Update to socks 1.0r11. patch-aa had been partially integrated into

r11 as well as parts of patch-ak.  1.0r10 is no longer available at
the NEC web site.  Verified the URL was still the right place to go to
get socks5 1.0r11.

Noticed by: Jim Paterson <jpaterso@paterson.org>

4 files changed, 17 insertions, 44 deletions

diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 9329b3154851..f438de900dcb 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	socks5
-PORTVERSION=	1.0.10
+PORTVERSION=	1.0.11
 CATEGORIES=	net security
-DISTNAME=	socks5-v1.0r10
+DISTNAME=	socks5-v1.0r11
 EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	imp@freebsd.org
diff --git a/net/socks5/distinfo b/net/socks5/distinfo
index d1ae5669e1e9..8df599a06eba 100644
--- a/net/socks5/distinfo
+++ b/net/socks5/distinfo
@@ -1 +1 @@
-MD5 (socks5-v1.0r10.tar.gz) = 99d99a1723f793d7cb8e8043e72da9b1
+MD5 (socks5-v1.0r11.tar.gz) = 60688f74b06dc38c1786ca10ba72c90f
diff --git a/net/socks5/files/patch-aa b/net/socks5/files/patch-aa
index 87cc2585803e..2a50a26f15bc 100644
--- a/net/socks5/files/patch-aa
+++ b/net/socks5/files/patch-aa
@@ -1,14 +1,5 @@
 --- lib/rld.c.orig	Wed Aug  4 04:59:28 1999
 +++ lib/rld.c	Mon Feb 21 03:55:45 2000
-@@ -143,7 +143,7 @@
- static void DGetOriginalFunc(void **fptr, char *name, int libmask) {
-     /* Synchronize access to func and lib opening functions if we can...     */
- 
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) || __FreeBSD__ != 2
-     name++;
- #endif
- 
 @@ -197,6 +197,26 @@
      lsInRLDFunctions = 0;
      S5LogUpdate(S5LogDefaultHandle, S5_LOG_DEBUG(10), 0, "RLD: gethostbyname2 results: %s %s", name, hp?hp->h_name:"???");
diff --git a/net/socks5/files/patch-ak b/net/socks5/files/patch-ak
index e94333601db1..3322c3cb11be 100644
--- a/net/socks5/files/patch-ak
+++ b/net/socks5/files/patch-ak
@@ -1,30 +1,24 @@
---- lib/hostname.c.orig	Wed Aug  4 04:59:29 1999
-+++ lib/hostname.c	Tue Feb 22 09:51:48 2000
+--- lib/hostname.c.orig	Wed Aug 16 09:38:40 2000
++++ lib/hostname.c	Wed Aug 30 13:27:33 2000
 @@ -17,6 +17,11 @@
  #define S5_HOSTLIST_SIZE    256
  #define S5_HOSTALIASES_SIZE 16
- #define S5_FAKEHOSTFILE     ".s5fakehost"
-+
+  
 +/* wrapper for KAME-special getnameinfo() */
 +#ifndef NI_WITHSCOPEID
 +#define	NI_WITHSCOPEID	0
 +#endif
-  
++
  struct hostEntry {
      char name[S5_HOSTNAME_SIZE];
-@@ -171,7 +176,7 @@
-         strncpy(hostname, name, MIN(strlen(name), S5_HOSTNAME_SIZE-1));
-         hostname[MIN(strlen(name), S5_HOSTNAME_SIZE-1)] = '\0';
- 
--        lseek(fd, (j-1)*256+sizeof(int), SEEK_SET);
-+        lseek(fd, (j-1)*S5_HOSTNAME_SIZE+sizeof(int), SEEK_SET);
-         if (REAL(write)(fd, hostname, sizeof(hostname)) != sizeof(hostname)) {
-             S5LogUpdate(S5LogDefaultHandle, S5_LOG_ERROR, 0, "GetHostFromFile: write table failed %m");
-             SetWriteLock(0);
-@@ -402,6 +407,129 @@
- }
- #endif
- 
+ };
+@@ -398,6 +403,129 @@
+     lsInWrapFunction = 0;
+     lsInWrapHostname = 0;
+     return &h;
++}
++#endif
++
 +#if defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO)
 +/* wrapper around the getaddrinfo call.                                      */
 +/* similar to getaddrinfo() except for:                                      */
@@ -145,18 +139,6 @@
 +    lsInWrapFunction = 0;
 +    lsInWrapHostname = 0;
 +    return 0;
-+}
-+#endif
-+
- int lsGetCachedAddress(const char *name, S5NetAddr *na) {
-     int i;
-     char hostname[S5_HOSTNAME_SIZE];
-@@ -472,7 +600,7 @@
- 
-     if (fd > 0) {
-         SetReadLock(1);
--        lseek(fd, (i-1)*256+sizeof(int), SEEK_SET);
-+        lseek(fd, (i-1)*S5_HOSTNAME_SIZE+sizeof(int), SEEK_SET);
+ }
+ #endif
  
-         if (REAL(read)(fd, hostname, len) != len) {
-             S5LogUpdate(S5LogDefaultHandle, S5_LOG_ERROR, 0, "lsGetCachedHostname: read fake table failed %m");