diff --git a/vpnc.changes b/vpnc.changes index 5f2cc9a..1c6c58e 100644 --- a/vpnc.changes +++ b/vpnc.changes @@ -3,6 +3,8 @@ Sun Nov 25 18:40:46 UTC 2012 - tittiatcoke@gmail.com - Ensure that on every boot the directory /var/run/vpnc is created (bnc#773379) +- Removed patch work-with-netconfig.patch as this is now included + upstream ------------------------------------------------------------------- Tue Oct 9 08:56:14 UTC 2012 - tittiatcoke@gmail.com diff --git a/work-with-netconfig.patch b/work-with-netconfig.patch deleted file mode 100644 index db7afe2..0000000 --- a/work-with-netconfig.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- vpnc-script.in 2009-09-05 19:10:59.000000000 +0200 -+++ vpnc-script.in 2011-08-26 16:11:57.217160278 +0200 -@@ -76,9 +76,9 @@ - if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo - MODIFYRESOLVCONF=modify_resolvconf_manager - RESTORERESOLVCONF=restore_resolvconf_manager --elif [ -x /sbin/modify_resolvconf ]; then # Mandatory tool on Suse earlier than 11.1 -- MODIFYRESOLVCONF=modify_resolvconf_suse -- RESTORERESOLVCONF=restore_resolvconf_suse -+elif [ -x /sbin/netconfig ]; then # Mandatory tool on Suse later than 11.2 -+ MODIFYRESOLVCONF=modify_resolvconf_suse_netconfig -+ RESTORERESOLVCONF=restore_resolvconf_suse_netconfig - else # Generic for any OS - MODIFYRESOLVCONF=modify_resolvconf_generic - RESTORERESOLVCONF=restore_resolvconf_generic -@@ -344,6 +344,25 @@ - esac - fi - } -+# === resolv.conf handling via /sbin/netconfig (Suse 11.1) ===================== -+ -+# Suse provides a script that modifies resolv.conf. Use it because it will -+# restart/reload all other services that care about it (e.g. lwresd). [unclear if this is still true, but probably --mlk] -+ -+modify_resolvconf_suse_netconfig() -+{ -+ /sbin/netconfig modify -s vpnc -i "$TUNDEV" <<-EOF -+ INTERFACE='$TUNDEV' -+ DNSSERVERS='$INTERNAL_IP4_DNS' -+ DNSDOMAIN='$CISCO_DEF_DOMAIN' -+ EOF -+} -+# Restore resolv.conf to old contents on Suse -+restore_resolvconf_suse_netconfig() -+{ -+ /sbin/netconfig remove -s vpnc -i "$TUNDEV" -+} -+ - # === resolv.conf handling via /sbin/modify_resolvconf (Suse) ===================== - - # Suse provides a script that modifies resolv.conf. Use it because it will