diff options
Diffstat (limited to 'net/tsocks/patches/patch-ab')
| -rw-r--r-- | net/tsocks/patches/patch-ab | 98 |
1 files changed, 33 insertions, 65 deletions
diff --git a/net/tsocks/patches/patch-ab b/net/tsocks/patches/patch-ab index 01c0912a947..a6622212f2e 100644 --- a/net/tsocks/patches/patch-ab +++ b/net/tsocks/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2005/02/27 22:06:10 jschauma Exp $ +$NetBSD: patch-ab,v 1.3 2005/08/04 10:22:21 drochner Exp $ ---- configure.orig Mon Mar 12 07:47:41 2001 -+++ configure Sun Feb 27 16:08:19 2005 -@@ -536,7 +536,6 @@ +--- configure.orig 2002-07-16 00:51:08.000000000 +0200 ++++ configure +@@ -538,7 +538,6 @@ fi @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2005/02/27 22:06:10 jschauma Exp $ # Check whether --enable-socksdns or --disable-socksdns was given. if test "${enable_socksdns+set}" = set; then -@@ -1272,7 +1271,7 @@ +@@ -1375,7 +1374,7 @@ fi done @@ -18,8 +18,8 @@ $NetBSD: patch-ab,v 1.2 2005/02/27 22:06:10 jschauma Exp $ +for ac_func in strcspn strdup strerror strspn strtol dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 - echo "configure:1279: checking for $ac_func" >&5 -@@ -1323,9 +1322,11 @@ + echo "configure:1382: checking for $ac_func" >&5 +@@ -1426,9 +1425,11 @@ if eval "test \"`echo '$ac_cv_func_'$ac_ EOF else @@ -31,77 +31,45 @@ $NetBSD: patch-ab,v 1.2 2005/02/27 22:06:10 jschauma Exp $ done -@@ -1733,6 +1734,7 @@ +@@ -1836,6 +1837,7 @@ fi SIMPLELIBS=${LIBS} LIBS= +if [ $ac_cv_func_dlopen != "yes" ]; then echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6 - echo "configure:1738: checking for dlsym in -ldl" >&5 + echo "configure:1841: checking for dlsym in -ldl" >&5 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'` -@@ -1780,6 +1782,7 @@ +@@ -1883,6 +1885,7 @@ else echo "$ac_t""no" 1>&6 { echo "configure: error: "libdl is required"" 1>&2; exit 1; } fi +fi - echo $ac_n "checking for RTLD_NEXT from dlfcn.h""... $ac_c" 1>&6 -@@ -1977,7 +1980,11 @@ + echo $ac_n "checking "for RTLD_NEXT from dlfcn.h"""... $ac_c" 1>&6 +@@ -2078,12 +2081,16 @@ EOF - echo $ac_n "checking location of libc""... $ac_c" 1>&6 - echo "configure:1980: checking location of libc" >&5 -+ if test "$OPSYS" != "IRIX"; then - LIBC=`$LDD /bin/ls | $GREP "libc" | $AWK ' { print $3 } '` -+ else -+ LIBC=/usr/lib$ABI/libc.so -+ fi + echo $ac_n "checking "location of libc.so"""... $ac_c" 1>&6 + echo "configure:2081: checking "location of libc.so"" >&5 ++ if test "$OPSYS" != "IRIX"; then + LIBC= + for DIR in '/lib' '/usr/lib'; do + if test "${LIBC}" = ""; then + LIBC=`$FIND $DIR -name "libc.so.?" 2>/dev/null | $TAIL -1` + fi + done ++ else ++ LIBC=/usr/lib$ABI/libc.so ++ fi cat >> confdefs.h <<EOF #define LIBC "${LIBC}" -@@ -1992,6 +1999,8 @@ - imp2='(int __fd, struct sockaddr * __addr, int __len) {' - proto3='(int, const struct sockaddr *, socklen_t);' - imp3='(int __fd, const struct sockaddr * __addr, socklen_t __len) {' -+proto4='(int, const void *, socklen_t);' -+imp4='(int __fd, const void * __addr, socklen_t __len) {' - echo $ac_n "checking for correct connect prototype""... $ac_c" 1>&6 - echo "configure:1997: checking for correct connect prototype" >&5 - if test "$cross_compiling" = yes; then -@@ -2056,6 +2065,26 @@ - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -+ -+ if test "$cross_compiling" = yes; then -+ PROTO="" -+else -+ cat > conftest.$ac_ext <<EOF -+#line 2045 "configure" -+#include "confdefs.h" -+ -+ #include <sys/socket.h> -+ int connect$proto4 -+ int main() {return(0);} -+ -+EOF -+if { (eval echo configure:2053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ PROTO="$proto4"; IMP="$imp4" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - PROTO="" - fi - rm -fr conftest* -@@ -2066,6 +2095,9 @@ - rm -fr conftest* - fi - -+fi -+rm -fr conftest* -+fi - - fi - rm -fr conftest* +@@ -2228,7 +2235,7 @@ EOF + echo $ac_n "checking for correct poll prototype""... $ac_c" 1>&6 + echo "configure:2230: checking for correct poll prototype" >&5 + PROTO= +-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' ++for testproto in 'struct pollfd *ufds, nfds_t nfds, int timeout' + do + if test "${PROTO}" = ""; then + cat > conftest.$ac_ext <<EOF |