summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-03-18 08:42:13 +0000
committerAlin Năstac <mrness@gentoo.org>2007-03-18 08:42:13 +0000
commit51da5755c564a4589679a619adf723fe7021141c (patch)
treecb763a462e147d1ba4868225dbae3df7a0338754 /net-misc/openswan
parentChanged Homepage/SRC_URI, as that address will become invalid soon. (diff)
downloadgentoo-2-51da5755c564a4589679a619adf723fe7021141c.tar.gz
gentoo-2-51da5755c564a4589679a619adf723fe7021141c.tar.bz2
gentoo-2-51da5755c564a4589679a619adf723fe7021141c.zip
Remove obsolete version.
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-misc/openswan')
-rw-r--r--net-misc/openswan/ChangeLog6
-rw-r--r--net-misc/openswan/files/digest-openswan-2.4.43
-rw-r--r--net-misc/openswan/files/openswan-2.4.4-gentoo.patch393
-rw-r--r--net-misc/openswan/openswan-2.4.4.ebuild85
4 files changed, 5 insertions, 482 deletions
diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 9f27a87069b1..e9f33fae4260 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openswan
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.33 2007/01/14 22:44:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.34 2007/03/18 08:42:13 mrness Exp $
+
+ 18 Mar 2007; Alin Năstac <mrness@gentoo.org>
+ -files/openswan-2.4.4-gentoo.patch, -openswan-2.4.4.ebuild:
+ Remove obsolete version.
14 Jan 2007; Alin Năstac <mrness@gentoo.org> openswan-2.4.7.ebuild:
Stable on amd64 and x86.
diff --git a/net-misc/openswan/files/digest-openswan-2.4.4 b/net-misc/openswan/files/digest-openswan-2.4.4
deleted file mode 100644
index 5f2bfe40882d..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.4.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd1a46c64727674149de61da2a32ca63 openswan-2.4.4.tar.gz 3588694
-RMD160 b2eeb9b5f5186d33b644aa0bb9c46fb2746850ae openswan-2.4.4.tar.gz 3588694
-SHA256 b7d18cbaf30bbe66820dd13f170e3c9ae183307d5c5ee3cd4fa0e2711110ad79 openswan-2.4.4.tar.gz 3588694
diff --git a/net-misc/openswan/files/openswan-2.4.4-gentoo.patch b/net-misc/openswan/files/openswan-2.4.4-gentoo.patch
deleted file mode 100644
index 0198612e4c6a..000000000000
--- a/net-misc/openswan/files/openswan-2.4.4-gentoo.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-diff -Naupr openswan-2.4.4/Makefile.inc openswan-2.4.4-gentoo/Makefile.inc
---- openswan-2.4.4/Makefile.inc 2005-11-17 22:50:40.000000000 -0600
-+++ openswan-2.4.4-gentoo/Makefile.inc 2005-11-17 23:31:07.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.4
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
-
--FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.4
- 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.4/doc/Makefile openswan-2.4.4-gentoo/doc/Makefile
---- openswan-2.4.4/doc/Makefile 2005-11-08 15:32:45.000000000 -0600
-+++ openswan-2.4.4-gentoo/doc/Makefile 2005-11-17 23:31:07.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.4/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/crypt586.pl
---- openswan-2.4.4/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-15 19:24:45.000000000 -0500
-+++ openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/crypt586.pl 2005-11-17 23:31:07.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 <svolaf@inet.uni-c.dk>
-diff -Naupr openswan-2.4.4/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl
---- openswan-2.4.4/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 03:07:06.000000000 -0500
-+++ openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2005-11-17 23:31:07.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.4/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
---- openswan-2.4.4/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 03:07:06.000000000 -0500
-+++ openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2005-11-17 23:31:07.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.4/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
---- openswan-2.4.4/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 03:07:07.000000000 -0500
-+++ openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2005-11-17 23:31:07.000000000 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- package x86ms;
-
-diff -Naupr openswan-2.4.4/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
---- openswan-2.4.4/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 03:07:07.000000000 -0500
-+++ openswan-2.4.4-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2005-11-17 23:31:07.000000000 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- package x86unix;
-
-diff -Naupr openswan-2.4.4/lib/liblwres/Makefile openswan-2.4.4-gentoo/lib/liblwres/Makefile
---- openswan-2.4.4/lib/liblwres/Makefile 2004-12-18 12:13:34.000000000 -0600
-+++ openswan-2.4.4-gentoo/lib/liblwres/Makefile 2005-11-17 23:31:07.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.4/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.4-gentoo/linux/net/ipsec/des/asm/des-586.pl
---- openswan-2.4.4/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.4.4-gentoo/linux/net/ipsec/des/asm/des-586.pl 2005-11-17 23:31:07.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 <svolaf@inet.uni-c.dk>
-diff -Naupr openswan-2.4.4/linux/net/ipsec/des/asm/des686.pl openswan-2.4.4-gentoo/linux/net/ipsec/des/asm/des686.pl
---- openswan-2.4.4/linux/net/ipsec/des/asm/des686.pl 2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.4.4-gentoo/linux/net/ipsec/des/asm/des686.pl 2005-11-17 23:31:07.000000000 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $prog="des686.pl";
-
-diff -Naupr openswan-2.4.4/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.4-gentoo/linux/net/ipsec/des/asm/desboth.pl
---- openswan-2.4.4/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 03:06:50.000000000 -0500
-+++ openswan-2.4.4-gentoo/linux/net/ipsec/des/asm/desboth.pl 2005-11-17 23:31:07.000000000 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $L="edi";
- $R="esi";
-diff -Naupr openswan-2.4.4/programs/_include/_include.in openswan-2.4.4-gentoo/programs/_include/_include.in
---- openswan-2.4.4/programs/_include/_include.in 2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/_include/_include.in 2005-11-17 23:31:07.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.4/programs/barf/barf.in openswan-2.4.4-gentoo/programs/barf/barf.in
---- openswan-2.4.4/programs/barf/barf.in 2005-07-15 11:39:25.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/barf/barf.in 2005-11-17 23:31:07.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.4/programs/eroute/eroute.5 openswan-2.4.4-gentoo/programs/eroute/eroute.5
---- openswan-2.4.4/programs/eroute/eroute.5 2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/eroute/eroute.5 2005-11-17 23:31:07.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.4/programs/eroute/eroute.8 openswan-2.4.4-gentoo/programs/eroute/eroute.8
---- openswan-2.4.4/programs/eroute/eroute.8 2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/eroute/eroute.8 2005-11-17 23:31:07.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.4/programs/ipsec/ipsec.8 openswan-2.4.4-gentoo/programs/ipsec/ipsec.8
---- openswan-2.4.4/programs/ipsec/ipsec.8 2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/ipsec/ipsec.8 2005-11-17 23:31:07.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.4/programs/klipsdebug/klipsdebug.5 openswan-2.4.4-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.4.4/programs/klipsdebug/klipsdebug.5 2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/klipsdebug/klipsdebug.5 2005-11-17 23:31:07.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.4/programs/klipsdebug/klipsdebug.8 openswan-2.4.4-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.4.4/programs/klipsdebug/klipsdebug.8 2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/klipsdebug/klipsdebug.8 2005-11-17 23:31:07.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.4/programs/lwdnsq/lwdnsq.xml.in openswan-2.4.4-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.4.4/programs/lwdnsq/lwdnsq.xml.in 2004-04-03 19:50:56.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/lwdnsq/lwdnsq.xml.in 2005-11-17 23:31:07.000000000 -0600
-@@ -430,7 +430,7 @@ information.
- <refsect1><title>Special IPSECKEY processing</title>
-
- <programlisting>
--/etc/ipsec.d/lwdnsq.conf
-+/etc/ipsec/ipsec.d/lwdnsq.conf
- </programlisting>
-
- </refsect1>
-diff -Naupr openswan-2.4.4/programs/mailkey/mailkey.in openswan-2.4.4-gentoo/programs/mailkey/mailkey.in
---- openswan-2.4.4/programs/mailkey/mailkey.in 2005-01-30 13:07:15.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/mailkey/mailkey.in 2005-11-17 23:31:07.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.4/programs/pluto/Makefile openswan-2.4.4-gentoo/programs/pluto/Makefile
---- openswan-2.4.4/programs/pluto/Makefile 2005-08-11 20:12:38.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/pluto/Makefile 2005-11-17 23:31:07.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.4/programs/setup/Makefile openswan-2.4.4-gentoo/programs/setup/Makefile
---- openswan-2.4.4/programs/setup/Makefile 2004-12-18 12:13:43.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/setup/Makefile 2005-11-17 23:31:07.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.4/programs/showhostkey/showhostkey.in openswan-2.4.4-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.4.4/programs/showhostkey/showhostkey.in 2004-11-14 07:40:41.000000000 -0600
-+++ openswan-2.4.4-gentoo/programs/showhostkey/showhostkey.in 2005-11-17 23:31:07.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.4/programs/spi/spi.5 openswan-2.4.4-gentoo/programs/spi/spi.5
---- openswan-2.4.4/programs/spi/spi.5 2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/spi/spi.5 2005-11-17 23:31:07.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.4/programs/spi/spi.8 openswan-2.4.4-gentoo/programs/spi/spi.8
---- openswan-2.4.4/programs/spi/spi.8 2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/spi/spi.8 2005-11-17 23:31:07.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.4/programs/spigrp/spigrp.5 openswan-2.4.4-gentoo/programs/spigrp/spigrp.5
---- openswan-2.4.4/programs/spigrp/spigrp.5 2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/spigrp/spigrp.5 2005-11-17 23:31:07.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.4/programs/spigrp/spigrp.8 openswan-2.4.4-gentoo/programs/spigrp/spigrp.8
---- openswan-2.4.4/programs/spigrp/spigrp.8 2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/spigrp/spigrp.8 2005-11-17 23:31:07.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.4/programs/tncfg/tncfg.5 openswan-2.4.4-gentoo/programs/tncfg/tncfg.5
---- openswan-2.4.4/programs/tncfg/tncfg.5 2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/tncfg/tncfg.5 2005-11-17 23:31:07.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.4/programs/tncfg/tncfg.8 openswan-2.4.4-gentoo/programs/tncfg/tncfg.8
---- openswan-2.4.4/programs/tncfg/tncfg.8 2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.4.4-gentoo/programs/tncfg/tncfg.8 2005-11-17 23:31:07.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.4.ebuild b/net-misc/openswan/openswan-2.4.4.ebuild
deleted file mode 100644
index 1a0a59d2a751..000000000000
--- a/net-misc/openswan/openswan-2.4.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.4.ebuild,v 1.4 2006/11/22 19:09:55 masterdriverz Exp $
-
-inherit eutils linux-info
-
-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=""
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if kernel_is 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 kernel_is 2 4; then
- if ! [ -d /usr/src/linux/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."
- export MYMAKE="confcheck programs"
-
- else
- die "Unrecognised kernel version"
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
- epatch ${FILESDIR}/${P}-gentoo.patch
-
- # GCC4 compile fix
- sed -i -e '/LIST_INSERT_HEAD/a ;' programs/pluto/server.c
-}
-
-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
-
- doinitd ${FILESDIR}/ipsec
-}