head 1.8; access; symbols pkgsrc-2026Q2:1.8.0.122 pkgsrc-2026Q2-base:1.8 pkgsrc-2026Q1:1.8.0.120 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.118 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.116 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.114 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.112 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.110 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.108 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.106 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.104 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.102 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.100 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.98 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.96 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.94 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.92 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.90 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.88 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.86 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.84 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.82 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.80 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.78 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.76 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.72 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.52 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.74 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.70 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.68 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.66 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.64 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.62 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.60 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.58 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.56 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.54 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.50 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.48 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.46 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.44 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.42 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.40 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.38 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.36 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.34 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.32 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.30 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.28 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.26 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.24 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.22 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.20 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.18 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.16 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.14 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.12 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.10 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.8 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.6 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.4 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.7.0.2 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.6.0.26 pkgsrc-2010Q4-base:1.6 pkgsrc-2010Q3:1.6.0.24 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.22 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.20 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.18 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.16 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.14 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.12 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.10 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.8 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.6 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.4 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.2 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.10 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.8 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.6 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2011.04.14.21.27.39; author hans; state Exp; branches; next 1.7; 1.7 date 2011.03.05.17.46.41; author cegger; state Exp; branches; next 1.6; 1.6 date 2008.05.29.20.50.31; author sketch; state Exp; branches; next 1.5; 1.5 date 2008.01.09.11.35.31; author hubertf; state Exp; branches; next 1.4; 1.4 date 2007.04.28.20.17.13; author hubertf; state Exp; branches; next 1.3; 1.3 date 2006.01.03.21.48.17; author hubertf; state Exp; branches; next 1.2; 1.2 date 2004.11.26.23.03.54; author hubertf; state Exp; branches; next 1.1; 1.1 date 2004.09.20.22.58.52; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.09.20.22.58.52; author wiz; state Exp; branches; next ; desc @@ 1.8 log @Re-add hunks that got lost in last commit to patch-aa and patch-ac. @ text @$NetBSD: patch-aa,v 1.7 2011/03/05 17:46:41 cegger Exp $ --- config.c.orig 2007-09-10 22:39:48.000000000 +0200 +++ config.c 2008-05-28 16:32:56.000000000 +0100 @@@@ -267,12 +267,12 @@@@ static const char *config_def_app_versio static const char *config_def_script(void) { - return "/etc/vpnc/vpnc-script"; + return "@@PKG_SYSCONFDIR@@/vpnc/vpnc-script"; } static const char *config_def_pid_file(void) { - return "/var/run/vpnc/pid"; + return "@@VARBASE@@/run/vpnc/pid"; } static const char *config_def_vendor(void) @@@@ -186,6 +186,16 @@@@ static const char *config_def_vendor(voi return "cisco"; } +static const char *config_def_networks_list(void) +{ + return ""; +} + +static const char *config_def_dns_update(void) +{ + return "Yes"; +} + static const char *config_def_target_network(void) { return "0.0.0.0/0.0.0.0"; @@@@ -448,6 +458,21 @@@@ static const struct config_names_s { "Target network in dotted decimal or CIDR notation\n", config_def_target_network }, { + CONFIG_DNS_UPDATE, 1, 1, + "--dns-update", + "DNSUpdate", + "", + "DEPRECATED extension from Debian", + config_def_dns_update + }, { + CONFIG_TARGET_NETWORKS, 1, 1, + "--target-networks", + "Target Networks", + NULL, + "DEPRECATED extension from Debian", + config_def_networks_list + }, { + 0, 0, 0, NULL, NULL, NULL, NULL, NULL } }; @@@@ -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@@/vpnc/", name, add_dot_conf ? ".conf" : ""); return realname; } @@@@ -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); } if (!print_config) { @ 1.7 log @Apply patches from debian: - Bug fix: "Disconnect after an hour and loops trying to reconnect" - Additional vpnc functionality (resolvconf, Target Networks, DNSUpdate options) Bump revision @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- config.c.orig 2008-11-19 20:36:12.000000000 +0000 +++ config.c @@@@ -173,12 +173,12 @@@@ static const char *config_def_app_versio d59 20 @ 1.6 log @Bunch of fixes to get this working for me, including: - support $VARBASE - vpnc.conf was installed in the wrong place, rather than move it use default.conf instead to mirror what vpnc does natively, and install with secure permissions (as it contains passwords) - shell portability Bump PKGREVISION. Ok'd Jukka/Hubert. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2008/01/09 11:35:31 hubertf Exp $ d3 3 a5 3 --- config.c.orig 2007-09-10 22:39:48.000000000 +0200 +++ config.c 2008-05-28 16:32:56.000000000 +0100 @@@@ -267,12 +267,12 @@@@ static const char *config_def_app_versio d20 2 a21 7 @@@@ -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@@/vpnc/", name, add_dot_conf ? ".conf" : ""); return realname; d24 33 a56 8 @@@@ -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); d58 1 a58 2 if (!print_config) { @ 1.5 log @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. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2007/04/28 20:17:13 hubertf Exp $ d4 2 a5 2 +++ config.c 2007-09-14 14:31:56.000000000 +0200 @@@@ -267,7 +267,7 @@@@ static const char *config_def_app_versio d14 6 @ 1.4 log @Update vpnc to 0.4.0. Changes: * DragonFly BSD support by Hans-Werner Hilse * Solaris 10 fixes by Sunil * support to read obfuscated passwords from .pcf files, based on work from "HAL-9000@@evilscientists.de" * granted Dan Villiom Podlaski Christiansen svn commit privileges * Darwin support by Dan Villiom Podlaski Christiansen * UDP IP keepalive support from FreeBSD port * Juniper/ScreenOS support from Marc Huber * replace "--disable-natt --force-natt --udp" with "--natt-mode" * null cipher support from Simon Lipp * Windows/Cygwin and tap support from Paolo Zarpellon * rekeying support * various other fixes contributed by Joerg Mayer, Heiko Stamer, Plamen Todorov, Asgeir, Jukka Salmi, Wolfram Sang, Laurence MOINDROT, Chris Osicki, Anton Altaparmakov, Adam Simpkins, Ken Bell, Hanno Boeck, Kyle McKay, Dennis Schneider Also, the binary is now in .../sbin instead of .../bin. Patch contributed by Jukka Salmi in private mail. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- 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 d10 1 a10 1 + return PKG_SYSCONFDIR "/vpnc-script"; d14 1 a14 1 @@@@ -485,7 +485,7 @@@@ static char *get_config_filename(const c d19 1 a19 1 + asprintf(&realname, "%s%s%s", index(name, '/') ? "" : PKG_SYSCONFDIR "/", name, add_dot_conf ? ".conf" : ""); d23 1 a23 1 @@@@ -701,8 +701,8 @@@@ void do_config(int argc, char **argv) d29 2 a30 2 + read_config_file(PKG_SYSCONFDIR "/vpnc/default.conf", config, 1); + read_config_file(PKG_SYSCONFDIR "/vpnc.conf", config, 1); @ 1.3 log @Update vpnc to 0.3.3. Changes: * ignore \r in config files * (hopefuly) fixed 64bit bugs (Nicolas Boichat and Zach Brown) * added support for "Split-Net" Routing * introduced vpnc-script and removed vpnc-connect * always search for configfiles in /etc/vpnc/ expect if the filename contains at least one "/" * only read /etc/vpnc/default.conf and /etc/vpnc.conf if no other configfiles are provided * various other fixes contributed by Anton Altaparmakov, Randy Chou, "krabat", Andre Vanha and Nikolay Sturm @ text @d3 3 a5 3 --- config.c.orig 2005-05-01 16:06:36.000000000 -0400 +++ config.c @@@@ -125,7 +125,7 @@@@ static const char *config_def_app_versio d14 10 a23 10 @@@@ -325,7 +325,7 @@@@ static void read_config_file(const char if (index(name, '/')) realname = strdup(name); else - asprintf(&realname, "/etc/vpnc/%s", name); + asprintf(&realname, PKG_SYSCONFDIR "/vpnc/%s", name); f = fopen(realname, "r"); if (missingok && f == NULL && errno == ENOENT) { free(realname); @@@@ -520,8 +520,8 @@@@ void do_config(int argc, char **argv) d25 1 a25 1 d32 1 a32 1 @ 1.2 log @Update vpnc to 0.3.2. Changes: * vpnc-0.3.2.tar.gz Mon Nov 22 01:14:29 CET 2004 * added support for preshared without xauth * fixed NAT-T support with IOS and PIX * fixed IP-Len header (Christian Lackas) * fixed reconnection problems with IOS and PIX * vpnc-0.3.1.tar.gz Sat Nov 13 01:46:42 CET 2004 * fixed segfault in --print-config * vpnc-0.3.tar.gz Sat Nov 13 01:16:37 CET 2004 * included IPSec over UDP and NAT-T support, thanks to Tomas Mraz and Martin von Gagern * added support for interactive authentication (security tokens for example) * fixed IOS support * updated man-page * updated TODO list * fixed byte-order in debug ouput @ text @d3 1 a3 1 --- config.c.orig 2004-11-22 01:11:48.000000000 +0100 d5 19 a23 2 @@@@ -484,8 +484,8 @@@@ void do_config(int argc, char **argv) } d26 6 a31 4 - 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); a33 1 for (i = 0; config_names[i].name != NULL; i++) @ 1.1 log @Initial revision @ text @d3 5 a7 5 --- vpnc.c.orig 2004-05-13 19:24:34.000000000 +0200 +++ vpnc.c @@@@ -2298,8 +2298,8 @@@@ int main(int argc, char **argv) else read_config_file (argv[i], config, 0); d9 4 a12 4 - 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); d14 2 a15 2 if (!print_config) for (i = 0; config_names[i].name != NULL; i++) @ 1.1.1.1 log @Initial import of vpnc-0.2.1. vpnc is a VPN client for the Cisco 3000 VPN Concentrator, creating an IPSec-like connection as a tunneling network device for the local system. This is a slightly changed version of the pkgsrc-wip/vpnc (by me ;)). @ text @@