From 04abfc73fe9d33f4f9fc5390bfd4522f5e0cfd06 Mon Sep 17 00:00:00 2001 From: Jay Pfeifer Date: Tue, 15 Nov 2005 04:12:35 +0000 Subject: Version bump fixing assert in PSK+ID and aggressive mode. (Portage version: 2.0.53_rc7) --- net-misc/openswan/ChangeLog | 10 +- net-misc/openswan/Manifest | 8 +- net-misc/openswan/files/digest-openswan-2.4.2 | 1 - net-misc/openswan/files/digest-openswan-2.4.3 | 1 + .../openswan/files/openswan-2.4.2-gentoo.patch | 393 --------------------- .../openswan/files/openswan-2.4.3-gentoo.patch | 393 +++++++++++++++++++++ net-misc/openswan/openswan-2.4.2.ebuild | 125 ------- net-misc/openswan/openswan-2.4.3.ebuild | 125 +++++++ 8 files changed, 532 insertions(+), 524 deletions(-) delete mode 100644 net-misc/openswan/files/digest-openswan-2.4.2 create mode 100644 net-misc/openswan/files/digest-openswan-2.4.3 delete mode 100644 net-misc/openswan/files/openswan-2.4.2-gentoo.patch create mode 100644 net-misc/openswan/files/openswan-2.4.3-gentoo.patch delete mode 100644 net-misc/openswan/openswan-2.4.2.ebuild create mode 100644 net-misc/openswan/openswan-2.4.3.ebuild (limited to 'net-misc/openswan') diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index 535ce356db71..8c3f6feb9dc3 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/openswan # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.24 2005/11/15 03:07:16 pfeifer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.25 2005/11/15 04:12:35 pfeifer Exp $ + +*openswan-2.4.3 (15 Nov 2005) + + 15 Nov 2005; Jay Pfeifer + -files/openswan-2.4.2-gentoo.patch, +files/openswan-2.4.3-gentoo.patch, + -openswan-2.4.2.ebuild, +openswan-2.4.3.ebuild: + Version bump fixing assert in PSK+ID and aggressive mode. + Remove openswan-2.4.2. *openswan-2.4.2 (15 Nov 2005) diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest index 713460b44806..6b0274a44be4 100644 --- a/net-misc/openswan/Manifest +++ b/net-misc/openswan/Manifest @@ -1,11 +1,11 @@ -MD5 95b3baef364ee17e2c6c79bb353d79b0 ChangeLog 4154 +MD5 2f8bd43b5011eff9a26eae6ce271c16c ChangeLog 4443 MD5 5a79041189d29ce8568c635f841cebd4 files/digest-openswan-1.0.7 67 MD5 0ddd2a0be9ddea1e37f659f9d529ee19 files/digest-openswan-2.2.0 67 -MD5 b6a2da6dfd14ecac53087bf2064a601c files/digest-openswan-2.4.2 67 +MD5 f4f84eab128c1b8cd2fdca381fde7d73 files/digest-openswan-2.4.3 67 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538 MD5 9b866b02f096fc3ce577165fd17a82ec files/openswan-2.2.0-gentoo.patch 17438 -MD5 1ac8999f0cbc3032b95cf133cd74ff2b files/openswan-2.4.2-gentoo.patch 17758 +MD5 7015cc05d4916c9bcd1437cfce3c7156 files/openswan-2.4.3-gentoo.patch 17758 MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568 MD5 6e024f039baaa21ae409f042004a8c5a openswan-1.0.7.ebuild 1885 MD5 3305d9fca22c0df5182a711f91c38abf openswan-2.2.0.ebuild 3160 -MD5 dece2f165d69018e880d9394b9190db0 openswan-2.4.2.ebuild 3117 +MD5 80311bb49eac9543401f29d0d46af17e openswan-2.4.3.ebuild 3015 diff --git a/net-misc/openswan/files/digest-openswan-2.4.2 b/net-misc/openswan/files/digest-openswan-2.4.2 deleted file mode 100644 index 80540eca51ce..000000000000 --- a/net-misc/openswan/files/digest-openswan-2.4.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 38c7ad91312bdd67fa57fe987b21183e openswan-2.4.2.tar.gz 3585824 diff --git a/net-misc/openswan/files/digest-openswan-2.4.3 b/net-misc/openswan/files/digest-openswan-2.4.3 new file mode 100644 index 000000000000..ea552f289034 --- /dev/null +++ b/net-misc/openswan/files/digest-openswan-2.4.3 @@ -0,0 +1 @@ +MD5 d721c1d11296c3e739fffc9c3dc187f5 openswan-2.4.3.tar.gz 3585768 diff --git a/net-misc/openswan/files/openswan-2.4.2-gentoo.patch b/net-misc/openswan/files/openswan-2.4.2-gentoo.patch deleted file mode 100644 index ee289995997f..000000000000 --- a/net-misc/openswan/files/openswan-2.4.2-gentoo.patch +++ /dev/null @@ -1,393 +0,0 @@ -diff -Naupr openswan-2.4.2/Makefile.inc openswan-2.4.2-gentoo/Makefile.inc ---- openswan-2.4.2/Makefile.inc 2005-11-13 20:35:41.000000000 -0600 -+++ openswan-2.4.2-gentoo/Makefile.inc 2005-11-14 20:14:24.000000000 -0600 -@@ -46,7 +46,7 @@ SHELL=/bin/sh - 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* -@@ -80,7 +80,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_ - MANPLACES=man3 man5 man8 - - # where configuration files go --FINALCONFFILE?=/etc/ipsec.conf -+FINALCONFFILE?=/etc/ipsec/ipsec.conf - CONFFILE=$(DESTDIR)$(FINALCONFFILE) - - FINALCONFDIR?=/etc -@@ -91,10 +91,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR) - - # sample configuration files go into - INC_DOCDIR?=share/doc --FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan -+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.2 - EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} - --FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan -+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.2 - DOCDIR=${DESTDIR}${FINALDOCDIR} - - # where per-conn pluto logs go -@@ -239,7 +239,7 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F - # installed one in RH 7.2, won't work - you wind up depending upon - # openssl. - --BIND9STATICLIBDIR?=/usr/local/lib -+BIND9STATICLIBDIR?=/usr/lib - - # if you install elsewere, you may need to point the include files to it. - #BIND9STATICLIBDIR?=/sandel/lib -diff -Naupr openswan-2.4.2/doc/Makefile openswan-2.4.2-gentoo/doc/Makefile ---- openswan-2.4.2/doc/Makefile 2005-11-08 15:32:45.000000000 -0600 -+++ openswan-2.4.2-gentoo/doc/Makefile 2005-11-14 20:14:24.000000000 -0600 -@@ -1,6 +1,6 @@ - # Makefile to generate various formats from HTML source - # --# Assumes the htmldoc utility is available. -+# No longer cares if the htmldoc utility is available. - # This can be downloaded from www.easysw.com - # - # Also needs lynx(1) for HTML-to-text conversion -diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/crypt586.pl ---- openswan-2.4.2/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-15 19:24:45.000000000 -0500 -+++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/crypt586.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # The inner loop instruction sequence and the IP/FP modifications are from - # Svend Olaf Mikkelsen -diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl ---- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 03:07:06.000000000 -0500 -+++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) - # des_cblock (*input); -diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl ---- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 03:07:06.000000000 -0500 -+++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - # require 'x86asm.pl'; - # &asm_init("cpp","des-586.pl"); -diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl ---- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 03:07:07.000000000 -0500 -+++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - package x86ms; - -diff -Naupr openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl ---- openswan-2.4.2/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 03:07:07.000000000 -0500 -+++ openswan-2.4.2-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - package x86unix; - -diff -Naupr openswan-2.4.2/lib/liblwres/Makefile openswan-2.4.2-gentoo/lib/liblwres/Makefile ---- openswan-2.4.2/lib/liblwres/Makefile 2004-12-18 12:13:34.000000000 -0600 -+++ openswan-2.4.2-gentoo/lib/liblwres/Makefile 2005-11-14 20:14:24.000000000 -0600 -@@ -20,7 +20,7 @@ CINCLUDES = -I${srcdir}/unix/include \ - CDEFINES = -g - CWARNINGS = -Werror - --CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} -+CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE) - - VERSION="@(\#) openswan-hacking-9.3-for-osw2" - LIBINTERFACE=2 -diff -Naupr openswan-2.4.2/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des-586.pl ---- openswan-2.4.2/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 03:06:50.000000000 -0500 -+++ openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des-586.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - # - # The inner loop instruction sequence and the IP/FP modifications are from - # Svend Olaf Mikkelsen -diff -Naupr openswan-2.4.2/linux/net/ipsec/des/asm/des686.pl openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des686.pl ---- openswan-2.4.2/linux/net/ipsec/des/asm/des686.pl 2004-07-10 03:06:50.000000000 -0500 -+++ openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/des686.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - $prog="des686.pl"; - -diff -Naupr openswan-2.4.2/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/desboth.pl ---- openswan-2.4.2/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 03:06:50.000000000 -0500 -+++ openswan-2.4.2-gentoo/linux/net/ipsec/des/asm/desboth.pl 2005-11-14 20:14:24.000000000 -0600 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -+#!/usr/bin/perl - - $L="edi"; - $R="esi"; -diff -Naupr openswan-2.4.2/programs/_include/_include.in openswan-2.4.2-gentoo/programs/_include/_include.in ---- openswan-2.4.2/programs/_include/_include.in 2003-01-06 15:44:04.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/_include/_include.in 2005-11-14 20:14:24.000000000 -0600 -@@ -47,10 +47,10 @@ for f - 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 -Naupr openswan-2.4.2/programs/barf/barf.in openswan-2.4.2-gentoo/programs/barf/barf.in ---- openswan-2.4.2/programs/barf/barf.in 2005-07-15 11:39:25.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/barf/barf.in 2005-11-14 20:14:24.000000000 -0600 -@@ -16,7 +16,7 @@ - - LOGS=${LOGS-/var/log} - CONFS=${IPSEC_CONFS-/etc} --CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} -+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} - me="ipsec barf" - # Max lines to use for things like 'route -n' - maxlines=100 -@@ -238,13 +238,13 @@ then - done - fi - _________________________ ipsec/ls-libdir --ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} -+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} - _________________________ ipsec/ls-execdir --ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} -+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} - _________________________ ipsec/updowns --for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` -+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` - do -- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f -+ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f - done - _________________________ /proc/net/dev - cat /proc/net/dev -diff -Naupr openswan-2.4.2/programs/eroute/eroute.5 openswan-2.4.2-gentoo/programs/eroute/eroute.5 ---- openswan-2.4.2/programs/eroute/eroute.5 2003-10-30 20:32:27.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/eroute/eroute.5 2005-11-14 20:14:24.000000000 -0600 -@@ -223,7 +223,7 @@ Parameters Index of - in hexadecimal using Authentication Header protocol (51, - IPPROTO_AH) with no identies defined for either end. - .SH FILES --/proc/net/ipsec_eroute, /usr/local/bin/ipsec -+/proc/net/ipsec_eroute, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5), - ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5), -diff -Naupr openswan-2.4.2/programs/eroute/eroute.8 openswan-2.4.2-gentoo/programs/eroute/eroute.8 ---- openswan-2.4.2/programs/eroute/eroute.8 2003-10-30 20:32:27.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/eroute/eroute.8 2005-11-14 20:14:24.000000000 -0600 -@@ -308,7 +308,7 @@ will be in clear text. - .br - .LP - .SH FILES --/proc/net/ipsec_eroute, /usr/local/bin/ipsec -+/proc/net/ipsec_eroute, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), - ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) -diff -Naupr openswan-2.4.2/programs/ipsec/ipsec.8 openswan-2.4.2-gentoo/programs/ipsec/ipsec.8 ---- openswan-2.4.2/programs/ipsec/ipsec.8 2003-02-27 10:51:54.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/ipsec/ipsec.8 2005-11-14 20:14:24.000000000 -0600 -@@ -81,7 +81,7 @@ reports where - .I ipsec - thinks the IPsec configuration files are stored. - .SH FILES --/usr/local/lib/ipsec usual utilities directory -+/usr/lib/ipsec usual utilities directory - .SH ENVIRONMENT - .PP - The following environment variables control where FreeS/WAN finds its -diff -Naupr openswan-2.4.2/programs/klipsdebug/klipsdebug.5 openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.5 ---- openswan-2.4.2/programs/klipsdebug/klipsdebug.5 2002-04-24 02:35:38.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.5 2005-11-14 20:14:24.000000000 -0600 -@@ -103,7 +103,7 @@ full - sockets debugging has been set and everything else is not set. - .LP - .SH FILES --/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec -+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5), -diff -Naupr openswan-2.4.2/programs/klipsdebug/klipsdebug.8 openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.8 ---- openswan-2.4.2/programs/klipsdebug/klipsdebug.8 2002-04-24 02:35:39.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/klipsdebug/klipsdebug.8 2005-11-14 20:14:24.000000000 -0600 -@@ -117,7 +117,7 @@ turns off only the - debugging messages. - .LP - .SH FILES --/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec -+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5) -diff -Naupr openswan-2.4.2/programs/lwdnsq/lwdnsq.xml.in openswan-2.4.2-gentoo/programs/lwdnsq/lwdnsq.xml.in ---- openswan-2.4.2/programs/lwdnsq/lwdnsq.xml.in 2004-04-03 19:50:56.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/lwdnsq/lwdnsq.xml.in 2005-11-14 20:14:24.000000000 -0600 -@@ -430,7 +430,7 @@ information. - Special IPSECKEY processing - - --/etc/ipsec.d/lwdnsq.conf -+/etc/ipsec/ipsec.d/lwdnsq.conf - - - -diff -Naupr openswan-2.4.2/programs/mailkey/mailkey.in openswan-2.4.2-gentoo/programs/mailkey/mailkey.in ---- openswan-2.4.2/programs/mailkey/mailkey.in 2005-01-30 13:07:15.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/mailkey/mailkey.in 2005-11-14 20:14:24.000000000 -0600 -@@ -60,7 +60,7 @@ with the following error: - - "$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 -Naupr openswan-2.4.2/programs/pluto/Makefile openswan-2.4.2-gentoo/programs/pluto/Makefile ---- openswan-2.4.2/programs/pluto/Makefile 2005-08-11 20:12:38.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/pluto/Makefile 2005-11-14 20:14:24.000000000 -0600 -@@ -262,7 +262,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \ - -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ - -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" - --ALLFLAGS = $(CPPFLAGS) $(CFLAGS) -+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) - - # libefence is a free memory allocation debugger - # Solaris 2 needs -lsocket -lnsl -diff -Naupr openswan-2.4.2/programs/setup/Makefile openswan-2.4.2-gentoo/programs/setup/Makefile ---- openswan-2.4.2/programs/setup/Makefile 2004-12-18 12:13:43.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/setup/Makefile 2005-11-14 20:14:24.000000000 -0600 -@@ -33,25 +33,10 @@ install:: 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 - - clean:: - @rm -f setup -diff -Naupr openswan-2.4.2/programs/showhostkey/showhostkey.in openswan-2.4.2-gentoo/programs/showhostkey/showhostkey.in ---- openswan-2.4.2/programs/showhostkey/showhostkey.in 2004-11-14 07:40:41.000000000 -0600 -+++ openswan-2.4.2-gentoo/programs/showhostkey/showhostkey.in 2005-11-14 20:14:24.000000000 -0600 -@@ -18,7 +18,7 @@ me="ipsec showhostkey" - 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 -Naupr openswan-2.4.2/programs/spi/spi.5 openswan-2.4.2-gentoo/programs/spi/spi.5 ---- openswan-2.4.2/programs/spi/spi.5 2002-04-24 02:35:39.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/spi/spi.5 2005-11-14 20:14:24.000000000 -0600 -@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has - 3858 seconds ago and has been idle for 23 seconds. - .LP - .SH FILES --/proc/net/ipsec_spi, /usr/local/bin/ipsec -+/proc/net/ipsec_spi, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), - ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5), -diff -Naupr openswan-2.4.2/programs/spi/spi.8 openswan-2.4.2-gentoo/programs/spi/spi.8 ---- openswan-2.4.2/programs/spi/spi.8 2002-04-24 02:35:40.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/spi/spi.8 2005-11-14 20:14:24.000000000 -0600 -@@ -461,7 +461,7 @@ and protocol - (4). - .LP - .SH FILES --/proc/net/ipsec_spi, /usr/local/bin/ipsec -+/proc/net/ipsec_spi, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5) -diff -Naupr openswan-2.4.2/programs/spigrp/spigrp.5 openswan-2.4.2-gentoo/programs/spigrp/spigrp.5 ---- openswan-2.4.2/programs/spigrp/spigrp.5 2002-04-24 02:35:40.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/spigrp/spigrp.5 2005-11-14 20:14:24.000000000 -0600 -@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend - machine. - .LP - .SH FILES --/proc/net/ipsec_spigrp, /usr/local/bin/ipsec -+/proc/net/ipsec_spigrp, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), - ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5), -diff -Naupr openswan-2.4.2/programs/spigrp/spigrp.8 openswan-2.4.2-gentoo/programs/spigrp/spigrp.8 ---- openswan-2.4.2/programs/spigrp/spigrp.8 2002-04-24 02:35:41.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/spigrp/spigrp.8 2005-11-14 20:14:24.000000000 -0600 -@@ -128,7 +128,7 @@ and finally an AH header to authenticate - .BR 0x236 . - .LP - .SH FILES --/proc/net/ipsec_spigrp, /usr/local/bin/ipsec -+/proc/net/ipsec_spigrp, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5) -diff -Naupr openswan-2.4.2/programs/tncfg/tncfg.5 openswan-2.4.2-gentoo/programs/tncfg/tncfg.5 ---- openswan-2.4.2/programs/tncfg/tncfg.5 2002-04-24 02:35:41.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/tncfg/tncfg.5 2005-11-14 20:14:24.000000000 -0600 -@@ -75,7 +75,7 @@ shows that virtual device - is not connected to any physical device. - .LP - .SH "FILES" --/proc/net/ipsec_tncfg, /usr/local/bin/ipsec -+/proc/net/ipsec_tncfg, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), - ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), -diff -Naupr openswan-2.4.2/programs/tncfg/tncfg.8 openswan-2.4.2-gentoo/programs/tncfg/tncfg.8 ---- openswan-2.4.2/programs/tncfg/tncfg.8 2002-04-24 02:35:41.000000000 -0500 -+++ openswan-2.4.2-gentoo/programs/tncfg/tncfg.8 2005-11-14 20:14:24.000000000 -0600 -@@ -76,7 +76,7 @@ virtual device to the - physical device. - .LP - .SH "FILES" --/proc/net/ipsec_tncfg, /usr/local/bin/ipsec -+/proc/net/ipsec_tncfg, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8), - ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5) diff --git a/net-misc/openswan/files/openswan-2.4.3-gentoo.patch b/net-misc/openswan/files/openswan-2.4.3-gentoo.patch new file mode 100644 index 000000000000..7aa6f0f4e6df --- /dev/null +++ b/net-misc/openswan/files/openswan-2.4.3-gentoo.patch @@ -0,0 +1,393 @@ +diff -Naupr openswan-2.4.3/Makefile.inc openswan-2.4.3-gentoo/Makefile.inc +--- openswan-2.4.3/Makefile.inc 2005-11-14 20:46:45.000000000 -0600 ++++ openswan-2.4.3-gentoo/Makefile.inc 2005-11-14 21:37:50.000000000 -0600 +@@ -46,7 +46,7 @@ SHELL=/bin/sh + 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* +@@ -80,7 +80,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_ + MANPLACES=man3 man5 man8 + + # where configuration files go +-FINALCONFFILE?=/etc/ipsec.conf ++FINALCONFFILE?=/etc/ipsec/ipsec.conf + CONFFILE=$(DESTDIR)$(FINALCONFFILE) + + FINALCONFDIR?=/etc +@@ -91,10 +91,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR) + + # sample configuration files go into + INC_DOCDIR?=share/doc +-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan ++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.3 + EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} + +-FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan ++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.3 + DOCDIR=${DESTDIR}${FINALDOCDIR} + + # where per-conn pluto logs go +@@ -239,7 +239,7 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F + # installed one in RH 7.2, won't work - you wind up depending upon + # openssl. + +-BIND9STATICLIBDIR?=/usr/local/lib ++BIND9STATICLIBDIR?=/usr/lib + + # if you install elsewere, you may need to point the include files to it. + #BIND9STATICLIBDIR?=/sandel/lib +diff -Naupr openswan-2.4.3/doc/Makefile openswan-2.4.3-gentoo/doc/Makefile +--- openswan-2.4.3/doc/Makefile 2005-11-08 15:32:45.000000000 -0600 ++++ openswan-2.4.3-gentoo/doc/Makefile 2005-11-14 21:37:50.000000000 -0600 +@@ -1,6 +1,6 @@ + # Makefile to generate various formats from HTML source + # +-# Assumes the htmldoc utility is available. ++# No longer cares if the htmldoc utility is available. + # This can be downloaded from www.easysw.com + # + # Also needs lynx(1) for HTML-to-text conversion +diff -Naupr openswan-2.4.3/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/crypt586.pl +--- openswan-2.4.3/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-15 19:24:45.000000000 -0500 ++++ openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/crypt586.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # The inner loop instruction sequence and the IP/FP modifications are from + # Svend Olaf Mikkelsen +diff -Naupr openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl +--- openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 03:07:06.000000000 -0500 ++++ openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) + # des_cblock (*input); +diff -Naupr openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl +--- openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 03:07:06.000000000 -0500 ++++ openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # require 'x86asm.pl'; + # &asm_init("cpp","des-586.pl"); +diff -Naupr openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl +--- openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 03:07:07.000000000 -0500 ++++ openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86ms; + +diff -Naupr openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl +--- openswan-2.4.3/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 03:07:07.000000000 -0500 ++++ openswan-2.4.3-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86unix; + +diff -Naupr openswan-2.4.3/lib/liblwres/Makefile openswan-2.4.3-gentoo/lib/liblwres/Makefile +--- openswan-2.4.3/lib/liblwres/Makefile 2004-12-18 12:13:34.000000000 -0600 ++++ openswan-2.4.3-gentoo/lib/liblwres/Makefile 2005-11-14 21:37:50.000000000 -0600 +@@ -20,7 +20,7 @@ CINCLUDES = -I${srcdir}/unix/include \ + CDEFINES = -g + CWARNINGS = -Werror + +-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} ++CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE) + + VERSION="@(\#) openswan-hacking-9.3-for-osw2" + LIBINTERFACE=2 +diff -Naupr openswan-2.4.3/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.3-gentoo/linux/net/ipsec/des/asm/des-586.pl +--- openswan-2.4.3/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 03:06:50.000000000 -0500 ++++ openswan-2.4.3-gentoo/linux/net/ipsec/des/asm/des-586.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # The inner loop instruction sequence and the IP/FP modifications are from + # Svend Olaf Mikkelsen +diff -Naupr openswan-2.4.3/linux/net/ipsec/des/asm/des686.pl openswan-2.4.3-gentoo/linux/net/ipsec/des/asm/des686.pl +--- openswan-2.4.3/linux/net/ipsec/des/asm/des686.pl 2004-07-10 03:06:50.000000000 -0500 ++++ openswan-2.4.3-gentoo/linux/net/ipsec/des/asm/des686.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $prog="des686.pl"; + +diff -Naupr openswan-2.4.3/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.3-gentoo/linux/net/ipsec/des/asm/desboth.pl +--- openswan-2.4.3/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 03:06:50.000000000 -0500 ++++ openswan-2.4.3-gentoo/linux/net/ipsec/des/asm/desboth.pl 2005-11-14 21:37:50.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $L="edi"; + $R="esi"; +diff -Naupr openswan-2.4.3/programs/_include/_include.in openswan-2.4.3-gentoo/programs/_include/_include.in +--- openswan-2.4.3/programs/_include/_include.in 2003-01-06 15:44:04.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/_include/_include.in 2005-11-14 21:37:50.000000000 -0600 +@@ -47,10 +47,10 @@ for f + 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 -Naupr openswan-2.4.3/programs/barf/barf.in openswan-2.4.3-gentoo/programs/barf/barf.in +--- openswan-2.4.3/programs/barf/barf.in 2005-07-15 11:39:25.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/barf/barf.in 2005-11-14 21:37:50.000000000 -0600 +@@ -16,7 +16,7 @@ + + LOGS=${LOGS-/var/log} + CONFS=${IPSEC_CONFS-/etc} +-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} ++CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} + me="ipsec barf" + # Max lines to use for things like 'route -n' + maxlines=100 +@@ -238,13 +238,13 @@ then + done + fi + _________________________ ipsec/ls-libdir +-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} ++ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} + _________________________ ipsec/ls-execdir +-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} ++ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} + _________________________ ipsec/updowns +-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` ++for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` + do +- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f ++ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f + done + _________________________ /proc/net/dev + cat /proc/net/dev +diff -Naupr openswan-2.4.3/programs/eroute/eroute.5 openswan-2.4.3-gentoo/programs/eroute/eroute.5 +--- openswan-2.4.3/programs/eroute/eroute.5 2003-10-30 20:32:27.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/eroute/eroute.5 2005-11-14 21:37:50.000000000 -0600 +@@ -223,7 +223,7 @@ Parameters Index of + in hexadecimal using Authentication Header protocol (51, + IPPROTO_AH) with no identies defined for either end. + .SH FILES +-/proc/net/ipsec_eroute, /usr/local/bin/ipsec ++/proc/net/ipsec_eroute, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5), + ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5), +diff -Naupr openswan-2.4.3/programs/eroute/eroute.8 openswan-2.4.3-gentoo/programs/eroute/eroute.8 +--- openswan-2.4.3/programs/eroute/eroute.8 2003-10-30 20:32:27.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/eroute/eroute.8 2005-11-14 21:37:50.000000000 -0600 +@@ -308,7 +308,7 @@ will be in clear text. + .br + .LP + .SH FILES +-/proc/net/ipsec_eroute, /usr/local/bin/ipsec ++/proc/net/ipsec_eroute, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), + ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) +diff -Naupr openswan-2.4.3/programs/ipsec/ipsec.8 openswan-2.4.3-gentoo/programs/ipsec/ipsec.8 +--- openswan-2.4.3/programs/ipsec/ipsec.8 2003-02-27 10:51:54.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/ipsec/ipsec.8 2005-11-14 21:37:50.000000000 -0600 +@@ -81,7 +81,7 @@ reports where + .I ipsec + thinks the IPsec configuration files are stored. + .SH FILES +-/usr/local/lib/ipsec usual utilities directory ++/usr/lib/ipsec usual utilities directory + .SH ENVIRONMENT + .PP + The following environment variables control where FreeS/WAN finds its +diff -Naupr openswan-2.4.3/programs/klipsdebug/klipsdebug.5 openswan-2.4.3-gentoo/programs/klipsdebug/klipsdebug.5 +--- openswan-2.4.3/programs/klipsdebug/klipsdebug.5 2002-04-24 02:35:38.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/klipsdebug/klipsdebug.5 2005-11-14 21:37:50.000000000 -0600 +@@ -103,7 +103,7 @@ full + sockets debugging has been set and everything else is not set. + .LP + .SH FILES +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5), +diff -Naupr openswan-2.4.3/programs/klipsdebug/klipsdebug.8 openswan-2.4.3-gentoo/programs/klipsdebug/klipsdebug.8 +--- openswan-2.4.3/programs/klipsdebug/klipsdebug.8 2002-04-24 02:35:39.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/klipsdebug/klipsdebug.8 2005-11-14 21:37:50.000000000 -0600 +@@ -117,7 +117,7 @@ turns off only the + debugging messages. + .LP + .SH FILES +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5) +diff -Naupr openswan-2.4.3/programs/lwdnsq/lwdnsq.xml.in openswan-2.4.3-gentoo/programs/lwdnsq/lwdnsq.xml.in +--- openswan-2.4.3/programs/lwdnsq/lwdnsq.xml.in 2004-04-03 19:50:56.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/lwdnsq/lwdnsq.xml.in 2005-11-14 21:37:50.000000000 -0600 +@@ -430,7 +430,7 @@ information. + Special IPSECKEY processing + + +-/etc/ipsec.d/lwdnsq.conf ++/etc/ipsec/ipsec.d/lwdnsq.conf + + + +diff -Naupr openswan-2.4.3/programs/mailkey/mailkey.in openswan-2.4.3-gentoo/programs/mailkey/mailkey.in +--- openswan-2.4.3/programs/mailkey/mailkey.in 2005-01-30 13:07:15.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/mailkey/mailkey.in 2005-11-14 21:37:50.000000000 -0600 +@@ -60,7 +60,7 @@ with the following error: + + "$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 -Naupr openswan-2.4.3/programs/pluto/Makefile openswan-2.4.3-gentoo/programs/pluto/Makefile +--- openswan-2.4.3/programs/pluto/Makefile 2005-08-11 20:12:38.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/pluto/Makefile 2005-11-14 21:37:50.000000000 -0600 +@@ -262,7 +262,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \ + -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ + -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" + +-ALLFLAGS = $(CPPFLAGS) $(CFLAGS) ++ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) + + # libefence is a free memory allocation debugger + # Solaris 2 needs -lsocket -lnsl +diff -Naupr openswan-2.4.3/programs/setup/Makefile openswan-2.4.3-gentoo/programs/setup/Makefile +--- openswan-2.4.3/programs/setup/Makefile 2004-12-18 12:13:43.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/setup/Makefile 2005-11-14 21:37:50.000000000 -0600 +@@ -33,25 +33,10 @@ install:: 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 + + clean:: + @rm -f setup +diff -Naupr openswan-2.4.3/programs/showhostkey/showhostkey.in openswan-2.4.3-gentoo/programs/showhostkey/showhostkey.in +--- openswan-2.4.3/programs/showhostkey/showhostkey.in 2004-11-14 07:40:41.000000000 -0600 ++++ openswan-2.4.3-gentoo/programs/showhostkey/showhostkey.in 2005-11-14 21:37:50.000000000 -0600 +@@ -18,7 +18,7 @@ me="ipsec showhostkey" + 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 -Naupr openswan-2.4.3/programs/spi/spi.5 openswan-2.4.3-gentoo/programs/spi/spi.5 +--- openswan-2.4.3/programs/spi/spi.5 2002-04-24 02:35:39.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/spi/spi.5 2005-11-14 21:37:50.000000000 -0600 +@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has + 3858 seconds ago and has been idle for 23 seconds. + .LP + .SH FILES +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), + ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5), +diff -Naupr openswan-2.4.3/programs/spi/spi.8 openswan-2.4.3-gentoo/programs/spi/spi.8 +--- openswan-2.4.3/programs/spi/spi.8 2002-04-24 02:35:40.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/spi/spi.8 2005-11-14 21:37:50.000000000 -0600 +@@ -461,7 +461,7 @@ and protocol + (4). + .LP + .SH FILES +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5) +diff -Naupr openswan-2.4.3/programs/spigrp/spigrp.5 openswan-2.4.3-gentoo/programs/spigrp/spigrp.5 +--- openswan-2.4.3/programs/spigrp/spigrp.5 2002-04-24 02:35:40.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/spigrp/spigrp.5 2005-11-14 21:37:50.000000000 -0600 +@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend + machine. + .LP + .SH FILES +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), + ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5), +diff -Naupr openswan-2.4.3/programs/spigrp/spigrp.8 openswan-2.4.3-gentoo/programs/spigrp/spigrp.8 +--- openswan-2.4.3/programs/spigrp/spigrp.8 2002-04-24 02:35:41.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/spigrp/spigrp.8 2005-11-14 21:37:50.000000000 -0600 +@@ -128,7 +128,7 @@ and finally an AH header to authenticate + .BR 0x236 . + .LP + .SH FILES +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5) +diff -Naupr openswan-2.4.3/programs/tncfg/tncfg.5 openswan-2.4.3-gentoo/programs/tncfg/tncfg.5 +--- openswan-2.4.3/programs/tncfg/tncfg.5 2002-04-24 02:35:41.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/tncfg/tncfg.5 2005-11-14 21:37:50.000000000 -0600 +@@ -75,7 +75,7 @@ shows that virtual device + is not connected to any physical device. + .LP + .SH "FILES" +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), + ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), +diff -Naupr openswan-2.4.3/programs/tncfg/tncfg.8 openswan-2.4.3-gentoo/programs/tncfg/tncfg.8 +--- openswan-2.4.3/programs/tncfg/tncfg.8 2002-04-24 02:35:41.000000000 -0500 ++++ openswan-2.4.3-gentoo/programs/tncfg/tncfg.8 2005-11-14 21:37:50.000000000 -0600 +@@ -76,7 +76,7 @@ virtual device to the + physical device. + .LP + .SH "FILES" +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8), + ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5) diff --git a/net-misc/openswan/openswan-2.4.2.ebuild b/net-misc/openswan/openswan-2.4.2.ebuild deleted file mode 100644 index cdbb1a13e7f0..000000000000 --- a/net-misc/openswan/openswan-2.4.2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.2.ebuild,v 1.1 2005/11/15 03:07:16 pfeifer Exp $ - -inherit eutils - -MY_P=${P/_p/_kb} -S=${WORKDIR}/${MY_P} -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/${MY_P}.tar.gz - mirror://gentoo/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64 ~ppc" -IUSE="" - -DEPEND="!net-misc/strongswan - virtual/libc - virtual/linux-sources - >=dev-libs/gmp-3.1.1 - net-dns/host - sys-apps/iproute2" -RDEPEND="" - -check_version_h() { - if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ] - then - eerror "Please verify that your /usr/src/linux symlink is pointing" - eerror "to your current kernel sources, and that you have a running kernel" - die "/usr/src/linux symlink not setup or kernel tree has not been configured!" - fi -} - -get_KV_info() { - check_version_h - - # Get the kernel version of sources in /usr/src/linux ... - export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \ - "${ROOT}/usr/src/linux/include/linux/version.h")" - export KV_major="$(echo "${KV_full}" | cut -d. -f1)" - export KV_minor="$(echo "${KV_full}" | cut -d. -f2)" - export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')" -} - -is_kernel() { - [ -z "$1" -o -z "$2" ] && return 1 - - get_KV_info - - if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ] - then - return 0 - else - return 1 - fi -} - -pkg_setup() { - get_KV_info - - einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}" - - if is_kernel 2 5 - then - eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild." - die "Please install a 2.6.x version of the Linux kernel." - fi - - if is_kernel 2 6 - then - einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)." - einfo "KLIPS will not be compiled/installed." - export MYMAKE="programs" - - elif is_kernel 2 4 - then - [ -d /usr/src/linux/net/ipsec ] || { - 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" - } - einfo "Using patched-in IPsec code for kernel 2.4" - einfo "Your kernel only supports KLIPS for kernel level IPsec." - export MYMAKE="confcheck programs" - - else - eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}." - die "Install an IPsec enabled 2.4 or 2.6 kernel." - fi -} - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.patch -} - -src_compile() { - make \ - DESTDIR=${D} \ - USERCOMPILE="${CFLAGS}" \ - FINALCONFDIR=/etc/ipsec \ - INC_RCDEFAULT=/etc/init.d \ - INC_USRLOCAL=/usr \ - INC_MANDIR=share/man \ - ${MYMAKE} || die -} - -src_install() { - make \ - DESTDIR=${D} \ - USERCOMPILE="${CFLAGS}" \ - FINALCONFDIR=/etc/ipsec \ - INC_RCDEFAULT=/etc/init.d \ - INC_USRLOCAL=/usr \ - INC_MANDIR=share/man \ - install || die - - dosym /etc/ipsec/ipsec.d /etc/ipsec.d - - exeinto /etc/init.d/ - doexe ${FILESDIR}/ipsec -} diff --git a/net-misc/openswan/openswan-2.4.3.ebuild b/net-misc/openswan/openswan-2.4.3.ebuild new file mode 100644 index 000000000000..c12fdc4559b7 --- /dev/null +++ b/net-misc/openswan/openswan-2.4.3.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.3.ebuild,v 1.1 2005/11/15 04:12:35 pfeifer Exp $ + +inherit eutils + +MY_P=${P/_p/_kb} +S=${WORKDIR}/${MY_P} +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/${MY_P}.tar.gz + mirror://gentoo/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~x86 ~amd64 ~ppc" +IUSE="" + +DEPEND="!net-misc/strongswan + virtual/libc + virtual/linux-sources + >=dev-libs/gmp-3.1.1 + net-dns/host + sys-apps/iproute2" +RDEPEND="" + +check_version_h() { + if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ] + then + eerror "Please verify that your /usr/src/linux symlink is pointing" + eerror "to your current kernel sources, and that you have a running kernel" + die "/usr/src/linux symlink not setup or kernel tree has not been configured!" + fi +} + +get_KV_info() { + check_version_h + + # Get the kernel version of sources in /usr/src/linux ... + export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \ + "${ROOT}/usr/src/linux/include/linux/version.h")" + export KV_major="$(echo "${KV_full}" | cut -d. -f1)" + export KV_minor="$(echo "${KV_full}" | cut -d. -f2)" + export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')" +} + +is_kernel() { + [ -z "$1" -o -z "$2" ] && return 1 + + get_KV_info + + if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ] + then + return 0 + else + return 1 + fi +} + +pkg_setup() { + get_KV_info + + einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}" + + if is_kernel 2 5 + then + eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild." + die "Please install a 2.6.x version of the Linux kernel." + fi + + if is_kernel 2 6 + then + einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)." + einfo "KLIPS will not be compiled/installed." + export MYMAKE="programs" + + elif is_kernel 2 4 + then + [ -d /usr/src/linux/net/ipsec ] || { + 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" + } + einfo "Using patched-in IPsec code for kernel 2.4" + einfo "Your kernel only supports KLIPS for kernel level IPsec." + export MYMAKE="confcheck programs" + + else + eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}." + die "Install an IPsec enabled 2.4 or 2.6 kernel." + fi +} + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.patch +} + +src_compile() { + make \ + DESTDIR=${D} \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=/etc/ipsec \ + INC_RCDEFAULT=/etc/init.d \ + INC_USRLOCAL=/usr \ + INC_MANDIR=share/man \ + ${MYMAKE} || die +} + +src_install() { + make \ + DESTDIR=${D} \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=/etc/ipsec \ + INC_RCDEFAULT=/etc/init.d \ + INC_USRLOCAL=/usr \ + INC_MANDIR=share/man \ + install || die + + dosym /etc/ipsec/ipsec.d /etc/ipsec.d + + exeinto /etc/init.d/ + doexe ${FILESDIR}/ipsec +} -- cgit v1.2.3-65-gdbad