diff options
author | salo <salo@pkgsrc.org> | 2003-02-15 02:02:12 +0000 |
---|---|---|
committer | salo <salo@pkgsrc.org> | 2003-02-15 02:02:12 +0000 |
commit | a076b470af0528e9d7f6fea69630b3b879b1684a (patch) | |
tree | d09e59bdf974aaec6655ab944c3a0872cc425f94 /net/tspc | |
parent | 9e7bfcbc28e5a1b8c38e219ed7e91792e0746af3 (diff) | |
download | pkgsrc-a076b470af0528e9d7f6fea69630b3b879b1684a.tar.gz |
Update to version 0.9.7.
Addresses PR pkg/20169 by Quentin Garnier.
Changes:
- follow PKG_SYSCONFDIR
- use CONF_FILES correctly
- simplify Makefile and clean it up a bit
0.9.7
=====
- Add support for Darwin (MacOS X) (thanks to Tim Buchheim)
- Add new feature : 'retry_delay' option to retry tunnel request
to server every n seconds (thanks to Peter Todd of Linux Journal
who suggested this feature)
- Correct WindowsNT-2K-XP bugs of directory separator and environment
variables setting (thanks to Christian Meyer)
- Correct digest-md5 bug (thanks to Love from ngtrans)
- Correct linux.sh template to add default route to 2000::/3 (thanks
to Peter Schneider-Kamp)
- Correct openbsd.sh template bugs in radvd config file generation
(thanks to Stephen Harrell)
- Correct netbsd.sh template bug of radvdconfigfile variable name
(thanks to Brad Forschinger)
- Modify code to be tsp-draft compliant
- Update man pages and documentation
Diffstat (limited to 'net/tspc')
-rw-r--r-- | net/tspc/Makefile | 35 | ||||
-rw-r--r-- | net/tspc/PLIST | 5 | ||||
-rw-r--r-- | net/tspc/distinfo | 13 | ||||
-rw-r--r-- | net/tspc/patches/patch-aa | 4 | ||||
-rw-r--r-- | net/tspc/patches/patch-ab | 4 | ||||
-rw-r--r-- | net/tspc/patches/patch-ac | 4 | ||||
-rw-r--r-- | net/tspc/patches/patch-ad | 40 |
7 files changed, 74 insertions, 31 deletions
diff --git a/net/tspc/Makefile b/net/tspc/Makefile index e11be87a7eb..2bf578fab17 100644 --- a/net/tspc/Makefile +++ b/net/tspc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2003/01/28 22:03:57 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2003/02/15 02:02:12 salo Exp $ # -DISTNAME= freenet6-0.9.6 -PKGNAME= tspc-0.9.6 +DISTNAME= freenet6-0.9.7 +PKGNAME= ${DISTNAME:S/freenet6/tspc/} CATEGORIES= net MASTER_SITES= # empty EXTRACT_SUFX= .tgz @@ -14,7 +14,7 @@ COMMENT= freenet6 IPv6 tunnel server protocol client USE_PKGINSTALL= yes NO_CONFIGURE= yes INTERACTIVE_STAGE= fetch -ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-5.[8-9]-* +ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-5.[8-9]-* Darwin-*-* .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" @@ -35,33 +35,32 @@ _FETCH_MESSAGE= \ ${ECHO} " ${DOWNLOAD}."; \ ${ECHO} "===============================================================" -TSP_DIR= ${PREFIX}/share/tspc -CONF_FILES= ${WRKSRC}/bin/tspc.conf ${PREFIX}/etc/tspc.conf +FILES_SUBST+= TSP_DIR=${PREFIX}/share/tspc +EGDIR= ${PREFIX}/share/examples/tspc +CONF_FILES= ${EGDIR}/tspc.conf.default ${PKG_SYSCONFDIR}/tspc.conf pre-build: -.for file in src/Makefile src/tspc.c man/man8/tspc.8 - ${MV} ${WRKSRC}/${file} ${WRKSRC}/${file}.orig - ${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/${file}.orig > \ - ${WRKSRC}/${file} -.endfor -.for file in src/tspc.c src/tspc.conf.in - ${MV} ${WRKSRC}/${file} ${WRKSRC}/${file}.orig - ${SED} -e 's|@TSP_DIR@|${TSP_DIR}|' ${WRKSRC}/${file}.orig > \ - ${WRKSRC}/${file} +.for f in man/man5/tspc.conf.5 man/man8/tspc.8 src/Makefile \ + src/tspc.c src/tspc.c src/tspc.conf.in + @${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.orig + @${SED} ${FILES_SUBST_SED} ${WRKSRC}/${f}.orig > ${WRKSRC}/${f} .endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/tspc ${PREFIX}/sbin ${INSTALL_MAN} ${WRKSRC}/man/man5/tspc.conf.5 ${PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/man/man8/tspc.8 ${PREFIX}/man/man8 + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tspc + ${INSTALL_DATA} ${WRKSRC}/bin/tspc.conf ${EGDIR}/tspc.conf.default ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tspc ${INSTALL_DATA} ${WRKSRC}/CONTRIB.txt ${PREFIX}/share/doc/tspc ${INSTALL_DATA} ${WRKSRC}/LEGAL ${PREFIX}/share/doc/tspc ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tspc ${INSTALL_DATA_DIR} ${PREFIX}/share/tspc ${INSTALL_DATA_DIR} ${PREFIX}/share/tspc/template -.for template in checktunnel.sh cisco.sh freebsd4.sh freebsd44.sh linux.sh netbsd.sh openbsd.sh solaris8.sh - ${INSTALL_SCRIPT} ${WRKSRC}/template/${template} ${PREFIX}/share/tspc/template -.endfor + cd ${WRKSRC}/template && \ + ${INSTALL_SCRIPT} checktunnel.sh cisco.sh darwin.sh freebsd4.sh \ + freebsd44.sh linux.sh netbsd.sh openbsd.sh solaris8.sh \ + ${PREFIX}/share/tspc/template .include "../../mk/bsd.pkg.mk" diff --git a/net/tspc/PLIST b/net/tspc/PLIST index ab18aa4f03a..f2e9987b091 100644 --- a/net/tspc/PLIST +++ b/net/tspc/PLIST @@ -1,12 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/22 18:14:51 grant Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/02/15 02:02:13 salo Exp $ man/man5/tspc.conf.5 man/man8/tspc.8 sbin/tspc +share/examples/tspc/tspc.conf.default share/doc/tspc/CONTRIB.txt share/doc/tspc/LEGAL share/doc/tspc/README share/tspc/template/checktunnel.sh share/tspc/template/cisco.sh +share/tspc/template/darwin.sh share/tspc/template/freebsd4.sh share/tspc/template/freebsd44.sh share/tspc/template/linux.sh @@ -16,3 +18,4 @@ share/tspc/template/solaris8.sh @dirrm share/doc/tspc @dirrm share/tspc/template @dirrm share/tspc +@dirrm share/examples/tspc diff --git a/net/tspc/distinfo b/net/tspc/distinfo index 06619a42661..16b4b221188 100644 --- a/net/tspc/distinfo +++ b/net/tspc/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/22 18:14:52 grant Exp $ +$NetBSD: distinfo,v 1.2 2003/02/15 02:02:13 salo Exp $ -SHA1 (freenet6-0.9.6.tgz) = f3e063a25a199b10b03a322f83fdf49cd7818f72 -Size (freenet6-0.9.6.tgz) = 334333 bytes -SHA1 (patch-aa) = ba2521fe708a9bae5c8efdd6c3c7b7f957f82dd5 -SHA1 (patch-ab) = 6f3da6e14e0a0fbf1eac1735b364b38e89d845d3 -SHA1 (patch-ac) = e586056941f011765f3f4d7c96da215a24e8d054 +SHA1 (freenet6-0.9.7.tgz) = 6e8c8ab68d2fa28027ab1724383a9217a87f325d +Size (freenet6-0.9.7.tgz) = 336929 bytes +SHA1 (patch-aa) = c1ac856acdd9903ff43bdb937c5ff0d9d58ac8fd +SHA1 (patch-ab) = d5d41ae54efe336245a6afcd6460617fcb08dfe7 +SHA1 (patch-ac) = 571a0f412c31aac318bf1b6cfbe553637468ffbb +SHA1 (patch-ad) = 38905092e426d8a9ed89f8341ecfd309effa2547 diff --git a/net/tspc/patches/patch-aa b/net/tspc/patches/patch-aa index dadadf775b6..38504be5168 100644 --- a/net/tspc/patches/patch-aa +++ b/net/tspc/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/08/22 18:14:52 grant Exp $ +$NetBSD: patch-aa,v 1.2 2003/02/15 02:02:14 salo Exp $ --- src/tspc.conf.in.orig Sat May 12 04:11:49 2001 +++ src/tspc.conf.in @@ -6,7 +6,7 @@ # tsp client version # - tsp_version=1.0.0 + tsp_version=1.0.1 -tsp_dir=@tsp_dir@ +tsp_dir=@TSP_DIR@ diff --git a/net/tspc/patches/patch-ab b/net/tspc/patches/patch-ab index 2cdf13649ff..09851ede395 100644 --- a/net/tspc/patches/patch-ab +++ b/net/tspc/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/08/22 18:14:52 grant Exp $ +$NetBSD: patch-ab,v 1.2 2003/02/15 02:02:14 salo Exp $ --- src/tspc.c.orig Sat Dec 8 07:18:05 2001 +++ src/tspc.c @@ -8,7 +8,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/08/22 18:14:52 grant Exp $ -char *FileName = "tspc.conf"; -char *LogFile = "tspc.log"; -+char *FileName = "@PREFIX@/etc/tspc.conf"; ++char *FileName = "@PKG_SYSCONFDIR@/tspc.conf"; +char *LogFile = "/var/log/tspc.log"; char *ScriptDir = NULL; char *LogFileName = NULL; diff --git a/net/tspc/patches/patch-ac b/net/tspc/patches/patch-ac index b8d085faaaf..0a40743e2c3 100644 --- a/net/tspc/patches/patch-ac +++ b/net/tspc/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/08/22 18:14:52 grant Exp $ +$NetBSD: patch-ac,v 1.2 2003/02/15 02:02:15 salo Exp $ --- man/man8/tspc.8.orig Wed May 30 06:01:50 2001 +++ man/man8/tspc.8 @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/08/22 18:14:52 grant Exp $ .It Fl f Ar configuration_file Specifies a different configuration file to be used in placed of -the default file /usr/local/tsp/etc/tspc.conf. The file format is -+the default file @PREFIX@/etc/tspc.conf. The file format is ++the default file @PKG_SYSCONFDIR@/tspc.conf. The file format is detailed in .Xr tspc.conf 5 and lists the options available to customize the client. diff --git a/net/tspc/patches/patch-ad b/net/tspc/patches/patch-ad new file mode 100644 index 00000000000..1687960ada3 --- /dev/null +++ b/net/tspc/patches/patch-ad @@ -0,0 +1,40 @@ +$NetBSD: patch-ad,v 1.1 2003/02/15 02:02:15 salo Exp $ + +--- man/man5/tspc.conf.5.orig Mon Jan 6 17:14:34 2003 ++++ man/man5/tspc.conf.5 Sat Feb 15 02:42:02 2003 +@@ -87,16 +87,16 @@ + .Bl -tag -width tsp_version + .It Sy tsp_version + The current version of tspc. The current installation is at version +-1.0.0. This variable might look something like this: ++1.0.1. This variable might look something like this: + .Pp +-tsp_version=1.0.0 ++tsp_version=1.0.1 + .Pp + This variable is MANDATORY. + .It Sy tsp_dir + The current directory where tspc programs and templates are located. This + variable might look something like this: + .Pp +-tsp_dir=/usr/local/tsp ++tsp_dir=@TSP_DIR@ + .Pp + This variable is MANDATORY. + .It Sy client_v4 +@@ -205,12 +205,12 @@ + This variable is OPTIONAL. + .El + .Sh FILES +-.Bl -tag -width /install/dir/bin/tspc.conf -compact +-.It Pa /install/dir/bin/tspc.conf ++.Bl -tag -width @PKG_SYSCONFDIR@/tspc.conf -compact ++.It Pa @PKG_SYSCONFDIR@/tspc.conf + The file + .Nm tspc.conf + resides in +-.Pa /install/dir/bin . ++.Pa @PKG_SYSCONFDIR@ . + .El + .Sh SEE ALSO + .Xr tcpc 8 , |