gentoo resync : 18.08.2019

4 files changed, 50 insertions, 15 deletions

diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index 8959b5943cde..fcf9c4c80896 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,4 +1,5 @@
-DIST sslsplit-0.5.2.tar.gz 1526606 BLAKE2B 2eb9e1525072626cfdfdfe344a61d92cf340a87dbbabfd06c5a7b46ce6dd0305b27949f91260fe192ecf97484676600e39f79a74995b45fb5b59138726cfbffe SHA512 5f0560dbf89355ad0ef443df2fb0358046efd8c35be6c45f27b04495fd6194c826ef1c7b261683e7f22eb14436293d00395329284d9e709e1188c3c885251935
-EBUILD sslsplit-0.5.2.ebuild 996 BLAKE2B b4fd683858430b4e4ed81f70ee05edb921fb0924365087b31eb39c287bbdafbe05d69c3d47d37689c07c73c3dccaa8ee4b70aa154c708dafde4a480ca4f7b4fa SHA512 a1d21421197f0e07227dd26590b56b3162888238f99bf3e861bb9fa9f50d3853ae212967e95283469639da65948f0945742c666610a00a5658c7f6683d05d3a0
-EBUILD sslsplit-9999.ebuild 994 BLAKE2B d88bc6536da3f3bcb071fe8c6c102a0906a5fc8de959484a5aeb59ab151202a6e77975ce7cfc6cc480108b4fedca87e019c0d5682988acb6902eb77b7290003e SHA512 28041f647509751509fff7db400e53849c912bad1ce150d918d1bd4bbe2d7b789def1ba256fa5abf5aff2c2f29078f44dda182bc86c50693f5ef63814c57863c
+AUX sslsplit-0.5.4-install.patch 1131 BLAKE2B 1f81f8fbc8861e4ccfc0b2068d19e1a5dbb1485cf72d7aa0799e7addf7c73e4836b427afd510de8b6c98037e473e5699c33920fb7931c99ccc989fd0cb956bb3 SHA512 0219d175cf9f8a6a89f9a807bb5981a83c1e62c6738f5fafd93970045fa56dd0595761f3915cc223f60541b39a8bff9222233f176a5a608cdcf7a6774b69f56c
+DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
+EBUILD sslsplit-0.5.4.ebuild 1062 BLAKE2B 21b643d7ea3e2b6227c1f51d1113b708da07624357fef757361150ec8a2d29d8e5b4c1a9a217b23e9ce0b106e2d7c13568aa3c3c2fdbfd828b717170a20697a5 SHA512 7aff2062038061115f4e59d706585da52ffba89f2a12f9d0da2c7be19844c0a3530771f6ee28b2b91bf4a6abd648180ee92052e6815ee4ff911fd5977d33109f
+EBUILD sslsplit-9999.ebuild 1029 BLAKE2B 84433424dce11eb473146ce9d4caa229f6f648d2ad627059992b9877140caf720f126b03b96655bec689ae5042e296573fe3ee77b9d938699133fd6a2666e57e SHA512 a44176eb89f13fa2f337116026d9ceb363c6d22ffcaf6c635b23ca8edffd8fd145ea6fa6129991a57b50187a083890215e7da069b11f045764f09bb6409ac820
 MISC metadata.xml 873 BLAKE2B 2025dba83d4a6c2c48f8297da057360bc42269093af9292a8baa3096a5ec5cb3644da47effd8977ee9829e318bea5c11680c5eccab0407d5f14ed29a12e615b3 SHA512 d6d408cf00e3201acd6de22a0f10a2322398a889c84480da8eebd005da099f9306ac8d88d13c4186fa369915c39b4ad04d7aff558ad263896591374c9a4c78a1
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
new file mode 100644
index 000000000000..65959f3e1090
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
@@ -0,0 +1,26 @@
+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/sslsplit-0.5.2.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
index f823d37044fe..af09469872b6 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.2.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -22,23 +22,29 @@ else
 fi
 
 RDEPEND="
-	elibc_musl? ( sys-libs/fts-standalone )
 	dev-libs/libevent[ssl,threads]
-	dev-libs/openssl:0="
+	dev-libs/openssl:0=
+	net-libs/libnet:1.1
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-install.patch"
+)
 
 src_prepare() {
 	default
 
 	use elibc_musl && append-libs "-lfts"
 
-	sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
-	sed -i 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile version.c || die
+	sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+		-e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die
 	sed -i '/opts_suite/d' main.t.c || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc AUTHORS.md NEWS.md README.md
+	dodoc AUTHORS.md NEWS.md README.md sslsplit.conf
 }
diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild
index f013b4bb5552..5ea7c49b62cf 100644
--- a/net-analyzer/sslsplit/sslsplit-9999.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -22,23 +22,25 @@ else
 fi
 
 RDEPEND="
-	elibc_musl? ( sys-libs/fts-standalone )
 	dev-libs/libevent[ssl,threads]
-	dev-libs/openssl:0="
+	dev-libs/openssl:0=
+	net-libs/libnet:1.1
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}
 	test? ( dev-libs/check )"
+BDEPEND=""
 
 src_prepare() {
 	default
 
 	use elibc_musl && append-libs "-lfts"
 
-	sed -i 's/-D_FORTIFY_SOURCE=2 //g' GNUmakefile || die
-	sed -i 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile build.c || die
+	sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+		-e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die
 	sed -i '/opts_suite/d' main.t.c || die
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install
 	dodoc AUTHORS.md NEWS.md README.md
 }