From eb9f00e1fe68b59462fd348587f3be4ac73db66b Mon Sep 17 00:00:00 2001 From: Eder Sosa Date: Mon, 8 Feb 2021 06:27:47 -0600 Subject: [PATCH] crda: update to 4.14 crda-4.14 wireless-regdb-2020.12.20 fix error messages like [ 6.954196] platform regulatory.0: Direct firmware load for regulatory.db failed with error -2 [ 6.954207] cfg80211: failed to load regulatory.db --- srcpkgs/crda/files/set-wireless-regdom | 5 --- srcpkgs/crda/template | 42 +++++++------------------- 2 files changed, 11 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/crda/files/set-wireless-regdom diff --git a/srcpkgs/crda/files/set-wireless-regdom b/srcpkgs/crda/files/set-wireless-regdom deleted file mode 100644 index 0a857d974ea..00000000000 --- a/srcpkgs/crda/files/set-wireless-regdom +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -unset WIRELESS_REGDOM -. /etc/wireless-regdom.conf -[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM} diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template index 59ebaf7d24c..ba0c594516f 100644 --- a/srcpkgs/crda/template +++ b/srcpkgs/crda/template @@ -1,9 +1,9 @@ # Template file for 'crda' pkgname=crda -version=3.18 -revision=5 +version=4.14 +revision=1 _dbname=wireless-regdb -_dbversion=2016.06.10 +_dbversion=2020.11.20 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/" hostmakedepends="libressl python python-M2Crypto pkg-config" makedepends="libnl-devel libgcrypt-devel" @@ -11,48 +11,28 @@ depends="iw" short_desc="Central Regulatory Domain Agent for wireless networks" maintainer="Andrea Brancaleoni " license="ISC" -homepage="http://wireless.kernel.org/en/developers/Regulatory/CRDA" -distfiles="https://kernel.org/pub/software/network/crda/${pkgname}-${version}.tar.xz https://www.kernel.org/pub/software/network/wireless-regdb/${_dbname}-${_dbversion}.tar.xz" -checksum="43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf -cfedf1c3521b3c8f32602f25ed796e96e687c3441a00e7c050fedf7fd4f1b8b7" -conf_files="/etc/wireless-regdom.conf" - -build_options="wardrive" -desc_option_wardrive="Disable CRDA checks for wardriving competitions" - -post_extract() { - if [ "$build_option_wardrive" ]; then - sed -i 's/([0-9][0-9])/(33)/g' ${_dbsrc}/db.txt # Max 2W =~ 33dBm - fi -} +homepage="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" +distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${pkgname}-${version}.tar.gz https://www.kernel.org/pub/software/network/wireless-regdb/${_dbname}-${_dbversion}.tar.xz" +checksum="5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2 + b4164490d82ff7b0086e812ac42ab27baf57be24324d4c0ee1c5dd6ba27f2a52" do_build() { CFLAGS+=" -Wno-unused-const-variable" cd ${_dbsrc} make - cp *.pem ${wrksrc}/pubkeys + cp *.pub.pem ${wrksrc}/pubkeys cd ${wrksrc} - make CC="$CC" all_noverify } do_install() { make DESTDIR="${DESTDIR}" SBINDIR="/usr/bin/" UDEV_RULE_DIR="/usr/lib/udev/rules.d/" install - vlicense LICENSE + vlicense LICENSE LICENSE.crda cd ${_dbsrc} - vmkdir usr/lib/crda/ - vinstall regulatory.bin 644 usr/lib/crda/ - vmkdir etc/conf.d/ - for dom in $(grep ^country db.txt | cut -d' ' -f2 | sed 's|:||g'); do - echo "#WIRELESS_REGDOM=\"${dom}\"" >> ${DESTDIR}/etc/wireless-regdom.tmp - done - sort -u ${DESTDIR}/etc/wireless-regdom.tmp >> ${DESTDIR}/etc/wireless-regdom.conf - rm ${DESTDIR}/etc/wireless-regdom.tmp - - vbin ${FILESDIR}/set-wireless-regdom - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> ${DESTDIR}/usr/lib/udev/rules.d/85-regulatory.rules + make DESTDIR="${DESTDIR}" FIRMWARE_PATH="/usr/lib/firmware" install + vlicense LICENSE LICENSE.wireless-regdb find ${DESTDIR} -type f -name \*.h -delete # No need for devel files, no package i know uses libreg.so }