summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-09-30 05:08:51 +0000
committertnn <tnn@pkgsrc.org>2015-09-30 05:08:51 +0000
commitff8c1429ffe7e10695584628711a1b4ff7d5d3ce (patch)
tree0b68ae7bbbbca2da56a35692646ac567a168209c
parentd18cf863b7a912dc05306463e5af8b479869bb44 (diff)
downloadpkgsrc-ff8c1429ffe7e10695584628711a1b4ff7d5d3ce.tar.gz
Remove socks5 due to distfile unavailability and a license which forbids
redistribution. Equivalent functionality is provided by the free net/dante package (or even "ssh -D" for simple use cases)
-rw-r--r--net/socks5/DESCR21
-rw-r--r--net/socks5/Makefile69
-rw-r--r--net/socks5/PLIST32
-rw-r--r--net/socks5/buildlink3.mk12
-rw-r--r--net/socks5/distinfo18
-rw-r--r--net/socks5/files/socks5.sh15
-rw-r--r--net/socks5/patches/patch-aa24
-rw-r--r--net/socks5/patches/patch-ab185
-rw-r--r--net/socks5/patches/patch-ac25
-rw-r--r--net/socks5/patches/patch-ad44
-rw-r--r--net/socks5/patches/patch-ae43
-rw-r--r--net/socks5/patches/patch-af20
-rw-r--r--net/socks5/patches/patch-ag21
-rw-r--r--net/socks5/patches/patch-ah12
-rw-r--r--net/socks5/patches/patch-ai13
-rw-r--r--net/socks5/patches/patch-aj13
-rw-r--r--net/socks5/patches/patch-ak15
-rw-r--r--net/socks5/patches/patch-al13
-rw-r--r--net/socks5/patches/patch-clients_archie_pfs.h22
19 files changed, 0 insertions, 617 deletions
diff --git a/net/socks5/DESCR b/net/socks5/DESCR
deleted file mode 100644
index 49be7bfca67..00000000000
--- a/net/socks5/DESCR
+++ /dev/null
@@ -1,21 +0,0 @@
-This is NWSL (previously CSTC) version 5.0 of SOCKS, a package that allows
-Unix hosts behind a firewall to gain full access to the internet without
-requiring direct IP reachability. It does require a SOCKS server program
-being run on a host that can communicate directly to hosts behind the
-firewall as well as hosts on the Internet at large. It is based on the
-original SOCKS written by David Koblas <koblas@netcom.com> and the work of
-the AFT working group of the IETF.
-
-NOTE: The shared library features in socks5 require a dynamic linker that
- understands the LD_PRELOAD environment variable. FreeBSD
- 2.1.5-RELEASE supports this; so do versions of -current and -stable
- later than May 2, 1996. All other features will work with FreeBSD
- 2.0 and later.
-
-WARNING: Export of SOCKS from the US without a proper license is a violation
- of ITAR rules.
-
-WARNING: Commercial use and distribution of this software requires a license
- from NEC corporation.
-
-See the README files for more information.
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
deleted file mode 100644
index 449d0b4b124..00000000000
--- a/net/socks5/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2014/10/09 14:06:48 wiz Exp $
-
-DISTNAME= socks5-v1_0r2
-PKGNAME= socks5-1.0.2
-PKGREVISION= 6
-CATEGORIES= net security
-MASTER_SITES= # empty -- manual fetch needed
-EXTRACT_SUFX= _tar.gz
-
-MAINTAINER= ambrisko@ambrisko.roble.com
-HOMEPAGE= http://www.socks.permeo.com/
-COMMENT= SOCKS v5 application layer gateway and clients
-# XXX missing
-LICENSE= socks5-license
-
-RESTRICTED= no commercial use
-# Set all pending someone looking at the license.
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-MAKE_JOBS_SAFE= no
-
-CONFLICTS= socks4-[0-9]*
-
-# here are some extra configure args you may wish to use
-# see the readme file before screwing with them
-#
-#EXTRA_CONFIGURE_ARGS+= \
-# --with-default-server=socks.mydomain.com \
-# --with-syslog-facility=LOG_AUTH \
-# --with-passwd
-
-WRKSRC= ${WRKDIR}/socks5-v1.0r2
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-libconffile=${PREFIX}/etc/libsocks5.conf \
- --with-srvconffile=${PREFIX}/etc/socks5.conf \
- --with-srvpidfile=/var/run/socks5.pid \
- --with-srvidtfile=/var/run/socks5.ident \
- ${EXTRA_CONFIGURE_ARGS}
-LIBS+= -lcrypt
-RCD_SCRIPTS= socks5
-
-EXAMPLE_FILES= README multiple_server.example server_2_multiple_server.example
-EXAMPLE_FILES+= single_homed_host.example socks5.conf.dualhomed
-EXAMPLE_FILES+= socks5.conf.gssapi socks5.conf.multipleservers
-EXAMPLE_FILES+= socks5.conf.server2server socks5.conf.singlehomed
-EXAMPLE_DIR= ${PREFIX}/share/examples/socks5
-
-INSTALLATION_DIRS= bin include ${EXAMPLE_DIR} ${PKGMANDIR}/man1 \
- ${PKGMANDIR}/man5
-INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \
- SHLIB_DIR=${DESTDIR}${PREFIX}/lib \
- MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} \
- mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \
- prefix=${DESTDIR}${PREFIX} \
- exec_prefix=${DESTDIR}${PREFIX}
-
-post-install:
- cd ${DESTDIR}${PREFIX}/bin && chmod 555 rarchie rfinger rftp rping rtelnet rtraceroute runsocks rwhois
- ${MV} ${DESTDIR}${PREFIX}/lib/libsocks5_sh.so ${DESTDIR}${PREFIX}/lib/libsocks5_sh.so.0.0
- ${LN} -sf libsocks5_sh.so.0.0 ${DESTDIR}${PREFIX}/lib/libsocks5_sh.so.0
- ${LN} -sf libsocks5_sh.so.0.0 ${DESTDIR}${PREFIX}/lib/libsocks5_sh.so
-.for f in ${EXAMPLE_FILES}
- ${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DESTDIR}${EXAMPLE_DIR}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/socks5/PLIST b/net/socks5/PLIST
deleted file mode 100644
index 0a5cdd7a19b..00000000000
--- a/net/socks5/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:11 jperkin Exp $
-bin/rarchie
-bin/rfinger
-bin/rftp
-bin/rping
-bin/rtelnet
-bin/rtraceroute
-bin/runsocks
-bin/rwhois
-bin/socks5
-bin/stopsocks
-include/socks.h
-lib/libsocks5.a
-lib/libsocks5_sh.so
-lib/libsocks5_sh.so.0
-lib/libsocks5_sh.so.0.0
-man/man1/runsocks.1
-man/man1/socks5.1
-man/man1/socks5_clients.1
-man/man1/stopsocks.1
-man/man5/libsocks5.conf.5
-man/man5/socks5.conf.5
-man/man5/socks5.passwd.5
-share/examples/socks5/README
-share/examples/socks5/multiple_server.example
-share/examples/socks5/server_2_multiple_server.example
-share/examples/socks5/single_homed_host.example
-share/examples/socks5/socks5.conf.dualhomed
-share/examples/socks5/socks5.conf.gssapi
-share/examples/socks5/socks5.conf.multipleservers
-share/examples/socks5/socks5.conf.server2server
-share/examples/socks5/socks5.conf.singlehomed
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
deleted file mode 100644
index ca7b4d64ba2..00000000000
--- a/net/socks5/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:12 joerg Exp $
-
-BUILDLINK_TREE+= socks5
-
-.if !defined(SOCKS5_BUILDLINK3_MK)
-SOCKS5_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.socks5+= socks5>=1.0.2
-BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5
-.endif # SOCKS5_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -socks5
diff --git a/net/socks5/distinfo b/net/socks5/distinfo
deleted file mode 100644
index 310243d0a6d..00000000000
--- a/net/socks5/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.8 2012/11/19 02:59:39 joerg Exp $
-
-SHA1 (socks5-v1_0r2_tar.gz) = 57c6e3a17381ce48bed008a86442385dbc2d11de
-RMD160 (socks5-v1_0r2_tar.gz) = 18b6986027cee615cdae051d47240f3dc99b9c85
-Size (socks5-v1_0r2_tar.gz) = 390331 bytes
-SHA1 (patch-aa) = 5960986bf8aa8e8abf96df90b4b9c1940b1adb98
-SHA1 (patch-ab) = 85e70c3a81ee5dc44af24f48fe4d3869c0985854
-SHA1 (patch-ac) = 296da7096e6c6984714f5aa88e3caab7cd11e309
-SHA1 (patch-ad) = bed5faf67a3d7e15693cd526d9554dca85877d7f
-SHA1 (patch-ae) = ee871fc2b3e1b3e8b9c78ab20fe829929bc98b08
-SHA1 (patch-af) = d21161fc0caee89b7f3de390dd16fa4a81882c51
-SHA1 (patch-ag) = 21dcc2d897df2ba38e484e105dd97d0130428f8c
-SHA1 (patch-ah) = 925232d6f4e5d95101f18b31c4f8943ac2d50e9b
-SHA1 (patch-ai) = 1fe2e130eaa29731d9ddae6cfc3d6d728b89053e
-SHA1 (patch-aj) = b0019fe20f666e1d42483dd9e0e06aec9a02ba3e
-SHA1 (patch-ak) = f8ea0bea85e37d997b4a54cd66b4f537aee9fcd9
-SHA1 (patch-al) = 0837caf83252fb0f660721a3fcfc066c5fe91333
-SHA1 (patch-clients_archie_pfs.h) = 126bde203ecf5602f61fe581ac8d0032e28f00f1
diff --git a/net/socks5/files/socks5.sh b/net/socks5/files/socks5.sh
deleted file mode 100644
index 55d9acd8f51..00000000000
--- a/net/socks5/files/socks5.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: socks5.sh,v 1.1 2002/10/02 13:27:14 grant Exp $
-#
-# PROVIDE: socks5
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="socks5"
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/socks5.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/socks5/patches/patch-aa b/net/socks5/patches/patch-aa
deleted file mode 100644
index 31bcddd8410..00000000000
--- a/net/socks5/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/04/16 11:44:52 hubertf Exp $
-
---- shlib/runsocks.in 1997/11/21 14:21:03 1.1
-+++ shlib/runsocks.in 1997/11/21 14:23:18
-@@ -21,8 +21,8 @@
- # in front of it. We make the path overridable with SOCKS5_SHLIB_RUNPATH...
- #
- case `uname -rs` in
--SunOS*4.*)
-- @PRELOADS@=${SOCKS5_SHLIB_RUNPATH}@SHLIB_LIB@@PRELOADA@
-+SunOS*4.*|NetBSD*)
-+ @PRELOADS@=${SOCKS5_SHLIB_RUNPATH}@SHLIB_LIB@@PRELOADA@.0.0
- export @PRELOADS@
- ;;
- *)
-@@ -33,7 +33,7 @@
- export LD_LIBRARY_PATH
- fi
-
-- @PRELOADS@=@SHLIB_LIB@@PRELOADA@
-+ @PRELOADS@=@SHLIB_LIB@@PRELOADA@.0.0
- export LD_LIBRARY_PATH
- ;;
- esac
diff --git a/net/socks5/patches/patch-ab b/net/socks5/patches/patch-ab
deleted file mode 100644
index 5cf5be5f8e7..00000000000
--- a/net/socks5/patches/patch-ab
+++ /dev/null
@@ -1,185 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/04/16 11:46:18 hubertf Exp $
-
---- shlib/Makefile.in.orig Wed Apr 23 21:11:10 1997
-+++ shlib/Makefile.in Fri Apr 16 12:45:45 1999
-@@ -11,7 +11,7 @@
- LIBS = @LIBS@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
- SHLIB_OFLAGS = @SHLIB_OFLAGS@
--SHLIB_LFLAGS = @SHLIB_LFLAGS@
-+SHLIB_LFLAGS = @SHLIB_LFLAGS@ -R${PREFIX}/lib
- SHLIB_LIBS = @SHLIB_LIBS@
- PLUGIN_LIBS = @PLUGIN_LIBS@
- SHLIB_LIB = @SHLIB_LIB@
-@@ -63,25 +63,25 @@
- (cd ..; CONFIG_FILES=shlib/runsocks CONFIG_HEADERS= ./config.status)
-
- libsocks5_sh.so: $(OBJS)
-- $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
-+ $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(OBJS) $(SHLIB_LIBS) $(DLLIBS)
-
- libs5auth_u.so: $(AUTH_U_OBJS)
-- $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_U_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
-+ $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_U_OBJS) $(SHLIB_LIBS) $(DLLIBS)
-
- libs5auth_k.so: $(AUTH_K_OBJS)
-- $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_K_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
-+ $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_K_OBJS) $(SHLIB_LIBS) $(DLLIBS)
-
- libs5auth_c.so: $(AUTH_C_OBJS)
-- $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_C_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
-+ $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(AUTH_C_OBJS) $(SHLIB_LIBS) $(DLLIBS)
-
- libs5filter_p.so: $(FILTER_P_OBJS)
-- $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(FILTER_P_OBJS) $(LDFLAGS) $(SHLIB_LIBS) $(DLLIBS)
-+ $(SHLIB_LD) -o $@ $(SHLIB_LFLAGS) $(FILTER_P_OBJS) $(SHLIB_LIBS) $(DLLIBS)
-
- install: Makefile $(SHLIB_LIB) runsocks
- if [ -n "$(SHLIB_LIB)" -a -f "$(SHLIB_LIB)" ] ; then $(INSTALL) $(SHLIB_LIB) $(SHLIB_DIR) ; $(INSTALL) runsocks $(exec_prefix)/bin; fi
-
- clean:
-- -$(BINRM) *.o $(SHLIB_LIB) $(PLUGIN_LIBS) so_locations
-+ -$(BINRM) *.o *.so $(SHLIB_LIB) $(PLUGIN_LIBS) so_locations
-
- distclean: clean
- -$(BINRM) Makefile runsocks *~ #*# *.bak
-@@ -92,70 +92,116 @@
-
-
- msg.o: $(srcdir)/../lib/msg.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/msg.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/msg.c -o msg.so
-+ ${LD} -x -r msg.so -o msg.o
-+ rm -f msg.so
-
- protocol.o: $(srcdir)/../lib/protocol.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/protocol.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/protocol.c -o protocol.so
-+ ${LD} -x -r protocol.so -o protocol.o
-+ rm -f protocol.so
-
- log.o: $(srcdir)/../lib/log.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/log.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/log.c -o log.so
-+ ${LD} -x -r log.so -o log.o
-+ rm -f log.so
-
- hostname.o: $(srcdir)/../lib/hostname.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/hostname.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/hostname.c -o hostname.so
-+ ${LD} -x -r hostname.so -o hostname.o
-+ rm -f hostname.so
-
- confutil.o: $(srcdir)/../lib/confutil.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/confutil.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/confutil.c -o confutil.so
-+ ${LD} -x -r confutil.so -o confutil.o
-+ rm -f confutil.so
-
- buffer.o: $(srcdir)/../lib/buffer.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/buffer.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/buffer.c -o buffer.so
-+ ${LD} -x -r buffer.so -o buffer.o
-+ rm -f buffer.so
-
- cache.o: $(srcdir)/../lib/cache.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/cache.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/cache.c -o cache.so
-+ ${LD} -x -r cache.so -o cache.o
-+ rm -f cache.so
-
- wrap.o: $(srcdir)/../lib/wrap.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap.c -o wrap.so
-+ ${LD} -x -r wrap.so -o wrap.o
-+ rm -f wrap.so
-
- wrap_tcp.o: $(srcdir)/../lib/wrap_tcp.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_tcp.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_tcp.c -o wrap_tcp.so
-+ ${LD} -x -r wrap_tcp.so -o wrap_tcp.o
-+ rm -f wrap_tcp.so
-
- wrap_udp.o: $(srcdir)/../lib/wrap_udp.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_udp.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/wrap_udp.c -o wrap_udp.so
-+ ${LD} -x -r wrap_udp.so -o wrap_udp.o
-+ rm -f wrap_udp.so
-
- conf.o: $(srcdir)/../lib/conf.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/conf.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/conf.c -o conf.so
-+ ${LD} -x -r conf.so -o conf.o
-+ rm -f conf.so
-
- libproto.o: $(srcdir)/../lib/libproto.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/libproto.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/libproto.c -o libproto.so
-+ ${LD} -x -r libproto.so -o libproto.o
-+ rm -f libproto.so
-
- select.o: $(srcdir)/../lib/select.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/select.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/select.c -o select.so
-+ ${LD} -x -r select.so -o select.o
-+ rm -f select.so
-
- rld.o: $(srcdir)/../lib/rld.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/rld.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/rld.c -o rld.so
-+ ${LD} -x -r rld.so -o rld.o
-+ rm -f rld.so
-
- null.o: $(srcdir)/../lib/null.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/null.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/null.c -o null.so
-+ ${LD} -x -r null.so -o null.o
-+ rm -f null.so
-
- addr.o: $(srcdir)/../lib/addr.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/addr.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/addr.c -o addr.so
-+ ${LD} -x -r addr.so -o addr.o
-+ rm -f addr.so
-
- shim.o: $(srcdir)/../lib/shim.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/shim.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/shim.c -o shim.so
-+ ${LD} -x -r shim.so -o shim.o
-+ rm -f shim.so
-
- dpin.o: $(srcdir)/../lib/dpin.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpin.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpin.c -o dpin.so
-+ ${LD} -x -r dpin.so -o dpin.o
-+ rm -f dpin.so
-
- dpinutil.o: $(srcdir)/../lib/dpinutil.c
-- $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpinutil.c
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/../lib/dpinutil.c -o dpinutil.so
-+ ${LD} -x -r dpinutil.so -o dpinutil.o
-+ rm -f dpinutil.so
-
- upwd.o: $(srcdir)/../lib/upwd.c
-- $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/upwd.c
-+ $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/upwd.c -o upwd.so
-+ ${LD} -x -r upwd.so -o upwd.o
-+ rm -f upwd.so
-
- gss.o: $(srcdir)/../lib/gss.c
-- $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/gss.c
-+ $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/gss.c -o gss.so
-+ ${LD} -x -r gss.so -o gss.o
-+ rm -f gss.so
-
- cram.o: $(srcdir)/../lib/cram.c
-- $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/cram.c
-+ $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../lib/cram.c -o cram.so
-+ ${LD} -x -r cram.so -o cram.o
-+ rm -f cram.so
-
- packet.o: $(srcdir)/../server/packet.c
-- $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../server/packet.c
-+ $(CC) $(CPPFLAGS) $(PIN_CFLAGS) -c $(srcdir)/../server/packet.c -o packet.so
-+ ${LD} -x -r packet.so -o packet.o
-+ rm -f packet.so
diff --git a/net/socks5/patches/patch-ac b/net/socks5/patches/patch-ac
deleted file mode 100644
index 58d00ef7f0d..00000000000
--- a/net/socks5/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/10/11 11:27:56 grant Exp $
-
---- lib/log.c.orig 1997-06-19 02:32:05.000000000 +1000
-+++ lib/log.c
-@@ -77,7 +77,8 @@ static void replacePercentM(const char *
- }
-
- void S5LogvUpdate(const void *handle, int level, int msgID, const char *oformat, va_list pvar) {
-- char fmt_cpy[2*1024 + 2*10], format[2*1024 + 2*10];
-+#define FMT_BUFLEN (2*1024 + 2*10)
-+ char fmt_cpy[FMT_BUFLEN], format[FMT_BUFLEN];
- S5LogHandle *h = (S5LogHandle *)handle;
- int serrno = GETERRNO();
- static int dontLoop = 0;
-@@ -112,7 +113,9 @@ void S5LogvUpdate(const void *handle, in
- strcat(format, " ");
-
- replacePercentM(oformat, format + strlen(format), sizeof(format) - strlen(format));
-- vsprintf(fmt_cpy, format, pvar);
-+ if(vsnprintf(fmt_cpy, FMT_BUFLEN-1,format, pvar)==-1) {
-+ fmt_cpy[FMT_BUFLEN-1]='\0';
-+ }
-
- /* Log to the Local log facility, e.g. Stderr on Unix and maybe a window */
- /* or something on NT. Neither system can deal with a NULL format so */
diff --git a/net/socks5/patches/patch-ad b/net/socks5/patches/patch-ad
deleted file mode 100644
index 638ade6a4f8..00000000000
--- a/net/socks5/patches/patch-ad
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/12/19 12:24:25 agc Exp $
-
---- clients/ftp/ftp.c 2003/12/19 12:10:21 1.1
-+++ clients/ftp/ftp.c 2003/12/19 12:11:47
-@@ -48,7 +48,7 @@
- #include <fcntl.h>
- #endif
-
--#include <varargs.h>
-+#include <stdarg.h>
-
- #ifdef FASCIST
- #include <syslog.h>
-@@ -241,9 +241,8 @@
- }
-
- /*VARARGS*/
--int command(va_alist) va_dcl {
-+int command(char *fmt, ...) {
- va_list ap;
-- char *fmt;
- int r;
- sig_t oldintr;
-
-@@ -251,8 +250,7 @@
- if (debug) {
- printf("---> ");
-
-- va_start(ap);
-- fmt = va_arg(ap, char *);
-+ va_start(ap, fmt);
- if (strncmp("PASS ", fmt, 5) == 0)
- printf("PASS XXXX");
- else
-@@ -271,8 +269,7 @@
-
- oldintr = (sig_t)Signal(SIGINT, cmdabort);
-
-- va_start(ap);
-- fmt = va_arg(ap, char *);
-+ va_start(ap, fmt);
- vfprintf(cout, fmt, ap);
- va_end(ap);
-
diff --git a/net/socks5/patches/patch-ae b/net/socks5/patches/patch-ae
deleted file mode 100644
index 0d806132799..00000000000
--- a/net/socks5/patches/patch-ae
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/12/19 12:24:25 agc Exp $
-
---- clients/telnet/commands.c 2003/12/19 12:14:28 1.1
-+++ clients/telnet/commands.c 2003/12/19 12:16:29
-@@ -83,7 +83,7 @@
- #include <signal.h>
- #include <ctype.h>
- #include <pwd.h>
--#include <varargs.h>
-+#include <stdarg.h>
- #include <errno.h>
-
- #include <arpa/telnet.h>
-@@ -122,7 +122,7 @@
- extern int Ambiguous();
- extern void herror();
-
--static call();
-+static int call(void *, ...);
-
- typedef struct {
- char *name; /* command name */
-@@ -2092,17 +2092,15 @@
-
- /*VARARGS1*/
- static int
--call(va_alist)
-- va_dcl
-+call(void *func, ...)
- {
- va_list ap;
- typedef int (*intrtn_t)();
-- intrtn_t routine;
-+ intrtn_t routine = (intrtn_t) func;
- char *args[100];
- int argno = 0;
-
-- va_start(ap);
-- routine = (va_arg(ap, intrtn_t));
-+ va_start(ap, func);
- while ((args[argno++] = va_arg(ap, char *)) != 0) {
- ;
- }
diff --git a/net/socks5/patches/patch-af b/net/socks5/patches/patch-af
deleted file mode 100644
index 36a4d079e79..00000000000
--- a/net/socks5/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/12/18 18:01:18 joerg Exp $
-
---- clients/archie/dirsend.c.orig 2005-12-18 17:34:43.000000000 +0000
-+++ clients/archie/dirsend.c
-@@ -17,6 +17,7 @@
- #ifdef ISC
- # include <net/errno.h>
- #endif /* ISC */
-+#include <errno.h>
-
- #include "pfs.h"
- #include "pprot.h"
-@@ -24,7 +25,6 @@
- #include "perrno.h"
-
- static int notprived = 0;
--extern int errno;
- extern int perrno;
- extern int rdgram_priority;
- #ifdef DEBUG
diff --git a/net/socks5/patches/patch-ag b/net/socks5/patches/patch-ag
deleted file mode 100644
index 6b1695af33e..00000000000
--- a/net/socks5/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/18 18:01:18 joerg Exp $
-
---- clients/ftp/ftp_var.h.orig 2005-12-18 17:35:23.000000000 +0000
-+++ clients/ftp/ftp_var.h
-@@ -35,6 +35,8 @@
- #ifndef FTP_VAR_H
- #define FTP_VAR_H
-
-+#include <errno.h>
-+
- #include "config.h"
- #include "includes.h"
- #include "defs.h"
-@@ -143,7 +145,6 @@ extern char macbuf[4096];
- extern char *tail();
- extern char *remglob();
- extern char *mktemp();
--extern int errno;
-
- #if (defined(COMPAT) || defined(ultrix) || defined(SCO) || defined(__alpha__)) && !defined(__bsdi__)
- typedef void (*_sig_t)();
diff --git a/net/socks5/patches/patch-ah b/net/socks5/patches/patch-ah
deleted file mode 100644
index b17dd6bf0ba..00000000000
--- a/net/socks5/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/12/18 18:01:18 joerg Exp $
-
---- clients/ftp/cmds.c.orig 2005-12-18 17:36:04.000000000 +0000
-+++ clients/ftp/cmds.c
-@@ -53,7 +53,6 @@ extern char *home;
- extern char *globerr;
- extern char **ftpglob();
- extern char *remglob();
--extern int errno;
- extern off_t restart_point;
- extern char reply_string[];
-
diff --git a/net/socks5/patches/patch-ai b/net/socks5/patches/patch-ai
deleted file mode 100644
index 7cdb7d45ca3..00000000000
--- a/net/socks5/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/12/18 18:01:18 joerg Exp $
-
---- clients/ftp/ftp.c.orig 2005-12-18 17:36:46.000000000 +0000
-+++ clients/ftp/ftp.c
-@@ -81,7 +81,7 @@ int ptflag = 0;
- off_t restart_point = 0;
- unsigned long socks_bind_remoteAddr; /* Socks */
-
--extern int connected, errno;
-+extern int connected;
-
- FILE *cin, *cout;
- FILE *dataconn();
diff --git a/net/socks5/patches/patch-aj b/net/socks5/patches/patch-aj
deleted file mode 100644
index 8a70899bc41..00000000000
--- a/net/socks5/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/12/18 18:01:18 joerg Exp $
-
---- clients/ftp/glob.c.orig 2005-12-18 17:37:16.000000000 +0000
-+++ clients/ftp/glob.c
-@@ -92,8 +92,6 @@ char *globchars = "`{[*?";
- char *globerr;
- char *home;
-
--extern int errno;
--
- static int match P((char *, char *));
- static int execbrc P((char *, char *));
-
diff --git a/net/socks5/patches/patch-ak b/net/socks5/patches/patch-ak
deleted file mode 100644
index 3826de1f34c..00000000000
--- a/net/socks5/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/12/18 18:01:18 joerg Exp $
-
---- clients/telnet/externs.h.orig 2005-12-18 17:38:01.000000000 +0000
-+++ clients/telnet/externs.h
-@@ -118,10 +118,6 @@ typedef unsigned char cc_t;
-
- #define SUBBUFSIZE 256
-
--#ifndef CRAY
--extern int errno; /* outside this world */
--#endif
--
- extern int
- autologin, /* Autologin enabled */
- skiprc, /* Don't process the ~/.telnetrc file */
diff --git a/net/socks5/patches/patch-al b/net/socks5/patches/patch-al
deleted file mode 100644
index 246fdab25eb..00000000000
--- a/net/socks5/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/09/19 08:05:16 rillig Exp $
-
---- Makefile.in.orig 1997-05-03 00:31:52.000000000 +0200
-+++ Makefile.in 2006-09-19 10:00:20.000000000 +0200
-@@ -18,7 +18,7 @@ AUTOHDR = @AUTOHDR@
-
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--mandir = $(prefix)/man
-+mandir = @mandir@
-
- all: Makefile server lib clients shlib
-
diff --git a/net/socks5/patches/patch-clients_archie_pfs.h b/net/socks5/patches/patch-clients_archie_pfs.h
deleted file mode 100644
index ca096c4dd2e..00000000000
--- a/net/socks5/patches/patch-clients_archie_pfs.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-clients_archie_pfs.h,v 1.1 2012/11/19 02:59:39 joerg Exp $
-
---- clients/archie/pfs.h.orig 2012-11-18 22:48:11.000000000 +0000
-+++ clients/archie/pfs.h
-@@ -194,7 +194,7 @@ struct acl {
- char *atype; /* Authentication type */
- char *rights; /* Rights */
- char *principals; /* Authorized principals */
-- struct restrict *restrictions; /* Restrictions on use */
-+ struct restrictions *restrictions; /* Restrictions on use */
- struct acl *previous; /* Previous elt in linked list */
- struct acl *next; /* Next element in linked list */
- };
-@@ -216,7 +216,7 @@ typedef struct acl ACL_ST;
-
- /* Definition of structure contining access restrictions */
- /* for future extensions */
--struct restrict {
-+struct restrictions {
- struct acl *previous; /* Previous elt in linked list */
- struct acl *next; /* Next element in linked list */
- };