diff --git a/.crda.metadata b/.crda.metadata index f55b23d..c993818 100644 --- a/.crda.metadata +++ b/.crda.metadata @@ -1,2 +1,2 @@ -bf89555550c8dd8faf84019e7ad89e05f5a91df6 SOURCES/wireless-regdb-2013.02.13.tar.bz2 6e0adbfc0f5418a03d7d708bd39d52cd1325b511 SOURCES/crda-1.1.3.tar.bz2 +f295acdc03acef5bbec4f23647075b0fa21730e6 SOURCES/wireless-regdb-2013.11.27.tar.bz2 diff --git a/SOURCES/setregdomain b/SOURCES/setregdomain index 7664c59..f6f0d1a 100755 --- a/SOURCES/setregdomain +++ b/SOURCES/setregdomain @@ -18,6 +18,17 @@ REGDOMAIN=/etc/sysconfig/regdomain LOCALTIME=/etc/localtime +getcountry() { + while read c a z r + do + if [ "$z" = "$ZONE" ] + then + echo $c + break + fi + done < /usr/share/zoneinfo/zone.tab +} + if [ -f $REGDOMAIN ] then # This should set COUNTRY @@ -29,9 +40,11 @@ then fi fi -if [ -f $TZ ] +if [ -f "$LOCALTIME" ] then - ZONE=$(readlink $LOCALTIME | sed -e 's/\/usr\/share\/zoneinfo\///') + ZONE=$(readlink $LOCALTIME) + ZONE=${ZONE#/usr/share/zoneinfo/} + ZONE=${ZONE#../usr/share/zoneinfo/} else echo "Timezone information not found! Unable to set regulatory domain." exit @@ -43,7 +56,7 @@ then exit fi -COUNTRY=$(grep $ZONE /usr/share/zoneinfo/zone.tab | awk '{ print $1 }') +COUNTRY=$(getcountry) if [ -z "$COUNTRY" ] then diff --git a/SPECS/crda.spec b/SPECS/crda.spec index 15c0e24..7857c14 100644 --- a/SPECS/crda.spec +++ b/SPECS/crda.spec @@ -1,9 +1,9 @@ %define crda_version 1.1.3 -%define regdb_version 2013.02.13 +%define regdb_version 2013.11.27 Name: crda Version: %{crda_version}_%{regdb_version} -Release: 2%{?dist} +Release: 5%{?dist} Summary: Regulatory compliance daemon for 802.11 wireless networking Group: System Environment/Base @@ -12,7 +12,7 @@ URL: http://www.linuxwireless.org/en/developers/Regulatory/CRDA BuildRoot: %{_tmppath}/%{name}-%{crda_version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kernel-headers >= 2.6.27 -BuildRequires: libnl-devel >= 1.1 +BuildRequires: libnl3-devel BuildRequires: libgcrypt-devel BuildRequires: pkgconfig python m2crypto BuildRequires: openssl @@ -20,8 +20,8 @@ BuildRequires: openssl Requires: udev, iw Requires: systemd >= 190 -Source0: http://wireless.kernel.org/download/crda/crda-%{crda_version}.tar.bz2 -Source1: http://wireless.kernel.org/download/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2 +Source0: http://www.kernel.org/pub/software/network/crda/crda-%{crda_version}.tar.bz2 +Source1: http://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-%{regdb_version}.tar.bz2 Source2: setregdomain Source3: setregdomain.1 @@ -44,18 +44,19 @@ communication from the kernel. %build +export CFLAGS="%{optflags}" # Use our own signing key to generate regulatory.bin cd wireless-regdb-%{regdb_version} -make %{?_smp_mflags} CFLAGS="%{optflags}" maintainer-clean -make %{?_smp_mflags} CFLAGS="%{optflags}" REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem +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 -make %{?_smp_mflags} CFLAGS="%{optflags}" REG_BIN=../wireless-regdb-%{regdb_version}/regulatory.bin +make %{?_smp_mflags} REG_BIN=../wireless-regdb-%{regdb_version}/regulatory.bin %install @@ -94,6 +95,33 @@ rm -rf %{buildroot} %changelog +* Fri Feb 28 2014 John W. Linville - 1.1.3_2013.11.27-5 +- Accomodate relative pathnames in the symlink for /etc/localtime + +* Mon Feb 10 2014 John W. Linville - 1.1.3_2013.11.27-4 +- Correct a typo in setregdomain + +* Fri Jan 24 2014 Daniel Mach - 1.1.3_2013.11.27-3 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.1.3_2013.11.27-2 +- Mass rebuild 2013-12-27 + +* Mon Dec 2 2013 John W. Linville - 1.1.3_2013.11.27-1 +- Update wireless-regdb to version 2013.11.27 + +* Fri Nov 22 2013 Xose Vazquez Perez - 1.1.3_2013.02.13-5 +- fixed wrong dates +- link with libnl3 +- new home for sources + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.3_2013.02.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Apr 3 2013 John W. Linville - 1.1.3_2013.02.13-3 +- setregdomain: remove sed and awk calls +- setregdomain: reimplement COUNTRY assignment with shell function + * Fri Mar 1 2013 John W. Linville - 1.1.3_2013.02.13-2 - Bump release to prevent upgrade issues from F17...oops! @@ -103,10 +131,10 @@ rm -rf %{buildroot} * Tue Feb 12 2013 John W. Linville - 1.1.3_2013.02.12-1 - Update wireless-regdb to version 2013.02.12 -* Mon Jan 25 2013 John W. Linville - 1.1.3_2013.01.11-2 +* Fri Jan 25 2013 John W. Linville - 1.1.3_2013.01.11-2 - Update setregdomain to determine timezone info from /etc/timezone -* Mon Jan 25 2013 John W. Linville - 1.1.3_2013.01.11-1 +* Fri Jan 25 2013 John W. Linville - 1.1.3_2013.01.11-1 - Update crda to version 1.1.3 - Update wireless-regdb to version 2013.01.11 @@ -145,10 +173,10 @@ rm -rf %{buildroot} * Tue Jan 26 2010 John W. Linville 1.1.1_2009.11.25-1 - Update for crda version 1.1.1 -* Tue Dec 21 2009 John W. Linville 1.1.0_2009.11.25-5 +* Mon Dec 21 2009 John W. Linville 1.1.0_2009.11.25-5 - Remove unnecessary explicit Requries for libgcrypt and libnl -- oops! -* Tue Dec 21 2009 John W. Linville 1.1.0_2009.11.25-4 +* Mon Dec 21 2009 John W. Linville 1.1.0_2009.11.25-4 - Add libgcrypt and libnl to Requires * Mon Dec 21 2009 John W. Linville 1.1.0_2009.11.25-3 @@ -164,7 +192,7 @@ rm -rf %{buildroot} * Wed Nov 11 2009 John W. Linville 1.1.0_2009.11.10-1 - Update wireless-regdb to version 2009.11.10 -* Wed Oct 1 2009 John W. Linville 1.1.0_2009.09.08-3 +* Thu Oct 1 2009 John W. Linville 1.1.0_2009.09.08-3 - Move regdb to /lib/crda to facilitate /usr mounted over wireless network * Wed Sep 9 2009 John W. Linville 1.1.0_2009.09.08-2