[pkgsrc/trunk]: pkgsrc Update to 0.5.1, regard PKG_SYSCONFDIR

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Update to 0.5.1, regard PKG_SYSCONFDIR
From: hubertf <hubertf%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:41:19 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/73ce054540d7
branches:  trunk
changeset: 537458:73ce054540d7
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Wed Jan 09 11:35:26 2008 +0000

description:
Update to 0.5.1, regard PKG_SYSCONFDIR
furthermore cisco-decrypt(1) and pcf2vpnc(1) also get installed.

Changes in vpnc-0.5.1:
    * link against -lcrypto instead of -lssl, fix from: Christophe Thil
    * fixed crashes on 64bit platforms by Tomas Mraz, report by Brian Downing
    * fixes to keepalive code from Brian Downing
    * generate options part of the manpage automatically, by Wolfram Sang
    * fix dead peer detection problems with Sonicwall, by Gerald Hanusch and
      Wolfgang Astleitner
    * fix disconnect problems with Sonicwall (please test if it fixes the known
      problems with Cisco), by Gerald Hanusch and Wolfgang Astleitner
    * again special thanks Joerg Mayer for handling all patches since the
    * various other fixes contributed by Scott Rankin, Markus Meschederu

Changes in vpnc-0.5.0:
    * Dead-Peer-Detection support by Kyle McKay
    * Hybrid-Auth support by Andreas Hoffmann, merged by Chris Walter (depends
      on OpenSSL, deactivatable at compile-time)
    * granted Joerg Mayer svn commit privileges, special thanks to him for doing
      so much work on vpnc during the last month (-:
    * various other fixes contributed by Kyle McKay, Petr Salinger, Christian
      Faulhammer, Kyle McKay, Paolo Zarpellon, Joerg Mayer, Marcus Obst, Mika
      Liljeberg, Eduard Bloch, Wolfram Sang, Jukka Salmi, Gustavo Sverzut Barbieri,
      Soren Hansen, Mike Javorski.
    * first round of a general code cleanup (far less global variables / etc)

Patch submitted by Jukka Sallmi in PR pkg/37046.

diffstat:

 doc/CHANGES-2008          |   3 ++-
 net/vpnc/Makefile         |  37 +++++++++++++++++++++++++------------
 net/vpnc/PLIST            |   6 +++++-
 net/vpnc/distinfo         |  16 +++++++++-------
 net/vpnc/patches/patch-aa |  20 ++++++++++----------
 net/vpnc/patches/patch-ab |  19 ++++++++-----------
 net/vpnc/patches/patch-ac |  25 ++++++++++++++-----------
 7 files changed, 73 insertions(+), 53 deletions(-)

diffs (230 lines):

diff -r 2af13acadf71 -r 73ce054540d7 doc/CHANGES-2008
--- a/doc/CHANGES-2008  Wed Jan 09 09:28:00 2008 +0000
+++ b/doc/CHANGES-2008  Wed Jan 09 11:35:26 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2008,v 1.67 2008/01/09 09:28:00 bjs Exp $
+$NetBSD: CHANGES-2008,v 1.68 2008/01/09 11:35:26 hubertf Exp $
 
 Changes to the packages collection and infrastructure in 2008:
 
@@ -119,3 +119,4 @@
        Updated www/elinks to 0.11.20080109nb1 [bjs 2008-01-09]
        Updated x11/pixman to 0.9.6nb2 [bjs 2008-01-09]
        Updated net/btpd to 0.12 [bjs 2008-01-09]
+       Updated net/vpnc to 0.5.1 [hubertf 2008-01-09]
diff -r 2af13acadf71 -r 73ce054540d7 net/vpnc/Makefile
--- a/net/vpnc/Makefile Wed Jan 09 09:28:00 2008 +0000
+++ b/net/vpnc/Makefile Wed Jan 09 11:35:26 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2007/04/28 20:17:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2008/01/09 11:35:31 hubertf Exp $
 #
 
-DISTNAME=              vpnc-0.4.0
+DISTNAME=              vpnc-0.5.1
 CATEGORIES=            net security
 MASTER_SITES=          http://www.unix-ag.uni-kl.de/~massar/vpnc/
 
@@ -13,23 +13,36 @@
 
 USE_TOOLS+=            gmake
 USE_TOOLS+=            perl
-BUILD_TARGET=          vpnc
-INSTALLATION_DIRS=     bin ${PKGMANDIR}/man8
+INSTALLATION_DIRS=     bin sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
+                       share/doc/vpnc share/examples/vpnc
+OWN_DIRS=              ${PKG_SYSCONFDIR}/vpnc
 
-EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=           ${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc.conf
-CONF_FILES_PERMS+=     ${EGDIR}/vpnc-script ${PKG_SYSCONFDIR}/vpnc-script ${ROOT_USER} ${ROOT_GROUP} 755
+SUBST_CLASSES+=        paths
+SUBST_MESSAGE.paths=   fixing pathnames
+SUBST_STAGE.paths=     post-patch
+SUBST_FILES.paths=     config.c vpnc-script makeman.pl pcf2vpnc vpnc.8.template
+SUBST_SED.paths=       -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
+SUBST_SED.paths+=      -e 's|@PREFIX@|${PREFIX}|g'
+SUBST_SED.paths+=      -e 's|@PKGMANDIR@|${PKGMANDIR}|g'
+SUBST_SED.paths+=      -e 's|@VARBASE@|${VARBASE}|g'
+SUBST_SED.paths+=      -e 's|@PERL5@|${PERL5}|g'
+SUBST_SED.paths+=      -e 's|@PERL5@|${PERL5}|g'
+
+EGDIR=                 ${PREFIX}/share/examples/vpnc
+CONF_FILES+=           ${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc/vpnc.conf
+CONF_FILES_PERMS+=     ${EGDIR}/vpnc-script ${PKG_SYSCONFDIR}/vpnc/vpnc-script ${ROOT_USER} ${ROOT_GROUP} 755
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vpnc
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       :
        ${INSTALL_PROGRAM} ${WRKSRC}/vpnc ${PREFIX}/sbin
+       ${INSTALL_PROGRAM} ${WRKSRC}/cisco-decrypt ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/vpnc-script ${EGDIR}
+       ${INSTALL_MAN} ${WRKSRC}/vpnc.conf ${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/vpnc-disconnect ${PREFIX}/bin
+       ${INSTALL_SCRIPT} ${WRKSRC}/pcf2vpnc ${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_MAN} ${WRKSRC}/pcf2vpnc.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/cisco-decrypt.1 ${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/vpnc
-       ${INSTALL_MAN} ${WRKSRC}/vpnc.conf ${EGDIR}
-       ${INSTALL_SCRIPT} ${WRKSRC}/vpnc-script ${EGDIR}
 
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2af13acadf71 -r 73ce054540d7 net/vpnc/PLIST
--- a/net/vpnc/PLIST    Wed Jan 09 09:28:00 2008 +0000
+++ b/net/vpnc/PLIST    Wed Jan 09 11:35:26 2008 +0000
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2007/04/28 20:17:11 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/01/09 11:35:31 hubertf Exp $
+bin/cisco-decrypt
+bin/pcf2vpnc
 bin/vpnc-disconnect
+man/man1/cisco-decrypt.1
+man/man1/pcf2vpnc.1
 man/man8/vpnc.8
 sbin/vpnc
 share/doc/vpnc/README
diff -r 2af13acadf71 -r 73ce054540d7 net/vpnc/distinfo
--- a/net/vpnc/distinfo Wed Jan 09 09:28:00 2008 +0000
+++ b/net/vpnc/distinfo Wed Jan 09 11:35:26 2008 +0000
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2007/04/28 20:17:12 hubertf Exp $
+$NetBSD: distinfo,v 1.9 2008/01/09 11:35:31 hubertf Exp $
 
-SHA1 (vpnc-0.4.0.tar.gz) = e39b63bbebf37758e8fb7eb2ec44dfc9b7afdaab
-RMD160 (vpnc-0.4.0.tar.gz) = 1640481601074d4517746f6e3b147b12f24b06e3
-Size (vpnc-0.4.0.tar.gz) = 75491 bytes
-SHA1 (patch-aa) = 80c183434e635cb95a0a6f0a481b118e654e6699
-SHA1 (patch-ab) = 458f86249e20d1948b5f99f5d4f39c35b19a0e13
-SHA1 (patch-ac) = 3f680616b4d49b3f6b525fc75669166798819376
+SHA1 (vpnc-0.5.1.tar.gz) = efc71dba03aa40945af35e4b074d99f922ff7ffd
+RMD160 (vpnc-0.5.1.tar.gz) = 76dd5a3a38bd2109cf8e1fbad85e2762e8489832
+Size (vpnc-0.5.1.tar.gz) = 91496 bytes
+SHA1 (patch-aa) = 93beb83165aeb0abb9605f0d8ce9d203726d7d04
+SHA1 (patch-ab) = 9eb2db944f6428401990659984abd38a07c3454f
+SHA1 (patch-ac) = 7cde3e693a73e5848de596a49d23e4be45a7d8a9
+SHA1 (patch-ad) = 7e31f1804541eb4de9924edcc517304487aad0f2
+SHA1 (patch-ae) = d831819831a5861550c5924955cc270c58341d9d
diff -r 2af13acadf71 -r 73ce054540d7 net/vpnc/patches/patch-aa
--- a/net/vpnc/patches/patch-aa Wed Jan 09 09:28:00 2008 +0000
+++ b/net/vpnc/patches/patch-aa Wed Jan 09 11:35:26 2008 +0000
@@ -1,33 +1,33 @@
-$NetBSD: patch-aa,v 1.4 2007/04/28 20:17:13 hubertf Exp $
+$NetBSD: patch-aa,v 1.5 2008/01/09 11:35:31 hubertf Exp $
 
---- config.c.orig      2007-02-16 18:22:06.000000000 +0100
-+++ config.c   2007-04-28 11:30:56.000000000 +0200
-@@ -251,7 +251,7 @@ static const char *config_def_app_versio
+--- config.c.orig      2007-09-10 22:39:48.000000000 +0200
++++ config.c   2007-09-14 14:31:56.000000000 +0200
+@@ -267,7 +267,7 @@ static const char *config_def_app_versio
  
  static const char *config_def_script(void)
  {
 -      return "/etc/vpnc/vpnc-script";
-+      return PKG_SYSCONFDIR "/vpnc-script";
++      return "@PKG_SYSCONFDIR@/vpnc/vpnc-script";
  }
  
  static const char *config_def_pid_file(void)
-@@ -485,7 +485,7 @@ static char *get_config_filename(const c
+@@ -538,7 +538,7 @@ static char *get_config_filename(const c
  {
        char *realname;
        
 -      asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : "");
-+      asprintf(&realname, "%s%s%s", index(name, '/') ? "" : PKG_SYSCONFDIR "/", name, add_dot_conf ? ".conf" : "");
++      asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "@PKG_SYSCONFDIR@/vpnc/", name, add_dot_conf ? ".conf" : "");
        return realname;
  }
  
-@@ -701,8 +701,8 @@ void do_config(int argc, char **argv)
+@@ -757,8 +757,8 @@ void do_config(int argc, char **argv)
        }
        
        if (!got_conffile) {
 -              read_config_file("/etc/vpnc/default.conf", config, 1);
 -              read_config_file("/etc/vpnc.conf", config, 1);
-+              read_config_file(PKG_SYSCONFDIR "/vpnc/default.conf", config, 1);
-+              read_config_file(PKG_SYSCONFDIR "/vpnc.conf", config, 1);
++              read_config_file("@PKG_SYSCONFDIR@/vpnc/default.conf", config, 1);
++              read_config_file("@PKG_SYSCONFDIR@/vpnc.conf", config, 1);
        }
        
        if (!print_config) {
diff -r 2af13acadf71 -r 73ce054540d7 net/vpnc/patches/patch-ab
--- a/net/vpnc/patches/patch-ab Wed Jan 09 09:28:00 2008 +0000
+++ b/net/vpnc/patches/patch-ab Wed Jan 09 11:35:26 2008 +0000
@@ -1,13 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2007/04/28 20:17:13 hubertf Exp $
+$NetBSD: patch-ab,v 1.5 2008/01/09 11:35:31 hubertf Exp $
 
---- Makefile.orig      2007-02-19 21:51:12.000000000 +0100
-+++ Makefile   2007-04-28 11:32:25.000000000 +0200
-@@ -35,7 +35,7 @@ VERSION := $(shell sh mk-version)
- RELEASE_VERSION := $(shell cat VERSION)
+--- makeman.pl.orig    2007-09-10 22:39:48.000000000 +0200
++++ makeman.pl 2007-09-14 14:39:22.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl -w
++#! @PERL5@ -w
  
- CC=gcc
--CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
-+CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR}\"
- CPPFLAGS = -DVERSION=\"$(VERSION)\"
- LDFLAGS = -g $(shell libgcrypt-config --libs)
- CFLAGS +=  $(shell libgcrypt-config --cflags)
+ # $Id: patch-ab,v 1.5 2008/01/09 11:35:31 hubertf Exp $
+ 
diff -r 2af13acadf71 -r 73ce054540d7 net/vpnc/patches/patch-ac
--- a/net/vpnc/patches/patch-ac Wed Jan 09 09:28:00 2008 +0000
+++ b/net/vpnc/patches/patch-ac Wed Jan 09 11:35:26 2008 +0000
@@ -1,31 +1,34 @@
-$NetBSD: patch-ac,v 1.4 2007/04/28 20:17:13 hubertf Exp $
+$NetBSD: patch-ac,v 1.5 2008/01/09 11:35:31 hubertf Exp $
 
---- vpnc-script.orig   2007-02-18 12:52:03.000000000 +0100
-+++ vpnc-script        2007-04-28 11:49:41.000000000 +0200
-@@ -31,12 +31,13 @@ case "$OS" in
+--- vpnc-script.orig   2007-09-06 22:05:15.000000000 +0200
++++ vpnc-script        2007-09-14 13:30:59.000000000 +0200
+@@ -56,14 +56,15 @@ case "$OS" in
                ;;
  esac
  
 -DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute
 -RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
-+STATEDIR=/var/run/vpnc
+-FULL_SCRIPTNAME=/usr/local/sbin/vpnc
++STATEDIR=@VARBASE@/run/vpnc
 +DEFAULT_ROUTE_FILE=$STATEDIR/defaultroute
 +RESOLV_CONF_BACKUP=$STATEDIR/resolv.conf-backup
++FULL_SCRIPTNAME=@PREFIX@/sbin/vpnc
+ SCRIPTNAME=`basename $FULL_SCRIPTNAME`
  
  # some systems, eg. Darwin & FreeBSD, prune /var/run on boot
 -if ! [ -d "/var/run/vpnc" ]; then
--       mkdir -p /var/run/vpnc
+-      mkdir -p /var/run/vpnc
 +if ! [ -d $STATEDIR ]; then
-+       mkdir -p $STATEDIR
++      mkdir -p $STATEDIR
  fi
  
  # stupid SunOS: no blubber in /usr/local/bin ... (on stdout)
-@@ -167,7 +168,7 @@ else
-       get_default_gw() {
+@@ -157,7 +158,7 @@ else # use route command
                # isn't -n supposed to give --numeric output?
                # apperently not...
--              netstat -r -n | sed 's/default/0.0.0.0/' | grep '^0.0.0.0' | awk '{print $2}'
-+              netstat -r -n | awk '$2 ~ /^link/ { next; } /^(default|0.0.0.0)/ { print $2; }'
+               # Get rid of lines containing IPv6 addresses (':')
+-              netstat -r -n | sed 's/default/0.0.0.0/' | sed 's/^.*:.*$//' | grep '^0.0.0.0' | awk '{print $2}'
++              netstat -r -n | awk '/:/ { next; } $2 ~ /^link/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }'
        }
        
        set_vpngateway_route() {
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc + Updated net/btpd to 0.12 [bjs 2008-01-09]
Next by Date: [pkgsrc/trunk]: pkgsrc/net/vpnc Fix a few leftovers from previous update, not...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc + Updated net/btpd to 0.12 [bjs 2008-01-09]
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/vpnc Fix a few leftovers from previous update, not...
Indexes:
Home | Main Index | Thread Index | Old Index