rpms/openswan/devel openswan-2.6.24-nspr.patch, NONE, 1.1 openswan.spec, 1.83, 1.84

[avesh agarwal]

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17801

Modified Files:
	openswan.spec 
Added Files:
	openswan-2.6.24-nspr.patch 
Log Message:
* Mon Jan 11 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.24-1
- New upstream release
- Cisco interop patches
- Improved init script
- Fix to allow ";" in the ike/esp parameters
- Fix to unset IKEv2 Critical flag for payloads defined in RFC 4306
- Fix to Zeroize ISAKMP and IPsec SA's when in FIPS mode
- Fix to the issue where Some programs were installed
  twice causing .old files
- lwdns.req.log moved from /var/tmp/ to /var/run/pluto/ .
  This is to avoid an SElinux AVC Denial 


openswan-2.6.24-nspr.patch:
 rsasigkey/Makefile   |    5 ++++-
 showhostkey/Makefile |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE openswan-2.6.24-nspr.patch ---
diff -urNp openswan-2.6.24-orig/programs/rsasigkey/Makefile openswan-2.6.24/programs/rsasigkey/Makefile
--- openswan-2.6.24-orig/programs/rsasigkey/Makefile	2010-01-09 20:34:38.000000000 -0500
+++ openswan-2.6.24/programs/rsasigkey/Makefile	2010-01-11 16:28:41.000000000 -0500
@@ -18,7 +18,7 @@ include ${OPENSWANSRCDIR}/Makefile.inc
 ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS
 # temp workaround for bug in nspr 4.8.2 
-CFLAGS+=-Wno-strict-prototypes
+#CFLAGS+=-Wno-strict-prototypes
 ifeq ($(USE_FIPSCHECK),true)
 FIPS_CHECK=1
 CFLAGS+=-DFIPS_CHECK
@@ -38,3 +38,6 @@ endif
 
 include ${srcdir}../Makefile.program
 
+ifeq ($(USE_LIBNSS),true)
+CFLAGS+=-Wno-strict-prototypes
+endif
diff -urNp openswan-2.6.24-orig/programs/showhostkey/Makefile openswan-2.6.24/programs/showhostkey/Makefile
--- openswan-2.6.24-orig/programs/showhostkey/Makefile	2010-01-09 20:34:38.000000000 -0500
+++ openswan-2.6.24/programs/showhostkey/Makefile	2010-01-11 16:29:32.000000000 -0500
@@ -18,10 +18,13 @@ ifeq ($(USE_LIBNSS),true)
 CFLAGS+=-DHAVE_LIBNSS
 INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
 # temp workaround for bug in nspr 4.8.2 
-CFLAGS+=-Wno-strict-prototypes
+#CFLAGS+=-Wno-strict-prototypes
 endif
 
 PROGRAM=showhostkey
 
 include ${srcdir}../Makefile.program
 
+ifeq ($(USE_LIBNSS),true)
+CFLAGS+=-Wno-strict-prototypes
+endif


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- openswan.spec	11 Jan 2010 18:02:35 -0000	1.83
+++ openswan.spec	11 Jan 2010 21:42:28 -0000	1.84
@@ -17,6 +17,7 @@ Source2: ipsec.conf
 
 Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-2.6-selinux.patch
+Patch3: openswan-2.6.24-nspr.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,6 +74,7 @@ find doc -name .gitignore -print0 | xarg
 
 %patch1 -p1 -b .relpath
 %patch2 -p1 -b .selinux
+%patch3 -p1 
 
 %build