pool/crda
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1094860 from hardware

Browse Source 
- Update to crda 4.15
- Remove patches now upstream
  * crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch
  * crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch
- Port patch crda-python3.patch

OBS-URL: https://build.opensuse.org/request/show/1094860
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/crda?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2023-06-24 18:13:33 +00:00 committed by Git OBS Bridge
commit af428a4805
7 changed files with 24 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
crda-4.14.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

3
crda-4.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99eb58f774f6016c380def0d80fffd573d2be0ad5f117b678c1968ed5657af82
size 72907

31
crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch
View File

@ -1,31 +0,0 @@
commit 67f1e6ddbdfade357e234c9d58a30fe0a283fe60
Author: Xose Vazquez Perez <xose.vazquez@gmail.com>
Date: Fri Nov 9 17:23:23 2018 +0100
crda: add URLs to README
Cc: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: WIRELESS ML <linux-wireless@vger.kernel.org>
Cc: REGDB ML <wireless-regdb@lists.infradead.org>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
diff --git a/README b/README
index 5d89b83..88f2623 100644
--- a/README
+++ b/README
@@ -1,5 +1,6 @@
Central Regulatory Domain Agent (CRDA)
========================================
+<https://wireless.wiki.kernel.org/en/developers/regulatory/crda>
This is the Central Regulatory Domain Agent for Linux. It serves one
purpose: tell Linux kernel what to enforce. In essence it is a udev
@@ -46,6 +47,7 @@ with this package as regulatory.rules
OVERVIEW
==========
+<https://wireless.wiki.kernel.org/en/developers/regulatory>
The database is maintained on the wireless-regdb.git tree. This git
tree maintains a binary regulatory database file which is produced

38
crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch
View File

@ -1,38 +0,0 @@
commit f4ef2531698fb9ba006e8b31a223b3269be8bc7c
Author: Luis Chamberlain <mcgrof@kernel.org>
Date: Wed Nov 21 17:07:45 2018 -0800
README: add legacy notice
As if kernel v4.15 CRDA is no longer needed. Annotate this. The
code will still be maintained to help older kernels.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
diff --git a/README b/README
index 88f2623..7d39891 100644
--- a/README
+++ b/README
@@ -3,11 +3,17 @@
<https://wireless.wiki.kernel.org/en/developers/regulatory/crda>
This is the Central Regulatory Domain Agent for Linux. It serves one
-purpose: tell Linux kernel what to enforce. In essence it is a udev
-helper for communication between the kernel and userspace. You only
-need to run this manually for debugging purposes. For manual changing
-of regulatory domains use iw (iw reg set) or wpa_supplicant (feature
-yet to be added).
+purpose: tell Linux kernel what regulatory ruels to enforce for 802.11.
+
+CRDA is no longer needed as of kernel v4.15 since commit 007f6c5e6eb45
+("cfg80211: support loading regulatory database as firmware file") added
+support to use the kernel's firmware request API which looks for the
+firmware on /lib/firmware. Because of this CRDA is legacy software for
+older kernels. It will continue to be maintained.
+
+CRDA is a udev helper for communication between the kernel and userspace. You
+only need to run this manually for debugging purposes. For manual changing of
+regulatory domains use iw (iw reg set) or wpa_supplicant.
HOST REQUIREMENTS
===================

11
crda-python3.patch
View File

@ -12,12 +12,11 @@ fixed:
* The generated constants are given the 'ull' suffix to prevent
warnings about constants that are too large.
---
Makefile | 2 +-
utils/key2pub.py | 146 ++++++++++++++++++++++++++++---------------------------
Makefile | 2
utils/key2pub.py | 146 +++++++++++++++++++++++++++----------------------------
2 files changed, 75 insertions(+), 73 deletions(-)
diff --git a/Makefile b/Makefile
index a3ead30..65fc780 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ $(REG_BIN):
@ -25,12 +24,11 @@ index a3ead30..65fc780 100644
$(NQ) ' GEN ' $@
$(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
- $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
+ $(Q) python3 ./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
+ $(Q)python3 ./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
$(LIBREG): regdb.h reglib.h reglib.c
$(LIBREG): reglib.c regdb.h reglib.h
$(NQ) ' CC ' $@
diff --git a/utils/key2pub.py b/utils/key2pub.py
index 3e84cd2..ff92748 100755
--- a/utils/key2pub.py
+++ b/utils/key2pub.py
@@ -1,126 +1,128 @@
@ -256,4 +254,3 @@ index 3e84cd2..ff92748 100755
idx += 1
modes[mode][1](output, idx - 1)

9
crda.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jun 23 10:57:35 UTC 2023 - Dr. Werner Fink <werner@suse.de>
- Update to crda 4.15
- Remove patches now upstream
* crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch
* crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch
- Port patch crda-python3.patch
-------------------------------------------------------------------
Tue Dec 27 10:29:57 UTC 2022 - Ludwig Nussel <lnussel@suse.com>

20
crda.spec
View File

@ -24,7 +24,7 @@ Summary: 802.11 central regulatory domain agent
License: SUSE-Copyleft-Next-0.3.0
Group: Hardware/Wifi
URL: https://wireless.wiki.kernel.org/en/developers/Regulatory/CRDA
Version: 4.14
Version: 4.15
Release: 0
Source0: https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/crda-%{version}.tar.gz
Source1: crda.default
@ -34,6 +34,7 @@ BuildRequires: pkg-config
BuildRequires: python3
BuildRequires: python3-pycrypto
BuildRequires: wireless-regdb
BuildRequires: pkgconfig(libgcrypt)
BuildRequires: pkgconfig(libnl-3.0)
BuildRequires: pkgconfig(udev)
Requires: wireless-regdb
@ -42,12 +43,8 @@ Supplements: kernel >= 2.6.29
Patch0: gcc6-fix-errors.patch
# PATCH-FIX-OPENSUSE python2 is gone, port to python3
Patch1: crda-python3.patch
# PATCH-FIX-UPSTREAM crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch
Patch2: crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch
# PATCH-FIX-UPSTREAM crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch
Patch3: crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch
# PATCH-FIX-SUSE crda-default.patch
Patch4: crda-default.patch
Patch2: crda-default.patch
%description
The crda binary provides access to the wireless-regdb to the kernel
@ -55,17 +52,16 @@ through udev.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch0 -p1 -b .p0
%patch1 -p1 -b .p1
%patch2 -p1 -b .p2
# make install calls 'ldconfig' and fails if it cannot run it...
ln -s /bin/true ldconfig
%build
export CC="gcc"
export CFLAGS="%{optflags}"
make all_noverify %{?_smp_mflags} V=1
%make_build all_noverify %{?_smp_mflags} V=1
%install
# to find ldconfig...