diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-09-06 18:53:41 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-09-06 18:53:41 +0000 |
| commit | 7213ee2cd85bd85b83c1c7a6a40553c9f2c6878a (patch) | |
| tree | 0fa55b94b60afdc73f06047040e0a456ad20777e /net-misc | |
| parent | Hack the glibc-2.16/gets issue to current stable (already fixed in newer vers... (diff) | |
| download | gentoo-2-7213ee2cd85bd85b83c1c7a6a40553c9f2c6878a.tar.gz gentoo-2-7213ee2cd85bd85b83c1c7a6a40553c9f2c6878a.tar.bz2 gentoo-2-7213ee2cd85bd85b83c1c7a6a40553c9f2c6878a.zip | |
Fixing building with -pam and +eap use flags, fixing bug 434128
(Portage version: 2.2.0_alpha123/cvs/Linux i686)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/strongswan/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/strongswan/metadata.xml | 5 | ||||
| -rw-r--r-- | net-misc/strongswan/strongswan-5.0.0.ebuild | 13 |
3 files changed, 13 insertions, 10 deletions
diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog index 15121b547ae9..4d4927a5b0bd 100644 --- a/net-misc/strongswan/ChangeLog +++ b/net-misc/strongswan/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/strongswan # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.96 2012/07/01 10:45:17 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.97 2012/09/06 18:53:41 gurligebis Exp $ + + 06 Sep 2012; <gurligebis@gentoo.org> strongswan-5.0.0.ebuild, metadata.xml: + Fixing building with -pam and +eap use flags, fixing bug #434128 *strongswan-5.0.0 (01 Jul 2012) diff --git a/net-misc/strongswan/metadata.xml b/net-misc/strongswan/metadata.xml index 81f3e6f4ed68..3ae719bdc6f3 100644 --- a/net-misc/strongswan/metadata.xml +++ b/net-misc/strongswan/metadata.xml @@ -9,11 +9,6 @@ <email>gurligebis@gentoo.org</email> <name>Bjarke Istrup Pedersen</name> </maintainer> - <maintainer> - <email>ua_bugz_gentoo@mortal-soul.de</email> - <name>Matthias Dahl</name> - <description>Proxy Maintainer, CC on all bugs</description> - </maintainer> <longdescription lang="en"> StrongSwan is direct descendant of the discontinued FreeS/WAN project. As an IPsec based VPN solution which is focused on security and ease of diff --git a/net-misc/strongswan/strongswan-5.0.0.ebuild b/net-misc/strongswan/strongswan-5.0.0.ebuild index 5a1042b61be2..a58c75d36c68 100644 --- a/net-misc/strongswan/strongswan-5.0.0.ebuild +++ b/net-misc/strongswan/strongswan-5.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-5.0.0.ebuild,v 1.1 2012/07/01 10:45:17 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-5.0.0.ebuild,v 1.2 2012/09/06 18:53:41 gurligebis Exp $ EAPI=2 inherit eutils linux-info user @@ -12,7 +12,7 @@ SRC_URI="http://download.strongswan.org/${P}.tar.bz2" LICENSE="GPL-2 RSA-MD5 RSA-PKCS11 DES" SLOT="0" KEYWORDS="~arm ~amd64 ~ppc ~sparc ~x86" -IUSE="+caps curl debug dhcp eap farp gcrypt ldap +ikev1 +ikev2 mysql +non-root +openssl sqlite" +IUSE="+caps curl debug dhcp eap pam farp gcrypt ldap +ikev1 +ikev2 mysql +non-root +openssl sqlite" COMMON_DEPEND="!net-misc/openswan >=dev-libs/gmp-4.1.5 @@ -22,7 +22,8 @@ COMMON_DEPEND="!net-misc/openswan ldap? ( net-nds/openldap ) openssl? ( >=dev-libs/openssl-0.9.8[-bindist] ) mysql? ( virtual/mysql ) - sqlite? ( >=dev-db/sqlite-3.3.1 )" + sqlite? ( >=dev-db/sqlite-3.3.1 ) + pam? ( sys-libs/pam )" DEPEND="${COMMON_DEPEND} virtual/linux-sources sys-kernel/linux-headers" @@ -108,6 +109,11 @@ src_configure() { # strongSwan builds and installs static libs by default which are # useless to the user (and to strongSwan for that matter) because no # header files or alike get installed... so disabling them is safe. + if use pam && use eap; then + myconf="${myconf} --enable-eap-gtc" + else + myconf="${myconf} --disable-eap-gtc" + fi econf \ --disable-static \ $(use_with caps capabilities libcap) \ @@ -121,7 +127,6 @@ src_configure() { $(use_enable eap eap-simaka-reauth) \ $(use_enable eap eap-identity) \ $(use_enable eap eap-md5) \ - $(use_enable eap eap-gtc) \ $(use_enable eap eap-aka) \ $(use_enable eap eap-aka-3gpp2) \ $(use_enable eap eap-mschapv2) \ |