config/1386: Using Socks5 instead of Socks4

[Antonio Rosella <An...@agip.it>]

>Number:         1386
>Category:       config
>Synopsis:       Using Socks5 instead of Socks4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    apache
>State:          open
>Class:          change-request
>Submitter-Id:   apache
>Arrival-Date:   Mon Nov 10 06:10:00 PST 1997
>Last-Modified:
>Originator:     Antonio.Rosella@agip.it
>Organization:
apache
>Release:        1.2.4
>Environment:
IRIX jessica 6.3 12161207 IP32
gcc version 2.7.2.3
>Description:
I have succesfully used the new release of Socks with apache 1.2.4 and maybe my
pathches could be usefull to the apache community 
>How-To-Repeat:
Install the Socks5 library and compile apache
>Fix:
There are the patches for Configuration.tmpl and Configure I used
*** Configuration.tmpl_old      Sat May 10 19:14:36 1997
--- Configuration.tmpl  Mon Nov 10 13:33:43 1997
***************
*** 69,74 ****
--- 69,77 ----
  #  location to EXTRA_LIBS, otherwise Configure will assume
  #  "-L/usr/local/lib -lsocks"
  #
+ # SOCKS5:
+ #  Same as Socks4 but using the new libraries
+ #
  # STATUS:
  #  If Configure determines that you are using the status_module,
  #  it will automatically enable full status information if set
***************
*** 83,88 ****
--- 86,92 ----
  
  Rule STATUS=yes
  Rule SOCKS4=no
+ Rule SOCKS5=no
  Rule IRIXNIS=no
  
  # The following rules should be set automatically by Configure. However, if


*** Configure   Mon Nov 10 13:40:01 1997
--- Configure_old       Mon Nov 10 13:38:58 1997
***************
*** 137,143 ****
  RULE_WANTHSREGEX=`./helpers/CutRule WANTHSREGEX $file`
  RULE_STATUS=`./helpers/CutRule STATUS $file`
  RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file`
- RULE_SOCKS5=`./helpers/CutRule SOCKS5 $file`
  RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file`
  
  #
--- 137,142 ----***************
*** 599,623 ****
  #
  if [ "$RULE_SOCKS4" = "yes" ]; then
      # Set flag and check Makefile for -lsocks line
!     CFLAGS="$CFLAGS -DSOCKS"
!     if [ "$OS" = "Solaris 2" ]; then
!       LIBS="$LIBS -lresolv"
!     fi
!     if grep "EXTRA_" Makefile | grep "\-lsocks5" > /dev/null; then : ;
!     else
!       LIBS="$LIBS -L/usr/local/lib -lsocks5"
!     fi
! fi
! 
! #
! # Now SOCKS5.
! #  NOTE: We assume that if they are using SOCKS5, then they've
! #   adjusted EXTRA_LIBS and/or EXTRA_LFLAGS as required,
! #   otherwise we assume "-L/usr/local/lib -lsocks5"
! #
! if [ "$RULE_SOCKS5" = "yes" ]; then
!     # Set flag and check Makefile for -lsocks line
!     CFLAGS="$CFLAGS -DSOCKS"
      if [ "$OS" = "Solaris 2" ]; then
        LIBS="$LIBS -lresolv"
      fi
--- 598,605 ----
  #
  if [ "$RULE_SOCKS4" = "yes" ]; then
      # Set flag and check Makefile for -lsocks line
!     CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
!     CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
      if [ "$OS" = "Solaris 2" ]; then
        LIBS="$LIBS -lresolv"
      fi

***************


I'm not sure about the Solaris test because I can test only on my SGI


%0
>Audit-Trail:
>Unformatted: