add pubkey of new regdb maintainer; rel 3

see:
https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git/commit/?id=37dcea0e6e5effb4228fe385e906edba3cbee389

diff --git a/build.patch b/build.patch
new file mode 100644 (file)
index 0000000..b71f6b5
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,33 @@
+From 067d961a344b4a2b2c374cfba5a632f0652971e2 Mon Sep 17 00:00:00 2001
+From: Jelle van der Waa <jelle@vdwaa.nl>
+Date: Mon, 4 Dec 2017 21:52:39 +0100
+Subject: crda: Fix error: `keys’ defined but not used
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix error: ‘keys’ defined but not used [-Werror=unused-const-variable=]
+by informing GCC keys is unused.
+
+Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
+Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
+---
+ utils/key2pub.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/key2pub.py b/utils/key2pub.py
+index 3e84cd2..9bb04cd 100755
+--- a/utils/key2pub.py
++++ b/utils/key2pub.py
+@@ -115,7 +115,7 @@ struct key_params {
+       .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))
+-- 
+cgit 1.2.3-korg
+

diff --git a/crda.spec b/crda.spec
index d7ea2769388c79ca0c9e5b584aeebad0b0739045..a60d2b178a75e7486956f447c7f539dd7e6e6283 100644 (file)
--- a/crda.spec
+++ b/crda.spec
@@ -7,14 +7,17 @@ Summary:      udev helper: Central Regulatory Domain Agent
 Summary(pl.UTF-8):     Program pomocniczy udev: Central Regulatory Domain Agent
 Name:          crda
 Version:       3.18
-Release:       1
+Release:       3
 License:       ISC
 Group:         Networking/Daemons
 Source0:       https://www.kernel.org/pub/software/network/crda/%{name}-%{version}.tar.xz
 # Source0-md5: 0431fef3067bf503dfb464069f06163a
+Source1:       https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git/plain/wens.key.pub.pem
+# Source1-md5: 11522c524aa619d6031b73edd02e8071
 Patch0:                %{name}-regdb.patch
 Patch1:                %{name}-destdir.patch
 Patch2:                %{name}-link.patch
+Patch3:                build.patch
 URL:           http://wireless.kernel.org/en/developers/Regulatory/CRDA
 BuildRequires: libgcrypt-devel
 BuildRequires: libnl-devel >= 1:3.2
@@ -72,6 +75,9 @@ Pliki nagłówkowe biblioteki CRDA libreg.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+cp -p %{SOURCE1} pubkeys
 
 %build
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \