gentoo auto-resync : 07:10:2022 - 13:23:59

3 files changed, 63 insertions, 26 deletions

diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
deleted file mode 100644
index 65959f3e1090..000000000000
--- a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/GNUmakefile b/GNUmakefile
-index ebdcf0a..02cb4b7 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE
- 
- install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5
- 	test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
--	test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \
--		$(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit
- 	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
- 		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
- 	test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
- 		$(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
--	test -d $(DESTDIR)/var/log/$(TARGET) || \
--		$(MKDIR) -p $(DESTDIR)/var/log/$(TARGET)
--	test -d $(DESTDIR)/var/run/$(TARGET) || \
--		$(MKDIR) -p $(DESTDIR)/var/run/$(TARGET)
- 	$(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
- 		$(TARGET) $(DESTDIR)$(PREFIX)/bin/
--	$(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \
--		$(TARGET).conf \
--		$(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample
- 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
- 		$(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
- 	$(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
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
+