From nobody Tue May 27 20:01:56 2025 X-Original-To: dev-commits-ports-all@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 4b6Nnc6h6sz5xqbY; Tue, 27 May 2025 20:01:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Nnc6BH5z497S; Tue, 27 May 2025 20:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748376116; 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=CLpVRcYCAgAp00+nbsJsoJFauX9lTiNF4VubbGAa2Cs=; b=uimQ/WCQTw+OndUTitngmYa68LAf/2YJgEDlCTd0CrBm2Z918vixzCpIBVD8Q1peOoCVvM y80pbYcuHvcwEeYfN0Ylg9XzPJioTtFq2mze/OkSb9HdAtrzQNS5QxDgvHC7bDMKhQZ3WH 2bGK/nmMdHqXPn6WmG9f0RJFzafFRv63P+n1VR0l5l2sIAW6PtkyKt01bmdusI1qzV69f6 tiWPyyKGAk3WzlhHYuCKWy8hYqN5+8YjLuHjVH2gBWkYLfbUBEGuwuu1hyDTsuRSCvp0tz DrKAxCKRJzYFz8Souof/YDW/uU5pUFuKtT0flv0iPaDydjG9cFyKDl7wy5mp8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748376116; a=rsa-sha256; cv=none; b=hSB/jf0xI9bNeeBmf99Vq+6uaeg4iVNEa/QvDrJy8wEU5aNtXOlyYxixa8D7voxa8Qkk4p oLRAgbV8hRVTfQ63/sewWfkMQxh693h0omQQx3qFDb+9YeNW+/Y8P0XKQPJ9/aJl6gcFWF qfowyZgx1RbpgisiMXnwzMe0E0mvWEBQpDLP0KzMCgTihnVjWCu8Kp+r1vgJ9+PZBqWVzn x8bW3PbZStjKLoYWKCjy9HbS7ifPUtVIuC/ZddoNThuKgMnBzbf57e6MRIP1MMRr/DFrsz bMPid/sJnzW/8y4krOSlD0dnEK1xSDAi4HVr0U5otxMZr3YBq5fO9HIDOtoLyQ== 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=1748376116; 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=CLpVRcYCAgAp00+nbsJsoJFauX9lTiNF4VubbGAa2Cs=; b=j/e4ngn/N+L5aoHxcrwMD+hbvl/p7dVJ+6Cy2T8w9WPWKt+r9MLXVmo9VD7FHDApEeAiq3 Tpbv1zIbXA9RMJhfuSEWok7t60Ocgw2z3Ce9ZajjCSFfjEFP5t4fhxmoD8mPu1WXmi9zrs QwRXL3absu/0fyCpKu5A/DtcPFIgGqLCbcNuHDx0Oyo5gOefepvGKL0wXEhdceQm3ECYZn xyEK+9tPpUjdcuheD4CK2wtTWyzPas9Ml/A66bl7lvxsSm1QJLdM+fR3+wTrs/FOPdUL7C RLLeGf2hOWtKvbQpehdGaBIwX75eLzjAKBQUffQHD0HCLCbsu+Q/uGT/5JjVOw== 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 4b6Nnc5ksbz163f; Tue, 27 May 2025 20:01:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54RK1uTh047743; Tue, 27 May 2025 20:01:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RK1ucb047740; Tue, 27 May 2025 20:01:56 GMT (envelope-from git) Date: Tue, 27 May 2025 20:01:56 GMT Message-Id: <202505272001.54RK1ucb047740@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mark Felder Subject: git: 37bb13fefc4f - main - net/haproxy: Add flavor supporting WolfSSL List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: feld X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37bb13fefc4f3f439f7e901eb23d89f6d9ec060b Auto-Submitted: auto-generated The branch main has been updated by feld: URL: https://cgit.FreeBSD.org/ports/commit/?id=37bb13fefc4f3f439f7e901eb23d89f6d9ec060b commit 37bb13fefc4f3f439f7e901eb23d89f6d9ec060b Author: Mark Felder AuthorDate: 2025-05-27 19:59:36 +0000 Commit: Mark Felder CommitDate: 2025-05-27 19:59:36 +0000 net/haproxy: Add flavor supporting WolfSSL Approved by: Dmitry Sivachenko (maintainer) PR: 286727 --- net/haproxy/Makefile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 68f090875e6a..b6ce33370eca 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,15 +10,17 @@ WWW= https://www.haproxy.org LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi -FLAVORS= default lua +FLAVORS= default lua wolfssl FLAVOR?= ${FLAVORS:[1]} USES= compiler:c++11-lang cpe gmake USE_RC_SUBR= haproxy -default_CONFLICTS_INSTALL= haproxy-lua -lua_CONFLICTS_INSTALL= haproxy-devel +default_CONFLICTS_INSTALL= haproxy-lua haproxy-wolfssl +lua_CONFLICTS_INSTALL= haproxy-devel haproxy-wolfssl lua_PKGNAMESUFFIX= -lua +wolfssl_CONFLICTS_INSTALL= haproxy-devel haproxy-lua +wolfssl_PKGNAMESUFFIX= -wolfssl CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 haproxy25 haproxy26 @@ -32,16 +34,17 @@ MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ MAKE_ARGS_i386= USE_LIBATOMIC= MAKE_ARGS_powerpc= USE_LIBATOMIC= -OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX -OPTIONS_RADIO= PCRE +OPTIONS_DEFINE= DOCS EXAMPLES LUA DEVICEATLAS PROMEX +OPTIONS_RADIO= PCRE SSL OPTIONS_RADIO_PCRE= DPCRE DPCRE2 SPCRE SPCRE2 +OPTIONS_RADIO_SSL= OPENSSL WOLFSSL DPCRE_DESC= Link pcre(1) dynamically DPCRE2_DESC= Link pcre2 dynamically SPCRE_DESC= Link pcre(1) statically SPCRE2_DESC= Link pcre2 statically DEVICEATLAS_DESC= DeviceAtlas Device Detection support PROMEX_DESC= Enable Prometheus exporter -OPTIONS_DEFAULT= DPCRE2 OPENSSL PROMEX +OPTIONS_DEFAULT= DPCRE2 PROMEX DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1 @@ -58,11 +61,20 @@ OPENSSL_USES= ssl OPENSSL_MAKE_ARGS= USE_OPENSSL=1 SSL_LIB=${OPENSSLLIB} SSL_INC=${OPENSSLINC} LUA_USES= lua:53 LUA_MAKE_ARGS= USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER} +WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl +WOLFSSL_MAKE_ARGS= USE_OPENSSL_WOLFSSL=1 USE_QUIC=1 +WOLFSSL_CFLAGS= -I${LOCALBASE}/include/wolfssl .if ${FLAVOR:U} == lua OPTIONS_DEFAULT+= LUA .endif +.if ${FLAVOR:U} == wolfssl +OPTIONS_DEFAULT+= WOLFSSL +.else +OPTIONS_DEFAULT+= OPENSSL +.endif + .include .if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:M*quictls}