From d5d15e73d9aad893ebfd1ce7474dc7372507aa76 Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Wed, 15 Apr 2009 21:02:17 +0000 Subject: Replace gentoo patches with with gentoo-fixed patches, added to cvs using -kb flag (#264346). Package-Manager: portage-2.1.6.7/cvs/Linux x86_64 --- .../files/openswan-2.4.14-gentoo-fixed.patch | 175 +++++++++++++++++++++ .../openswan/files/openswan-2.4.14-gentoo.patch | 175 --------------------- .../files/openswan-2.6.21-gentoo-fixed.patch | 130 +++++++++++++++ .../openswan/files/openswan-2.6.21-gentoo.patch | 130 --------------- 4 files changed, 305 insertions(+), 305 deletions(-) create mode 100644 net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch delete mode 100644 net-misc/openswan/files/openswan-2.4.14-gentoo.patch create mode 100644 net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch delete mode 100644 net-misc/openswan/files/openswan-2.6.21-gentoo.patch (limited to 'net-misc/openswan/files') diff --git a/net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch b/net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch new file mode 100644 index 000000000000..2e9d041c8e10 --- /dev/null +++ b/net-misc/openswan/files/openswan-2.4.14-gentoo-fixed.patch @@ -0,0 +1,175 @@ +diff -Nru openswan-2.4.14.orig/lib/liblwres/Makefile openswan-2.4.14/lib/liblwres/Makefile +--- openswan-2.4.14.orig/lib/liblwres/Makefile 2007-10-22 14:33:11.000000000 +0000 ++++ openswan-2.4.14/lib/liblwres/Makefile 2009-04-08 23:07:06.000000000 +0000 +@@ -17,8 +17,8 @@ + + CINCLUDES = -I${srcdir}/unix/include \ + -I. -I./include -I${srcdir}/include +-CDEFINES = -g +-CWARNINGS = -Werror ++CDEFINES = ++CWARNINGS = + + CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} + +diff -Nru openswan-2.4.14.orig/Makefile.inc openswan-2.4.14/Makefile.inc +--- openswan-2.4.14.orig/Makefile.inc 2009-03-30 13:55:24.000000000 +0000 ++++ openswan-2.4.14/Makefile.inc 2009-04-08 23:06:04.000000000 +0000 +@@ -46,7 +46,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* +@@ -91,7 +91,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.4.14.orig/programs/_confread/_confread.in openswan-2.4.14/programs/_confread/_confread.in +--- openswan-2.4.14.orig/programs/_confread/_confread.in 2006-04-12 19:55:42.000000000 +0000 ++++ openswan-2.4.14/programs/_confread/_confread.in 2009-04-08 23:06:04.000000000 +0000 +@@ -14,7 +14,7 @@ + # + # RCSID $Id: _confread.in,v 1.81.2.5 2006-04-12 19:55:42 mcr Exp $ + # +-# Extract configuration info from /etc/ipsec.conf, repackage as assignments ++# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments + # to shell variables or tab-delimited fields. Success or failure is reported + # inline, as extra data, due to the vagaries of shell backquote handling. + # In the absence of --varprefix, output is tab-separated fields, like: +diff -Nru openswan-2.4.14.orig/programs/_confread/ipsec.conf.in openswan-2.4.14/programs/_confread/ipsec.conf.in +--- openswan-2.4.14.orig/programs/_confread/ipsec.conf.in 2006-10-19 03:49:46.000000000 +0000 ++++ openswan-2.4.14/programs/_confread/ipsec.conf.in 2009-04-08 23:06:04.000000000 +0000 +@@ -1,4 +1,4 @@ +-# /etc/ipsec.conf - Openswan IPsec configuration file ++# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file + # RCSID $Id: ipsec.conf.in,v 1.15.2.6 2006-10-19 03:49:46 paul Exp $ + + # This file: @FINALEXAMPLECONFDIR@/ipsec.conf-sample +diff -Nru openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.14/programs/examples/l2tp-psk.conf.in +--- openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in 2007-11-02 01:49:40.000000000 +0000 ++++ openswan-2.4.14/programs/examples/l2tp-psk.conf.in 2009-04-08 23:06:04.000000000 +0000 +@@ -11,7 +11,7 @@ + # + # Use a Preshared Key. Disable Perfect Forward Secrecy. + # +- # PreSharedSecret needs to be specified in /etc/ipsec.secrets as ++ # PreSharedSecret needs to be specified in /etc/ipsec/ipsec.secrets as + # YourIPAddress %any: "sharedsecret" + authby=secret + pfs=no +diff -Nru openswan-2.4.14.orig/programs/_include/_include.in openswan-2.4.14/programs/_include/_include.in +--- openswan-2.4.14.orig/programs/_include/_include.in 2003-01-06 21:44:04.000000000 +0000 ++++ openswan-2.4.14/programs/_include/_include.in 2009-04-08 23:06:04.000000000 +0000 +@@ -47,10 +47,10 @@ + do + if test ! -r "$f" + then +- if test ! "$f" = "/etc/ipsec.conf" ++ if test ! "$f" = "/etc/ipsec/ipsec.conf" + then + echo "#:cannot open configuration file \'$f\'" +- if test "$f" = "/etc/ipsec.secrets" ++ if test "$f" = "/etc/ipsec/ipsec.secrets" + then + echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." + fi +diff -Nru openswan-2.4.14.orig/programs/mailkey/mailkey.in openswan-2.4.14/programs/mailkey/mailkey.in +--- openswan-2.4.14.orig/programs/mailkey/mailkey.in 2006-10-28 23:49:23.000000000 +0000 ++++ openswan-2.4.14/programs/mailkey/mailkey.in 2009-04-08 23:06:04.000000000 +0000 +@@ -60,7 +60,7 @@ + + "$test1st" + +-Common concerns: This account must be able to read /etc/ipsec.secrets. ++Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. + If you haven't generated your key yet, please run 'ipsec newhostkey'." + exit 0 + } +diff -Nru openswan-2.4.14.orig/programs/Makefile.program openswan-2.4.14/programs/Makefile.program +--- openswan-2.4.14.orig/programs/Makefile.program 2007-06-19 14:49:19.000000000 +0000 ++++ openswan-2.4.14/programs/Makefile.program 2009-04-08 23:08:31.000000000 +0000 +@@ -34,7 +34,6 @@ + WERROR:= -Werror + endif + +-CFLAGS+= ${WERROR} + + ifneq ($(LD_LIBRARY_PATH),) + LDFLAGS=-L$(LD_LIBRARY_PATH) +diff -Nru openswan-2.4.14.orig/programs/pluto/Makefile openswan-2.4.14/programs/pluto/Makefile +--- openswan-2.4.14.orig/programs/pluto/Makefile 2007-11-06 18:56:26.000000000 +0000 ++++ openswan-2.4.14/programs/pluto/Makefile 2009-04-08 23:06:04.000000000 +0000 +@@ -210,7 +210,7 @@ + endif + + ifeq ($(USE_WEAKSTUFF),true) +-WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES ++WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES + endif + + ifeq ($(USE_EXTRACRYPTO),true) +diff -Nru openswan-2.4.14.orig/programs/setup/Makefile openswan-2.4.14/programs/setup/Makefile +--- openswan-2.4.14.orig/programs/setup/Makefile 2004-12-18 18:13:43.000000000 +0000 ++++ openswan-2.4.14/programs/setup/Makefile 2009-04-08 23:06:04.000000000 +0000 +@@ -33,25 +33,10 @@ + @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 + + clean:: + @rm -f setup +diff -Nru openswan-2.4.14.orig/programs/showhostkey/showhostkey.in openswan-2.4.14/programs/showhostkey/showhostkey.in +--- openswan-2.4.14.orig/programs/showhostkey/showhostkey.in 2007-06-19 15:27:27.000000000 +0000 ++++ openswan-2.4.14/programs/showhostkey/showhostkey.in 2009-04-08 23:06:04.000000000 +0000 +@@ -18,7 +18,7 @@ + usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] + [--dhclient] [--ipseckey]" + +-file=/etc/ipsec.secrets ++file=/etc/ipsec/ipsec.secrets + fmt="" + gw= + id= +diff -Nru openswan-2.4.14.orig/testing/utils/ikeping/Makefile openswan-2.4.14/testing/utils/ikeping/Makefile +--- openswan-2.4.14.orig/testing/utils/ikeping/Makefile 2004-04-03 19:44:52.000000000 +0000 ++++ openswan-2.4.14/testing/utils/ikeping/Makefile 2009-04-08 23:09:18.000000000 +0000 +@@ -27,10 +27,9 @@ + FREESWANINCLS= -I$(FREESWANLIBDIR) -I${OPENSWANSRCDIR} + FREESWANLIB=$(FREESWANLIBDIR)/libfreeswan.a + +-CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ ++CFLAGS = -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ + -Wcast-qual -Wmissing-declarations -Wwrite-strings + CFLAGS+= -Wstrict-prototypes +-CFLAGS+= -Werror + #CFLAGS+= -Wundef + + HDRDIRS = $(FREESWANINCLS) diff --git a/net-misc/openswan/files/openswan-2.4.14-gentoo.patch b/net-misc/openswan/files/openswan-2.4.14-gentoo.patch deleted file mode 100644 index 63c310fd9513..000000000000 --- a/net-misc/openswan/files/openswan-2.4.14-gentoo.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -Nru openswan-2.4.14.orig/lib/liblwres/Makefile openswan-2.4.14/lib/liblwres/Makefile ---- openswan-2.4.14.orig/lib/liblwres/Makefile 2007-10-22 14:33:11.000000000 +0000 -+++ openswan-2.4.14/lib/liblwres/Makefile 2009-04-08 23:07:06.000000000 +0000 -@@ -17,8 +17,8 @@ - - CINCLUDES = -I${srcdir}/unix/include \ - -I. -I./include -I${srcdir}/include --CDEFINES = -g --CWARNINGS = -Werror -+CDEFINES = -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.4.14.orig/Makefile.inc openswan-2.4.14/Makefile.inc ---- openswan-2.4.14.orig/Makefile.inc 2009-03-30 13:55:24.000000000 +0000 -+++ openswan-2.4.14/Makefile.inc 2009-04-08 23:06:04.000000000 +0000 -@@ -46,7 +46,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* -@@ -91,7 +91,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.4.14.orig/programs/_confread/_confread.in openswan-2.4.14/programs/_confread/_confread.in ---- openswan-2.4.14.orig/programs/_confread/_confread.in 2006-04-12 19:55:42.000000000 +0000 -+++ openswan-2.4.14/programs/_confread/_confread.in 2009-04-08 23:06:04.000000000 +0000 -@@ -14,7 +14,7 @@ - # - # RCSID $Id: openswan-2.4.14-gentoo.patch,v 1.1 2009/04/08 23:30:45 mrness Exp $ - # --# Extract configuration info from /etc/ipsec.conf, repackage as assignments -+# Extract configuration info from /etc/ipsec/ipsec.conf, repackage as assignments - # to shell variables or tab-delimited fields. Success or failure is reported - # inline, as extra data, due to the vagaries of shell backquote handling. - # In the absence of --varprefix, output is tab-separated fields, like: -diff -Nru openswan-2.4.14.orig/programs/_confread/ipsec.conf.in openswan-2.4.14/programs/_confread/ipsec.conf.in ---- openswan-2.4.14.orig/programs/_confread/ipsec.conf.in 2006-10-19 03:49:46.000000000 +0000 -+++ openswan-2.4.14/programs/_confread/ipsec.conf.in 2009-04-08 23:06:04.000000000 +0000 -@@ -1,4 +1,4 @@ --# /etc/ipsec.conf - Openswan IPsec configuration file -+# /etc/ipsec/ipsec.conf - Openswan IPsec configuration file - # RCSID $Id: openswan-2.4.14-gentoo.patch,v 1.1 2009/04/08 23:30:45 mrness Exp $ - - # This file: @FINALEXAMPLECONFDIR@/ipsec.conf-sample -diff -Nru openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.14/programs/examples/l2tp-psk.conf.in ---- openswan-2.4.14.orig/programs/examples/l2tp-psk.conf.in 2007-11-02 01:49:40.000000000 +0000 -+++ openswan-2.4.14/programs/examples/l2tp-psk.conf.in 2009-04-08 23:06:04.000000000 +0000 -@@ -11,7 +11,7 @@ - # - # Use a Preshared Key. Disable Perfect Forward Secrecy. - # -- # PreSharedSecret needs to be specified in /etc/ipsec.secrets as -+ # PreSharedSecret needs to be specified in /etc/ipsec/ipsec.secrets as - # YourIPAddress %any: "sharedsecret" - authby=secret - pfs=no -diff -Nru openswan-2.4.14.orig/programs/_include/_include.in openswan-2.4.14/programs/_include/_include.in ---- openswan-2.4.14.orig/programs/_include/_include.in 2003-01-06 21:44:04.000000000 +0000 -+++ openswan-2.4.14/programs/_include/_include.in 2009-04-08 23:06:04.000000000 +0000 -@@ -47,10 +47,10 @@ - do - if test ! -r "$f" - then -- if test ! "$f" = "/etc/ipsec.conf" -+ if test ! "$f" = "/etc/ipsec/ipsec.conf" - then - echo "#:cannot open configuration file \'$f\'" -- if test "$f" = "/etc/ipsec.secrets" -+ if test "$f" = "/etc/ipsec/ipsec.secrets" - then - echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." - fi -diff -Nru openswan-2.4.14.orig/programs/mailkey/mailkey.in openswan-2.4.14/programs/mailkey/mailkey.in ---- openswan-2.4.14.orig/programs/mailkey/mailkey.in 2006-10-28 23:49:23.000000000 +0000 -+++ openswan-2.4.14/programs/mailkey/mailkey.in 2009-04-08 23:06:04.000000000 +0000 -@@ -60,7 +60,7 @@ - - "$test1st" - --Common concerns: This account must be able to read /etc/ipsec.secrets. -+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. - If you haven't generated your key yet, please run 'ipsec newhostkey'." - exit 0 - } -diff -Nru openswan-2.4.14.orig/programs/Makefile.program openswan-2.4.14/programs/Makefile.program ---- openswan-2.4.14.orig/programs/Makefile.program 2007-06-19 14:49:19.000000000 +0000 -+++ openswan-2.4.14/programs/Makefile.program 2009-04-08 23:08:31.000000000 +0000 -@@ -34,7 +34,6 @@ - WERROR:= -Werror - endif - --CFLAGS+= ${WERROR} - - ifneq ($(LD_LIBRARY_PATH),) - LDFLAGS=-L$(LD_LIBRARY_PATH) -diff -Nru openswan-2.4.14.orig/programs/pluto/Makefile openswan-2.4.14/programs/pluto/Makefile ---- openswan-2.4.14.orig/programs/pluto/Makefile 2007-11-06 18:56:26.000000000 +0000 -+++ openswan-2.4.14/programs/pluto/Makefile 2009-04-08 23:06:04.000000000 +0000 -@@ -210,7 +210,7 @@ - endif - - ifeq ($(USE_WEAKSTUFF),true) --WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES -+WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES - endif - - ifeq ($(USE_EXTRACRYPTO),true) -diff -Nru openswan-2.4.14.orig/programs/setup/Makefile openswan-2.4.14/programs/setup/Makefile ---- openswan-2.4.14.orig/programs/setup/Makefile 2004-12-18 18:13:43.000000000 +0000 -+++ openswan-2.4.14/programs/setup/Makefile 2009-04-08 23:06:04.000000000 +0000 -@@ -33,25 +33,10 @@ - @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 - - clean:: - @rm -f setup -diff -Nru openswan-2.4.14.orig/programs/showhostkey/showhostkey.in openswan-2.4.14/programs/showhostkey/showhostkey.in ---- openswan-2.4.14.orig/programs/showhostkey/showhostkey.in 2007-06-19 15:27:27.000000000 +0000 -+++ openswan-2.4.14/programs/showhostkey/showhostkey.in 2009-04-08 23:06:04.000000000 +0000 -@@ -18,7 +18,7 @@ - usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] - [--dhclient] [--ipseckey]" - --file=/etc/ipsec.secrets -+file=/etc/ipsec/ipsec.secrets - fmt="" - gw= - id= -diff -Nru openswan-2.4.14.orig/testing/utils/ikeping/Makefile openswan-2.4.14/testing/utils/ikeping/Makefile ---- openswan-2.4.14.orig/testing/utils/ikeping/Makefile 2004-04-03 19:44:52.000000000 +0000 -+++ openswan-2.4.14/testing/utils/ikeping/Makefile 2009-04-08 23:09:18.000000000 +0000 -@@ -27,10 +27,9 @@ - FREESWANINCLS= -I$(FREESWANLIBDIR) -I${OPENSWANSRCDIR} - FREESWANLIB=$(FREESWANLIBDIR)/libfreeswan.a - --CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ -+CFLAGS = -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \ - -Wcast-qual -Wmissing-declarations -Wwrite-strings - CFLAGS+= -Wstrict-prototypes --CFLAGS+= -Werror - #CFLAGS+= -Wundef - - HDRDIRS = $(FREESWANINCLS) diff --git a/net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch b/net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch new file mode 100644 index 000000000000..a9439f43843a --- /dev/null +++ b/net-misc/openswan/files/openswan-2.6.21-gentoo-fixed.patch @@ -0,0 +1,130 @@ +diff -Nru openswan-2.6.21.orig/lib/libdns/Makefile openswan-2.6.21/lib/libdns/Makefile +--- openswan-2.6.21.orig/lib/libdns/Makefile 2009-03-30 13:11:28.000000000 +0000 ++++ openswan-2.6.21/lib/libdns/Makefile 2009-04-10 21:20:46.000000000 +0000 +@@ -30,8 +30,8 @@ + -I${srcdir}../libisc/nothreads/include \ + -I. -I./include -I${srcdir}include \ + -I${srcdir}../libisc/include +-CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE} +-CWARNINGS = -Werror ++CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} ++CWARNINGS = + + CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} + +diff -Nru openswan-2.6.21.orig/lib/libisc/Makefile openswan-2.6.21/lib/libisc/Makefile +--- openswan-2.6.21.orig/lib/libisc/Makefile 2009-03-30 13:11:28.000000000 +0000 ++++ openswan-2.6.21/lib/libisc/Makefile 2009-04-10 21:20:46.000000000 +0000 +@@ -22,8 +22,8 @@ + -I${srcdir}nothreads/include \ + -I. -I./include -I${srcdir}include \ + $(PORTINCLUDE) -I${OPENSWANSRCDIR}/include +-CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} +-# CWARNINGS = -Werror ++CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} ++# CWARNINGS = + + CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} + +diff -Nru openswan-2.6.21.orig/lib/liblwres/Makefile openswan-2.6.21/lib/liblwres/Makefile +--- openswan-2.6.21.orig/lib/liblwres/Makefile 2009-03-30 13:11:28.000000000 +0000 ++++ openswan-2.6.21/lib/liblwres/Makefile 2009-04-10 21:20:46.000000000 +0000 +@@ -22,8 +22,8 @@ + -I${srcdir}../libisc/${ISCARCH}/include \ + -I${srcdir}../libisc/include \ + -I. -I./include -I${srcdir}include +-CDEFINES = -g +-CWARNINGS = -Werror ++CDEFINES = ++CWARNINGS = + + CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} + +diff -Nru openswan-2.6.21.orig/Makefile.inc openswan-2.6.21/Makefile.inc +--- openswan-2.6.21.orig/Makefile.inc 2009-03-30 13:11:28.000000000 +0000 ++++ openswan-2.6.21/Makefile.inc 2009-04-10 21:20:46.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.21.orig/programs/Makefile.program openswan-2.6.21/programs/Makefile.program +--- openswan-2.6.21.orig/programs/Makefile.program 2009-03-30 13:11:28.000000000 +0000 ++++ openswan-2.6.21/programs/Makefile.program 2009-04-10 21:20:46.000000000 +0000 +@@ -53,7 +53,6 @@ + WERROR:= -Werror + endif + +-CFLAGS+= ${WERROR} + + ifneq ($(LD_LIBRARY_PATH),) + LDFLAGS=-L$(LD_LIBRARY_PATH) +diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/setup/Makefile +--- openswan-2.6.21.orig/programs/setup/Makefile 2009-03-30 13:11:28.000000000 +0000 ++++ openswan-2.6.21/programs/setup/Makefile 2009-04-10 21:20:47.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: Makefile,v $ +diff -Nru openswan-2.6.21.orig/testing/utils/make-uml.sh openswan-2.6.21/testing/utils/make-uml.sh +--- openswan-2.6.21.orig/testing/utils/make-uml.sh 2009-03-30 13:11:28.000000000 +0000 ++++ openswan-2.6.21/testing/utils/make-uml.sh 2009-04-10 21:20:47.000000000 +0000 +@@ -262,7 +262,7 @@ + + cd $OPENSWANSRCDIR || exit 1 + +-make WERROR=-Werror USE_OBJDIR=true programs ++make USE_OBJDIR=true programs + + # now, execute the Makefile that we have created! + cd $POOLSPACE && make $OPENSWANHOSTS diff --git a/net-misc/openswan/files/openswan-2.6.21-gentoo.patch b/net-misc/openswan/files/openswan-2.6.21-gentoo.patch deleted file mode 100644 index 36fef3c6b200..000000000000 --- a/net-misc/openswan/files/openswan-2.6.21-gentoo.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Nru openswan-2.6.21.orig/lib/libdns/Makefile openswan-2.6.21/lib/libdns/Makefile ---- openswan-2.6.21.orig/lib/libdns/Makefile 2009-03-30 13:11:28.000000000 +0000 -+++ openswan-2.6.21/lib/libdns/Makefile 2009-04-10 21:20:46.000000000 +0000 -@@ -30,8 +30,8 @@ - -I${srcdir}../libisc/nothreads/include \ - -I. -I./include -I${srcdir}include \ - -I${srcdir}../libisc/include --CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE} --CWARNINGS = -Werror -+CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.21.orig/lib/libisc/Makefile openswan-2.6.21/lib/libisc/Makefile ---- openswan-2.6.21.orig/lib/libisc/Makefile 2009-03-30 13:11:28.000000000 +0000 -+++ openswan-2.6.21/lib/libisc/Makefile 2009-04-10 21:20:46.000000000 +0000 -@@ -22,8 +22,8 @@ - -I${srcdir}nothreads/include \ - -I. -I./include -I${srcdir}include \ - $(PORTINCLUDE) -I${OPENSWANSRCDIR}/include --CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} --# CWARNINGS = -Werror -+CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} -+# CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.21.orig/lib/liblwres/Makefile openswan-2.6.21/lib/liblwres/Makefile ---- openswan-2.6.21.orig/lib/liblwres/Makefile 2009-03-30 13:11:28.000000000 +0000 -+++ openswan-2.6.21/lib/liblwres/Makefile 2009-04-10 21:20:46.000000000 +0000 -@@ -22,8 +22,8 @@ - -I${srcdir}../libisc/${ISCARCH}/include \ - -I${srcdir}../libisc/include \ - -I. -I./include -I${srcdir}include --CDEFINES = -g --CWARNINGS = -Werror -+CDEFINES = -+CWARNINGS = - - CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.21.orig/Makefile.inc openswan-2.6.21/Makefile.inc ---- openswan-2.6.21.orig/Makefile.inc 2009-03-30 13:11:28.000000000 +0000 -+++ openswan-2.6.21/Makefile.inc 2009-04-10 21:20:46.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.21.orig/programs/Makefile.program openswan-2.6.21/programs/Makefile.program ---- openswan-2.6.21.orig/programs/Makefile.program 2009-03-30 13:11:28.000000000 +0000 -+++ openswan-2.6.21/programs/Makefile.program 2009-04-10 21:20:46.000000000 +0000 -@@ -53,7 +53,6 @@ - WERROR:= -Werror - endif - --CFLAGS+= ${WERROR} - - ifneq ($(LD_LIBRARY_PATH),) - LDFLAGS=-L$(LD_LIBRARY_PATH) -diff -Nru openswan-2.6.21.orig/programs/setup/Makefile openswan-2.6.21/programs/setup/Makefile ---- openswan-2.6.21.orig/programs/setup/Makefile 2009-03-30 13:11:28.000000000 +0000 -+++ openswan-2.6.21/programs/setup/Makefile 2009-04-10 21:20:47.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: not supported by cvs2svn $ -diff -Nru openswan-2.6.21.orig/testing/utils/make-uml.sh openswan-2.6.21/testing/utils/make-uml.sh ---- openswan-2.6.21.orig/testing/utils/make-uml.sh 2009-03-30 13:11:28.000000000 +0000 -+++ openswan-2.6.21/testing/utils/make-uml.sh 2009-04-10 21:20:47.000000000 +0000 -@@ -262,7 +262,7 @@ - - cd $OPENSWANSRCDIR || exit 1 - --make WERROR=-Werror USE_OBJDIR=true programs -+make USE_OBJDIR=true programs - - # now, execute the Makefile that we have created! - cd $POOLSPACE && make $OPENSWANHOSTS -- cgit v1.2.3-65-gdbad