diff --git a/crda-3.18.tar.xz b/crda-3.18.tar.xz deleted file mode 100644 index eee0108..0000000 --- a/crda-3.18.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf -size 61516 diff --git a/crda-4.14.tar.gz b/crda-4.14.tar.gz new file mode 100644 index 0000000..62d5548 --- /dev/null +++ b/crda-4.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2 +size 72753 diff --git a/crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch b/crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch new file mode 100644 index 0000000..2c6234d --- /dev/null +++ b/crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000..143483e --- /dev/null +++ b/crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch @@ -0,0 +1,38 @@ +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 c93569c..b3b02ae 100644 --- a/crda-python3.patch +++ b/crda-python3.patch @@ -213,7 +213,7 @@ index 3e84cd2..ff92748 100755 + .n = _n, .len_n = sizeof(_n), \\ } - static const struct key_params keys[] = { + static const struct key_params __attribute__ ((unused)) keys[] = { ''') - for n in xrange(n + 1): - output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) diff --git a/crda.changes b/crda.changes index 1d601c4..4b2528f 100644 --- a/crda.changes +++ b/crda.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Aug 17 17:34:41 CEST 2020 - ro@suse.de + +- update to 4.14 and update home URL to use the github project + - fix keys defined but not used error +- add patch from upstream + crda-67f1e6ddbdfade357e234c9d58a30fe0a283fe60.patch + - add URLs to README +- add patch from upstream + crda-f4ef2531698fb9ba006e8b31a223b3269be8bc7c.patch + - add legacy note to README + - ## CRDA is no longer needed as of kernel v4.15 + ------------------------------------------------------------------- Thu Mar 12 11:34:19 CET 2020 - ro@suse.de diff --git a/crda.spec b/crda.spec index 76ffdd7..cec726f 100644 --- a/crda.spec +++ b/crda.spec @@ -23,10 +23,10 @@ Name: crda Summary: 802.11 central regulatory domain agent License: SUSE-Copyleft-Next-0.3.0 Group: Hardware/Wifi -URL: http://linuxwireless.org/en/developers/Regulatory/CRDA -Version: 3.18 +URL: https://github.com/mcgrof/crda/commits/master +Version: 4.14 Release: 0 -Source: http://kernel.org/pub/software/network/crda/crda-%{version}.tar.xz +Source: http://kernel.org/pub/software/network/crda/crda-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libgcrypt-devel BuildRequires: pkg-config @@ -39,7 +39,12 @@ Requires: wireless-regdb Supplements: kernel >= 2.6.29 # PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6. 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 %description The crda binary provides access to the wireless-regdb to the kernel @@ -49,6 +54,8 @@ through udev. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # make install calls 'ldconfig' and fails if it cannot run it... ln -s /bin/true ldconfig