diff --git a/.crda.metadata b/.crda.metadata index c993818..8c32d2a 100644 --- a/.crda.metadata +++ b/.crda.metadata @@ -1,2 +1,2 @@ 6e0adbfc0f5418a03d7d708bd39d52cd1325b511 SOURCES/crda-1.1.3.tar.bz2 -f295acdc03acef5bbec4f23647075b0fa21730e6 SOURCES/wireless-regdb-2013.11.27.tar.bz2 +5ec3ff2ddac5d1f11ede0fa02fd6cbd5716817ae SOURCES/wireless-regdb-2014.06.13.tar.xz diff --git a/.gitignore b/.gitignore index 443278a..e67a367 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/crda-1.1.3.tar.bz2 -SOURCES/wireless-regdb-2013.11.27.tar.bz2 +SOURCES/wireless-regdb-2014.06.13.tar.xz diff --git a/SOURCES/setregdomain b/SOURCES/setregdomain index f6f0d1a..5316d03 100755 --- a/SOURCES/setregdomain +++ b/SOURCES/setregdomain @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2009-2010 Red Hat, Inc. All rights reserved. +# Copyright 2009-2014 Red Hat, Inc. All rights reserved. # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -18,6 +18,8 @@ REGDOMAIN=/etc/sysconfig/regdomain LOCALTIME=/etc/localtime +LOGGER="/usr/bin/logger -t crda" + getcountry() { while read c a z r do @@ -35,7 +37,7 @@ then . $REGDOMAIN if [ -n "$COUNTRY" ] then - /sbin/iw reg set $COUNTRY + /usr/sbin/iw reg set $COUNTRY exit fi fi @@ -46,13 +48,13 @@ then ZONE=${ZONE#/usr/share/zoneinfo/} ZONE=${ZONE#../usr/share/zoneinfo/} else - echo "Timezone information not found! Unable to set regulatory domain." + $LOGGER -s "Timezone information not found! Unable to set regulatory domain." exit fi if [ -z "$ZONE" ] then - echo "Timezone information not set! Unable to set regulatory domain." + $LOGGER -s "Timezone information not set! Unable to set regulatory domain." exit fi @@ -60,8 +62,9 @@ COUNTRY=$(getcountry) if [ -z "$COUNTRY" ] then - echo "Could not determine country! Unable to set regulatory domain." + $LOGGER -s "Could not determine country! Unable to set regulatory domain." exit fi -/sbin/iw reg set $COUNTRY +$LOGGER "setting regulatory domain to $COUNTRY based on timezone ($ZONE)" +/usr/sbin/iw reg set $COUNTRY diff --git a/SPECS/crda.spec b/SPECS/crda.spec index 7857c14..d736ad6 100644 --- a/SPECS/crda.spec +++ b/SPECS/crda.spec @@ -1,9 +1,9 @@ %define crda_version 1.1.3 -%define regdb_version 2013.11.27 +%define regdb_version 2014.06.13 Name: crda Version: %{crda_version}_%{regdb_version} -Release: 5%{?dist} +Release: 1%{?dist} Summary: Regulatory compliance daemon for 802.11 wireless networking Group: System Environment/Base @@ -21,7 +21,7 @@ Requires: udev, iw Requires: systemd >= 190 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 +Source1: http://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-%{regdb_version}.tar.xz Source2: setregdomain Source3: setregdomain.1 @@ -95,6 +95,10 @@ rm -rf %{buildroot} %changelog +* Mon Jul 28 2014 John W. Linville - 1.1.3_2014.06.13-1 +- Update wireless-regdb to version 2014.06.13 +- Add logger commands to setregdomain to make it more communicative + * Fri Feb 28 2014 John W. Linville - 1.1.3_2013.11.27-5 - Accomodate relative pathnames in the symlink for /etc/localtime