gentoo resync : 24.03.2019

3 files changed, 133 insertions, 0 deletions

diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index 0e260b3e4b67..9bfeb612663c 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -1,9 +1,12 @@
 AUX tsocks-1.8_beta5-bsd.patch 932 BLAKE2B f38baf5c331fb13a2a7ff12426f1e2187c5165a5d626a223d831e271b438388b58accc70578c2306d56fd950f068f2ec6ecc71ec4113eade1a9cc5ac2f04b929 SHA512 15e126ccc183f4217b4862bb0cb0d5da49c7895b1a51e00ff43fadb3e66cc9f9dc70208672f92c10da438fa4af17506a8dade9517b5eeae29fea171d04b90093
 AUX tsocks-1.8_beta5-flags.patch 1339 BLAKE2B 8e9c5fd3152418e2e2a0053242538d02bd22246e28cff608c0cc223052729ef2c1006c55dbc3974abdd37710d9e63eed99fdab7da70038ff08c819d2dea6bc35 SHA512 a25acc848a7fa29479109a49147d3a1e6332fa90ed00ab5fc0c99ca546e7f7c4d9b45662ba4ece9c03cc970438d86ead79ed64c6d244d76d98d7fc8dde4060bf
 AUX tsocks-1.8_beta5-ld_preload.patch 1127 BLAKE2B d5781ae260b66aed97193d6ef73d7862555d39b8c442d771f70e329971bb3532d12961abc451e88f7eaced2fc6e6108ce7a9c758c245c0b6b3d9baf358ec9663 SHA512 a202c7a2db1f0b98f6fc6bf36ab56906be7b3516726a4ae002916a91b6fc67e6630876eadfb970a91465b3526dc00249f5b9222dd90f96a1b9cdf4f2aff13e22
+AUX tsocks-1.8_beta5-options.patch 1468 BLAKE2B b6eae3f2d0a51b2de68b47623c6c527e895e6637d30e1dccdc16adf53e8caaac029a944812810f0aa094a1ddf700ef3ceaa8ace663911ed2f208d4571dc524bb SHA512 9ffbe5cfdce9fb87cec739cd6de611c5acd2f79b73396355f7302366fa178ddbf92499c7c2801245cbe2f2a3448df27c67d57753c645f5c2622535cd8b1ea08f
 AUX tsocks-1.8_beta5-poll.patch 617 BLAKE2B 974277a260d0947e16b096eb38a0234d0fd40bbf9a4e0f212a4741994e5bee859080d455328979373c290ca9d5856db4fe4af116595a84a6fa6f70582045f10f SHA512 931a50b2c62c6fead52073dbe8287bfeda807f1c2e6ef3f9a3798cd79754e2fcd06e4d88c49bc0d748ee7a42eca3727503b2c1f261bd994b1a63e5eefac73956
 AUX tsocks-1.8_beta5-rename.patch 3104 BLAKE2B 6eec6173d8bd4cbb2e4b78096521abbfc5a57b37c6a492ef6de2de7d55d99a621e2641764038c0fe0a4ec3166c268b8eaa652ae25d86085655756471af5cf23b SHA512 d9c4b015c9408a455b357718fd40cf07f40430aef45acb1680a939b414e75ccdef43bac6e3d046268990c228aa402e9917dcf08a13d605264925c5766e9f0758
 DIST tsocks-1.8b5-tordns1-gentoo-r3.patch.xz 18468 BLAKE2B 6e786a2a5cbf37bce743aa2f934884fd7ba3abcb0c675d9cb61a0c8ab078cde1eb96a11bf8b2acf102a9637c78654e519e186a7558a3af496eaf86c0d65bd51c SHA512 86cbc7a8733e9f9e19e0924d2a2b8481a66eb67a8d548b90c7bd02cc6ae42064a295ee6a002cf19a7b3d7d811388db2a34b641d9dbe239f4c0bc8a1f78c90682
+DIST tsocks-1.8b5-tordns1-gentoo-r4.patch.xz 18464 BLAKE2B 99bd4c210c2fa4c797c4d827df4ae53d13198b91083975b9f6d327bd762193663c1a0c8530ea5e65e82d54ccf6900a11aba50e19a2fb6209e0e8f1131985374b SHA512 711b2e3f5ac9b1a4fd63e32b6cb8090066ece8882e2ec0048bee6cba868712c80ca7f601f79405be40404af625c2ff6fefa8cba98b8a6ced95abe6becf34954f
 DIST tsocks-1.8beta5.tar.gz 83928 BLAKE2B a58b4866154deb72b551961578f90b270a7cc1fd2c5b4c08a5ddf99472e3c8e338cc9116c0c9d2d2e1e1c350a077b46cd08fb24390156eb1e60c4d7a10510e6d SHA512 b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9
 EBUILD tsocks-1.8_beta5-r8.ebuild 2231 BLAKE2B 5c0b0193d17c63a14de0abbc27c2aab65c8e37a539edf5e4db96b90aee8c7112f37468b73e2176513ab8370afd0e119159eb0ef15d23a53fb08b343e500ed222 SHA512 8805ced695c03c23bd908e0ad427596804461ca32f1a4183748d968c517b1d56ffd0e4b9fa0d985425943bdbdedd3b03f2c5af99e8f6ef050200447d446f19c6
+EBUILD tsocks-1.8_beta5-r9.ebuild 2285 BLAKE2B d5b31359c75faea39ecdd10f0b2b307ed87ed0c08f419e90ba6118d5e39806e23dcd0f3274ddae3cef7b04b18b697fa64f68bd6ab7ebc995387ecc7c84576c4f SHA512 518d8cd766fd136c0376d99c8e187834279b3126d88366804fc732a22e6f0547be2cb7d0bd38bf98e467cc690df7ad0d436de6c2ca231e67a0b0e665db2db182
 MISC metadata.xml 981 BLAKE2B 9fbeb51e30b15ddc223aa7d239f9e5d9a51fed44b5ea905dfe07c7f996410cfb09c0019730cf4d26cf7ec26aac1bd63ac5eca1025efaff4ad20dfdce90435fd9 SHA512 483a93183cdedf77df2dbefff201c35d36f755969e28c6fefc6a44cfb56b0464ed78dfa7100ccbb3519a8ae30322c1346fb0d4cf2b1cbfa79dded237aff22d73
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-options.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-options.patch
new file mode 100644
index 000000000000..d1f524b3147c
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-options.patch
@@ -0,0 +1,47 @@
+--- tsocks-1.8/configure.in.orig	2002-07-16 02:51:03.000000000 +0400
++++ tsocks-1.8/configure.in	2019-03-22 01:38:19.065438275 +0300
+@@ -154,36 +154,36 @@
+   ])    
+ ])
+ 
+-if test "${enable_socksdns}" = "yes"; then
++if test "x${enable_socksdns}" = "xyes"; then
+   AC_DEFINE(USE_SOCKS_DNS)
+ fi
+ 
+-if test "x${enable_envconf}" = "x"; then
++if test "x${enable_envconf}" = "xyes"; then
+   AC_DEFINE(ALLOW_ENV_CONFIG)
+ fi
+ 
+-if test "${enable_oldmethod}" = "yes"; then
++if test "x${enable_oldmethod}" = "xyes"; then
+   AC_DEFINE(USE_OLD_DLSYM)
+   oldmethod="yes"
+ fi
+ 
+-if test "x${enable_debug}" = "x"; then
++if test "x${enable_debug}" = "xyes"; then
+   AC_DEFINE(ALLOW_MSG_OUTPUT)
+ fi
+ 
+-if test "x${enable_hostnames}" = "x"; then
++if test "x${enable_hostnames}" = "xyes"; then
+   AC_DEFINE(HOSTNAMES)
+ fi
+ 
+-if test "${enable_socksdns}" = "yes" -a \
+-        "x${enable_hostnames}" = "x" ; then
++if test "x${enable_socksdns}" = "xyes" -a \
++        "x${enable_hostnames}" != "xno" ; then
+   AC_MSG_ERROR("--enable-socksdns is not valid without --disable-hostnames")
+ fi
+ 
+ dnl If we have to use the old method of overriding connect (i.e no
+ dnl RTLD_NEXT) we need to know the location of the library that
+ dnl contains connect(), select(), poll() and close()
+-if test "${oldmethod}" = "yes"; then 
++if test "x${oldmethod}" = "xyes"; then 
+   dnl We need to find the path to the library, to do 
+   dnl this we use find on the usual suspects, i.e /lib and
+   dnl /usr/lib
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
new file mode 100644
index 000000000000..63bfc1fbe7c9
--- /dev/null
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+DESCRIPTION="Transparent SOCKS v4 proxying library"
+HOMEPAGE="http://tsocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
+	tordns? ( https://dev.gentoo.org/~bircoph/patches/${PN}-${PV/_beta/b}-tordns1-gentoo-r4.patch.xz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug dns envconf tordns server-lookups"
+
+REQUIRED_USE="
+	dns? ( !tordns !server-lookups )
+	tordns? ( !dns !server-lookups )
+"
+
+S="${WORKDIR}/${P%%_*}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-ld_preload.patch"
+	"${FILESDIR}/${P}-rename.patch"
+	"${FILESDIR}/${P}-bsd.patch"
+	"${FILESDIR}/${P}-poll.patch"
+	"${FILESDIR}/${P}-options.patch"
+)
+
+src_prepare() {
+	default
+	use tordns && eapply "../${PN}-${PV/_beta/b}-tordns1-gentoo-r4.patch"
+
+	sed -i 's/TSOCKS_CONFFILE/TSOCKS_CONF_FILE/' tsocks.8 || die "sed tsocks.8 failed"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export CC
+
+	# NOTE: the docs say to install it into /lib. If you put it into
+	# /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
+	# mounted in time :-( (Ben Lutgens) <lamer@gentoo.org>
+	econf \
+		$(use_enable debug) \
+		$(use_enable dns socksdns) \
+		$(use_enable envconf) \
+		$(use_enable server-lookups hostnames) \
+		--with-conf="${EPREFIX}"/etc/socks/tsocks.conf \
+		--libdir="${EPREFIX}"/$(get_libdir)
+}
+
+multilib_src_compile() {
+	# Fix QA notice lack of SONAME
+	emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi; then
+		newbin validateconf tsocks-validateconf
+		newbin saveme tsocks-saveme
+		dobin inspectsocks
+		insinto /etc/socks
+		doins tsocks.conf.*.example
+		dodoc FAQ
+		use tordns && dodoc README*
+	fi
+}
+
+pkg_postinst() {
+	einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory"
+	einfo "The following executables have been renamed:"
+	einfo "    /usr/bin/saveme renamed to tsocks-saveme"
+	einfo "    /usr/bin/validateconf renamed to tsocks-validateconf"
+}