diff -Nru vpnc-0.5.3r512/debian/changelog vpnc-0.5.3r512/debian/changelog --- vpnc-0.5.3r512/debian/changelog 2012-02-16 14:19:03.000000000 -0800 +++ vpnc-0.5.3r512/debian/changelog 2012-03-13 23:26:42.000000000 -0700 @@ -1,3 +1,10 @@ +vpnc (0.5.3r512-1ubuntu1) precise; urgency=low + + * Added fetch-split-dns-prop.patch to fetch split DNS property from + Cisco VPN servers. (LP: #954747) + + -- Evan Broder Tue, 13 Mar 2012 23:26:42 -0700 + vpnc (0.5.3r512-1) unstable; urgency=low * Imported new upstream SVN snapshot with support for Fritz!Box routers diff -Nru vpnc-0.5.3r512/debian/control vpnc-0.5.3r512/debian/control --- vpnc-0.5.3r512/debian/control 2012-02-16 14:19:03.000000000 -0800 +++ vpnc-0.5.3r512/debian/control 2012-03-13 23:26:57.000000000 -0700 @@ -1,7 +1,8 @@ Source: vpnc Section: net Priority: extra -Maintainer: Florian Schlichting +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Florian Schlichting Build-Depends: debhelper (>= 9), libgnutls-dev, pkg-config Standards-Version: 3.9.2 Homepage: http://www.unix-ag.uni-kl.de/~massar/vpnc/ diff -Nru vpnc-0.5.3r512/debian/patches/fetch-split-dns-prop.patch vpnc-0.5.3r512/debian/patches/fetch-split-dns-prop.patch --- vpnc-0.5.3r512/debian/patches/fetch-split-dns-prop.patch 1969-12-31 16:00:00.000000000 -0800 +++ vpnc-0.5.3r512/debian/patches/fetch-split-dns-prop.patch 2012-03-13 23:59:06.000000000 -0700 @@ -0,0 +1,53 @@ +Description: Fetch split DNS information from Cisco servers + Cisco servers can optionally include a list of domain names that are + configured using split DNS. + . + Request that list, and then export it to the vpnc-script +Origin: http://lists.unix-ag.uni-kl.de/pipermail/vpnc-devel/2012-March/003738.html +Author: Evan Broder +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/vpnc/+bug/954747 +Forwarded: yes + +Index: vpnc-0.5.3r512/vpnc.c +=================================================================== +--- vpnc-0.5.3r512.orig/vpnc.c 2012-03-13 23:21:45.000000000 -0700 ++++ vpnc-0.5.3r512/vpnc.c 2012-03-13 23:37:09.495911698 -0700 +@@ -1086,6 +1086,18 @@ + } + break; + ++ case ISAKMP_MODECFG_ATTRIB_CISCO_SPLIT_DNS: ++ if (a->af != isakmp_attr_lots) { ++ reject = ISAKMP_N_ATTRIBUTES_NOT_SUPPORTED; ++ break; ++ } ++ strbuf = xallocc(a->u.lots.length + 1); ++ memcpy(strbuf, a->u.lots.data, a->u.lots.length); ++ addenv("CISCO_SPLIT_DNS", strbuf); ++ free(strbuf); ++ DEBUG(2, printf("Split DNS: %s\n", a->u.lots.data)); ++ break; ++ + case ISAKMP_MODECFG_ATTRIB_CISCO_SAVE_PW: + DEBUG(2, printf("got save password setting: %d\n", a->u.attr_16)); + break; +@@ -2433,6 +2445,7 @@ + a->u.lots.data = xallocc(a->u.lots.length); + memcpy(a->u.lots.data, uts.nodename, a->u.lots.length); + ++ a = new_isakmp_attribute(ISAKMP_MODECFG_ATTRIB_CISCO_SPLIT_DNS, a); + a = new_isakmp_attribute(ISAKMP_MODECFG_ATTRIB_CISCO_SPLIT_INC, a); + a = new_isakmp_attribute(ISAKMP_MODECFG_ATTRIB_CISCO_SAVE_PW, a); + +Index: vpnc-0.5.3r512/vpnc-script +=================================================================== +--- vpnc-0.5.3r512.orig/vpnc-script 2012-03-13 23:21:45.000000000 -0700 ++++ vpnc-0.5.3r512/vpnc-script 2012-03-13 23:21:45.000000000 -0700 +@@ -15,6 +15,7 @@ + #* INTERNAL_IP6_DNS -- IPv6 list of dns servers + #* CISCO_DEF_DOMAIN -- default domain name + #* CISCO_BANNER -- banner from server ++#* CISCO_SPLIT_DNS -- comma-separated list of domain names with split DNS + #* CISCO_SPLIT_INC -- number of networks in split-network-list + #* CISCO_SPLIT_INC_%d_ADDR -- network address + #* CISCO_SPLIT_INC_%d_MASK -- subnet mask (for example: 255.255.255.0) diff -Nru vpnc-0.5.3r512/debian/patches/series vpnc-0.5.3r512/debian/patches/series --- vpnc-0.5.3r512/debian/patches/series 2012-02-16 14:19:03.000000000 -0800 +++ vpnc-0.5.3r512/debian/patches/series 2012-03-13 23:21:45.000000000 -0700 @@ -2,3 +2,4 @@ 04_debianitis.patch fix_make_test.patch fix_makefile_VERSION.patch +fetch-split-dns-prop.patch