Re-add setup script (#284955).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 23 insertions, 9 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 0de367d2a3a1..a7b141e6986e 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openswan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.69 2009/09/11 18:46:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.70 2009/09/17 16:07:06 mrness Exp $
+
+*openswan-2.6.23-r1 (17 Sep 2009)
+
+  17 Sep 2009; Alin Năstac <mrness@gentoo.org>
+  files/openswan-2.6.23-gentoo.patch, -openswan-2.6.23.ebuild,
+  +openswan-2.6.23-r1.ebuild:
+  Re-add setup script (#284955).
 
 *openswan-2.6.23 (11 Sep 2009)
 *openswan-2.4.15-r1 (11 Sep 2009)
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 6bbff6e4f0f5..80eea36c9cb4 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -8,20 +8,20 @@ AUX openswan-2.4.15-deprecated-ldap.patch 372 RMD160 434d98f24c6b0066be3ce6d50e6
 AUX openswan-2.4.15-gentoo.patch 7744 RMD160 fb3d0f745ddf93f11fbeeee98d709c46455c248d SHA1 14dc6577ddb6e52a7356407512725a23865d02b8 SHA256 792055fe57e1a7756d5e804bdbbdf76e009b9b4e60141125bd92c464ec46d946
 AUX openswan-2.6-allow-ms-bad-proposal.patch 551 RMD160 3fda2ba360cb5d3427af56c12f32526c78465c7e SHA1 6649779a6ae76773c78db5d646927a7e698ce825 SHA256 3c84444f6181c0b7f7749c828db790e20f637d93d9dacec8e120709cce8adcc0
 AUX openswan-2.6.22-gentoo.patch 5088 RMD160 e61921ae0c795e38c44e38f5a22f0881aaf4d893 SHA1 783cee333a0fa0f820c76d7bda808404c650aa39 SHA256 e95a2cd4fa2aff4c1d75951c27595045602180a6865920594b318ec6cd576db8
-AUX openswan-2.6.23-gentoo.patch 5198 RMD160 42a4b13b4778297ca6051916f1222f04b336cdb4 SHA1 b5ee49a2201a46e36772c15e43594ab4151ff792 SHA256 b6cac62e0544cab3680457538b35e1f71cd1389d06369f486640ae37bf7277ef
+AUX openswan-2.6.23-gentoo.patch 5343 RMD160 ac3faa214214b4c2b9c55ebb24b01e97a1b13b6d SHA1 9430bd651aef246b427c7b0e453cb81e2a53a399 SHA256 cc3048ad2540a92a504aa58de3f7bed28a022eb59dc0a32be7b593f151c7e671
 DIST openswan-2.4.15.tar.gz 3938290 RMD160 be0c9bec423f5df5815d6a773ed79c4d832b94a9 SHA1 b9b76c81fae2ff1f202c362fc67518a7acd1e99e SHA256 cf85bf896dd2b0b0818d2851f4d8ec61f816f777d47cbfed7065a682ffd47293
 DIST openswan-2.6.22.tar.gz 8152865 RMD160 dd06dbf7147407c9dc31efa29253d4c06ef5f0b1 SHA1 44cc5d6dd850b926f9addfd88ec2540984b08563 SHA256 05f4db569206b2bb31d99a322eb75a4830567e2859f485a12fdbaee37d91704b
 DIST openswan-2.6.23.tar.gz 8127086 RMD160 534e5be9df46116db65adf17e05faae13c8c5f8d SHA1 03ce952f4a7fe6be8c8244d759d782d2249d010f SHA256 5e14092746ebca6c8f6ec03e98c74c8094d5343a4f20f860f8cf15f3d33261e2
 EBUILD openswan-2.4.15-r1.ebuild 3788 RMD160 0195c1c269a763347e5ce2ba96cc7aa16a0a80de SHA1 21df0773a8f788161ba364a387277a28630e9ea2 SHA256 6b9e1ab34d6de2ca89680d207f94eda8dfbdec36cd75f57a8f5b3af98a9c3806
 EBUILD openswan-2.4.15.ebuild 3524 RMD160 846041fd08d5f29d85ae4721ec8941cb32662d5e SHA1 b51b0f8072555e2c4216751625d8d690251d74a4 SHA256 da2aab48d0493e800a4ad6d0bdd913a736e7e0aa8035b7ec2f06e33539568cb7
 EBUILD openswan-2.6.22.ebuild 4532 RMD160 bf55872849421ca354554c99f1cb5be66dee203e SHA1 d0ca8b86fc9b92d26ecc9b8e704bf855f994f969 SHA256 71a90ba5379c7dd3892a00759552c6e02e39fe2b03f9ab27aafa408df980e1ba
-EBUILD openswan-2.6.23.ebuild 4647 RMD160 b4474762a40293b1d4eb7bc18fa26328d825fd88 SHA1 e27846553b09cde3a912c7fb72205a0cf960734e SHA256 83ba0dd45ee1123edcf2abad0fc4705104827a75b4cff50fc67588924463bae9
-MISC ChangeLog 13839 RMD160 15e24d3ecd8afe9291a38e2c18c74a8bf2851efe SHA1 93486f12ccba9cb688a6372f0ba8b087be3080c9 SHA256 50e7899d5893cf6c7f08461cc3a1a256a18f612c6d40c63d636387afea2e5007
+EBUILD openswan-2.6.23-r1.ebuild 4650 RMD160 fe9138f2a63d2a5bd1ba5069b0f16adae47174b7 SHA1 5749cf596ac51f4719d0806bb806c288abfa5536 SHA256 081f1bd8b19df3184591fb75973f1068c4130c2f4d934f4bc65e426f964d5595
+MISC ChangeLog 14049 RMD160 78b6e24475ac594d40f02430ca57fc580a668d5b SHA1 a1e3c89bbe75f4f4000ca3195bfcb1b0aa516ca2 SHA256 9c3bcd68123d90d6ee92f1218953907d4c9011f4b516f566b6db95abf37f7cf8
 MISC metadata.xml 1169 RMD160 972a171b3ac79de89b5885a0ec41e067930e7c72 SHA1 648e25d425288f8b7b160cce0d26fd33a7d9e133 SHA256 3b481978833bd6bf1eac2a07930dc3b1ea622cc7abd2dcdb2bbae47d65672a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqqmxYACgkQ9A5kJBGSrsu4zQCeME6X9iXUoSNM0EzjHJgG21ss
-cxgAoI7lspeRx/q+8WKbttRbPWa6dQ6Y
-=ZlyI
+iEYEARECAAYFAkqyXr0ACgkQ9A5kJBGSrssdEACgpY896sxeWQ71rWJ6Lu/fpYDV
+KGIAn1gQZWXL81s1TTrgWGa0gqhAVFVQ
+=YyGi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/openswan-2.6.23-gentoo.patch b/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
index 51da8db7766a..df5a5ce67f1c 100644
--- a/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
+++ b/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
@@ -80,7 +80,8 @@ diff -Nru openswan-2.6.23.orig/programs/setup/Makefile openswan-2.6.23/programs/
  # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
  # not as /etc/rc.d/init.d/setup.
 -PROGRAMDIR=$(RCDIR)
- PROGRAM=
+-PROGRAM=
++PROGRAM=setup
  EXTRA8MAN=setup.8
  
 @@ -29,32 +28,6 @@
@@ -116,6 +117,12 @@ diff -Nru openswan-2.6.23.orig/programs/setup/Makefile openswan-2.6.23/programs/
  
  #
  # $Log: not supported by cvs2svn $
+ # Revision 1.1  2009/09/11 18:46:35  mrness
+ # Version bump.
+ # Correct ipsec.conf and ipsec.secrets paths in openswan-2.4 documentation (#284235).
+ # Add ms-bad-proposal USE flag and patch (#284240).
+ # (Portage version: 2.1.6.13/cvs/Linux x86_64)
+ #
 diff -Nru openswan-2.6.23.orig/testing/utils/make-uml.sh openswan-2.6.23/testing/utils/make-uml.sh
 --- openswan-2.6.23.orig/testing/utils/make-uml.sh	2009-09-09 02:42:54.000000000 +0200
 +++ openswan-2.6.23/testing/utils/make-uml.sh	2009-09-11 19:20:37.000000000 +0200
diff --git a/net-misc/openswan/openswan-2.6.23.ebuild b/net-misc/openswan/openswan-2.6.23-r1.ebuild
index 78dd752d856e..cb45d304ee6d 100644
--- a/net-misc/openswan/openswan-2.6.23.ebuild
+++ b/net-misc/openswan/openswan-2.6.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.23.ebuild,v 1.1 2009/09/11 18:46:36 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.23-r1.ebuild,v 1.1 2009/09/17 16:07:06 mrness Exp $
 
 EAPI="2"