diff options
-rw-r--r-- | net-misc/openswan/ChangeLog | 10 | ||||
-rw-r--r-- | net-misc/openswan/Manifest | 25 | ||||
-rw-r--r-- | net-misc/openswan/files/digest-openswan-2.3.0 | 1 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.3.0-gentoo.patch | 434 | ||||
-rw-r--r-- | net-misc/openswan/openswan-1.0.6.ebuild | 4 | ||||
-rw-r--r-- | net-misc/openswan/openswan-1.0.7.ebuild | 4 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.1.4.ebuild | 4 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.1.5.ebuild | 4 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.2.0.ebuild | 4 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.3.0.ebuild | 125 |
10 files changed, 587 insertions, 28 deletions
diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index ff5960e2ea22..47bd3610e2cb 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/openswan -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.20 2004/10/25 17:05:03 pfeifer Exp $ +# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.21 2005/01/21 02:49:24 pfeifer Exp $ + +*openswan-2.3.0 (20 Jan 2005) + + 20 Jan 2005; Jay Pfeifer <pfeifer@gentoo.org> + +files/openswan-2.3.0-gentoo.patch, +openswan-2.3.0.ebuild: + Version bump. 25 Oct 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.2.0.ebuild: Stable on x86. diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest index e0cede57f108..60431b21311f 100644 --- a/net-misc/openswan/Manifest +++ b/net-misc/openswan/Manifest @@ -1,14 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 bb89ef02ed491be05e7c7aa090a88263 openswan-1.0.7.ebuild 1887 -MD5 0b4846a1ec1c676f6085fdec6be40522 openswan-2.1.5.ebuild 3123 -MD5 c46a67b9295b521816d933ab5c0d3601 openswan-1.0.6.ebuild 1887 -MD5 9bde29a2af4f8037cf8a4e672b012c74 openswan-2.2.0.ebuild 3122 -MD5 ae997bca1ced2191e39625501480f95b openswan-2.1.4.ebuild 3122 -MD5 65cadc6532a4933958c94b2756be6d79 ChangeLog 3187 +MD5 e2ffaa1222b5c1ca8f988401cb629584 openswan-1.0.7.ebuild 1887 +MD5 9de1bedd6c896bb822c85a9833332579 openswan-2.1.5.ebuild 3123 +MD5 8a7fcaa9f7615726aebc93d27b85f896 openswan-1.0.6.ebuild 1887 +MD5 dc2aa54ef7a85c54e0118c4eb1a3de6c openswan-2.2.0.ebuild 3122 +MD5 c96344bc4f7e8023909cc183649313d1 openswan-2.1.4.ebuild 3122 +MD5 b9d6bdd933f63344c84fcaaf5363687d openswan-2.3.0.ebuild 2973 +MD5 b9736f7e948703ef7df83cd3ac58c614 ChangeLog 3345 MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538 +MD5 cd5f8cc1a1e4a42483b45bc18c87f95b files/openswan-2.3.0-gentoo.patch 19127 MD5 c455249e331da80c3619b2e474e2af67 files/openswan-2.1.5-gentoo.patch 17438 MD5 9b866b02f096fc3ce577165fd17a82ec files/openswan-2.2.0-gentoo.patch 17438 MD5 6ececd32bf85e7cd883a626e99c18e9d files/digest-openswan-1.0.6 67 @@ -16,11 +15,5 @@ MD5 5a79041189d29ce8568c635f841cebd4 files/digest-openswan-1.0.7 67 MD5 a89d62cdc2c6087f9828b1586b0a78ec files/digest-openswan-2.1.4 67 MD5 23643094e10b2d1822e4ed1a782ba418 files/digest-openswan-2.1.5 67 MD5 0ddd2a0be9ddea1e37f659f9d529ee19 files/digest-openswan-2.2.0 67 +MD5 31031b397c28bfb7ea42f1954d7f208b files/digest-openswan-2.3.0 67 MD5 8e740d4b962bb189f52cf890e2c98c8f files/openswan-2.1.4-gentoo.patch 17438 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.10 (GNU/Linux) - -iD8DBQFBw0sII1lqEGTUzyQRAmhbAJsFXh2YODGuUOV5VXlxdgKmmAUjdQCfaiZX -zyPzD/syvDnYignYBi/6Zh4= -=RzoF ------END PGP SIGNATURE----- diff --git a/net-misc/openswan/files/digest-openswan-2.3.0 b/net-misc/openswan/files/digest-openswan-2.3.0 new file mode 100644 index 000000000000..48ad03a8d2ee --- /dev/null +++ b/net-misc/openswan/files/digest-openswan-2.3.0 @@ -0,0 +1 @@ +MD5 709d2b1102ddf6e50620b2fb5038e62b openswan-2.3.0.tar.gz 4991013 diff --git a/net-misc/openswan/files/openswan-2.3.0-gentoo.patch b/net-misc/openswan/files/openswan-2.3.0-gentoo.patch new file mode 100644 index 000000000000..392f168a9dc5 --- /dev/null +++ b/net-misc/openswan/files/openswan-2.3.0-gentoo.patch @@ -0,0 +1,434 @@ +diff -Naupr openswan-2.3.0/Makefile.inc openswan-2.3.0-gentoo/Makefile.inc +--- openswan-2.3.0/Makefile.inc 2004-12-31 18:52:53.000000000 -0600 ++++ openswan-2.3.0-gentoo/Makefile.inc 2005-01-20 20:24:20.384146880 -0600 +@@ -65,7 +65,7 @@ POLICYLIB=${OPENSWANSRCDIR}/lib/libipsec + 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* +@@ -99,7 +99,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 +@@ -110,10 +110,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.3.0 + EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} + +-FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan ++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.3.0 + DOCDIR=${DESTDIR}${FINALDOCDIR} + + # where per-conn pluto logs go +@@ -247,7 +247,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4 + # 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.3.0/doc/Makefile openswan-2.3.0-gentoo/doc/Makefile +--- openswan-2.3.0/doc/Makefile 2004-09-18 13:59:18.000000000 -0500 ++++ openswan-2.3.0-gentoo/doc/Makefile 2005-01-20 20:25:36.702578773 -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 +@@ -67,28 +67,11 @@ HMANDIR=manpage.d + # dependencies build most of it + # then we add index + index.html: toc.html HowTo.html manpages src/index.html +- cp src/index.html index.html +- +-# separate files plus table of contents +-# and then remove HTML formatting added by htmldoc +-toc.html : $(sections) +- -@htmldoc -t html --path ".;${TESTINGDIR}/doc" -d . $(sections) +- @$(SCRIPTDIR)/cleanhtml.sh $(SCRIPTDIR)/cleanhtml.sed $(separate) +- +-# one big HTML file +-HowTo.html : $(sections) +- -@htmldoc -t html --toclevels 4 --header ' cf' -f $@ $(sections) + + # other HowTo formats + HowTo.txt: HowTo.html + lynx -dump $< > $@ + +-HowTo.ps : $(sections) +- -@htmldoc -f $@ $(sections) +- +-HowTo.pdf : $(sections) +- -@htmldoc -f $@ $(sections) +- + manpages: manp + + manp: $(SCRIPTDIR)/mkhtmlman +diff -Naupr openswan-2.3.0/lib/libcrypto/libdes/Makefile openswan-2.3.0-gentoo/lib/libcrypto/libdes/Makefile +--- openswan-2.3.0/lib/libcrypto/libdes/Makefile 2004-07-15 19:25:17.000000000 -0500 ++++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/Makefile 2005-01-20 20:24:20.385146703 -0600 +@@ -60,7 +60,7 @@ MAKE=make -f Makefile + # normally overridden by FreeS/WAN Makefiles anyway + CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR} + +-CFLAGS=$(OPTS) $(CFLAG) ++CFLAGS=$(OPTS) $(CFLAG) $(USERCOMPILE) + CPP=$(CC) -E + + # Assember version of des_encrypt*(). +diff -Naupr openswan-2.3.0/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/crypt586.pl +--- openswan-2.3.0/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-15 19:24:45.000000000 -0500 ++++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/crypt586.pl 2005-01-20 20:24:20.385146703 -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.3.0/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl +--- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 03:07:06.000000000 -0500 ++++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2005-01-20 20:24:20.385146703 -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.3.0/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl +--- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 03:07:06.000000000 -0500 ++++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2005-01-20 20:24:20.386146525 -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.3.0/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl +--- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 03:07:07.000000000 -0500 ++++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2005-01-20 20:24:20.386146525 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86ms; + +diff -Naupr openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl +--- openswan-2.3.0/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 03:07:07.000000000 -0500 ++++ openswan-2.3.0-gentoo/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2005-01-20 20:24:20.386146525 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86unix; + +diff -Naupr openswan-2.3.0/lib/liblwres/Makefile openswan-2.3.0-gentoo/lib/liblwres/Makefile +--- openswan-2.3.0/lib/liblwres/Makefile 2004-11-16 16:11:54.000000000 -0600 ++++ openswan-2.3.0-gentoo/lib/liblwres/Makefile 2005-01-20 20:24:20.387146347 -0600 +@@ -24,7 +24,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.3.0/linux/net/ipsec/des/asm/des-586.pl openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des-586.pl +--- openswan-2.3.0/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 03:06:50.000000000 -0500 ++++ openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des-586.pl 2005-01-20 20:24:20.387146347 -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.3.0/linux/net/ipsec/des/asm/des686.pl openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des686.pl +--- openswan-2.3.0/linux/net/ipsec/des/asm/des686.pl 2004-07-10 03:06:50.000000000 -0500 ++++ openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/des686.pl 2005-01-20 20:24:20.387146347 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $prog="des686.pl"; + +diff -Naupr openswan-2.3.0/linux/net/ipsec/des/asm/desboth.pl openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/desboth.pl +--- openswan-2.3.0/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 03:06:50.000000000 -0500 ++++ openswan-2.3.0-gentoo/linux/net/ipsec/des/asm/desboth.pl 2005-01-20 20:24:20.388146169 -0600 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $L="edi"; + $R="esi"; +diff -Naupr openswan-2.3.0/programs/_include/_include.in openswan-2.3.0-gentoo/programs/_include/_include.in +--- openswan-2.3.0/programs/_include/_include.in 2003-01-06 15:44:04.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/_include/_include.in 2005-01-20 20:24:20.388146169 -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.3.0/programs/barf/barf.in openswan-2.3.0-gentoo/programs/barf/barf.in +--- openswan-2.3.0/programs/barf/barf.in 2004-12-29 19:59:10.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/barf/barf.in 2005-01-20 20:24:20.388146169 -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.3.0/programs/eroute/eroute.5 openswan-2.3.0-gentoo/programs/eroute/eroute.5 +--- openswan-2.3.0/programs/eroute/eroute.5 2003-10-30 20:32:27.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/eroute/eroute.5 2005-01-20 20:24:20.389145992 -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.3.0/programs/eroute/eroute.8 openswan-2.3.0-gentoo/programs/eroute/eroute.8 +--- openswan-2.3.0/programs/eroute/eroute.8 2003-10-30 20:32:27.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/eroute/eroute.8 2005-01-20 20:24:20.389145992 -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.3.0/programs/ipsec/ipsec.8 openswan-2.3.0-gentoo/programs/ipsec/ipsec.8 +--- openswan-2.3.0/programs/ipsec/ipsec.8 2003-02-27 10:51:54.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/ipsec/ipsec.8 2005-01-20 20:24:20.389145992 -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.3.0/programs/klipsdebug/klipsdebug.5 openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.5 +--- openswan-2.3.0/programs/klipsdebug/klipsdebug.5 2002-04-24 02:35:38.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.5 2005-01-20 20:24:20.390145814 -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.3.0/programs/klipsdebug/klipsdebug.8 openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.8 +--- openswan-2.3.0/programs/klipsdebug/klipsdebug.8 2002-04-24 02:35:39.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/klipsdebug/klipsdebug.8 2005-01-20 20:24:20.390145814 -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.3.0/programs/lwdnsq/lwdnsq.xml.in openswan-2.3.0-gentoo/programs/lwdnsq/lwdnsq.xml.in +--- openswan-2.3.0/programs/lwdnsq/lwdnsq.xml.in 2004-04-03 19:50:56.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/lwdnsq/lwdnsq.xml.in 2005-01-20 20:24:20.390145814 -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.3.0/programs/mailkey/mailkey.in openswan-2.3.0-gentoo/programs/mailkey/mailkey.in +--- openswan-2.3.0/programs/mailkey/mailkey.in 2003-06-30 00:34:22.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/mailkey/mailkey.in 2005-01-20 20:24:20.391145636 -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.3.0/programs/pluto/Makefile openswan-2.3.0-gentoo/programs/pluto/Makefile +--- openswan-2.3.0/programs/pluto/Makefile 2004-12-15 19:27:56.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/pluto/Makefile 2005-01-20 20:24:20.391145636 -0600 +@@ -244,7 +244,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.3.0/programs/setup/Makefile openswan-2.3.0-gentoo/programs/setup/Makefile +--- openswan-2.3.0/programs/setup/Makefile 2004-04-03 13:44:48.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/setup/Makefile 2005-01-20 20:24:20.391145636 -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.3.0/programs/showhostkey/showhostkey.in openswan-2.3.0-gentoo/programs/showhostkey/showhostkey.in +--- openswan-2.3.0/programs/showhostkey/showhostkey.in 2004-11-14 07:40:41.000000000 -0600 ++++ openswan-2.3.0-gentoo/programs/showhostkey/showhostkey.in 2005-01-20 20:24:20.392145458 -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.3.0/programs/spi/spi.5 openswan-2.3.0-gentoo/programs/spi/spi.5 +--- openswan-2.3.0/programs/spi/spi.5 2002-04-24 02:35:39.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/spi/spi.5 2005-01-20 20:24:20.392145458 -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.3.0/programs/spi/spi.8 openswan-2.3.0-gentoo/programs/spi/spi.8 +--- openswan-2.3.0/programs/spi/spi.8 2002-04-24 02:35:40.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/spi/spi.8 2005-01-20 20:24:20.392145458 -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.3.0/programs/spigrp/spigrp.5 openswan-2.3.0-gentoo/programs/spigrp/spigrp.5 +--- openswan-2.3.0/programs/spigrp/spigrp.5 2002-04-24 02:35:40.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/spigrp/spigrp.5 2005-01-20 20:24:20.393145280 -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.3.0/programs/spigrp/spigrp.8 openswan-2.3.0-gentoo/programs/spigrp/spigrp.8 +--- openswan-2.3.0/programs/spigrp/spigrp.8 2002-04-24 02:35:41.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/spigrp/spigrp.8 2005-01-20 20:24:20.393145280 -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.3.0/programs/tncfg/tncfg.5 openswan-2.3.0-gentoo/programs/tncfg/tncfg.5 +--- openswan-2.3.0/programs/tncfg/tncfg.5 2002-04-24 02:35:41.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/tncfg/tncfg.5 2005-01-20 20:24:20.393145280 -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.3.0/programs/tncfg/tncfg.8 openswan-2.3.0-gentoo/programs/tncfg/tncfg.8 +--- openswan-2.3.0/programs/tncfg/tncfg.8 2002-04-24 02:35:41.000000000 -0500 ++++ openswan-2.3.0-gentoo/programs/tncfg/tncfg.8 2005-01-20 20:24:20.394145103 -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-1.0.6.ebuild b/net-misc/openswan/openswan-1.0.6.ebuild index 7309287ac620..410216110eaa 100644 --- a/net-misc/openswan/openswan-1.0.6.ebuild +++ b/net-misc/openswan/openswan-1.0.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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-1.0.6.ebuild,v 1.4 2004/09/12 06:22:56 pfeifer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-1.0.6.ebuild,v 1.5 2005/01/21 02:49:24 pfeifer Exp $ inherit eutils diff --git a/net-misc/openswan/openswan-1.0.7.ebuild b/net-misc/openswan/openswan-1.0.7.ebuild index 450a7e224fa7..cc305fc24be6 100644 --- a/net-misc/openswan/openswan-1.0.7.ebuild +++ b/net-misc/openswan/openswan-1.0.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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-1.0.7.ebuild,v 1.3 2004/09/18 02:49:41 pfeifer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-1.0.7.ebuild,v 1.4 2005/01/21 02:49:24 pfeifer Exp $ inherit eutils diff --git a/net-misc/openswan/openswan-2.1.4.ebuild b/net-misc/openswan/openswan-2.1.4.ebuild index 67fa9e68fe09..b4bf8fe0c9a9 100644 --- a/net-misc/openswan/openswan-2.1.4.ebuild +++ b/net-misc/openswan/openswan-2.1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.1.4.ebuild,v 1.4 2004/09/12 06:22:56 pfeifer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.4.ebuild,v 1.5 2005/01/21 02:49:24 pfeifer Exp $ inherit eutils diff --git a/net-misc/openswan/openswan-2.1.5.ebuild b/net-misc/openswan/openswan-2.1.5.ebuild index 85b07110d479..c1ee8e227a5a 100644 --- a/net-misc/openswan/openswan-2.1.5.ebuild +++ b/net-misc/openswan/openswan-2.1.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.1.5.ebuild,v 1.4 2004/10/19 12:33:24 absinthe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.5.ebuild,v 1.5 2005/01/21 02:49:24 pfeifer Exp $ inherit eutils diff --git a/net-misc/openswan/openswan-2.2.0.ebuild b/net-misc/openswan/openswan-2.2.0.ebuild index 15712b2659d5..f03d278ac3b3 100644 --- a/net-misc/openswan/openswan-2.2.0.ebuild +++ b/net-misc/openswan/openswan-2.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.2.0.ebuild,v 1.3 2004/10/25 17:05:03 pfeifer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.2.0.ebuild,v 1.4 2005/01/21 02:49:24 pfeifer Exp $ inherit eutils diff --git a/net-misc/openswan/openswan-2.3.0.ebuild b/net-misc/openswan/openswan-2.3.0.ebuild new file mode 100644 index 000000000000..6dc6fd267536 --- /dev/null +++ b/net-misc/openswan/openswan-2.3.0.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.3.0.ebuild,v 1.1 2005/01/21 02:49:24 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/code/${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-misc/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!" + 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 +} |