Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/android:master commit in: net-proxy/tsocks/files/, net-proxy/tsocks/
Date: Thu, 09 Feb 2017 04:52:29
Message-Id: 1484988240.05f135815944247427fee72a3cbe36fce6388d87.heroxbd@gentoo
1 commit: 05f135815944247427fee72a3cbe36fce6388d87
2 Author: Benda Xu <heroxbd <AT> gmail <DOT> com>
3 AuthorDate: Sat Jan 21 08:44:00 2017 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 21 08:44:00 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=05f13581
7
8 net-proxy/tsocks: merged.
9
10 net-proxy/tsocks/ChangeLog | 185 ---------------------
11 net-proxy/tsocks/Manifest | 7 -
12 net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch | 22 ---
13 .../tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch | 133 ---------------
14 net-proxy/tsocks/metadata.xml | 13 --
15 net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild | 60 -------
16 6 files changed, 420 deletions(-)
17
18 diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog
19 deleted file mode 100644
20 index 0835909..0000000
21 --- a/net-proxy/tsocks/ChangeLog
22 +++ /dev/null
23 @@ -1,185 +0,0 @@
24 -# ChangeLog for net-proxy/tsocks
25 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.36 2010/06/06 14:40:38 armin76 Exp $
27 -
28 - 06 Jun 2010; Raúl Porcel <armin76@g.o> tsocks-1.8_beta5-r5.ebuild:
29 - arm stable wrt #300830
30 -
31 - 17 Apr 2010; Raúl Porcel <armin76@g.o> tsocks-1.8_beta5-r3.ebuild,
32 - tsocks-1.8_beta5-r4.ebuild, tsocks-1.8_beta5-r5.ebuild:
33 - Add ~arm wrt #300830
34 -
35 - 19 Jul 2009; nixnut <nixnut@g.o> tsocks-1.8_beta5-r5.ebuild:
36 - ppc stable #274790
37 -
38 - 06 Jul 2009; Raúl Porcel <armin76@g.o> tsocks-1.8_beta5-r5.ebuild:
39 - sparc stable wrt #274790
40 -
41 - 04 Jul 2009; Brent Baude <ranger@g.o> tsocks-1.8_beta5-r5.ebuild:
42 - stable ppc64, bug 274790
43 -
44 - 28 Jun 2009; Tobias Klausmann <klausman@g.o>
45 - tsocks-1.8_beta5-r5.ebuild:
46 - Stable on alpha, bug #274790
47 -
48 - 28 Jun 2009; Markus Meier <maekke@g.o> tsocks-1.8_beta5-r5.ebuild:
49 - amd64/x86 stable, bug #274790
50 -
51 -*tsocks-1.8_beta5-r5 (20 Jun 2009)
52 -
53 - 20 Jun 2009; Alin Năstac <mrness@g.o>
54 - +files/tsocks-1.8_beta5-gentoo-r3.patch, +tsocks-1.8_beta5-r5.ebuild:
55 - Link tsocks-saveme dinamically (#273339). Migrate to EAPI 2.
56 -
57 -*tsocks-1.8_beta5-r4 (18 Feb 2009)
58 -
59 - 18 Feb 2009; Alin Năstac <mrness@g.o>
60 - -files/tsocks-1.8_beta5-gentoo.patch,
61 - +files/tsocks-1.8_beta5-gentoo-r2.patch, -tsocks-1.8_beta5-r2.ebuild,
62 - +tsocks-1.8_beta5-r4.ebuild:
63 - Fix LD_PRELOAD setup, thanks to Yuval Hager <yuval at avramzon dot net>
64 - (#255960).
65 -
66 - 22 Aug 2008; Markus Meier <maekke@g.o> metadata.xml,
67 - tsocks-1.8_beta5-r3.ebuild:
68 - amd64 stable, bug #231690; add GLEP 56 USE flag desc from use.local.desc
69 -
70 - 21 Jul 2008; nixnut <nixnut@g.o> tsocks-1.8_beta5-r3.ebuild:
71 - Stable on ppc wrt bug 231690
72 -
73 - 17 Jul 2008; Markus Rothe <corsair@g.o> tsocks-1.8_beta5-r3.ebuild:
74 - Stable on ppc64; bug #231690
75 -
76 - 17 Jul 2008; Raúl Porcel <armin76@g.o> tsocks-1.8_beta5-r3.ebuild:
77 - alpha/x86 stable wrt #231690
78 -
79 - 16 Jul 2008; Friedrich Oslage <bluebird@g.o>
80 - tsocks-1.8_beta5-r3.ebuild:
81 - Stable on sparc, bug #231690
82 -
83 -*tsocks-1.8_beta5-r3 (13 Feb 2008)
84 -
85 - 13 Feb 2008; Alin Năstac <mrness@g.o>
86 - +files/tsocks-1.8_beta5-gentoo-r1.patch, +tsocks-1.8_beta5-r3.ebuild:
87 - Link programs using user selected LDFLAGS (#209703). Fix library path in
88 - tsocks script.
89 -
90 - 17 Jun 2007; Alin Năstac <mrness@g.o> -tsocks-1.8_beta5.ebuild,
91 - -tsocks-1.8_beta5-r1.ebuild:
92 - Remove old revisions.
93 -
94 - 22 Apr 2007; Bryan Østergaard <kloeri@g.o>
95 - tsocks-1.8_beta5-r2.ebuild:
96 - Stable on Alpha, bug 174160.
97 -
98 - 11 Apr 2007; Alin Năstac <mrness@g.o> tsocks-1.8_beta5-r2.ebuild:
99 - Stable on amd64.
100 -
101 - 01 Apr 2007; Michael Hanselmann <hansmi@g.o>
102 - tsocks-1.8_beta5-r2.ebuild:
103 - Stable on ppc.
104 -
105 - 03 Dec 2006; Markus Rothe <corsair@g.o> tsocks-1.8_beta5-r2.ebuild:
106 - Stable on ppc64
107 -
108 - 07 Nov 2006; Gustavo Zacarias <gustavoz@g.o>
109 - tsocks-1.8_beta5-r2.ebuild:
110 - Stable on sparc
111 -
112 - 01 Nov 2006; Alin Nastac <mrness@g.o> tsocks-1.8_beta5-r2.ebuild:
113 - Add SONAME to libtsocks. Stable on x86.
114 -
115 - 20 Oct 2006; Gustavo Zacarias <gustavoz@g.o>
116 - tsocks-1.8_beta5-r1.ebuild:
117 - Stable on sparc
118 -
119 - 29 Sep 2006; Markus Rothe <corsair@g.o> tsocks-1.8_beta5-r1.ebuild:
120 - Stable on ppc64
121 -
122 - 24 Sep 2006; Michael Hanselmann <hansmi@g.o>
123 - tsocks-1.8_beta5-r1.ebuild:
124 - Stable on ppc.
125 -
126 -*tsocks-1.8_beta5-r2 (22 Sep 2006)
127 -
128 - 22 Sep 2006; Alin Nastac <mrness@g.o>
129 - +files/tsocks-1.8_beta5-gentoo.patch, +tsocks-1.8_beta5-r2.ebuild:
130 - Rename saveme and validateconf executables. Add tordns patch & local USE
131 - flag (#148550).
132 -
133 - 20 Sep 2006; Alin Nastac <mrness@g.o> tsocks-1.8_beta5-r1.ebuild:
134 - Stable on x86.
135 -
136 -*tsocks-1.8_beta5-r1 (16 Jul 2006)
137 -
138 - 16 Jul 2006; Diego Pettenò <flameeyes@g.o>
139 - +files/tsocks-1.8_beta5-bsd.patch, +tsocks-1.8_beta5-r1.ebuild:
140 - Add tsocks with a little cleanup and patch for BSD compatibility (bug #140612).
141 -
142 - 04 Oct 2005; Alin Nastac <mrness@g.o> -tsocks-1.8_beta4.ebuild,
143 - tsocks-1.8_beta5.ebuild:
144 - Remove obsolete version. Remove INSTALL from docs.
145 -
146 - 13 Aug 2005; Michael Hanselmann <hansmi@g.o>
147 - tsocks-1.8_beta5.ebuild:
148 - Stable on ppc.
149 -
150 - 02 Aug 2005; Gustavo Zacarias <gustavoz@g.o>
151 - tsocks-1.8_beta5.ebuild:
152 - Stable on sparc
153 -
154 - 30 Jul 2005; Alin Nastac <mrness@g.o> tsocks-1.8_beta5.ebuild:
155 - Stable on x86.
156 -
157 - 20 Jul 2005; Herbie Hopkins <herbs@g.o> tsocks-1.8_beta5.ebuild:
158 - Stable on amd64.
159 -
160 - 18 May 2005; Markus Rothe <corsair@g.o> tsocks-1.8_beta5.ebuild:
161 - Stable on ppc64
162 -
163 - 22 Apr 2005; Alin Nastac <mrness@g.o> +metadata.xml:
164 - Move net-misc/tsocks to net-proxy/tsocks. Add metadata.
165 -
166 - 29 Mar 2005; Markus Rothe <corsair@g.o> tsocks-1.8_beta5.ebuild:
167 - Added ~ppc64 to KEYWORDS; bug #86993
168 -
169 - 22 Feb 2005; Jeremy Huddleston <eradicator@g.o>
170 - tsocks-1.8_beta5.ebuild:
171 - Multilib cleanup.
172 -
173 - 29 Dec 2004; Ciaran McCreesh <ciaranm@g.o> :
174 - Change encoding to UTF-8 for GLEP 31 compliance
175 -
176 - 08 Jun 2004; Bryan Østergaard <kloeri@g.o> tsocks-1.8_beta5.ebuild:
177 - Stable on alpha.
178 -
179 -*tsocks-1.8_beta5 (22 Feb 2004)
180 -
181 - 22 Feb 2004; Mike Frysinger <vapier@g.o> :
182 - Version bump #42394 by Scott Jones.
183 -
184 - 07 Dec 2003; David Holm <dholm@g.o> tsocks-1.8_beta4.ebuild:
185 - Added to ~ppc.
186 -
187 - 21 Aug 2003; Will Woods <wwoods@g.o> tsocks-1.8_beta4.ebuild:
188 - Added ~alpha to KEYWORDS
189 -
190 - 12 Jun 2003; <msterret@g.o> tsocks-1.8_beta4.ebuild:
191 - add Header
192 -
193 - 06 Dec 2002; Rodney Rees <manson@g.o> : changed sparc ~sparc keywords
194 -
195 -*tsocks-1.8_beta4 (10 Jun 2002)
196 -
197 - 11 Jul 2002; lamer <lamer@g.o> tsocks-1.8beta4.ebuild :
198 - Added "dobin validateconf saveme inspectsocks" to src_install
199 -
200 - 09 Jul 2002; phoen][x <phoenix@g.o> tsocks-1.8beta4.ebuild :
201 - Added KEYWORDS, SLOT.
202 -
203 - 10 Jun 2002; Ben Lutgens <lamer@g.o> tsocks-1.8_beta4: Ebuild for
204 - tsocks submitted to bugs.gentoo.org by a gentoo user *THANKS*
205 - bardur-gta@××××××××××××××××××.dk. It should be noted that as per the
206 - install docs, this stuff gets installed to /lib. Mainly due to the fact
207 - that it's often needed before /usr gets mounted. So the old
208 - /etc/ld.so.preload trick won't work!
209
210 diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
211 deleted file mode 100644
212 index 5b42cd4..0000000
213 --- a/net-proxy/tsocks/Manifest
214 +++ /dev/null
215 @@ -1,7 +0,0 @@
216 -AUX tsocks-1.8_beta5-bsd.patch 932 RMD160 d17f6927c4e18b25505139a9893c59afc39775aa SHA1 98b77ce698a8a9ad072f1c7275a3aeb8e2177f86 SHA256 c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d
217 -AUX tsocks-1.8_beta5-gentoo-r3.patch 5866 RMD160 2dffa4d10f82a2fd9adacebf987064d24f23aa42 SHA1 35ac9f759102cc7089b7b83757e2942e4d2d3c4a SHA256 5bc4ec52f9d473e50948a5136fd657a26906603e97f779786b76244f026d73ca
218 -DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 RMD160 5c77013987262331c9285e9d53738f9f7a3ecf45 SHA1 df0474aedd7ae9639053ec11968b10a68b4f82ed SHA256 d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd
219 -DIST tsocks-1.8beta5.tar.gz 83928 RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e SHA1 489f88c5df999ba21b27cdaa7836d9426d062aec SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
220 -EBUILD tsocks-1.8_beta5-r5.ebuild 1832 RMD160 d00457395adf5b52806487ab3846ee1ada51c8fd SHA1 09faed4d5544bbcf5c03ca8b8a4ac76a2cfd847c SHA256 10af15f4b10069842baf08c7c5cb56e225d8652e60d4e6aaa46e1d0439f17b98
221 -MISC ChangeLog 6304 RMD160 f7fd57a56b7e13a551b38b2741a8343677a4b7f9 SHA1 c3a160953e630155a57910c34f9aa263f5049b72 SHA256 abbecfa1bec9353cbe24bce0d91bdca34f07cbf417959326b2f68c755dd9674f
222 -MISC metadata.xml 593 RMD160 31a381655437e3f21b9d4bd0982356eac43b79bf SHA1 8bd4c29f69a1ca1456fbb99523e46356eca2454c SHA256 08fa435f16b6ec09e7cfb979843b309354230db8986894227436699eb588a2d0
223
224 diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch
225 deleted file mode 100644
226 index e003475..0000000
227 --- a/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch
228 +++ /dev/null
229 @@ -1,22 +0,0 @@
230 -Index: tsocks-1.8/configure.in
231 -===================================================================
232 ---- tsocks-1.8.orig/configure.in
233 -+++ tsocks-1.8/configure.in
234 -@@ -122,7 +122,7 @@ LIBS=
235 -
236 - dnl Checks for libraries.
237 - dnl Replace `main' with a function in -ldl:
238 --AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))
239 -+AC_CHECK_FUNC([dlsym], [], [AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))])
240 -
241 - dnl If we're using gcc here define _GNU_SOURCE
242 - AC_MSG_CHECKING("for RTLD_NEXT from dlfcn.h")
243 -@@ -312,7 +312,7 @@ AC_DEFINE_UNQUOTED(CLOSE_SIGNATURE, [${P
244 - dnl Find the correct poll prototype on this machine
245 - AC_MSG_CHECKING(for correct poll prototype)
246 - PROTO=
247 --for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout'
248 -+for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 'struct pollfd ufds[[]], nfds_t nfds, int timeout'
249 - do
250 - if test "${PROTO}" = ""; then
251 - AC_TRY_COMPILE([
252
253 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
254 deleted file mode 100644
255 index 1c9dd18..0000000
256 --- a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
257 +++ /dev/null
258 @@ -1,133 +0,0 @@
259 -diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in
260 ---- tsocks-1.8.orig/Makefile.in 2002-03-16 11:12:40.000000000 +0100
261 -+++ tsocks-1.8/Makefile.in 2009-06-20 13:56:56.000000000 +0200
262 -@@ -28,6 +28,7 @@
263 - INSTALL = @INSTALL@
264 - INSTALL_DATA = @INSTALL_DATA@
265 - CFLAGS = @CFLAGS@
266 -+LDFLAGS = @LDFLAGS@
267 - INCLUDES = -I.
268 - LIBS = @LIBS@
269 - SPECIALLIBS = @SPECIALLIBS@
270 -@@ -41,16 +42,16 @@
271 - all: ${TARGETS}
272 -
273 - ${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o
274 -- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
275 -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
276 -
277 - ${INSPECT}: ${INSPECT}.c ${COMMON}.o
278 -- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS}
279 -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS}
280 -
281 - ${SAVE}: ${SAVE}.c
282 -- ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
283 -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${SAVE} ${SAVE}.c
284 -
285 - ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o
286 -- ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
287 -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
288 - ln -sf ${SHLIB} ${LIB_NAME}.so
289 -
290 - %.so: %.c
291 -diff -Nru tsocks-1.8.orig/tsocks tsocks-1.8/tsocks
292 ---- tsocks-1.8.orig/tsocks 2002-03-16 11:27:18.000000000 +0100
293 -+++ tsocks-1.8/tsocks 2009-06-20 13:56:38.000000000 +0200
294 -@@ -46,14 +46,14 @@
295 - on)
296 - if [ -z "$LD_PRELOAD" ]
297 - then
298 -- export LD_PRELOAD="/usr/lib/libtsocks.so"
299 -+ export LD_PRELOAD="/lib/libtsocks.so"
300 - else
301 -- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
302 -- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
303 -+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \
304 -+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
305 - fi
306 - ;;
307 - off)
308 -- export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'`
309 -+ export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libtsocks.so \?//'`
310 - if [ -z "$LD_PRELOAD" ]
311 - then
312 - unset LD_PRELOAD
313 -@@ -68,10 +68,10 @@
314 - *)
315 - if [ -z "$LD_PRELOAD" ]
316 - then
317 -- export LD_PRELOAD="/usr/lib/libtsocks.so"
318 -+ export LD_PRELOAD="/lib/libtsocks.so"
319 - else
320 -- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
321 -- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
322 -+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \
323 -+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
324 - fi
325 -
326 - if [ $# = 0 ]
327 -diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8
328 ---- tsocks-1.8.orig/tsocks.8 2002-03-16 11:20:51.000000000 +0100
329 -+++ tsocks-1.8/tsocks.8 2009-06-20 13:56:38.000000000 +0200
330 -@@ -127,8 +127,8 @@
331 - libtsocks in /etc/ld.so.preload. Please make sure you correctly enter the
332 - full path to the library in this file if you do this. If you get it wrong,
333 - you will be UNABLE TO DO ANYTHING with the machine and will have to boot
334 --it with a rescue disk and remove the file (or try the saveme program, see
335 --the INSTALL file for more info). THIS IS A ***WARNING***, please be
336 -+it with a rescue disk and remove the file (or try the tsocks-saveme program,
337 -+simply unlinks /etc/ld.so.preload ). THIS IS A ***WARNING***, please be
338 - careful. Also be sure the library is in the root filesystem as all hell
339 - will break loose if the directory it is in is not available at boot time.
340 -
341 -diff -Nru tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5
342 ---- tsocks-1.8.orig/tsocks.conf.5 2002-05-18 04:13:08.000000000 +0200
343 -+++ tsocks-1.8/tsocks.conf.5 2009-06-20 13:56:38.000000000 +0200
344 -@@ -139,21 +139,20 @@
345 - the version that server supports.
346 -
347 - .TP
348 --validateconf
349 --validateconf can be used to verify the configuration file. It checks the format
350 --of the file and also the contents for errors. Having read the file it dumps
351 --the configuration to the screen in a formatted, readable manner. This can be
352 --extremely useful in debugging problems.
353 --
354 --validateconf can read a configuration file from a location other than the
355 --location specified at compile time with the -f <filename> command line
356 --option.
357 --
358 --Normally validateconf simply dumps the configuration read to the screen (in
359 --a nicely readable format), however it also has a useful 'test' mode. When
360 --passed a hostname/ip on the command line like -t <hostname/ip>, validateconf
361 --determines which of the SOCKS servers specified in the configuration file
362 --would be used by tsocks to access the specified host.
363 -+tsocks-validateconf
364 -+tsocks-validateconf can be used to verify the configuration file. It checks
365 -+the format of the file and also the contents for errors. Having read the file
366 -+it dumps the configuration to the screen in a formatted, readable manner.
367 -+This can be extremely useful in debugging problems.
368 -+
369 -+tsocks-validateconf can read a configuration file from a location other than the
370 -+location specified at compile time with the -f <filename> command line option.
371 -+
372 -+Normally tsocks-validateconf simply dumps the configuration read to the screen
373 -+(in a nicely readable format), however it also has a useful 'test' mode. When
374 -+passed a hostname/ip on the command line like -t <hostname/ip>,
375 -+tsocks-validateconf determines which of the SOCKS servers specified in the
376 -+configuration file would be used by tsocks to access the specified host.
377 -
378 - .SH SEE ALSO
379 - tsocks(8)
380 -diff -Nru tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c
381 ---- tsocks-1.8.orig/validateconf.c 2002-02-07 11:49:59.000000000 +0100
382 -+++ tsocks-1.8/validateconf.c 2009-06-20 13:56:38.000000000 +0200
383 -@@ -23,7 +23,7 @@
384 - */
385 -
386 - /* Global configuration variables */
387 --char *progname = "validateconf"; /* Name for error msgs */
388 -+char *progname = "tsocks-validateconf"; /* Name for error msgs */
389 -
390 - /* Header Files */
391 - #include <config.h>
392
393 diff --git a/net-proxy/tsocks/metadata.xml b/net-proxy/tsocks/metadata.xml
394 deleted file mode 100644
395 index f70a637..0000000
396 --- a/net-proxy/tsocks/metadata.xml
397 +++ /dev/null
398 @@ -1,13 +0,0 @@
399 -<?xml version="1.0" encoding="UTF-8"?>
400 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
401 -<pkgmetadata>
402 -<herd>net-proxy</herd>
403 -<longdescription>tsocks' role is to allow non SOCKS aware applications (e.g telnet, ssh, ftp etc) to use SOCKS
404 -without any modification. It does this by intercepting the calls that applications make to establish network connections
405 -and negotating them through a SOCKS server as necessary.</longdescription>
406 -<use>
407 - <flag name='tordns'>
408 - Apply tordns patch which allows transparent TORification of the DNS queries
409 - </flag>
410 -</use>
411 -</pkgmetadata>
412
413 diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild
414 deleted file mode 100644
415 index c8f5a2c..0000000
416 --- a/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild
417 +++ /dev/null
418 @@ -1,60 +0,0 @@
419 -# Copyright 1999-2010 Gentoo Foundation
420 -# Distributed under the terms of the GNU General Public License v2
421 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild,v 1.8 2010/06/06 14:40:38 armin76 Exp $
422 -
423 -EAPI="2"
424 -
425 -inherit multilib eutils autotools toolchain-funcs
426 -
427 -DESCRIPTION="Transparent SOCKS v4 proxying library"
428 -HOMEPAGE="http://tsocks.sourceforge.net/"
429 -SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
430 - tordns? ( mirror://gentoo/${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch.gz )"
431 -
432 -LICENSE="GPL-2"
433 -SLOT="0"
434 -KEYWORDS="~x86-linux"
435 -IUSE="tordns"
436 -
437 -S="${WORKDIR}/${P%%_*}"
438 -
439 -src_prepare() {
440 - epatch "${FILESDIR}/${P}-gentoo-r3.patch"
441 - epatch "${FILESDIR}/${P}-bsd.patch"
442 - use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch"
443 - eautoreconf
444 -}
445 -
446 -src_configure() {
447 - tc-export CC
448 -
449 - # NOTE: the docs say to install it into /lib. If you put it into
450 - # /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
451 - # mounted in time :-( (Ben Lutgens) <lamer@g.o>
452 - econf \
453 - --with-conf=${EROOT}/etc/socks/tsocks.conf \
454 - --libdir=${EROOT}/$(get_libdir) || die "configure failed"
455 -}
456 -
457 -src_compile() {
458 - # Fix QA notice lack of SONAME
459 - emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} || die "emake failed"
460 -}
461 -
462 -src_install() {
463 - emake DESTDIR="${D}" install || die "make install failed"
464 - newbin validateconf tsocks-validateconf
465 - newbin saveme tsocks-saveme
466 - dobin inspectsocks
467 - insinto ${ER}/etc/socks
468 - doins tsocks.conf.*.example
469 - dodoc FAQ
470 - use tordns && dodoc README*
471 -}
472 -
473 -pkg_postinst() {
474 - einfo "Make sure you create ${ER}/etc/socks/tsocks.conf from one of the examples in that directory"
475 - einfo "The following executables have been renamed:"
476 - einfo " ${ER}/usr/bin/saveme renamed to tsocks-saveme"
477 - einfo " ${ER}/usr/bin/validateconf renamed to tsocks-validateconf"
478 -}