rpms/openswan/devel .cvsignore, 1.28, 1.29 openswan-2.6-relpath.patch, 1.1, 1.2 openswan-2.6-selinux.patch, 1.3, 1.4 openswan.spec, 1.82, 1.83 sources, 1.27, 1.28 openswan-2.6-initscript-correction.patch, 1.1, NONE openswan-2.6.22-gcc44.patch, 1.1, NONE

avesh agarwal avesh at fedoraproject.org
Mon Jan 11 18:02:35 UTC 2010 

Author: avesh

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

Modified Files:
	.cvsignore openswan-2.6-relpath.patch 
	openswan-2.6-selinux.patch openswan.spec sources 
Removed Files:
	openswan-2.6-initscript-correction.patch 
	openswan-2.6.22-gcc44.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 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	9 Sep 2009 17:41:06 -0000	1.28
+++ .cvsignore	11 Jan 2010 18:02:35 -0000	1.29
@@ -12,3 +12,4 @@ openswan-2.6.19.tar.gz
 openswan-2.6.21.tar.gz
 openswan-2.6.22.tar.gz
 openswan-2.6.23.tar.gz
+openswan-2.6.24.tar.gz

openswan-2.6-relpath.patch:
 Makefile.inc            |    2 ++
 programs/setup/Makefile |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Index: openswan-2.6-relpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan-2.6-relpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openswan-2.6-relpath.patch	17 Jan 2008 04:47:44 -0000	1.1
+++ openswan-2.6-relpath.patch	11 Jan 2010 18:02:35 -0000	1.2
@@ -1,17 +1,7 @@
---- openswan-2.6.03/programs/setup/Makefile.relpath	2008-01-10 18:32:08.000000000 -0600
-+++ openswan-2.6.03/programs/setup/Makefile	2008-01-16 21:29:51.000000000 -0600
-@@ -32,7 +32,7 @@
- doinstall:: setup
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
--	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
-+	@ln -s $(RELFINALRCDIR)/ipsec $(BINDIR)/setup
- 	- at for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
- 	- at cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
- 	- at cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
---- openswan-2.6.03/Makefile.inc.relpath	2008-01-10 18:32:08.000000000 -0600
-+++ openswan-2.6.03/Makefile.inc	2008-01-16 21:33:56.000000000 -0600
-@@ -123,6 +123,8 @@
+diff -urNp openswan-2.6.24-orig/Makefile.inc openswan-2.6.24/Makefile.inc
+--- openswan-2.6.24-orig/Makefile.inc	2010-01-09 20:34:38.000000000 -0500
++++ openswan-2.6.24/Makefile.inc	2010-01-11 12:15:53.000000000 -0500
+@@ -123,6 +123,8 @@ FINALRCDIR=$(shell for d in $(INC_RCDIRS
  		do if test -d $(DESTDIR)/$$d ; \
  		then echo $$d ; exit 0 ; \
  		fi ; done ; echo $(INC_RCDEFAULT) )
@@ -20,3 +10,15 @@
  RCDIR=$(DESTDIR)$(FINALRCDIR)
  
  
+diff -urNp openswan-2.6.24-orig/programs/setup/Makefile openswan-2.6.24/programs/setup/Makefile
+--- openswan-2.6.24-orig/programs/setup/Makefile	2010-01-09 20:34:38.000000000 -0500
++++ openswan-2.6.24/programs/setup/Makefile	2010-01-11 12:15:53.000000000 -0500
+@@ -32,7 +32,7 @@ include ${srcdir}../Makefile.program
+ doinstall:: setup
+ 	@rm -f $(BINDIR)/setup
+ 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
+-	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
++	@ln -s $(RELFINALRCDIR)/ipsec $(BINDIR)/setup
+ 	- at for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
+ 	- at cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
+ 	- at cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec

openswan-2.6-selinux.patch:
 verify.in |   13 -------------
 1 file changed, 13 deletions(-)

Index: openswan-2.6-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan-2.6-selinux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openswan-2.6-selinux.patch	9 Sep 2009 17:41:06 -0000	1.3
+++ openswan-2.6-selinux.patch	11 Jan 2010 18:02:35 -0000	1.4
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.23.orig/programs/verify/verify.in openswan-2.6.23/programs/verify/verify.in
---- openswan-2.6.23.orig/programs/verify/verify.in	2009-09-08 20:42:54.000000000 -0400
-+++ openswan-2.6.23/programs/verify/verify.in	2009-09-09 12:22:10.392305880 -0400
+diff -urNp openswan-2.6.24-orig/programs/verify/verify.in openswan-2.6.24/programs/verify/verify.in
+--- openswan-2.6.24-orig/programs/verify/verify.in	2010-01-09 20:34:38.000000000 -0500
++++ openswan-2.6.24/programs/verify/verify.in	2010-01-11 12:17:47.000000000 -0500
 @@ -276,19 +276,6 @@ sub installstartcheck {
  	   } else { warnchk "","UNKNOWN"; }
  	}
@@ -11,7 +11,7 @@ diff -urNp openswan-2.6.23.orig/programs
 -        if(<cat> == "1")
 -            {
 -                errchk "";
--                print "\n  SElinux is running in 'enforced' mode. Since no working SElinux\n  policies exist for Openswan, SElinux should be disabled.\n";
+-                print "\n  SElinux is running in 'enforced' mode.\n  If you encounter network related SElinux errors, especially when using KLIPS,\n  try disabling SElinux using:\n";
 -		print "\n  echo \"0\" > /selinux/enforce (or edit /etc/sysconfig/selinux)\n\n";
 -	        $reterr = 1;
 -            }


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- openswan.spec	9 Sep 2009 17:41:07 -0000	1.82
+++ openswan.spec	11 Jan 2010 18:02:35 -0000	1.83
@@ -6,7 +6,7 @@
 
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.23
+Version: 2.6.24
 
 Release: 1%{?dist}
 License: GPLv2+
@@ -17,8 +17,6 @@ Source2: ipsec.conf
 
 Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-2.6-selinux.patch
-Patch3: openswan-2.6-initscript-correction.patch
-Patch4: openswan-2.6.22-gcc44.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,8 +73,6 @@ find doc -name .gitignore -print0 | xarg
 
 %patch1 -p1 -b .relpath
 %patch2 -p1 -b .selinux
-%patch3 -p1
-%patch4 -p1
 
 %build
 
@@ -135,14 +131,11 @@ FS=$(pwd)
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/spi \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/spigrp \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_startklips \
-  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_startklips.old \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_startnetkey \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/tncfg \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.klips \
-  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.klips.old \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.mast \
-  fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.mast.old \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/_updown.netkey \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/verify \
   fipshmac $RPM_BUILD_ROOT%{_libexecdir}/ipsec/whack \
@@ -227,6 +220,18 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* 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 
+
 * Wed Sep 09 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.23-1
 - New upstream release
 - Supports smartcards now


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	9 Sep 2009 17:41:07 -0000	1.27
+++ sources	11 Jan 2010 18:02:35 -0000	1.28
@@ -1 +1 @@
-c83053471e639bf3b97e3cf7796b7e83  openswan-2.6.23.tar.gz
+1c76b6982c05392f7c360afb92699661  openswan-2.6.24.tar.gz


--- openswan-2.6-initscript-correction.patch DELETED ---


--- openswan-2.6.22-gcc44.patch DELETED ---

More information about the scm-commits mailing list