rpms/openswan/devel openswan-2.6-initscript-correction.patch, NONE, 1.1 openswan-2.6-selinux.patch, 1.2, 1.3 .cvsignore, 1.27, 1.28 openswan.spec, 1.81, 1.82 sources, 1.26, 1.27 openswan-2.6.16-examples.patch, 1.1, NONE openswan-2.6.16-initscript-correction.patch, 1.1, NONE openswan-2.6.22-nss.patch, 1.1, NONE openswan-2.6.22-selinux.patch, 1.1, NONE

[avesh agarwal]

Author: avesh

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

Modified Files:
	.cvsignore openswan.spec sources 
Added Files:
	openswan-2.6-initscript-correction.patch 
	openswan-2.6-selinux.patch 
Removed Files:
	openswan-2.6.16-examples.patch 
	openswan-2.6.16-initscript-correction.patch 
	openswan-2.6.22-nss.patch openswan-2.6.22-selinux.patch 
Log Message:
* Wed Sep 09 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.23-1
- New upstream release
- Supports smartcards now
- Supports PSK with NSS
- Supports libcap-ng for lowering capabilities of pluto process 
- Updated README.nss


openswan-2.6-initscript-correction.patch:
 setup.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openswan-2.6-initscript-correction.patch ---
--- openswan-2.6.23.orig/programs/setup/setup.in	2009-09-08 20:42:54.000000000 -0400
+++ openswan-2.6.23/programs/setup/setup.in	2009-09-09 12:33:29.279527959 -0400
@@ -39,7 +39,7 @@
 # times of NFS filesystem startup/shutdown).  Startup is after startup of
 # syslog and pcmcia support; shutdown is just before shutdown of syslog.
 #
-# chkconfig: 2345 47 76
+# chkconfig: - 47 76
 # description: IPsec provides encrypted and authenticated communications; \
 # KLIPS is the kernel half of it, Pluto is the user-level management daemon.
 

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

Index: openswan-2.6-selinux.patch
===================================================================
RCS file: openswan-2.6-selinux.patch
diff -N openswan-2.6-selinux.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openswan-2.6-selinux.patch	9 Sep 2009 17:41:06 -0000	1.3
@@ -0,0 +1,23 @@
+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
+@@ -276,19 +276,6 @@ sub installstartcheck {
+ 	   } else { warnchk "","UNKNOWN"; }
+ 	}
+ 
+-        if ( -e "/selinux/enforce") {
+-        printfun "Testing against enforced SElinux mode";
+-        open("cat", "/selinux/enforce");
+-        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  echo \"0\" > /selinux/enforce (or edit /etc/sysconfig/selinux)\n\n";
+-	        $reterr = 1;
+-            }
+-        else { errchk "1"; }
+-        }
+-
+         if ( -c "/dev/hw_random" || -c "/dev/hwrng" ) {
+         printfun "Hardware RNG detected, testing if used properly";
+         run "pidof rngd";


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	23 Jul 2009 22:01:57 -0000	1.27
+++ .cvsignore	9 Sep 2009 17:41:06 -0000	1.28
@@ -11,3 +11,4 @@ openswan-2.6.18.tar.gz
 openswan-2.6.19.tar.gz
 openswan-2.6.21.tar.gz
 openswan-2.6.22.tar.gz
+openswan-2.6.23.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- openswan.spec	25 Jul 2009 20:54:45 -0000	1.81
+++ openswan.spec	9 Sep 2009 17:41:07 -0000	1.82
@@ -1,25 +1,24 @@
 %define USE_LIBNSS 1
 %define USE_FIPSCHECK 1
+%define USE_LIBCAP_NG 1
 %define nss_version 3.12.3-2
 %define fipscheck_version 1.2.0-1
 
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.22
+Version: 2.6.23
 
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
 
 Source2: ipsec.conf
 
-Patch1: openswan-2.6.16-examples.patch
-Patch2: openswan-2.6-relpath.patch
-Patch3: openswan-2.6.22-selinux.patch
-Patch4: openswan-2.6.16-initscript-correction.patch
-Patch5: openswan-2.6.22-gcc44.patch
-Patch6: openswan-2.6.22-nss.patch
+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)
@@ -37,6 +36,10 @@ Requires(preun): /sbin/service
 BuildRequires: fipscheck-devel >= %{fipscheck_version}
 %endif
 
+%if %{USE_LIBCAP_NG}
+BuildRequires: libcap-ng-devel
+%endif
+
 Provides: ipsec-userland = %{version}-%{release}
 #unless kernel with NETKEY supplies this capability we cannot do this
 #Requires: ipsec-kernel
@@ -70,12 +73,10 @@ system.
 find doc/examples -type f -print0 | xargs -0 chmod a-x
 find doc -name .gitignore -print0 | xargs -0 rm -v
 
-%patch1 -p1 
-%patch2 -p1 -b .relpath
-%patch3 -p1 -b .selinux
+%patch1 -p1 -b .relpath
+%patch2 -p1 -b .selinux
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 
@@ -94,6 +95,9 @@ find doc -name .gitignore -print0 | xarg
 %if %{USE_FIPSCHECK}
   USE_FIPSCHECK=true \
 %endif
+%if %{USE_LIBCAP_NG}
+  USE_LIBCAP_NG=true \
+%endif
   programs
 FS=$(pwd)
 
@@ -188,7 +192,8 @@ rm -rf %{buildroot}
 %files doc
 %defattr(-,root,root)
 %doc doc/README.* doc/CHANGES.* doc/CREDITS.* doc/2.6.known-issues
-%doc doc/examples doc/std doc/quickstarts doc/example-configs
+%doc doc/examples doc/std doc/quickstarts
+#%doc doc/examples doc/std doc/quickstarts doc/example-configs
 
 %files 
 %defattr(-,root,root)
@@ -222,6 +227,13 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Wed Sep 09 2009 Avesh Agarwal <avagarwa at redhat.com> - 2.6.23-1
+- New upstream release
+- Supports smartcards now
+- Supports PSK with NSS
+- Supports libcap-ng for lowering capabilities of pluto process 
+- Updated README.nss
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources	23 Jul 2009 22:01:58 -0000	1.26
+++ sources	9 Sep 2009 17:41:07 -0000	1.27
@@ -1 +1 @@
-9a30009bade8a1b09fba27680c87cf72  openswan-2.6.22.tar.gz
+c83053471e639bf3b97e3cf7796b7e83  openswan-2.6.23.tar.gz


--- openswan-2.6.16-examples.patch DELETED ---


--- openswan-2.6.16-initscript-correction.patch DELETED ---


--- openswan-2.6.22-nss.patch DELETED ---


--- openswan-2.6.22-selinux.patch DELETED ---