Add myself as backup maintainer. Version bump (#134484). Fix dependencies (#147116).

Package-Manager: portage-2.1.1-r1

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 0572982004c3017ba91f4e9373d327b29ceca28f..ffd39ef7e24a3084f5689af54a4fe0289af972a2 100644 (file)
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.31 2006/11/22 19:09:55 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.32 2006/12/07 19:48:51 mrness Exp $
+
+*openswan-2.4.7 (07 Dec 2006)
+
+  07 Dec 2006; Alin Năstac <mrness@gentoo.org>
+  +files/openswan-2.4.7-gentoo.patch, metadata.xml, +openswan-2.4.7.ebuild:
+  Version bump (#134484). Fix dependencies (#147116).
 
   22 Nov 2006; Charlie Shepherd <masterdriverz@gentoo.org> ChangeLog:
   Change "exit" to "return" in init script and use doinitd. Thanks to Tomasz

diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 8cd3e29f40d327a66887d03e5cd53246a264d004..fa947ea41fd2a6e8765e43a9e4e83bceb19e1e77 100644 (file)
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a613a025d34ea3b68e95c2b13e62c SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21
 MD5 ec906a9d1fd912d2e294a5f6d00f1dc3 files/ipsec 1551
 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a files/ipsec 1551
@@ -6,19 +9,38 @@ AUX openswan-2.4.4-gentoo.patch 17758 RMD160 9048fe80d6b4b7b187e4c82887afcf5a481
 MD5 50900bb43e8903e91321d0be7f7e672b files/openswan-2.4.4-gentoo.patch 17758
 RMD160 9048fe80d6b4b7b187e4c82887afcf5a48128b0e files/openswan-2.4.4-gentoo.patch 17758
 SHA256 ed3681b1253e44e5178b67d21f66ce8eb4db03b02715e9ce636778850255543f files/openswan-2.4.4-gentoo.patch 17758
+AUX openswan-2.4.7-gentoo.patch 15049 RMD160 fc107a158d768f63eccef2f8fe3d15ba31050226 SHA1 3795575e3be0ec0fa27a3bcaefa209ac7432a670 SHA256 48bc8d2a6b9c7c7333060a46a0965424165a1b02cd1ee053c44b1f2d895a2920
+MD5 357d372357fc107ead840ee02d1fe3d6 files/openswan-2.4.7-gentoo.patch 15049
+RMD160 fc107a158d768f63eccef2f8fe3d15ba31050226 files/openswan-2.4.7-gentoo.patch 15049
+SHA256 48bc8d2a6b9c7c7333060a46a0965424165a1b02cd1ee053c44b1f2d895a2920 files/openswan-2.4.7-gentoo.patch 15049
 DIST openswan-2.4.4.tar.gz 3588694 RMD160 b2eeb9b5f5186d33b644aa0bb9c46fb2746850ae SHA1 0f706fedaaa4594d3e56592447f58a20c5c5f886 SHA256 b7d18cbaf30bbe66820dd13f170e3c9ae183307d5c5ee3cd4fa0e2711110ad79
+DIST openswan-2.4.7.tar.gz 3727456 RMD160 b84dc9600de491af2c8f0b5183af1b68c8a16ac7 SHA1 da2252f05bb477a2ca7454b50ac025e1ef2a79ae SHA256 b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
 EBUILD openswan-2.4.4.ebuild 1975 RMD160 6a40f7f3cd0c95a41eac118474b8df2f6b7cd0a5 SHA1 66cf86bf1c5c0086727466d24512c0064935058b SHA256 1c7da4d3a4f9e4b6744c0d41563aa9c249cda3844fab9b74a5cd9378201e4750
 MD5 319f88807cc48255685ebb42f2e4938e openswan-2.4.4.ebuild 1975
 RMD160 6a40f7f3cd0c95a41eac118474b8df2f6b7cd0a5 openswan-2.4.4.ebuild 1975
 SHA256 1c7da4d3a4f9e4b6744c0d41563aa9c249cda3844fab9b74a5cd9378201e4750 openswan-2.4.4.ebuild 1975
-MISC ChangeLog 5554 RMD160 7d1adf2a71ea9087697a367c3202a4d11fbdbc36 SHA1 618ab24003cbe93b28e4743c0dd41962d4343966 SHA256 c571492e4fe0a38d00ab7501a41c362cc9b597f4b1f0a8910b777b33d9e529e5
-MD5 285e74485b4af68ce6a63d294e9f53b4 ChangeLog 5554
-RMD160 7d1adf2a71ea9087697a367c3202a4d11fbdbc36 ChangeLog 5554
-SHA256 c571492e4fe0a38d00ab7501a41c362cc9b597f4b1f0a8910b777b33d9e529e5 ChangeLog 5554
-MISC metadata.xml 568 RMD160 2e125013ab267b1363716992132776bc38594ae4 SHA1 9579a2650144de1ba2f4284722b9eba138a9687d SHA256 89e23bc79dada00ca870d71bf4bacefdae75a5f59c1e6b6cded682270b219f9f
-MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568
-RMD160 2e125013ab267b1363716992132776bc38594ae4 metadata.xml 568
-SHA256 89e23bc79dada00ca870d71bf4bacefdae75a5f59c1e6b6cded682270b219f9f metadata.xml 568
+EBUILD openswan-2.4.7.ebuild 2607 RMD160 37f006a7997e2348e8f820430b6a2381d993fc29 SHA1 51d31341fe6a54dbb66ae3cb3a7f6940f41d7a3e SHA256 eb336d18e589384d1279c857b861cd468f93869308e138b84de0428c67c4b2bb
+MD5 bbb745b3f707753616e46058e6966156 openswan-2.4.7.ebuild 2607
+RMD160 37f006a7997e2348e8f820430b6a2381d993fc29 openswan-2.4.7.ebuild 2607
+SHA256 eb336d18e589384d1279c857b861cd468f93869308e138b84de0428c67c4b2bb openswan-2.4.7.ebuild 2607
+MISC ChangeLog 5757 RMD160 a9a10b029bc137e459c1e0224edf4cd5be8ef3f5 SHA1 c881d5b7451bb620d4c65a4f64aae6a881f9e7e8 SHA256 fca1b4a8c282708cb4269651c2847bab94222e3aa4fd3c6407a0bebc7dc206e2
+MD5 dbfcdbfde5f4f5c3215440a02502dbaf ChangeLog 5757
+RMD160 a9a10b029bc137e459c1e0224edf4cd5be8ef3f5 ChangeLog 5757
+SHA256 fca1b4a8c282708cb4269651c2847bab94222e3aa4fd3c6407a0bebc7dc206e2 ChangeLog 5757
+MISC metadata.xml 705 RMD160 b5844f6b42e7dbfd5b28fd76ba400fa22c9d8da1 SHA1 c2a11159482a537e08c18e28fd907f7c609a8a67 SHA256 ee7d6ca07b0a9506b1581df4095f507f7fac36c6e3d1867a577e99e8a9fb36ee
+MD5 114469c7e6baefa800996a7006c3f5d5 metadata.xml 705
+RMD160 b5844f6b42e7dbfd5b28fd76ba400fa22c9d8da1 metadata.xml 705
+SHA256 ee7d6ca07b0a9506b1581df4095f507f7fac36c6e3d1867a577e99e8a9fb36ee metadata.xml 705
 MD5 6e1e70ba8ffd8d18ed1d638cfca4d462 files/digest-openswan-2.4.4 247
 RMD160 08c5bbee4e0079c9672014b00632e58edd15a4bc files/digest-openswan-2.4.4 247
 SHA256 84979b2a8c020a15f251c54f6713879be38dac47d119f35db5a75e79a9f7294f files/digest-openswan-2.4.4 247
+MD5 3cde038bd3cff9494c80d762aa0c9270 files/digest-openswan-2.4.7 247
+RMD160 8ee2b4e365c68ffea8d69ca0540dd7171317ba8c files/digest-openswan-2.4.7 247
+SHA256 71e2281bbe224e2198739f77262072a4af1e4d6fd0411b061122a395f90d6840 files/digest-openswan-2.4.7 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFeHAy3sf9c6kjmR8RAs/1AKC8T23CloOgtmhqIL2t5k0WTs4wIwCeMUVi
+ztQXHK+4TN7lW3r1vY/ogUI=
+=BT9L
+-----END PGP SIGNATURE-----

diff --git a/net-misc/openswan/files/digest-openswan-2.4.7 b/net-misc/openswan/files/digest-openswan-2.4.7
new file mode 100644 (file)
index 0000000..04c51dc
--- /dev/null
+++ b/net-misc/openswan/files/digest-openswan-2.4.7
@@ -0,0 +1,3 @@
+MD5 70f22e8adc39e07a165f75eccb7cd079 openswan-2.4.7.tar.gz 3727456
+RMD160 b84dc9600de491af2c8f0b5183af1b68c8a16ac7 openswan-2.4.7.tar.gz 3727456
+SHA256 b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd openswan-2.4.7.tar.gz 3727456

diff --git a/net-misc/openswan/files/openswan-2.4.7-gentoo.patch b/net-misc/openswan/files/openswan-2.4.7-gentoo.patch
new file mode 100644 (file)
index 0000000..b3863a5
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.4.7-gentoo.patch
@@ -0,0 +1,377 @@
+diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
+--- openswan-2.4.7.orig/doc/Makefile   2005-11-08 23:32:45.000000000 +0200
++++ openswan-2.4.7/doc/Makefile        2006-12-06 22:46:54.732830840 +0200
+@@ -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 -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl
+--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl   2004-07-16 03:24:45.000000000 +0300
++++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl        2006-12-06 22:46:54.732830840 +0200
+@@ -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 -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl
+--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl        2004-07-10 11:07:06.000000000 +0300
++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl     2006-12-06 22:46:54.736831090 +0200
+@@ -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 -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
+--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl     2004-07-10 11:07:06.000000000 +0300
++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl  2006-12-06 22:46:54.736831090 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ # require 'x86asm.pl';
+ # &asm_init("cpp","des-586.pl");
+diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
+--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl      2004-07-10 11:07:07.000000000 +0300
++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl   2006-12-06 22:46:54.736831090 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ package x86ms;
+ 
+diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
+--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl    2004-07-10 11:07:07.000000000 +0300
++++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-12-06 22:46:54.736831090 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ package x86unix;
+ 
+diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile
+--- openswan-2.4.7.orig/lib/liblwres/Makefile  2004-12-18 20:13:34.000000000 +0200
++++ openswan-2.4.7/lib/liblwres/Makefile       2006-12-06 22:46:54.736831090 +0200
+@@ -20,7 +20,7 @@
+ CDEFINES = -g
+ CWARNINGS = -Werror
+ 
+-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
++CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE)
+ 
+ VERSION="@(\#) openswan-hacking-9.3-for-osw2"
+ LIBINTERFACE=2
+diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl
+--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl     2004-07-10 11:06:50.000000000 +0300
++++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl  2006-12-06 22:46:54.736831090 +0200
+@@ -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 -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl
+--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl      2004-07-10 11:06:50.000000000 +0300
++++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl   2006-12-06 22:46:54.740831340 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ $prog="des686.pl";
+ 
+diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl
+--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl     2004-07-10 11:06:50.000000000 +0300
++++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl  2006-12-06 22:46:54.740831340 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ $L="edi";
+ $R="esi";
+diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc
+--- openswan-2.4.7.orig/Makefile.inc   2006-11-14 19:56:09.000000000 +0200
++++ openswan-2.4.7/Makefile.inc        2006-12-06 22:48:32.534943089 +0200
+@@ -46,7 +46,7 @@
+ DESTDIR?=
+ 
+ # "local" part of tree, used in building other pathnames
+-INC_USRLOCAL=/usr/local
++INC_USRLOCAL?=/usr
+ 
+ # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
+ # settings which are assumed to include it (or at least, to include *some*
+@@ -80,7 +80,7 @@
+ MANPLACES=man3 man5 man8
+ 
+ # where configuration files go
+-FINALCONFFILE?=/etc/ipsec.conf
++FINALCONFFILE?=/etc/ipsec/ipsec.conf
+ CONFFILE=$(DESTDIR)$(FINALCONFFILE)
+ 
+ FINALCONFDIR?=/etc
+@@ -91,7 +91,7 @@
+ 
+ # sample configuration files go into
+ INC_DOCDIR?=share/doc
+-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
++FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+ EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
+ 
+ FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+@@ -239,7 +239,7 @@
+ # 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 -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in
+--- openswan-2.4.7.orig/programs/barf/barf.in  2006-11-07 05:49:18.000000000 +0200
++++ openswan-2.4.7/programs/barf/barf.in       2006-12-06 22:46:54.740831340 +0200
+@@ -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 @@
+       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 -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5
+--- openswan-2.4.7.orig/programs/eroute/eroute.5       2006-10-26 23:40:43.000000000 +0300
++++ openswan-2.4.7/programs/eroute/eroute.5    2006-12-06 22:57:19.307864340 +0200
+@@ -168,7 +168,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
++/proc/net/ipsec_eroute, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8
+--- openswan-2.4.7.orig/programs/eroute/eroute.8       2003-10-31 04:32:27.000000000 +0200
++++ openswan-2.4.7/programs/eroute/eroute.8    2006-12-06 22:46:54.740831340 +0200
+@@ -308,7 +308,7 @@
+ .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 -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in
+--- openswan-2.4.7.orig/programs/_include/_include.in  2003-01-06 23:44:04.000000000 +0200
++++ openswan-2.4.7/programs/_include/_include.in       2006-12-06 22:46:54.740831340 +0200
+@@ -47,10 +47,10 @@
+ do
+       if test ! -r "$f"
+       then
+-              if test ! "$f" = "/etc/ipsec.conf"
++              if test ! "$f" = "/etc/ipsec/ipsec.conf"
+               then
+                       echo "#:cannot open configuration file \'$f\'"
+-                      if test "$f" = "/etc/ipsec.secrets"
++                      if test "$f" = "/etc/ipsec/ipsec.secrets"
+                       then
+                               echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
+                       fi
+diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8
+--- openswan-2.4.7.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200
++++ openswan-2.4.7/programs/ipsec/ipsec.8      2006-12-06 22:46:54.744831590 +0200
+@@ -81,7 +81,7 @@
+ .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 -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5
+--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5       2006-10-27 01:21:25.000000000 +0300
++++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5    2006-12-06 22:58:04.150666840 +0200
+@@ -114,7 +114,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8
+--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8       2006-10-27 01:21:25.000000000 +0300
++++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8    2006-12-06 22:58:22.295800840 +0200
+@@ -111,7 +111,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in
+--- openswan-2.4.7.orig/programs/mailkey/mailkey.in    2006-10-29 02:49:23.000000000 +0300
++++ openswan-2.4.7/programs/mailkey/mailkey.in 2006-12-06 22:46:54.828836839 +0200
+@@ -60,7 +60,7 @@
+ 
+ "$test1st"
+ 
+-Common concerns: This account must be able to read /etc/ipsec.secrets. 
++Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. 
+ If you haven't generated your key yet, please run 'ipsec newhostkey'." 
+ exit 0
+ }
+diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile
+--- openswan-2.4.7.orig/programs/pluto/Makefile        2006-11-07 17:55:52.000000000 +0200
++++ openswan-2.4.7/programs/pluto/Makefile     2006-12-06 22:46:54.832837088 +0200
+@@ -256,7 +256,7 @@
+       -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 -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile
+--- openswan-2.4.7.orig/programs/setup/Makefile        2004-12-18 20:13:43.000000000 +0200
++++ openswan-2.4.7/programs/setup/Makefile     2006-12-06 22:46:54.832837088 +0200
+@@ -33,25 +33,10 @@
+       @rm -f $(BINDIR)/setup
+       @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
+       @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
+-      -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
+-      -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
+-      -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
+-      -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
+-      -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
+-      -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
+-      -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
+-      -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
+ 
+ install_file_list::
+       @echo $(RCDIR)/ipsec
+       @echo $(BINDIR)/setup
+-      @echo $(RCDIR)/../rc0.d/K76ipsec
+-      @echo $(RCDIR)/../rc1.d/K76ipsec
+-      @echo $(RCDIR)/../rc2.d/S47ipsec
+-      @echo $(RCDIR)/../rc3.d/S47ipsec
+-      @echo $(RCDIR)/../rc4.d/S47ipsec
+-      @echo $(RCDIR)/../rc5.d/S47ipsec
+-      @echo $(RCDIR)/../rc6.d/K76ipsec
+ 
+ clean::
+       @rm -f setup
+diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in
+--- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in    2004-11-14 15:40:41.000000000 +0200
++++ openswan-2.4.7/programs/showhostkey/showhostkey.in 2006-12-06 22:46:54.844837840 +0200
+@@ -18,7 +18,7 @@
+ usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
+                   [--dhclient] [--ipseckey]"
+ 
+-file=/etc/ipsec.secrets
++file=/etc/ipsec/ipsec.secrets
+ fmt=""
+ gw=
+ id=
+diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5
+--- openswan-2.4.7.orig/programs/spi/spi.5     2006-10-26 23:53:59.000000000 +0300
++++ openswan-2.4.7/programs/spi/spi.5  2006-12-06 23:00:11.910340779 +0200
+@@ -157,7 +157,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_spi, /usr/local/bin/ipsec
++/proc/net/ipsec_spi, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8
+--- openswan-2.4.7.orig/programs/spi/spi.8     2006-10-30 22:00:04.000000000 +0200
++++ openswan-2.4.7/programs/spi/spi.8  2006-12-06 23:00:27.043286530 +0200
+@@ -215,7 +215,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_spi, /usr/local/bin/ipsec
++/proc/net/ipsec_spi, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5
+--- openswan-2.4.7.orig/programs/spigrp/spigrp.5       2006-10-26 23:50:29.000000000 +0300
++++ openswan-2.4.7/programs/spigrp/spigrp.5    2006-12-06 23:01:25.650949280 +0200
+@@ -67,7 +67,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
++/proc/net/ipsec_spigrp, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8
+--- openswan-2.4.7.orig/programs/spigrp/spigrp.8       2006-10-26 23:50:29.000000000 +0300
++++ openswan-2.4.7/programs/spigrp/spigrp.8    2006-12-06 23:01:39.079788532 +0200
+@@ -87,7 +87,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
++/proc/net/ipsec_spigrp, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5
+--- openswan-2.4.7.orig/programs/tncfg/tncfg.5 2006-10-26 23:58:11.000000000 +0300
++++ openswan-2.4.7/programs/tncfg/tncfg.5      2006-12-06 23:01:59.385057530 +0200
+@@ -101,7 +101,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
++/proc/net/ipsec_tncfg, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 
+diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8
+--- openswan-2.4.7.orig/programs/tncfg/tncfg.8 2006-10-26 23:58:11.000000000 +0300
++++ openswan-2.4.7/programs/tncfg/tncfg.8      2006-12-06 23:02:09.245673780 +0200
+@@ -63,7 +63,7 @@
+ .SH "FILES"
+ 
+ .PP
+-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
++/proc/net/ipsec_tncfg, /usr/bin/ipsec
+ 
+ .SH "SEE ALSO"
+ 

diff --git a/net-misc/openswan/metadata.xml b/net-misc/openswan/metadata.xml
index 8a28243d60e91dc6b3abf48a4f93e858a77ec740..6889a16498c0b2ea4086d088346818f9ab0334df 100644 (file)
--- a/net-misc/openswan/metadata.xml
+++ b/net-misc/openswan/metadata.xml
@@ -6,6 +6,11 @@
   <email>pfeifer@gentoo.org</email>
   <name>Jay Pfeifer</name>
 </maintainer>
+<maintainer>
+  <email>mrness@gentoo.org</email>
+  <name>Alin Năstac</name>
+  <description>Backup maintainer</description>
+</maintainer>
 <longdescription>From the Openswan web site: Openswan is an Open Source 
 implementation of IPsec for the Linux operating system. Is it a code fork 
 of the FreeS/WAN project, started by a few of the developers who were 

diff --git a/net-misc/openswan/openswan-2.4.7.ebuild b/net-misc/openswan/openswan-2.4.7.ebuild
new file mode 100644 (file)
index 0000000..ccf86c8
--- /dev/null
+++ b/net-misc/openswan/openswan-2.4.7.ebuild
@@ -0,0 +1,96 @@
+# 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.7.ebuild,v 1.1 2006/12/07 19:48:51 mrness Exp $
+
+inherit eutils linux-info
+
+DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
+HOMEPAGE="http://www.openswan.org/"
+SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="!net-misc/strongswan
+       >=dev-libs/gmp-4.2.1"
+DEPEND="${COMMON_DEPEND}
+       virtual/linux-sources"
+RDEPEND="${COMMON_DEPEND}
+       virtual/logger
+       sys-apps/iproute2"
+
+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."
+               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."
+               MYMAKE="confcheck programs"
+
+       else
+               die "Unrecognised kernel version"
+       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 \
+               FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+               FINALDOCDIR=/usr/share/doc/${P} \
+               ${MYMAKE} || die "make failed"
+}
+
+src_install() {
+       make \
+               DESTDIR="${D}" \
+               USERCOMPILE="${CFLAGS}" \
+               FINALCONFDIR=/etc/ipsec \
+               INC_RCDEFAULT=/etc/init.d \
+               INC_USRLOCAL=/usr \
+               INC_MANDIR=share/man \
+               FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+               FINALDOCDIR=/usr/share/doc/${P} \
+               install || die "make install failed"
+
+       dosym /etc/ipsec/ipsec.d /etc/ipsec.d
+
+       doinitd "${FILESDIR}"/ipsec
+
+       fperms -R a-X /etc/ipsec /usr/share
+       keepdir /var/run/pluto
+}
+
+pkg_postinst() {
+       if kernel_is 2 6; then
+               CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
+               WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
+               WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
+               WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
+               check_extra_config
+       fi
+}