diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2007-06-14 18:52:33 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2007-06-14 18:52:33 +0000 |
| commit | 844bca576c1ae6a9453a86de4c61cb06e605643e (patch) | |
| tree | 798e9bb05673482adba97c45047df3f8d21ef258 /net-misc/openswan | |
| parent | Stable on amd64 wrt bug 178264 (diff) | |
| download | gentoo-2-844bca576c1ae6a9453a86de4c61cb06e605643e.tar.gz gentoo-2-844bca576c1ae6a9453a86de4c61cb06e605643e.tar.bz2 gentoo-2-844bca576c1ae6a9453a86de4c61cb06e605643e.zip | |
Add smartcard USE flag (#181483).
(Portage version: 2.1.2.7)
Diffstat (limited to 'net-misc/openswan')
| -rw-r--r-- | net-misc/openswan/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openswan/files/openswan-2.4.8-smartcard-typo.patch | 13 | ||||
| -rw-r--r-- | net-misc/openswan/openswan-2.4.8.ebuild | 11 |
3 files changed, 26 insertions, 4 deletions
diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index 4ec6cbedcd4f..c20404aa5dbe 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openswan # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.37 2007/06/05 07:07:44 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.38 2007/06/14 18:52:33 mrness Exp $ + + 14 Jun 2007; Alin Năstac <mrness@gentoo.org> + +files/openswan-2.4.8-smartcard-typo.patch, openswan-2.4.8.ebuild: + Add smartcard support (#181483). *openswan-2.4.8 (05 Jun 2007) diff --git a/net-misc/openswan/files/openswan-2.4.8-smartcard-typo.patch b/net-misc/openswan/files/openswan-2.4.8-smartcard-typo.patch new file mode 100644 index 000000000000..8c233bf64517 --- /dev/null +++ b/net-misc/openswan/files/openswan-2.4.8-smartcard-typo.patch @@ -0,0 +1,13 @@ +diff -Naupr openswan-2.4.8-old/programs/pluto/smartcard.c openswan-2.4.8/programs/pluto/smartcard.c +--- openswan-2.4.8-old/programs/pluto/smartcard.c 2007-01-22 19:42:02.000000000 +0100 ++++ openswan-2.4.8/programs/pluto/smartcard.c 2007-06-09 20:50:48.000000000 +0200 +@@ -381,8 +381,7 @@ scx_sign_hash(smartcard_t *sc UNUSED + sc_pkcs15_hex_string_to_id(sc->id, &id); + + /* get private key by id */ +- r = sc_pkcs15_find_prkey_by_id_usage(p15card, &id, SC_PKCS15_PRKEY_USAGE_SI +-GN | SC_PKCS15_PRKEY_USAGE_SIGNRECOVER, &key); ++ r = sc_pkcs15_find_prkey_by_id_usage(p15card, &id, SC_PKCS15_PRKEY_USAGE_SIGN | SC_PKCS15_PRKEY_USAGE_SIGNRECOVER, &key); + + if (r < 0) + { diff --git a/net-misc/openswan/openswan-2.4.8.ebuild b/net-misc/openswan/openswan-2.4.8.ebuild index 67b17e393978..66bc7ba65a4b 100644 --- a/net-misc/openswan/openswan-2.4.8.ebuild +++ b/net-misc/openswan/openswan-2.4.8.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/openswan/openswan-2.4.8.ebuild,v 1.1 2007/06/05 07:07:44 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.8.ebuild,v 1.2 2007/06/14 18:52:33 mrness Exp $ inherit eutils linux-info @@ -11,10 +11,11 @@ SRC_URI="http://www.openswan.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="extra-algorithms weak-algorithms" +IUSE="smartcard extra-algorithms weak-algorithms" COMMON_DEPEND="!net-misc/strongswan - >=dev-libs/gmp-4.2.1" + >=dev-libs/gmp-4.2.1 + smartcard? ( dev-libs/opensc )" DEPEND="${COMMON_DEPEND} virtual/linux-sources" RDEPEND="${COMMON_DEPEND} @@ -51,6 +52,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${P}-gentoo.patch epatch "${FILESDIR}"/${P}-type-punned.patch + epatch "${FILESDIR}"/${P}-smartcard-typo.patch } get_make_options() { @@ -60,6 +62,9 @@ get_make_options() { INC_MANDIR=share/man \ FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ FINALDOCDIR=/usr/share/doc/${P}" + if use smartcard ; then + MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_SMARTCARD=true" + fi if use extra-algorithms ; then MY_MAKE_OPTIONS="${MY_MAKE_OPTIONS} USE_EXTRACRYPTO=true" fi |