Rename saveme and validateconf executables. Add tordns patch & local USE flag (#148550).

Package-Manager: portage-2.1.1

5 files changed, 158 insertions, 8 deletions

diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog
index 4f9af2a33152..f209423c0097 100644
--- a/net-proxy/tsocks/ChangeLog
+++ b/net-proxy/tsocks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/tsocks
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.10 2006/09/20 18:18:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.11 2006/09/22 12:25:03 mrness Exp $
+
+*tsocks-1.8_beta5-r2 (22 Sep 2006)
+
+  22 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  +files/tsocks-1.8_beta5-gentoo.patch, +tsocks-1.8_beta5-r2.ebuild:
+  Rename saveme and validateconf executables. Add tordns patch & local USE
+  flag (#148550).
 
   20 Sep 2006; Alin Nastac <mrness@gentoo.org> tsocks-1.8_beta5-r1.ebuild:
   Stable on x86.
diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index bcd51102bb60..ca38ecd916d1 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -5,19 +5,28 @@ AUX tsocks-1.8_beta5-bsd.patch 932 RMD160 d17f6927c4e18b25505139a9893c59afc39775
 MD5 3dac1b67ca2cbbf1a9685b34de5162f2 files/tsocks-1.8_beta5-bsd.patch 932
 RMD160 d17f6927c4e18b25505139a9893c59afc39775aa files/tsocks-1.8_beta5-bsd.patch 932
 SHA256 c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d files/tsocks-1.8_beta5-bsd.patch 932
+AUX tsocks-1.8_beta5-gentoo.patch 3291 RMD160 5008f683ead3a900af4a73a9ad3a35c4f0c1548f SHA1 0c1696184bf8cf9ac9e178dd5b2993949b24e38c SHA256 53e0dd75a776fdd75c23f5dd193bff5065fcc94b2c4cc797fd77315ca2641463
+MD5 0b7200721e675c0dfcb302b5cfaa79a2 files/tsocks-1.8_beta5-gentoo.patch 3291
+RMD160 5008f683ead3a900af4a73a9ad3a35c4f0c1548f files/tsocks-1.8_beta5-gentoo.patch 3291
+SHA256 53e0dd75a776fdd75c23f5dd193bff5065fcc94b2c4cc797fd77315ca2641463 files/tsocks-1.8_beta5-gentoo.patch 3291
+DIST tsocks-1.8b5-tordns1-gentoo.patch.gz 21543 RMD160 cb584dfcc0fc0fdf382a641689a9ddf25dc184fc SHA1 f57d1550a56f4de425ef94787a0f4b6f705191d6 SHA256 7b222a5edb1d68c0046e9f1e8bef06a4508fe1bec35f846f97f4af51db67b916
 DIST tsocks-1.8beta5.tar.gz 83928 RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e SHA1 489f88c5df999ba21b27cdaa7836d9426d062aec SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
 EBUILD tsocks-1.8_beta5-r1.ebuild 1403 RMD160 4caa07e0d8e7f2a091d6afb0da5b5be107cd61c8 SHA1 d84f18ed36dc1e7542c04de9de633f7e53a1fcd2 SHA256 3792efce88aca93438a895baff4d1cd591f75d2c74779f566821ba7489d10812
 MD5 e3281563471a803f7b8b14bd57f752e8 tsocks-1.8_beta5-r1.ebuild 1403
 RMD160 4caa07e0d8e7f2a091d6afb0da5b5be107cd61c8 tsocks-1.8_beta5-r1.ebuild 1403
 SHA256 3792efce88aca93438a895baff4d1cd591f75d2c74779f566821ba7489d10812 tsocks-1.8_beta5-r1.ebuild 1403
+EBUILD tsocks-1.8_beta5-r2.ebuild 1873 RMD160 d3b0b50e239827ef934bec4b6310cbc75ef4030d SHA1 dcc8e9e91a05fc9dfd16ecec09a62747d8e0e0c7 SHA256 75a961b99f45b1dd4d542601d6c9737f89cb21713ef9062f8e9e28a6f09325dd
+MD5 e907ba4a37bd06a5a05be640ed9043d0 tsocks-1.8_beta5-r2.ebuild 1873
+RMD160 d3b0b50e239827ef934bec4b6310cbc75ef4030d tsocks-1.8_beta5-r2.ebuild 1873
+SHA256 75a961b99f45b1dd4d542601d6c9737f89cb21713ef9062f8e9e28a6f09325dd tsocks-1.8_beta5-r2.ebuild 1873
 EBUILD tsocks-1.8_beta5.ebuild 1319 RMD160 825543015817c82a1264e33e38e3c6e00fdbe77a SHA1 f73f24d2e76f99eb7fa96141716da70ff00f168e SHA256 426bac9c14a223a4e286dbb8721dddb8d51ac7bd31e2c1acbc636a33bea07426
 MD5 02e0def565a3cfb7d388dacac30279a1 tsocks-1.8_beta5.ebuild 1319
 RMD160 825543015817c82a1264e33e38e3c6e00fdbe77a tsocks-1.8_beta5.ebuild 1319
 SHA256 426bac9c14a223a4e286dbb8721dddb8d51ac7bd31e2c1acbc636a33bea07426 tsocks-1.8_beta5.ebuild 1319
-MISC ChangeLog 2821 RMD160 dba9d518127cfab9dfc05e3946c750531f30a16a SHA1 36d38479cf5d0033ed3474592caba0b1bde20b16 SHA256 b500b1b74e68a4bbc37aae50ec7278fb4e6ba800b1b612b3bf600915b5430926
-MD5 3fe1d3251941f747135381c1398886a9 ChangeLog 2821
-RMD160 dba9d518127cfab9dfc05e3946c750531f30a16a ChangeLog 2821
-SHA256 b500b1b74e68a4bbc37aae50ec7278fb4e6ba800b1b612b3bf600915b5430926 ChangeLog 2821
+MISC ChangeLog 3067 RMD160 9cf4c4c89f2f4859219fc579209b01fbc4916300 SHA1 fcd1c0d0f1c79178bada752f9f247c05676c8428 SHA256 c9d837f8167d7983dd02d52b11669d67a02451510a0fac4488377d818233b2ee
+MD5 108ea5e05e369d226c1bdee8effb5e8a ChangeLog 3067
+RMD160 9cf4c4c89f2f4859219fc579209b01fbc4916300 ChangeLog 3067
+SHA256 c9d837f8167d7983dd02d52b11669d67a02451510a0fac4488377d818233b2ee ChangeLog 3067
 MISC metadata.xml 471 RMD160 dee402e8fb1b0a17d03af1f2589e924ac4c73380 SHA1 75450d9c85ab5ac179ce651eb077ea46ef4e21b6 SHA256 c40bbba952834ddbeeda24dfee44d7b115e05a70ac381daad972df60d9ce96bd
 MD5 dcd6e2fd781d4984dfd0a5c89343847b metadata.xml 471
 RMD160 dee402e8fb1b0a17d03af1f2589e924ac4c73380 metadata.xml 471
@@ -28,10 +37,13 @@ SHA256 21922518e4e035dfdb3d4df376b2cd6fed1e6d42bcd187c297b7e63e7ed8094c files/di
 MD5 a96b628504b49e1497c63410757e8266 files/digest-tsocks-1.8_beta5-r1 244
 RMD160 ab4d2d9705d59fc772a5090f6a4de69666e373c5 files/digest-tsocks-1.8_beta5-r1 244
 SHA256 21922518e4e035dfdb3d4df376b2cd6fed1e6d42bcd187c297b7e63e7ed8094c files/digest-tsocks-1.8_beta5-r1 244
+MD5 e7c6a81da2477e25687f906a73d6355f files/digest-tsocks-1.8_beta5-r2 530
+RMD160 adca992785e28db91097a76fce2358a11db2a11a files/digest-tsocks-1.8_beta5-r2 530
+SHA256 80ab0f54ad63044fbd26663f8a7ad4b6d3cc644de1af2fa103208231d7c968d4 files/digest-tsocks-1.8_beta5-r2 530
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFEYYG3sf9c6kjmR8RAjUGAJ0XbVU8w7D/MfjWn2OG8zPn9TNrNQCdHuij
-UC7W0oTwPH9D2Fu0qsjhhr4=
-=+FO2
+iD8DBQFFE9Yp3sf9c6kjmR8RAu9FAJ0eESRJ0pNHUzFcTWZv4Hgfvq78OQCgimt8
+PtP3WJy0Jq1bPwo8NUZD2h4=
+=8FYR
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/tsocks/files/digest-tsocks-1.8_beta5-r2 b/net-proxy/tsocks/files/digest-tsocks-1.8_beta5-r2
new file mode 100644
index 000000000000..23ace769555a
--- /dev/null
+++ b/net-proxy/tsocks/files/digest-tsocks-1.8_beta5-r2
@@ -0,0 +1,6 @@
+MD5 0fad226bf82cf0074babb153c25a8e0f tsocks-1.8b5-tordns1-gentoo.patch.gz 21543
+RMD160 cb584dfcc0fc0fdf382a641689a9ddf25dc184fc tsocks-1.8b5-tordns1-gentoo.patch.gz 21543
+SHA256 7b222a5edb1d68c0046e9f1e8bef06a4508fe1bec35f846f97f4af51db67b916 tsocks-1.8b5-tordns1-gentoo.patch.gz 21543
+MD5 51caefd77e5d440d0bbd6443db4fc0f8 tsocks-1.8beta5.tar.gz 83928
+RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e tsocks-1.8beta5.tar.gz 83928
+SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 tsocks-1.8beta5.tar.gz 83928
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo.patch
new file mode 100644
index 000000000000..aee2d06fdb75
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo.patch
@@ -0,0 +1,65 @@
+diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8
+--- tsocks-1.8.orig/tsocks.8	2002-03-16 12:20:51.000000000 +0200
++++ tsocks-1.8/tsocks.8	2006-09-22 15:01:13.005417500 +0300
+@@ -127,8 +127,8 @@
+ libtsocks in /etc/ld.so.preload. Please make sure you correctly enter the
+ full path to the library in this file if you do this. If you get it wrong,
+ you will be UNABLE TO DO ANYTHING with the machine and will have to boot
+-it with a rescue disk and remove the file (or try the saveme program, see
+-the INSTALL file for more info).  THIS IS A ***WARNING***, please be
++it with a rescue disk and remove the file (or try the tsocks-saveme program,
++simply unlinks /etc/ld.so.preload ). THIS IS A ***WARNING***, please be
+ careful. Also be sure the library is in the root filesystem as all hell
+ will break loose if the directory it is in is not available at boot time.
+ 
+diff -Nru tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5
+--- tsocks-1.8.orig/tsocks.conf.5	2002-05-18 05:13:08.000000000 +0300
++++ tsocks-1.8/tsocks.conf.5	2006-09-22 15:03:49.063170500 +0300
+@@ -139,21 +139,20 @@
+ the version that server supports. 
+ 
+ .TP
+-validateconf
+-validateconf can be used to verify the configuration file. It checks the format
+-of the file and also the contents for errors. Having read the file it dumps 
+-the configuration to the screen in a formatted, readable manner. This can be 
+-extremely useful in debugging problems.
+-
+-validateconf can read a configuration file from a location other than the 
+-location specified at compile time with the -f <filename> command line 
+-option.
+-
+-Normally validateconf simply dumps the configuration read to the screen (in
+-a nicely readable format), however it also has a useful 'test' mode. When
+-passed a hostname/ip on the command line like -t <hostname/ip>, validateconf 
+-determines which of the SOCKS servers specified in the configuration file 
+-would be used by tsocks to access the specified host. 
++tsocks-validateconf
++tsocks-validateconf can be used to verify the configuration file. It checks
++the format of the file and also the contents for errors. Having read the file 
++it dumps the configuration to the screen in a formatted, readable manner.
++This can be extremely useful in debugging problems.
++
++tsocks-validateconf can read a configuration file from a location other than the 
++location specified at compile time with the -f <filename> command line option.
++
++Normally tsocks-validateconf simply dumps the configuration read to the screen 
++(in a nicely readable format), however it also has a useful 'test' mode. When
++passed a hostname/ip on the command line like -t <hostname/ip>, 
++tsocks-validateconf determines which of the SOCKS servers specified in the 
++configuration file would be used by tsocks to access the specified host. 
+ 
+ .SH SEE ALSO
+ tsocks(8)
+diff -Nru tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c
+--- tsocks-1.8.orig/validateconf.c	2002-02-07 12:49:59.000000000 +0200
++++ tsocks-1.8/validateconf.c	2006-09-22 15:04:10.368502000 +0300
+@@ -23,7 +23,7 @@
+ */
+ 
+ /* Global configuration variables */ 
+-char *progname = "validateconf";	      /* Name for error msgs      */
++char *progname = "tsocks-validateconf";	      /* Name for error msgs      */
+ 
+ /* Header Files */
+ #include <config.h>
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r2.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r2.ebuild
new file mode 100644
index 000000000000..b36252f8e877
--- /dev/null
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r2.ebuild,v 1.1 2006/09/22 12:25:03 mrness Exp $
+
+inherit multilib eutils autotools toolchain-funcs
+
+DESCRIPTION="Transparent SOCKS v4 proxying library"
+HOMEPAGE="http://tsocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
+	tordns? ( mirror://gentoo/${PN}-${PV/_beta/b}-tordns1-gentoo.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="tordns"
+
+S="${WORKDIR}/${P%%_*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-bsd.patch"
+	use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo.patch"
+	eautoconf
+}
+
+src_compile() {
+	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 \
+		--with-conf=/etc/socks/tsocks.conf \
+		--libdir=/$(get_libdir) || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	newbin validateconf tsocks-validateconf
+	newbin saveme tsocks-saveme
+	dobin inspectsocks
+	insinto /etc/socks
+	doins tsocks.conf.*.example
+	dodoc FAQ
+	use tordns && dodoc README*
+	# tsocks script is buggy so we need this symlink
+	dodir /usr/$(get_libdir)
+	dosym /$(get_libdir)/libtsocks.so /usr/$(get_libdir)/libtsocks.so
+}
+
+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"
+}