Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 02 Apr 2004 18:23:05 +0400
From:      Sergey Matveychuk <sem@ciam.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/65075: [PATCH] net/socks5: compile with password file, add startup script
Message-ID:  <E1B9PZZ-0008oK-B4@avim.ciam.ru>
Resent-Message-ID: <200404021430.i32EUAdu017200@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         65075
>Category:       ports
>Synopsis:       [PATCH] net/socks5: compile with password file, add startup script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 02 06:30:10 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 4.8-RELEASE-p13 i386
>Organization:
>Environment:
System: FreeBSD avim.ciam.ru 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #2: Thu Jan 22 16:16:10 MSK 2004
>Description:
[DESCRIBE CHANGES]
* compile with password file support (turning on in socks5.conf)
* add startup script
* bump PORTVERSION

Added file(s):
- files/socks5.sh.sample

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- socks5-1.0.11_3.patch begins here ---
diff -ruN --exclude=CVS /ports/net/socks5.orig/Makefile /ports/net/socks5/Makefile
--- /ports/net/socks5.orig/Makefile	Fri Feb 27 05:35:35 2004
+++ /ports/net/socks5/Makefile	Fri Apr  2 17:42:57 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	socks5
 PORTVERSION=	1.0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net security
 DISTNAME=	socks5-v1.0r11
 
@@ -32,13 +32,18 @@
 		--with-srvconffile=${PREFIX}/etc/socks5.conf \
 		--with-srvpidfile=/var/run/socks5.pid \
 		--with-srvidtfile=/var/run/socks5.ident \
+		--with-srvpwdfile=${PREFIX}/etc/socks5.passwd \
 		${EXTRA_CONFIGURE_ARGS}
 MAN1=		runsocks.1 socks5.1 stopsocks.1 socks5_clients.1
 MAN5=		libsocks5.conf.5 socks5.conf.5 socks5.passwd.5
 CONFIGURE_ENV=	LIBS=-lcrypt
 
-.if !defined(NOPORTDOCS)
 post-install:
+	@if [ ! -f ${PREFIX}/etc/rc.d/socks5.sh ]; then \
+		${ECHO} "Creating ${PREFIX}/etc/rc.d/socks5.sh startup file."; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/socks5.sh.sample ${PREFIX}/etc/rc.d/socks5.sh; \
+	 fi
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 	@${MKDIR} ${DOCSDIR}
diff -ruN --exclude=CVS /ports/net/socks5.orig/files/socks5.sh.sample /ports/net/socks5/files/socks5.sh.sample
--- /ports/net/socks5.orig/files/socks5.sh.sample	Thu Jan  1 03:00:00 1970
+++ /ports/net/socks5/files/socks5.sh.sample	Fri Apr  2 17:42:57 2004
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -x ${PREFIX}/bin/socks5 ] && ${PREFIX}/bin/socks5 && echo -n ' socks5'
+	;;
+stop)
+	killall socks5 && echo -n ' socks5'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff -ruN --exclude=CVS /ports/net/socks5.orig/pkg-plist /ports/net/socks5/pkg-plist
--- /ports/net/socks5.orig/pkg-plist	Tue Mar  2 02:52:54 2004
+++ /ports/net/socks5/pkg-plist	Fri Apr  2 17:50:07 2004
@@ -1,3 +1,4 @@
+etc/rc.d/socks5.sh
 bin/socks5
 bin/runsocks
 bin/stopsocks
--- socks5-1.0.11_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1B9PZZ-0008oK-B4>