From d81fc2b6aab8b1842a55b610a2a6daf3866b2665 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Mar 15 2013 13:24:11 +0000 Subject: import crda-1.1.3_2013.02.13-2.el7.src.rpm --- diff --git a/.crda.metadata b/.crda.metadata new file mode 100644 index 0000000..f55b23d --- /dev/null +++ b/.crda.metadata @@ -0,0 +1,2 @@ +bf89555550c8dd8faf84019e7ad89e05f5a91df6 SOURCES/wireless-regdb-2013.02.13.tar.bz2 +6e0adbfc0f5418a03d7d708bd39d52cd1325b511 SOURCES/crda-1.1.3.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/regulatory-rules-setregdomain.patch b/SOURCES/regulatory-rules-setregdomain.patch new file mode 100644 index 0000000..806209e --- /dev/null +++ b/SOURCES/regulatory-rules-setregdomain.patch @@ -0,0 +1,10 @@ +diff -up crda-1.1.3_2013.01.11/crda-1.1.3/udev/regulatory.rules.setregdomain crda-1.1.3_2013.01.11/crda-1.1.3/udev/regulatory.rules +--- crda-1.1.3_2013.01.11/crda-1.1.3/udev/regulatory.rules.setregdomain 2012-01-18 21:19:09.000000000 -0500 ++++ crda-1.1.3_2013.01.11/crda-1.1.3/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 + ++SUBSYSTEM=="ieee80211", ACTION=="add", RUN+="/sbin/setregdomain" ++ + KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform", RUN+="$(SBINDIR)crda" diff --git a/SOURCES/setregdomain b/SOURCES/setregdomain new file mode 100755 index 0000000..7664c59 --- /dev/null +++ b/SOURCES/setregdomain @@ -0,0 +1,54 @@ +#!/bin/sh +# +# Copyright 2009-2010 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 +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +REGDOMAIN=/etc/sysconfig/regdomain +LOCALTIME=/etc/localtime + +if [ -f $REGDOMAIN ] +then + # This should set COUNTRY + . $REGDOMAIN + if [ -n "$COUNTRY" ] + then + /sbin/iw reg set $COUNTRY + exit + fi +fi + +if [ -f $TZ ] +then + ZONE=$(readlink $LOCALTIME | sed -e 's/\/usr\/share\/zoneinfo\///') +else + echo "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." + exit +fi + +COUNTRY=$(grep $ZONE /usr/share/zoneinfo/zone.tab | awk '{ print $1 }') + +if [ -z "$COUNTRY" ] +then + echo "Could not determine country! Unable to set regulatory domain." + exit +fi + +/sbin/iw reg set $COUNTRY diff --git a/SOURCES/setregdomain.1 b/SOURCES/setregdomain.1 new file mode 100644 index 0000000..3ce6d8d --- /dev/null +++ b/SOURCES/setregdomain.1 @@ -0,0 +1,12 @@ +.\" Copyright 2009 Red Hat, Inc. +.TH segregdomain 1 2009-10-16 "CRDA" "User Commands" +.SH NAME +setregdomain \- set regulatory domain based on timezone +.SH SYNOPSIS +.B setregdomain +.SH DESCRIPTION +setregdomain sets the regulatory domain for your system; it takes no +arguments and is normally called via system script (eg, udev) rather +than manually by an adminstrator. +.SH "SEE ALSO" +.BR iw (1) diff --git a/SPECS/crda.spec b/SPECS/crda.spec new file mode 100644 index 0000000..15c0e24 --- /dev/null +++ b/SPECS/crda.spec @@ -0,0 +1,217 @@ +%define crda_version 1.1.3 +%define regdb_version 2013.02.13 + +Name: crda +Version: %{crda_version}_%{regdb_version} +Release: 2%{?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 +BuildRoot: %{_tmppath}/%{name}-%{crda_version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: kernel-headers >= 2.6.27 +BuildRequires: libnl-devel >= 1.1 +BuildRequires: libgcrypt-devel +BuildRequires: pkgconfig python m2crypto +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 +Source2: setregdomain +Source3: setregdomain.1 + +# Add udev rule to call setregdomain on wireless device add +Patch0: regulatory-rules-setregdomain.patch + + +%description +CRDA acts as the udev helper for communication between the kernel +and userspace for regulatory compliance. It relies on nl80211 +for communication. CRDA is intended to be run only through udev +communication from the kernel. + + +%prep +%setup -q -c +%setup -q -T -D -a 1 + +%patch0 -p1 -b .setregdomain + + +%build + +# 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 + +# 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 + + +%install +rm -rf %{buildroot} + +cd crda-%{crda_version} +cp README README.crda +make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir} + +cd ../wireless-regdb-%{regdb_version} +cp README README.wireless-regdb +make install DESTDIR=%{buildroot} PREFIX='' MANDIR=%{_mandir} + +install -D -pm 0755 %SOURCE2 %{buildroot}/sbin +install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1 + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +/sbin/%{name} +/sbin/regdbdump +/sbin/setregdomain +/lib/udev/rules.d/85-regulatory.rules +# location of database is hardcoded to /lib/%{name} +/lib/%{name} +%{_mandir}/man1/setregdomain.1* +%{_mandir}/man5/regulatory.bin.5* +%{_mandir}/man8/crda.8* +%{_mandir}/man8/regdbdump.8* +%doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda +%doc wireless-regdb-%{regdb_version}/README.wireless-regdb + + +%changelog +* Fri Mar 1 2013 John W. Linville - 1.1.3_2013.02.13-2 +- Bump release to prevent upgrade issues from F17...oops! + +* Wed Feb 13 2013 John W. Linville - 1.1.3_2013.02.13-1 +- Update wireless-regdb to version 2013.02.13 + +* 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 +- Update setregdomain to determine timezone info from /etc/timezone + +* Mon 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 + +* Fri Aug 10 2012 John W. Linville +- Add BuildRequires for openssl + +* Wed Jul 18 2012 Fedora Release Engineering - 1.1.2_2011.04.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.1.2_2011.04.28-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Aug 11 2011 John W. Linville 1.1.2_2011.04.28-1 +- Update crda to version 1.1.2 +- Update wireless-regdb to version 2011.04.28 +- Fix mis-numbered version comment in changelog for Nov 23 2010 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.1.1_2010.11.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 23 2010 John W. Linville 1.1.1_2010.11.22-1 +- Update wireless-regdb to version 2010.11.22 + +* Thu Feb 25 2010 John W. Linville 1.1.1_2009.11.25-3 +- Correct license tag from BSD to ISC +- Comment purpose of regulatory-rules-setregdomain.patch +- Add copyright and license statement to setregdomain +- Add comment for why /lib is hardcoded in files section +- Reformat Dec 21 2009 changelog entry so rpmlint stops complaining + +* Tue Jan 26 2010 John W. Linville 1.1.1_2009.11.25-2 +- Change RPM_OPT_FLAGS to optflags +- Leave man page compression to rpmbuild +- Correct date in previous changelog entry + +* 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 +- Remove unnecessary explicit Requries for libgcrypt and libnl -- oops! + +* Tue 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 +- Add man page for setregdomain (from Andrew Hecox ) +- Change $RPM_BUILD_ROOT to buildroot + +* Fri Dec 18 2009 John W. Linville 1.1.0_2009.11.25-2 +- Specify path to iw in setregdomain + +* Wed Dec 2 2009 John W. Linville 1.1.0_2009.11.25-1 +- Update wireless-regdb to version 2009.11.25 + +* 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 +- 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 +- Use kernel-headers instead of kernel-devel + +* Wed Sep 9 2009 John W. Linville 1.1.0_2009.09.08-1 +- Update wireless-regdb to version 2009.09.08 +- Start resetting release number with version updates + +* Fri Jul 24 2009 Fedora Release Engineering - 1.1.0_2009.04.17-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed May 13 2009 John W. Linville 1.1.0_2009.04.17-11 +- Update crda version to version 1.1.0 +- Update wireless-regdb to version 2009.04.17 + +* Fri Apr 17 2009 John W. Linville 1.0.1_2009.04.16-10 +- Update wireless-regdb version to pick-up recent updates and fixes (#496392) + +* Tue Mar 31 2009 John W. Linville 1.0.1_2009.03.09-9 +- Add Requires line for iw package (#492762) +- Update setregdomain script to correctly check if COUNTRY is set + +* Thu Mar 19 2009 John W. Linville 1.0.1_2009.03.09-8 +- Add setregdomain script to set regulatory domain based on timezone +- Expand 85-regulatory.rules to invoke setregdomain script on device add + +* Tue Mar 10 2009 John W. Linville 1.0.1_2009.03.09-7 +- Update wireless-regdb version to pick-up recent updates and fixes (#489560) + +* Tue Feb 24 2009 Fedora Release Engineering - 1.0.1_2009.01.30-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 16 2009 John W. Linville 1.0.1_2009.01.30-5 +- Recognize regulatory.bin files signed with the upstream key (#484982) + +* Tue Feb 03 2009 John W. Linville 1.0.1_2009.01.30-4 +- Change version to reflect new wireless-regdb upstream release practices +- Update wireless-regdb version to pick-up recent updates and fixes (#483816) + +* Tue Jan 27 2009 John W. Linville 1.0.1_2009_01_15-3 +- Update for CRDA verion 1.0.1 +- Account for lack of "v" in upstream release tarball naming +- Add patch to let wireless-regdb install w/o being root + +* Thu Jan 22 2009 John W. Linville v0.9.5_2009_01_15-2 +- Revamp based on package review comments + +* Tue Jan 20 2009 John W. Linville v0.9.5_2009_01_15-1 +- Initial build