rpms/vpnc/devel vpnc-0.5.1-domain.patch, NONE, 1.1 vpnc-cleanup, NONE, 1.1 vpnc.spec, 1.29, 1.30

[Tomáš Mráz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28899

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.5.1-domain.patch vpnc-cleanup 
Log Message:
* Thu Jul 24 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.1-6
- do not modify domain in resolv.conf (#446404)
- clean up modified resolv.conf on startup (#455899)


vpnc-0.5.1-domain.patch:

--- NEW FILE vpnc-0.5.1-domain.patch ---
diff -up vpnc-0.5.1/vpnc-script.domain vpnc-0.5.1/vpnc-script
--- vpnc-0.5.1/vpnc-script.domain	2008-07-24 22:06:21.000000000 +0200
+++ vpnc-0.5.1/vpnc-script	2008-07-24 22:07:08.000000000 +0200
@@ -238,7 +238,7 @@ EOF
 					LINE=""
 				fi
 				;;
-			domain*|search*)
+			search*)
 				if [ -n "$CISCO_DEF_DOMAIN" ]; then
 					LINE="$LINE $CISCO_DEF_DOMAIN"
 					CISCO_DEF_DOMAIN=""


--- NEW FILE vpnc-cleanup ---
# vpnc-cleanup - clean up vpnc modified resolv.conf
#

start on stopped rcS

stop on runlevel

script
	rm -f /var/run/vpnc/pid
	RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
	if [ -e "$RESOLV_CONF_BACKUP" ]; then
		grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 && cat "$RESOLV_CONF_BACKUP" > /etc/resolv.conf
		rm -f -- "$RESOLV_CONF_BACKUP"
	fi
end script


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- vpnc.spec	5 Apr 2008 19:16:05 -0000	1.29
+++ vpnc.spec	24 Jul 2008 21:09:49 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.5.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -13,14 +13,16 @@
 Source3:	vpnc-disconnect.consolehelper
 Source4:	vpnc.pam
 Source5:	vpnc-helper
+Source6:	vpnc-cleanup
 Patch2:		vpnc-0.4.0-cloexec.patch
 Patch3:		vpnc-0.5.1-dpd.patch
 Patch4:		vpnc-0.5.1-mtu.patch
+Patch5:		vpnc-0.5.1-domain.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
-Requires:       kernel >= 2.4
+Requires:       upstart iproute
 
 %description
 A VPN client compatible with Cisco's EasyVPN equipment.
@@ -43,6 +45,7 @@
 %patch2 -p1 -b .cloexec
 %patch3 -p1 -b .dpd
 %patch4 -p1 -b .mtu
+%patch5 -p1 -b .domain
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
@@ -72,6 +75,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect
+install -Dp -m 0644 %{SOURCE6} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/event.d/vpnc-cleanup
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,6 +88,7 @@
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
+%config(noreplace) %{_sysconfdir}/event.d/vpnc-cleanup
 %{_sbindir}/vpnc
 %{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
@@ -101,6 +107,10 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Thu Jul 24 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.1-6
+- do not modify domain in resolv.conf (#446404)
+- clean up modified resolv.conf on startup (#455899)
+
 * Sat Apr  5 2008 Michal Schmidt <mschmidt at redhat.com> - 0.5.1-5
 - vpnc-script: fix 'ip link ...' syntax.