From 1b9c9cf5b717295753f7f7adb1f9d3d1cbaf5308 Mon Sep 17 00:00:00 2001
From: Dan Hale <danhale@us.ibm.com>
Date: Fri, 25 Aug 2000 06:58:06 -0400
Subject: [PATCH] AIX 4.3.3 has SOCKS in libc with a differently named init
 routine, the problem reported in

Subject: [ID 20000825.007] Building stable 5.6.0 on AIX 4.3.3 using SOCKS
Message-Id: <85256946.005238A3.00@d54mta02.raleigh.ibm.com>

p4raw-id: //depot/perl@6816
---
 Configure            |  8 +++++++-
 INSTALL              | 12 ++++++++----
 config_h.SH          | 18 ++++++++++++------
 configure.com        |  1 +
 epoc/config.sh       |  1 +
 perl.c               |  4 ++++
 uconfig.h            | 18 ++++++++++++------
 uconfig.sh           |  1 +
 vos/config.def       |  1 +
 vos/config_h.SH_orig | 18 ++++++++++++------
 win32/config.bc      |  1 +
 win32/config.gc      |  1 +
 win32/config.vc      |  1 +
 13 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/Configure b/Configure
index 24c3a56..afdbfbb 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Tue Aug 22 21:15:59 EET DST 2000 [metaconfig 3.0 PL70]
+# Generated on Fri Aug 25 21:05:22 EET DST 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -524,6 +524,7 @@ d_sockpair=''
 sockethdr=''
 socketlib=''
 d_socklen_t=''
+d_socks5_init=''
 d_sqrtl=''
 d_statblks=''
 d_statfs_f_flags=''
@@ -11441,6 +11442,10 @@ set d_sigsetjmp
 eval $setvar
 $rm -f try.c try
 
+: see if socks5_init exists
+set socks5_init d_socks5_init
+eval $inlibc
+
 : see if sys/stat.h is available
 set sys/stat.h i_sysstat
 eval $inhdr
@@ -15644,6 +15649,7 @@ d_sigsetjmp='$d_sigsetjmp'
 d_socket='$d_socket'
 d_socklen_t='$d_socklen_t'
 d_sockpair='$d_sockpair'
+d_socks5_init='$d_socks5_init'
 d_sqrtl='$d_sqrtl'
 d_statblks='$d_statblks'
 d_statfs_f_flags='$d_statfs_f_flags'
diff --git a/INSTALL b/INSTALL
index 00101aa..1b258d0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -763,7 +763,7 @@ extension modules or external libraries may not work.  This
 configuration exists to allow these issues to be worked on.
 
 This option requires the 'sfio' package to have been built and installed.
-A (fairly old) version of sfio is in CPAN.
+The latest sfio is available from http://www.research.att.com/sw/tools/sfio/
 
 You select this option by
 
@@ -780,9 +780,6 @@ Configure should detect this problem and warn you about problems with
 _exit vs. exit.  If you have this problem, the fix is to go back to
 your sfio sources and correct iffe's guess about atexit.
 
-There also might be a more recent release of Sfio that fixes your
-problem.
-
 =item 2.
 
 Normal stdio IO, but with all IO going through calls to the PerlIO
@@ -801,6 +798,13 @@ detect sfio, then this will be the default suggested by Configure.
 
 =back
 
+=head2 SOCKS
+
+Perl can be configured to be 'socksified', that is, to use the SOCKS
+TCP/IP proxy protocol library.  SOCKS is used to give applications
+access to transport layer network proxies.  Perl supports only SOCKS
+Version 5.  You can find more about SOCKS from http://www.socks.nec.com/
+
 =head2 Dynamic Loading
 
 By default, Configure will compile perl to use dynamic loading if
diff --git a/config_h.SH b/config_h.SH
index c186dfd..a9bb0ea 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -2003,6 +2003,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$d_msg_proxy	HAS_MSG_PROXY	/**/
 #$d_scm_rights	HAS_SCM_RIGHTS	/**/
 
+/* HAS_SOCKS5_INIT:
+ *	This symbol, if defined, indicates that the socks5_init routine is
+ *	available to initialize SOCKS 5.
+ */
+#$d_socks5_init HAS_SOCKS5_INIT		/**/
+
 /* HAS_SQRTL:
  *	This symbol, if defined, indicates that the sqrtl routine is
  *	available to do long double square roots.
@@ -2338,6 +2344,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$i_inttypes   I_INTTYPES                /**/
 
+/* I_LIBUTIL:
+ *	This symbol, if defined, indicates that <libutil.h> exists and
+ *	should be included.
+ */
+#$i_libutil	I_LIBUTIL		/**/
+
 /* I_MACH_CTHREADS:
  *     This symbol, if defined, indicates to the C program that it should
  *     include <mach/cthreads.h>.
@@ -3171,11 +3183,5 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define PERL_XS_APIVERSION "$xs_apiversion"
 #define PERL_PM_APIVERSION "$pm_apiversion"
 
-/* I_LIBUTIL:
- *	This symbol, if defined, indicates that <libutil.h> exists and
- *	should be included.
- */
-#$i_libutil	I_LIBUTIL		/**/
-
 #endif
 !GROK!THIS!
diff --git a/configure.com b/configure.com
index 3f43528..d9ea9c2 100644
--- a/configure.com
+++ b/configure.com
@@ -4841,6 +4841,7 @@ $ WC "d_sigsetjmp='" + d_sigsetjmp + "'"
 $ WC "d_socket='" + d_socket + "'"
 $ WC "d_socklen_t='" + d_socklen_t + "'"
 $ WC "d_sockpair='undef'"
+$ WC "d_socks5_init='undef'"
 $ WC "d_sqrtl='define'"
 $ WC "d_statblks='undef'"
 $ WC "d_statfs_f_flags='undef'"
diff --git a/epoc/config.sh b/epoc/config.sh
index 51e95ee..897a18f 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -318,6 +318,7 @@ d_sigaction='undef'
 d_sigsetjmp='undef'
 d_socket='define'
 d_sockpair='undef'
+d_socks5_init='undef'
 d_statblks='define'
 d_statfs='undef'
 d_statfsflags='define'
diff --git a/perl.c b/perl.c
index 89e6429..a2cfd78 100644
--- a/perl.c
+++ b/perl.c
@@ -1261,7 +1261,11 @@ print \"  \\@INC:\\n    @INC\\n\";");
 #endif
 
 #ifdef USE_SOCKS
+#   ifdef HAS_SOCKS5_INIT
+    socks5_init(argv[0]);
+#   else
     SOCKSinit(argv[0]);
+#   endif
 #endif    
 
     init_predump_symbols();
diff --git a/uconfig.h b/uconfig.h
index 1377c3b..6509a26 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -1979,6 +1979,12 @@
 /*#define	HAS_MSG_PROXY	/ **/
 /*#define	HAS_SCM_RIGHTS	/ **/
 
+/* HAS_SOCKS5_INIT:
+ *	This symbol, if defined, indicates that the socks5_init routine is
+ *	available to initialize SOCKS 5.
+ */
+/*#define HAS_SOCKS5_INIT		/ **/
+
 /* HAS_SQRTL:
  *	This symbol, if defined, indicates that the sqrtl routine is
  *	available to do long double square roots.
@@ -2314,6 +2320,12 @@
  */
 /*#define   I_INTTYPES                / **/
 
+/* I_LIBUTIL:
+ *	This symbol, if defined, indicates that <libutil.h> exists and
+ *	should be included.
+ */
+/*#define	I_LIBUTIL		/ **/
+
 /* I_MACH_CTHREADS:
  *     This symbol, if defined, indicates to the C program that it should
  *     include <mach/cthreads.h>.
@@ -3147,10 +3159,4 @@
 #define PERL_XS_APIVERSION "5.005"
 #define PERL_PM_APIVERSION "5.005"
 
-/* I_LIBUTIL:
- *	This symbol, if defined, indicates that <libutil.h> exists and
- *	should be included.
- */
-/*#define	I_LIBUTIL		/ **/
-
 #endif
diff --git a/uconfig.sh b/uconfig.sh
index a363f50..35bb5a3 100755
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -246,6 +246,7 @@ d_sigaction='undef'
 d_sigsetjmp='undef'
 d_socket='undef'
 d_sockpair='undef'
+d_socks5_init='undef'
 d_sqrtl='undef'
 d_statblks='undef'
 d_statfs_f_flags='undef'
diff --git a/vos/config.def b/vos/config.def
index e0fbeb4..9f439a5 100644
--- a/vos/config.def
+++ b/vos/config.def
@@ -227,6 +227,7 @@ $d_sigsetjmp='undef'
 $d_sitearch='undef'
 $d_socket='define'
 $d_sockpair='undef'
+$d_socks5_init='undef'
 $d_sqrtl='undef'
 $d_statblks='undef'
 $d_statfs_f_flags='undef'
diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig
index c186dfd..a9bb0ea 100755
--- a/vos/config_h.SH_orig
+++ b/vos/config_h.SH_orig
@@ -2003,6 +2003,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #$d_msg_proxy	HAS_MSG_PROXY	/**/
 #$d_scm_rights	HAS_SCM_RIGHTS	/**/
 
+/* HAS_SOCKS5_INIT:
+ *	This symbol, if defined, indicates that the socks5_init routine is
+ *	available to initialize SOCKS 5.
+ */
+#$d_socks5_init HAS_SOCKS5_INIT		/**/
+
 /* HAS_SQRTL:
  *	This symbol, if defined, indicates that the sqrtl routine is
  *	available to do long double square roots.
@@ -2338,6 +2344,12 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$i_inttypes   I_INTTYPES                /**/
 
+/* I_LIBUTIL:
+ *	This symbol, if defined, indicates that <libutil.h> exists and
+ *	should be included.
+ */
+#$i_libutil	I_LIBUTIL		/**/
+
 /* I_MACH_CTHREADS:
  *     This symbol, if defined, indicates to the C program that it should
  *     include <mach/cthreads.h>.
@@ -3171,11 +3183,5 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
 #define PERL_XS_APIVERSION "$xs_apiversion"
 #define PERL_PM_APIVERSION "$pm_apiversion"
 
-/* I_LIBUTIL:
- *	This symbol, if defined, indicates that <libutil.h> exists and
- *	should be included.
- */
-#$i_libutil	I_LIBUTIL		/**/
-
 #endif
 !GROK!THIS!
diff --git a/win32/config.bc b/win32/config.bc
index fb746c9..172404b 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -312,6 +312,7 @@ d_sigsetjmp='undef'
 d_socket='define'
 d_socklen_t='undef'
 d_sockpair='undef'
+d_socks5_init='undef'
 d_sqrtl='undef'
 d_statblks='undef'
 d_statfs_f_flags='undef'
diff --git a/win32/config.gc b/win32/config.gc
index 5c50488..498bb40 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -312,6 +312,7 @@ d_sigsetjmp='undef'
 d_socket='define'
 d_socklen_t='undef'
 d_sockpair='undef'
+d_socks5_init='undef'
 d_sqrtl='undef'
 d_statblks='undef'
 d_statfs_f_flags='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 8c9e5c0..0371234 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -312,6 +312,7 @@ d_sigsetjmp='undef'
 d_socket='define'
 d_socklen_t='undef'
 d_sockpair='undef'
+d_socks5_init='undef'
 d_sqrtl='undef'
 d_statblks='undef'
 d_statfs_f_flags='undef'
-- 
2.7.4