rpms/vpnc/devel vpnc-helper, NONE, 1.1 vpnc.consolehelper, 1.1, 1.2 vpnc.spec, 1.19, 1.20

[Tomas Mraz (tmraz)]

Author: tmraz

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

Modified Files:
	vpnc.consolehelper vpnc.spec 
Added Files:
	vpnc-helper 
Log Message:
* Wed Jan 17 2007 Tomas Mraz <tmraz at redhat.com> - 0.3.3-15
- do not overwrite personalized vpnc scripts (#195842)
- we must not allow commandline options to vpnc when run through consolehelper



--- NEW FILE vpnc-helper ---
#!/bin/sh
/usr/sbin/vpnc


Index: vpnc.consolehelper
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.consolehelper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc.consolehelper	17 Jan 2007 22:14:00 -0000	1.1
+++ vpnc.consolehelper	17 Jan 2007 22:48:24 -0000	1.2
@@ -1,2 +1,2 @@
 USER=root
-PROGRAM=/usr/sbin/vpnc
+PROGRAM=/usr/sbin/vpnc-helper


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vpnc.spec	17 Jan 2007 22:14:00 -0000	1.19
+++ vpnc.spec	17 Jan 2007 22:48:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -12,6 +12,7 @@
 Source2:	vpnc.consolehelper
 Source3:	vpnc-disconnect.consolehelper
 Source4:	vpnc.pam
+Source5:	vpnc-helper
 Patch0:         vpnc-0.3.2-pie.patch
 Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.3.3-ip-output.patch
@@ -70,6 +71,8 @@
     $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vpnc
 install -Dp -m 0644 %{SOURCE4} \
     $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vpnc-disconnect
+install -m 0755 %{SOURCE5} \
+    $RPM_BUILD_ROOT%{_sbindir}/vpnc-helper
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect
@@ -82,9 +85,10 @@
 %doc README COPYING
 
 %dir %{_sysconfdir}/vpnc
-%{_sysconfdir}/vpnc/vpnc-script
+%config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
-%{_sbindir}/*
+%{_sbindir}/vpnc
+%{_sbindir}/vpnc-disconnect
 %{_mandir}/man8/*
 %dir %{_var}/run/vpnc
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/pid
@@ -96,8 +100,13 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/vpnc*
 %config(noreplace) %{_sysconfdir}/pam.d/vpnc*
 %{_bindir}/vpnc*
+%{_sbindir}/vpnc-helper
 
 %changelog
+* Wed Jan 17 2007 Tomas Mraz <tmraz at redhat.com> - 0.3.3-15
+- do not overwrite personalized vpnc scripts (#195842)
+- we must not allow commandline options to vpnc when run through consolehelper
+
 * Wed Jan 17 2007 Tomas Mraz <tmraz at redhat.com> - 0.3.3-14
 - add consoleuser subpackage (#160571)
 - fix permissions on manpage (#222578)