From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 389C4158094 for ; Fri, 7 Oct 2022 11:29:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81B7EE08EB; Fri, 7 Oct 2022 11:29:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6327DE08DD for ; Fri, 7 Oct 2022 11:29:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EBA03410C3 for ; Fri, 7 Oct 2022 11:28:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57564617 for ; Fri, 7 Oct 2022 11:28:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665142109.7bb7ed201f33e94137d7e032f4627158141411a4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/sslsplit/, net-analyzer/sslsplit/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch net-analyzer/sslsplit/sslsplit-0.5.5.ebuild X-VCS-Directories: net-analyzer/sslsplit/ net-analyzer/sslsplit/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7bb7ed201f33e94137d7e032f4627158141411a4 X-VCS-Branch: master Date: Fri, 7 Oct 2022 11:28:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c041a609-c050-47cc-85b0-6425f0341a6a X-Archives-Hash: c5727736f30d6181e0dd769658a13527 commit: 7bb7ed201f33e94137d7e032f4627158141411a4 Author: Petr Vaněk atlas cz> AuthorDate: Tue Oct 4 15:24:30 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 7 11:28:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb7ed20 net-analyzer/sslsplit: use pkgconfig to detect libnet SSLsplit uses custom localization of libnet library which does not work correctly in multilib environment. This commit fixes the issue by restoring pkgconfig detection from upstream commit 46a55de8040a ("Refactor location of packages, improve libnet detection"). Similar patch is also needed for tests, where libcrypto is also searched with pkgconfig. Closes: https://bugs.gentoo.org/731190 Closes: https://bugs.gentoo.org/874075 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/27631 Signed-off-by: Sam James gentoo.org> .../files/sslsplit-0.5.5-libcrypto-pkgconfig.patch | 23 +++++++++++++ .../files/sslsplit-0.5.5-libnet-pkgconfig.patch | 40 ++++++++++++++++++++++ net-analyzer/sslsplit/sslsplit-0.5.5.ebuild | 6 +++- 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch new file mode 100644 index 000000000000..dd6ae812efb6 --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch @@ -0,0 +1,23 @@ +Use pkgconfig for localization of libcrypto. This is needed for tests in +multilib systems. + +diff --git a/extra/engine/GNUmakefile b/extra/engine/GNUmakefile +index b50717b..3712ad6 100644 +--- a/extra/engine/GNUmakefile ++++ b/extra/engine/GNUmakefile +@@ -16,9 +16,9 @@ else + SUFFIX:= so + endif + +-CFLAGS+= -fPIC -I$(OPENSSL_BASE)/include +-LDFLAGS+= -L$(OPENSSL_BASE)/lib +-LIBS+= -lcrypto ++CFLAGS+= -fPIC $(shell pkg-config --cflags libcrypto) ++LDFLAGS+= $(shell pkg-config --libs-only-L libcrypto) ++LIBS+= $(shell pkg-config --libs-only-l libcrypto) + + TARGET= dummy-engine + +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch new file mode 100644 index 000000000000..5eebf8d4deaf --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch @@ -0,0 +1,40 @@ +Subject: [PATCH] locate libnet with pkgconfig + +This is partially reverted from upstream commit 46a55de8040a ("Refactor +location of packages, improve libnet detection") + +diff --git a/GNUmakefile b/GNUmakefile +index cc7197e..2343272 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -277,6 +277,10 @@ PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_openssl \ + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_pthreads \ + && echo libevent_pthreads) + endif ++ifndef LIBNET_BASE ++PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libnet \ ++ && echo libnet) ++endif + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + ifndef LIBPCAP_BASE + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libpcap \ +@@ -333,7 +337,7 @@ CHECK_MISSING:= 1 + endif + endif + +-# Always search filesystem for libnet because libnet-config is unreliable ++ifeq (,$(filter libnet,$(PKGS))) + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + LIBNET_FOUND:= $(call locate,libnet,include/libnet-1.1/libnet.h,$(LIBNET_BASE)) + ifdef LIBNET_FOUND +@@ -347,6 +351,7 @@ $(error dependency 'libnet' not found; \ + install it or point LIBNET_BASE to base path) + endif + endif ++endif + + ifdef OPENSSL_FOUND + PKG_CPPFLAGS+= -I$(OPENSSL_FOUND)/include +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild index c3100f34cf6c..9295120f10b3 100644 --- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild +++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild @@ -35,7 +35,11 @@ DEPEND="${RDEPEND} test? ( dev-libs/check )" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-openssl3.patch" ) +PATCHES=( + "${FILESDIR}/${P}-openssl3.patch" + "${FILESDIR}/${P}-libnet-pkgconfig.patch" + "${FILESDIR}/${P}-libcrypto-pkgconfig.patch" +) src_prepare() { default