[arch-commits] Commit in wireless-regdb/trunk (5 files)

[Tobias Powalowski]

    Date: Thursday, March 31, 2022 @ 06:12:36
  Author: tpowa
Revision: 441022

upgpkg: wireless-regdb 2022.02.18-2: fix #59475 #59643

Added:
  wireless-regdb/trunk/85-regulatory.rules
  wireless-regdb/trunk/set-wireless-regdom
  wireless-regdb/trunk/wireless-regdom
Modified:
  wireless-regdb/trunk/PKGBUILD
Deleted:
  wireless-regdb/trunk/wireless-regdb.install

------------------------+
 85-regulatory.rules    |    3 +++
 PKGBUILD               |   37 ++++++++++++++++---------------------
 set-wireless-regdom    |    5 +++++
 wireless-regdb.install |   13 -------------
 wireless-regdom        |    4 ++++
 5 files changed, 28 insertions(+), 34 deletions(-)

Added: 85-regulatory.rules
===================================================================
--- 85-regulatory.rules	                        (rev 0)
+++ 85-regulatory.rules	2022-03-31 06:12:36 UTC (rev 441022)
@@ -0,0 +1,3 @@
+# Set wireless regulatory domain at device creation
+
+ACTION=="add", SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-31 05:08:50 UTC (rev 441021)
+++ PKGBUILD	2022-03-31 06:12:36 UTC (rev 441022)
@@ -2,16 +2,19 @@
 
 pkgname=wireless-regdb
 pkgver=2022.02.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Central Regulatory Domain Database"
 arch=('any')
 url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb"
+license=('custom')
+depends=('bash' 'iw')
+replaces=('crda')
+provides=('crda')
 backup=(etc/conf.d/wireless-regdom)
-license=('custom')
-depends=('sh')
-makedepends=('crda')
 source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${pkgver}.tar.{xz,sign}
-        crda.conf.d)
+        wireless-regdom
+        set-wireless-regdom
+        85-regulatory.rules)
 sha256sums=('8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f'
             'SKIP'
             '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b')
@@ -18,22 +21,14 @@
 validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') #Seth Forshee <seth.forshee at canonical.com>
 
 package() {
-  # Install and verify regulatory.bin file
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin "${pkgdir}"/usr/lib/crda/regulatory.bin
-  # This creates a depend/makedepend loop:
-  # crda depends on wireless-regdb (but strictly doesn't makedepend on it)
-  # wireless-regdb makedepends on crda
-  if ! /usr/bin/regdbdump "${pkgdir}"/usr/lib/crda/regulatory.bin > /dev/null; then
-  return 1
-  fi
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/sforshee.key.pub.pem "${pkgdir}"/usr/lib/crda/pubkeys/sforshee.key.pub.pem
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/wireless-regdb/LICENSE
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.bin.5 "${pkgdir}"/usr/share/man/man5/regulatory.bin.5
- install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.db "${pkgdir}"/usr/lib/firmware/regulatory.db
- install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.db.p7s "${pkgdir}"/usr/lib/firmware/regulatory.db.p7s
- install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/regulatory.db.5 "${pkgdir}"/usr/share/man/man5/regulatory.db.5
-  install -D -m644 "${srcdir}"/crda.conf.d "${pkgdir}"/etc/conf.d/wireless-regdom
-  for dom in $(grep ^country "${srcdir}"/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do
+  install -Dm644 wireless-regdom -t "${pkgdir}"/etc/conf.d
+  install -Dm644 85-regulatory.rules -t "${pkgdir}"/usr/lib/udev/rules.d
+  install -Dm755 set-wireless-regdom -t "${pkgdir}"/usr/bin
+
+  cd ${pkgname}-${pkgver}
+  make install DESTDIR="${pkgdir}" MANDIR=usr/share/man FIRMWARE_PATH=usr/lib/firmware
+
+  for dom in $(grep ^country db.txt | cut -d' ' -f2 | sed 's|:||g'); do
     echo "#WIRELESS_REGDOM=\"${dom}\"" >> "${pkgdir}"/etc/conf.d/wireless-regdom.tmp
   done
   sort -u "${pkgdir}"/etc/conf.d/wireless-regdom.tmp >> "${pkgdir}"/etc/conf.d/wireless-regdom

Added: set-wireless-regdom
===================================================================
--- set-wireless-regdom	                        (rev 0)
+++ set-wireless-regdom	2022-03-31 06:12:36 UTC (rev 441022)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+unset WIRELESS_REGDOM
+. /etc/conf.d/wireless-regdom
+[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM}


Property changes on: wireless-regdb/trunk/set-wireless-regdom
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: wireless-regdb.install
===================================================================
--- wireless-regdb.install	2022-03-31 05:08:50 UTC (rev 441021)
+++ wireless-regdb.install	2022-03-31 06:12:36 UTC (rev 441022)
@@ -1,13 +0,0 @@
-post_install() {
-  post_upgrade
-}
-
-post_upgrade() {
-  # If crda is installed, we verify the integrity of the database
-  # If not, we skip this step silently
-  if [ -x /usr/bin/regdbdump ]; then
-    if ! /usr/bin/regdbdump /usr/lib/crda/regulatory.bin > /dev/null; then
-      echo "Failed to verify the integrity of the wireless regulatory database, CRDA will not work."
-    fi
-  fi
-}

Added: wireless-regdom
===================================================================
--- wireless-regdom	                        (rev 0)
+++ wireless-regdom	2022-03-31 06:12:36 UTC (rev 441022)
@@ -0,0 +1,4 @@
+#
+# Wireless regulatory domain configuration
+#
+