diff options
author | Mike Gilbert <floppym@gentoo.org> | 2012-12-27 15:24:03 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2012-12-27 15:24:03 +0000 |
commit | 03bd7cd24548af64ac204cef46353deadf4a1b02 (patch) | |
tree | 8c808cec646f9b6b180bba5be5ce83789b5adddc /net-misc | |
parent | Migrate to EAPI 5. Make static libs optional and prune .la files. (diff) | |
download | gentoo-2-03bd7cd24548af64ac204cef46353deadf4a1b02.tar.gz gentoo-2-03bd7cd24548af64ac204cef46353deadf4a1b02.tar.bz2 gentoo-2-03bd7cd24548af64ac204cef46353deadf4a1b02.zip |
pluto creates /var/run/pluto on startup, so don't call keepdir. Bug 448834 by flameeyes. Remove old.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/openswan/ChangeLog | 12 | ||||
-rw-r--r-- | net-misc/openswan/files/ipsec | 57 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch | 11 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch | 11 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.4.15-gentoo.patch | 175 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.6.31-gentoo.patch | 253 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.6.37-gentoo.patch | 253 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.4.15-r2.ebuild | 134 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.6.31.ebuild | 191 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.6.37-r1.ebuild | 175 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.6.37.ebuild | 195 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.6.38.ebuild | 4 |
12 files changed, 12 insertions, 1459 deletions
diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index b0fd88b94824..a87870d89663 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-misc/openswan # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.85 2012/09/14 22:29:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.86 2012/12/27 15:24:03 floppym Exp $ + + 27 Dec 2012; Mike Gilbert <floppym@gentoo.org> -files/ipsec, + -files/openswan-2.4-allow-ms-bad-proposal.patch, + -files/openswan-2.4.15-deprecated-ldap.patch, + -files/openswan-2.4.15-gentoo.patch, -files/openswan-2.6.31-gentoo.patch, + -files/openswan-2.6.37-gentoo.patch, -openswan-2.4.15-r2.ebuild, + -openswan-2.6.31.ebuild, -openswan-2.6.37-r1.ebuild, -openswan-2.6.37.ebuild, + openswan-2.6.38.ebuild: + pluto creates /var/run/pluto on startup, so don't call keepdir. Bug 448834 by + flameeyes. Remove old. 14 Sep 2012; Agostino Sarubbo <ago@gentoo.org> openswan-2.6.38.ebuild: Stable for amd64, wrt bug #434606 diff --git a/net-misc/openswan/files/ipsec b/net-misc/openswan/files/ipsec deleted file mode 100644 index 2d4bf293e6e1..000000000000 --- a/net-misc/openswan/files/ipsec +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/runscript - -# IPsec startup and shutdown script -# Copyright (C) 1998, 1999, 2001 Henry Spencer. -# Gentoo mods (C) 2003 Anthony de Boer -# -# 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 -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. - -depend() { - need net logger - after dns -} - -ipsecdoit() { -# 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 --varprefix IPSEC --export --type config setup` - if test " $IPSEC_confreadstatus" != " " - then - echo "$IPSEC_confreadstatus -- \`$1' aborted" | - logger -s -p daemon.error -t ipsec_setup - return 1 - fi - IPSECsyslog=${IPSECsyslog-daemon.error} - export IPSECsyslog - umask 022 - tmp=/var/run/ipsec_setup.st - ( - ipsec _realsetup $1 - echo "$?" >$tmp - ) 2>&1 | logger -s -p $IPSECsyslog -t ipsec_setup 2>&1 - st=`cat $tmp` - rm -f $tmp - return $st -} - -start() { - ebegin "Starting IPSEC ..." - ipsecdoit start - eend $? -} - -stop() { - ebegin "Stopping IPSEC ..." - ipsecdoit stop - eend $? -} - diff --git a/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch b/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch deleted file mode 100644 index 8f50cbb8e17d..000000000000 --- a/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru openswan-2.4.15.orig/programs/pluto/Makefile openswan-2.4.15/programs/pluto/Makefile ---- openswan-2.4.15.orig/programs/pluto/Makefile 2009-09-11 18:32:38.000000000 +0200 -+++ openswan-2.4.15/programs/pluto/Makefile 2009-09-11 19:35:33.000000000 +0200 -@@ -244,6 +244,7 @@ - -DGCC_LINT \ - -DUSE_AES -DUSE_3DES \ - -DIKE_ALG -DKERNEL_ALG -DDB_CONTEXT \ -+ -DALLOW_MICROSOFT_BAD_PROPOSAL \ - ${AGGRESSIVE_DEFS} \ - ${XAUTH_DEFS} ${XAUTHPAM_DEFS} \ - ${NAT_DEFS} ${CURL_DEFS}\ diff --git a/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch b/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch deleted file mode 100644 index 33c70e83a30a..000000000000 --- a/net-misc/openswan/files/openswan-2.4.15-deprecated-ldap.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru openswan-2.4.15.orig/programs/pluto/fetch.c openswan-2.4.15/programs/pluto/fetch.c ---- openswan-2.4.15.orig/programs/pluto/fetch.c 2004-06-14 04:01:32.000000000 +0200 -+++ openswan-2.4.15/programs/pluto/fetch.c 2009-06-28 11:24:17.000000000 +0200 -@@ -28,6 +28,7 @@ - #include <openswan.h> - - #ifdef LDAP_VER -+#define LDAP_DEPRECATED 1 - #include <ldap.h> - #endif - diff --git a/net-misc/openswan/files/openswan-2.4.15-gentoo.patch b/net-misc/openswan/files/openswan-2.4.15-gentoo.patch deleted file mode 100644 index 35ccb2f24a0c..000000000000 --- a/net-misc/openswan/files/openswan-2.4.15-gentoo.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -Nru openswan-2.4.15.orig/lib/liblwres/Makefile openswan-2.4.15/lib/liblwres/Makefile ---- openswan-2.4.15.orig/lib/liblwres/Makefile 2007-10-22 16:33:11.000000000 +0200 -+++ openswan-2.4.15/lib/liblwres/Makefile 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/Makefile.inc openswan-2.4.15/Makefile.inc ---- openswan-2.4.15.orig/Makefile.inc 2009-06-25 06:01:16.000000000 +0200 -+++ openswan-2.4.15/Makefile.inc 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/programs/_confread/_confread.in openswan-2.4.15/programs/_confread/_confread.in ---- openswan-2.4.15.orig/programs/_confread/_confread.in 2006-04-12 21:55:42.000000000 +0200 -+++ openswan-2.4.15/programs/_confread/_confread.in 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/programs/_confread/ipsec.conf.in openswan-2.4.15/programs/_confread/ipsec.conf.in ---- openswan-2.4.15.orig/programs/_confread/ipsec.conf.in 2006-10-19 05:49:46.000000000 +0200 -+++ openswan-2.4.15/programs/_confread/ipsec.conf.in 2009-06-28 11:22:29.000000000 +0200 -@@ -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.15.orig/programs/examples/l2tp-psk.conf.in openswan-2.4.15/programs/examples/l2tp-psk.conf.in ---- openswan-2.4.15.orig/programs/examples/l2tp-psk.conf.in 2007-11-02 02:49:40.000000000 +0100 -+++ openswan-2.4.15/programs/examples/l2tp-psk.conf.in 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/programs/_include/_include.in openswan-2.4.15/programs/_include/_include.in ---- openswan-2.4.15.orig/programs/_include/_include.in 2003-01-06 22:44:04.000000000 +0100 -+++ openswan-2.4.15/programs/_include/_include.in 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/programs/mailkey/mailkey.in openswan-2.4.15/programs/mailkey/mailkey.in ---- openswan-2.4.15.orig/programs/mailkey/mailkey.in 2006-10-29 01:49:23.000000000 +0200 -+++ openswan-2.4.15/programs/mailkey/mailkey.in 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/programs/Makefile.program openswan-2.4.15/programs/Makefile.program ---- openswan-2.4.15.orig/programs/Makefile.program 2007-06-19 16:49:19.000000000 +0200 -+++ openswan-2.4.15/programs/Makefile.program 2009-06-28 11:21:35.000000000 +0200 -@@ -34,7 +34,6 @@ - WERROR:= -Werror - endif - --CFLAGS+= ${WERROR} - - ifneq ($(LD_LIBRARY_PATH),) - LDFLAGS=-L$(LD_LIBRARY_PATH) -diff -Nru openswan-2.4.15.orig/programs/pluto/Makefile openswan-2.4.15/programs/pluto/Makefile ---- openswan-2.4.15.orig/programs/pluto/Makefile 2007-11-06 19:56:26.000000000 +0100 -+++ openswan-2.4.15/programs/pluto/Makefile 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/programs/setup/Makefile openswan-2.4.15/programs/setup/Makefile ---- openswan-2.4.15.orig/programs/setup/Makefile 2004-12-18 19:13:43.000000000 +0100 -+++ openswan-2.4.15/programs/setup/Makefile 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/programs/showhostkey/showhostkey.in openswan-2.4.15/programs/showhostkey/showhostkey.in ---- openswan-2.4.15.orig/programs/showhostkey/showhostkey.in 2007-06-19 17:27:27.000000000 +0200 -+++ openswan-2.4.15/programs/showhostkey/showhostkey.in 2009-06-28 11:21:35.000000000 +0200 -@@ -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.15.orig/testing/utils/ikeping/Makefile openswan-2.4.15/testing/utils/ikeping/Makefile ---- openswan-2.4.15.orig/testing/utils/ikeping/Makefile 2004-04-03 21:44:52.000000000 +0200 -+++ openswan-2.4.15/testing/utils/ikeping/Makefile 2009-06-28 11:21:35.000000000 +0200 -@@ -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.31-gentoo.patch b/net-misc/openswan/files/openswan-2.6.31-gentoo.patch deleted file mode 100644 index ff064ba1d0db..000000000000 --- a/net-misc/openswan/files/openswan-2.6.31-gentoo.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff -Nru openswan-2.6.31.orig/lib/libcrypto/libmd5/Makefile openswan-2.6.31/lib/libcrypto/libmd5/Makefile ---- openswan-2.6.31.orig/lib/libcrypto/libmd5/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/libcrypto/libmd5/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -12,7 +12,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - include ${srcdir}../../Makefile.library -diff -Nru openswan-2.6.31.orig/lib/libcrypto/libsha1/Makefile openswan-2.6.31/lib/libcrypto/libsha1/Makefile ---- openswan-2.6.31.orig/lib/libcrypto/libsha1/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/libcrypto/libsha1/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -12,7 +12,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - -diff -Nru openswan-2.6.31.orig/lib/libcrypto/libsha2/Makefile openswan-2.6.31/lib/libcrypto/libsha2/Makefile ---- openswan-2.6.31.orig/lib/libcrypto/libsha2/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/libcrypto/libsha2/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -15,5 +15,5 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif -diff -Nru openswan-2.6.31.orig/lib/libdns/Makefile openswan-2.6.31/lib/libdns/Makefile ---- openswan-2.6.31.orig/lib/libdns/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/libdns/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -31,7 +31,7 @@ - -I. -I./include -I${srcdir}include \ - -I${srcdir}../libisc/include - CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} --CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.31.orig/lib/libipsecconf/Makefile openswan-2.6.31/lib/libipsecconf/Makefile ---- openswan-2.6.31.orig/lib/libipsecconf/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/libipsecconf/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -33,7 +33,7 @@ - #CFLAGS+=-DFIPS_CHECK - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - ifeq ($(USE_NM),true) -diff -Nru openswan-2.6.31.orig/lib/libisc/Makefile openswan-2.6.31/lib/libisc/Makefile ---- openswan-2.6.31.orig/lib/libisc/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/libisc/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -23,7 +23,7 @@ - -I. -I./include -I${srcdir}include \ - $(PORTINCLUDE) -I${OPENSWANSRCDIR}/include - CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} --# CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.31.orig/lib/liblwres/Makefile openswan-2.6.31/lib/liblwres/Makefile ---- openswan-2.6.31.orig/lib/liblwres/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/liblwres/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -23,7 +23,7 @@ - -I${srcdir}../libisc/include \ - -I. -I./include -I${srcdir}include - CDEFINES = --CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.31.orig/lib/libopenswan/Makefile openswan-2.6.31/lib/libopenswan/Makefile ---- openswan-2.6.31.orig/lib/libopenswan/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/lib/libopenswan/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -100,7 +100,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - ifeq ($(USE_MODP_RFC5114),true) -diff -Nru openswan-2.6.31.orig/Makefile.inc openswan-2.6.31/Makefile.inc ---- openswan-2.6.31.orig/Makefile.inc 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/Makefile.inc 2010-11-27 13:16:46.000000000 +0100 -@@ -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* -diff -Nru openswan-2.6.31.orig/packaging/makefiles/module.make openswan-2.6.31/packaging/makefiles/module.make ---- openswan-2.6.31.orig/packaging/makefiles/module.make 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/packaging/makefiles/module.make 2010-11-27 13:16:46.000000000 +0100 -@@ -25,7 +25,6 @@ - - EXTRA_CFLAGS += $(KLIPSCOMPILE) - EXTRA_CFLAGS += -Wall -DIPCOMP_PREFIX --#EXTRA_CFLAGS += -Werror - #EXTRA_CFLAGS += -Wconversion - #EXTRA_CFLAGS += -Wmissing-prototypes - # 'override CFLAGS' should really be 'EXTRA_CFLAGS' -diff -Nru openswan-2.6.31.orig/programs/Makefile.program openswan-2.6.31/programs/Makefile.program ---- openswan-2.6.31.orig/programs/Makefile.program 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/programs/Makefile.program 2010-11-27 13:16:46.000000000 +0100 -@@ -48,12 +48,7 @@ - CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\" - CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" - --# die if there are any warnings --ifndef WERROR --WERROR:= -Werror --endif - --CFLAGS+= ${WERROR} - - ifneq ($(LD_LIBRARY_PATH),) - LDFLAGS=-L$(LD_LIBRARY_PATH) -@@ -104,8 +99,6 @@ - ifneq ($(NOINSTALL),true) - - doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) -- # remove any old vendor file installed previously -- @rm -f $(FINALLIBEXECDIR)/vendor - @mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) - @if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi - @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ -@@ -180,6 +173,7 @@ - LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp - else - LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - endif - - -diff -Nru openswan-2.6.31.orig/programs/pluto/Makefile.options openswan-2.6.31/programs/pluto/Makefile.options ---- openswan-2.6.31.orig/programs/pluto/Makefile.options 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/programs/pluto/Makefile.options 2010-11-27 13:16:46.000000000 +0100 -@@ -44,7 +44,7 @@ - - # -O on Linux makes gcc coredump when compiling sha1.c - # -Wundef is nice but RHL5.2 compiler doesn't support it --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 \ - -Wstrict-prototypes # -Wundef - -@@ -54,7 +54,7 @@ - - # Use LIBNSS - ifeq ($(USE_LIBNSS),true) --HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3 -+HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss - endif - - # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN -@@ -306,6 +306,7 @@ - DEFINES+=-DHAVE_LIBNSS - LIBSPLUTO+= -lnspr4 - LIBSPLUTO+= -lnss3 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - # For avoiding implicit DSO linking - LIBSPLUTO+= -lpthread - ifeq ($(USE_FIPSCHECK),true) -diff -Nru openswan-2.6.31.orig/programs/rsasigkey/Makefile openswan-2.6.31/programs/rsasigkey/Makefile ---- openswan-2.6.31.orig/programs/rsasigkey/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/programs/rsasigkey/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -21,13 +21,14 @@ - FIPS_CHECK=1 - CFLAGS+=-DFIPS_CHECK - endif --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif - - PROGRAM=rsasigkey - LIBS=${OPENSWANLIB} -lgmp - ifeq ($(USE_LIBNSS),true) - LIBS+= -lnspr4 -lnss3 -lplc4 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - ifeq ($(USE_FIPSCHECK),true) - LIBS+= -lfipscheck - endif -diff -Nru openswan-2.6.31.orig/programs/setup/Makefile openswan-2.6.31/programs/setup/Makefile ---- openswan-2.6.31.orig/programs/setup/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/programs/setup/Makefile 2010-11-27 13:17:15.000000000 +0100 -@@ -16,11 +16,7 @@ - OPENSWANSRCDIR?=$(shell cd ../..; pwd) - include ${OPENSWANSRCDIR}/Makefile.inc - --# 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 --NOINSTALL=true - EXTRA8MAN=setup.8 - - include ${srcdir}../Makefile.program -@@ -34,13 +30,11 @@ - # remove any old vendor file installed previously - @rm -f $(BINDIR)/setup - # check the directories we need exist (ie., make install DESTDIR=/tmp/IPsec) -- @mkdir -p $(RCDIR) $(BINDIR) -+ @mkdir -p $(BINDIR) - # install and link everything -- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec -- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup -+ @$(INSTALL) $(INSTBINFLAGS) setup $(BINDIR)/setup - - install_file_list:: -- @echo $(RCDIR)/ipsec - @echo $(BINDIR)/setup - - cleanall:: -diff -Nru openswan-2.6.31.orig/programs/showhostkey/Makefile openswan-2.6.31/programs/showhostkey/Makefile ---- openswan-2.6.31.orig/programs/showhostkey/Makefile 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/programs/showhostkey/Makefile 2010-11-27 13:16:46.000000000 +0100 -@@ -16,7 +16,7 @@ - include ${OPENSWANSRCDIR}/Makefile.inc - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif - - PROGRAM=showhostkey -diff -Nru openswan-2.6.31.orig/testing/utils/make-uml.sh openswan-2.6.31/testing/utils/make-uml.sh ---- openswan-2.6.31.orig/testing/utils/make-uml.sh 2010-10-18 18:13:36.000000000 +0200 -+++ openswan-2.6.31/testing/utils/make-uml.sh 2010-11-27 13:16:46.000000000 +0100 -@@ -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.37-gentoo.patch b/net-misc/openswan/files/openswan-2.6.37-gentoo.patch deleted file mode 100644 index 1ff87c35d12a..000000000000 --- a/net-misc/openswan/files/openswan-2.6.37-gentoo.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff -Nru openswan-2.6.37.old//lib/libcrypto/libmd5/Makefile openswan-2.6.37/lib/libcrypto/libmd5/Makefile ---- openswan-2.6.37.old//lib/libcrypto/libmd5/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/libcrypto/libmd5/Makefile 2011-11-07 21:36:27.000000000 +0100 -@@ -12,7 +12,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - include ${srcdir}../../Makefile.library -diff -Nru openswan-2.6.37.old//lib/libcrypto/libsha1/Makefile openswan-2.6.37/lib/libcrypto/libsha1/Makefile ---- openswan-2.6.37.old//lib/libcrypto/libsha1/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/libcrypto/libsha1/Makefile 2011-11-07 21:36:29.000000000 +0100 -@@ -12,7 +12,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - -diff -Nru openswan-2.6.37.old//lib/libcrypto/libsha2/Makefile openswan-2.6.37/lib/libcrypto/libsha2/Makefile ---- openswan-2.6.37.old//lib/libcrypto/libsha2/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/libcrypto/libsha2/Makefile 2011-11-07 21:36:30.000000000 +0100 -@@ -15,5 +15,5 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif -diff -Nru openswan-2.6.37.old//lib/libdns/Makefile openswan-2.6.37/lib/libdns/Makefile ---- openswan-2.6.37.old//lib/libdns/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/libdns/Makefile 2011-11-07 21:36:30.000000000 +0100 -@@ -31,7 +31,7 @@ - -I. -I./include -I${srcdir}include \ - -I${srcdir}../libisc/include - CDEFINES = ${USERCOMPILE} ${PORTINCLUDE} --CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.37.old//lib/libipsecconf/Makefile openswan-2.6.37/lib/libipsecconf/Makefile ---- openswan-2.6.37.old//lib/libipsecconf/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/libipsecconf/Makefile 2011-11-07 21:36:32.000000000 +0100 -@@ -33,7 +33,7 @@ - #CFLAGS+=-DFIPS_CHECK - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - ifeq ($(USE_NM),true) -diff -Nru openswan-2.6.37.old//lib/libisc/Makefile openswan-2.6.37/lib/libisc/Makefile ---- openswan-2.6.37.old//lib/libisc/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/libisc/Makefile 2011-11-07 21:36:32.000000000 +0100 -@@ -23,7 +23,7 @@ - -I. -I./include -I${srcdir}include \ - $(PORTINCLUDE) -I${OPENSWANSRCDIR}/include - CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE} --# CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.37.old//lib/liblwres/Makefile openswan-2.6.37/lib/liblwres/Makefile ---- openswan-2.6.37.old//lib/liblwres/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/liblwres/Makefile 2011-11-07 21:36:32.000000000 +0100 -@@ -23,7 +23,7 @@ - -I${srcdir}../libisc/include \ - -I. -I./include -I${srcdir}include - CDEFINES = --CWARNINGS = -Werror -+CWARNINGS = - - CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} - -diff -Nru openswan-2.6.37.old//lib/libopenswan/Makefile openswan-2.6.37/lib/libopenswan/Makefile ---- openswan-2.6.37.old//lib/libopenswan/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/lib/libopenswan/Makefile 2011-11-07 21:36:32.000000000 +0100 -@@ -105,7 +105,7 @@ - - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3 -+CFLAGS+=-I/usr/include/nspr -I/usr/include/nss - endif - - ifeq ($(USE_MODP_RFC5114),true) -diff -Nru openswan-2.6.37.old//Makefile.inc openswan-2.6.37/Makefile.inc ---- openswan-2.6.37.old//Makefile.inc 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/Makefile.inc 2011-11-07 21:36:32.000000000 +0100 -@@ -55,7 +55,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* -diff -Nru openswan-2.6.37.old//packaging/makefiles/module.make openswan-2.6.37/packaging/makefiles/module.make ---- openswan-2.6.37.old//packaging/makefiles/module.make 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/packaging/makefiles/module.make 2011-11-07 21:36:35.000000000 +0100 -@@ -25,7 +25,6 @@ - - EXTRA_CFLAGS += $(KLIPSCOMPILE) - EXTRA_CFLAGS += -Wall -DIPCOMP_PREFIX --#EXTRA_CFLAGS += -Werror - #EXTRA_CFLAGS += -Wconversion - #EXTRA_CFLAGS += -Wmissing-prototypes - # 'override CFLAGS' should really be 'EXTRA_CFLAGS' -diff -Nru openswan-2.6.37.old//programs/Makefile.program openswan-2.6.37/programs/Makefile.program ---- openswan-2.6.37.old//programs/Makefile.program 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/programs/Makefile.program 2011-11-07 21:36:36.000000000 +0100 -@@ -48,12 +48,7 @@ - CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFILE}\" - CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" - --# die if there are any warnings --ifndef WERROR --WERROR:= -Werror --endif - --CFLAGS+= ${WERROR} - - ifneq ($(LD_LIBRARY_PATH),) - LDFLAGS=-L$(LD_LIBRARY_PATH) -@@ -104,8 +99,6 @@ - ifneq ($(NOINSTALL),true) - - doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) -- # remove any old vendor file installed previously -- @rm -f $(FINALLIBEXECDIR)/vendor - @mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) - @if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi - @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ -@@ -180,6 +173,7 @@ - LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp - else - LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - endif - - -diff -Nru openswan-2.6.37.old//programs/pluto/Makefile.options openswan-2.6.37/programs/pluto/Makefile.options ---- openswan-2.6.37.old//programs/pluto/Makefile.options 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/programs/pluto/Makefile.options 2011-11-07 21:36:36.000000000 +0100 -@@ -44,7 +44,7 @@ - - # -O on Linux makes gcc coredump when compiling sha1.c - # -Wundef is nice but RHL5.2 compiler doesn't support it --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 \ - -Wstrict-prototypes # -Wundef - -@@ -58,7 +58,7 @@ - - # Use LIBNSS - ifeq ($(USE_LIBNSS),true) --HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3 -+HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss - endif - - # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN -@@ -315,6 +315,7 @@ - DEFINES+=-DHAVE_LIBNSS - LIBSPLUTO+= -lnspr4 - LIBSPLUTO+= -lnss3 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - # For avoiding implicit DSO linking - LIBSPLUTO+= -lpthread - ifeq ($(USE_FIPSCHECK),true) -diff -Nru openswan-2.6.37.old//programs/rsasigkey/Makefile openswan-2.6.37/programs/rsasigkey/Makefile ---- openswan-2.6.37.old//programs/rsasigkey/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/programs/rsasigkey/Makefile 2011-11-07 21:36:36.000000000 +0100 -@@ -21,13 +21,14 @@ - FIPS_CHECK=1 - CFLAGS+=-DFIPS_CHECK - endif --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif - - PROGRAM=rsasigkey - LIBS=${OPENSWANLIB} -lgmp - ifeq ($(USE_LIBNSS),true) - LIBS+= -lnspr4 -lnss3 -lplc4 -+LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss - ifeq ($(USE_FIPSCHECK),true) - LIBS+= -lfipscheck - endif -diff -Nru openswan-2.6.37.old//programs/setup/Makefile openswan-2.6.37/programs/setup/Makefile ---- openswan-2.6.37.old//programs/setup/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/programs/setup/Makefile 2011-11-07 21:36:36.000000000 +0100 -@@ -16,11 +16,7 @@ - OPENSWANSRCDIR?=$(shell cd ../..; pwd) - include ${OPENSWANSRCDIR}/Makefile.inc - --# 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 --NOINSTALL=true - EXTRA8MAN=setup.8 - - include ${srcdir}../Makefile.program -@@ -34,13 +30,11 @@ - # remove any old vendor file installed previously - @rm -f $(BINDIR)/setup - # check the directories we need exist (ie., make install DESTDIR=/tmp/IPsec) -- @mkdir -p $(RCDIR) $(BINDIR) -+ @mkdir -p $(BINDIR) - # install and link everything -- @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec -- @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup -+ @$(INSTALL) $(INSTBINFLAGS) setup $(BINDIR)/setup - - install_file_list:: -- @echo $(RCDIR)/ipsec - @echo $(BINDIR)/setup - - cleanall:: -diff -Nru openswan-2.6.37.old//programs/showhostkey/Makefile openswan-2.6.37/programs/showhostkey/Makefile ---- openswan-2.6.37.old//programs/showhostkey/Makefile 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/programs/showhostkey/Makefile 2011-11-07 21:36:36.000000000 +0100 -@@ -16,7 +16,7 @@ - include ${OPENSWANSRCDIR}/Makefile.inc - ifeq ($(USE_LIBNSS),true) - CFLAGS+=-DHAVE_LIBNSS --INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3 -+INCLUDES+=-I/usr/include/nspr -I/usr/include/nss - endif - - PROGRAM=showhostkey -diff -Nru openswan-2.6.37.old//testing/utils/make-uml.sh openswan-2.6.37/testing/utils/make-uml.sh ---- openswan-2.6.37.old//testing/utils/make-uml.sh 2011-10-28 23:11:53.000000000 +0200 -+++ openswan-2.6.37/testing/utils/make-uml.sh 2011-11-07 21:39:58.000000000 +0100 -@@ -264,7 +264,7 @@ - - cd $OPENSWANSRCDIR || exit 1 - --make ${WERROR:-WERROR=-Werror} USE_OBJDIR=true USE_IPSECPOLICY=true programs -+make ${WERROR:-WERROR=} USE_OBJDIR=true USE_IPSECPOLICY=true programs - - # now, execute the Makefile that we have created! - cd $POOLSPACE && make $OPENSWANHOSTS diff --git a/net-misc/openswan/openswan-2.4.15-r2.ebuild b/net-misc/openswan/openswan-2.4.15-r2.ebuild deleted file mode 100644 index a75bd9c50380..000000000000 --- a/net-misc/openswan/openswan-2.4.15-r2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.15-r2.ebuild,v 1.3 2011/06/06 06:18:52 robbat2 Exp $ - -EAPI="2" - -inherit eutils linux-info toolchain-funcs - -DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)." -HOMEPAGE="http://www.openswan.org/" -SRC_URI="http://www.openswan.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="curl ldap smartcard extra-algorithms weak-algorithms ms-bad-proposal" - -COMMON_DEPEND="!net-misc/strongswan - dev-libs/gmp - dev-lang/perl - smartcard? ( dev-libs/opensc ) - curl? ( net-misc/curl ) - ldap? ( net-nds/openldap )" -DEPEND="${COMMON_DEPEND} - virtual/linux-sources" -RDEPEND="${COMMON_DEPEND} - virtual/logger - sys-apps/iproute2" - -pkg_setup() { - linux-info_pkg_setup - - if kernel_is -ge 2 6; then - einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)." - einfo "KLIPS will not be compiled/installed." - MYMAKE="programs" - - elif kernel_is 2 4; then - if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then - eerror "You need to have an IPsec enabled 2.4.x kernel." - eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" - die - fi - - einfo "Using patched-in IPsec code for kernel 2.4" - einfo "Your kernel only supports KLIPS for kernel level IPsec." - MYMAKE="confcheck programs" - - else - die "Unsupported kernel version" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-deprecated-ldap.patch - use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch - - find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \ - -e 's:/usr/local:/usr:g' \ - -e 's:/etc/ipsec[\][&][.]conf:/etc/ipsec/ipsec\\\&.conf:g' \ - -e 's:/etc/ipsec[.]conf:/etc/ipsec/ipsec.conf:g' \ - -e 's:/etc/ipsec[\][&][.]secrets:/etc/ipsec/ipsec\\\&.secrets:g' \ - -e 's:/etc/ipsec[.]secrets:/etc/ipsec/ipsec.secrets:g' '{}' \; || - die "failed to replace text in docs" -} - -get_make_options() { - echo KERNELSRC=\"${KERNEL_DIR}\" \ - FINALCONFDIR=/etc/ipsec \ - FINALCONFFILE=/etc/ipsec/ipsec.conf \ - FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \ - INC_RCDEFAULT=/etc/init.d \ - INC_USRLOCAL=/usr \ - INC_MANDIR=share/man \ - FINALDOCDIR=/usr/share/doc/${PF} \ - DESTDIR=\"${D}\" \ - USERCOMPILE=\"${CFLAGS}\" \ - CC=\"$(tc-getCC)\" - if use smartcard ; then - echo USE_SMARTCARD=true - fi - if use extra-algorithms ; then - echo USE_EXTRACRYPTO=true - fi - if use weak-algorithms ; then - echo USE_WEAKSTUFF=true - fi - echo USE_OE=false # by default, turn off Opportunistic Encryption - echo USE_LWRES=false # needs bind9 with lwres support - local USETHREADS=false - if use curl; then - echo USE_LIBCURL=true - USETHREADS=true - fi - if use ldap; then - echo USE_LDAP=true - USETHREADS=true - fi - echo HAVE_THREADS=${USETHREADS} -} - -src_compile() { - eval set -- $(get_make_options) - emake "$@" \ - ${MYMAKE} || die "emake failed" -} - -src_install() { - eval set -- $(get_make_options) - emake "$@" \ - install || die "emake install failed" - - dodoc docs/{KNOWN_BUGS,RELEASE-NOTES*,debugging*} - dodoc doc/*.html - docinto quickstarts - dodoc doc/quickstarts/* - - dosym /etc/ipsec/ipsec.d /etc/ipsec.d - - doinitd "${FILESDIR}"/ipsec || die "failed to install init script" - - dodir /var/run/pluto || die "failed to create /var/run/pluto" -} - -pkg_postinst() { - if kernel_is -ge 2 6; then - CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP" - WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)" - WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)" - WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)" - check_extra_config - fi -} diff --git a/net-misc/openswan/openswan-2.6.31.ebuild b/net-misc/openswan/openswan-2.6.31.ebuild deleted file mode 100644 index 8203dc698bd6..000000000000 --- a/net-misc/openswan/openswan-2.6.31.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.31.ebuild,v 1.2 2011/06/06 06:18:52 robbat2 Exp $ - -EAPI="2" - -inherit eutils linux-info toolchain-funcs flag-o-matic - -DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)." -HOMEPAGE="http://www.openswan.org/" -SRC_URI="http://www.openswan.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss" - -COMMON_DEPEND="!net-misc/strongswan - dev-libs/gmp - dev-lang/perl - caps? ( sys-libs/libcap-ng ) - curl? ( net-misc/curl ) - ldap? ( net-nds/openldap ) - nss? ( dev-libs/nss ) - ssl? ( dev-libs/openssl )" -DEPEND="${COMMON_DEPEND} - virtual/linux-sources - app-text/xmlto - app-text/docbook-xml-dtd:4.1.2" # see bug 237132 -RDEPEND="${COMMON_DEPEND} - virtual/logger - sys-apps/iproute2" - -pkg_setup() { - if use nocrypto-algorithms && ! use weak-algorithms; then - ewarn "Enabling nocrypto-algorithms USE flag has no effect when" - ewarn "weak-algorithms USE flag is disabled" - fi - - linux-info_pkg_setup - - if kernel_is -ge 2 6; then - einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)." - einfo "KLIPS will not be compiled/installed." - MYMAKE="programs" - - elif kernel_is 2 4; then - if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then - eerror "You need to have an IPsec enabled 2.4.x kernel." - eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" - die - fi - - einfo "Using patched-in IPsec code for kernel 2.4" - einfo "Your kernel only supports KLIPS for kernel level IPsec." - MYMAKE="confcheck programs" - - else - die "Unsupported kernel version" - fi - - # most code is OK, but programs/pluto code breaks strict aliasing - append-cflags -fno-strict-aliasing -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch - - find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \ - -e s:/usr/local:/usr:g '{}' \; || - die "failed to replace text in docs" -} - -get_make_options() { - echo KERNELSRC=\"${KERNEL_DIR}\"\ - FINALEXAMPLECONFDIR=/usr/share/doc/${PF}\ - INC_RCDEFAULT=/etc/init.d\ - INC_USRLOCAL=/usr\ - INC_MANDIR=share/man\ - FINALDOCDIR=/usr/share/doc/${PF}/html\ - FINALLIBDIR=/usr/$(get_libdir)/ipsec\ - DESTDIR=\"${D}\"\ - USERCOMPILE=\"${CFLAGS}\"\ - CC=\"$(tc-getCC)\" - - use caps\ - && echo USE_LIBCAP_NG=true\ - || echo USE_LIBCAP_NG=false - - use curl\ - && echo USE_LIBCURL=true\ - || echo USE_LIBCURL=false - - use ldap\ - && echo USE_LDAP=true\ - || echo USE_LDAP=false - - echo USE_XAUTH=true - use pam\ - && echo USE_XAUTHPAM=true\ - || echo USE_XAUTHPAM=false - - use nss\ - && echo USE_LIBNSS=true\ - || echo USE_LIBNSS=false - - use ssl\ - && echo HAVE_OPENSSL=true\ - || echo HAVE_OPENSSL=false - - use extra-algorithms\ - && echo USE_EXTRACRYPTO=true\ - || echo USE_EXTRACRYPTO=false - if use weak-algorithms ; then - echo USE_WEAKSTUFF=true - if use nocrypto-algorithms; then - echo USE_NOCRYPTO=true - fi - else - echo USE_WEAKSTUFF=false - fi - - echo USE_LWRES=false # needs bind9 with lwres support - if use curl || use ldap || use pam; then - echo HAVE_THREADS=true - else - echo HAVE_THREADS=false - fi -} - -src_compile() { - eval set -- $(get_make_options) - emake "$@" ${MYMAKE} || die "emake failed" -} - -src_install() { - eval set -- $(get_make_options) - emake "$@" install || die "emake install failed" - - dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*} - dohtml doc/*.html - docinto quickstarts - dodoc doc/quickstarts/* - - newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script" - - keepdir /var/run/pluto -} - -pkg_preinst() { - if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then - ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':" - local i err=0 - if [ -h "../ipsec.d" ]; then - rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink" - fi - for i in *; do - if [ -e "../$i" ]; then - eerror " $i NOT MOVED, ../$i already exists!" - err=1 - elif [ -d "$i" ]; then - mv "$i" .. || die "failed to move $i directory" - ewarn " directory $i" - elif [ -f "$i" ]; then - sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \ - mv "$i" .. && ewarn " file $i" || \ - die "failed to move $i file" - else - eerror " $i NOT MOVED, it is not a file nor a directory!" - err=1 - fi - done - popd - if [ $err -eq 0 ]; then - rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec" - else - ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself" - fi - fi -} - -pkg_postinst() { - if kernel_is -ge 2 6; then - CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP" - WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)" - WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)" - WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)" - check_extra_config - fi -} diff --git a/net-misc/openswan/openswan-2.6.37-r1.ebuild b/net-misc/openswan/openswan-2.6.37-r1.ebuild deleted file mode 100644 index 1f3922a6bee1..000000000000 --- a/net-misc/openswan/openswan-2.6.37-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.37-r1.ebuild,v 1.1 2011/11/21 20:51:51 vapier Exp $ - -EAPI="2" - -inherit eutils linux-info toolchain-funcs flag-o-matic - -DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)." -HOMEPAGE="http://www.openswan.org/" -SRC_URI="http://www.openswan.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss" - -RESTRICT="test" # requires user mode linux setup - -COMMON_DEPEND="!net-misc/strongswan - dev-libs/gmp - dev-lang/perl - caps? ( sys-libs/libcap-ng ) - curl? ( net-misc/curl ) - ldap? ( net-nds/openldap ) - nss? ( dev-libs/nss ) - ssl? ( dev-libs/openssl )" -DEPEND="${COMMON_DEPEND} - virtual/linux-sources - app-text/xmlto - app-text/docbook-xml-dtd:4.1.2" # see bug 237132 -RDEPEND="${COMMON_DEPEND} - || ( sys-apps/net-tools[old-output] <sys-apps/net-tools-1.60_p201111202031570500 ) - virtual/logger - sys-apps/iproute2" - -pkg_setup() { - if use nocrypto-algorithms && ! use weak-algorithms; then - ewarn "Enabling nocrypto-algorithms USE flag has no effect when" - ewarn "weak-algorithms USE flag is disabled" - fi - - linux-info_pkg_setup - - if kernel_is -ge 2 6; then - einfo "This ebuild will set ${P} to use kernel native IPsec (KAME)." - MYMAKE="programs" - - elif kernel_is 2 4; then - if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then - eerror "You need to have an IPsec enabled 2.4.x kernel." - eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" - die - fi - - einfo "Using patched-in IPsec code for kernel 2.4" - einfo "Your kernel only supports KLIPS for kernel level IPsec." - MYMAKE="confcheck programs" - - else - die "Unsupported kernel version" - fi - - # most code is OK, but programs/pluto code breaks strict aliasing - append-cflags -fno-strict-aliasing -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch - - find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \ - -e s:/usr/local:/usr:g '{}' \; || - die "failed to replace text in docs" -} - -usetf() { usex $1 true false ; } -get_make_options() { - make_options=( - KERNELSRC="${KERNEL_DIR}" - FINALEXAMPLECONFDIR=/usr/share/doc/${PF} - INC_RCDEFAULT=/etc/init.d - INC_USRLOCAL=/usr - INC_MANDIR=share/man - FINALDOCDIR=/usr/share/doc/${PF}/html - FINALLIBDIR=/usr/$(get_libdir)/ipsec - DESTDIR="${D}" - USERCOMPILE="${CFLAGS}" - USERLINK="-Wl,-z,relro ${LDFLAGS}" - CC="$(tc-getCC)" - USE_LIBCAP_NG=$(usetf caps) - USE_LIBCURL=$(usetf curl) - USE_LDAP=$(usetf ldap) - USE_XAUTH=true - USE_XAUTHPAM=$(usetf pam) - USE_LIBNSS=$(usetf nss) - HAVE_OPENSSL=$(usetf ssl) - USE_EXTRACRYPTO=$(usetf extra-algorithms) - USE_WEAKSTUFF=$(usetf weak-algorithms) - ) - - if use weak-algorithms && use nocrypto-algorithms ; then - make_options+=( USE_NOCRYPTO=true ) - fi - - make_options+=( USE_LWRES=false ) # needs bind9 with lwres support - if use curl || use ldap || use pam; then - make_options+=( HAVE_THREADS=true ) - else - make_options+=( HAVE_THREADS=false ) - fi -} - -src_compile() { - local make_options; get_make_options - emake "${make_options[@]}" ${MYMAKE} || die -} - -src_install() { - local make_options; get_make_options - emake "${make_options[@]}" install || die - - dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*} - docinto quickstarts - dodoc docs/quickstarts/* - - insinto /usr/share/doc/${PF} - doins -r contrib - - newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script" - - keepdir /var/run/pluto -} - -pkg_preinst() { - if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then - ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':" - local i err=0 - if [ -h "../ipsec.d" ]; then - rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink" - fi - for i in *; do - if [ -e "../$i" ]; then - eerror " $i NOT MOVED, ../$i already exists!" - err=1 - elif [ -d "$i" ]; then - mv "$i" .. || die "failed to move $i directory" - ewarn " directory $i" - elif [ -f "$i" ]; then - sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \ - mv "$i" .. && ewarn " file $i" || \ - die "failed to move $i file" - else - eerror " $i NOT MOVED, it is not a file nor a directory!" - err=1 - fi - done - popd - if [ $err -eq 0 ]; then - rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec" - else - ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself" - fi - fi -} - -pkg_postinst() { - if kernel_is -ge 2 6; then - CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP" - WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)" - WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)" - WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)" - check_extra_config - fi -} diff --git a/net-misc/openswan/openswan-2.6.37.ebuild b/net-misc/openswan/openswan-2.6.37.ebuild deleted file mode 100644 index 2330083e4a73..000000000000 --- a/net-misc/openswan/openswan-2.6.37.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.37.ebuild,v 1.3 2011/11/10 14:32:21 chainsaw Exp $ - -EAPI="2" - -inherit eutils linux-info toolchain-funcs flag-o-matic - -DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)." -HOMEPAGE="http://www.openswan.org/" -SRC_URI="http://www.openswan.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss" - -RESTRICT="test" # requires user mode linux setup - -COMMON_DEPEND="!net-misc/strongswan - dev-libs/gmp - dev-lang/perl - caps? ( sys-libs/libcap-ng ) - curl? ( net-misc/curl ) - ldap? ( net-nds/openldap ) - nss? ( dev-libs/nss ) - ssl? ( dev-libs/openssl )" -DEPEND="${COMMON_DEPEND} - virtual/linux-sources - app-text/xmlto - app-text/docbook-xml-dtd:4.1.2" # see bug 237132 -RDEPEND="${COMMON_DEPEND} - virtual/logger - sys-apps/iproute2" - -pkg_setup() { - if use nocrypto-algorithms && ! use weak-algorithms; then - ewarn "Enabling nocrypto-algorithms USE flag has no effect when" - ewarn "weak-algorithms USE flag is disabled" - fi - - linux-info_pkg_setup - - if kernel_is -ge 2 6; then - einfo "This ebuild will set ${P} to use kernel native IPsec (KAME)." - MYMAKE="programs" - - elif kernel_is 2 4; then - if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then - eerror "You need to have an IPsec enabled 2.4.x kernel." - eerror "Ensure you have one running and make a symlink to it in /usr/src/linux" - die - fi - - einfo "Using patched-in IPsec code for kernel 2.4" - einfo "Your kernel only supports KLIPS for kernel level IPsec." - MYMAKE="confcheck programs" - - else - die "Unsupported kernel version" - fi - - # most code is OK, but programs/pluto code breaks strict aliasing - append-cflags -fno-strict-aliasing -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch - - find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \ - -e s:/usr/local:/usr:g '{}' \; || - die "failed to replace text in docs" -} - -get_make_options() { - echo KERNELSRC=\"${KERNEL_DIR}\"\ - FINALEXAMPLECONFDIR=/usr/share/doc/${PF}\ - INC_RCDEFAULT=/etc/init.d\ - INC_USRLOCAL=/usr\ - INC_MANDIR=share/man\ - FINALDOCDIR=/usr/share/doc/${PF}/html\ - FINALLIBDIR=/usr/$(get_libdir)/ipsec\ - DESTDIR=\"${D}\"\ - USERCOMPILE=\"${CFLAGS}\"\ - USERLINK=\"-Wl,-z,relro ${LDFLAGS}\"\ - CC=\"$(tc-getCC)\" - - use caps\ - && echo USE_LIBCAP_NG=true\ - || echo USE_LIBCAP_NG=false - - use curl\ - && echo USE_LIBCURL=true\ - || echo USE_LIBCURL=false - - use ldap\ - && echo USE_LDAP=true\ - || echo USE_LDAP=false - - echo USE_XAUTH=true - use pam\ - && echo USE_XAUTHPAM=true\ - || echo USE_XAUTHPAM=false - - use nss\ - && echo USE_LIBNSS=true\ - || echo USE_LIBNSS=false - - use ssl\ - && echo HAVE_OPENSSL=true\ - || echo HAVE_OPENSSL=false - - use extra-algorithms\ - && echo USE_EXTRACRYPTO=true\ - || echo USE_EXTRACRYPTO=false - if use weak-algorithms ; then - echo USE_WEAKSTUFF=true - if use nocrypto-algorithms; then - echo USE_NOCRYPTO=true - fi - else - echo USE_WEAKSTUFF=false - fi - - echo USE_LWRES=false # needs bind9 with lwres support - if use curl || use ldap || use pam; then - echo HAVE_THREADS=true - else - echo HAVE_THREADS=false - fi -} - -src_compile() { - eval set -- $(get_make_options) - emake "$@" ${MYMAKE} || die "emake failed" -} - -src_install() { - eval set -- $(get_make_options) - emake "$@" install || die "emake install failed" - - dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*} - docinto quickstarts - dodoc docs/quickstarts/* - - insinto /usr/share/doc/${PF} - doins -r contrib - - newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script" - - keepdir /var/run/pluto -} - -pkg_preinst() { - if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then - ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':" - local i err=0 - if [ -h "../ipsec.d" ]; then - rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink" - fi - for i in *; do - if [ -e "../$i" ]; then - eerror " $i NOT MOVED, ../$i already exists!" - err=1 - elif [ -d "$i" ]; then - mv "$i" .. || die "failed to move $i directory" - ewarn " directory $i" - elif [ -f "$i" ]; then - sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \ - mv "$i" .. && ewarn " file $i" || \ - die "failed to move $i file" - else - eerror " $i NOT MOVED, it is not a file nor a directory!" - err=1 - fi - done - popd - if [ $err -eq 0 ]; then - rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec" - else - ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself" - fi - fi -} - -pkg_postinst() { - if kernel_is -ge 2 6; then - CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP" - WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)" - WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)" - WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)" - check_extra_config - fi -} diff --git a/net-misc/openswan/openswan-2.6.38.ebuild b/net-misc/openswan/openswan-2.6.38.ebuild index e71bae510a2b..0f9653fcc048 100644 --- a/net-misc/openswan/openswan-2.6.38.ebuild +++ b/net-misc/openswan/openswan-2.6.38.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.3 2012/09/14 22:29:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.4 2012/12/27 15:24:03 floppym Exp $ EAPI="4" @@ -130,8 +130,6 @@ src_install() { docompress -x /usr/share/doc/${PF}/contrib newinitd "${FILESDIR}"/ipsec-initd ipsec - - keepdir /var/run/pluto } pkg_preinst() { |