summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2008-12-03 23:30:28 +0000
committerAlin Năstac <mrness@gentoo.org>2008-12-03 23:30:28 +0000
commit04964a61ffc321f675cf6dd032e54b404c14ad18 (patch)
treeda997ff5602cc5842bb746258e21ced7cca44293 /net-misc/openswan/files/openswan-2.6.19-gentoo.patch
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-04964a61ffc321f675cf6dd032e54b404c14ad18.tar.gz
gentoo-2-04964a61ffc321f675cf6dd032e54b404c14ad18.tar.bz2
gentoo-2-04964a61ffc321f675cf6dd032e54b404c14ad18.zip
Remove obsolete versions.
Correct doc install path (#241976). Version bump. (Portage version: 2.1.4.4, RepoMan options: --force)
Diffstat (limited to 'net-misc/openswan/files/openswan-2.6.19-gentoo.patch')
-rw-r--r--net-misc/openswan/files/openswan-2.6.19-gentoo.patch98
1 files changed, 98 insertions, 0 deletions
diff --git a/net-misc/openswan/files/openswan-2.6.19-gentoo.patch b/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
new file mode 100644
index 000000000000..45fa706a7f1b
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.19-gentoo.patch
@@ -0,0 +1,98 @@
+diff -Nru openswan-2.6.19.orig/Makefile.inc openswan-2.6.19/Makefile.inc
+--- openswan-2.6.19.orig/Makefile.inc 2008-11-25 01:24:56.000000000 +0000
++++ openswan-2.6.19/Makefile.inc 2008-12-03 23:06:52.000000000 +0000
+@@ -49,7 +49,7 @@
+ DESTDIR?=
+
+ # "local" part of tree, used in building other pathnames
+-INC_USRLOCAL=/usr/local
++INC_USRLOCAL?=/usr
+
+ # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
+ # settings which are assumed to include it (or at least, to include *some*
+@@ -94,7 +94,7 @@
+
+ # sample configuration files go into
+ INC_DOCDIR?=share/doc
+-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
++FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+ EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
+
+ FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+diff -Nru openswan-2.6.19.orig/programs/Makefile.manpages openswan-2.6.19/programs/Makefile.manpages
+--- openswan-2.6.19.orig/programs/Makefile.manpages 2008-11-25 01:24:56.000000000 +0000
++++ openswan-2.6.19/programs/Makefile.manpages 2008-12-03 23:09:27.000000000 +0000
+@@ -1,19 +1,19 @@
+ # xmlto is from http://cyberelk.net/tim/xmlto/
+ ifneq ($(strip $(XMLTO)),)
+ %.8: %.8.xml
+- ${XMLTO} man $<
++ ${XMLTO} --skip-validation man $<
+ @for m in ipsec_*.8; do if [ -f $$m ]; then mv $$m $@; fi; done
+
+ %.5: %.5.xml
+- ${XMLTO} man $<
++ ${XMLTO} --skip-validation man $<
+ @for m in ipsec_*.5; do if [ -f $$m ]; then mv $$m $@; fi; done
+
+ %.2: %.2.xml
+- ${XMLTO} man $<
++ ${XMLTO} --skip-validation man $<
+ @for m in ipsec_*.3; do if [ -f $$m ]; then mv $$m $@; fi; done
+
+ %.1: %.1.xml
+- ${XMLTO} man $<
++ ${XMLTO} --skip-validation man $<
+ @for m in ipsec_*.1; do if [ -f $$m ]; then mv $$m $@; fi; done
+ endif
+
+diff -Nru openswan-2.6.19.orig/programs/setup/Makefile openswan-2.6.19/programs/setup/Makefile
+--- openswan-2.6.19.orig/programs/setup/Makefile 2008-11-25 01:24:56.000000000 +0000
++++ openswan-2.6.19/programs/setup/Makefile 2008-12-03 23:06:52.000000000 +0000
+@@ -18,7 +18,6 @@
+
+ # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
+ # not as /etc/rc.d/init.d/setup.
+-PROGRAMDIR=$(RCDIR)
+ PROGRAM=setup
+ EXTRA8MAN=setup.8
+
+@@ -29,32 +28,6 @@
+ # into the $BINDIR.
+ #
+ # the priorities match those in setup's chkconfig line
+-doinstall:: setup
+- @rm -f $(BINDIR)/setup
+- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
+- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
+- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
+- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
+- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
+- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
+- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
+- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
+- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
+- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
+-
+-install_file_list::
+- @echo $(RCDIR)/ipsec
+- @echo $(BINDIR)/setup
+- @echo $(RCDIR)/../rc0.d/K76ipsec
+- @echo $(RCDIR)/../rc1.d/K76ipsec
+- @echo $(RCDIR)/../rc2.d/S47ipsec
+- @echo $(RCDIR)/../rc3.d/S47ipsec
+- @echo $(RCDIR)/../rc4.d/S47ipsec
+- @echo $(RCDIR)/../rc5.d/S47ipsec
+- @echo $(RCDIR)/../rc6.d/K76ipsec
+-
+-cleanall::
+- @rm -f setup
+
+ #
+ # $Log: openswan-2.6.19-gentoo.patch,v $
+ # Revision 1.1 2008/12/03 23:30:28 mrness
+ # Remove obsolete versions.
+ # Correct doc install path (#241976).
+ # Version bump.
+ # (Portage version: 2.1.4.4, RepoMan options: --force)
+ #