rpms/openswan/devel ipsec.init, 1.6, 1.7 openswan-2.6-noslash.patch, 1.1, 1.2 openswan.spec, 1.54, 1.55

[Steve Conklin (sconklin)]

Author: sconklin

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

Modified Files:
	ipsec.init openswan-2.6-noslash.patch openswan.spec 
Log Message:
more small changes



Index: ipsec.init
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/ipsec.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ipsec.init	21 Feb 2005 14:50:57 -0000	1.6
+++ ipsec.init	18 Jan 2008 15:17:25 -0000	1.7
@@ -5,8 +5,7 @@
 #
 # chkconfig: - 47 76
 # description: IPsec provides encrypted and authenticated communications; \
-# KLIPS is the kernel half of it, Pluto is the user-level management daemon.
-
+# NETKEY is the kernel half of it, Pluto is the user-level management daemon.
 
 # IPsec startup and shutdown script
 # Copyright (C) 1998, 1999, 2001  Henry Spencer.
@@ -119,11 +118,11 @@
 # 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
+#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

openswan-2.6-noslash.patch:

Index: openswan-2.6-noslash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan-2.6-noslash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openswan-2.6-noslash.patch	18 Jan 2008 01:58:48 -0000	1.1
+++ openswan-2.6-noslash.patch	18 Jan 2008 15:17:25 -0000	1.2
@@ -8,4 +8,3 @@
 -		(cd $$d && $(MAKE) srcdir=${srcdir}/$$d/ OPENSWANSRCDIR=$(OPENSWANSRCDIR) $@ ) || exit 1; \
 +		(cd $$d && $(MAKE) srcdir=${srcdir}$$d/ OPENSWANSRCDIR=$(OPENSWANSRCDIR) $@ ) || exit 1; \
  	done; \
- 
\ No newline at end of file


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- openswan.spec	18 Jan 2008 04:42:44 -0000	1.54
+++ openswan.spec	18 Jan 2008 15:17:25 -0000	1.55
@@ -1,12 +1,11 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
 Version: 2.6.03
-%define srcpkgver %{version}
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
-Source: openswan-%{srcpkgver}.tar.gz
+Source: openswan-%{version}.tar.gz
 
 Source2: ipsec.init
 Source3: ipsec.conf
@@ -50,7 +49,7 @@
 system.
 
 %prep
-%setup -q -n openswan-%{srcpkgver}
+%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
 
@@ -76,7 +75,7 @@
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 %{__make} \
   DESTDIR=%{buildroot} \
   INC_USRLOCAL=%{_prefix} \
@@ -112,7 +111,7 @@
 rm -f %{buildroot}%{_sysconfdir}/ipsec.d/examples
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %files doc
 %defattr(-,root,root)
@@ -148,6 +147,9 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Fri Jan 18 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-7
+- Addressed the last set of small changes for package review
+
 * Thu Jan 17 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-6
 - Moved everything else out of /usr/lib
 - Added tmraz's patch to remove extra slashes in makefile