Version bump.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

8 files changed, 244 insertions, 6 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index 51ab524066c7..a8c07b41cb06 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.69 2015/03/03 16:29:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.70 2015/03/04 19:52:37 vapier Exp $
+
+*crda-3.18 (04 Mar 2015)
+
+  04 Mar 2015; Mike Frysinger <vapier@gentoo.org> +crda-3.18.ebuild,
+  +files/crda-3.18-cflags.patch, +files/crda-3.18-no-ldconfig.patch,
+  +files/crda-3.18-no-werror.patch, +files/crda-3.18-openssl.patch,
+  metadata.xml:
+  Version bump.
 
   03 Mar 2015; Mike Gilbert <floppym@gentoo.org> crda-1.1.3-r1.ebuild:
   Set EAPI=5. Call has_version --host-root in python_check_deps to help with
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 199c94a24d73..2203a4154570 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -2,19 +2,35 @@
 Hash: SHA256
 
 AUX crda-1.1.3-missing-include.patch 231 SHA256 82fa9006d037b42df124d334a48bf06ec75d3b510eb7c464033798c05daede9c SHA512 d24f11a36e798e1da7951efbcd3925d7728a2519c75ff289bfaadc92090f17fb5b9b21010ad960fadfffe6c949b63eddc2b8282508fd5947486f31495cca2afc WHIRLPOOL 73be5658dec27b0fb079aafde7087cbcbaeb5bdaf66d29ea2d4a4cd7f689d1305a8ff95292ab3807271882b76fc3aaee4078df110cc1762d470252816d17d6dd
+AUX crda-3.18-cflags.patch 895 SHA256 ac079317739e015799103751f63e480053a49f94b8be219d00d6a18d4c96527f SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d WHIRLPOOL 29fef240b5faa214b6385b3d672d66d4f7a9bde949a96db6146331249fb7684f6a9a056cb801134cdde7ff8ab3c1a903dedf6e6dc9653b5a5e370247d0aea6a7
+AUX crda-3.18-no-ldconfig.patch 748 SHA256 f4b3ea1bf64dd95a76e0ac51e29a7ba5c9b66e7b0cb9dd275079c3ecbcf7938d SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28 WHIRLPOOL 4cfd5e80e2c10d94bd820e7a4f7ad1f258cd8841e1bcad1cf472d3f4e13de1f58f92d0701dcf230ad46d5c5d5dc06bef06cfc5d2c958677a1c02f9c514337e03
+AUX crda-3.18-no-werror.patch 916 SHA256 abcd49fac91f87f3862ba096e1ab0fc2591688339e2fee5e81388d8f9d60ed27 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9 WHIRLPOOL 129c31f79af1c6b1d20dc81109ba213d7f1a5db51ab58d3c277e5dacd304c2afc137d2a87f06fbb35d1a6ecf8d92f9b7bd45d8c2e5478928d5986028b50af8c5
+AUX crda-3.18-openssl.patch 1601 SHA256 f620823d5f648a5895163495dd5fa62ca5b78887e40f4bf856aa2db7ea729785 SHA512 0ffd2b51689ee30b064494022127eb7933c9dfe6f90189ef4b6209f7f733813026da0b2cb7fcf473fa81549515355b7f5b285ce759a3f3053f95b290550a71fe WHIRLPOOL 7e4a4f1beed4673dca355959db09c0abb72844b42d9d3b9f974fe6586221ebba90d3d0445e403f1c3816feace32db0db4a869cf10cd84fb99699c3ca3a557877
 AUX libnl31-support.diff 1963 SHA256 5a2fce22089b49733cd2315840d2812e4590e12d987086a04dcb69d6d9fcbac7 SHA512 849c3f866723f163579f55be7f6eda13020299394fd6599bfff80028da73cbe78f049d963fbf91eb3de6fca1e16ce26ae48e84534ad383caade4112ca448ca89 WHIRLPOOL d7fb6fbf7ea3d2fee7342e4878110ed9305259818cb353dd7cac321fecd87e5cd23986a6ee5a266f6ca06fade05e1d016531c38d6d1404a80c0963451e67604f
 DIST crda-1.1.2.tar.bz2 21754 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864 SHA512 cd0997fdafc63640cbac5cff57b617177c3693a6d05e2138f23ed8273502d5f485f8f60309ed4fec97fe2cd2d51ee4b7e2d9535efc1de44c08b9cc9d6fb7ecf3 WHIRLPOOL 35ef76fcb7f3760613135caba5b9c6b0c781bc560f948a60f6b09eaeb75f3538461d90ce353decc17795995795b63c124a282903d41a8e25680fda0b6498bea4
 DIST crda-1.1.3.tar.bz2 38697 SHA256 aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed WHIRLPOOL bbcb31277b664243f9e494c494152cf0ebcb187360ba48aa07c8e96c83dd91098bc49f1edf0b196a9bf4071565ac389b2907fcc73e348780aa890e066895c282
+DIST crda-3.18.tar.xz 61516 SHA256 43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588 WHIRLPOOL f2ee46b8e25509b6f78e508e62de3f1d0d85303b173b38d653f69f4f6e8f77ada2bc3330cd62646a1ce3819b0db834d9aecc9751cf3e7d35e2a67d3ffdfb1503
 EBUILD crda-1.1.2-r3.ebuild 1303 SHA256 224c8c3ee63e6d9bd3e20f3affc5572546b9caf9686cfd549924bf51a79481ec SHA512 d69d7cadde9032164b590c3a2e014be162791312a879f3252c714f6bdaa14557238e26570f114db799d4866d90ad88236b297c6ec7fb1bc0f1bf56a64a7f321a WHIRLPOOL 8d0a921fea3a73a6a211a6e6e9c18f7917ec41d301124a1b43aa2d2b6dd050f3c73b55f36b07c4984784eaa2584f868a63dd3619da9ef86594e4ac7ce23375b6
 EBUILD crda-1.1.2-r4.ebuild 1432 SHA256 57419ea4ca8339031c8c44d94bd1ef9876fb0c61982a1af83364837aea103304 SHA512 ffaa832777328bba36d1b7aac50f993dc3cf640b4a143c731080dc4a928a2f5bb62de33078a2fb2cb545e01642474030851721524af98fdf81e3dcbf061302b2 WHIRLPOOL e42b308e05e2f1af41021a10f13def2f13e9f14a8752ad76c907241d840b6d7fe04062fc75bcef674291592132bbea10d3e8be38bf5d21534020aab1c2fa5146
 EBUILD crda-1.1.3-r1.ebuild 1739 SHA256 74da33cf85b1d33d62544755d4259e0d863fa3e148cc03d6c851a32abcf1bbd6 SHA512 4983d6535dfbe1eeeb9be8bccc0c485316db18f3d3ce0daf57929a7339447d85075aec7bb73a626a8f09a7bfce8062d9af45492bc49a5098c4e60421e3fd5f00 WHIRLPOOL c40796558b31bcafee524a6f57fee7333c848255154c54e7b40500dbf162fbff8c3fecb2bd67226ae5445fea65d8925c241852352e2c3b46da2024819e612262
 EBUILD crda-1.1.3.ebuild 1354 SHA256 c0bfd862402f8daeb54ed405fd14a762191c8edf239d07824cbf1b9ac172c3a3 SHA512 2295877d4263230fa6d2eb3b8653b790675efa2092a9c3c6884ce23856b6e90f58d52a9f025e6179344478e5a66ab61ce8b766c1b42aed754d9d3f612c582036 WHIRLPOOL f34fd3c2acb339950629244dc9f49019f29b74b3b577913dbb6901f93d06551724d661cb0881047138acc12a1d5ed0698decff3a1fd63e31a36b8eb074d227cc
-MISC ChangeLog 10319 SHA256 07f4128711c186d6ae68bf683e421709a7c27f53a46c4caaed2c3dec767001b8 SHA512 87dea515b22755f1b5623b31702295c9e03fe21d360ef43a2f89bcc70250d4140de715bdcccfb05d4d755752a0b865d430001ca2f3b8efd865276d48ac995724 WHIRLPOOL 327f455f18edc8f741ded5cadf168f923050bda574e5879e29d88e057dd1c8d88fe9f5355dd598b2ecc8c6afe0909ff52e9b975db6f2f628421735b5470b748d
-MISC metadata.xml 340 SHA256 80a1eddbe298bb95ec1ff00e7f2c63695ae3f5817b35ab7b79403a18d171da2a SHA512 0e7fab95bd71c76b0f5c347d1471357d7604ae15357d97a0ab8b9933b54868fea78eee8cd570944e438b73b353457dca627ad29c7907576c2a5fb268803baa3d WHIRLPOOL f2a20d3788629c99bc65d9d0577625bebb5651e20db8293c94c048e73fa21ea5423745bc7d9773eb06afaeb05df26b71383bbf614746b263353bc248ebf7c32f
+EBUILD crda-3.18.ebuild 2067 SHA256 b9cb12f02cbcd294802d54ced0cefa6221fcd95647693bb73f65e5d2a165e719 SHA512 5bd402c4a59a104dc197b3551ab544f215aa0863a53c7fbc9a603dbffb31ad5c2b69afcb62cbcd00058b5364257b1ad061540d0a80b46d85ad259001b84ac03e WHIRLPOOL edd2199e7188f623b6cbff4c81c569a4ed78a2ce7aa843ebd5ca361a7333476a06683473c239e9df12eb5e942cc3b00f4333439ffeded5ac7bd602fecf69d044
+MISC ChangeLog 10583 SHA256 d2feff89e8fceea4f15f13a4bf5519fdcfb28779be7a5f6a133ab62c125dd48a SHA512 f7c1f69268842b576e28de52196b2e7f5e1ac659bcee09ba5f09a29bb9a384ed0082ce618e83a17742953a189d5ad6992e9f42a06b34ae6560fcd97e1ffd3293 WHIRLPOOL 8a66d4043cd549be7a46c997a44c4ca350eeb186c27c5aa4cc0d7687e5696e316c6423e601f3ff68a10915a3e9e51239aa24b965d388c6ac6c744d300882cbd2
+MISC metadata.xml 434 SHA256 a3ec7036405666bbb6082583502a79d55f066bcad3f1dc382eff959986acb41d SHA512 4bdab4b4019296a1575331290ea2890c6b1fdd540011d7533a77e3781f511c06496bf7666c490c87ac725a0bef9e0936cdb8b434c24eee9709bd70329a4cf2c1 WHIRLPOOL 15a207c0e8c3cad6eca1f821ca90b2ab14454075662bd93dc4af5f7c9eb62d94d986103b8fb0a2f1094a3ba79c339a7d55c0609bc548313bee3a250622c866db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT14XAACgkQC77qH+pIQ6SaawD/fGe8CKKc6gb1nVOjESSPG5Cu
-JpfU3qqKuzFItG4oBwABAIvJZdrpPIqYYLAjtJt6Tu4oM5OLiYRnyUWOWRKEFiRb
-=GdEL
+iQIcBAEBCAAGBQJU92KHAAoJEPGu1DbS6WIAyKoP/RkvIbx7XVCuEr84G4cxDyvI
+JJcxcZ25fDna6JoHG621stGplCWrpW7Tx+xtDST9t/B5+CI6lk3wfiEdkjg9Q7lB
+Xxghve2zacE1OsbNMBsXxL+vZWcvoGpE7hlyMrophXWMrMbGrnoguEhGlae9eJYT
+oxxfynQqENWNVl0ZBD2P6zMwtThQ0nXe8HXE/9jlpttZeEYxrvGBwD2Bc7GVIuSQ
+UfTAw4niva8fryDaUyD3RejKpRgdnQIhreY7oWMHF+RtJicqXwa3AHA9EBIAR2ba
+yc+4K10hACDKopr+0Akj7dPMZwNwrEsIPiphWGI6JSfbzdlWqnhtrcHHT4qIII56
+6Qr6m2Y2/uMrgCqLyqBWJQwzAArv/u0g51BzwbeSD7RtbAcIKmqGyRxXjlTGrIMn
+XIaSJZksltghy0v1Z9vEt1ZtclF13WGqn+5Wzs3wruxS+uubq7O7g/rIhiwcEdnt
++T9I8iIMpitdXnCoYz6vFS8IznQV8IOFXfgiXvCdqVF46QVn1PC/xySjhzDJdWgR
+l4Viq3XtYDp2Uo8+yui19na1R+SDAXmmSdixGsu2L4V7BES7KX12VleoJWUSpL0i
+1ClnG1gFroZHYoYuqjcRO1s/AlPuu+frBIleXBDGz9PHpapSGGzasOpn/xDP3t8+
+6MLOK0Ha0KUxyTJgaiYc
+=Z1zb
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/crda/crda-3.18.ebuild b/net-wireless/crda/crda-3.18.ebuild
new file mode 100644
index 000000000000..7589e1df3767
--- /dev/null
+++ b/net-wireless/crda/crda-3.18.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-3.18.ebuild,v 1.1 2015/03/04 19:52:37 vapier Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils toolchain-funcs python-any-r1 udev
+
+DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
+SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
+	mirror://kernel/software/network/crda/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gcrypt"
+
+RDEPEND="!gcrypt? ( dev-libs/openssl:0 )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	dev-libs/libnl:3
+	net-wireless/wireless-regdb"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]')
+	virtual/pkgconfig"
+
+python_check_deps() {
+	has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.18-no-ldconfig.patch
+	epatch "${FILESDIR}"/${PN}-3.18-no-werror.patch
+	epatch "${FILESDIR}"/${PN}-3.18-openssl.patch
+	epatch "${FILESDIR}"/${PN}-3.18-cflags.patch
+	sed -i \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		Makefile || die
+}
+
+_emake() {
+	# The source hardcodes /usr/lib/crda/ paths (ignoring all make vars
+	# that look like it should change it).  We want to use /usr/lib/
+	# anyways as this file is not ABI specific and we want to share it
+	# among all ABIs rather than pointlessly duplicate it.
+	#
+	# The trailing slash on SBINDIR is required by the source.
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		SBINDIR='$(PREFIX)/sbin/' \
+		LIBDIR='$(PREFIX)/'"$(get_libdir)" \
+		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
+		REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \
+		USE_OPENSSL=$(usex gcrypt 0 1) \
+		CC="$(tc-getCC)" \
+		V=1 \
+		WERROR= \
+		"$@"
+}
+
+src_compile() {
+	_emake all_noverify
+}
+
+src_test() {
+	_emake verify
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+	keepdir /etc/wireless-regdb/pubkeys
+}
diff --git a/net-wireless/crda/files/crda-3.18-cflags.patch b/net-wireless/crda/files/crda-3.18-cflags.patch
new file mode 100644
index 000000000000..6edbded822cc
--- /dev/null
+++ b/net-wireless/crda/files/crda-3.18-cflags.patch
@@ -0,0 +1,33 @@
+From c5b0741ea7fc12e9f6a2a309296ed412a999d0f7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 4 Mar 2015 14:09:50 -0500
+Subject: [PATCH] clean up CFLAGS handling
+
+Rather than append -O2 -g all the time to the user's CFLAGS (and thus
+clobbering whatever they have set up), initialize the default value to
+that and let the user override it entirely.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5f988f4..8e345a1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,9 +26,9 @@ PUBKEY_DIR?=pubkeys
+ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+ 
+ WERROR = -Werror
+-CFLAGS += -O2 -fpic
++CFLAGS ?= -O2 -g
++CFLAGS += -fpic
+ CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic
+-CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+ LDLIBS += $(LDLIBREG)
+ LDLIBS += -lm
+-- 
+2.3.1
+
diff --git a/net-wireless/crda/files/crda-3.18-no-ldconfig.patch b/net-wireless/crda/files/crda-3.18-no-ldconfig.patch
new file mode 100644
index 000000000000..a5cc42084d53
--- /dev/null
+++ b/net-wireless/crda/files/crda-3.18-no-ldconfig.patch
@@ -0,0 +1,28 @@
+From b11d83df189670defe4a29c624f2930351c13df2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 4 Mar 2015 13:56:36 -0500
+Subject: [PATCH] do not run ldconfig
+
+Let the distro/user deal with ldconfig updating.  Running it blindly like
+this breaks DESTDIR installs as `ldconfig` only operates on system paths.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a3ead30..46c683d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -127,7 +127,6 @@ install-libreg:
+ 	$(NQ) '  INSTALL  libreg'
+ 	$(Q)mkdir -p $(DESTDIR)/$(LIBDIR)
+ 	$(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
+-	$(Q)ldconfig
+ 
+ %.o: %.c regdb.h $(LIBREG)
+ 	$(NQ) '  CC  ' $@
+-- 
+2.3.1
+
diff --git a/net-wireless/crda/files/crda-3.18-no-werror.patch b/net-wireless/crda/files/crda-3.18-no-werror.patch
new file mode 100644
index 000000000000..6abb78c984e4
--- /dev/null
+++ b/net-wireless/crda/files/crda-3.18-no-werror.patch
@@ -0,0 +1,32 @@
+From 37384d22ba0ab622a5848a9a794084e6064fc905 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 4 Mar 2015 14:03:44 -0500
+Subject: [PATCH] allow people to turn off -Werror
+
+Forcing -Werror at build time easily breaks across compiler settings,
+compiler versions, architectures, C libraries, etc...  Add a knob so
+distro peeps can turn it off.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 46c683d..5f988f4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -25,8 +25,9 @@ UDEV_RULE_DIR?=/lib/udev/rules.d/
+ PUBKEY_DIR?=pubkeys
+ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+ 
++WERROR = -Werror
+ CFLAGS += -O2 -fpic
+-CFLAGS += -std=gnu99 -Wall -Werror -pedantic
++CFLAGS += -std=gnu99 -Wall $(WERROR) -pedantic
+ CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+ LDLIBS += $(LDLIBREG)
+-- 
+2.3.1
+
diff --git a/net-wireless/crda/files/crda-3.18-openssl.patch b/net-wireless/crda/files/crda-3.18-openssl.patch
new file mode 100644
index 000000000000..9147e862ee5a
--- /dev/null
+++ b/net-wireless/crda/files/crda-3.18-openssl.patch
@@ -0,0 +1,44 @@
+From af009b7599d705a1023d7bc95c485e5a8776d2b8 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 4 Mar 2015 14:07:37 -0500
+Subject: [PATCH] fix openssl generation
+
+This file uses BN_ULONG but doesn't include the openssl headers leading
+to build failures:
+keys-ssl.c:2:8: error: unknown type name 'BN_ULONG'
+ static BN_ULONG e_0[1] = {
+
+The large unqualified constants also break building:
+keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow]
+  0x63a2705416a0d8e1, 0xdc9fca11c8ba757b,
+  ^
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ utils/key2pub.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/utils/key2pub.py b/utils/key2pub.py
+index 3e84cd2..c504aca 100755
+--- a/utils/key2pub.py
++++ b/utils/key2pub.py
+@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val):
+     for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
+         if not idx:
+             output.write('\t')
+-        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
++        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
+         idx += 1
+         if idx == 2:
+             idx = 0
+@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val):
+ def print_ssl(output, name, val):
+     import struct
+     output.write('#include <stdint.h>\n')
++    output.write('#include <openssl/bn.h>\n')
+     if len(struct.pack('@L', 0)) == 8:
+         return print_ssl_64(output, name, val)
+     else:
+-- 
+2.3.1
+
diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml
index 632557fd08d3..784df934cb05 100644
--- a/net-wireless/crda/metadata.xml
+++ b/net-wireless/crda/metadata.xml
@@ -9,5 +9,8 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<use>
+		<flag name='gcrypt'>Use libgcrypt instead of openssl for key checking</flag>
+	</use>
 </pkgmetadata>