From nobody Fri Mar 15 21:23:58 2024 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 4TxHLR1CXCz5Cxtc; Fri, 15 Mar 2024 21:23:59 +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 4TxHLR0kbhz4FwD; Fri, 15 Mar 2024 21:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710537839; 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=jGw3UxTFD/pgblkZCmK+Z9ztVxCkyrKA3gViN5rRuCY=; b=LC0cNs2oZ5sYVguXQ+wyY4IopHA4BzMGvVaYiBL3NPwqh71y4CbPCar98o3LqlYEFIDtkk 8wZTln4ADcqLbsJSvLEk0jbW53WFj8JOGzPF7e+se/cpViMyX2vXgDs/q3a/1HmTVopoOS N5HI+X/pZxUQIISwSkYJGHhaf3t6EwLRX+CzrvE0tCnNelWYRmXIafkYbf6RrbitbcgDmF djHbiayWfvHirVoioE1G+X8tGdzHDGU9rfTZl5/PzrkXqYf/dDC2Roev3L09eATLuOltEw GjTJ6qL7mFkPtmgNWhjHE6ecgFaZaPBHBCD8qCN1yHQOQAFY+lEtX/ptNoCIFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710537839; a=rsa-sha256; cv=none; b=RkaIMJbcAysjFdYDM4u8ooSzqhHmwps3YkQBdWJI3zVJwv1xw3ioVdlYaBaQP7Qyp09yA+ cri+6ytdBrcTa3+dv/76BiDEVAcxiOsN+WinwV0Aj8u1/Q8bpPWVzmkQ7B6hP0zVm65nR2 KW9oTzmzYTo4FMFHkxnN5aWBf2wipTGDPVtyvS9yVb2DaJaXMw/HSn8K4gUXe8nQQEGvwJ eX3Yu5sTBcURqa64lcUB9Rb5i/KV+ZqiKEosBdal85fOJucKRD2wjatxL5qcWH4FIAKKUG vPQrpSRh05Fw5rJGCxKapS0kRXJCsck9bj3605kChg0NfkjuM3UoxaEVTE892A== 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=1710537839; 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=jGw3UxTFD/pgblkZCmK+Z9ztVxCkyrKA3gViN5rRuCY=; b=TKtM/IGgWebZcd3NWVMoZwMF7HS0zTDwfVafBrF4JkfH1UokQZzd4T+wFPe1JDH5fLMmFQ qhIY3qMFbSWbz+oOlieOxsvCuyriQYaUD5QPRF/ujA5cb8QSGQi0hT5RtZhAT4e0sGMGSh +JUsfU+qRL1k2VYa0lRH0mcTIpozTAPR6bqDxWYHBudXCg/2SZ+6h9apAm59DfWHozgAL+ hPa9qTF+Xnn4glSb1z3DZf4ZzcWqKFQcsyl2UOmzUMCfzfDMMQOJdtv2gID+WDYxBTM0G+ nE/xLodtsl09D/NfY4kE4Tp1Epq2EUZx53AIFYWAzgxaGwXhP4t4OgFHSCCXXw== 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 4TxHLR0LZRzS94; Fri, 15 Mar 2024 21:23:59 +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 42FLNwL3055949; Fri, 15 Mar 2024 21:23:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FLNwHZ055946; Fri, 15 Mar 2024 21:23:58 GMT (envelope-from git) Date: Fri, 15 Mar 2024 21:23:58 GMT Message-Id: <202403152123.42FLNwHZ055946@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 135861ca0d31 - main - security/sslsplit: Fix build with OpenSSL 3 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 135861ca0d3119b359c0666ac3a8fcb893f4df9a Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=135861ca0d3119b359c0666ac3a8fcb893f4df9a commit 135861ca0d3119b359c0666ac3a8fcb893f4df9a Author: Muhammad Moinur Rahman AuthorDate: 2024-03-15 21:23:11 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-03-15 21:23:45 +0000 security/sslsplit: Fix build with OpenSSL 3 --- security/sslsplit/Makefile | 13 ++++--------- security/sslsplit/distinfo | 2 +- security/sslsplit/files/patch-pxyconn.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/security/sslsplit/Makefile b/security/sslsplit/Makefile index 155ac68ce36c..dcf46acc9232 100644 --- a/security/sslsplit/Makefile +++ b/security/sslsplit/Makefile @@ -1,6 +1,6 @@ PORTNAME= sslsplit -PORTVERSION= 0.5.5 -PORTREVISION= 2 +DISTVERSION= 0.5.5 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://mirror.roe.ch/rel/sslsplit/ @@ -17,19 +17,14 @@ LIB_DEPENDS= libevent.so:devel/libevent \ libnet.so:net/libnet USES= gmake pkgconfig tar:bzip2 uidfix ssl + MAKEFILE= GNUmakefile MAKE_ENV= MANDIR=${PREFIX}/share/man INSTALLUID=${UID} INSTALLGID=${GID} + PLIST_FILES= bin/sslsplit share/man/man1/sslsplit.1.gz \ share/man/man5/sslsplit.conf.5.gz \ "@sample %%ETCDIR%%/sslsplit.conf.sample" -.include - -.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl} || ${SSL_DEFAULT:Mopenssl3*} -IGNORE_SSL= base openssl openssl31 -IGNORE_SSL_REASON= error: undefined symbol: ERR_GET_FUNC which were deprecated in OpenSSL 3.0.0 and later -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sslsplit diff --git a/security/sslsplit/distinfo b/security/sslsplit/distinfo index 53b878d4b4d0..d99e8a7e13bd 100644 --- a/security/sslsplit/distinfo +++ b/security/sslsplit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1570828243 +TIMESTAMP = 1710537207 SHA256 (sslsplit-0.5.5.tar.bz2) = ba0473fd01428439e0cf22fae80fdd26d08a0bcf85e17c82177cb0810b700faf SIZE (sslsplit-0.5.5.tar.bz2) = 532788 diff --git a/security/sslsplit/files/patch-pxyconn.c b/security/sslsplit/files/patch-pxyconn.c new file mode 100644 index 000000000000..1e593e668bee --- /dev/null +++ b/security/sslsplit/files/patch-pxyconn.c @@ -0,0 +1,31 @@ +--- pxyconn.c.orig 2024-03-15 21:14:16 UTC ++++ pxyconn.c +@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shutdown(UNUSED st + } + #endif /* LIBEVENT_VERSION_NUMBER < 0x02010000 */ + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#define ERR_GET_FUNC(x) 0 ++#define ERR_func_error_string(x) "" ++#endif + + /* + * Maximum size of data to buffer per connection direction before +@@ -586,7 +590,7 @@ out: + * keep a pointer to the object (which we never do here). + */ + #ifdef HAVE_SSLV2 +-#define MAYBE_UNUSED ++#define MAYBE_UNUSED + #else /* !HAVE_SSLV2 */ + #define MAYBE_UNUSED UNUSED + #endif /* !HAVE_SSLV2 */ +@@ -2428,7 +2432,7 @@ pxy_sni_resolve_cb(int errcode, struct evutil_addrinfo + * after the first ssl callout failed because of client cert auth. + */ + #ifndef OPENSSL_NO_TLSEXT +-#define MAYBE_UNUSED ++#define MAYBE_UNUSED + #else /* OPENSSL_NO_TLSEXT */ + #define MAYBE_UNUSED UNUSED + #endif /* OPENSSL_NO_TLSEXT */