ports/109356: [UPDATE] net/vtun 2.6_2 -> 3.0.0
Martin Matuska
martin at matuska.org
Tue Feb 20 10:50:10 UTC 2007
>Number: 109356
>Category: ports
>Synopsis: [UPDATE] net/vtun 2.6_2 -> 3.0.0
>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: Tue Feb 20 10:50:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
Update of net/vtun from 2.6_2 to 3.0.0
- Makefile cleanup
- NOPORTDOCS support, DOCSDIR in pkg-plist
- fixed startup scripts and knobs
Files removed:
files/patch-configure.in (already in source)
Files renamed/moved:
files/vtunclient.sh -> files/vtunclient.in
files/vtund.sh -> files/vtund.in
portlint -a:
looks fine.
Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/vtun-3.0.0.log
>How-To-Repeat:
>Fix:
diff -Nbur net/vtun.orig/Makefile net/vtun/Makefile
--- net/vtun.orig/Makefile Tue Nov 15 07:50:37 2005
+++ net/vtun/Makefile Tue Feb 20 11:37:54 2007
@@ -6,8 +6,7 @@
#
PORTNAME= vtun
-PORTVERSION= 2.6
-PORTREVISION= 2
+PORTVERSION= 3.0.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -22,38 +21,32 @@
MLINKS= vtund.8 vtun.8
USE_OPENSSL= yes
-USE_AUTOTOOLS= autoconf:213
+USE_AUTOTOOLS= autoconf:259
CONFIGURE_ARGS= --localstatedir=/var \
--with-ssl-headers=${OPENSSLBASE}/include/openssl \
--with-ssl-lib=${OPENSSLBASE}/lib \
--with-lzo-headers=${LOCALBASE}/include \
--with-lzo-lib=${LOCALBASE}/lib
CONFIGURE_ENV= YACC=${YACC}
-USE_RC_SUBR= yes
-
-WRKSRC= ${WRKDIR}/vtun
+USE_RC_SUBR= vtunclient vtund
ALL_TARGET= vtund
-RC_SCRIPT_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
+DOCS= ChangeLog Credits FAQ README README.LZO README.Setup \
+ README.Shaper TODO
.if defined(VTUN_EXTENDED_MODE)
# Obtained from http://home.jp.FreeBSD.org/~simokawa/vtun-v6.html
EXTRA_PATCHES= ${FILESDIR}/extra-tun_dev.c
.endif
-post-build:
- @${SED} ${RC_SCRIPT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- <${FILESDIR}/vtund.sh >${WRKDIR}/vtund.sh
- @${SED} ${RC_SCRIPT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- <${FILESDIR}/vtunclient.sh >${WRKDIR}/vtunclient.sh
-
post-install:
@${INSTALL_DATA} ${WRKSRC}/vtund.conf ${PREFIX}/etc/vtund.conf.example
- @${MKDIR} ${PREFIX}/share/doc/vtund
-.for doc in FAQ README README.Setup README.Shaper
- @${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/vtund
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for doc in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
.endfor
- @${INSTALL_SCRIPT} ${WRKDIR}/vtund.sh ${PREFIX}/etc/rc.d
- @${INSTALL_SCRIPT} ${WRKDIR}/vtunclient.sh ${PREFIX}/etc/rc.d
+.endif
.include <bsd.port.mk>
diff -Nbur net/vtun.orig/distinfo net/vtun/distinfo
--- net/vtun.orig/distinfo Fri Nov 25 17:48:29 2005
+++ net/vtun/distinfo Tue Feb 20 11:05:56 2007
@@ -1,3 +1,3 @@
-MD5 (vtun-2.6.tar.gz) = 309534fd03c5d13a19c43916f61f4bbf
-SHA256 (vtun-2.6.tar.gz) = fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
-SIZE (vtun-2.6.tar.gz) = 95637
+MD5 (vtun-3.0.0.tar.gz) = 01210337eab054195ae3410a0e2c4510
+SHA256 (vtun-3.0.0.tar.gz) = 86ceadb2c3bfbcce6ec880bc5056a88f41d34aed0379fef6e4d09c4f26a82cca
+SIZE (vtun-3.0.0.tar.gz) = 123231
diff -Nbur net/vtun.orig/files/patch-configure.in net/vtun/files/patch-configure.in
--- net/vtun.orig/files/patch-configure.in Mon Jun 2 01:27:53 2003
+++ net/vtun/files/patch-configure.in Thu Jan 1 01:00:00 1970
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/net/vtun/files/patch-configure.in,v 1.1 2003/06/01 23:27:53 naddy Exp $
-
---- configure.in.orig Mon Jun 2 01:21:53 2003
-+++ configure.in Mon Jun 2 01:22:02 2003
-@@ -134,7 +134,7 @@
- AC_MSG_RESULT()
- AC_CHECKING( for md5 Library and Header files ... )
- AC_SEARCH_HEADERS(md5.h,
-- $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include, /usr/include/sys,
-+ $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys,
- ,
- AC_MSG_ERROR( SSL headers not found. )
- )
diff -Nbur net/vtun.orig/files/vtunclient.in net/vtun/files/vtunclient.in
--- net/vtun.orig/files/vtunclient.in Thu Jan 1 01:00:00 1970
+++ net/vtun/files/vtunclient.in Mon Feb 20 21:47:31 2006
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net/vtun/files/vtunclient.sh,v 1.2 2006/02/20 20:47:31 dougb Exp $
+#
+# PROVIDE: vtunclient
+# REQUIRE: DAEMON
+#
+# Add the following line to /etc/rc.conf to enable vtunclient:
+#
+# vtunclient_enable="YES"
+# vtunclient_flags="<session> <server address>"
+#
+
+vtunclient_enable=${vtunclient_enable:-"NO"}
+vtunclient_flags=${vtunclient_flags:-""}
+
+. %%RC_SUBR%%
+
+name=vtunclient
+rcvar=`set_rcvar`
+required_files="%%PREFIX%%/etc/vtund.conf"
+
+command=%%PREFIX%%/sbin/vtund
+
+load_rc_config $name
+run_rc_command "$1"
diff -Nbur net/vtun.orig/files/vtunclient.sh net/vtun/files/vtunclient.sh
--- net/vtun.orig/files/vtunclient.sh Mon Feb 20 21:47:31 2006
+++ net/vtun/files/vtunclient.sh Thu Jan 1 01:00:00 1970
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/vtun/files/vtunclient.sh,v 1.2 2006/02/20 20:47:31 dougb Exp $
-#
-# PROVIDE: vtunclient
-# REQUIRE: DAEMON
-#
-# Add the following line to /etc/rc.conf to enable vtunclient:
-#
-# vtunclient_enable="YES"
-# vtunclient_flags="<session> <server address>"
-#
-
-vtunclient_enable=${vtunclient_enable:-"NO"}
-vtunclient_flags=${vtunclient_flags:-""}
-
-. %%RC_SUBR%%
-
-name=vtunclient
-rcvar=`set_rcvar`
-required_files="%%PREFIX%%/etc/vtund.conf"
-
-command=%%PREFIX%%/sbin/vtund
-
-load_rc_config $name
-run_rc_command "$1"
diff -Nbur net/vtun.orig/files/vtund.in net/vtun/files/vtund.in
--- net/vtun.orig/files/vtund.in Thu Jan 1 01:00:00 1970
+++ net/vtun/files/vtund.in Mon Feb 20 21:47:31 2006
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/net/vtun/files/vtund.sh,v 1.2 2006/02/20 20:47:31 dougb Exp $
+#
+# PROVIDE: vtund
+# REQUIRE: DAEMON
+#
+# Add the following line to /etc/rc.conf to enable vtund:
+#
+# vtund_enable="YES"
+#
+
+vtund_enable=${vtund_enable:-"NO"}
+vtund_flags=${vtund_flags:-"-s"}
+
+. %%RC_SUBR%%
+
+name=vtund
+rcvar=`set_rcvar`
+required_files="%%PREFIX%%/etc/vtund.conf"
+
+command=%%PREFIX%%/sbin/vtund
+
+load_rc_config $name
+run_rc_command "$1"
diff -Nbur net/vtun.orig/files/vtund.sh net/vtun/files/vtund.sh
--- net/vtun.orig/files/vtund.sh Mon Feb 20 21:47:31 2006
+++ net/vtun/files/vtund.sh Thu Jan 1 01:00:00 1970
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/vtun/files/vtund.sh,v 1.2 2006/02/20 20:47:31 dougb Exp $
-#
-# PROVIDE: vtund
-# REQUIRE: DAEMON
-#
-# Add the following line to /etc/rc.conf to enable vtund:
-#
-# vtund_enable="YES"
-#
-
-vtund_enable=${vtund_enable:-"NO"}
-vtund_flags=${vtund_flags:-"-s"}
-
-. %%RC_SUBR%%
-
-name=vtund
-rcvar=`set_rcvar`
-required_files="%%PREFIX%%/etc/vtund.conf"
-
-command=%%PREFIX%%/sbin/vtund
-
-load_rc_config $name
-run_rc_command "$1"
diff -Nbur net/vtun.orig/pkg-plist net/vtun/pkg-plist
--- net/vtun.orig/pkg-plist Thu Aug 26 11:18:57 2004
+++ net/vtun/pkg-plist Tue Feb 20 11:34:59 2007
@@ -1,12 +1,14 @@
@unexec if cmp -s %D/etc/vtund.conf.example %D/etc/vtund.conf; then rm -f %D/etc/vtund.conf; fi
etc/vtund.conf.example
-etc/rc.d/vtunclient.sh
-etc/rc.d/vtund.sh
sbin/vtund
-share/doc/vtund/FAQ
-share/doc/vtund/README
-share/doc/vtund/README.Setup
-share/doc/vtund/README.Shaper
- at dirrm share/doc/vtund
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/Credits
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.LZO
+%%PORTDOCS%%%%DOCSDIR%%/README.Setup
+%%PORTDOCS%%%%DOCSDIR%%/README.Shaper
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec rm -rf /var/log/vtund
@exec rm -rf /var/lock/vtund
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list