From f7ff723a6a3148541e36da55e61fc5f057299efa Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:16:43 +0000 Subject: import crda-3.18_2018.05.31-4.el7 --- diff --git a/.crda.metadata b/.crda.metadata index 5a6d09e..ebe96e5 100644 --- a/.crda.metadata +++ b/.crda.metadata @@ -1,2 +1,2 @@ -cee5aee4e7ae209e2dfdf2adcd683a882c6c0668 SOURCES/crda-3.13.tar.xz -9ce5f00f608f203adf2675d02a5148913f7fe6ad SOURCES/wireless-regdb-2016.02.08.tar.xz +16e5a1b67a168d37c28245d681512cbc46f865d9 SOURCES/crda-3.18.tar.xz +3f699d43748824fff3b21d8dd11ef540df205e32 SOURCES/wireless-regdb-2018.05.31.tar.xz diff --git a/.gitignore b/.gitignore index f435ca3..970b392 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/crda-3.13.tar.xz -SOURCES/wireless-regdb-2016.02.08.tar.xz +SOURCES/crda-3.18.tar.xz +SOURCES/wireless-regdb-2018.05.31.tar.xz diff --git a/SOURCES/crda-libreg-DESTDIR.patch b/SOURCES/crda-libreg-DESTDIR.patch deleted file mode 100644 index a63b93f..0000000 --- a/SOURCES/crda-libreg-DESTDIR.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 2cabb2588da56735369131b709f191453c080be0 -Author: John W. Linville -Date: Fri Feb 14 13:58:44 2014 -0500 - - crda: Add DESTDIR support in install-libreg* rules in Makefile - - Signed-off-by: John W. Linville - Signed-off-by: Luis R. Rodriguez - -diff --git a/Makefile b/Makefile -index 0b2f0d7f8d4e..1f2550915c0d 100644 ---- a/Makefile -+++ b/Makefile -@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' -- $(Q)mkdir -p $(INCLUDE_DIR) -- $(Q)cp *.h $(INCLUDE_DIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) -+ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ - - install-libreg: - $(NQ) ' INSTALL libreg' -- $(Q)mkdir -p $(LIBDIR) -- $(Q)cp $(LIBREG) $(LIBDIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) -+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ - $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) diff --git a/SOURCES/regulatory-rules-setregdomain.patch b/SOURCES/regulatory-rules-setregdomain.patch index 0f6c428..be8297c 100644 --- a/SOURCES/regulatory-rules-setregdomain.patch +++ b/SOURCES/regulatory-rules-setregdomain.patch @@ -1,6 +1,6 @@ -diff -up crda-3.13_2016.02.08/crda-3.13/udev/regulatory.rules.setregdomain crda-3.13_2016.02.08/crda-3.13/udev/regulatory.rules ---- crda-3.13_2016.02.08/crda-3.13/udev/regulatory.rules.setregdomain 2012-01-18 21:19:09.000000000 -0500 -+++ crda-3.13_2016.02.08/crda-3.13/udev/regulatory.rules 2013-01-25 14:10:57.818931320 -0500 +diff -up crda-3.18_2018.05.09/crda-3.18/udev/regulatory.rules.setregdomain crda-3.18_2018.05.09/crda-3.18/udev/regulatory.rules +--- crda-3.18_2018.05.09/crda-3.18/udev/regulatory.rules.setregdomain 2012-01-18 21:19:09.000000000 -0500 ++++ crda-3.18_2018.05.09/crda-3.18/udev/regulatory.rules 2013-01-25 14:10:57.818931320 -0500 @@ -2,4 +2,6 @@ # For more information see: # http://wireless.kernel.org/en/developers/Regulatory/CRDA diff --git a/SOURCES/wireless-regdb-fw-dependency.patch b/SOURCES/wireless-regdb-fw-dependency.patch new file mode 100644 index 0000000..244eef3 --- /dev/null +++ b/SOURCES/wireless-regdb-fw-dependency.patch @@ -0,0 +1,12 @@ +diff -up crda-3.18_2017.12.23/wireless-regdb-2017.12.23/Makefile.orig crda-3.18_2017.12.23/wireless-regdb-2017.12.23/Makefile +--- crda-3.18_2017.12.23/wireless-regdb-2017.12.23/Makefile.orig 2018-04-30 14:56:17.934744786 -0400 ++++ crda-3.18_2017.12.23/wireless-regdb-2017.12.23/Makefile 2018-04-30 14:57:15.182554167 -0400 +@@ -59,7 +59,7 @@ regulatory.bin: db.txt $(REGDB_PRIVKEY) + @echo Generating $@ digitally signed by $(REGDB_AUTHOR)... + ./db2bin.py regulatory.bin db.txt $(REGDB_PRIVKEY) + +-regulatory.db: db.txt db2fw.py ++regulatory.db: db.txt db2fw.py $(REGDB_PRIVKEY) $(REGDB_PUBCERT) + @echo "Generating $@" + ./db2fw.py regulatory.db db.txt + diff --git a/SPECS/crda.spec b/SPECS/crda.spec index ff325a4..28b1d66 100644 --- a/SPECS/crda.spec +++ b/SPECS/crda.spec @@ -1,14 +1,16 @@ -%define crda_version 3.13 -%define regdb_version 2016.02.08 +%define crda_version 3.18 +%define regdb_version 2018.05.31 + +%global _firmwarepath /usr/lib/firmware Name: crda Version: %{crda_version}_%{regdb_version} -Release: 1%{?dist} +Release: 4%{?dist} Summary: Regulatory compliance daemon for 802.11 wireless networking Group: System Environment/Base License: ISC -URL: http://www.linuxwireless.org/en/developers/Regulatory/CRDA +URL: http://wireless.kernel.org/en/developers/Regulatory/CRDA BuildRoot: %{_tmppath}/%{name}-%{crda_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kernel-headers >= 2.6.27 @@ -27,10 +29,10 @@ Source3: setregdomain.1 # Add udev rule to call setregdomain on wireless device add Patch0: regulatory-rules-setregdomain.patch -# Add DESTDIR to path for libreg installation -Patch1: crda-libreg-DESTDIR.patch # Do not call ldconfig in crda Makefile -Patch2: crda-remove-ldconfig.patch +Patch1: crda-remove-ldconfig.patch +# Ensure rebuild of regulatory.db after signature regeneration +Patch2: wireless-regdb-fw-dependency.patch %description @@ -56,23 +58,18 @@ Header files to make use of libreg for accessing regulatory info. %patch0 -p1 -b .setregdomain cd crda-%{crda_version} -%patch1 -p1 -b .destdir -%patch2 -p1 -b .ldconfig-remove +%patch1 -p1 -b .ldconfig-remove +cd ../wireless-regdb-%{regdb_version} +%patch2 -p2 -b .fwsign %build export CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" -# Use our own signing key to generate regulatory.bin -cd wireless-regdb-%{regdb_version} - -make %{?_smp_mflags} maintainer-clean -make %{?_smp_mflags} REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem - -# Build CRDA using the new key and regulatory.bin from above -cd ../crda-%{crda_version} -cp ../wireless-regdb-%{regdb_version}/key.pub.pem pubkeys - +# Build CRDA using the sforshee.key.pub.pem key and regulatory.bin +cd crda-%{crda_version} +cp ../wireless-regdb-%{regdb_version}/sforshee.key.pub.pem pubkeys + make %{?_smp_mflags} SBINDIR=%{_sbindir}/ LIBDIR=%{_libdir}/ \ REG_BIN=../wireless-regdb-%{regdb_version}/regulatory.bin @@ -89,7 +86,8 @@ make install DESTDIR=%{buildroot} MANDIR=%{_mandir}/ \ cd ../wireless-regdb-%{regdb_version} cp LICENSE LICENSE.wireless-regdb cp README README.wireless-regdb -make install DESTDIR=%{buildroot} MANDIR=%{_mandir} +make install DESTDIR=%{buildroot} MANDIR=%{_mandir} \ + FIRMWARE_PATH=%{_firmwarepath} install -D -pm 0755 %SOURCE2 %{buildroot}%{_sbindir} install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1 @@ -110,10 +108,13 @@ rm -rf %{buildroot} %{_sbindir}/setregdomain %{_libdir}/libreg.so /lib/udev/rules.d/85-regulatory.rules -# location of database is hardcoded to /usr/lib/%{name} +# location of database is hardcoded to /usr/lib/%%{name} /usr/lib/%{name} +%{_firmwarepath}/regulatory.db +%{_firmwarepath}/regulatory.db.p7s %{_mandir}/man1/setregdomain.1* %{_mandir}/man5/regulatory.bin.5* +%{_mandir}/man5/regulatory.db.5* %{_mandir}/man8/crda.8* %{_mandir}/man8/regdbdump.8* %license crda-%{crda_version}/LICENSE.crda @@ -129,6 +130,19 @@ rm -rf %{buildroot} %changelog +* Thu Aug 09 2018 John W. Linville - 3.18_2018.05.31-4 +- Update changelog and bump Release + +* Thu Aug 09 2018 Stanislaw Gruszka - 3.18_2018.05.31-3 +- Update wireless-regdb to version 2018.05.31 + +* Fri Jun 01 2018 John W. Linville - 3.18_2017.12.23-2 +- Update URL in package header + +* Thu May 31 2018 John W. Linville - 3.18_2017.12.23-1 +- Update crda to version 3.18 +- Update wireless-regdb to version 2017.12.23 + * Tue Feb 09 2016 John W. Linville - 3.13_2016.02.08-1 - Update crda to version 3.13 - Update wireless-regdb to version 2016.02.08