From f6d0a59f06b90fa747e9a8e84d0a37e9878bbee8 Mon Sep 17 00:00:00 2001
From: Lars Weiler <pylon@gentoo.org>
Date: Wed, 28 Feb 2007 16:47:04 +0000
Subject: [PATCH] Version bump. Added dependency to linux-headers as new
 versions (>=2.6.18) removed some needed functions. Package-Manager:
 portage-2.1.2-r12

---
 net-misc/strongswan/ChangeLog                 |  11 ++++-
 net-misc/strongswan/Manifest                  |  46 +++++++++---------
 .../strongswan/files/digest-strongswan-2.8.1  |   3 --
 .../strongswan/files/digest-strongswan-2.8.3  |   3 ++
 .../files/ipsec-path-2.8.3.patch.bz2          | Bin 0 -> 17544 bytes
 .../files/linux-headers-2.6.18.patch          |  11 -----
 net-misc/strongswan/strongswan-2.8.0.ebuild   |   8 +--
 ...n-2.8.1.ebuild => strongswan-2.8.3.ebuild} |  10 ++--
 8 files changed, 41 insertions(+), 51 deletions(-)
 delete mode 100644 net-misc/strongswan/files/digest-strongswan-2.8.1
 create mode 100644 net-misc/strongswan/files/digest-strongswan-2.8.3
 create mode 100644 net-misc/strongswan/files/ipsec-path-2.8.3.patch.bz2
 delete mode 100644 net-misc/strongswan/files/linux-headers-2.6.18.patch
 rename net-misc/strongswan/{strongswan-2.8.1.ebuild => strongswan-2.8.3.ebuild} (93%)

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index a9368e063022..bee15607d417 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.52 2007/02/28 16:11:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.53 2007/02/28 16:47:04 pylon Exp $
+
+*strongswan-2.8.3 (28 Feb 2007)
+
+  28 Feb 2007; Lars Weiler <pylon@gentoo.org>
+  -files/linux-headers-2.6.18.patch, +files/ipsec-path-2.8.3.patch.bz2,
+  strongswan-2.8.0.ebuild, -strongswan-2.8.1.ebuild,
+  +strongswan-2.8.3.ebuild:
+  Version bump. Added dependency to linux-headers as new versions (>=2.6.18)
+  removed some needed functions.
 
   28 Feb 2007; Lars Weiler <pylon@gentoo.org> -strongswan-2.5.7.ebuild,
   -strongswan-2.6.2.ebuild, strongswan-2.8.0.ebuild,
diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest
index 12f6ac486dd5..a06a89416584 100644
--- a/net-misc/strongswan/Manifest
+++ b/net-misc/strongswan/Manifest
@@ -5,14 +5,14 @@ AUX ipsec 1538 RMD160 eaecc2b05c66aa3d6140fe3b6b01147c34c9ead3 SHA1 cd80b639a4dd
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
 RMD160 eaecc2b05c66aa3d6140fe3b6b01147c34c9ead3 files/ipsec 1538
 SHA256 a405d35526f0017b6cf95ed67f5cab1e325a1850ae85f763cdb7d7b2a913b51a files/ipsec 1538
+AUX ipsec-path-2.8.3.patch.bz2 17544 RMD160 5d1d1382e9a02d552a2b56f8ddcdf00c30af44eb SHA1 b179094d9f43b3fbb7ee79fbce9488c5e521bb55 SHA256 4694f5da168dac91b3e61679cdbec95e0adb4142884170579631f3ae69700c0a
+MD5 78352ba949b9a81ac1e00c089afb54a3 files/ipsec-path-2.8.3.patch.bz2 17544
+RMD160 5d1d1382e9a02d552a2b56f8ddcdf00c30af44eb files/ipsec-path-2.8.3.patch.bz2 17544
+SHA256 4694f5da168dac91b3e61679cdbec95e0adb4142884170579631f3ae69700c0a files/ipsec-path-2.8.3.patch.bz2 17544
 AUX ipsec-path.patch.bz2 28829 RMD160 bd4b6b85b4cdefbf7d6eaa69a68baa00f4a7a25d SHA1 cea2ba7610b932b3e5b8cf62dddadf6f1d9029b3 SHA256 6cf1de4d2f1b256ab9a11ef4345cc791843a99df03adfad8050899ebe6761616
 MD5 db3c0ff0a05bce87c7deb0c92d3abe7e files/ipsec-path.patch.bz2 28829
 RMD160 bd4b6b85b4cdefbf7d6eaa69a68baa00f4a7a25d files/ipsec-path.patch.bz2 28829
 SHA256 6cf1de4d2f1b256ab9a11ef4345cc791843a99df03adfad8050899ebe6761616 files/ipsec-path.patch.bz2 28829
-AUX linux-headers-2.6.18.patch 501 RMD160 915076bce5fe0db576067709ba7eff1abb1f8654 SHA1 c61793c755a089ebd910e5661f2152d1776c2a5c SHA256 e5a2fa3d5b2393780e11ac6b44ccdcc7bbd5a62d42faeb0552ce7a7966cb3d87
-MD5 2c3d4b174b285f8ad967c64087870600 files/linux-headers-2.6.18.patch 501
-RMD160 915076bce5fe0db576067709ba7eff1abb1f8654 files/linux-headers-2.6.18.patch 501
-SHA256 e5a2fa3d5b2393780e11ac6b44ccdcc7bbd5a62d42faeb0552ce7a7966cb3d87 files/linux-headers-2.6.18.patch 501
 AUX strongswan-2.5.7-gentoo.patch 11561 RMD160 7073faf7422117dde68857db5a1c9fccc1c7cd01 SHA1 e791272675388bca783454ed12749394ebb3f972 SHA256 5ba19c6cdd47dc35f0e711b9838c2ba807bf34ffbbddf7c238561a41d920d612
 MD5 3c4497cd3d13f2c5e42de1e36579b2f8 files/strongswan-2.5.7-gentoo.patch 11561
 RMD160 7073faf7422117dde68857db5a1c9fccc1c7cd01 files/strongswan-2.5.7-gentoo.patch 11561
@@ -22,19 +22,19 @@ MD5 b4bf5e5d10c4f0fc9ba8ecaf61066bd8 files/strongswan-2.6.2-gentoo.patch 11564
 RMD160 62dec97fccb460c49bc585b302094321ed0aa819 files/strongswan-2.6.2-gentoo.patch 11564
 SHA256 926e9d664c195c003d4038a2f289d6ec54f19c2c4147d13bd902d3b0fa8ce9e1 files/strongswan-2.6.2-gentoo.patch 11564
 DIST strongswan-2.8.0.tar.bz2 2534893 RMD160 c5ff3e675bbf02d243775e4418858bd2cb1ddaac SHA1 d946d508b33b1afd7fef8ffac4c141a853a58f70 SHA256 998231c62cc2a27060fe9523c64cfd12f42865a9e3a0bf1a2f27e5a7aa900fa2
-DIST strongswan-2.8.1.tar.bz2 2531451 RMD160 d7026b78498b4febd6ad06e26c7e5521a3fcef17 SHA1 b688b155fb0ba111a8a2587f12ef8940cf83c300 SHA256 e8e5c1a42f50d0f03956b41bf1c59ba561b1b34b46407fe8f71b1df6c0b23d6b
-EBUILD strongswan-2.8.0.ebuild 3919 RMD160 34be6d13cfc7ccf30fe5a16618baec10fe04c7e2 SHA1 b0ecf8ec7cee546db10bb364dec55cd777e271ea SHA256 b4f237e6b763b115359068caa503ba71f31b9f9f2014fe1bf01a9819276e2a63
-MD5 9b1d0fa5f3d6e8aa47d52b8559777eb8 strongswan-2.8.0.ebuild 3919
-RMD160 34be6d13cfc7ccf30fe5a16618baec10fe04c7e2 strongswan-2.8.0.ebuild 3919
-SHA256 b4f237e6b763b115359068caa503ba71f31b9f9f2014fe1bf01a9819276e2a63 strongswan-2.8.0.ebuild 3919
-EBUILD strongswan-2.8.1.ebuild 4117 RMD160 0773b9e8d988a8ff1d1137c3c2de21679816f70b SHA1 e33deb1796795c6f44da5d89ef4d9f4908791b86 SHA256 9c5cf5aa4256acf7f796a840dbd62f3d9ba91cc172e25d5a1cc9c5b5e221c959
-MD5 4e3412496b4ce712fd164a6d2c9c614c strongswan-2.8.1.ebuild 4117
-RMD160 0773b9e8d988a8ff1d1137c3c2de21679816f70b strongswan-2.8.1.ebuild 4117
-SHA256 9c5cf5aa4256acf7f796a840dbd62f3d9ba91cc172e25d5a1cc9c5b5e221c959 strongswan-2.8.1.ebuild 4117
-MISC ChangeLog 8751 RMD160 e92d3e08dcf2efe0ef3760113c407d32a64b773e SHA1 6e6f9df0213867d9cc7a4f5b208f6992a232c870 SHA256 bf17974c29a2560fef2c69494b3246272af3c06f7dbdc0ecc3c734b81a36229e
-MD5 7ec19fd1e2056cd5c7d9af3057efad62 ChangeLog 8751
-RMD160 e92d3e08dcf2efe0ef3760113c407d32a64b773e ChangeLog 8751
-SHA256 bf17974c29a2560fef2c69494b3246272af3c06f7dbdc0ecc3c734b81a36229e ChangeLog 8751
+DIST strongswan-2.8.3.tar.bz2 1710171 RMD160 6bf267e500bb60d39fff5cef7872c3ad31750d9d SHA1 c5fee405536a2d3aa43c98a9e102c212bc1e66a3 SHA256 01441bdf2e172074179d3c70a73a2a86754895e7fd60ff8b5f215fce70351bdf
+EBUILD strongswan-2.8.0.ebuild 3786 RMD160 aed31a8639a67ed9d777874fce8e479027b9ef8f SHA1 372b2d71be80dd0b2b3e04aacaeaa553d4b3eede SHA256 1383ba07d0b89c8df5ce4a6ddbac18222205c97fcd03d9480667291b38e811cf
+MD5 43e86853321e350aaee9426f13b73276 strongswan-2.8.0.ebuild 3786
+RMD160 aed31a8639a67ed9d777874fce8e479027b9ef8f strongswan-2.8.0.ebuild 3786
+SHA256 1383ba07d0b89c8df5ce4a6ddbac18222205c97fcd03d9480667291b38e811cf strongswan-2.8.0.ebuild 3786
+EBUILD strongswan-2.8.3.ebuild 3990 RMD160 72988dc472bd034068cd83d210474b5cea5cb797 SHA1 1376401de1b0f164f5e1d7669913bd256bb31340 SHA256 dc708684ec22d250591b37d2535a64e524aa2e195e095426a520cbf825c352e7
+MD5 ce736594e9217d0182f0622233634bb4 strongswan-2.8.3.ebuild 3990
+RMD160 72988dc472bd034068cd83d210474b5cea5cb797 strongswan-2.8.3.ebuild 3990
+SHA256 dc708684ec22d250591b37d2535a64e524aa2e195e095426a520cbf825c352e7 strongswan-2.8.3.ebuild 3990
+MISC ChangeLog 9094 RMD160 7b9d199cf125c255214d84128725707cecd9cc46 SHA1 2d3203bb5a505826f22e016e6d11b58918a9fe05 SHA256 19cf3e71f9f3ba356276670780f3988a48e995377c34c31a952b59127a49f95c
+MD5 b77ff892b33f9a460d0800d956cc3761 ChangeLog 9094
+RMD160 7b9d199cf125c255214d84128725707cecd9cc46 ChangeLog 9094
+SHA256 19cf3e71f9f3ba356276670780f3988a48e995377c34c31a952b59127a49f95c ChangeLog 9094
 MISC metadata.xml 769 RMD160 5835c33c35419648b3beceb29f4917d6dca6669b SHA1 310dfe0d59c860abdbc05803edcd653b616f6335 SHA256 37ed72207b9c20d6bb80690c6dd4935bdc4c79f69f7530700c90e18f7c5e7cb9
 MD5 73e8a4ac5eb27655e494f6fcbbeeb5f7 metadata.xml 769
 RMD160 5835c33c35419648b3beceb29f4917d6dca6669b metadata.xml 769
@@ -42,13 +42,13 @@ SHA256 37ed72207b9c20d6bb80690c6dd4935bdc4c79f69f7530700c90e18f7c5e7cb9 metadata
 MD5 f04ac4c8ffc55846156d429b1d862acb files/digest-strongswan-2.8.0 256
 RMD160 1ad72b5c437748c0f1e60d1e3ebc3783070c2ef1 files/digest-strongswan-2.8.0 256
 SHA256 f253313e21d90546455ed6d4b3b19bebf555303540f0e1f54105a5046fc9b9b5 files/digest-strongswan-2.8.0 256
-MD5 a2c0baf666ce5df70bccdbf5443a2442 files/digest-strongswan-2.8.1 256
-RMD160 bbf65b58a80933609b42a7328c01ffd3422a378f files/digest-strongswan-2.8.1 256
-SHA256 93eb86f2e18eaf082977ccf7ab084df95dc23d4215921884ca588b05b12df566 files/digest-strongswan-2.8.1 256
+MD5 28801455c91996b7e4fc8364ab5e3d59 files/digest-strongswan-2.8.3 256
+RMD160 a5451c27f0a67a21b5e29135d45646e8d2f5f50f files/digest-strongswan-2.8.3 256
+SHA256 bc61fa25b18a014c8c4b89e0218a25448cf3b418e93f799c0476872d16e2cbf4 files/digest-strongswan-2.8.3 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF5anA6IPkARlRZfQRAkaSAJ4llD+1Gx7Bb6JU4RJDtBtUSko+pwCfZLLg
-MhotE2rn/rafIJy6LSGMwm8=
-=WDfc
+iD8DBQFF5bIk6IPkARlRZfQRAulOAJ9FcWgBdYl9QRb7mKExEm9uiwAzrQCfdXab
+QnVM3EIJCQJpge9e/OExpXM=
+=rT1i
 -----END PGP SIGNATURE-----
diff --git a/net-misc/strongswan/files/digest-strongswan-2.8.1 b/net-misc/strongswan/files/digest-strongswan-2.8.1
deleted file mode 100644
index e7f86b493b7b..000000000000
--- a/net-misc/strongswan/files/digest-strongswan-2.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a87edfa33d207ef03ccb844087e26cf strongswan-2.8.1.tar.bz2 2531451
-RMD160 d7026b78498b4febd6ad06e26c7e5521a3fcef17 strongswan-2.8.1.tar.bz2 2531451
-SHA256 e8e5c1a42f50d0f03956b41bf1c59ba561b1b34b46407fe8f71b1df6c0b23d6b strongswan-2.8.1.tar.bz2 2531451
diff --git a/net-misc/strongswan/files/digest-strongswan-2.8.3 b/net-misc/strongswan/files/digest-strongswan-2.8.3
new file mode 100644
index 000000000000..fe88f92163e4
--- /dev/null
+++ b/net-misc/strongswan/files/digest-strongswan-2.8.3
@@ -0,0 +1,3 @@
+MD5 720bfbbb3a0deb6964119228ed4226b4 strongswan-2.8.3.tar.bz2 1710171
+RMD160 6bf267e500bb60d39fff5cef7872c3ad31750d9d strongswan-2.8.3.tar.bz2 1710171
+SHA256 01441bdf2e172074179d3c70a73a2a86754895e7fd60ff8b5f215fce70351bdf strongswan-2.8.3.tar.bz2 1710171
diff --git a/net-misc/strongswan/files/ipsec-path-2.8.3.patch.bz2 b/net-misc/strongswan/files/ipsec-path-2.8.3.patch.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..e8f97f9273572ad13542f7b547656c57eeb8b100
GIT binary patch
literal 17544
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
G@=j=Ic<WLC

literal 0
HcmV?d00001

diff --git a/net-misc/strongswan/files/linux-headers-2.6.18.patch b/net-misc/strongswan/files/linux-headers-2.6.18.patch
deleted file mode 100644
index 2676160449d2..000000000000
--- a/net-misc/strongswan/files/linux-headers-2.6.18.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur strongswan-2.8.1-vanilla/programs/starter/starterwhack.c strongswan-2.8.1-incfix/programs/starter/starterwhack.c
---- strongswan-2.8.1-vanilla/programs/starter/starterwhack.c    2006-10-19 18:02:46.000000000 +0300
-+++ strongswan-2.8.1-incfix/programs/starter/starterwhack.c     2007-01-18 09:57:07.000000000 +0200
-@@ -17,7 +17,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <linux/stddef.h>
-+#include <stddef.h>
- #include <unistd.h>
- #include <errno.h>
diff --git a/net-misc/strongswan/strongswan-2.8.0.ebuild b/net-misc/strongswan/strongswan-2.8.0.ebuild
index 0e2de17f6a4f..c1afd4f71b04 100644
--- a/net-misc/strongswan/strongswan-2.8.0.ebuild
+++ b/net-misc/strongswan/strongswan-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.10 2007/02/28 16:11:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.11 2007/02/28 16:47:04 pylon Exp $
 
 inherit eutils linux-info
 
@@ -17,6 +17,7 @@ COMMON_DEPEND="!net-misc/openswan
 	dev-libs/gmp"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
+	<sys-kernel/linux-headers-2.6.18
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
 	smartcard? ( dev-libs/opensc )"
@@ -55,11 +56,6 @@ src_unpack() {
 
 	epatch ${FILESDIR}/ipsec-path.patch.bz2
 
-	# Fix for newer sys-kernel/linux-headers; bug #162811
-	if has_version ">=sys-kernel/linux-headers-2.6.18" ; then
-		epatch ${FILESDIR}/linux-headers-2.6.18.patch
-	fi
-
 	if use curl ; then
 		ebegin "Curl support requested. Enabling curl support"
 		sed -i -e 's:\(USE_LIBCURL?=\)false:\1true:g' Makefile.inc || die
diff --git a/net-misc/strongswan/strongswan-2.8.1.ebuild b/net-misc/strongswan/strongswan-2.8.3.ebuild
similarity index 93%
rename from net-misc/strongswan/strongswan-2.8.1.ebuild
rename to net-misc/strongswan/strongswan-2.8.3.ebuild
index 89f53d9024e9..81caafa17457 100644
--- a/net-misc/strongswan/strongswan-2.8.1.ebuild
+++ b/net-misc/strongswan/strongswan-2.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.1.ebuild,v 1.2 2007/02/28 16:11:34 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.3.ebuild,v 1.1 2007/02/28 16:47:04 pylon Exp $
 
 inherit eutils linux-info
 
@@ -17,6 +17,7 @@ COMMON_DEPEND="!net-misc/openswan
 	dev-libs/gmp"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
+	<sys-kernel/linux-headers-2.6.18
 	curl? ( net-misc/curl )
 	ldap? ( net-nds/openldap )
 	smartcard? ( dev-libs/opensc )"
@@ -53,12 +54,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/ipsec-path.patch.bz2
-
-	# Fix for newer sys-kernel/linux-headers; bug #162811
-	if has_version ">=sys-kernel/linux-headers-2.6.18" ; then
-		epatch ${FILESDIR}/linux-headers-2.6.18.patch
-	fi
+	epatch ${FILESDIR}/ipsec-path-${PV}.patch.bz2
 
 	if use curl ; then
 		ebegin "Curl support requested. Enabling curl support"
-- 
2.26.2