rpms/vpnc/devel vpnc-0.4.0-cloexec.patch, 1.1, 1.2 vpnc.spec, 1.24, 1.25 vpnc-0.3.3-sbin-path.patch, 1.1, NONE vpnc-0.4.0-pie.patch, 1.1, NONE vpnc-0.4.0-sizeofbug.patch, 1.1, NONE

[Tomas Mraz (tmraz)]

Author: tmraz

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

Modified Files:
	vpnc-0.4.0-cloexec.patch vpnc.spec 
Removed Files:
	vpnc-0.3.3-sbin-path.patch vpnc-0.4.0-pie.patch 
	vpnc-0.4.0-sizeofbug.patch 
Log Message:
* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
- upgrade to latest upstream


vpnc-0.4.0-cloexec.patch:

Index: vpnc-0.4.0-cloexec.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc-0.4.0-cloexec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc-0.4.0-cloexec.patch	26 Feb 2007 12:59:05 -0000	1.1
+++ vpnc-0.4.0-cloexec.patch	20 Sep 2007 19:48:41 -0000	1.2
@@ -1,15 +1,6 @@
 --- vpnc-0.4.0/vpnc.c.cloexec	2007-02-19 21:49:51.000000000 +0100
 +++ vpnc-0.4.0/vpnc.c	2007-02-22 10:49:46.000000000 +0100
-@@ -96,6 +96,8 @@
- 	if (sock < 0)
- 		error(1, errno, "making socket");
- 
-+	fcntl(sock, F_SETFD, FD_CLOEXEC);
-+
- 	/* give the socket a name */
- 	name.sin_family = AF_INET;
- 	name.sin_addr = s->opt_src_ip;
-@@ -2246,6 +2248,8 @@
+@@ -2246,6 +2246,8 @@
  			if (s->esp_fd == -1) {
  				error(1, errno, "socket(PF_INET, SOCK_RAW, IPPROTO_ESP)");
  			}


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vpnc.spec	3 Sep 2007 15:40:57 -0000	1.24
+++ vpnc.spec	20 Sep 2007 19:48:41 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           vpnc
-Version:        0.4.0
-Release:        4%{?dist}
+Version:        0.5.1
+Release:        1%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -13,10 +13,7 @@
 Source3:	vpnc-disconnect.consolehelper
 Source4:	vpnc.pam
 Source5:	vpnc-helper
-Patch0:         vpnc-0.4.0-pie.patch
-Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.4.0-cloexec.patch
-Patch3:		vpnc-0.4.0-sizeofbug.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,18 +38,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .pie
-%patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .cloexec
-%patch3 -p1 -b .sizeofbug
 
 %build
-make PREFIX=/usr
+CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr
 rm -f $RPM_BUILD_ROOT%{_bindir}/pcf2vpnc
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcf2vpnc.1
 chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/vpnc.8
 install -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/default.conf
 mkdir -p $RPM_BUILD_ROOT%{_var}/run/vpnc
@@ -78,14 +73,16 @@
 
 %files
 %defattr(-,root,root)
-%doc README COPYING pcf2vpnc
+%doc README COPYING pcf2vpnc pcf2vpnc.1
 
 %dir %{_sysconfdir}/vpnc
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
 %{_sbindir}/vpnc
+%{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
-%{_mandir}/man8/*
+%{_mandir}/man8/vpnc.*
+%{_mandir}/man1/cisco-decrypt.*
 %dir %{_var}/run/vpnc
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/pid
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/defaultroute
@@ -99,6 +96,9 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Thu Sep 20 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-1
+- upgrade to latest upstream
+
 * Mon Sep  3 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-4
 - fix long standing bug causing problems on x86_64 (#232565) now for real
 


--- vpnc-0.3.3-sbin-path.patch DELETED ---


--- vpnc-0.4.0-pie.patch DELETED ---


--- vpnc-0.4.0-sizeofbug.patch DELETED ---