rpms/openswan/devel openswan-2.6-relpath.patch, NONE, 1.1 openswan.spec, 1.47, 1.48

[Steve Conklin (sconklin)]

Author: sconklin

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

Modified Files:
	openswan.spec 
Added Files:
	openswan-2.6-relpath.patch 
Log Message:
Added patch to make the link path relative for the init script, should work in chroot environments


openswan-2.6-relpath.patch:

--- NEW FILE openswan-2.6-relpath.patch ---
--- 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 @@
 		do if test -d $(DESTDIR)/$$d ; \
 		then echo $$d ; exit 0 ; \
 		fi ; done ; echo $(INC_RCDEFAULT) )
+# this needs to be a relative path from BINDIR
+RELFINALRCDIR=../../..$(FINALRCDIR)
 RCDIR=$(DESTDIR)$(FINALRCDIR)
 
 


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- openswan.spec	17 Jan 2008 01:07:06 -0000	1.47
+++ openswan.spec	17 Jan 2008 04:47:44 -0000	1.48
@@ -8,7 +8,7 @@
 
 %define debug_package %{nil}
 Release: 3%{?dist}
-License: GPLv2
+License: -GPL
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
 
@@ -16,6 +16,7 @@
 Source3: ipsec.conf
 
 Patch: openswan-2.6-examples.patch
+Patch1: openswan-2.6-relpath.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,7 @@
 find doc -name .gitignore -print0 | xargs -0 rm -v
 
 %patch -p1
+%patch1 -p1 -b .relpath
 
 %build
 
@@ -90,8 +92,8 @@
 find %{buildroot}/etc/ipsec.d -type f -exec chmod 644 {} \;
 
 mkdir -p %{buildroot}%{_sysconfdir}
-cp %{SOURCE3} %{buildroot}%{_sysconfdir}/ipsec.conf
-cp %{SOURCE2} %{buildroot}%{_initrddir}/ipsec
+install -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/ipsec.conf
+install -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/ipsec
 
 sed -i -e 's#/usr/lib/#%{_libdir}/#g' %{buildroot}%{_initrddir}/ipsec
 
@@ -117,12 +119,12 @@
 %files 
 %defattr(-,root,root)
 %doc BUGS CHANGES COPYING CREDITS README LICENSE
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipsec.conf
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipsec.secrets
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/policies/*
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/policies/*
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/policies
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d
-%{_initrddir}/ipsec
+%config(noreplace) %{_initrddir}/ipsec
 %{_libdir}/ipsec
 %{_sbindir}/ipsec
 %{_libexecdir}/ipsec
@@ -150,6 +152,8 @@
 - Changed License from GPL to GPL+
 - removed klips ifdefs from spec file
 - Added patch to move example configs to doc dir
+- Added a patch to make the link to init script relative, 
+  for chroot environments
 
 * Fri Jan 11 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-2
 - Removed copy of file that no longer exists