From: Lars Weiler Date: Sat, 20 Jan 2007 00:20:39 +0000 (+0000) Subject: Version bump (currently masked due to compile problems on a stable system) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ef7f74dbaa365f5dd275b4a612c014986b9d540;p=gentoo.git Version bump (currently masked due to compile problems on a stable system) and a patch for newer linux-headers; bug #162811. Package-Manager: portage-2.1.2-r1 --- diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog index bbf439bc2fde..fbd9e3d00871 100644 --- a/net-misc/strongswan/ChangeLog +++ b/net-misc/strongswan/ChangeLog @@ -1,6 +1,14 @@ # 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.48 2007/01/18 19:25:04 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.49 2007/01/20 00:20:38 pylon Exp $ + +*strongswan-2.8.1 (20 Jan 2007) + + 20 Jan 2007; Lars Weiler + +files/linux-headers-2.6.18.patch, files/ipsec-path.patch.bz2, + strongswan-2.8.0.ebuild, +strongswan-2.8.1.ebuild: + Version bump (currently masked due to compile problems on a stable system) + and a patch for newer linux-headers; bug #162811. 18 Jan 2007; Raúl Porcel strongswan-2.8.0.ebuild: x86 stable wrt bug 162649 diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest index cb5562974d42..81fee84d1209 100644 --- a/net-misc/strongswan/Manifest +++ b/net-misc/strongswan/Manifest @@ -2,10 +2,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.patch.bz2 28918 RMD160 4b1685876802d6efc581d792db0d38869a824667 SHA1 e3ab6b6b4ab723200b6fc4f9d916652f559aa0b9 SHA256 92a66133ebf8fe50fc12614c1a405c19e2119c43c1e4878ae6ef16e7bc74e9fa -MD5 a0f14005505a4adc96221ffbd31ba57c files/ipsec-path.patch.bz2 28918 -RMD160 4b1685876802d6efc581d792db0d38869a824667 files/ipsec-path.patch.bz2 28918 -SHA256 92a66133ebf8fe50fc12614c1a405c19e2119c43c1e4878ae6ef16e7bc74e9fa files/ipsec-path.patch.bz2 28918 +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 @@ -17,6 +21,7 @@ SHA256 926e9d664c195c003d4038a2f289d6ec54f19c2c4147d13bd902d3b0fa8ce9e1 files/st DIST strongswan-2.5.7.tar.bz2 2458893 RMD160 e2c8f799c1ef68cdd0327c415efb6ced0bc48d0e SHA1 f829310a51f4d35f95a5d25353c544acfe4c7d91 SHA256 8195ce5c5576ba63fec4e12f23fa4f91cc90e4ca35b004b1a59bc272949b64bb DIST strongswan-2.6.2.tar.bz2 2634571 RMD160 600aa3c523f9db432441f7c9c4c4898a6b89edb4 SHA1 2c964e9b3d5f4189da215fc3eb61e0f28cef4d60 SHA256 713fbd4bebecf9e4293251aa8b1b2f0bd308f698633b0fc727b7570135434385 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.5.7.ebuild 3713 RMD160 f525690169e29ae6d681363ec42cf9dd57b02937 SHA1 c06dda74efa5b628b368416c72a37716b5f256df SHA256 1f4ce8ffc8bc6a7cdf2bf7e4f314800cdd1607099bd23fefd33d0ce0ff99b353 MD5 e97bed99891047b86ce76be2101a4849 strongswan-2.5.7.ebuild 3713 RMD160 f525690169e29ae6d681363ec42cf9dd57b02937 strongswan-2.5.7.ebuild 3713 @@ -25,14 +30,18 @@ EBUILD strongswan-2.6.2.ebuild 3781 RMD160 558be3e7c0cb4013c09abcd4176a113743ff6 MD5 1b405815ac0e7b4aa894ff6b1ca04ef7 strongswan-2.6.2.ebuild 3781 RMD160 558be3e7c0cb4013c09abcd4176a113743ff6a64 strongswan-2.6.2.ebuild 3781 SHA256 de1182eea9f6799f1253ef14383fa9252784d575a52fb2d88ab12d6106dc1810 strongswan-2.6.2.ebuild 3781 -EBUILD strongswan-2.8.0.ebuild 3744 RMD160 3a549153e1db64f240bc36b85d035a3f433c3b7b SHA1 08d2b0f0e318b2fd7a063267dc4d73977754c3a2 SHA256 b78a4239aa1213bfb1d89a91c89e56cdf7a7b9b3179c818f78c65f60464110cc -MD5 53657c7e36edd0d629fab107c6d4128b strongswan-2.8.0.ebuild 3744 -RMD160 3a549153e1db64f240bc36b85d035a3f433c3b7b strongswan-2.8.0.ebuild 3744 -SHA256 b78a4239aa1213bfb1d89a91c89e56cdf7a7b9b3179c818f78c65f60464110cc strongswan-2.8.0.ebuild 3744 -MISC ChangeLog 7980 RMD160 3a9192adff8ace2ea410458a49c6e7f2e790e27b SHA1 824ad14e92d575321d8e05bc37a720ab81e87d18 SHA256 f4efb000bbd0a0d5c975d5f2465389ca3e2ba7e4d63b0da65892a3db9ece386d -MD5 70234ec2a15868fdb5270c852d5b6b0c ChangeLog 7980 -RMD160 3a9192adff8ace2ea410458a49c6e7f2e790e27b ChangeLog 7980 -SHA256 f4efb000bbd0a0d5c975d5f2465389ca3e2ba7e4d63b0da65892a3db9ece386d ChangeLog 7980 +EBUILD strongswan-2.8.0.ebuild 3918 RMD160 e64aa5f9e6a4ba8964fec3ee2cf48ef53ad75b4d SHA1 1673e64fbf2a633b34e8a80943062f0ee48a86db SHA256 ac0d01c35c0a01e8920e20c962456ef1c8ea44eea50992627b5abc4390302f6e +MD5 2ac1e4a40b1602b4b55290528cf399ff strongswan-2.8.0.ebuild 3918 +RMD160 e64aa5f9e6a4ba8964fec3ee2cf48ef53ad75b4d strongswan-2.8.0.ebuild 3918 +SHA256 ac0d01c35c0a01e8920e20c962456ef1c8ea44eea50992627b5abc4390302f6e strongswan-2.8.0.ebuild 3918 +EBUILD strongswan-2.8.1.ebuild 4115 RMD160 4def5d2c7615252c98c2dec513e551d4ed4331ee SHA1 dc4cecc9c5917ed1fd5cb6d566509051e4872cd8 SHA256 1d0839ed79dc8c0cd68732398e5b6b92af05bd9cf100a62a910491e4d4d67e05 +MD5 937c3b6d09df0e00d8ecf437d16db82e strongswan-2.8.1.ebuild 4115 +RMD160 4def5d2c7615252c98c2dec513e551d4ed4331ee strongswan-2.8.1.ebuild 4115 +SHA256 1d0839ed79dc8c0cd68732398e5b6b92af05bd9cf100a62a910491e4d4d67e05 strongswan-2.8.1.ebuild 4115 +MISC ChangeLog 8305 RMD160 d9630c70b14b614430723ee963b60497beea0eab SHA1 22fc84beef16b3a77e6ac494ba8466e1afd1f2c4 SHA256 d751cdb70d81c4badc83013ad7dc9a2ca0b620f0b04ddeee63304a4f6045b71f +MD5 95dda85cdf51fb0e9a93838a98b036dc ChangeLog 8305 +RMD160 d9630c70b14b614430723ee963b60497beea0eab ChangeLog 8305 +SHA256 d751cdb70d81c4badc83013ad7dc9a2ca0b620f0b04ddeee63304a4f6045b71f ChangeLog 8305 MISC metadata.xml 769 RMD160 5835c33c35419648b3beceb29f4917d6dca6669b SHA1 310dfe0d59c860abdbc05803edcd653b616f6335 SHA256 37ed72207b9c20d6bb80690c6dd4935bdc4c79f69f7530700c90e18f7c5e7cb9 MD5 73e8a4ac5eb27655e494f6fcbbeeb5f7 metadata.xml 769 RMD160 5835c33c35419648b3beceb29f4917d6dca6669b metadata.xml 769 @@ -46,3 +55,6 @@ SHA256 4b58d838783aa458b7b08d5121e73b62a0d8e6b8ea58b72c6b1e6ccb5d8543c9 files/di 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 diff --git a/net-misc/strongswan/files/digest-strongswan-2.8.1 b/net-misc/strongswan/files/digest-strongswan-2.8.1 new file mode 100644 index 000000000000..e7f86b493b7b --- /dev/null +++ b/net-misc/strongswan/files/digest-strongswan-2.8.1 @@ -0,0 +1,3 @@ +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/ipsec-path.patch.bz2 b/net-misc/strongswan/files/ipsec-path.patch.bz2 index 755071de96dc..364f4bb7f9ba 100644 Binary files a/net-misc/strongswan/files/ipsec-path.patch.bz2 and b/net-misc/strongswan/files/ipsec-path.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 new file mode 100644 index 000000000000..2676160449d2 --- /dev/null +++ b/net-misc/strongswan/files/linux-headers-2.6.18.patch @@ -0,0 +1,11 @@ +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 + #include + #include +-#include ++#include + #include + #include diff --git a/net-misc/strongswan/strongswan-2.8.0.ebuild b/net-misc/strongswan/strongswan-2.8.0.ebuild index 6ca1a2ec9291..b02bbc031cf0 100644 --- 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.6 2007/01/18 19:25:04 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.7 2007/01/20 00:20:38 pylon Exp $ inherit eutils linux-info @@ -55,6 +55,11 @@ 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 @@ -67,11 +72,13 @@ src_unpack() { eend $? fi - if use smartcard ; then + if use smartcard ; then ebegin "Smartcard support requested. Enabling opensc support" sed -i -e 's:\(USE_SMARTCARD?=\)false:\1true:g' Makefile.inc || die - sed -i -e 's:\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/pkcs11/opensc-pkcs11.so\\\"\):#\1:g' Makefile.inc || die - sed -i -e 's:#\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/opensc-pkcs11.so\\\"\):\1:g' Makefile.inc || die + sed -i -e 's:\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/pkcs11/opensc-pkcs11.so\\\"\):#\1:g' \ + Makefile.inc || die + sed -i -e 's:#\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/opensc-pkcs11.so\\\"\):\1:g' \ + Makefile.inc || die eend $? fi diff --git a/net-misc/strongswan/strongswan-2.8.1.ebuild b/net-misc/strongswan/strongswan-2.8.1.ebuild new file mode 100644 index 000000000000..214b2303f0fc --- /dev/null +++ b/net-misc/strongswan/strongswan-2.8.1.ebuild @@ -0,0 +1,145 @@ +# 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.1 2007/01/20 00:20:38 pylon Exp $ + +inherit eutils linux-info + +DESCRIPTION="IPsec-based VPN Solution for Linux" +HOMEPAGE="http://www.strongswan.org/" +SRC_URI="http://download.strongswan.org/${P}.tar.bz2" + +LICENSE="GPL-2 RSA-MD2 RSA-MD5 RSA-PKCS11 DES" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="curl ldap nat smartcard" + +COMMON_DEPEND="!net-misc/openswan + dev-libs/gmp" +DEPEND="${COMMON_DEPEND} + virtual/linux-sources + curl? ( net-misc/curl ) + ldap? ( net-nds/openldap ) + smartcard? ( dev-libs/opensc )" +RDEPEND="${COMMON_DEPEND} + virtual/logger + sys-apps/iproute2" + +pkg_setup() { + linux-info_pkg_setup + + 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." + MYMAKE="programs" + + 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 + + einfo "Using patched-in IPsec code for kernel 2.4." + einfo "Your kernel only supports KLIPS for kernel level IPsec." + MYMAKE="confcheck programs" + + else + eerror "Sorry, no support for your kernel version ${KV_FULL}." + die "Install an IPsec enabled 2.4 or 2.6 kernel." + fi +} + +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 + + if use curl ; then + ebegin "Curl support requested. Enabling curl support" + sed -i -e 's:\(USE_LIBCURL?=\)false:\1true:g' Makefile.inc || die + eend $? + fi + + if use ldap ; then + ebegin "LDAP support requested. Enabling LDAPv3 support" + sed -i -e 's:\(USE_LDAP?=\)false:\1true:g' Makefile.inc || die + eend $? + fi + + if use nat ; then + ebegin "Enabling NAT-Traversal on Transport mode (insecure)" + sed -i -e 's:\(USE_NAT_TRAVERSAL_TRANSPORT_MODE?=\)false:\1true:g' \ + Makefile.inc || die + eend $? + fi + + if use smartcard ; then + ebegin "Smartcard support requested. Enabling opensc support" + sed -i -e 's:\(USE_SMARTCARD?=\)false:\1true:g' Makefile.inc || die + sed -i -e 's:\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/pkcs11/opensc-pkcs11.so\\\"\):#\1:g' \ + Makefile.inc || die + sed -i -e 's:#\(PKCS11_DEFAULT_LIB=\\\"/usr/lib/opensc-pkcs11.so\\\"\):\1:g' \ + Makefile.inc || die + eend $? + fi + + # patch broken check-rule + sed -i -e 's#check: uml#check: programs checkprograms#' Makefile + +} + +src_compile() { + make \ + DESTDIR="${D}" \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=/etc/ipsec \ + INC_RCDEFAULT=/etc/init.d \ + INC_USRLOCAL=/usr \ + INC_MANDIR=share/man \ + FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ + FINALDOCDIR=/usr/share/doc/${P} \ + ${MYMAKE} || die "make failed" +} + +src_install() { + # make install wants this directory + dodir /etc/init.d + + make \ + DESTDIR="${D}" \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=/etc/ipsec \ + INC_RCDEFAULT=/etc/init.d \ + INC_USRLOCAL=/usr \ + INC_MANDIR=share/man \ + FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ + FINALDOCDIR=/usr/share/doc/${P} \ + install || die "make install failed" + + dohtml doc/*html + rm -f ${S}/doc/*.html + dodoc CHANGES COPYING CREDITS INSTALL LICENSE README doc/* + + doinitd "${FILESDIR}"/ipsec + + fperms -R a-X /etc/ipsec /usr/share + keepdir /var/run/pluto + + einfo "Configuration files are installed into /etc/ipsec/" +} + +pkg_postinst() { + if kernel_is 2 6; then + CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP" + WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)" + WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)" + WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)" + check_extra_config + fi +}