Fix libreg linkage #542436 by Rémi Cardona.

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

4 files changed, 53 insertions, 17 deletions

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index a8c07b41cb06..6de27d14185b 100644
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,10 @@
 # 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.70 2015/03/04 19:52:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.71 2015/03/08 03:32:24 vapier Exp $
+
+  08 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/crda-3.18-libreg-link.patch, crda-3.18.ebuild:
+  Fix libreg linkage #542436 by Rémi Cardona.
 
 *crda-3.18 (04 Mar 2015)
 
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 2203a4154570..c7284d07dbf3 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -3,6 +3,7 @@ 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-libreg-link.patch 888 SHA256 ef78e82ba641e27649d6c49b63653cad1e1fefbd8c1e3d1f98660cf25403cb4a SHA512 c920fa70312b1d7334a4c3ca470864d3b95329784481e30a319d813e111646ae736edeefb53eb5985ee179a8978310d6f048e2c16fce815aa66cbe2c739303a3 WHIRLPOOL 05d986d7c77229dca3965a767406b5bdff038313e160f04503989a2d7181999e1a390fb8d8ee4554f14429f9fa91aebda27440c79c3582151f531c905a54ffac
 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
@@ -14,23 +15,23 @@ EBUILD crda-1.1.2-r3.ebuild 1303 SHA256 224c8c3ee63e6d9bd3e20f3affc5572546b9caf9
 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
-EBUILD crda-3.18.ebuild 2067 SHA256 b9cb12f02cbcd294802d54ced0cefa6221fcd95647693bb73f65e5d2a165e719 SHA512 5bd402c4a59a104dc197b3551ab544f215aa0863a53c7fbc9a603dbffb31ad5c2b69afcb62cbcd00058b5364257b1ad061540d0a80b46d85ad259001b84ac03e WHIRLPOOL edd2199e7188f623b6cbff4c81c569a4ed78a2ce7aa843ebd5ca361a7333476a06683473c239e9df12eb5e942cc3b00f4333439ffeded5ac7bd602fecf69d044
-MISC ChangeLog 10583 SHA256 d2feff89e8fceea4f15f13a4bf5519fdcfb28779be7a5f6a133ab62c125dd48a SHA512 f7c1f69268842b576e28de52196b2e7f5e1ac659bcee09ba5f09a29bb9a384ed0082ce618e83a17742953a189d5ad6992e9f42a06b34ae6560fcd97e1ffd3293 WHIRLPOOL 8a66d4043cd549be7a46c997a44c4ca350eeb186c27c5aa4cc0d7687e5696e316c6423e601f3ff68a10915a3e9e51239aa24b965d388c6ac6c744d300882cbd2
+EBUILD crda-3.18.ebuild 2126 SHA256 305b387ecb42f9ba7dfef6289db4f818fc5432fb1c9c13e0684d427378aae82f SHA512 dd4ecebd6d13a49453f804e2ff375cf01999126247613ec7c4d3b3f554ccaac1105a8dbe16efe2e7d9eba50b1eaeaec484e74da20389236959cc4aa7d5d5898a WHIRLPOOL 7eedcc4395dda39853700ce3763224267ba9e6600ade685f1fbd5b1e809ff639e001c8d4ad6bdccb379a56f2ba315bc875dbb2ca1fff96dc2e36db14e63328f7
+MISC ChangeLog 10737 SHA256 a23865fd09f4e0e15c2dac280965cd5ad4d4199157ced928fdd6f8bdf444de69 SHA512 01a0dae9963b586dd9bce43e339d3ade2bbd10f30270399bca5a1c8bd44938bac14bfa96d87bda205bf2a7befd90b5fba8a344408205f80bda64d519799112f4 WHIRLPOOL d319ca205f6d1311d087b583265abef14f566f0583d1d3d938346cf37907baa2a7ccdead408b7105ab3b877730643b7e2c186b1c00467ecc16964e52c85a4128
 MISC metadata.xml 434 SHA256 a3ec7036405666bbb6082583502a79d55f066bcad3f1dc382eff959986acb41d SHA512 4bdab4b4019296a1575331290ea2890c6b1fdd540011d7533a77e3781f511c06496bf7666c490c87ac725a0bef9e0936cdb8b434c24eee9709bd70329a4cf2c1 WHIRLPOOL 15a207c0e8c3cad6eca1f821ca90b2ab14454075662bd93dc4af5f7c9eb62d94d986103b8fb0a2f1094a3ba79c339a7d55c0609bc548313bee3a250622c866db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJU+8LKAAoJEPGu1DbS6WIAffAP/23F3q1WTjN3Ueu89Cg2QUzM
+FULjRFoKQgdF52q0X7/IFJigOaupFBlv0xvdNp305DHm+05mQqRH6wzQk938SM3w
+3/WFXChzhT5USrob8oFmlbO4X6CC7k2w0+GN/zNUfEFHYGOokoOIC+yOFo+pnSEP
+VWKfYFWAbe/I/ZcfRhfu29rcsy6XJXejANQ8xTI1WtwL+4u2SmPuJ1gT/D5NNHeO
+Bf6E6DV1vqGxmMB9zSZ6SYp0M/SHIdqvXHlz+/53T+ZjFhwvjK7UScH0SJXFyuVF
+H76GjVHuiL6J1sakmF9vrgZb83wt9ERVAHQJ7o3psj2QmJz/oR2q2sd/VgZo8BKP
+7F3x5M2TAa/HPYBe9Zt8oE9w72T2+pvanPop7XJz7enQ1niSxmFsjcJd7FTkRS9S
+76YUNfsueXU+SHmqqfgGwi08B4AlnJpSodbUVr+OslE8SDyCrvghnwxUqfYNznLY
+ldw9IX9pZPBBzVq+txZq9W/6cJc272zfaiCwtLAdBOv/ITnMqlC9X0AUtqjKqBxn
+Sl9WQ6kUULSR1rG3yNLxdxebpxKSPIuGWLMUeSAYwB7HyM9CZcbFFX+IOmpzfKns
+NyoEM2lXPpU4whMb6lAqlYlqWjGP4SBRLxciRImY7Npz/Hmf2hiDTnRik8GzFtix
+wy8Odazqt/1Pg0mKveY8
+=ou1/
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/crda/crda-3.18.ebuild b/net-wireless/crda/crda-3.18.ebuild
index 7589e1df3767..4ab186cf569b 100644
--- a/net-wireless/crda/crda-3.18.ebuild
+++ b/net-wireless/crda/crda-3.18.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-3.18.ebuild,v 1.2 2015/03/08 03:32:24 vapier Exp $
 
 EAPI=5
 
@@ -35,6 +35,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.18-no-werror.patch
 	epatch "${FILESDIR}"/${PN}-3.18-openssl.patch
 	epatch "${FILESDIR}"/${PN}-3.18-cflags.patch
+	epatch "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436
 	sed -i \
 		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
 		Makefile || die
diff --git a/net-wireless/crda/files/crda-3.18-libreg-link.patch b/net-wireless/crda/files/crda-3.18-libreg-link.patch
new file mode 100644
index 000000000000..b5819028ba23
--- /dev/null
+++ b/net-wireless/crda/files/crda-3.18-libreg-link.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/542436
+
+From f56ab87b25f2228a67ac592a1c18793c72dd03eb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 7 Mar 2015 22:29:33 -0500
+Subject: [PATCH crda] libreg: link against crypto libs
+
+Since libreg uses funcs from the crypto lib, make sure we link them.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8e345a1..77708e6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -117,7 +117,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
+ 
+ $(LIBREG): regdb.h reglib.h reglib.c
+ 	$(NQ) '  CC  ' $@
+-	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^
++	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDLIBS)
+ 
+ install-libreg-headers:
+ 	$(NQ) '  INSTALL  libreg-headers'
+-- 
+2.3.1
+