Remove obsolete version.

Package-Manager: portage-2.1.2.2

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 9f27a87069b105c6fb42895e855692103ccb395a..e9f33fae4260324109ea0d4715f137ac07ea43f7 100644 (file)
--- 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/Manifest b/net-misc/openswan/Manifest
index 082c0f6bb92d5f6f5526cb07913f94b7faba8341..38a1819ec13facb13579bca05fa6cb8e97944b00 100644 (file)
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -5,42 +5,30 @@ AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a
 MD5 ec906a9d1fd912d2e294a5f6d00f1dc3 files/ipsec 1551
 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a files/ipsec 1551
 SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21 files/ipsec 1551
-AUX openswan-2.4.4-gentoo.patch 17758 RMD160 9048fe80d6b4b7b187e4c82887afcf5a48128b0e SHA1 fe76c5c807ba0931c979c19480eb0fec24463558 SHA256 ed3681b1253e44e5178b67d21f66ce8eb4db03b02715e9ce636778850255543f
-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
 EBUILD openswan-2.4.7.ebuild 2605 RMD160 cc235d994cb32577fa3b122348b81b13df8015bf SHA1 9d7045f4c5a48f0cdf97a006cc5e4135f2d94dde SHA256 67c14326bf4c462dc3d38f1fabe4f5c5fa6cef07f458602889a4d0b0ad091783
 MD5 955b22336bcbf29314e37f0d763608a6 openswan-2.4.7.ebuild 2605
 RMD160 cc235d994cb32577fa3b122348b81b13df8015bf openswan-2.4.7.ebuild 2605
 SHA256 67c14326bf4c462dc3d38f1fabe4f5c5fa6cef07f458602889a4d0b0ad091783 openswan-2.4.7.ebuild 2605
-MISC ChangeLog 5856 RMD160 e03f3baa5c045f364b828420d6dab12b376e56df SHA1 586308f5faa6fcf4f1f03ca321801e8e0b752e92 SHA256 55ef24901c87e4fcbe0458ada6b4fa8ca46aa405603176d4ef6324f1bf0550b9
-MD5 8b3b1dd4bc0263d09fcca841b03c2ca5 ChangeLog 5856
-RMD160 e03f3baa5c045f364b828420d6dab12b376e56df ChangeLog 5856
-SHA256 55ef24901c87e4fcbe0458ada6b4fa8ca46aa405603176d4ef6324f1bf0550b9 ChangeLog 5856
+MISC ChangeLog 5994 RMD160 2b2280455edbfbd164b3b2555935b49e3069e530 SHA1 98f695bac2640645421fc6e5ce6804e70bd91080 SHA256 4cce555769485e1a52c04f6ef5af6d5afd8fb52e1d6c1114bea1909e0ec616e4
+MD5 4f720e3a83af927d78c58021c084ef91 ChangeLog 5994
+RMD160 2b2280455edbfbd164b3b2555935b49e3069e530 ChangeLog 5994
+SHA256 4cce555769485e1a52c04f6ef5af6d5afd8fb52e1d6c1114bea1909e0ec616e4 ChangeLog 5994
 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 v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFqrJmJnxX6mF440QRAn6TAKDH/cia3aWziYksP8lrAatGrZy/AgCfc/QJ
-X7sead/ajVN0UjuEddi8ITg=
-=s86l
+iD8DBQFF/PtvJnxX6mF440QRAqEzAKCyJtRsKYU9RB20YBkXTAR1xVU6IQCg6DQ6
+jUF57D1e7PRq7T69RcxAj2I=
+=LXuS
 -----END PGP SIGNATURE-----

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 (file)
index 5f2bfe4..0000000
--- 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 (file)
index 0198612..0000000
--- 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 (file)
index 1a0a59d..0000000
--- 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
-}

diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index a4037cda0644b7b33db2b549befa87e65a3d70cd..f807c69f04e072dd29b4311c4dea987229529766 100644 (file)
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -39,26 +39,20 @@ RMD160 1cb01c0b95fd8a49d442b2a0c1d900e1cee7d477 files/zebra.init 1013
 SHA256 7eac27ca9661fb453a93b131bfbf69e409a06f65c2cedb83cdd55869d6871236 files/zebra.init 1013
 DIST quagga-0.98.6-patches-20060511.tar.gz 19251 RMD160 0c46dc9aac99a74871bf12523e4ed5de17baba01 SHA1 a44a3c7323102e483401db95723f529097256672 SHA256 bb94ec2897fac3c15454c6f25e6346be087db04ba4718cb629b7b41b63da1173
 DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc27174352967342879 SHA1 2234d1235f504e9dc5865cc8d5fd4e250bf43ed5 SHA256 a84e1aac4e666929abd1942fa8958d9ef0d0bbf605f47d5c2a09f6be716987a1
-DIST quagga-0.99.5-patches-20061111.tar.gz 17786 RMD160 a301713e724bd0190302858f1209b4e32abb0e5b SHA1 fa2afcb1bb0ca2bded17eefb14a734b8f5ecc3d4 SHA256 0be922ffe1fbdf420500f8c93c8ac08bf37af77e91171d2f1a4fa2cad279272b
-DIST quagga-0.99.5.tar.gz 2311140 RMD160 7e9237f12bd6105b91d79c5e22f6999234126b50 SHA1 ef20ca8b0d161a9cac1a232fa4a8c0db94b0d58d SHA256 2555535654893806d21e804406f2cf594214bb2b9661458eb5bbf00402c31c7b
 DIST quagga-0.99.6-patches-20070112.tar.gz 17361 RMD160 d8704b3dbb8ba550fc7aa0fa9ad6e9ee5007aac6 SHA1 b8813902cf4354fe142e54924d9a3ce70614d691 SHA256 967e31f3bc8d79a107ad619b35204c1d626fba6eb4e4fb33418f56a815c5d213
 DIST quagga-0.99.6.tar.gz 2324051 RMD160 0dbeedc6d64ea7266677e88f951adc2f63d02935 SHA1 eb35c4bf2a8da4fdf66f2a7eb7724852b0f7e017 SHA256 a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a
 EBUILD quagga-0.98.6-r1.ebuild 5089 RMD160 5651737641dbb5646a6c020e6a99acac1edd70af SHA1 e9507728c1b9c36aa76f0cc154c092b678b748fc SHA256 2982a9d62c04d4b229557198bd3e5aae6e3b070dcd5cc42e941626595a065300
 MD5 6255b83707ebb2d6d0a4bd77dbec5d71 quagga-0.98.6-r1.ebuild 5089
 RMD160 5651737641dbb5646a6c020e6a99acac1edd70af quagga-0.98.6-r1.ebuild 5089
 SHA256 2982a9d62c04d4b229557198bd3e5aae6e3b070dcd5cc42e941626595a065300 quagga-0.98.6-r1.ebuild 5089
-EBUILD quagga-0.99.5.ebuild 3943 RMD160 ccd295fe81093746b78c06820ddcc7ef7de3063d SHA1 b32284d7684bd82b263bdc2fff12e0126d492413 SHA256 aa8509f23339f6d51591643d041e43aab59902820d3462d2a197d2535e9b5e05
-MD5 70e5d54f2123cbefc48784005d30c3da quagga-0.99.5.ebuild 3943
-RMD160 ccd295fe81093746b78c06820ddcc7ef7de3063d quagga-0.99.5.ebuild 3943
-SHA256 aa8509f23339f6d51591643d041e43aab59902820d3462d2a197d2535e9b5e05 quagga-0.99.5.ebuild 3943
 EBUILD quagga-0.99.6.ebuild 3943 RMD160 6734457d5ada5f3f1a923cd403952c92338f4ffe SHA1 831e6bfb67f7dec1f351070cd3ef947274b91862 SHA256 4e48c3b643d7fa1b929c3f5a3b5febd296325b4f13c53f7c629e918aa6fd0d38
 MD5 6a7ef034bd6a351f38d5f2c0ad797497 quagga-0.99.6.ebuild 3943
 RMD160 6734457d5ada5f3f1a923cd403952c92338f4ffe quagga-0.99.6.ebuild 3943
 SHA256 4e48c3b643d7fa1b929c3f5a3b5febd296325b4f13c53f7c629e918aa6fd0d38 quagga-0.99.6.ebuild 3943
-MISC ChangeLog 13498 RMD160 60931a8e9202dd56d98c477ed37c5e76f1b8d819 SHA1 663aefd7d09d970e391359286f40639ad8000469 SHA256 621f4a676d3f5ddec301c3830f2a955b78a641dcea38bb978fd8d8a6aae51cf3
-MD5 62c910b3a21fab4b452245b659f7c4ad ChangeLog 13498
-RMD160 60931a8e9202dd56d98c477ed37c5e76f1b8d819 ChangeLog 13498
-SHA256 621f4a676d3f5ddec301c3830f2a955b78a641dcea38bb978fd8d8a6aae51cf3 ChangeLog 13498
+MISC ChangeLog 13605 RMD160 93e0e485f65c7aea3552a5936b55775b68e0d6cd SHA1 9bbf9691aebcd48f64b5edf981dd5ddd4ceb54fc SHA256 a8f067a306d9fc5556684a5183fd80d658cf49ba71a5070d754f723bda0146f6
+MD5 889c3845c1b74579884942cfa7b34339 ChangeLog 13605
+RMD160 93e0e485f65c7aea3552a5936b55775b68e0d6cd ChangeLog 13605
+SHA256 a8f067a306d9fc5556684a5183fd80d658cf49ba71a5070d754f723bda0146f6 ChangeLog 13605
 MISC metadata.xml 1301 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa SHA1 0d1a07e1b3821ec910b98531511f51f733915a8d SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb
 MD5 558920a085e2065a8aef6eca3e1896fb metadata.xml 1301
 RMD160 2f07ee712c18a121b153385c20a69ceee57395aa metadata.xml 1301
@@ -66,16 +60,13 @@ SHA256 b6b92c898b68e0c1a270fbd47b91321e9a0db76068990fcbbd93ad83246b4cbb metadata
 MD5 fd0be646cb5258a11bb1a1ab1c29435d files/digest-quagga-0.98.6-r1 533
 RMD160 5639c4a7c18287a5f808a420bb58f29e210d5910 files/digest-quagga-0.98.6-r1 533
 SHA256 16c8576b8842fd33e5545deed73e9d2c4a0a3530e8e9556b567695551a714716 files/digest-quagga-0.98.6-r1 533
-MD5 c13316f5837127e7515e0498d15984d4 files/digest-quagga-0.99.5 533
-RMD160 dcc9497638b2d6d071b741c45064f2ee01c73464 files/digest-quagga-0.99.5 533
-SHA256 0e6afbebd5de7159100db142acbc29bc46a59951b74cb414aad2764cce984972 files/digest-quagga-0.99.5 533
 MD5 020249364f04aca6a99c4a884a11a344 files/digest-quagga-0.99.6 533
 RMD160 1f613d61d300c0a90644025df7e68b4845738c3e files/digest-quagga-0.99.6 533
 SHA256 9ff7f2ca0f6759755a3679f8fea920f3d205e3e7f28af0d53a54bd582333bd07 files/digest-quagga-0.99.6 533
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF4V2JJnxX6mF440QRAig8AKChz3k/986YGKBIM9LgzVDwhLf1FACg0BzJ
-o25KxTyKWXSY/J1YBd6RW3k=
-=lxlY
+iD8DBQFF/PwVJnxX6mF440QRAiV/AKCZKO+e/yHbIwSRNUDb6cg32M0buACffckZ
+B9PorXlzttuXs/Y1gR18Nd8=
+=K8jn
 -----END PGP SIGNATURE-----