From 8147f5a19440f87035008524d10b77693c062934237061d664fe5d1f575d8c18 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 23 Jun 2023 11:09:49 +0000 Subject: [PATCH] Update to crda-4.15 OBS-URL: https://build.opensuse.org/package/show/hardware/crda?expand=0&rev=42 --- crda-4.14.tar.gz | 3 -- crda-4.15.tar.gz | 3 ++ ...e6ddbdfade357e234c9d58a30fe0a283fe60.patch | 31 --------------- ...2531698fb9ba006e8b31a223b3269be8bc7c.patch | 38 ------------------- crda-python3.patch | 11 ++---- crda.changes | 9 +++++ crda.spec | 20 ++++------ 7 files changed, 24 insertions(+), 91 deletions(-) delete mode 100644 crda-4.14.tar.gz create mode 100644 crda-4.15.tar.gz delete mode 100644 crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch delete mode 100644 crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch diff --git a/crda-4.14.tar.gz b/crda-4.14.tar.gz deleted file mode 100644 index 62d5548..0000000 --- a/crda-4.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2 -size 72753 diff --git a/crda-4.15.tar.gz b/crda-4.15.tar.gz new file mode 100644 index 0000000..f79a6a4 --- /dev/null +++ b/crda-4.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99eb58f774f6016c380def0d80fffd573d2be0ad5f117b678c1968ed5657af82 +size 72907 diff --git a/crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch b/crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch deleted file mode 100644 index 2c6234d..0000000 --- a/crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 67f1e6ddbdfade357e234c9d58a30fe0a283fe60 -Author: Xose Vazquez Perez -Date: Fri Nov 9 17:23:23 2018 +0100 - - crda: add URLs to README - - Cc: Luis R. Rodriguez - Cc: WIRELESS ML - Cc: REGDB ML - Signed-off-by: Xose Vazquez Perez - Signed-off-by: Luis Chamberlain - -diff --git a/README b/README -index 5d89b83..88f2623 100644 ---- a/README -+++ b/README -@@ -1,5 +1,6 @@ - Central Regulatory Domain Agent (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 - ========== -+ - - The database is maintained on the wireless-regdb.git tree. This git - tree maintains a binary regulatory database file which is produced diff --git a/crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch b/crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch deleted file mode 100644 index 143483e..0000000 --- a/crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit f4ef2531698fb9ba006e8b31a223b3269be8bc7c -Author: Luis Chamberlain -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 - -diff --git a/README b/README -index 88f2623..7d39891 100644 ---- a/README -+++ b/README -@@ -3,11 +3,17 @@ - - - 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 - =================== diff --git a/crda-python3.patch b/crda-python3.patch index b3b02ae..33a9cc8 100644 --- a/crda-python3.patch +++ b/crda-python3.patch @@ -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) - diff --git a/crda.changes b/crda.changes index 85845ff..cb4a2a4 100644 --- a/crda.changes +++ b/crda.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jun 23 10:57:35 UTC 2023 - Dr. Werner Fink + +- 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 diff --git a/crda.spec b/crda.spec index 72c1302..caa3a4d 100644 --- a/crda.spec +++ b/crda.spec @@ -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...