From 0704956f7256f1f618cc5e03af2c1dbd0e83dbc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Jan 2020 16:18:18 +0000 Subject: gentoo resync : 16.01.2020 --- net-wireless/Manifest.gz | Bin 18245 -> 18241 bytes net-wireless/crda/Manifest | 19 +- net-wireless/crda/crda-3.18-r3.ebuild | 14 +- net-wireless/crda/crda-4.14.ebuild | 84 ++++++ net-wireless/crda/files/crda-3.18-cflags.patch | 33 --- net-wireless/crda/files/crda-3.18-ldflags.patch | 11 - .../crda/files/crda-3.18-libreg-link.patch | 30 -- net-wireless/crda/files/crda-3.18-libressl.patch | 11 - .../crda/files/crda-3.18-no-ldconfig.patch | 28 -- net-wireless/crda/files/crda-3.18-no-werror.patch | 32 --- .../crda/files/crda-4.14-do-not-compress-doc.patch | 36 +++ .../crda-4.14-openssl-1.1.0-compatibility.patch | 314 +++++++++++++++++++++ net-wireless/crda/files/crda-4.14-python-3.patch | 93 ++++++ net-wireless/crda/files/crda-cflags.patch | 33 +++ net-wireless/crda/files/crda-ldflags.patch | 11 + net-wireless/crda/files/crda-libreg-link.patch | 30 ++ net-wireless/crda/files/crda-libressl.patch | 11 + net-wireless/crda/files/crda-no-ldconfig.patch | 28 ++ net-wireless/crda/files/crda-no-werror.patch | 32 +++ net-wireless/gnuradio/Manifest | 8 +- net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild | 5 +- net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild | 10 +- net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 10 +- net-wireless/gnuradio/gnuradio-9999.ebuild | 5 +- net-wireless/jackit/Manifest | 2 +- net-wireless/jackit/jackit-0.0_p20170918.ebuild | 4 +- 26 files changed, 722 insertions(+), 172 deletions(-) create mode 100644 net-wireless/crda/crda-4.14.ebuild delete mode 100644 net-wireless/crda/files/crda-3.18-cflags.patch delete mode 100644 net-wireless/crda/files/crda-3.18-ldflags.patch delete mode 100644 net-wireless/crda/files/crda-3.18-libreg-link.patch delete mode 100644 net-wireless/crda/files/crda-3.18-libressl.patch delete mode 100644 net-wireless/crda/files/crda-3.18-no-ldconfig.patch delete mode 100644 net-wireless/crda/files/crda-3.18-no-werror.patch create mode 100644 net-wireless/crda/files/crda-4.14-do-not-compress-doc.patch create mode 100644 net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch create mode 100644 net-wireless/crda/files/crda-4.14-python-3.patch create mode 100644 net-wireless/crda/files/crda-cflags.patch create mode 100644 net-wireless/crda/files/crda-ldflags.patch create mode 100644 net-wireless/crda/files/crda-libreg-link.patch create mode 100644 net-wireless/crda/files/crda-libressl.patch create mode 100644 net-wireless/crda/files/crda-no-ldconfig.patch create mode 100644 net-wireless/crda/files/crda-no-werror.patch (limited to 'net-wireless') diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz index c101b9ec075c..4690157d0634 100644 Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest index 685e26ea60bd..1904c2856f09 100644 --- a/net-wireless/crda/Manifest +++ b/net-wireless/crda/Manifest @@ -1,10 +1,15 @@ -AUX crda-3.18-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d -AUX crda-3.18-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f -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 +AUX crda-4.14-do-not-compress-doc.patch 1367 BLAKE2B 021a25a898dc225e52bee293ba94152e5f7e8229c5c0a813a126f239819fd727edfa34c9b85f25e31d7630c13598f797dfcd855d31fd28beec5443866f3841fb SHA512 d3545fff1f6c6ae9ae1ae9c833bb137f84783a32dfb9e2f50075079268f67ee1b001fc904d99c68ff0aad97d674fabd591c1ca2ba378e14551759e56bc3f2e45 +AUX crda-4.14-openssl-1.1.0-compatibility.patch 8821 BLAKE2B 3f679378829d2d39fcac69a111d1caa551cb1b5ee51c34aab48fa3a84847fcb98771126856bc95b6af4462539fed1987682a4528cbc47a17ab03a14b23a3b8fe SHA512 9203965c228bfc7f694380e727ceee0654b18b8da81d49c5d9d379d94087d8f6e972894034c2245086366832d181b7d69180bada5199baff1c90b2012248fc15 +AUX crda-4.14-python-3.patch 2808 BLAKE2B 6353678cf583c83e7f077209b6f6f7b7ff506239958aa20a66c57a47f6a02d7de9003bc344d1b453dd239b87c7b8649e31a6c4f6e7aecfeb6a40375d75519e6f SHA512 7f9a7dc492d5b46f7cfeaf7902cc37be4763bd5dabe049df5eab1d3b903712a43153de65ef9184df364aeaac6f57d73afcd634e3cea8c0ebdb3aee118f1c9364 +AUX crda-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d +AUX crda-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f +AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90fbe503130e81fb423e04d3f257e1a1d78db9fef605e42a4d9571c54e8ac9cb8a2569d3c3cd3f5c6d542a295 SHA512 41c98f1e4ca0ae3d22b08086eb54aefd4ec95fed5a6e5fafd55fb6a9b9649ec18f5f65003a1424cf59bf99e266fddf110c92d9e46a4b40a18be5931fc7bbbbeb +AUX crda-libressl.patch 410 BLAKE2B c341e349348eb7ce1ca3979865a2a984e44e62786508fe4d93c461abdded1f1169a87a72d90ce4518e3aed1307a4624857e6a563868b303e297a56e6fbf92211 SHA512 205f06886ea5a43f870bc38f3a548ee0f2e10ebc461c3748262bfda521c6145f625ee261089256d3c5dc5d791d1688d072a3f4299ca8af89f311c3f9a74ecc69 +AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28 +AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588 -EBUILD crda-3.18-r3.ebuild 2171 BLAKE2B 0e23394b5a5b51754b1b3165cac0cae8be1d70395134bdd2d6cd06631efdbb0cfb47faef1ed16556922a018ba4f69ade67f53cb68bc1c383844383c4e2bf8f9c SHA512 4aee854e3516bfa14494543645b0926885ef700b6a5144b31805c98b7f2149cf3c935cbcd40b77355398698835edacc27c77cc196e2e9ba3cef7a03827e340aa +DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053 +EBUILD crda-3.18-r3.ebuild 2141 BLAKE2B f8ce3772934e945d9222793d4f06a8243df581c1e6f03ef972ad39844fc225bb5675cf3c65c096eb7be13232196f0ca11ace26084b8ef48235a256047effbd02 SHA512 e03b4a5e02ce374bb760ad659e08e165fd7bba6e5547ca6aad933ab54fd3d38fbff746b31df90c1335bed0662d4b86b7600fa3d64a60ad86b1ebae6daf4d809a +EBUILD crda-4.14.ebuild 2231 BLAKE2B b85f56aceeaa096887848775d01f5995c27d09e0756a3f92d368f2c82d5cb4aa01451ffe8fd92f9062abdf62a5f485af52ba680f60bfaf833c3db3797f520a37 SHA512 84f6688ee216a8f2f7530f4b17d694facaeee02ceac1a4202eaea6e83c2f92052f5f27eeaa95d0b757df19fdd8aa72ea04f3456168305bee8a3ccd7e94962fbc MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59 diff --git a/net-wireless/crda/crda-3.18-r3.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild index c1fa8bd32e47..42a8e00147ae 100644 --- a/net-wireless/crda/crda-3.18-r3.ebuild +++ b/net-wireless/crda/crda-3.18-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2019 Gentoo Authors +# Copyright 2008-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,13 +33,13 @@ python_check_deps() { } PATCHES=( - "${FILESDIR}"/${PN}-3.18-no-ldconfig.patch - "${FILESDIR}"/${PN}-3.18-no-werror.patch - "${FILESDIR}"/${PN}-3.18-cflags.patch - "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436 + "${FILESDIR}"/${PN}-no-ldconfig.patch + "${FILESDIR}"/${PN}-no-werror.patch + "${FILESDIR}"/${PN}-cflags.patch + "${FILESDIR}"/${PN}-libreg-link.patch #542436 "${FILESDIR}"/${PN}-3.18-openssl-1.1.0-compatibility.patch #652428 - "${FILESDIR}"/${PN}-3.18-libressl.patch - "${FILESDIR}"/${PN}-3.18-ldflags.patch + "${FILESDIR}"/${PN}-libressl.patch + "${FILESDIR}"/${PN}-ldflags.patch ) src_prepare() { diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild new file mode 100644 index 000000000000..380cc3d2f089 --- /dev/null +++ b/net-wireless/crda/crda-4.14.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) +inherit 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="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="gcrypt libressl" + +RDEPEND="!gcrypt? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl: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}]" +} + +PATCHES=( + "${FILESDIR}"/${PN}-no-ldconfig.patch + "${FILESDIR}"/${PN}-no-werror.patch + "${FILESDIR}"/${PN}-cflags.patch + "${FILESDIR}"/${PN}-libreg-link.patch #542436 + "${FILESDIR}"/${PN}-4.14-python-3.patch + "${FILESDIR}"/${PN}-4.14-openssl-1.1.0-compatibility.patch #652428 + "${FILESDIR}"/${PN}-libressl.patch + "${FILESDIR}"/${PN}-ldflags.patch + "${FILESDIR}"/${PN}-4.14-do-not-compress-doc.patch +) + +src_prepare() { + default + sed -i \ + -e "s:\:$(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 deleted file mode 100644 index 6edbded822cc..000000000000 --- a/net-wireless/crda/files/crda-3.18-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c5b0741ea7fc12e9f6a2a309296ed412a999d0f7 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -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 ---- - 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-ldflags.patch b/net-wireless/crda/files/crda-3.18-ldflags.patch deleted file mode 100644 index 5ba9165c7adc..000000000000 --- a/net-wireless/crda/files/crda-3.18-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /Makefile -+++ /Makefile -@@ -115,7 +115,7 @@ - - $(LIBREG): regdb.h reglib.h reglib.c - $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' diff --git a/net-wireless/crda/files/crda-3.18-libreg-link.patch b/net-wireless/crda/files/crda-3.18-libreg-link.patch deleted file mode 100644 index 0aa1b6e87a39..000000000000 --- a/net-wireless/crda/files/crda-3.18-libreg-link.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/542436 - -From f56ab87b25f2228a67ac592a1c18793c72dd03eb Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -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 ---- - 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) $^ $(filter-out -lreg,$(LDLIBS)) - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' --- -2.3.1 - diff --git a/net-wireless/crda/files/crda-3.18-libressl.patch b/net-wireless/crda/files/crda-3.18-libressl.patch deleted file mode 100644 index 817f2e0328cc..000000000000 --- a/net-wireless/crda/files/crda-3.18-libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/net-wireless/crda/files/crda-3.18-no-ldconfig.patch b/net-wireless/crda/files/crda-3.18-no-ldconfig.patch deleted file mode 100644 index a5cc42084d53..000000000000 --- a/net-wireless/crda/files/crda-3.18-no-ldconfig.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b11d83df189670defe4a29c624f2930351c13df2 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -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 ---- - 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 deleted file mode 100644 index 6abb78c984e4..000000000000 --- a/net-wireless/crda/files/crda-3.18-no-werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 37384d22ba0ab622a5848a9a794084e6064fc905 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -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 ---- - 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-4.14-do-not-compress-doc.patch b/net-wireless/crda/files/crda-4.14-do-not-compress-doc.patch new file mode 100644 index 000000000000..428bafbde44f --- /dev/null +++ b/net-wireless/crda/files/crda-4.14-do-not-compress-doc.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile b/Makefile +index 335d17d..683a379 100644 +--- a/Makefile ++++ b/Makefile +@@ -157,11 +157,7 @@ verify: $(REG_BIN) regdbdump + LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) \ + ./regdbdump $(REG_BIN) >/dev/null + +-%.gz: % +- @$(NQ) ' GZIP' $< +- $(Q)gzip < $< > $@ +- +-install: install-libreg install-libreg-headers crda crda.8.gz regdbdump.8.gz ++install: install-libreg install-libreg-headers crda crda.8 regdbdump.8 + $(NQ) ' INSTALL crda' + $(Q)$(MKDIR) $(DESTDIR)/$(SBINDIR) + $(Q)$(INSTALL) -m 755 -t $(DESTDIR)/$(SBINDIR) crda +@@ -177,13 +173,13 @@ install: install-libreg install-libreg-headers crda crda.8.gz regdbdump.8.gz + $(Q)$(INSTALL) -m 644 -t \ + $(DESTDIR)/$(UDEV_RULE_DIR)/ \ + udev/$(UDEV_LEVEL)regulatory.rules +- $(NQ) ' INSTALL crda.8.gz' ++ $(NQ) ' INSTALL crda.8' + $(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/ +- $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ crda.8.gz +- $(NQ) ' INSTALL regdbdump.8.gz' +- $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ regdbdump.8.gz ++ $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ crda.8 ++ $(NQ) ' INSTALL regdbdump.8' ++ $(Q)$(INSTALL) -m 644 -t $(DESTDIR)/$(MANDIR)/man8/ regdbdump.8 + + clean: + $(Q)rm -f $(LIBREG) crda regdbdump intersect db2rd optimize \ +- *.o *~ *.pyc keys.c *.gz \ ++ *.o *~ *.pyc keys.c \ + udev/$(UDEV_LEVEL)regulatory.rules udev/regulatory.rules.parsed diff --git a/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch b/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch new file mode 100644 index 000000000000..a9999da239fd --- /dev/null +++ b/net-wireless/crda/files/crda-4.14-openssl-1.1.0-compatibility.patch @@ -0,0 +1,314 @@ +From 338637ac08c19708eb35523894b44bbe3c726cfa Mon Sep 17 00:00:00 2001 +From: quentin +Date: Mon, 2 Apr 2018 18:07:50 +0200 +Subject: [PATCH] crda: Fix for OpenSSL 1.1.0: BIGNUM now opaque + +OpenSSL 1.1.0 makes most of OpenSSL's structures opaque, and provides +functions to manipulate them. This means it's no longer possible to +construct an OpenSSL BIGNUM directly from scratch, as was done in +keys-ssl.c. + +Use BN_bin2bn() (available since OpenSSL 0.9.8) to build the bignum from +its big-endian representation as a byte array. + +This also allows factoring the code in utils/key2pub.py as it's now the +same mechanism as with libgcrypt. + +This was tested with OpenSSL 1.1.0g. + +Signed-off-by: Quentin Minster +--- + Makefile | 12 +++---- + reglib.c | 44 +++++++++++++++++------ + utils/key2pub.py | 107 ++++++------------------------------------------------- + 3 files changed, 49 insertions(+), 114 deletions(-) + +diff --git a/Makefile b/Makefile +index a3ead30..a4e7373 100644 +--- a/Makefile ++++ b/Makefile +@@ -38,18 +38,16 @@ all: all_noverify verify + + all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize + ++$(LIBREG): keys.c ++ + ifeq ($(USE_OPENSSL),1) + CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` + LDLIBS += `pkg-config --libs openssl` + +-$(LIBREG): keys-ssl.c +- + else + CFLAGS += -DUSE_GCRYPT + LDLIBS += -lgcrypt + +-$(LIBREG): keys-gcrypt.c +- + endif + MKDIR ?= mkdir -p + INSTALL ?= install +@@ -109,10 +107,10 @@ $(REG_BIN): + $(NQ) + $(Q) exit 1 + +-keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) ++keys.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + $(NQ) ' GEN ' $@ + $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) +- $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ ++ $(Q)./utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) $@ + + $(LIBREG): regdb.h reglib.h reglib.c + $(NQ) ' CC ' $@ +@@ -187,5 +185,5 @@ install: install-libreg install-libreg-headers crda crda.8.gz regdbdump.8.gz + + clean: + $(Q)rm -f $(LIBREG) crda regdbdump intersect db2rd optimize \ +- *.o *~ *.pyc keys-*.c *.gz \ ++ *.o *~ *.pyc keys.c *.gz \ + udev/$(UDEV_LEVEL)regulatory.rules udev/regulatory.rules.parsed +diff --git a/reglib.c b/reglib.c +index e00e9b8..00f7f56 100644 +--- a/reglib.c ++++ b/reglib.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #endif + + #ifdef USE_GCRYPT +@@ -30,12 +31,8 @@ + + #include "reglib.h" + +-#ifdef USE_OPENSSL +-#include "keys-ssl.c" +-#endif +- +-#ifdef USE_GCRYPT +-#include "keys-gcrypt.c" ++#if defined(USE_OPENSSL) || defined(USE_GCRYPT) ++#include "keys.c" + #endif + + int debug = 0; +@@ -81,7 +78,8 @@ reglib_array_len(size_t baselen, unsigned int elemcount, size_t elemlen) + #ifdef USE_OPENSSL + int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) + { +- RSA *rsa; ++ RSA *rsa = NULL; ++ BIGNUM *rsa_e = NULL, *rsa_n = NULL; + uint8_t hash[SHA_DIGEST_LENGTH]; + unsigned int i; + int ok = 0; +@@ -102,15 +100,35 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) + goto out; + } + +- rsa->e = &keys[i].e; +- rsa->n = &keys[i].n; ++ rsa_e = BN_bin2bn(keys[i].e, keys[i].len_e, NULL); ++ if (!rsa_e) { ++ fprintf(stderr, "Failed to convert value for RSA e.\n"); ++ goto out; ++ } ++ rsa_n = BN_bin2bn(keys[i].n, keys[i].len_n, NULL); ++ if (!rsa_n) { ++ fprintf(stderr, "Failed to convert value for RSA n.\n"); ++ goto out; ++ } ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ rsa->e = rsa_e; ++ rsa->n = rsa_n; ++#else ++ if (RSA_set0_key(rsa, rsa_n, rsa_e, NULL) != 1) { ++ fprintf(stderr, "Failed to set RSA key.\n"); ++ goto out; ++ } ++#endif ++ /* BIGNUMs now owned by the RSA object */ ++ rsa_e = NULL; ++ rsa_n = NULL; + + ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH, + db + dblen, siglen, rsa) == 1; + +- rsa->e = NULL; +- rsa->n = NULL; + RSA_free(rsa); ++ rsa = NULL; + } + if (!ok && (pubkey_dir = opendir(PUBKEY_DIR))) { + while (!ok && (nextfile = readdir(pubkey_dir))) { +@@ -123,6 +141,7 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) + ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH, + db + dblen, siglen, rsa) == 1; + RSA_free(rsa); ++ rsa = NULL; + fclose(keyfile); + } + } +@@ -133,6 +152,9 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen) + fprintf(stderr, "Database signature verification failed.\n"); + + out: ++ RSA_free(rsa); ++ BN_free(rsa_e); ++ BN_free(rsa_n); + return ok; + } + #endif /* USE_OPENSSL */ +diff --git a/utils/key2pub.py b/utils/key2pub.py +index 9bb04cd..1919270 100755 +--- a/utils/key2pub.py ++++ b/utils/key2pub.py +@@ -9,84 +9,7 @@ except ImportError as e: + sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') + sys.exit(1) + +-def print_ssl_64(output, name, val): +- while val[0:1] == b'\0': +- val = val[1:] +- while len(val) % 8: +- val = b'\0' + val +- vnew = [] +- while len(val): +- vnew.append((val[0:1], val[1:2], val[2:3], val[3:4], val[4:5], val[5:6], val[6:7], val[7:8])) +- val = val[8:] +- vnew.reverse() +- output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) +- idx = 0 +- 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))) +- idx += 1 +- if idx == 2: +- idx = 0 +- output.write('\n') +- if idx: +- output.write('\n') +- output.write('};\n\n') +- +-def print_ssl_32(output, name, val): +- while val[0:1] == b'\0': +- val = val[1:] +- while len(val) % 4: +- val = b'\0' + val +- vnew = [] +- while len(val): +- vnew.append((val[0:1], val[1:2], val[2:3], val[3:4])) +- val = val[4:] +- vnew.reverse() +- output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) +- idx = 0 +- for v1, v2, v3, v4 in vnew: +- if not idx: +- output.write('\t') +- output.write('0x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4))) +- idx += 1 +- if idx == 4: +- idx = 0 +- output.write('\n') +- if idx: +- output.write('\n') +- output.write('};\n\n') +- +-def print_ssl(output, name, val): +- import struct +- output.write('#include \n') +- if len(struct.pack('@L', 0)) == 8: +- return print_ssl_64(output, name, val) +- else: +- return print_ssl_32(output, name, val) +- +-def print_ssl_keys(output, n): +- output.write(r''' +-struct pubkey { +- struct bignum_st e, n; +-}; +- +-#define KEY(data) { \ +- .d = data, \ +- .top = sizeof(data)/sizeof(data[0]), \ +-} +- +-#define KEYS(e,n) { KEY(e), KEY(n), } +- +-static struct pubkey keys[] = { +-''') +- for n in range(n + 1): +- output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) +- output.write('};\n') +- pass +- +-def print_gcrypt(output, name, val): +- output.write('#include \n') ++def print_bignum(output, name, val): + while val[0:1] == b'\0': + val = val[1:] + output.write('static const uint8_t %s[%d] = {\n' % (name, len(val))) +@@ -103,11 +26,11 @@ def print_gcrypt(output, name, val): + output.write('\n') + output.write('};\n\n') + +-def print_gcrypt_keys(output, n): ++def print_keys(output, n): + output.write(r''' + struct key_params { + const uint8_t *e, *n; +- uint32_t len_e, len_n; ++ const uint32_t len_e, len_n; + }; + + #define KEYS(_e, _n) { \ +@@ -120,25 +43,17 @@ static const struct key_params __attribute__ ((unused)) keys[] = { + for n in range(n + 1): + output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) + output.write('};\n') +- + +-modes = { +- '--ssl': (print_ssl, print_ssl_keys), +- '--gcrypt': (print_gcrypt, print_gcrypt_keys), +-} + +-try: +- mode = sys.argv[1] +- files = sys.argv[2:-1] +- outfile = sys.argv[-1] +-except IndexError: +- mode = None ++files = sys.argv[1:-1] ++outfile = sys.argv[-1] + +-if not mode in modes: +- print('Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))) ++if len(files) == 0: ++ print('Usage: %s input-file... output-file' % sys.argv[0]) + sys.exit(2) + + output = open(outfile, 'w') ++output.write('#include \n\n\n') + + # load key + idx = 0 +@@ -148,10 +63,10 @@ for f in files: + except RSA.RSAError: + key = RSA.load_key(f) + +- modes[mode][0](output, 'e_%d' % idx, key.e[4:]) +- modes[mode][0](output, 'n_%d' % idx, key.n[4:]) ++ print_bignum(output, 'e_%d' % idx, key.e[4:]) ++ print_bignum(output, 'n_%d' % idx, key.n[4:]) + idx += 1 + +-modes[mode][1](output, idx - 1) ++print_keys(output, idx - 1) + + output.close() diff --git a/net-wireless/crda/files/crda-4.14-python-3.patch b/net-wireless/crda/files/crda-4.14-python-3.patch new file mode 100644 index 000000000000..97db1ac05294 --- /dev/null +++ b/net-wireless/crda/files/crda-4.14-python-3.patch @@ -0,0 +1,93 @@ +--- /utils/key2pub.py ++++ /utils/key2pub.py +@@ -3,20 +3,20 @@ + import sys + try: + from M2Crypto import RSA +-except ImportError, e: ++except ImportError as e: + sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message) + sys.stderr.write('Please install the "M2Crypto" Python module.\n') + sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') + sys.exit(1) + + def print_ssl_64(output, name, val): +- while val[0] == '\0': ++ while val[0:1] == b'\0': + val = val[1:] + while len(val) % 8: +- val = '\0' + val ++ val = b'\0' + val + vnew = [] + while len(val): +- vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7])) ++ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4], val[4:5], val[5:6], val[6:7], val[7:8])) + val = val[8:] + vnew.reverse() + output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) +@@ -34,13 +34,13 @@ + output.write('};\n\n') + + def print_ssl_32(output, name, val): +- while val[0] == '\0': ++ while val[0:1] == b'\0': + val = val[1:] + while len(val) % 4: +- val = '\0' + val ++ val = b'\0' + val + vnew = [] + while len(val): +- vnew.append((val[0], val[1], val[2], val[3], )) ++ vnew.append((val[0:1], val[1:2], val[2:3], val[3:4])) + val = val[4:] + vnew.reverse() + output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) +@@ -80,21 +80,21 @@ + + static struct pubkey keys[] = { + ''') +- for n in xrange(n + 1): ++ for n in range(n + 1): + output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) + output.write('};\n') + pass + + def print_gcrypt(output, name, val): + output.write('#include \n') +- while val[0] == '\0': ++ while val[0:1] == b'\0': + val = val[1:] + output.write('static const uint8_t %s[%d] = {\n' % (name, len(val))) + idx = 0 + for v in val: + if not idx: + output.write('\t') +- output.write('0x%.2x, ' % ord(v)) ++ output.write('0x%.2x, ' % (v if sys.version_info[0] >=3 else ord(v))) + idx += 1 + if idx == 8: + idx = 0 +@@ -117,7 +117,7 @@ + + static const struct key_params keys[] = { + ''') +- for n in xrange(n + 1): ++ for n in range(n + 1): + output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) + output.write('};\n') + +@@ -135,7 +135,7 @@ + mode = None + + if not mode in modes: +- print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys())) ++ print('Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))) + sys.exit(2) + + output = open(outfile, 'w') +@@ -153,3 +153,5 @@ + idx += 1 + + modes[mode][1](output, idx - 1) ++ ++output.close() diff --git a/net-wireless/crda/files/crda-cflags.patch b/net-wireless/crda/files/crda-cflags.patch new file mode 100644 index 000000000000..6edbded822cc --- /dev/null +++ b/net-wireless/crda/files/crda-cflags.patch @@ -0,0 +1,33 @@ +From c5b0741ea7fc12e9f6a2a309296ed412a999d0f7 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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 +--- + 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-ldflags.patch b/net-wireless/crda/files/crda-ldflags.patch new file mode 100644 index 000000000000..5ba9165c7adc --- /dev/null +++ b/net-wireless/crda/files/crda-ldflags.patch @@ -0,0 +1,11 @@ +--- /Makefile ++++ /Makefile +@@ -115,7 +115,7 @@ + + $(LIBREG): regdb.h reglib.h reglib.c + $(NQ) ' CC ' $@ +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(filter-out -lreg,$(LDLIBS)) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' diff --git a/net-wireless/crda/files/crda-libreg-link.patch b/net-wireless/crda/files/crda-libreg-link.patch new file mode 100644 index 000000000000..0aa1b6e87a39 --- /dev/null +++ b/net-wireless/crda/files/crda-libreg-link.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/542436 + +From f56ab87b25f2228a67ac592a1c18793c72dd03eb Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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 +--- + 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) $^ $(filter-out -lreg,$(LDLIBS)) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +-- +2.3.1 + diff --git a/net-wireless/crda/files/crda-libressl.patch b/net-wireless/crda/files/crda-libressl.patch new file mode 100644 index 000000000000..817f2e0328cc --- /dev/null +++ b/net-wireless/crda/files/crda-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 diff --git a/net-wireless/crda/files/crda-no-ldconfig.patch b/net-wireless/crda/files/crda-no-ldconfig.patch new file mode 100644 index 000000000000..a5cc42084d53 --- /dev/null +++ b/net-wireless/crda/files/crda-no-ldconfig.patch @@ -0,0 +1,28 @@ +From b11d83df189670defe4a29c624f2930351c13df2 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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 +--- + 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-no-werror.patch b/net-wireless/crda/files/crda-no-werror.patch new file mode 100644 index 000000000000..6abb78c984e4 --- /dev/null +++ b/net-wireless/crda/files/crda-no-werror.patch @@ -0,0 +1,32 @@ +From 37384d22ba0ab622a5848a9a794084e6064fc905 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +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 +--- + 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/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 5ef9a7805929..5625541c2a7f 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -5,8 +5,8 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15 -EBUILD gnuradio-3.6.5.1-r2.ebuild 5127 BLAKE2B ad5cb9725f4a3adfc90deac129121d3b17d9db03dea210e9d9bc04b5279eec5276cb216110e88cab5b6cfeb12c1d213198dc9d50b032a21bc88b16a9945a52d0 SHA512 b36955101eee2a2e92388980c470941d2c6aeb7eb58f23158b21da16174e49640fd9332e5e05626307fccc1233fc6149a9baf8211ba1866ec2dbedc85c24831b -EBUILD gnuradio-3.7.13.5.ebuild 7446 BLAKE2B e3f0e8d79fda81d79b5553689cb7ffe8d55b413085a5e8c64fba199b2932705a7ee68490f2640ac96c198fc2bbfd4f4ad7d25266cd5779c33f42c6706ec6e3ee SHA512 7cfa60facce936cbb2699198fb33d66b9cb052bb4f0ea683090ae1113703ff68bbf22717c2b5ef1b91b14733985fe8196c4049c873a8e0fe1e722714291331ff -EBUILD gnuradio-3.7.9999.ebuild 6928 BLAKE2B 42edb5049dea982659fa60aab34256c76ae68fdb0ea4d3a75e92c1423973ed4749f9c2adf326e5601d325e3ca1f0d3e375272e953a20628e8be61bf7e6700ae3 SHA512 28911fb788d4f4893643f9d3158acdab3f123568b6435d01c36d40ea0bd7d7175dbe56162528c1f557fdc5202a4466def6bbaa483b1c5b5411e2701ba4e6b773 -EBUILD gnuradio-9999.ebuild 6966 BLAKE2B 406a2d6842e326fda4133db19182288be4218a652f08bb5748b4df42b47d99751d76988eaf5728591bd79bdbc8b71af6f597764955fcb38ad09336df726e4aaf SHA512 268428dd1d730db7a26b48ff23ef089de0230717b6481706ac2b7799ba8dc77437f26c5185ab753edb2c2b78ed6c72bcf49679addee3416161ebe649ece5cfbb +EBUILD gnuradio-3.6.5.1-r2.ebuild 5185 BLAKE2B 62bbbfaf2b1eb52c03e52b64eed81a8eb8277443f7d96ad3db5d8b37988ea7ef7c8385234df9a16177d2f9c9cf71b095ea0684d7f4fc737c46502dfdf318c8ff SHA512 b5fbdb677e9e9b9e24c220cdc6e5e536419f8323a93771c750b1d737fc5df7095b60d0fad113e510c9e804a1f882cc08f0170cf37b3c3428dc2d602a72181588 +EBUILD gnuradio-3.7.13.5.ebuild 7562 BLAKE2B bb7bc0cbd9459e328ac7421ac307093068bd50f36d65a1a86d0e05d894683dae6a25639de6ccba2d5c641ef25733932d625b3872e46a166d1f887383a391e28e SHA512 3035dc04e101c4469bcfa442987e6b3b317979027bc7ceb35c059f4b5772398ce7511cfd9cf201c269f91a97b69f234186a18bccd8e7491da4ec757b04e0bfb0 +EBUILD gnuradio-3.7.9999.ebuild 7044 BLAKE2B 8790023c7e47ae868bffc857e311981dd8a6ac47d399390bcaf09d25bbcdf3afcbc4a15a747019ff70248c4de009e44075b22abc4b8e7d2909839391d3c2a1d5 SHA512 72b0636cbb1b32b0fb625ce67b21206d741852065cebb5dcca4cbc9ebe7e55d75c896516aa69a3c894816611a35bb4c2674a0211251b833f974504084bf73c4f +EBUILD gnuradio-9999.ebuild 7021 BLAKE2B a87f63b767d5f9ca490e3a2d3c2bff872cfd67052a4dab9b56a4dd76a4b698ea9aa775575f9ccf1326c3b25baf6676ad924716b289a4d540211a1ba0c8e98836 SHA512 343e65b89adaab9eeb5488da797ab7e62ba4502d0de6b54234a31c08c2b91e7c0cd06fbd07e7b12fb5d8dcd492cfedc6837de9d65534814bfbfd25d3ba237f9b MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699 diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild index 03fd5605be28..5c9dcc316787 100644 --- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild @@ -45,7 +45,10 @@ RDEPEND="${PYTHON_DEPS} ) grc? ( dev-python/lxml[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) dev-python/pygtk:2[${PYTHON_USEDEP}] ) jack? ( diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild index 3c132c32fca0..afa455f35653 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild @@ -64,7 +64,10 @@ RDEPEND="${PYTHON_DEPS} dev-python/cheetah[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) ) jack? ( media-sound/jack-audio-connection-kit @@ -90,7 +93,10 @@ RDEPEND="${PYTHON_DEPS} ) wxwidgets? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) ) zeromq? ( >=net-libs/zeromq-2.1.11 ) " diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild index 15027d0285d7..ff1b29da54eb 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild @@ -61,7 +61,10 @@ RDEPEND="${PYTHON_DEPS} dev-python/cheetah[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) ) jack? ( media-sound/jack-audio-connection-kit @@ -80,7 +83,10 @@ RDEPEND="${PYTHON_DEPS} ) wxwidgets? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) ) zeromq? ( >=net-libs/zeromq-2.1.11 ) " diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild index e99366eabc8c..3861b55c8576 100644 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild @@ -50,7 +50,10 @@ RDEPEND="${PYTHON_DEPS} >=dev-lang/orc-0.4.12 dev-libs/boost:0=[${PYTHON_USEDEP}] !<=dev-libs/boost-1.52.0-r6:0/1.52 - dev-python/numpy[${PYTHON_USEDEP}] + || ( + dev-python/numpy-python2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + ) dev-python/six[${PYTHON_USEDEP}] sci-libs/fftw:3.0= alsa? ( diff --git a/net-wireless/jackit/Manifest b/net-wireless/jackit/Manifest index 9ce0256be7e9..db975c793a60 100644 --- a/net-wireless/jackit/Manifest +++ b/net-wireless/jackit/Manifest @@ -1,3 +1,3 @@ DIST jackit-0.0_p20170918.tar.gz 19104 BLAKE2B 57ba557e8ce0e10af68ed5445dc13ac51661ecd8b7dae7093643968b82d90a3ce3844571b4d84d3355a143382624af1fa16ff6d2432d07a4edc7ed9fd8a4b1fa SHA512 15e11594adf1f95e8b547ca1da9d44d93e263fa8b289a23413492bb9a991fdfc0d20d633c5ba66a9a254f12ad7301793f8456bd9197e1ad4207e5a2dd109babd -EBUILD jackit-0.0_p20170918.ebuild 679 BLAKE2B 878ff6371649cd6839ed851aa35c91dcde41fd7d367f919a7643c79b6a5a2626671f5d60bbea296cdf06bf5ddebef1dad111ea1d729a258f58e96307985b1a34 SHA512 825416ca7d79052bc890f7bfcaabb9a29604208faa551cc7305cc13dcd50b43f59743e767e369b5307babf98b4adc6447e6a854dc2d61df43b407c1f5c586b7f +EBUILD jackit-0.0_p20170918.ebuild 670 BLAKE2B 73baf8e389510153bafa9f9bc587c27d9eccd48b89ecb32c73cfa38a71bd86d40d208fdd2eae748cb15bfe9854493b98dabb28b4887fc2a153176fc319805d3d SHA512 8dcfc26fa4604ff196d9108593b31d45435a570970f643dac067bade4f481de30fff171d417125da5d4209f08b7e3a1c23bbf381d96274d5325456e78cb4bd87 MISC metadata.xml 347 BLAKE2B eb39ba237c6c887ba3ad252447e758af07bd54dad54213350f1db3f1dcda41fbc0e706604e86a4d99344b290c79df24d7908c153b2029b9a686c6a6af3cbc12c SHA512 75f028b7eb6bc20c2b9b401c1bf29a32b9c51aa4ec247e1d9effc8a658237d8932748c14cdb11014eb8a11c30fa0b8199830023294b33f38fe10e16e3a463af8 diff --git a/net-wireless/jackit/jackit-0.0_p20170918.ebuild b/net-wireless/jackit/jackit-0.0_p20170918.ebuild index 09d8500674b8..1e408e119d87 100644 --- a/net-wireless/jackit/jackit-0.0_p20170918.ebuild +++ b/net-wireless/jackit/jackit-0.0_p20170918.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 DESCRIPTION="Exploit Code for Mousejack" -- cgit v1.2.3