Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <arkamar@atlas.cz> Closes: #27631 Signed-off-by: Sam James <sam@gentoo.org>
- Loading branch information
1 parent
f425c55
commit 7bb7ed2
Showing
3 changed files
with
68 additions
and
1 deletion.
There are no files selected for viewing
23 changes: 23 additions & 0 deletions
23
net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
40 changes: 40 additions & 0 deletions
40
net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters