diff options
Diffstat (limited to 'net-wireless/crda')
| -rw-r--r-- | net-wireless/crda/Manifest | 3 | ||||
| -rw-r--r-- | net-wireless/crda/crda-3.18-r3.ebuild (renamed from net-wireless/crda/crda-3.18-r2.ebuild) | 7 | ||||
| -rw-r--r-- | net-wireless/crda/files/crda-3.18-libressl.patch | 11 |
3 files changed, 17 insertions, 4 deletions
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest index 691f5e1297e2..bba6dd80a1ea 100644 --- a/net-wireless/crda/Manifest +++ b/net-wireless/crda/Manifest @@ -1,6 +1,7 @@ AUX crda-1.1.3-missing-include.patch 231 BLAKE2B 5bbc51cc0dc4dc553aa017b3557372a7cdc507fa09da7220794d9db2806ce969baba27360d822b9bc8be5dfb521a5fd6a7c0347c5013233e9642852024dcedb7 SHA512 d24f11a36e798e1da7951efbcd3925d7728a2519c75ff289bfaadc92090f17fb5b9b21010ad960fadfffe6c949b63eddc2b8282508fd5947486f31495cca2afc AUX crda-3.18-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d AUX crda-3.18-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90fbe503130e81fb423e04d3f257e1a1d78db9fef605e42a4d9571c54e8ac9cb8a2569d3c3cd3f5c6d542a295 SHA512 41c98f1e4ca0ae3d22b08086eb54aefd4ec95fed5a6e5fafd55fb6a9b9649ec18f5f65003a1424cf59bf99e266fddf110c92d9e46a4b40a18be5931fc7bbbbeb +AUX crda-3.18-libressl.patch 410 BLAKE2B c341e349348eb7ce1ca3979865a2a984e44e62786508fe4d93c461abdded1f1169a87a72d90ce4518e3aed1307a4624857e6a563868b303e297a56e6fbf92211 SHA512 205f06886ea5a43f870bc38f3a548ee0f2e10ebc461c3748262bfda521c6145f625ee261089256d3c5dc5d791d1688d072a3f4299ca8af89f311c3f9a74ecc69 AUX crda-3.18-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28 AUX crda-3.18-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9 AUX crda-3.18-openssl-1.1.0-compatibility.patch 8782 BLAKE2B 7906eedd86aca173199ec957516167cf940d41da668cc7c5b5935232984f88960c1e00c87dfcd03c7d068cdb9168525378c46e1c52b28a9714d14cddce9240df SHA512 417a67139f61c467cd13274d0e6ad1542107dbb00765beed5becccdb64ac0228236498241e1fba9dfd4a5e1acb04ee583c435b699cca9b6a6461e5b7e86328cb @@ -9,5 +10,5 @@ DIST crda-1.1.3.tar.bz2 38697 BLAKE2B 5ca68362a134e6f5fad1a450edc3cfc083686d4575 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588 EBUILD crda-1.1.3-r1.ebuild 1611 BLAKE2B 9e28635e093a1746b5b8d27cab156400f6aa7597054395058c0d91722d358ca581fb871b29d8e1a7bdf992b75903464006b2afa3ed001c75fd31adac9c0ae0e8 SHA512 de63b4c8ffdcb047c6d2dead406734e2cf1a3275918a88d64ff58cc0e27870f9355e3011d690609b92d18db09d788c0f65e673b1508c3f6efba58e8262a66e61 EBUILD crda-3.18-r1.ebuild 2070 BLAKE2B 50b262cb62ee430d28e11383e53e8840d82f453d0cdaba60a1968f8dada923788f2679c5592ebd9a5b12ae6a3b471c9d7a55a6d61fa538cb17b6769caa6408c4 SHA512 5794efc8708aeeda30e03f17b22c47e03dc9d6a9274f52d18d5de94c4d3582cf427aaba77edee13f4183ec144609072276b11dbdf9433a9ca96028e3c0ec31ec -EBUILD crda-3.18-r2.ebuild 2086 BLAKE2B acf840dee5d1b04210ce24ddbd1fc52847eb4d139d79fa86144e7a540febcb6106c435dcaec3f0188d7432be98474c0be8b424a6b805b1bdbdfa556047d61697 SHA512 db63e7d0cf2ae0019d6102623e8234d1fb56de407dfb869cd1e7f02d2cc0909159cd6363ca8aa908ed27235d329a718d212cf3ac47bf5fa4f4080c86a91ce4c6 +EBUILD crda-3.18-r3.ebuild 2129 BLAKE2B e14e277b0649cec25afaaf0dbf8436f5b2b7b48c0d883343956c6511675129b7babe67862b63f848ca78d890e06037ee62af85fe18366a14e441c28fc581cef7 SHA512 e7775545e7257ea3c4f22ad64753038e5f665ccf9c73afbb1b9fa48f03d8f4c3ccefd533b19d674315697fd3948d4c3dcf5eb411deed056e47d8e667cb2ed49b MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59 diff --git a/net-wireless/crda/crda-3.18-r2.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild index c8ed53fe48e1..c278c0611d91 100644 --- a/net-wireless/crda/crda-3.18-r2.ebuild +++ b/net-wireless/crda/crda-3.18-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,9 +18,9 @@ IUSE="gcrypt libressl" RDEPEND="!gcrypt? ( !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + libressl? ( dev-libs/libressl:0= ) ) - gcrypt? ( dev-libs/libgcrypt:0 ) + gcrypt? ( dev-libs/libgcrypt:0= ) dev-libs/libnl:3 net-wireless/wireless-regdb" DEPEND="${RDEPEND} @@ -38,6 +38,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.18-cflags.patch "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436 "${FILESDIR}"/${PN}-3.18-openssl-1.1.0-compatibility.patch #652428 + "${FILESDIR}"/${PN}-3.18-libressl.patch ) src_prepare() { diff --git a/net-wireless/crda/files/crda-3.18-libressl.patch b/net-wireless/crda/files/crda-3.18-libressl.patch new file mode 100644 index 000000000000..817f2e0328cc --- /dev/null +++ b/net-wireless/crda/files/crda-3.18-libressl.patch @@ -0,0 +1,11 @@ +--- crda-3.18/reglib.c 2018-10-26 12:39:19.128083735 +1100 ++++ crda-3.18.a/reglib.c 2018-10-26 12:42:39.737916626 +1100 +@@ -111,7 +111,7 @@ int reglib_verify_db_signature(uint8_t * + goto out; + } + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) + rsa->e = rsa_e; + rsa->n = rsa_n; + #else |