diff options
Diffstat (limited to 'net-firewall/ipsec-tools')
| -rw-r--r-- | net-firewall/ipsec-tools/ChangeLog | 9 | ||||
| -rw-r--r-- | net-firewall/ipsec-tools/Manifest | 12 | ||||
| -rw-r--r-- | net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch | 25 | ||||
| -rw-r--r-- | net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch | 11 | ||||
| -rw-r--r-- | net-firewall/ipsec-tools/files/racoon.pam.d | 4 | ||||
| -rw-r--r-- | net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild | 181 |
6 files changed, 237 insertions, 5 deletions
diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog index df55fd0b8f24..d62a9a5d59ad 100644 --- a/net-firewall/ipsec-tools/ChangeLog +++ b/net-firewall/ipsec-tools/ChangeLog @@ -1,6 +1,13 @@ # 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.81 2012/02/09 20:47:18 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.82 2012/02/28 22:55:18 blueness Exp $ + +*ipsec-tools-0.8.0-r1 (28 Feb 2012) + + 28 Feb 2012; Anthony G. Basile <blueness@gentoo.org> + +ipsec-tools-0.8.0-r1.ebuild, +files/ipsec-tools-def-psk.patch, + +files/ipsec-tools-include-vendoridh.patch, +files/racoon.pam.d: + Address bugs #210826 and #403509 *ipsec-tools-0.8.0 (09 Feb 2012) diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest index 87f0d883616e..604524157320 100644 --- a/net-firewall/ipsec-tools/Manifest +++ b/net-firewall/ipsec-tools/Manifest @@ -1,20 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- 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 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 DIST ipsec-tools-0.7.3.tar.bz2 776096 RMD160 e0ff32f0daa845934ac868ad5f36d58b25919c30 SHA1 19dc160643547a0bfabf0fe0ad1a181d3c28f410 SHA256 e6131d010b71d984194eb28267e6c01b49784a17a077bbafae58063f10b33b67 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717 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 5070 RMD160 d9de651677a6e1a0a38482453807cf6a88a346fc SHA1 f03c16d86638a8857fdc722185b5159f0d2b6c87 SHA256 e772ef3628b33b6772a8f7892bc285832bb8d44239b1dd6c74c8dba1d0a6d962 EBUILD ipsec-tools-0.8.0.ebuild 5039 RMD160 0844c4087ebf39eb2b95a5fcb7ee910b4cf1cc0d SHA1 e7a982d311f583a246ea3904f7d5f807347792ad SHA256 9f4374e05e08ef0c0c88951a63b9dab0ab2f2edc5b7675b5f4864654078936b6 -MISC ChangeLog 13257 RMD160 87bea2416929e105cfc7c035c25a75c879b634d4 SHA1 95d3076ac3fc8471d5739f7a7830bb8cd30d4e89 SHA256 8dd6ed9b01a5d111474dd6069b3d7f2f5f39e522e655c7d3596a8fb9088908a9 +MISC ChangeLog 13518 RMD160 bd3fc980655b5e57893de06bdb6dd1b7e3f78205 SHA1 91fd6a84fd08d7d959b29920afa6db25bf32dcce SHA256 def8d173fc88207504a271ac3f600e772712068e201d36a66f3bee46a5d911d5 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk80MOAACgkQl5yvQNBFVTURPgCgiAkRmBF5kUsjuM2eZio7tBs6 -uMAAn1lk3mkHymUDDtL75LCroM0H8uIO -=iNra +iEYEAREIAAYFAk9NW2AACgkQl5yvQNBFVTVuPQCgp3WazoWgQgkb1HWsIbVWNOb8 +NawAnRd0XuR1J93uUZoaOj4T21NhzlLP +=Un6t -----END PGP SIGNATURE----- diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch b/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch new file mode 100644 index 000000000000..f351860a84e9 --- /dev/null +++ b/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch @@ -0,0 +1,25 @@ +diff -brau ipsec-tools-0.7.3.o/src/racoon/oakley.c ipsec-tools-0.7.3/src/racoon/oakley.c +--- ipsec-tools-0.7.3.o/src/racoon/oakley.c 2009-08-13 11:18:45.000000000 +0200 ++++ ipsec-tools-0.7.3/src/racoon/oakley.c 2011-06-06 09:36:11.000000000 +0200 +@@ -2498,8 +2498,21 @@ + plog(LLV_ERROR, LOCATION, iph1->remote, + "couldn't find the pskey for %s.\n", + saddrwop2str(iph1->remote)); ++ } ++ } ++ if (iph1->authstr == NULL) { ++ /* ++ * If we could not locate a psk above try and locate ++ * the default psk, ie, "*". ++ */ ++ iph1->authstr = privsep_getpsk("*", 1); ++ if (iph1->authstr == NULL) { ++ plog(LLV_ERROR, LOCATION, iph1->remote, ++ "couldn't find the the default pskey either.\n"); + goto end; + } ++ plog(LLV_NOTIFY, LOCATION, iph1->remote, ++ "Using default PSK.\n"); + } + plog(LLV_DEBUG, LOCATION, NULL, "the psk found.\n"); + /* should be secret PSK */ diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch b/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch new file mode 100644 index 000000000000..2e22c82db478 --- /dev/null +++ b/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch @@ -0,0 +1,11 @@ +diff -Naur ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c ipsec-tools-0.8.0/src/racoon/ipsec_doi.c +--- ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c 2012-02-28 13:42:24.000000000 -0500 ++++ ipsec-tools-0.8.0/src/racoon/ipsec_doi.c 2012-02-28 13:41:22.000000000 -0500 +@@ -87,6 +87,7 @@ + #ifdef HAVE_GSSAPI + #include <iconv.h> + #include "gssapi.h" ++#include "vendorid.h" + #ifdef HAVE_ICONV_2ND_CONST + #define __iconv_const const + #else diff --git a/net-firewall/ipsec-tools/files/racoon.pam.d b/net-firewall/ipsec-tools/files/racoon.pam.d new file mode 100644 index 000000000000..b801aaafa0f9 --- /dev/null +++ b/net-firewall/ipsec-tools/files/racoon.pam.d @@ -0,0 +1,4 @@ +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild new file mode 100644 index 000000000000..13177e70e62c --- /dev/null +++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild @@ -0,0 +1,181 @@ +# 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-r1.ebuild,v 1.1 2012/02/28 22:55:18 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() { + get_version + if kernel_is -ge 2 6 19 ; then + einfo "Checking for suitable kernel configuration (Networking | Networking support | Networking options)" + + if use nat; then + CONFIG_CHECK="${CONFIG_CHECK} ~NETFILTER_XT_MATCH_POLICY" + export WARNING_NETFILTER_XT_MATCH_POLICY="NAT support may fail weirdly unless you enable this option in your kernel" + fi + + for i in XFRM_USER NET_KEY; do + CONFIG_CHECK="${CONFIG_CHECK} ~${i}" + eval "export WARNING_${i}='No tunnels will be available at all'" + done + + for i in INET_IPCOMP INET_AH INET_ESP \ + INET_XFRM_MODE_TRANSPORT \ + INET_XFRM_MODE_TUNNEL \ + INET_XFRM_MODE_BEET ; do + CONFIG_CHECK="${CONFIG_CHECK} ~${i}" + eval "export WARNING_${i}='IPv4 tunnels will not be available'" + done + + for i in INET6_IPCOMP INET6_AH INET6_ESP \ + INET6_XFRM_MODE_TRANSPORT \ + INET6_XFRM_MODE_TUNNEL \ + INET6_XFRM_MODE_BEET ; do + CONFIG_CHECK="${CONFIG_CHECK} ~${i}" + eval "export WARNING_${i}='IPv6 tunnels will not be available'" + done + + CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_NULL" + export WARNING_CRYPTO_NULL="Unencrypted tunnels will not be available" + export CONFIG_CHECK + + check_extra_config + else + eerror "You must have a kernel >=2.6.19 to run ipsec-tools." + eerror "Building now, assuming that you will run on a different kernel" + 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" + + 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 + 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 +} |