From 83e3b0af64e54513165fe98511c40bbc812abddb Mon Sep 17 00:00:00 2001 From: Lars Weiler Date: Thu, 7 Dec 2006 20:50:23 +0000 Subject: [PATCH] More ebuild polishing to keep it similar to net-misc/openswan. Package-Manager: portage-2.1.2_rc2-r5 --- net-misc/strongswan/ChangeLog | 6 +- net-misc/strongswan/Manifest | 24 ++++---- net-misc/strongswan/metadata.xml | 5 ++ net-misc/strongswan/strongswan-2.8.0.ebuild | 62 ++++++++++++++------- 4 files changed, 63 insertions(+), 34 deletions(-) diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog index 8236e45b1090..eefae98e526a 100644 --- a/net-misc/strongswan/ChangeLog +++ b/net-misc/strongswan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/strongswan # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.43 2006/12/07 20:26:19 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.44 2006/12/07 20:50:23 pylon Exp $ + + 07 Dec 2006; Lars Weiler metadata.xml, + strongswan-2.8.0.ebuild: + More ebuild polishing to keep it similar to net-misc/openswan. *strongswan-2.8.0 (07 Dec 2006) diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest index 987776316fef..4eb3b52e3823 100644 --- a/net-misc/strongswan/Manifest +++ b/net-misc/strongswan/Manifest @@ -21,18 +21,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 3060 RMD160 52c88e230147846ecf70697bf05a8e65d22a479a SHA1 67dabe003b8cece95375e5ba347bf6ebbedce599 SHA256 7bde85f63c2409b26c88fb29027ceb249610bb147c4f7756c74250341cb7deee -MD5 b6501e7cc837870ce63388710e0d9d53 strongswan-2.8.0.ebuild 3060 -RMD160 52c88e230147846ecf70697bf05a8e65d22a479a strongswan-2.8.0.ebuild 3060 -SHA256 7bde85f63c2409b26c88fb29027ceb249610bb147c4f7756c74250341cb7deee strongswan-2.8.0.ebuild 3060 -MISC ChangeLog 7345 RMD160 9bc8a7a380ca0efb8c8a1e7b9dd97bd66a7a7480 SHA1 8a41e5b8ce42e8cf191deb2611648fbe55f0c4d3 SHA256 78fce5aaf75b7f13682c46d7db96904633378611e393239f2ce80199ed8b7c4d -MD5 17ccc947277e3698e5c81a9a0e6b6e2e ChangeLog 7345 -RMD160 9bc8a7a380ca0efb8c8a1e7b9dd97bd66a7a7480 ChangeLog 7345 -SHA256 78fce5aaf75b7f13682c46d7db96904633378611e393239f2ce80199ed8b7c4d ChangeLog 7345 -MISC metadata.xml 634 RMD160 24c570ea95443f70aa0e077267719bd31746a2f6 SHA1 7c6047e87df52c99839edabfafdd4f91895d09b0 SHA256 9b0a5ff28d7243716eb1d42dd87633df10b94606bf7f095dba8bbff6fa01bb32 -MD5 48d78406890387afe4b0d4bba793f8d1 metadata.xml 634 -RMD160 24c570ea95443f70aa0e077267719bd31746a2f6 metadata.xml 634 -SHA256 9b0a5ff28d7243716eb1d42dd87633df10b94606bf7f095dba8bbff6fa01bb32 metadata.xml 634 +EBUILD strongswan-2.8.0.ebuild 3594 RMD160 9a498d59c5d242d1781b3f1453e3106db9a8f26e SHA1 7267a63e2b3d7d01691b9fdb9ad2be67978506a2 SHA256 055eb5ea8821702b5494c7ddfe1a66a900a53eb53bcf66c62e18bf5f9db3765a +MD5 b505762cebb38a56466c62f02ea22e74 strongswan-2.8.0.ebuild 3594 +RMD160 9a498d59c5d242d1781b3f1453e3106db9a8f26e strongswan-2.8.0.ebuild 3594 +SHA256 055eb5ea8821702b5494c7ddfe1a66a900a53eb53bcf66c62e18bf5f9db3765a strongswan-2.8.0.ebuild 3594 +MISC ChangeLog 7498 RMD160 b2a344888c63b6487eacbb7978bbf6d890448f96 SHA1 b7284c60c35b800c5695f7adeba3be1dd4e86c53 SHA256 f03346f06d073193d725c985ff90b078474b45ea37b7ac4a4ace0ca2d2928ae8 +MD5 d29d5b852add02af9cba2f59299a48bf ChangeLog 7498 +RMD160 b2a344888c63b6487eacbb7978bbf6d890448f96 ChangeLog 7498 +SHA256 f03346f06d073193d725c985ff90b078474b45ea37b7ac4a4ace0ca2d2928ae8 ChangeLog 7498 +MISC metadata.xml 769 RMD160 5835c33c35419648b3beceb29f4917d6dca6669b SHA1 310dfe0d59c860abdbc05803edcd653b616f6335 SHA256 37ed72207b9c20d6bb80690c6dd4935bdc4c79f69f7530700c90e18f7c5e7cb9 +MD5 73e8a4ac5eb27655e494f6fcbbeeb5f7 metadata.xml 769 +RMD160 5835c33c35419648b3beceb29f4917d6dca6669b metadata.xml 769 +SHA256 37ed72207b9c20d6bb80690c6dd4935bdc4c79f69f7530700c90e18f7c5e7cb9 metadata.xml 769 MD5 ca3b12df3fd9cf3d5f8ce540445d6638 files/digest-strongswan-2.5.7 256 RMD160 b8c8247ca63c4f63df2943b53ac5b06e178f0451 files/digest-strongswan-2.5.7 256 SHA256 12e4d1abff9ac7ab9b672990c9b7021e97531df3022f3d50811f858c012e6c44 files/digest-strongswan-2.5.7 256 diff --git a/net-misc/strongswan/metadata.xml b/net-misc/strongswan/metadata.xml index ffec0bf7257e..a8cb49eee363 100644 --- a/net-misc/strongswan/metadata.xml +++ b/net-misc/strongswan/metadata.xml @@ -6,5 +6,10 @@ pfeifer@gentoo.org Jay Pfeifer + + pylon@gentoo.org + Lars weiler + Backup maintainer + strongSwan is an OpenSource IPsec implementation for the Linux operating system. It is based on the discontinued FreeS/WAN project and the X.509 patch which we developed over the last three years. In order to have a stable IPsec platform to base our future extensions of the X.509 capability on, we decided to lauch the strongSwan project. diff --git a/net-misc/strongswan/strongswan-2.8.0.ebuild b/net-misc/strongswan/strongswan-2.8.0.ebuild index 69363d732e9e..f1e37e6651ec 100644 --- a/net-misc/strongswan/strongswan-2.8.0.ebuild +++ b/net-misc/strongswan/strongswan-2.8.0.ebuild @@ -1,39 +1,47 @@ # Copyright 1999-2006 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.1 2006/12/07 20:26:19 pylon Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.8.0.ebuild,v 1.2 2006/12/07 20:50:23 pylon Exp $ + +inherit eutils linux-info -inherit 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" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 " +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="curl ldap smartcard" -DEPEND="!net-misc/openswan - dev-libs/gmp - sys-apps/iproute2 +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="" +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." - export MYMAKE="programs" + MYMAKE="programs" elif kernel_is 2 4; then - [ -d /usr/src/linux/net/ipsec ] || { + 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." - export MYMAKE="confcheck programs" + MYMAKE="confcheck programs" else eerror "Sorry, no support for your kernel version ${KV_FULL}." @@ -44,11 +52,6 @@ pkg_setup() { src_unpack() { unpack ${A} - # The Destination dir for documentation which will be included in man-pages - cd ${S} - sed -i -e "s:FINALEXAMPLECONFDIR=\(.*\)/strongswan:FINALEXAMPLECONFDIR=\1/${P}:g" Makefile.inc || die - sed -i -e "s:FINALDOCDIR?=\(.*\)/strongswan:FINALDOCDIR?=\1/${P}:g" Makefile.inc || die - if use curl ; then ebegin "Curl support requested. Enabling curl support" sed -i -e 's:\(USE_LIBCURL?=\)false:\1true:g' Makefile.inc || die @@ -72,13 +75,15 @@ src_unpack() { src_compile() { make \ - DESTDIR=${D} \ + DESTDIR="${D}" \ USERCOMPILE="${CFLAGS}" \ FINALCONFDIR=/etc/ipsec \ INC_RCDEFAULT=/etc/init.d \ INC_USRLOCAL=/usr \ INC_MANDIR=share/man \ - ${MYMAKE} || die "Failed compiling ${P}" + FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ + FINALDOCDIR=/usr/share/doc/${P} \ + ${MYMAKE} || die "make failed" } src_install() { @@ -86,19 +91,34 @@ src_install() { dodir /etc/init.d make \ - DESTDIR=${D} \ + DESTDIR="${D}" \ USERCOMPILE="${CFLAGS}" \ FINALCONFDIR=/etc/ipsec \ INC_RCDEFAULT=/etc/init.d \ INC_USRLOCAL=/usr \ INC_MANDIR=share/man \ - install || die "Failed compiling ${P}" + 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 || die "doinitd failed" + 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 +} -- 2.26.2