Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Feb 2006 09:35:34 GMT
From:      Sergey Matveychuk <sem@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/92731: [non-maintainer] net/dante: update to 1.1.19
Message-ID:  <200602020935.k129ZYsi067116@freefall.freebsd.org>
Resent-Message-ID: <200602020940.k129e4to067516@freefall.freebsd.org>

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

>Number:         92731
>Category:       ports
>Synopsis:       [non-maintainer] net/dante: update to 1.1.19
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 02 09:40:04 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 6.0-STABLE FreeBSD 6.0-STABLE #0: Sat Dec 10 03:18:20 UTC 2005 kensmith@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


	
>Description:
	
	Update to 1.1.19
	Change startup script with rcNG one
>How-To-Repeat:
	
>Fix:

	

--- dante.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/dante/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	12 Apr 2005 03:26:11 -0000	1.24
+++ Makefile	2 Feb 2006 09:31:22 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dante
-PORTVERSION=	1.1.15
+PORTVERSION=	1.1.19
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.inet.no/pub/socks/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/ \
@@ -24,13 +24,14 @@
 
 INSTALLS_SHLIB=	yes
 
+USE_RC_SUBR=	sockd.sh
+
 MAN5=	sockd.conf.5 socks.conf.5
 MAN8=	sockd.8
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/example/socks.conf ${PREFIX}/etc/socks.conf.example
 	@${INSTALL_DATA} ${WRKSRC}/example/sockd.conf ${PREFIX}/etc/sockd.conf.example
-	@${INSTALL_SCRIPT} ${FILESDIR}/sockd.sh ${PREFIX}/etc/rc.d/sockd.sh-dist
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -m 555 ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/README* ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/dante/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	22 Jan 2006 21:22:59 -0000	1.17
+++ distinfo	2 Feb 2006 09:31:22 -0000
@@ -1,3 +1,3 @@
-MD5 (dante-1.1.15.tar.gz) = c737faf4ba6282777070d8c0580c3832
-SHA256 (dante-1.1.15.tar.gz) = a2bc514933305e3a03558c8520e871dcaa9e031e241c7af9e2ef88346ea23d69
-SIZE (dante-1.1.15.tar.gz) = 839660
+MD5 (dante-1.1.19.tar.gz) = 58b56d1e964f3f0186f3eeed3d95d9a4
+SHA256 (dante-1.1.19.tar.gz) = b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
+SIZE (dante-1.1.19.tar.gz) = 895713
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/dante/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- pkg-plist	20 Feb 2005 11:16:03 -0000	1.9
+++ pkg-plist	2 Feb 2006 09:31:22 -0000
@@ -1,7 +1,6 @@
 bin/socksify
 etc/sockd.conf.example
 etc/socks.conf.example
-etc/rc.d/sockd.sh-dist
 include/socks.h
 lib/libdsocks.so
 lib/libdsocks.so.1
@@ -9,7 +8,6 @@
 lib/libsocks.so
 lib/libsocks.so.1
 sbin/sockd
-%%PORTDOCS%%%%DOCSDIR%%/README.msproxy
 %%PORTDOCS%%%%DOCSDIR%%/README.socksify
 %%PORTDOCS%%%%DOCSDIR%%/README.survey
 %%PORTDOCS%%%%DOCSDIR%%/README.usage
Index: files/sockd.sh
===================================================================
RCS file: files/sockd.sh
diff -N files/sockd.sh
--- files/sockd.sh	28 Oct 2003 22:30:54 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-start)
-	[ -x /usr/local/sbin/sockd ] && /usr/local/sbin/sockd -D > /dev/null && echo -n ' sockd'
-	;;
-stop)
-	[ -r /var/run/sockd.pid ] && kill `cat /var/run/sockd.pid` && echo -n ' sockd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
Index: files/sockd.sh.in
===================================================================
RCS file: files/sockd.sh.in
diff -N files/sockd.sh.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/sockd.sh.in	2 Feb 2006 09:31:22 -0000
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: sockd
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable sockd:
+#
+#sockd_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name=sockd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/sockd
+pidfile=/var/run/sockd.pid
+required_files=%%PREFIX%%/etc/sockd.conf
+
+sockd_enable=${sockd_enable:-"NO"}
+sockd_flags=${sockd_flags:-"-D"}
+
+load_rc_config $name
+run_rc_command "$1"
--- dante.diff ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602020935.k129ZYsi067116>