YES -> Yes

Fix runsocks bug. bin/{socks5,stopsocks} -> sbin/
2000-03-27 23:02:44 +00:00 · 2000-03-27 23:02:44 +00:00 · 22bb398026
commit 22bb398026
parent c6b18e0b0e
11 changed files with 197 additions and 65 deletions
--- a/security/socks5/Makefile
+++ b/security/socks5/Makefile
@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.18 2000/03/24 22:11:58 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2000/03/27 23:02:44 form Exp $

 DISTNAME=	socks5-v1.0r10
 PKGNAME=	socks5-1.0.10
-CATEGORIES=	security
+CATEGORIES=	security net
 NEED_VERSION=	1.191

 MAINTAINER=	ports@openbsd.org

-LICENSE_TYPE=		COMM
 PERMIT_PACKAGE_CDROM=	commercial
 PERMIT_PACKAGE_FTP=	commercial
 PERMIT_DISTFILES_CDROM=	commercial
@ -15,9 +14,10 @@ PERMIT_DISTFILES_FTP=	commercial

 NO_CDROM=	"NEC has a funky license for this software"
 RESTRICTED=	"no commercial use"
-MIRROR_DISTFILE=no
-IS_INTERACTIVE=	yes
+MIRROR_DISTFILE=No
+IS_INTERACTIVE=	Yes
 NO_PACKAGE=	interactive port
+MAKE_ENV=	INSTALL_RUNSOCKS=${INSTALL_RUNSOCKS}

 # here are some extra configure args you may wish to use
 # see the readme file before screwing with them
@ -27,10 +27,9 @@ NO_PACKAGE=	interactive port
 #		--with-syslog-facility=LOG_AUTH \
 #		--with-passwd

-ETCDIR?=	/etc
 GNU_CONFIGURE=	Yes
-CONFIGURE_ARGS=	--with-libconffile="${ETCDIR}/libsocks5.conf" \
-		--with-srvconffile="${ETCDIR}/socks5.conf" \
+CONFIGURE_ARGS=	--with-libconffile="/etc/libsocks5.conf" \
+		--with-srvconffile="/etc/socks5.conf" \
 		--with-srvpidfile="/var/run/socks5.pid" \
 		--with-srvidtfile="/var/run/socks5.ident" \
 		${EXTRA_CONFIGURE_ARGS}
@ -39,20 +38,61 @@ WRKDIST=	${WRKDIR}/${DISTNAME}

 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	  echo ""; \
-	  echo "NEC requires that you grab the dist files from their"; \
-	  echo "web site at http://www.socks.nec.com.  Please make sure"; \
-	  echo "you have ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}"; \
-	  echo "and run make again."; \
-	  echo ""; \
-	  exit 1;\
+		echo ""; \
+		echo "NEC requires that you grab the dist files from their"; \
+		echo "web site at http://www.socks.nec.com.  Please make sure"; \
+		echo "you have ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}"; \
+		echo "and run make again."; \
+		echo ""; \
+		exit 1;\
 	fi

-post-install:
+post-build:
+	@if [ ! x"${INSTALL_RUNSOCKS}" = "x" ]; then \
+		sed -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/runsocks.in \
+			> ${WRKBUILD}/runsocks; \
+	fi
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKBUILD}/server/socks5 ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKBUILD}/server/stopsocks ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/pt/rping ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/pt/rtraceroute ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/archie/archie \
+		${PREFIX}/bin/rarchie
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/archie/archie \
+		${PREFIX}/bin/rarchie
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/finger/finger \
+		${PREFIX}/bin/rfinger
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/finger/whois \
+		${PREFIX}/bin/rwhois
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/ftp/ftp \
+		${PREFIX}/bin/rftp
+	${INSTALL_PROGRAM} ${WRKBUILD}/clients/telnet/telnet \
+		${PREFIX}/bin/rtelnet
+	${INSTALL_DATA} ${WRKBUILD}/include/socks.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKBUILD}/lib/libsocks5.a ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKBUILD}/man/man1/socks5.1 ${PREFIX}/man/man8/socks5.8
+	${INSTALL_MAN} ${WRKBUILD}/man/man1/stopsocks.1 \
+		${PREFIX}/man/man8/stopsocks.8
+	${INSTALL_MAN} ${WRKBUILD}/man/man1/socks5_clients.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKBUILD}/man/man5/* ${PREFIX}/man/man5
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/socks
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/socks
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/lib/socks
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/socks
-	@${LDCONFIG} -m ${PREFIX}/lib
+	${INSTALL_MAN_DIR} ${PREFIX}/share/doc/socks
+	${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/socks
+	@if [ ! x"$INSTALL_RUNSOCKS" = "x" ]; then \
+		${INSTALL_DATA} ${WRKBUILD}/shlib/libsocks5_sh.so \
+			${PREFIX}/lib; \
+		${INSTALL_SCRIPT} ${WRKBUILD}/runsocks ${PREFIX}/bin; \
+		${INSTALL_MAN} ${WRKBUILD}/man/man1/runsocks.1 \
+			${PREFIX}/man/man1; \
+	fi

 .include <bsd.port.mk>
+
+.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:U} == YES
+INSTALL_RUNSOCKS=
+.else
+INSTALL_RUNSOCKS=	Yes
+.endif
--- a/security/socks5/files/runsocks.in
+++ b/security/socks5/files/runsocks.in
@ -0,0 +1,11 @@
+#!/bin/sh
+# $OpenBSD: runsocks.in,v 1.1 2000/03/27 23:02:45 form Exp $
+
+if [ -n "${LD_PRELOAD}" ]; then
+	LD_PRELOAD="@PREFIX@/lib/libsocks5_sh.so:${LD_PRELOAD}"
+else
+	LD_PRELOAD="@PREFIX@/lib/libsocks5_sh.so"
+fi
+export LD_PRELOAD
+
+exec "$@"
--- a/security/socks5/patches/patch-ab
+++ b/security/socks5/patches/patch-ab
@ -1,20 +0,0 @@
--- aclocal.m4.orig	Fri Mar 12 17:27:38 1999
-+++ aclocal.m4	Fri Mar 12 17:28:08 1999
-@@ -113,7 +113,7 @@
- 	UNIX_SV*|UNIX_System_V*)
- 		SHLIB_LFLAGS="-G"
- 		;;
-	FreeBSD*|NetBSD*)
-+	FreeBSD*|NetBSD*|OpenBSD*)
- 		SHLIB_LFLAGS="-Bshareable"
- 		SHLIB_CFLAGS="-fpic"
- 		PRELOADS="LD_PRELOAD"
-@@ -164,7 +164,7 @@
- 		UNIX_SV*|UNIX_System_V*)
- 			SHLIB_CFLAGS=
- 			;;
-		FreeBSD*|NetBSD*)
-+		FreeBSD*|NetBSD*|OpenBSD*)
- 			;;
- 		*)
- 			SHLIB_LD="gcc"
--- a/security/socks5/patches/patch-configure
+++ b/security/socks5/patches/patch-configure
@ -1,3 +1,5 @@
+# $OpenBSD: patch-configure,v 1.1 2000/03/27 23:02:47 form Exp $
+
 --- configure.orig	Fri Mar 12 17:23:42 1999
 +++ configure	Fri Mar 12 17:26:20 1999
@@ -4732,7 +4732,7 @@
--- a/security/socks5/patches/patch-rld-c
+++ b/security/socks5/patches/patch-rld-c
@ -0,0 +1,24 @@
+# $OpenBSD: patch-rld-c,v 1.1 2000/03/27 23:02:47 form Exp $
+
+--- lib/rld.c.orig	Tue Mar 28 04:56:16 2000
+++ lib/rld.c	Tue Mar 28 04:56:49 2000
+@@ -118,8 +118,10 @@
+     /* Synchronize access to func and lib opening functions if we can...     */
+ 
+ #if __FreeBSD__ != 2
+#ifndef __OpenBSD__
+     name++;
+ #endif
+#endif
+ 
+     if (*fptr) return;
+ 
+@@ -143,7 +145,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__) && !defined(__OpenBSD__)
+     name++;
+ #endif
+ 
--- a/security/socks5/patches/patch-socks5-1
+++ b/security/socks5/patches/patch-socks5-1
@ -0,0 +1,10 @@
+# $OpenBSD: patch-socks5-1,v 1.1 2000/03/27 23:02:47 form Exp $
+
+--- man/man1/socks5.1.orig	Tue Mar 28 06:17:35 2000
+++ man/man1/socks5.1	Tue Mar 28 06:17:38 2000
+@@ -1,4 +1,4 @@
+-.TH socks5 1 "7 Oct 1998"
+.TH socks5 8 "7 Oct 1998"
+ .SH NAME
+ .HP 9
+ socks5 \- A daemon that implements the SOCKS v5 protocol to execute proxy requests for a client
--- a/security/socks5/patches/patch-socks5-conf-5
+++ b/security/socks5/patches/patch-socks5-conf-5
@ -0,0 +1,31 @@
+# $OpenBSD: patch-socks5-conf-5,v 1.1 2000/03/27 23:02:48 form Exp $
+
+--- man/man5/socks5.conf.5.orig	Tue Mar 28 06:20:55 2000
+++ man/man5/socks5.conf.5	Tue Mar 28 06:21:14 2000
+@@ -78,7 +78,7 @@
+ .PP
+ When the configuration file does not contain \fB auth\fP lines, any authentication works. Omitting auth lines is the same as specifying an \fIauthpattern\fP containing -, any authentication.  If \fBauth\fP lines are used, clients not matching will be refused.
+ .PP
+-When the socks5 daemon does not require authentication, it receives no user information unless socks5 configuration requires ident responses. Use the SOCKS5_DEMAND_IDENT environment variable to require ident responses. See socks5(1) for a complete description of socks5 environment variables.
+When the socks5 daemon does not require authentication, it receives no user information unless socks5 configuration requires ident responses. Use the SOCKS5_DEMAND_IDENT environment variable to require ident responses. See socks5(8) for a complete description of socks5 environment variables.
+ 
+ To ensure that the socks5 daemon receives usernames from the client, and to allow socks4 clients to use the server, set the \fIauthpattern\fP order to n,u. With socks5 clients, the socks daemon chooses Username/Password authentication before no authentication.
+ .PP
+@@ -129,7 +129,7 @@
+ set
+ Identifies entries that initialize environment variables for internal use.
+ .P
+-Refer to the socks5(1) ENVIRONMENT section for complete details about socks5 environment variables and values.
+Refer to the socks5(8) ENVIRONMENT section for complete details about socks5 environment variables and values.
+ .PP
+ .SH PROXY ENTRIES
+ Proxy entries describe the addresses clients can only reach through other SOCKS servers and identify how the daemon contacts the host. The daemon contacts the host directly when the configuration file does not contain an entry for that host.
+@@ -402,7 +402,7 @@
+ or destination host.
+ .PP
+ .SH SEE ALSO
+-socks5(1), libsocks5.conf(5), sockd4_to_5.pl(1)
+socks5(8), libsocks5.conf(5), sockd4_to_5.pl(1)
+ .PP
+ .SH AUTHORS
+ NWSL SOCKS5 Development Team
--- a/security/socks5/patches/patch-socks5-passwd-5
+++ b/security/socks5/patches/patch-socks5-passwd-5
@ -0,0 +1,13 @@
+# $OpenBSD: patch-socks5-passwd-5,v 1.1 2000/03/27 23:02:48 form Exp $
+
+--- man/man5/socks5.passwd.5.orig	Tue Mar 28 06:22:38 2000
+++ man/man5/socks5.passwd.5	Tue Mar 28 06:22:42 2000
+@@ -49,7 +49,7 @@
+ .SH SOCKS5 Clients
+ The socks5 client library uses the SOCKS5_USER and SOCKS5_PASSWD environment variables for a user's username and password. Set the username on the client with the SOCKS5_USER environment variable. Set the password on the client with the SOCKS5_PASSWD variable.
+ .SH SEE ALSO
+-socks5(1), socks5.conf(5) libsocks.conf(5)
+socks5(8), socks5.conf(5) libsocks.conf(5)
+ .SH AUTHOR
+ NWSL SOCKS5 Development Team
+ .br
--- a/security/socks5/patches/patch-stopsocks-1
+++ b/security/socks5/patches/patch-stopsocks-1
@ -0,0 +1,19 @@
+# $OpenBSD: patch-stopsocks-1,v 1.1 2000/03/27 23:02:48 form Exp $
+
+--- man/man1/stopsocks.1.orig	Tue Mar 28 06:19:44 2000
+++ man/man1/stopsocks.1	Tue Mar 28 06:20:06 2000
+@@ -1,4 +1,4 @@
+-.TH stopsocks 1 "1 Oct 1998"
+.TH stopsocks 8 "1 Oct 1998"
+ .SH NAME
+ stopsocks \- A script to manage standalone socks5 daemons
+ .SH SYNOPSIS
+@@ -41,7 +41,7 @@
+ Specifies the process that receives \fIsignal\fP
+ .PP
+ .SH SEE ALSO
+-socks5(1)
+socks5(8)
+ .PP
+ .SH AUTHOR
+ NWSL SOCKS5 Development Team
--- a/security/socks5/pkg/PLIST
+++ b/security/socks5/pkg/PLIST
@ -1,21 +1,10 @@
-bin/socks5
-bin/runsocks
-bin/stopsocks
 bin/rarchie
 bin/rfinger
 bin/rftp
-bin/rping
 bin/rtelnet
-bin/rtraceroute
+bin/runsocks
 bin/rwhois
 include/socks.h
-man/man1/socks5.1
-man/man1/runsocks.1
-man/man1/stopsocks.1
-man/man1/socks5_clients.1
-man/man5/libsocks5.conf.5
-man/man5/socks5.conf.5
-man/man5/socks5.passwd.5
 lib/libsocks5.a
 lib/libsocks5_sh.so
 lib/socks/README
@ -27,9 +16,22 @@ lib/socks/socks5.conf.gssapi
 lib/socks/socks5.conf.multipleservers
 lib/socks/socks5.conf.server2server
 lib/socks/socks5.conf.singlehomed
+man/man1/runsocks.1
+man/man1/socks5_clients.1
+man/man5/libsocks5.conf.5
+man/man5/socks5.conf.5
+man/man5/socks5.conf.5.orig
+man/man5/socks5.passwd.5
+man/man5/socks5.passwd.5.orig
+man/man8/socks5.8
+man/man8/stopsocks.8
+sbin/rping
+sbin/rtraceroute
+sbin/socks5
+sbin/stopsocks
 share/doc/socks/rfc1928.txt
 share/doc/socks/rfc1929.txt
 share/doc/socks/rfc1961.txt
 share/doc/socks/socks.faq
-@dirrm lib/socks
@dirrm share/doc/socks
+@dirrm lib/socks
--- a/security/socks5/pkg/PLIST.noshared
+++ b/security/socks5/pkg/PLIST.noshared
@ -1,21 +1,9 @@
-bin/socks5
-bin/runsocks
-bin/stopsocks
 bin/rarchie
 bin/rfinger
 bin/rftp
-bin/rping
 bin/rtelnet
-bin/rtraceroute
 bin/rwhois
 include/socks.h
-man/man1/socks5.1
-man/man1/runsocks.1
-man/man1/stopsocks.1
-man/man1/socks5_clients.1
-man/man5/libsocks5.conf.5
-man/man5/socks5.conf.5
-man/man5/socks5.passwd.5
 lib/libsocks5.a
 lib/socks/README
 lib/socks/multiple_server.example
@ -26,9 +14,21 @@ lib/socks/socks5.conf.gssapi
 lib/socks/socks5.conf.multipleservers
 lib/socks/socks5.conf.server2server
 lib/socks/socks5.conf.singlehomed
+man/man1/socks5_clients.1
+man/man5/libsocks5.conf.5
+man/man5/socks5.conf.5
+man/man5/socks5.conf.5.orig
+man/man5/socks5.passwd.5
+man/man5/socks5.passwd.5.orig
+man/man8/socks5.8
+man/man8/stopsocks.8
+sbin/rping
+sbin/rtraceroute
+sbin/socks5
+sbin/stopsocks
 share/doc/socks/rfc1928.txt
 share/doc/socks/rfc1929.txt
 share/doc/socks/rfc1961.txt
 share/doc/socks/socks.faq
-@dirrm lib/socks
@dirrm share/doc/socks
+@dirrm lib/socks