Version bump. Added dependency to linux-headers as new versions (>=2.6.18)

removed some needed functions.
Package-Manager: portage-2.1.2-r12

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index a9368e063022ab8bb428ced2f180b8977d78520d..bee15607d417ae2dcc87f1fd8eb11a73b02396c6 100644 (file)
--- 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 12f6ac486dd526ffe43dd072d46a409e1652047d..a06a8941658492dead34d2f083450db1fc7bb890 100644 (file)
--- 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 (file)
index e7f86b4..0000000
--- 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 (file)
index 0000000..fe88f92
--- /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 (file)
index 0000000..e8f97f9
Binary files /dev/null and b/net-misc/strongswan/files/ipsec-path-2.8.3.patch.bz2 differ

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 (file)
index 2676160..0000000
--- 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 0e2de17f6a4f54c543a33c39997fa38eb8fcd45c..c1afd4f71b0435d663e9143a5f33c7d9d3a623ac 100644 (file)
--- 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 89f53d9024e914ef9e30fa3dde3a2dee4f1e2739..81caafa17457d6279a934b420ff2431f38966fab 100644 (file)
--- 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"