rpms/vpnc/devel vpnc-0.4.0-sizeofbug.patch, NONE, 1.1 vpnc.spec, 1.23, 1.24

[Tomas Mraz (tmraz)]

Author: tmraz

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

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.4.0-sizeofbug.patch 
Log Message:
* 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.4.0-sizeofbug.patch:

--- NEW FILE vpnc-0.4.0-sizeofbug.patch ---
diff -up vpnc-0.4.0/vpnc.c.sizeofbug vpnc-0.4.0/vpnc.c
--- vpnc-0.4.0/vpnc.c.sizeofbug	2007-09-03 17:30:03.000000000 +0200
+++ vpnc-0.4.0/vpnc.c	2007-09-03 17:30:45.000000000 +0200
@@ -1971,7 +1971,7 @@ static void setup_link(struct sa_block *
 		rp->next->next->next = us;
 	}
 
-	gcry_create_nonce((uint8_t *) & msgid, sizeof(&msgid));
+	gcry_create_nonce((uint8_t *) & msgid, sizeof(msgid));
 	if (msgid == 0)
 		msgid = 1;
 


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vpnc.spec	22 Aug 2007 21:15:39 -0000	1.23
+++ vpnc.spec	3 Sep 2007 15:40:57 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -16,6 +16,7 @@
 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)
 
@@ -43,11 +44,9 @@
 %patch0 -p1 -b .pie
 %patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .cloexec
+%patch3 -p1 -b .sizeofbug
 
 %build
-%ifarch x86_64
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed s/-fstack-protector//g)
-%endif
 make PREFIX=/usr
 
 %install
@@ -100,6 +99,9 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* 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
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz at redhat.com> - 0.4.0-3
 - license tag fix