Use linux-mod, to fix bug #149197 reported by DominikBuerkle

Package-Manager: portage-2.1.2_pre3-r1

3 files changed, 33 insertions, 79 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 61db8da24c12..bbee0a078cac 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.29 2006/06/19 05:20:32 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.30 2006/10/16 02:46:58 dsd Exp $
+
+  16 Oct 2006; Daniel Drake <dsd@gentoo.org> openswan-2.4.4.ebuild:
+  Use linux-mod, to fix bug #149197 reported by DominikBuerkle
 
   19 Jun 2006; Alin Nastac <mrness@gentoo.org> files/ipsec:
   Start ipsec after dns.
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index fda5dfcb486d..1abd4ed5c6af 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ipsec 1549 RMD160 ee263f8bd96e45ce2f14df2f8c7155f93e3c5c44 SHA1 a096150c16afbdaa8fa23e3164ed5cc221267e42 SHA256 2a8eb7ce1bc96f23bf04813398e8669c5c31ac0d96a60a649d7a7ad13e3641c2
 MD5 98be49e476925c27652e5b6016639bad files/ipsec 1549
 RMD160 ee263f8bd96e45ce2f14df2f8c7155f93e3c5c44 files/ipsec 1549
@@ -10,14 +7,14 @@ 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
 DIST openswan-2.4.4.tar.gz 3588694 RMD160 b2eeb9b5f5186d33b644aa0bb9c46fb2746850ae SHA1 0f706fedaaa4594d3e56592447f58a20c5c5f886 SHA256 b7d18cbaf30bbe66820dd13f170e3c9ae183307d5c5ee3cd4fa0e2711110ad79
-EBUILD openswan-2.4.4.ebuild 3115 RMD160 c59fc956490c90f5d0c5055588d55529375f56d6 SHA1 714443641c89fa9e21ec6df52fa3dc19eb6056b1 SHA256 6953e2b833771f5c41b90cdf91970cb21eea4a19dcdd71ef15345ac6d95efef0
-MD5 5cab4ee2a9cb0fd929efd3db2cf3f353 openswan-2.4.4.ebuild 3115
-RMD160 c59fc956490c90f5d0c5055588d55529375f56d6 openswan-2.4.4.ebuild 3115
-SHA256 6953e2b833771f5c41b90cdf91970cb21eea4a19dcdd71ef15345ac6d95efef0 openswan-2.4.4.ebuild 3115
-MISC ChangeLog 5185 RMD160 4b67ccc80b64124981669f5de321b9fe00d022d4 SHA1 08bd7898e15e655e84ea352734669a60c2d87661 SHA256 aaee3841e19caa0ffa22eae918675c361f16d9bc03c17bf69022759da4d912e2
-MD5 7b443991657000d1131005f151acabf8 ChangeLog 5185
-RMD160 4b67ccc80b64124981669f5de321b9fe00d022d4 ChangeLog 5185
-SHA256 aaee3841e19caa0ffa22eae918675c361f16d9bc03c17bf69022759da4d912e2 ChangeLog 5185
+EBUILD openswan-2.4.4.ebuild 1985 RMD160 eca4e6441ea17fbd22a31f5ac3aa95326cac5a67 SHA1 c601c19f5c32d44845e4aaee33b01d3887a5deed SHA256 602b0c62fe298511a18d9cb51e52bf3c929055bcc10313e23773e748a71cc011
+MD5 0a6b8fb0b983a4a2e007cdf017e9fee3 openswan-2.4.4.ebuild 1985
+RMD160 eca4e6441ea17fbd22a31f5ac3aa95326cac5a67 openswan-2.4.4.ebuild 1985
+SHA256 602b0c62fe298511a18d9cb51e52bf3c929055bcc10313e23773e748a71cc011 openswan-2.4.4.ebuild 1985
+MISC ChangeLog 5314 RMD160 c57e865639a5de2dc820f024a176504f862acec8 SHA1 7556a16f03e6b5a55ac36bf24de813aaa7775e60 SHA256 7bc5f761fe8f1b1df40c94098ad3649f06083373efa10955acd7dcba4dc7e33a
+MD5 33e4fbdcb31398715546cdc480bc6466 ChangeLog 5314
+RMD160 c57e865639a5de2dc820f024a176504f862acec8 ChangeLog 5314
+SHA256 7bc5f761fe8f1b1df40c94098ad3649f06083373efa10955acd7dcba4dc7e33a ChangeLog 5314
 MISC metadata.xml 568 RMD160 2e125013ab267b1363716992132776bc38594ae4 SHA1 9579a2650144de1ba2f4284722b9eba138a9687d SHA256 89e23bc79dada00ca870d71bf4bacefdae75a5f59c1e6b6cded682270b219f9f
 MD5 0f26f5619b06afba5889ea1982b99557 metadata.xml 568
 RMD160 2e125013ab267b1363716992132776bc38594ae4 metadata.xml 568
@@ -25,10 +22,3 @@ SHA256 89e23bc79dada00ca870d71bf4bacefdae75a5f59c1e6b6cded682270b219f9f metadata
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEljSYjG8pv1lIUX4RAga1AJ0cF5HtM0oYIkWPFkX3qwZLvQWDrgCeM1tc
-UfH0xCWahvW9MEFzyboRz7s=
-=nxSw
------END PGP SIGNATURE-----
diff --git a/net-misc/openswan/openswan-2.4.4.ebuild b/net-misc/openswan/openswan-2.4.4.ebuild
index 85be028af260..ff377505bedc 100644
--- a/net-misc/openswan/openswan-2.4.4.ebuild
+++ b/net-misc/openswan/openswan-2.4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2 2005/11/29 14:49:12 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.4.ebuild,v 1.3 2006/10/16 02:46:58 dsd Exp $
 
-inherit eutils
+inherit eutils linux-info
 
 MY_P=${P/_p/_kb}
 S=${WORKDIR}/${MY_P}
@@ -24,69 +24,27 @@ DEPEND="!net-misc/strongswan
 	sys-apps/iproute2"
 RDEPEND=""
 
-check_version_h() {
-	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
-	then
-		eerror "Please verify that your /usr/src/linux symlink is pointing"
-		eerror "to your current kernel sources, and that you have a running kernel"
-		die "/usr/src/linux symlink not setup or kernel tree has not been configured!"
-	fi
-}
-
-get_KV_info() {
-	check_version_h
-
-	# Get the kernel version of sources in /usr/src/linux ...
-	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
-		"${ROOT}/usr/src/linux/include/linux/version.h")"
-	export KV_major="$(echo "${KV_full}" | cut -d. -f1)"
-	export KV_minor="$(echo "${KV_full}" | cut -d. -f2)"
-	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
-}
-
-is_kernel() {
-	[ -z "$1" -o -z "$2" ] && return 1
-
-	get_KV_info
-
-	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
 pkg_setup() {
-	get_KV_info
+	linux-info_pkg_setup
 
-	einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}"
+	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"
 
-	if is_kernel 2 5
-	then
-	eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild."
-	die "Please install a 2.6.x version of the Linux kernel."
-	fi
+	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
 
-	if is_kernel 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 is_kernel 2 4
-	then
-		[ -d /usr/src/linux/net/ipsec ] || {
-		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"
-		}
-	einfo "Using patched-in IPsec code for kernel 2.4"
-	einfo "Your kernel only supports KLIPS for kernel level IPsec."
-	export MYMAKE="confcheck programs"
+		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
-	eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}."
-	die "Install an IPsec enabled 2.4 or 2.6 kernel."
+		die "Unrecognised kernel version"
 	fi
 }
 
@@ -95,6 +53,9 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	# GCC4 compile fix
+	sed -i -e '/LIST_INSERT_HEAD/a ;' programs/pluto/server.c
 }
 
 src_compile() {