Initial import of openswan-1.0.6-r1 for transition of superfreeswan users. Version bump to 2.1.4 for another security fix.

8 files changed, 182 insertions, 94 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index d533ca30d7df..c1e6f6b0c661 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.9 2004/06/19 14:54:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.10 2004/06/24 01:33:11 pfeifer Exp $
 
-  19 Jun 2004; David Holm <dholm@gentoo.org> openswan-2.1.3.ebuild:
+*openswan-2.1.4 (23 Jun 2004)
+
+  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.1.4.ebuild
+  Version bump. Contains a fix for potential security issue in x509.
+
+*openswan-1.0.6rc1 (23 Jun 2004)
+
+  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-1.0.6_rc1.ebuild
+  Initial import of Openswan 1.0.x series.
+  Superfreeswan users will now be migrated to openswan.
+  Contains fixes for potential security issues in x509.
+
+19 Jun 2004; David Holm <dholm@gentoo.org> openswan-2.1.3.ebuild:
   Added to ~ppc.
 
 *openswan-2.1.3 (19 Jun 2004)
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index c52687523a58..0a4578e53d16 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,6 +1,8 @@
-MD5 bb1c6554e770c2c74c3a68df9303ca92 ChangeLog 1584
+MD5 0dda08063514b6593eba6b0809c5ba94 openswan-1.0.6_rc1.ebuild 1898
+MD5 4a5802ea82f3560c220002206db1b134 openswan-2.1.4.ebuild 3109
+MD5 502978e0a258c89358f33cb0255e136d ChangeLog 2024
 MD5 5d96d9e4b6f6b113db0983e211adf85a metadata.xml 639
-MD5 e3b004485647282277b804f9d5a7b2eb openswan-2.1.3.ebuild 3107
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
-MD5 ec7eac89ca0ff22dfa5b9e4f157cf520 files/digest-openswan-2.1.3 67
-MD5 bd37ab9094716cd96868a501bc3a44f3 files/openswan-2.1.3-gentoo.patch 17438
+MD5 a89d62cdc2c6087f9828b1586b0a78ec files/digest-openswan-2.1.4 67
+MD5 8e740d4b962bb189f52cf890e2c98c8f files/openswan-2.1.4-gentoo.patch 17438
+MD5 086fb1dc6a45ef8a16247b0147407220 files/digest-openswan-1.0.6_rc1 70
diff --git a/net-misc/openswan/files/digest-openswan-1.0.6_rc1 b/net-misc/openswan/files/digest-openswan-1.0.6_rc1
new file mode 100644
index 000000000000..bc2f1c0dacdf
--- /dev/null
+++ b/net-misc/openswan/files/digest-openswan-1.0.6_rc1
@@ -0,0 +1 @@
+MD5 3bf9f9d8eab5ffe0de49fa8458133df0 openswan-1.0.6rc1.tar.gz 2731868
diff --git a/net-misc/openswan/files/digest-openswan-2.1.3 b/net-misc/openswan/files/digest-openswan-2.1.3
deleted file mode 100644
index 49742a7c07d8..000000000000
--- a/net-misc/openswan/files/digest-openswan-2.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac65d15905e73ea6ce68f527f9a375ce openswan-2.1.3.tar.gz 4541726
diff --git a/net-misc/openswan/files/digest-openswan-2.1.4 b/net-misc/openswan/files/digest-openswan-2.1.4
new file mode 100644
index 000000000000..d350ca207feb
--- /dev/null
+++ b/net-misc/openswan/files/digest-openswan-2.1.4
@@ -0,0 +1 @@
+MD5 5fd6e1866c392ab7e53b605ec70db11b openswan-2.1.4.tar.gz 4547143
diff --git a/net-misc/openswan/files/openswan-2.1.3-gentoo.patch b/net-misc/openswan/files/openswan-2.1.4-gentoo.patch
index 5851155670f8..5835991c3fd4 100644
--- a/net-misc/openswan/files/openswan-2.1.3-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.1.4-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Naupr openswan-2.1.3/Makefile.inc openswan-2.1.3-gentoo/Makefile.inc
---- openswan-2.1.3/Makefile.inc	2004-06-16 19:54:01.000000000 -0500
-+++ openswan-2.1.3-gentoo/Makefile.inc	2004-06-19 08:02:12.258722284 -0500
+diff -Naupr openswan-2.1.4/Makefile.inc openswan-2.1.4-gentoo/Makefile.inc
+--- openswan-2.1.4/Makefile.inc	2004-06-23 07:44:59.000000000 -0500
++++ openswan-2.1.4-gentoo/Makefile.inc	2004-06-23 20:19:18.601866871 -0500
 @@ -62,7 +62,7 @@ POLICYLIB=${FREESWANSRCDIR}/lib/libipsec
  DESTDIR?=
  
@@ -24,11 +24,11 @@ diff -Naupr openswan-2.1.3/Makefile.inc openswan-2.1.3-gentoo/Makefile.inc
  # sample configuration files go into
  INC_DOCDIR?=share/doc
 -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.3
++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.4
  EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
  
 -FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/freeswan
-+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.3
++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.1.4
  DOCDIR=${DESTDIR}${FINALDOCDIR}
  
  # where per-conn pluto logs go
@@ -41,9 +41,9 @@ diff -Naupr openswan-2.1.3/Makefile.inc openswan-2.1.3-gentoo/Makefile.inc
  
  # if you install elsewere, you may need to point the include files to it.
  #BIND9STATICLIBDIR?=/sandel/lib
-diff -Naupr openswan-2.1.3/lib/libdes/Makefile openswan-2.1.3-gentoo/lib/libdes/Makefile
---- openswan-2.1.3/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
-+++ openswan-2.1.3-gentoo/lib/libdes/Makefile	2004-06-19 08:02:12.259722110 -0500
+diff -Naupr openswan-2.1.4/lib/libdes/Makefile openswan-2.1.4-gentoo/lib/libdes/Makefile
+--- openswan-2.1.4/lib/libdes/Makefile	2003-04-22 19:38:03.000000000 -0500
++++ openswan-2.1.4-gentoo/lib/libdes/Makefile	2004-06-23 20:19:18.601866871 -0500
 @@ -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}
@@ -53,81 +53,81 @@ diff -Naupr openswan-2.1.3/lib/libdes/Makefile openswan-2.1.3-gentoo/lib/libdes/
  CPP=$(CC) -E
  
  # Assember version of des_encrypt*().
-diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-06-19 08:02:12.259722110 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/crypt586.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/crypt586.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/crypt586.pl	2004-06-23 20:19:18.601866871 -0500
 @@ -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.1.3/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-06-19 08:02:12.259722110 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/des-586.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des-586.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/des-586.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des-586.pl	2004-06-23 20:19:18.602866697 -0500
 @@ -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.1.3/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des686.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-06-19 08:02:12.260721936 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/des686.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des686.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/des686.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/des686.pl	2004-06-23 20:19:18.602866697 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  $prog="des686.pl";
  
-diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-06-19 08:02:12.260721936 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/desboth.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/desboth.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/desboth.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/desboth.pl	2004-06-23 20:19:18.602866697 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  $L="edi";
  $R="esi";
-diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-06-19 08:02:12.260721936 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/cbc.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/cbc.pl	2004-06-23 20:19:18.603866523 -0500
 @@ -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.1.3/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-06-19 08:02:12.261721762 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86asm.pl	2004-06-23 20:19:18.603866523 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  # require 'x86asm.pl';
  # &asm_init("cpp","des-586.pl");
-diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-06-19 08:02:12.261721762 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86ms.pl	2004-06-23 20:19:18.603866523 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  package x86ms;
  
-diff -Naupr openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
---- openswan-2.1.3/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
-+++ openswan-2.1.3-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-06-19 08:02:12.261721762 -0500
+diff -Naupr openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl
+--- openswan-2.1.4/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2002-04-24 02:36:37.000000000 -0500
++++ openswan-2.1.4-gentoo/linux/crypto/ciphers/des/asm/perlasm/x86unix.pl	2004-06-23 20:19:18.604866348 -0500
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!/usr/bin/perl
  
  package x86unix;
  
-diff -Naupr openswan-2.1.3/programs/_include/_include.in openswan-2.1.3-gentoo/programs/_include/_include.in
---- openswan-2.1.3/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
-+++ openswan-2.1.3-gentoo/programs/_include/_include.in	2004-06-19 08:02:12.262721588 -0500
+diff -Naupr openswan-2.1.4/programs/_include/_include.in openswan-2.1.4-gentoo/programs/_include/_include.in
+--- openswan-2.1.4/programs/_include/_include.in	2003-01-06 15:44:04.000000000 -0600
++++ openswan-2.1.4-gentoo/programs/_include/_include.in	2004-06-23 20:19:18.604866348 -0500
 @@ -47,10 +47,10 @@ for f
  do
  	if test ! -r "$f"
@@ -141,9 +141,9 @@ diff -Naupr openswan-2.1.3/programs/_include/_include.in openswan-2.1.3-gentoo/p
  			then
  				echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
  			fi
-diff -Naupr openswan-2.1.3/programs/barf/barf.in openswan-2.1.3-gentoo/programs/barf/barf.in
---- openswan-2.1.3/programs/barf/barf.in	2004-04-14 22:46:50.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/barf/barf.in	2004-06-19 08:02:12.262721588 -0500
+diff -Naupr openswan-2.1.4/programs/barf/barf.in openswan-2.1.4-gentoo/programs/barf/barf.in
+--- openswan-2.1.4/programs/barf/barf.in	2004-04-14 22:46:50.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/barf/barf.in	2004-06-23 20:19:18.605866174 -0500
 @@ -16,7 +16,7 @@
  
  LOGS=${LOGS-/var/log}
@@ -171,9 +171,9 @@ diff -Naupr openswan-2.1.3/programs/barf/barf.in openswan-2.1.3-gentoo/programs/
  done
  _________________________ proc/net/dev
  cat /proc/net/dev
-diff -Naupr openswan-2.1.3/programs/eroute/eroute.5 openswan-2.1.3-gentoo/programs/eroute/eroute.5
---- openswan-2.1.3/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.3-gentoo/programs/eroute/eroute.5	2004-06-19 08:02:12.262721588 -0500
+diff -Naupr openswan-2.1.4/programs/eroute/eroute.5 openswan-2.1.4-gentoo/programs/eroute/eroute.5
+--- openswan-2.1.4/programs/eroute/eroute.5	2003-10-30 20:32:27.000000000 -0600
++++ openswan-2.1.4-gentoo/programs/eroute/eroute.5	2004-06-23 20:19:18.605866174 -0500
 @@ -223,7 +223,7 @@ Parameters Index of
  in hexadecimal using Authentication Header protocol (51,
  IPPROTO_AH) with no identies defined for either end.
@@ -183,9 +183,9 @@ diff -Naupr openswan-2.1.3/programs/eroute/eroute.5 openswan-2.1.3-gentoo/progra
  .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.1.3/programs/eroute/eroute.8 openswan-2.1.3-gentoo/programs/eroute/eroute.8
---- openswan-2.1.3/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
-+++ openswan-2.1.3-gentoo/programs/eroute/eroute.8	2004-06-19 08:02:12.263721414 -0500
+diff -Naupr openswan-2.1.4/programs/eroute/eroute.8 openswan-2.1.4-gentoo/programs/eroute/eroute.8
+--- openswan-2.1.4/programs/eroute/eroute.8	2003-10-30 20:32:27.000000000 -0600
++++ openswan-2.1.4-gentoo/programs/eroute/eroute.8	2004-06-23 20:19:18.606866000 -0500
 @@ -308,7 +308,7 @@ will be in clear text.
  .br
  .LP
@@ -195,9 +195,9 @@ diff -Naupr openswan-2.1.3/programs/eroute/eroute.8 openswan-2.1.3-gentoo/progra
  .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.1.3/programs/ipsec/ipsec.8 openswan-2.1.3-gentoo/programs/ipsec/ipsec.8
---- openswan-2.1.3/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
-+++ openswan-2.1.3-gentoo/programs/ipsec/ipsec.8	2004-06-19 08:02:12.263721414 -0500
+diff -Naupr openswan-2.1.4/programs/ipsec/ipsec.8 openswan-2.1.4-gentoo/programs/ipsec/ipsec.8
+--- openswan-2.1.4/programs/ipsec/ipsec.8	2003-02-27 10:51:54.000000000 -0600
++++ openswan-2.1.4-gentoo/programs/ipsec/ipsec.8	2004-06-23 20:19:18.606866000 -0500
 @@ -81,7 +81,7 @@ reports where
  .I ipsec
  thinks the IPsec configuration files are stored.
@@ -207,9 +207,9 @@ diff -Naupr openswan-2.1.3/programs/ipsec/ipsec.8 openswan-2.1.3-gentoo/programs
  .SH ENVIRONMENT
  .PP
  The following environment variables control where FreeS/WAN finds its
-diff -Naupr openswan-2.1.3/programs/klipsdebug/klipsdebug.5 openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.5
---- openswan-2.1.3/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.5	2004-06-19 08:02:12.263721414 -0500
+diff -Naupr openswan-2.1.4/programs/klipsdebug/klipsdebug.5 openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.5
+--- openswan-2.1.4/programs/klipsdebug/klipsdebug.5	2002-04-24 02:35:38.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.5	2004-06-23 20:19:18.606866000 -0500
 @@ -103,7 +103,7 @@ full
  sockets debugging has been set and everything else is not set.
  .LP
@@ -219,9 +219,9 @@ diff -Naupr openswan-2.1.3/programs/klipsdebug/klipsdebug.5 openswan-2.1.3-gento
  .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.1.3/programs/klipsdebug/klipsdebug.8 openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.8
---- openswan-2.1.3/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/klipsdebug/klipsdebug.8	2004-06-19 08:02:12.264721240 -0500
+diff -Naupr openswan-2.1.4/programs/klipsdebug/klipsdebug.8 openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.8
+--- openswan-2.1.4/programs/klipsdebug/klipsdebug.8	2002-04-24 02:35:39.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/klipsdebug/klipsdebug.8	2004-06-23 20:19:18.606866000 -0500
 @@ -117,7 +117,7 @@ turns off only the
  debugging messages.
  .LP
@@ -231,9 +231,9 @@ diff -Naupr openswan-2.1.3/programs/klipsdebug/klipsdebug.8 openswan-2.1.3-gento
  .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.1.3/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.3-gentoo/programs/lwdnsq/lwdnsq.xml.in
---- openswan-2.1.3/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
-+++ openswan-2.1.3-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-06-19 08:02:12.264721240 -0500
+diff -Naupr openswan-2.1.4/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.4-gentoo/programs/lwdnsq/lwdnsq.xml.in
+--- openswan-2.1.4/programs/lwdnsq/lwdnsq.xml.in	2003-02-07 22:03:06.000000000 -0600
++++ openswan-2.1.4-gentoo/programs/lwdnsq/lwdnsq.xml.in	2004-06-23 20:19:18.607865826 -0500
 @@ -430,7 +430,7 @@ information.
  <refsect1><title>Special IPSECKEY processing</title>
  
@@ -243,9 +243,9 @@ diff -Naupr openswan-2.1.3/programs/lwdnsq/lwdnsq.xml.in openswan-2.1.3-gentoo/p
  </programlisting>
  
  </refsect1>
-diff -Naupr openswan-2.1.3/programs/mailkey/mailkey.in openswan-2.1.3-gentoo/programs/mailkey/mailkey.in
---- openswan-2.1.3/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/mailkey/mailkey.in	2004-06-19 08:02:12.264721240 -0500
+diff -Naupr openswan-2.1.4/programs/mailkey/mailkey.in openswan-2.1.4-gentoo/programs/mailkey/mailkey.in
+--- openswan-2.1.4/programs/mailkey/mailkey.in	2003-06-30 00:34:22.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/mailkey/mailkey.in	2004-06-23 20:19:18.607865826 -0500
 @@ -60,7 +60,7 @@ with the following error:
  
  "$test1st"
@@ -255,9 +255,9 @@ diff -Naupr openswan-2.1.3/programs/mailkey/mailkey.in openswan-2.1.3-gentoo/pro
  If you haven't generated your key yet, please run 'ipsec newhostkey'." 
  exit 0
  }
-diff -Naupr openswan-2.1.3/programs/pluto/Makefile openswan-2.1.3-gentoo/programs/pluto/Makefile
---- openswan-2.1.3/programs/pluto/Makefile	2004-06-16 19:35:21.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/pluto/Makefile	2004-06-19 08:02:12.265721065 -0500
+diff -Naupr openswan-2.1.4/programs/pluto/Makefile openswan-2.1.4-gentoo/programs/pluto/Makefile
+--- openswan-2.1.4/programs/pluto/Makefile	2004-06-16 19:35:21.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/pluto/Makefile	2004-06-23 20:19:18.608865651 -0500
 @@ -208,7 +208,7 @@ CPPFLAGS = $(HDRDIRS) $(DEFINES) \
  	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
  	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
@@ -267,9 +267,9 @@ diff -Naupr openswan-2.1.3/programs/pluto/Makefile openswan-2.1.3-gentoo/program
  
  # libefence is a free memory allocation debugger
  # Solaris 2 needs -lsocket -lnsl
-diff -Naupr openswan-2.1.3/programs/setup/Makefile openswan-2.1.3-gentoo/programs/setup/Makefile
---- openswan-2.1.3/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
-+++ openswan-2.1.3-gentoo/programs/setup/Makefile	2004-06-19 08:02:12.265721065 -0500
+diff -Naupr openswan-2.1.4/programs/setup/Makefile openswan-2.1.4-gentoo/programs/setup/Makefile
+--- openswan-2.1.4/programs/setup/Makefile	2003-12-01 20:35:46.000000000 -0600
++++ openswan-2.1.4-gentoo/programs/setup/Makefile	2004-06-23 20:19:18.608865651 -0500
 @@ -33,25 +33,10 @@ install:: setup
  	@rm -f $(BINDIR)/setup
  	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
@@ -296,9 +296,9 @@ diff -Naupr openswan-2.1.3/programs/setup/Makefile openswan-2.1.3-gentoo/program
  
  clean::
  	@rm -f setup
-diff -Naupr openswan-2.1.3/programs/showhostkey/showhostkey.in openswan-2.1.3-gentoo/programs/showhostkey/showhostkey.in
---- openswan-2.1.3/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/showhostkey/showhostkey.in	2004-06-19 08:02:12.266720891 -0500
+diff -Naupr openswan-2.1.4/programs/showhostkey/showhostkey.in openswan-2.1.4-gentoo/programs/showhostkey/showhostkey.in
+--- openswan-2.1.4/programs/showhostkey/showhostkey.in	2003-07-14 07:35:57.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/showhostkey/showhostkey.in	2004-06-23 20:19:18.609865477 -0500
 @@ -18,7 +18,7 @@ me="ipsec showhostkey"
  usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
                    [--dhclient]"
@@ -308,9 +308,9 @@ diff -Naupr openswan-2.1.3/programs/showhostkey/showhostkey.in openswan-2.1.3-ge
  fmt=""
  gw=
  id=
-diff -Naupr openswan-2.1.3/programs/spi/spi.5 openswan-2.1.3-gentoo/programs/spi/spi.5
---- openswan-2.1.3/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/spi/spi.5	2004-06-19 08:02:12.266720891 -0500
+diff -Naupr openswan-2.1.4/programs/spi/spi.5 openswan-2.1.4-gentoo/programs/spi/spi.5
+--- openswan-2.1.4/programs/spi/spi.5	2002-04-24 02:35:39.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/spi/spi.5	2004-06-23 20:19:18.609865477 -0500
 @@ -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
@@ -320,9 +320,9 @@ diff -Naupr openswan-2.1.3/programs/spi/spi.5 openswan-2.1.3-gentoo/programs/spi
  .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.1.3/programs/spi/spi.8 openswan-2.1.3-gentoo/programs/spi/spi.8
---- openswan-2.1.3/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/spi/spi.8	2004-06-19 08:02:12.266720891 -0500
+diff -Naupr openswan-2.1.4/programs/spi/spi.8 openswan-2.1.4-gentoo/programs/spi/spi.8
+--- openswan-2.1.4/programs/spi/spi.8	2002-04-24 02:35:40.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/spi/spi.8	2004-06-23 20:19:18.609865477 -0500
 @@ -461,7 +461,7 @@ and protocol
  (4).
  .LP
@@ -332,9 +332,9 @@ diff -Naupr openswan-2.1.3/programs/spi/spi.8 openswan-2.1.3-gentoo/programs/spi
  .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.1.3/programs/spigrp/spigrp.5 openswan-2.1.3-gentoo/programs/spigrp/spigrp.5
---- openswan-2.1.3/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/spigrp/spigrp.5	2004-06-19 08:02:12.267720717 -0500
+diff -Naupr openswan-2.1.4/programs/spigrp/spigrp.5 openswan-2.1.4-gentoo/programs/spigrp/spigrp.5
+--- openswan-2.1.4/programs/spigrp/spigrp.5	2002-04-24 02:35:40.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/spigrp/spigrp.5	2004-06-23 20:19:18.610865303 -0500
 @@ -77,7 +77,7 @@ be an incoming or outgoing group, depend
  machine.
  .LP
@@ -344,9 +344,9 @@ diff -Naupr openswan-2.1.3/programs/spigrp/spigrp.5 openswan-2.1.3-gentoo/progra
  .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.1.3/programs/spigrp/spigrp.8 openswan-2.1.3-gentoo/programs/spigrp/spigrp.8
---- openswan-2.1.3/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/spigrp/spigrp.8	2004-06-19 08:02:12.267720717 -0500
+diff -Naupr openswan-2.1.4/programs/spigrp/spigrp.8 openswan-2.1.4-gentoo/programs/spigrp/spigrp.8
+--- openswan-2.1.4/programs/spigrp/spigrp.8	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/spigrp/spigrp.8	2004-06-23 20:19:18.610865303 -0500
 @@ -128,7 +128,7 @@ and finally an AH header to authenticate
  .BR 0x236 .
  .LP
@@ -356,9 +356,9 @@ diff -Naupr openswan-2.1.3/programs/spigrp/spigrp.8 openswan-2.1.3-gentoo/progra
  .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.1.3/programs/tncfg/tncfg.5 openswan-2.1.3-gentoo/programs/tncfg/tncfg.5
---- openswan-2.1.3/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/tncfg/tncfg.5	2004-06-19 08:02:12.267720717 -0500
+diff -Naupr openswan-2.1.4/programs/tncfg/tncfg.5 openswan-2.1.4-gentoo/programs/tncfg/tncfg.5
+--- openswan-2.1.4/programs/tncfg/tncfg.5	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/tncfg/tncfg.5	2004-06-23 20:19:18.610865303 -0500
 @@ -75,7 +75,7 @@ shows that virtual device
  is not connected to any physical device.
  .LP
@@ -368,9 +368,9 @@ diff -Naupr openswan-2.1.3/programs/tncfg/tncfg.5 openswan-2.1.3-gentoo/programs
  .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.1.3/programs/tncfg/tncfg.8 openswan-2.1.3-gentoo/programs/tncfg/tncfg.8
---- openswan-2.1.3/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
-+++ openswan-2.1.3-gentoo/programs/tncfg/tncfg.8	2004-06-19 08:02:12.268720543 -0500
+diff -Naupr openswan-2.1.4/programs/tncfg/tncfg.8 openswan-2.1.4-gentoo/programs/tncfg/tncfg.8
+--- openswan-2.1.4/programs/tncfg/tncfg.8	2002-04-24 02:35:41.000000000 -0500
++++ openswan-2.1.4-gentoo/programs/tncfg/tncfg.8	2004-06-23 20:19:18.611865128 -0500
 @@ -76,7 +76,7 @@ virtual device to the
  physical device.
  .LP
diff --git a/net-misc/openswan/openswan-1.0.6_rc1.ebuild b/net-misc/openswan/openswan-1.0.6_rc1.ebuild
new file mode 100644
index 000000000000..5738fcb97c53
--- /dev/null
+++ b/net-misc/openswan/openswan-1.0.6_rc1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-1.0.6_rc1.ebuild,v 1.1 2004/06/24 01:33:11 pfeifer Exp $
+
+inherit eutils
+
+MY_P=${P/_/}
+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"
+
+DEPEND="virtual/glibc
+	virtual/linux-sources
+	net-misc/host
+	sys-apps/iproute2
+	>=dev-libs/gmp-3.1.1"
+LICENSE="GPL-2"
+RDEPEND=""
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+pkg_setup() {
+	[ -d /usr/src/linux/net/ipsec ] || {
+		echo You need to have the crypto-enabled version of Gentoo Sources
+		echo with a symlink to it in /usr/src/linux in order to have IPSec
+		echo kernel compatibility.  Please emerge sys-kernel/crypto-sources,
+		echo compile an IPSec-enabled kernel and attempt this ebuild again.
+		die
+	}
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_compile() {
+	cp ${S}/libdes/Makefile ${S}/libdes/Makefile.orig
+	sed s:/usr/local:/usr:g < ${S}/libdes/Makefile.orig \
+		> ${S}/libdes/Makefile
+	cp ${S}/libdes/Makefile ${S}/libdes/Makefile.orig
+	sed s:/usr/man:/usr/share/man:g < ${S}/libdes/Makefile.orig \
+		> ${S}/libdes/Makefile
+
+	make	 				   	\
+		DESTDIR=${D}				\
+		USERCOMPILE="${CFLAGS}"			\
+		FINALCONFDIR=/etc/ipsec			\
+		INC_RCDEFAULT=/etc/init.d		\
+		INC_USRLOCAL=/usr			\
+		INC_MANDIR=share/man			\
+		confcheck programs || die
+}
+
+src_install () {
+
+	# try make prefix=${D}/usr install
+
+	make 						\
+		DESTDIR=${D}				\
+		USERCOMPILE="${CFLAGS}"			\
+		FINALCONFDIR=/etc/ipsec			\
+		INC_RCDEFAULT=/etc/init.d		\
+		INC_USRLOCAL=/usr			\
+		INC_MANDIR=share/man			\
+		install || die
+
+	dodoc INSTALL COPYING CREDITS BUGS CHANGES README doc/*
+	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
+}
+
diff --git a/net-misc/openswan/openswan-2.1.3.ebuild b/net-misc/openswan/openswan-2.1.4.ebuild
index eb0db4a01f2c..2597810fa62b 100644
--- a/net-misc/openswan/openswan-2.1.3.ebuild
+++ b/net-misc/openswan/openswan-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.3.ebuild,v 1.2 2004/06/19 14:54:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.4.ebuild,v 1.1 2004/06/24 01:33:11 pfeifer Exp $
 
 inherit eutils