Upgrade to 1.0 r10.

Remove patches integrated since r9.
1/2 of patch-aa was integrated, the second half has been retained.
Add new patch (patch-ak) from web site for s5fakehost files.
Add new patch (patch-al) to fix long standing telnet failure to build (it
	is a kludge, so hasn't been submitted to the socks maintainers).

5 files changed, 70 insertions, 27 deletions

diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 9f0d4ab9ac2b..4c9179ac1018 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	socks5
-# Version required:			v1.0r8
+# Version required:			v1.0r10
 # Date created:				24 Apr 1996
 # Whom:					pst
 #
 # $FreeBSD$
 #
 
-DISTNAME=	socks5-v1.0r9
-PKGNAME=	socks5-1.0.9
+DISTNAME=	socks5-v1.0r10
+PKGNAME=	socks5-1.0.10
 CATEGORIES=	net security
 EXTRACT_SUFX=	.tar.gz
 
@@ -33,6 +33,7 @@ CONFIGURE_ARGS=	--with-libconffile=${PREFIX}/etc/libsocks5.conf \
 		${EXTRA_CONFIGURE_ARGS}
 MAN1=		runsocks.1 socks5.1 stopsocks.1 socks5_clients.1
 MAN5=		libsocks5.conf.5 socks5.conf.5
+CONFIGURE_ENV=  LIBS=-lcrypt
 
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
@@ -46,17 +47,3 @@ do-fetch:
 	fi
 
 .include <bsd.port.mk>
-
-# the following need to be included after bsd.port.mk, since OPSYS
-# ARCH are defined in bsd.port.mk
-
-.if ${OPSYS} == "FreeBSD"
-CONFIGURE_ENV=  LIBS=-lcrypt
-.endif
-
-# OpenBSD/arc doesn't seem to have a working ldconfig
-
-.if ${OPSYS} != "OpenBSD" || ${ARCH} != "arc"
-post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.endif
diff --git a/net/socks5/distinfo b/net/socks5/distinfo
index 1ef5977d0293..d1ae5669e1e9 100644
--- a/net/socks5/distinfo
+++ b/net/socks5/distinfo
@@ -1 +1 @@
-MD5 (socks5-v1.0r9.tar.gz) = 98b65d008b4ac995b75a9da7b16fed28
+MD5 (socks5-v1.0r10.tar.gz) = 99d99a1723f793d7cb8e8043e72da9b1
diff --git a/net/socks5/files/patch-aa b/net/socks5/files/patch-aa
index 9c4c8d11cc4a..393eee3f9f6d 100644
--- a/net/socks5/files/patch-aa
+++ b/net/socks5/files/patch-aa
@@ -1,14 +1,5 @@
 --- lib/rld.c.org	Wed Jun 24 22:32:37 1998
 +++ lib/rld.c	Wed Jun 24 22:33:11 1998
-@@ -114,7 +114,7 @@
- static void GetOriginalFunc(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
- 
 @@ -140,7 +140,7 @@
  static void DGetOriginalFunc(void **fptr, char *name, int libmask) {
      /* Synchronize access to func and lib opening functions if we can...     */
diff --git a/net/socks5/files/patch-ak b/net/socks5/files/patch-ak
new file mode 100644
index 000000000000..7289847f66d7
--- /dev/null
+++ b/net/socks5/files/patch-ak
@@ -0,0 +1,55 @@
+
+The patch is for clients that do not have DNS resolution.  Sites that do not
+use the remote name resolution do not have to apply this patch.
+
+The fakehost files (/tmp/.s5fakehost-<uid>) created with releases prior to 
+release 10 are not compatible.  
+
+If the fakehost file has size 65284 bytes, it is the old version.  Delete the
+file, apply the following patch, and rebuild the clients.  The new fakehost
+file has size 32644 bytes.
+
+steve@syl.dl.nec.com
+
+Index: lib/hostname.c
+===================================================================
+RCS file: lib/hostname.c,v
+retrieving revision 1.31.4.12
+retrieving revision 1.31.4.17
+diff -c -r1.31.4.12 -r1.31.4.17
+*** hostname.c	1999/08/02 14:52:23	1.31.4.12
+--- hostname.c	1999/08/11 18:53:42	1.31.4.17
+***************
+*** 171,177 ****
+          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);
+          if (REAL(write)(fd, hostname, sizeof(hostname)) != sizeof(hostname)) {
+              S5LogUpdate(S5LogDefaultHandle, S5_LOG_ERROR, 0, "GetHostFromFile: write table failed %m");
+              SetWriteLock(0);
+--- 170,176 ----
+          strncpy(hostname, name, MIN(strlen(name), S5_HOSTNAME_SIZE-1));
+          hostname[MIN(strlen(name), S5_HOSTNAME_SIZE-1)] = '\0';
+  
+!         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);
+***************
+*** 472,478 ****
+  
+      if (fd > 0) {
+          SetReadLock(1);
+!         lseek(fd, (i-1)*256+sizeof(int), SEEK_SET);
+  
+          if (REAL(read)(fd, hostname, len) != len) {
+              S5LogUpdate(S5LogDefaultHandle, S5_LOG_ERROR, 0, "lsGetCachedHostname: read fake table failed %m");
+--- 471,477 ----
+  
+      if (fd > 0) {
+          SetReadLock(1);
+!         lseek(fd, (i-1)*S5_HOSTNAME_SIZE+sizeof(int), SEEK_SET);
+  
+          if (REAL(read)(fd, hostname, len) != len) {
+              S5LogUpdate(S5LogDefaultHandle, S5_LOG_ERROR, 0, "lsGetCachedHostname: read fake table failed %m");
diff --git a/net/socks5/files/patch-al b/net/socks5/files/patch-al
new file mode 100644
index 000000000000..1b7660110396
--- /dev/null
+++ b/net/socks5/files/patch-al
@@ -0,0 +1,10 @@
+--- clients/telnet/telnet.c.org	Fri Sep 24 23:18:34 1999
++++ clients/telnet/telnet.c	Fri Sep 24 23:18:58 1999
+@@ -596,6 +596,7 @@
+     else return(unknown);
+ }
+ 
++#undef HAVE_SETUPTERM		/* GROSS KLUDGE XXX -- imp */
+ #ifndef HAVE_SETUPTERM
+ extern int tgetent(char *, char *);
+ char termbuf[1024];