| 1 |
mrness 08/02/13 16:17:50 |
| 2 |
|
| 3 |
Added: tsocks-1.8_beta5-gentoo-r1.patch |
| 4 |
Log: |
| 5 |
Link programs using user selected LDFLAGS (#209703). Fix library path in tsocks script. |
| 6 |
(Portage version: 2.1.3.19) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r1.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r1.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r1.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: tsocks-1.8_beta5-gentoo-r1.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in |
| 17 |
--- tsocks-1.8.orig/Makefile.in 2002-03-16 12:12:40.000000000 +0200 |
| 18 |
+++ tsocks-1.8/Makefile.in 2008-02-13 18:06:05.000000000 +0200 |
| 19 |
@@ -28,6 +28,7 @@ |
| 20 |
INSTALL = @INSTALL@ |
| 21 |
INSTALL_DATA = @INSTALL_DATA@ |
| 22 |
CFLAGS = @CFLAGS@ |
| 23 |
+LDFLAGS = @LDFLAGS@ |
| 24 |
INCLUDES = -I. |
| 25 |
LIBS = @LIBS@ |
| 26 |
SPECIALLIBS = @SPECIALLIBS@ |
| 27 |
@@ -41,16 +42,16 @@ |
| 28 |
all: ${TARGETS} |
| 29 |
|
| 30 |
${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o |
| 31 |
- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} |
| 32 |
+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} |
| 33 |
|
| 34 |
${INSPECT}: ${INSPECT}.c ${COMMON}.o |
| 35 |
- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} |
| 36 |
+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} |
| 37 |
|
| 38 |
${SAVE}: ${SAVE}.c |
| 39 |
- ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c |
| 40 |
+ ${SHCC} ${LDFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c |
| 41 |
|
| 42 |
${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o |
| 43 |
- ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} |
| 44 |
+ ${SHCC} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} |
| 45 |
ln -sf ${SHLIB} ${LIB_NAME}.so |
| 46 |
|
| 47 |
%.so: %.c |
| 48 |
diff -Nru tsocks-1.8.orig/tsocks tsocks-1.8/tsocks |
| 49 |
--- tsocks-1.8.orig/tsocks 2002-03-16 12:27:18.000000000 +0200 |
| 50 |
+++ tsocks-1.8/tsocks 2008-02-13 18:05:11.000000000 +0200 |
| 51 |
@@ -46,10 +46,10 @@ |
| 52 |
on) |
| 53 |
if [ -z "$LD_PRELOAD" ] |
| 54 |
then |
| 55 |
- export LD_PRELOAD="/usr/lib/libtsocks.so" |
| 56 |
+ export LD_PRELOAD="/lib/libtsocks.so" |
| 57 |
else |
| 58 |
- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ |
| 59 |
- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" |
| 60 |
+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \ |
| 61 |
+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD" |
| 62 |
fi |
| 63 |
;; |
| 64 |
off) |
| 65 |
@@ -68,10 +68,10 @@ |
| 66 |
*) |
| 67 |
if [ -z "$LD_PRELOAD" ] |
| 68 |
then |
| 69 |
- export LD_PRELOAD="/usr/lib/libtsocks.so" |
| 70 |
+ export LD_PRELOAD="/lib/libtsocks.so" |
| 71 |
else |
| 72 |
- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ |
| 73 |
- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" |
| 74 |
+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \ |
| 75 |
+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD" |
| 76 |
fi |
| 77 |
|
| 78 |
if [ $# = 0 ] |
| 79 |
diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8 |
| 80 |
--- tsocks-1.8.orig/tsocks.8 2002-03-16 12:20:51.000000000 +0200 |
| 81 |
+++ tsocks-1.8/tsocks.8 2008-02-13 18:06:05.000000000 +0200 |
| 82 |
@@ -127,8 +127,8 @@ |
| 83 |
libtsocks in /etc/ld.so.preload. Please make sure you correctly enter the |
| 84 |
full path to the library in this file if you do this. If you get it wrong, |
| 85 |
you will be UNABLE TO DO ANYTHING with the machine and will have to boot |
| 86 |
-it with a rescue disk and remove the file (or try the saveme program, see |
| 87 |
-the INSTALL file for more info). THIS IS A ***WARNING***, please be |
| 88 |
+it with a rescue disk and remove the file (or try the tsocks-saveme program, |
| 89 |
+simply unlinks /etc/ld.so.preload ). THIS IS A ***WARNING***, please be |
| 90 |
careful. Also be sure the library is in the root filesystem as all hell |
| 91 |
will break loose if the directory it is in is not available at boot time. |
| 92 |
|
| 93 |
diff -Nru tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5 |
| 94 |
--- tsocks-1.8.orig/tsocks.conf.5 2002-05-18 05:13:08.000000000 +0300 |
| 95 |
+++ tsocks-1.8/tsocks.conf.5 2008-02-13 18:06:05.000000000 +0200 |
| 96 |
@@ -139,21 +139,20 @@ |
| 97 |
the version that server supports. |
| 98 |
|
| 99 |
.TP |
| 100 |
-validateconf |
| 101 |
-validateconf can be used to verify the configuration file. It checks the format |
| 102 |
-of the file and also the contents for errors. Having read the file it dumps |
| 103 |
-the configuration to the screen in a formatted, readable manner. This can be |
| 104 |
-extremely useful in debugging problems. |
| 105 |
- |
| 106 |
-validateconf can read a configuration file from a location other than the |
| 107 |
-location specified at compile time with the -f <filename> command line |
| 108 |
-option. |
| 109 |
- |
| 110 |
-Normally validateconf simply dumps the configuration read to the screen (in |
| 111 |
-a nicely readable format), however it also has a useful 'test' mode. When |
| 112 |
-passed a hostname/ip on the command line like -t <hostname/ip>, validateconf |
| 113 |
-determines which of the SOCKS servers specified in the configuration file |
| 114 |
-would be used by tsocks to access the specified host. |
| 115 |
+tsocks-validateconf |
| 116 |
+tsocks-validateconf can be used to verify the configuration file. It checks |
| 117 |
+the format of the file and also the contents for errors. Having read the file |
| 118 |
+it dumps the configuration to the screen in a formatted, readable manner. |
| 119 |
+This can be extremely useful in debugging problems. |
| 120 |
+ |
| 121 |
+tsocks-validateconf can read a configuration file from a location other than the |
| 122 |
+location specified at compile time with the -f <filename> command line option. |
| 123 |
+ |
| 124 |
+Normally tsocks-validateconf simply dumps the configuration read to the screen |
| 125 |
+(in a nicely readable format), however it also has a useful 'test' mode. When |
| 126 |
+passed a hostname/ip on the command line like -t <hostname/ip>, |
| 127 |
+tsocks-validateconf determines which of the SOCKS servers specified in the |
| 128 |
+configuration file would be used by tsocks to access the specified host. |
| 129 |
|
| 130 |
.SH SEE ALSO |
| 131 |
tsocks(8) |
| 132 |
diff -Nru tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c |
| 133 |
--- tsocks-1.8.orig/validateconf.c 2002-02-07 12:49:59.000000000 +0200 |
| 134 |
+++ tsocks-1.8/validateconf.c 2008-02-13 18:06:05.000000000 +0200 |
| 135 |
@@ -23,7 +23,7 @@ |
| 136 |
*/ |
| 137 |
|
| 138 |
/* Global configuration variables */ |
| 139 |
-char *progname = "validateconf"; /* Name for error msgs */ |
| 140 |
+char *progname = "tsocks-validateconf"; /* Name for error msgs */ |
| 141 |
|
| 142 |
/* Header Files */ |
| 143 |
#include <config.h> |
| 144 |
|
| 145 |
|
| 146 |
|
| 147 |
-- |
| 148 |
gentoo-commits@l.g.o mailing list |
Archives