Use system linux header files rather than those in /usr/src/linux

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

4 files changed, 282 insertions, 5 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index 7bd807b4ed06..77959e2ee46c 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/ipsec-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.84 2012/03/04 18:18:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.85 2012/03/06 00:12:41 blueness Exp $
+
+*ipsec-tools-0.8.0-r2 (06 Mar 2012)
+
+  06 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
+  +ipsec-tools-0.8.0-r2.ebuild, +files/ipsec-tools-system-kernel-headers.patch:
+  Use system linux header files rather than those in /usr/src/linux.
 
   04 Mar 2012; Anthony G. Basile <blueness@gentoo.org>
   ipsec-tools-0.8.0-r1.ebuild:
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 1127c1576a01..1daf0233b99d 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX ipsec-tools-def-psk.patch 907 RMD160 4a72e22ecbc821cc96b338004b6ebb5787018569 SHA1 61be2483534c3a3084120a2d9fa08f660b7301f6 SHA256 15da775a7da892b7e99f0a6e531bdb9f37cc9d81c004f8a439152445f960f656
 AUX ipsec-tools-duplicate-header.patch 440 RMD160 0a9f53ad68232b382388447c3c4aa7c81f5b6de1 SHA1 1d48f49fae5e7c5278d52a512e6b06998f24eacf SHA256 47d31a605a48fc7168cd579f62217316a12b153177bc6b16618d46c38e6936d1
 AUX ipsec-tools-include-vendoridh.patch 434 RMD160 cf30a122392ba179a7c6b0cd65f4c21d68d16266 SHA1 a0de513e850618caa2b5917b5d5b838360eaa200 SHA256 be0fd6ec217405a6f1ab97231568297e705d995d0f5fa8a6ebae896e1b2e910c
+AUX ipsec-tools-system-kernel-headers.patch 1732 RMD160 521555b745f061cc60073f96d3c5031301e24f64 SHA1 0ab4f8bd7eaaec6a54819bab7e1b3a574436799d SHA256 7c8f11b1297ea5657b3665ad7541543bdba91f6d2b1f13016628749895ba7496
 AUX racoon.conf.d 621 RMD160 773a21f70bd4786eb6758f052bb54cc40273c259 SHA1 1291dbe1639cbb72a161e3af727c9c65c6ae0132 SHA256 bc7cf9c0fe8bd5f99c9353aa3c19e3314b3da21a7a2138fc6e901375be21b109
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 AUX racoon.pam.d 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
@@ -12,13 +13,14 @@ DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5
 EBUILD ipsec-tools-0.7.3-r1.ebuild 5504 RMD160 c80cca70aec3efa13f87c3c66bec051cc581a6da SHA1 afd5f1d981ab75cb640aa3825b3c377a8403eefd SHA256 fb8f045eb7bde9e20eb9c634337e1b23caf64128ff84aa81af4faed2cdc16fed
 EBUILD ipsec-tools-0.7.3.ebuild 8375 RMD160 990aa70c71acc7f3c523aaa1abcfef4f8999e7c7 SHA1 f65d04115cce6277297953cfbac91ce89a3ce83b SHA256 fb7cd6ae897526e409bb9799c9594955577894f87cf79fef27fe8f673d4eaafd
 EBUILD ipsec-tools-0.8.0-r1.ebuild 6059 RMD160 8362f600f68800c907e177a5566e1356377c470f SHA1 1cc992a2e39073e89fae48278c36ada363d0d366 SHA256 b0908292a9bd960f988009ed9a7a9f3be073243838c7b4f3ea7715695e8b48fa
+EBUILD ipsec-tools-0.8.0-r2.ebuild 6115 RMD160 6a5dbfacc11d4314d23d7914b5df48f98ed0ee0b SHA1 87df6e0743d04f427e5c438a09aae443f7ff02d9 SHA256 1259f0731b7905106f9c2b8c0b54ba55fd4327db12fc9686b146b8650915d41b
 EBUILD ipsec-tools-0.8.0.ebuild 5039 RMD160 0844c4087ebf39eb2b95a5fcb7ee910b4cf1cc0d SHA1 e7a982d311f583a246ea3904f7d5f807347792ad SHA256 9f4374e05e08ef0c0c88951a63b9dab0ab2f2edc5b7675b5f4864654078936b6
-MISC ChangeLog 13794 RMD160 94d9c41db46100a0d8c5149268acf314f446dc10 SHA1 5f0185480c29b0386bd38609542803c028600911 SHA256 d0b356d1fd80a9ddf90ac751cb9698fa6ce17dca6aed214e23a1acc2fdbf1554
+MISC ChangeLog 14036 RMD160 cf14ebcdd619880cbfc5e6a2f6246e0bfec90494 SHA1 6f42db6e3ba1d23c3b6d278e62d13b128961c285 SHA256 579794adf62eeb7d640c117be6d4eaf5ae727255ac551923e3e56798a6ef8cb8
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk9Tsf0ACgkQl5yvQNBFVTXFMwCcDTLMuQiklW1D3yjv2TixxM2a
-H3MAnRVUfLVEStpfEL1bLa4g7+YpvEXT
-=A0S4
+iEYEAREIAAYFAk9VVoQACgkQl5yvQNBFVTWwSACeL8zz5Mz4UuMj2bpWk53FeYJx
+0U4AoJLeIQh++evqdkVEARGIGtq+Pkoy
+=97B5
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-system-kernel-headers.patch b/net-firewall/ipsec-tools/files/ipsec-tools-system-kernel-headers.patch
new file mode 100644
index 000000000000..91e7e6194e99
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-system-kernel-headers.patch
@@ -0,0 +1,34 @@
+From: Anthony G. Basile <blueness@gentoo.org>
+
+ipsec-tools tries to make use of the kernel headers in /usr/src/linux/include/linux.
+This is not a good idea because these are not the system exported linux header files.
+Unfortunately the configure.ac option which says where to look for these headers
+doesn't point to the directory itself, usually /usr/include/linux, but to its parent!
+
+Our solution then, although less than satifying, is to remove the --with-kernel-headers
+switch and hard code KERNEL_INCLUDE="/usr/include".
+
+diff -Naur ipsec-tools-0.8.0.orig/configure.ac ipsec-tools-0.8.0/configure.ac
+--- ipsec-tools-0.8.0.orig/configure.ac	2012-03-05 18:46:54.000000000 -0500
++++ ipsec-tools-0.8.0/configure.ac	2012-03-05 18:53:56.000000000 -0500
+@@ -66,18 +66,11 @@
+ 
+ case "$host_os" in
+  *linux*)
+-    AC_ARG_WITH(kernel-headers,
+-	AC_HELP_STRING([--with-kernel-headers=/lib/modules/<uname>/build/include],
+-		       [where your Linux Kernel headers are installed]),
+-	    [ KERNEL_INCLUDE="$with_kernel_headers" 
+-	      CONFIGURE_AMFLAGS="--with-kernel-headers=$with_kernel_headers"
+-	      AC_SUBST(CONFIGURE_AMFLAGS) ],
+-	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
+-
++    KERNEL_INCLUDE="/usr/include"
+     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
+ 	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
+ 	  KERNEL_INCLUDE=/usr/src/linux/include ,
+-	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
++	  [ AC_MSG_ERROR([Unable to find linux kernel headers. Aborting.]) ] ) ] )
+     AC_SUBST(KERNEL_INCLUDE)
+     # We need the configure script to run with correct kernel headers.
+     # However we don't want to point to kernel source tree in compile time,
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..dc5c9d59ef72
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r2.ebuild,v 1.1 2012/03/06 00:12:41 blueness Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic autotools linux-info pam
+
+DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"
+HOMEPAGE="http://ipsec-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rc5 idea kerberos stats ipv6 nat selinux readline pam hybrid ldap"
+
+RDEPEND="
+	kerberos? ( virtual/krb5 )
+	selinux? (
+		sys-libs/libselinux
+		sec-policy/selinux-ipsec-tools
+	)
+	readline? ( sys-libs/readline )
+	pam? ( sys-libs/pam )
+	ldap? ( net-nds/openldap )
+	dev-libs/openssl
+	virtual/libiconv"
+#	iconv? ( virtual/libiconv )
+#	radius? ( net-dialup/gnuradius )
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.30"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	get_version
+
+	if linux_config_exists && kernel_is -ge 2 6 19; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[1;33m"
+		ewarn
+		ewarn "Checking kernel configuration in /usr/src/linux or"
+		ewarn "or /proc/config.gz for compatibility with ${PN}."
+		ewarn
+		ewarn "WARNING: If your *configured* and *running* kernel"
+		ewarn "differ either now or in the future, then these checks"
+		ewarn "may lead to misleading results."
+
+		# Check options for all flavors of IPSec
+		local msg=""
+		for i in XFRM_USER NET_KEY; do
+			if ! linux_chkconfig_present ${i}; then
+				msg="${msg} ${i}"
+			fi
+		done
+		if [[ ! -z "$msg" ]]; then
+			ewarn
+			ewarn "ALL IPSec may fail. CHECK:"
+			ewarn "${msg}"
+		fi
+
+		# Check unencrypted IPSec
+		if ! linux_chkconfig_present CRYPTO_NULL; then
+			ewarn
+			ewarn "Unencrypted IPSec may fail. CHECK:"
+			ewarn " CRYPTO_NULL"
+		fi
+
+		# Check IPv4 IPSec
+		msg=""
+		for i in \
+			INET_IPCOMP INET_AH INET_ESP \
+			INET_XFRM_MODE_TRANSPORT \
+			INET_XFRM_MODE_TUNNEL \
+			INET_XFRM_MODE_BEET
+		do
+			if ! linux_chkconfig_present ${i}; then
+				msg="${msg} ${i}"
+			fi
+		done
+		if [[ ! -z "$msg" ]]; then
+			ewarn
+			ewarn "IPv4 IPSec may fail. CHECK:"
+			ewarn "${msg}"
+		fi
+
+		# Check IPv6 IPSec
+		if use ipv6; then
+			msg=""
+			for i in INET6_IPCOMP INET6_AH INET6_ESP \
+				INET6_XFRM_MODE_TRANSPORT \
+				INET6_XFRM_MODE_TUNNEL \
+				INET6_XFRM_MODE_BEET
+			do
+				if ! linux_chkconfig_present ${i}; then
+					msg="${msg} ${i}"
+				fi
+			done
+			if [[ ! -z "$msg" ]]; then
+				ewarn
+				ewarn "IPv6 IPSec may fail. CHECK:"
+				ewarn "${msg}"
+			fi
+		fi
+
+		# Check IPSec behind NAT
+		if use nat; then
+			if ! linux_chkconfig_present NETFILTER_XT_MATCH_POLICY; then
+				ewarn
+				ewarn "IPSec behind NAT may fail.  CHECK:"
+				ewarn " NETFILTER_XT_MATCH_POLICY"
+			fi
+		fi
+
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[1;33m"
+		ewarn
+	else
+		eerror
+		eerror "\033[1;31m**************************************************\033[1;31m"
+		eerror "Make sure that your *running* kernel is/will be >=2.6.19."
+		eerror "Building ${PN} now, assuming that you know what you're doing."
+		eerror "\033[1;31m**************************************************\033[1;31m"
+		eerror
+	fi
+}
+
+src_prepare() {
+	# fix for bug #76741
+	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c || die
+	# fix for bug #124813
+	sed -i 's:-Werror::g' "${S}"/configure.ac || die
+	# fix for building with gcc-4.6
+	sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die
+
+	epatch "${FILESDIR}/${PN}-def-psk.patch"
+	epatch "${FILESDIR}/${PN}-include-vendoridh.patch"
+	epatch "${FILESDIR}/${PN}-system-kernel-headers.patch"
+
+	AT_M4DIR="${S}" eautoreconf
+	epunt_cxx
+}
+
+src_configure() {
+	# fix for bug #61025
+	filter-flags -march=c3
+
+	local myconf
+	myconf="--with-kernel-headers=/usr/include \
+			--enable-adminport \
+			--enable-frag \
+			--enable-dpd \
+			--enable-dependency-tracking \
+			$(use_enable rc5) \
+			$(use_enable idea) \
+			$(use_enable kerberos gssapi) \
+			$(use_enable stats) \
+			$(use_enable ipv6) \
+			$(use_enable nat natt) \
+			$(use_enable selinux security-context) \
+			$(use_with readline) \
+			$(use_with pam libpam) \
+			$(use_with ldap libldap)"
+
+	use nat && myconf="${myconf} --enable-natt-versions=yes"
+
+	# enable mode-cfg and xauth support
+	if use pam; then
+		myconf="${myconf} --enable-hybrid"
+	else
+		myconf="${myconf} $(use_enable hybrid)"
+	fi
+
+	# dev-libs/libiconv is hard masked
+	#use iconv && myconf="${myconf} $(use_with iconv libiconv)"
+
+	# the default (/usr/include/openssl/) is OK for Gentoo, leave it
+	# myconf="${myconf} $(use_with ssl openssl )"
+
+	# No way to get it compiling with freeradius or gnuradius
+	# We would need libradius which only exists on FreeBSD
+
+	# See bug #77369
+	#myconf="${myconf} --enable-samode-unspec"
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/racoon
+	newconfd "${FILESDIR}"/racoon.conf.d racoon
+	newinitd "${FILESDIR}"/racoon.init.d racoon
+	use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
+
+	dodoc ChangeLog README NEWS
+	dodoc -r src/racoon/samples
+	dodoc -r src/racoon/doc
+
+	docinto setkey
+	dodoc src/setkey/sample.cf
+
+	dodir /etc/racoon
+}
+
+pkg_postinst() {
+	if use nat; then
+		elog
+		elog "You have enabled the nat traversal functionnality."
+		elog "Nat versions wich are enabled by default are 00,02,rfc"
+		elog "you can find those drafts in the CVS repository:"
+		elog "cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co ipsec-tools"
+		elog
+		elog "If you feel brave enough and you know what you are"
+		elog "doing, you can consider emerging this ebuild with"
+		elog "EXTRA_ECONF=\"--enable-natt-versions=08,07,06\""
+		elog
+	fi
+
+	if use ldap; then
+		elog
+		elog "You have enabled ldap support with {$PN}."
+		elog "The man page does NOT contain any information on it yet."
+		elog "Consider using a more recent version or CVS."
+		elog
+	fi
+
+	elog
+	elog "Please have a look in /usr/share/doc/${P} and visit"
+	elog "http://www.netbsd.org/Documentation/network/ipsec/"
+	elog "to find more information on how to configure this tool."
+	elog
+}