From 78d097a68eb884c4745e133e8da6677e2ac22ed1 Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Sat, 25 Feb 2017 15:28:50 +0300 Subject: net-proxy/tsocks: remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Andrew Savchenko --- net-proxy/tsocks/Manifest | 1 - .../tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch | 133 --------------------- net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild | 60 ---------- 3 files changed, 194 deletions(-) delete mode 100644 net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch delete mode 100644 net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild (limited to 'net-proxy/tsocks') diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest index 7bddb8d7548d..7c2c9f44f3ed 100644 --- a/net-proxy/tsocks/Manifest +++ b/net-proxy/tsocks/Manifest @@ -1,3 +1,2 @@ -DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 SHA256 d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd SHA512 2b8ea526ea877459ebdbcc29ddf621afdad66fe9ebc304d46bdb8e75b3114bfff1ab68bdf114c53fc45fe4f61bcb98b4ba0e90b3070308d7207de6becd83d0ed WHIRLPOOL d202464cc1cc156a143a03d9182e3038a38cf4356039d767dc8515883a8fd73d8e508dd055055ca0cf46d096134560a989452577f503b6282fcb1a260400d4a4 DIST tsocks-1.8b5-tordns1-gentoo-r3.patch.xz 18468 SHA256 4b25f473ef08ce698bd12a92d65b3e6dffb706ec76289db8d5b75fac0bca16f8 SHA512 86cbc7a8733e9f9e19e0924d2a2b8481a66eb67a8d548b90c7bd02cc6ae42064a295ee6a002cf19a7b3d7d811388db2a34b641d9dbe239f4c0bc8a1f78c90682 WHIRLPOOL 5a4228be84b4797121b8deaf52c1030ea2d6716694f14602a473deca4919753abe5df9608e28056dcaecb8e57bbb0b5a290b7bcdacbda17fdc12df08a0f29fcb DIST tsocks-1.8beta5.tar.gz 83928 SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 SHA512 b41636ea6b77abf0d1e3cda7bbca4e7ee96f3cdb1843f3a2c530650931e5567f67921de67b28ba9bab0f51df39770a3f7fb458cf7ac78aad7aa861923df2c4a9 WHIRLPOOL 9b50f66d63c870a37111450d76ea027fab79ecc4f62be8d6fab380f9fbfa6d1573f8bad5afe284571de3ee557460454826967449518d7665a80f563a2cfe5151 diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch deleted file mode 100644 index 1c9dd18cd59d..000000000000 --- a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in ---- tsocks-1.8.orig/Makefile.in 2002-03-16 11:12:40.000000000 +0100 -+++ tsocks-1.8/Makefile.in 2009-06-20 13:56:56.000000000 +0200 -@@ -28,6 +28,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - CFLAGS = @CFLAGS@ -+LDFLAGS = @LDFLAGS@ - INCLUDES = -I. - LIBS = @LIBS@ - SPECIALLIBS = @SPECIALLIBS@ -@@ -41,16 +42,16 @@ - all: ${TARGETS} - - ${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o -- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} - - ${INSPECT}: ${INSPECT}.c ${COMMON}.o -- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} - - ${SAVE}: ${SAVE}.c -- ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${SAVE} ${SAVE}.c - - ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o -- ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} - ln -sf ${SHLIB} ${LIB_NAME}.so - - %.so: %.c -diff -Nru tsocks-1.8.orig/tsocks tsocks-1.8/tsocks ---- tsocks-1.8.orig/tsocks 2002-03-16 11:27:18.000000000 +0100 -+++ tsocks-1.8/tsocks 2009-06-20 13:56:38.000000000 +0200 -@@ -46,14 +46,14 @@ - on) - if [ -z "$LD_PRELOAD" ] - then -- export LD_PRELOAD="/usr/lib/libtsocks.so" -+ export LD_PRELOAD="/lib/libtsocks.so" - else -- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ -- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" -+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \ -+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD" - fi - ;; - off) -- export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'` -+ export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libtsocks.so \?//'` - if [ -z "$LD_PRELOAD" ] - then - unset LD_PRELOAD -@@ -68,10 +68,10 @@ - *) - if [ -z "$LD_PRELOAD" ] - then -- export LD_PRELOAD="/usr/lib/libtsocks.so" -+ export LD_PRELOAD="/lib/libtsocks.so" - else -- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ -- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" -+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \ -+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD" - fi - - if [ $# = 0 ] -diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8 ---- tsocks-1.8.orig/tsocks.8 2002-03-16 11:20:51.000000000 +0100 -+++ tsocks-1.8/tsocks.8 2009-06-20 13:56:38.000000000 +0200 -@@ -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 04:13:08.000000000 +0200 -+++ tsocks-1.8/tsocks.conf.5 2009-06-20 13:56:38.000000000 +0200 -@@ -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 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 , 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 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 , -+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 11:49:59.000000000 +0100 -+++ tsocks-1.8/validateconf.c 2009-06-20 13:56:38.000000000 +0200 -@@ -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 diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild deleted file mode 100644 index 99f72976b173..000000000000 --- a/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -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-r1.patch.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="tordns" - -S="${WORKDIR}/${P%%_*}" - -src_prepare() { - epatch "${FILESDIR}/${P}-gentoo-r3.patch" - epatch "${FILESDIR}/${P}-bsd.patch" - use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch" - eautoreconf -} - -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) - econf \ - --with-conf=/etc/socks/tsocks.conf \ - --libdir=/$(get_libdir) -} - -src_compile() { - # Fix QA notice lack of SONAME - emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} -} - -src_install() { - emake DESTDIR="${D}" install - newbin validateconf tsocks-validateconf - newbin saveme tsocks-saveme - dobin inspectsocks - insinto /etc/socks - doins tsocks.conf.*.example - dodoc FAQ - use tordns && dodoc README* -} - -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" -} -- cgit v1.2.3-65-gdbad