rpm/vpnc
SHA256
1
0
Fork 0
forked from pool/vpnc
Code Pull Requests Activity

Resolving bug 712435. Using netconfig to change /etc/resolv.conf

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=56
This commit is contained in:
Raymond Wooninck 2011-08-26 14:18:11 +00:00 committed by Git OBS Bridge
parent 5fd66099e8
commit 2b0803662e
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vpnc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 26 14:16:47 UTC 2011 - tittiatcoke@gmail.com
- Added patch to change /etc/resolv.conf with the help of netconfig
(bnc#712435)
-------------------------------------------------------------------
Thu Aug 4 10:25:45 UTC 2011 - tittiatcoke@gmail.com

2
vpnc.spec
View File

@ -31,6 +31,7 @@ Requires: /usr/bin/sed /sbin/ip
Source: %{name}-%{version}.tar.bz2
Patch0: bugfix.diff
Patch1: vpnc-no-build-dates.patch
Patch2: work-with-netconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -57,6 +58,7 @@ Authors:
%setup -n %{name}
%patch0 -p0
%patch1
%patch2 -p0
%build
export CFLAGS="%optflags -fno-strict-aliasing"

41
work-with-netconfig.patch Normal file
View File

@ -0,0 +1,41 @@
--- 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