rpms/openswan/devel openswan-2.6-cleanbarf.patch, NONE, 1.1 openswan-2.6-intwarning.patch, NONE, 1.1 ipsec.init, 1.7, 1.8 openswan.spec, 1.55, 1.56

[Steve Conklin (sconklin)]

Author: sconklin

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

Modified Files:
	ipsec.init openswan.spec 
Added Files:
	openswan-2.6-cleanbarf.patch openswan-2.6-intwarning.patch 
Log Message:
Cleaned up init script and removed a useless warning


openswan-2.6-cleanbarf.patch:

--- NEW FILE openswan-2.6-cleanbarf.patch ---
--- openswan-2.6.03/programs/barf/barf.in.spc	2008-01-10 18:32:08.000000000 -0600
+++ openswan-2.6.03/programs/barf/barf.in	2008-01-21 13:36:34.000000000 -0600
@@ -184,6 +184,7 @@
 if test -r /proc/crypto
 then
 	cat /proc/crypto
+fi
 # not visible on my 2.6 system
 #_________________________ /proc/net/pf_key-star
 #( cd /proc/net && egrep '^' pf_key_* )

openswan-2.6-intwarning.patch:

--- NEW FILE openswan-2.6-intwarning.patch ---
--- openswan-2.6.03/programs/_realsetup/_realsetup.in.spc	2008-01-24 14:42:41.000000000 -0600
+++ openswan-2.6.03/programs/_realsetup/_realsetup.in	2008-01-24 14:57:06.000000000 -0600
@@ -38,7 +38,12 @@
 
 # defaults for "config setup" items
 
-IPSECinterfaces=${IPSECinterfaces:-%defaultroute}
+if $netkey
+then
+    IPSECinterfaces=
+else
+    IPSECinterfaces=${IPSECinterfaces:-%defaultroute}
+fi
 	if test " $IPSECinterfaces" = " %none" ; then IPSECinterfaces= ; fi
 # IPSECforwardcontrol	"no"
 # IPSECsyslog	"daemon.error"


Index: ipsec.init
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/ipsec.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ipsec.init	18 Jan 2008 15:17:25 -0000	1.7
+++ ipsec.init	24 Jan 2008 21:07:42 -0000	1.8
@@ -10,6 +10,7 @@
 # IPsec startup and shutdown script
 # Copyright (C) 1998, 1999, 2001  Henry Spencer.
 # Copyright (C) 2002              Michael Richardson <mcr at freeswan.org>
+# Modified 2008 Steve Conklin <sconklin at redhat.com>
 # 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -43,7 +44,7 @@
 
 syslog ()
 {
-    /sbin/initlog -s "$*" -f daemon -p ${IPSECsyslog:-error} -n ipsec_setup
+    logger -s "$*" -f daemon -p ${IPSECsyslog:-error} -n ipsec_setup
 }
 
 [ "$(tty)" != '/dev/console' ] && TTY=1;
@@ -67,7 +68,7 @@
 
 # where the private directory and the config files are
 IPSEC_EXECDIR="${IPSEC_EXECDIR-/usr/libexec/ipsec}"
-IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/lib/ipsec}"
+IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}"
 IPSEC_SBINDIR="${IPSEC_SBINDIR-/usr/sbin}"
 IPSEC_CONFS="${IPSEC_CONFS-/etc}"
 
@@ -114,16 +115,6 @@
 	shift
 done
 
-
-# Pick up IPsec configuration (until we have done this, successfully, we
-# do not know where errors should go, hence the explicit "daemon.error"s.)
-# Note the "--export", which exports the variables created.
-#eval `ipsec _confread $config --optional --varprefix IPSEC --export --type config setup`
-#if test " $IPSEC_confreadstatus" != " "
-#then
-#	fail "$IPSEC_confreadstatus -- "'`'$1' '$"aborted"		
-#fi
-
 IPSEC_confreadsection=${IPSEC_confreadsection:-setup}
 export IPSEC_confreadsection
 
@@ -137,6 +128,14 @@
 
 prog="IPsec"
 
+# Load the af_key module if not already present
+[ -e /proc/net/pfkey ] || /sbin/modprobe af_key &>/dev/null
+
+[ -e /proc/net/pfkey ] || sleep 1
+
+# Don't bother if /proc/net/pfkey still doesn't exist, we need it
+[ -e /proc/net/pfkey ] || exit 0
+
 # do it
 start_it()
 {


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- openswan.spec	18 Jan 2008 15:17:25 -0000	1.55
+++ openswan.spec	24 Jan 2008 21:07:42 -0000	1.56
@@ -2,7 +2,7 @@
 Name: openswan
 Version: 2.6.03
 
-Release: 7%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -14,6 +14,8 @@
 Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-2.6-noxmlto.patch
 Patch3: openswan-2.6-noslash.patch
+Patch4: openswan-2.6-cleanbarf.patch
+Patch5: openswan-2.6-intwarning.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,11 +54,14 @@
 %setup -q -n openswan-%{version}
 find doc/examples -type f -print0 | xargs -0 chmod a-x
 find doc -name .gitignore -print0 | xargs -0 rm -v
+rm -rf programs/readwriteconf
 
 %patch -p1
 %patch1 -p1 -b .relpath
 %patch2 -p1 -b .noxmlto
 %patch3 -p1 -b .noslash
+%patch4 -p1 -b .cleanbarf
+%patch5 -p1 -b .interface
 
 %build
 
@@ -147,6 +152,16 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Thu Jan 24 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-9
+- Added af_key module load to init script
+- Removed spurious warning about interfaces=
+
+* Mon Jan 21 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-8
+Related: rhbz#235224
+- rpmdiff spotted these:
+- Cleaned out unused man page
+- patch error in barf script
+
 * Fri Jan 18 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-7
 - Addressed the last set of small changes for package review