From nobody Fri Dec 29 22:23:02 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T20J648pJz55PF4; Fri, 29 Dec 2023 22:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T20J63cQYz3gMf; Fri, 29 Dec 2023 22:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703888582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WYF/CD026jLM8cHPuZRkxnl3nFIizjN7wJH4pjK02mE=; b=DTySfPVsg3LLfJ1vmFj653Vo2lDfAK6kOhX0166o5cOfVAl6v5A5opnjqAhu0B4PED/Sru n23UH9o6v+4pVavgpuzfs4WNeQRoPlyzCxjta69EaoPUEBSZgdPMhrgPbNOGgFt3fi8/bY +4shcuNDkkSBotJUesMyaT33EYeVZxkTMTmHeOtl+tjcgGTUmK/fwAaTDSBKpub9pffmwT S/NW5VztBYfbYGadquJVckcJIjeA8+9bCO/87/gwGu0VD4GiPcuKAsFjEHbPf8dIgZ2M3p v6EuXX6IeeHGRwNjdkxoE+MM+IVBfbHjnTS57Jtjqls4TWjI+qX1n4Eafh/ehA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703888582; a=rsa-sha256; cv=none; b=pEkTuV8GHGQcclknNhfKNKaGX2cpzlpN3F0Ypo6uU5dBfcb3mLVsW9hBkvssIKDOCw1x0+ MLmi47uSNQTBxC8o6W4kPGO002OC9++foaXP5FzO68yzwuFIp3Pv/1PZjjA84TJVO4CZN4 DRa1Ba+KyOvxgtaVdgUXLQ/11DIMUAWaIJKcDoDltvFIewSqAghHI1VbNHx6riS2PhqfNZ Ej43SaBM+bCP53feqHXiawt7qXpUPzVYwL72RKPIPq6AuqrIXuAcEk/4oB3RDJlOHVj1fF 7AUIKdVfXjUP9gEvEsqSoQH9Yils32UMQXsm0G6ch7F6j4tmisfVWtaM5efp3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703888582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WYF/CD026jLM8cHPuZRkxnl3nFIizjN7wJH4pjK02mE=; b=UIUjn2GXHiAf078UfNz2lPIMiEVaKZMNqgYc+eLQOjsbM5lM5lIQfH02gWPE2ouUIfwwL/ xJsPN1ie2Rug3/uc7ygInR9GzZxt3zXpfI/O/jhopPOBZ6t2cnr7x+2J8T+NI74aBsYJJL nkvzNAkOA8Snlr/tTZvb0cl65deWRwQNnMLQULIOeC3oAiiwmumWZWpmtGyNw5l+hJgFjm Ys/xlblc/DjZSETPp/BhI+vk+kBEilB/gDE7leW+vcfXcVFivIyLZHltQ0kQYc0gvrhiVU tg5fOladhdbWCCEx9CI8SJtpbuLkMSbz/g7ew7RngMg1PRFUgZi82GWAO6c+5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T20J62fyMz8mF; Fri, 29 Dec 2023 22:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BTMN2VT006462; Fri, 29 Dec 2023 22:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BTMN2p1006459; Fri, 29 Dec 2023 22:23:02 GMT (envelope-from git) Date: Fri, 29 Dec 2023 22:23:02 GMT Message-Id: <202312292223.3BTMN2p1006459@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Sivachenko Subject: git: a2405c51ca2c - main - net/haproxy: enable QUIC support. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: demon X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2405c51ca2cf6f0e633f6b8cd4839e68ba1b865 Auto-Submitted: auto-generated The branch main has been updated by demon: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2405c51ca2cf6f0e633f6b8cd4839e68ba1b865 commit a2405c51ca2cf6f0e633f6b8cd4839e68ba1b865 Author: Dmitry Sivachenko AuthorDate: 2023-12-29 22:20:42 +0000 Commit: Dmitry Sivachenko CommitDate: 2023-12-29 22:22:56 +0000 net/haproxy: enable QUIC support. PR: 267388 Submitted by: Frank Wall --- net/haproxy/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index b67eac5bc4b7..3ed42706c23c 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,6 +1,6 @@ PORTNAME= haproxy DISTVERSION= 2.8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/2.8/src/ @@ -63,6 +63,14 @@ LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NA OPTIONS_DEFAULT+= LUA .endif +.include + +.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:M*quictls} +OPENSSL_MAKE_ARGS+= USE_QUIC=1 +.else +OPENSSL_MAKE_ARGS+= USE_QUIC=1 USE_QUIC_OPENSSL_COMPAT=1 +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_PROGRAM} ${WRKSRC}/admin/halog/halog ${STAGEDIR}${PREFIX}/sbin/ @@ -72,4 +80,4 @@ do-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) -.include +.include