Add smartcard USE flag (#181483).

Package-Manager: portage-2.1.2.7

4 files changed, 41 insertions, 15 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/Manifest b/net-misc/openswan/Manifest
index a0872914f169..e582c7a5d8c6 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -13,6 +13,10 @@ AUX openswan-2.4.8-gentoo.patch 16145 RMD160 06fe30efce6d8c816af35b71b71ac7f26ad
 MD5 4af58a3a24d7b72507dd82287e21af9e files/openswan-2.4.8-gentoo.patch 16145
 RMD160 06fe30efce6d8c816af35b71b71ac7f26adfca36 files/openswan-2.4.8-gentoo.patch 16145
 SHA256 8ff419b5867b5a5bf837e25a342ccd5a001a2dcfa694e7104ebb950e21e560c8 files/openswan-2.4.8-gentoo.patch 16145
+AUX openswan-2.4.8-smartcard-typo.patch 687 RMD160 edece169a7926de26df506c31ffc8e4789326ca7 SHA1 e90a8bdcb99ba33ff3228cae4b0d48677409b28c SHA256 70ab011b17d78ad62a4ee5e1a0f8af32144f961f523a03f2136af75f136ce8c0
+MD5 b3d297cf480e2aeca15421449784a67f files/openswan-2.4.8-smartcard-typo.patch 687
+RMD160 edece169a7926de26df506c31ffc8e4789326ca7 files/openswan-2.4.8-smartcard-typo.patch 687
+SHA256 70ab011b17d78ad62a4ee5e1a0f8af32144f961f523a03f2136af75f136ce8c0 files/openswan-2.4.8-smartcard-typo.patch 687
 AUX openswan-2.4.8-type-punned.patch 981 RMD160 ad4d2b009f4389a4e68c7adae438be5c26f9fd9b SHA1 6474461fe16ad7fae3718bb0de437c14094c1c04 SHA256 27f1e5f9e9c656c06b06b5dbcc367d9583ecdbfec531f59f7aff891bff423481
 MD5 831af84346d8a01bdaf57b37c431bcfe files/openswan-2.4.8-type-punned.patch 981
 RMD160 ad4d2b009f4389a4e68c7adae438be5c26f9fd9b files/openswan-2.4.8-type-punned.patch 981
@@ -23,14 +27,14 @@ EBUILD openswan-2.4.7.ebuild 2614 RMD160 67f2262fcbc8a804b2e7d882515dacd1377ba46
 MD5 4d4afd9d61ef22a9d0490574990af136 openswan-2.4.7.ebuild 2614
 RMD160 67f2262fcbc8a804b2e7d882515dacd1377ba468 openswan-2.4.7.ebuild 2614
 SHA256 4258888dcfeda4395c797ec1909f470114fe66afe7531fc73c758284fee388ce openswan-2.4.7.ebuild 2614
-EBUILD openswan-2.4.8.ebuild 2812 RMD160 f2125974ce3a1a81b75e1f88ccf638d0cd3f087a SHA1 ccd53b41bf3f1318ba0ab481aaec93a8c7aec027 SHA256 1ee26cf6abbcc21ea9bc56aeab8a6811e87db1193194d847194b2e214689ad69
-MD5 55ef7290d119a2d45387427708e28fca openswan-2.4.8.ebuild 2812
-RMD160 f2125974ce3a1a81b75e1f88ccf638d0cd3f087a openswan-2.4.8.ebuild 2812
-SHA256 1ee26cf6abbcc21ea9bc56aeab8a6811e87db1193194d847194b2e214689ad69 openswan-2.4.8.ebuild 2812
-MISC ChangeLog 6486 RMD160 a786c282bd41ae26663a706002bbcc91d183cbe7 SHA1 58dacaf5a0cd22da4174c3241830a10a59cd6f92 SHA256 b89f182b5c52a5347ef002335d850e4cffc2523e0467d935a19809251dec3858
-MD5 3a8320bd0979d9e5a76c85b3a1626de6 ChangeLog 6486
-RMD160 a786c282bd41ae26663a706002bbcc91d183cbe7 ChangeLog 6486
-SHA256 b89f182b5c52a5347ef002335d850e4cffc2523e0467d935a19809251dec3858 ChangeLog 6486
+EBUILD openswan-2.4.8.ebuild 2989 RMD160 8dc0553397425b995772f5e93bd41476c2a0efdd SHA1 9e6362ed9a5befbce71877eaf5955fa9b7133854 SHA256 bfbb85668e33354e84d1b211b2a594c4de62d8884a7bef5c42eda5bfeb14e2f4
+MD5 2096ef1777f53a08f1285bb438bb8e4e openswan-2.4.8.ebuild 2989
+RMD160 8dc0553397425b995772f5e93bd41476c2a0efdd openswan-2.4.8.ebuild 2989
+SHA256 bfbb85668e33354e84d1b211b2a594c4de62d8884a7bef5c42eda5bfeb14e2f4 openswan-2.4.8.ebuild 2989
+MISC ChangeLog 6639 RMD160 e653915de06560aee6877d80d7631855633467db SHA1 7473e64be5e00ea3ff40bb66e69f77f91ed23cd9 SHA256 85604af3346075baf9bf87e9915bf915cb8f4a50fc34efead086cf5da5fdee9f
+MD5 397921141071c3fea8c177894a5befa2 ChangeLog 6639
+RMD160 e653915de06560aee6877d80d7631855633467db ChangeLog 6639
+SHA256 85604af3346075baf9bf87e9915bf915cb8f4a50fc34efead086cf5da5fdee9f ChangeLog 6639
 MISC metadata.xml 615 RMD160 b3d598429d92b809f96a81e5afee71da401805e6 SHA1 b42b5faa0351e1a13a85f169c2f9f571cf5a01c9 SHA256 ea4e1b6588339042b92326e43795dd53d95e3c22851c78184ea91c4c850296b2
 MD5 c5341ab7b79f52446085b2a3ded10c77 metadata.xml 615
 RMD160 b3d598429d92b809f96a81e5afee71da401805e6 metadata.xml 615
@@ -44,7 +48,7 @@ SHA256 4e594d0597ff585c623c82b9c37e5037deb97c0a4d447f914a678ec72df0b1f9 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGZQvMJnxX6mF440QRAmawAKCIhCa3SIUbXup4EgVk29o8vZ0KzQCg8mLy
-IfuQkM2h4ppZMF6S29Cw2yc=
-=BkRY
+iD8DBQFGcY58JnxX6mF440QRAp83AJ43evagvO0F3RYivoonl5SPvQqJnACeJjYD
+wnoZcNVk2XWUwZsmAnmcNrc=
+=SZUt
 -----END PGP SIGNATURE-----
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