Version bump

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 300 insertions, 6 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index 4d2e9283b53f..5091edd02c14 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.105 2012/09/28 00:45:26 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.106 2013/03/16 00:52:11 blueness Exp $
+
+*ipsec-tools-0.8.1 (16 Mar 2013)
+
+  16 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  +ipsec-tools-0.8.1.ebuild:
+  Version bump
 
 *ipsec-tools-0.8.0-r5 (28 Sep 2012)
 
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 8e751f5734c8..a2691b160423 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -15,15 +15,27 @@ AUX racoon.init.d-r1 1232 SHA256 d31ca0615464fbc8a3a2a6c6b308ab937e795ca6a1ca7d1
 AUX racoon.init.d-r2 1279 SHA256 d9038da4f5c969a7da450d6d7a566fd77c4471ff0a1ceb2f176f0c9015d1eda8 SHA512 1a5337c74285b54c21b4d3d216f0a3756a3e2d6ea31028b56782c7a635ffac8142d61074fa0927df6dd1034e15234d3a4eda192c94e8cd5f510520e36bcf81a6 WHIRLPOOL f7219e0306b2d9e6311cd12ea06d560e1bf937ce409e44d7bf5a6e77325e4e6357b138fd709ca7972696a4669f1c6e6d72273250c84462ebf6b9e8c979aea330
 AUX racoon.pam.d 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b
 DIST ipsec-tools-0.8.0.tar.bz2 809297 SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717 SHA512 3bec6bab4fe555612f1d48966e797202830f5254a8d2146a14d268ff0c68445af790285214db41ab08ee4888625e8e680c3b848c30789d836169d1612a25fe2c WHIRLPOOL 862d2bbf78aca8c9e01e00c995aeb3b662e1ea4a769081b9880a3fee7821ef5968e10fe75d9671268979188c7ca3b91d507a1fc9a097729d0648bc4c965e675d
+DIST ipsec-tools-0.8.1.tar.bz2 860717 SHA256 fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4 SHA512 c8308aba9764a8e0a0507dbc62e8e93dc4b51f7215f2c3bb50f2e7e1f46dde0c773cfe2992660ccd319523775a9bab668371ee53cd4af153d2fcf13a0ef4e1eb WHIRLPOOL b3e8743174f7a05ca028f47f5faa66286e397a50c68e7724568b89e5fd2eea76a903c3e77a144e772f913fd51a253466b93e10690125a87d643f186a9689476c
 EBUILD ipsec-tools-0.8.0-r3.ebuild 6005 SHA256 2902daa99324e62e987b53ba7b3569d41d0a285da9d6c0fdf33a7962deb38452 SHA512 3b50e876a2067c514046e05b9414c5175f0b746e9bf2c0bacb2fa935e85246131d3a2ed289f0eff71f3f0aa1bf642c01929c348feb27b7e21458391440162d4d WHIRLPOOL 8b8ccd178359d6e7dd22618bf6b6b4d812213eacc3b4064abcf76eb83a91256f24bb7d55cd716062b17b790f29352392f3fd34279c8296d63a6c52a30787f8b3
 EBUILD ipsec-tools-0.8.0-r4.ebuild 6058 SHA256 8d2a487e694546399215337927bb280203bbf55f669b8d5d2fed8a29556f9544 SHA512 60a6185526afab73d90d964063f27de71e0d047811cdfa25d5bb29c10588f3dec1a5ada5e4fbff35d20d73f8206bf7dd39a589f47a015db395013e3151ca2ce0 WHIRLPOOL 38c78828d2c8ca20e761bfb2bfa8378c0457bef2ab5a5ef400a8bf842a6ea56576f3c6a85a8c14953fcc610383651f7469bc09c869e5597e66025c3d8189382f
 EBUILD ipsec-tools-0.8.0-r5.ebuild 7684 SHA256 789d3616d733f2773c4f4bed503f3301aaaee6e6c6a4936fb3274f328cd17069 SHA512 ec5472f25bfd10091333c0f9b56f9d96a1dd1b32e62932603ff7cbec9886ac27c4c8f54c0d239bb31fad46a86a8c72805685318790d16d054a35d2ba0f457472 WHIRLPOOL 8ed5f74fec61354701557d4a6ca8b70e0200e4c76cf26d7c8ec592e8dce9fe739ae7fe0c5a31215267b55d1db10953b4be9b7b1af3f2489a50f3d0d2e77b6383
-MISC ChangeLog 17018 SHA256 ecc71d1cc083cd772735d6f3ffc7a5773c754577d36e131a17d62325faa2b43e SHA512 27b5115cad4bd36a83288e5b3f36e34df4ea3c792b5e13d5478105a37796287f1c6e51eaa1fceda64f6204f51606928f9656f495c118f88cc89a7582aec19798 WHIRLPOOL 1307d4665ec9997ec5efd0cafe31bdaf2cbea495f0f8fd29050c0c7b9aa1c970da9a34342eabc59fcdb4f8498f037c4694cfe6f155b988119c40b69b23699fa7
+EBUILD ipsec-tools-0.8.1.ebuild 7691 SHA256 c956d428d12796a04fcc480fc5470eb1e42546f65ac27df49247f5a8d5b04598 SHA512 eac34f3e4bfba375dfd937aaa7838c0d4cd97f0954b37e94aab8d9f997fc332ed64a869c271c8016c7fc9a0f232be47c862fe38535e5eabc41f69e8c9da3c54f WHIRLPOOL 41b4113454043577d71479eb3ed4f6fe3b38191de3b97e13e673647780eb3b19e80f0250dcb1f399b458a01e5d2ed5abb0cebb24c6589c4d42836e3ff5f885f9
+MISC ChangeLog 17152 SHA256 96ac5ef365956508abd63cbda3a4beb777bf0cd607dd02e7226569b6ba2bbad9 SHA512 a36898597912cdee45cd6f439b88a1a9f49d87b28d7a0ef03b73e91f90e9362e575a8863693c35ee84557893dbfcf10f3f35ad758331b58f3b4f0ad03e8e3bdc WHIRLPOOL 8d10da0d312a9dffe6dc0c9ea503afeba2f4a70db338a67990baed79214f470bbac56283be958a88e637cdf409390213ce29b6394ea5e1809ee93a08e865b30e
 MISC metadata.xml 537 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40 SHA512 9b26b2cd54e00527201339c3936ac717c57fe596e470d84e0dc0715f778b5797488b6cac61dea83bab61714a23a88e44dbd537bfeeb2b37d285653dcb838fab5 WHIRLPOOL a0dd0b61f957875ca3c50db5aa66470ed493be9c4f002bd165d75b41a8ca51cbcfd2567b4702bf1845b8e0a1ca54239e6ed163098d8b613d1f9f459192acc14e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBk8vsACgkQl5yvQNBFVTXjnwCffu+hlTPyDPoL4BfMpHRib9Lo
-4a4AmQF2G04cQqs0bypR+aejLa7L9mOR
-=+WA4
+iQIcBAEBCAAGBQJRQ8IrAAoJEJOE+m71LUu6L64QALLmqZ985oj2YxYsA7LSN/Fx
+69pgEpdyiY9q3UdC+/6AwcfhF/YsnQ7yrgP6mJdvProK+yRPaLgfNZHPxV3xk7oc
+0D/jxGHA1JeZnG9rlhuuyxRPp1EF5MPmHjsqJSaU+NPAZZhCVSpu1IBAT2xRs/Us
+MNGuEq5TEglxwQm/u2fVOqAcbTHq5Id/uZ6JaYsFm0sTez07ru8eo2v/EnndZOcV
+kOGwiCq46AinNK7G4MZkd4b8NXOug5l2GakyLLpDd+FaYgTWdBkQnqWgOf2MTYgI
+WnqK4T7Vmr+qu/o6iMAdAb+vlhPFDc8yL7Z4z6Pfe8wbBDKfY+DNxx6LDARjsFGq
+qG7u2u2xFl92awmLtWSLSUs1W9WHvUX5/CBk6+eEQkuB8Nr1u/2oERf+E12NI5E2
+nSpf4kzfv7oyl+22Sn5w3adD8aySuv0vw7nR/Tc1LS5Do+zL7q6n2gQSLZDWp5K6
++/vlKkeA3VRnRPSnWLBXme55QVmt26/HSEKUhjP17OVZzcdIFrj249ldH9uko1cu
+dkyCphNKGLwSB0A2vQOOvE0VEO1WQge5hM66UceGINgKWFYUgZ1/rrAbRePflDrX
+oS9ea552qzaRLfF3dJxWtl3svXF19gTtkYZOhk8sGgfGR9oSqy4uriuz6VGk/J/M
+wGThtwV8/skVTOfrGBjQ
+=1k40
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild
new file mode 100644
index 000000000000..48a4f78b6a21
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2013 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.1.ebuild,v 1.1 2013/03/16 00:52:11 blueness Exp $
+
+EAPI="5"
+
+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 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+
+RDEPEND="
+	dev-libs/openssl
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( sys-libs/pam )
+	readline? ( sys-libs/readline )
+	selinux? (
+		sys-libs/libselinux
+		sec-policy/selinux-ipsec
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.30"
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.8.0-r5" ; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+		if ! has_version "net-misc/strongswan" ; then
+			ewarn "We found an earlier version of ${PN} installed."
+			ewarn "As of ${PN}-0.8.0-r5, the old configuration file,"
+			ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid"
+			ewarn "a conflict with net-misc/strongswan; bug #436144.  We will"
+			ewarn "rename this file for you with this upgrade.  However, if"
+			ewarn "you later downgrade, you'll have to rename the file to"
+			ewarn "its orignal manually or change /etc/conf.d/racoon to point"
+			ewarn "to the new file."
+
+			if [[ -f /etc/ipsec.conf && ! -f /etc/ipsec-tools.conf ]] ; then
+				mv /etc/ipsec.conf /etc/ipsec-tools.conf
+			else
+				ewarn
+				ewarn "Oops!  I can't move ipsec.conf to ipsec-tools.conf!"
+				ewarn "Either the former doesn't exist or the later does and"
+				ewarn "I won't clobber it.  Please fix this situation manually."
+			fi
+		else
+			ewarn "You had both an earlier version of ${PN} and"
+			ewarn "net-misc/strongswan installed.  I can't tell whether"
+			ewarn "the configuration file, ipsec.conf, belongs to one"
+			ewarn "package or the other due to a file conflict; bug #436144."
+			ewarn "The current version of ${PN} uses ipsec-tools.conf"
+			ewarn "as its configuration file, as will future versions."
+			ewarn "Please fix this situation manually."
+		fi
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+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[00m"
+		ewarn
+		ewarn "Checking kernel configuration in /usr/src/linux or"
+		ewarn "or /proc/config.gz for compatibility with ${PN}."
+		ewarn "Here are the potential problems:"
+		ewarn
+
+		local nothing="1"
+
+		# 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
+			nothing="0"
+			ewarn
+			ewarn "ALL IPSec may fail. CHECK:"
+			ewarn "${msg}"
+		fi
+
+		# Check unencrypted IPSec
+		if ! linux_chkconfig_present CRYPTO_NULL; then
+			nothing="0"
+			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
+			nothing="0"
+			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
+			nothing="0"
+				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
+				nothing="0"
+				ewarn
+				ewarn "IPSec behind NAT may fail.  CHECK:"
+				ewarn " NETFILTER_XT_MATCH_POLICY"
+			fi
+		fi
+
+		if [[ $nothing == "1" ]]; then
+			ewarn "NO PROBLEMS FOUND"
+		fi
+
+		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."
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	else
+		eerror
+		eerror "\033[1;31m**************************************************\033[00m"
+		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[00m"
+		eerror
+	fi
+}
+
+src_prepare() {
+	# 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}-0.8.0-sysctl.patch #425770
+
+	AT_M4DIR="${S}" eautoreconf
+	epunt_cxx
+}
+
+src_configure() {
+	#--with-{libiconv,libradius} lead to "Broken getaddrinfo()"
+	#--enable-samode-unspec is not supported in linux
+	local myconf
+	myconf="--with-kernel-headers=/usr/include \
+			--enable-adminport \
+			--enable-dependency-tracking \
+			--enable-dpd \
+			--enable-frag \
+			--without-libiconv \
+			--without-libradius \
+			--disable-samode-unspec \
+			$(use_enable idea) \
+			$(use_enable ipv6) \
+			$(use_enable kerberos gssapi) \
+			$(use_with ldap libldap) \
+			$(use_enable nat natt) \
+			$(use_with pam libpam) \
+			$(use_enable rc5) \
+			$(use_with readline) \
+			$(use_enable selinux security-context) \
+			$(use_enable stats)"
+
+	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
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/racoon
+	newconfd "${FILESDIR}"/racoon.conf.d-r1 racoon
+	newinitd "${FILESDIR}"/racoon.init.d-r2 racoon
+	use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
+
+	insinto /etc
+	doins "${FILESDIR}"/ipsec-tools.conf
+	insinto /etc/racoon
+	doins "${FILESDIR}"/racoon.conf
+	doins "${FILESDIR}"/psk.txt
+	chmod 400 "${D}"/etc/racoon/psk.txt
+
+	dodoc ChangeLog README NEWS
+	dodoc -r src/racoon/samples
+	dodoc -r src/racoon/doc
+	docinto samples
+	mv ipsec.conf ipsec-tools.conf
+	newdoc src/setkey/sample.cf ipsec-tools.conf
+}
+
+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
+}