rpms/openswan/devel openswan-2.6-selinux.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 openswan.spec, 1.57, 1.58 sources, 1.16, 1.17

[Steve Conklin (sconklin)]

Author: sconklin

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

Modified Files:
	.cvsignore openswan.spec sources 
Added Files:
	openswan-2.6-selinux.patch 
Log Message:
Latest upstream and a fix to the verify script


openswan-2.6-selinux.patch:

--- NEW FILE openswan-2.6-selinux.patch ---
--- openswan-2.6.03/programs/verify/verify.in.spc	2008-02-07 16:20:51.000000000 -0600
+++ openswan-2.6.03/programs/verify/verify.in	2008-02-07 16:22:14.000000000 -0600
@@ -262,18 +262,6 @@
 	errchk "$nattest"; 
 	}
 
-        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";
-            }
-        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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Jan 2008 21:51:54 -0000	1.17
+++ .cvsignore	8 Feb 2008 03:38:05 -0000	1.18
@@ -1,3 +1,4 @@
 openswan-2.6.02.tar.gz
 openswan-2.6.03.tar.gz
 openswan-2.6.04.tar.gz
+openswan-2.6.05rh.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- openswan.spec	28 Jan 2008 21:51:54 -0000	1.57
+++ openswan.spec	8 Feb 2008 03:38:05 -0000	1.58
@@ -1,11 +1,11 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.04
+Version: 2.6.05
 
 Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
-Source: openswan-%{version}.tar.gz
+Source: openswan-%{version}rh.tar.gz
 
 Source2: ipsec.init
 Source3: ipsec.conf
@@ -15,6 +15,7 @@
 Patch2: openswan-2.6-noxmlto.patch
 Patch3: openswan-2.6-cleanbarf.patch
 Patch4: openswan-2.6-intwarning.patch
+Patch5: openswan-2.6-selinux.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +51,7 @@
 system.
 
 %prep
-%setup -q -n openswan-%{version}
+%setup -q -n openswan-%{version}rh
 find doc/examples -type f -print0 | xargs -0 chmod a-x
 find doc -name .gitignore -print0 | xargs -0 rm -v
 rm -rf programs/readwriteconf
@@ -58,9 +59,9 @@
 %patch -p1
 %patch1 -p1 -b .relpath
 %patch2 -p1 -b .noxmlto
-#%patch3 -p1 -b .noslash
 %patch3 -p1 -b .cleanbarf
 %patch4 -p1 -b .interface
+%patch5 -p1 -b .selinux
 
 %build
 
@@ -151,6 +152,10 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Thu Feb  7 2008 Steve Conklin <sconklin at redhat.com> - 2.6.05-1
+- Removed check for selinux enforcing mode in verify script
+- Moved to latest upstream
+
 * Mon Jan 28 2008 Steve Conklin <sconklin at redhat.com> - 2.6.04-1
 - Move to new upstream source
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	28 Jan 2008 21:51:54 -0000	1.16
+++ sources	8 Feb 2008 03:38:05 -0000	1.17
@@ -1 +1 @@
-80b169354104d0b2d2a3cfa894dd769c  openswan-2.6.04.tar.gz
+4c5169673b7673d0496e4ac9b569c3db  openswan-2.6.05rh.tar.gz