gentoo resync : 18.11.2019

4 files changed, 96 insertions, 5 deletions

diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index 644b1a717776..8a8aec21b15e 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,4 +1,7 @@
 AUX proxychains-4.12-makefile.patch 1269 BLAKE2B e52a59dd39e19c063cf37455aef06551bfb93f12b12c39c432237d80552c2833bc40a7aa033548770f3ae921c0a929ddefe8a495b84448bffad13548f307417a SHA512 c25bae5b6d72c496cc4d92b0f8db22a113bd5e138cfccd0c5cebe45788f2dc88a4e2b194a86e635619e5ba575747bbf460b246efb35993544dab06b12009ea04
+AUX proxychains-4.14-makefile.patch 1299 BLAKE2B 9c53f252910da0f0247c95e74856703bf257a9d7c5a4bf91cbf4574f117dd7d6dc800a1def5d772d6ab74194db92d053e759d2ae2955d5d1d11fb4598b0f0d6e SHA512 79dde568a605a085208a2cefa23780448a71b44a273ebe8f19f2ba478b33eeb29b38a478a5c2aa88dcf2352f52aefded8ac8985ccf52839e8b332bf885381203
 DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a
+DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95
 EBUILD proxychains-4.12-r1.ebuild 1053 BLAKE2B 3a7efc6ab9b696cc44abef396a81c23311c674260dee94e6957c844f6dc7692b53466ca6606766ca53658b00eac1b130410e934ebaa6fb9acb4f91435c1d9526 SHA512 5ec56256c1a1ba7ef38cc47143d6a10adddde05974c14cccc0e85ca2844b103115e02a5740395a1e8b0baab2e5f1e88d48a265c34af64845c66db3887d4bb558
-MISC metadata.xml 332 BLAKE2B ec0a64e6a8b98117123ea94cdea29f12583127fda7ee5e5bb8e538628652971674df48012f8b07cd89994b9bc1badc1f42276dae92d899dd4983109f302ba42a SHA512 fd3dc4c1f4bc62a11a150838c07c619a57dcac24070b56594e73c0fc75551432449da46424b3c1072d24c2c0dbc0ffc02af8473772c4adf5d72da86b68d0e5eb
+EBUILD proxychains-4.14.ebuild 1038 BLAKE2B 159f93afdf7b3c839bd1b23f74387c812b087b327ef85da98ce844bc499e45aaace2968a867847d101d1814a14fc2eb5c9eb32ab5ca698a0242dbff9d77b3989 SHA512 a5e158942cb57d0cfa34b223e3552450f65d8dce6990ae9629fc7d781c0aefdc2ee293304b11d022c1af2a2cbd1dd4fef5bf061fff01c77a125fe75fc519c279
+MISC metadata.xml 253 BLAKE2B 3e4b9b170b225b9391c36cf88a21abdcae8482183a3455b61290468e87ff293831ce690981b2359b67454a6245503ea40150cbda72375033f4d25bf7f66337d7 SHA512 1193e3a626c519491a529009a6df3dd2fb76de6e6510e825f01ea9f5ad5f61b2b27a3bef5a1fae47aa1a922d02faef8b4a1691cee99665a5d6492c4c73effc17
diff --git a/net-misc/proxychains/files/proxychains-4.14-makefile.patch b/net-misc/proxychains/files/proxychains-4.14-makefile.patch
new file mode 100644
index 000000000000..3724ec6a5a22
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-4.14-makefile.patch
@@ -0,0 +1,43 @@
+--- proxychains-ng-4.14/Makefile
++++ proxychains-ng-4.14/Makefile
+@@ -22,10 +22,8 @@
+ 
+ GENH = src/version.h
+ 
+-CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
+-NO_AS_NEEDED = -Wl,--no-as-needed
+-LIBDL   = -ldl
+-LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
++CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
++LIBS    = -ldl -lpthread
+ INC     = 
+ PIC     = -fPIC
+ AR      = $(CROSS_COMPILE)ar
+@@ -36,11 +34,11 @@
+ LD_SET_SONAME = -Wl,-soname=
+ INSTALL = ./tools/install.sh
+ 
+-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
++LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
+ 
+ SHARED_LIBS = $(LDSO_PATHNAME)
+ ALL_LIBS = $(SHARED_LIBS)
+-PXCHAINS = proxychains4
++PXCHAINS = proxychains
+ ALL_TOOLS = $(PXCHAINS)
+ ALL_CONFIGS = src/proxychains.conf
+ 
+@@ -82,11 +80,10 @@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+ 
+ $(LDSO_PATHNAME): $(LOBJS)
+-	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) $(USER_LDFLAGS) \
+-		-shared -o $@ $(LOBJS) $(SOCKET_LIBS)
++	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -shared $(PIC) -o $@ $(LOBJS) $(LIBS) $(SOCKET_LIBS)
+ 
+ $(ALL_TOOLS): $(OBJS)
+-	$(CC) src/main.o src/common.o $(USER_LDFLAGS) -o $(PXCHAINS)
++	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
+ 
+ 
+ .PHONY: all clean install install-config install-libs install-tools
diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml
index 08334168ca3c..5046f26bf419 100644
--- a/net-misc/proxychains/metadata.xml
+++ b/net-misc/proxychains/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">rofl0r/proxychains-ng</remote-id>
 	</upstream>
diff --git a/net-misc/proxychains/proxychains-4.14.ebuild b/net-misc/proxychains/proxychains-4.14.ebuild
new file mode 100644
index 000000000000..9897fb23beb4
--- /dev/null
+++ b/net-misc/proxychains/proxychains-4.14.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib
+
+MY_PN=${PN}-ng
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
+HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
+SRC_URI="http://ftp.barfooze.de/pub/sabotage/tarballs/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+	default
+	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		|| die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS README TODO
+
+	dolib.so lib${PN}.so.${PV}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	insinto /etc
+	doins src/${PN}.conf
+}