Bug#764167: wheezy-pu: package wireless-regdb/2014.06.13-1~deb7u1
Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu
I have just updated wireless-regdb in unstable to a new upstream
release. There have been many changes to the database based on new
regulations and information about additional countries. These should
also go into stable so that users can easily comply with current laws
and use the full permitted ranges of frequency and transmit power.
Ben.
diff -Nru wireless-regdb-2013.11.27/CONTRIBUTING wireless-regdb-2014.06.13/CONTRIBUTING
--- wireless-regdb-2013.11.27/CONTRIBUTING 1970-01-01 01:00:00.000000000 +0100
+++ wireless-regdb-2014.06.13/CONTRIBUTING 2014-06-13 20:08:55.000000000 +0100
@@ -0,0 +1,49 @@
+
+This project embraces the Developer Certificate of Origin (DCO) for
+contributions. This means you must agree to the following prior to submitting
+patches, if you agree with this developer certificate you acknowledge this by
+adding a Signed-off-by tag to your patch commit log. Every submitted patch
+must have this.
+
+The source for the DCO:
+
+http://developercertificate.org/
+
+-----------------------------------------------------------------------
+
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+(c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
+
+(d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
diff -Nru wireless-regdb-2013.11.27/dbparse.py wireless-regdb-2014.06.13/dbparse.py
--- wireless-regdb-2013.11.27/dbparse.py 2013-11-27 16:21:08.000000000 +0000
+++ wireless-regdb-2014.06.13/dbparse.py 2014-06-13 20:08:55.000000000 +0100
@@ -16,6 +16,7 @@
# hole at bit 8
# hole at bit 9. FIXME: Where is NO-HT40 defined?
'NO-HT40': 1<<10,
+ 'AUTO-BW': 1<<11,
}
dfs_regions = {
diff -Nru wireless-regdb-2013.11.27/db.txt wireless-regdb-2014.06.13/db.txt
--- wireless-regdb-2013.11.27/db.txt 2013-11-27 16:21:08.000000000 +0000
+++ wireless-regdb-2014.06.13/db.txt 2014-06-13 20:08:55.000000000 +0100
@@ -4,10 +4,13 @@
# Channel 12 - 13.
(2457 - 2482 @ 40), (20), NO-IR
# Channel 14. Only JP enables this and for 802.11b only
- (2474 - 2494 @ 20), (20), NO-IR
+ (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
# Channel 36 - 48
- (5170 - 5250 @ 80), (20), NO-IR
- # NB: 5260 MHz - 5700 MHz requies DFS
+ (5170 - 5250 @ 160), (20), NO-IR
+ # Channel 52 - 64
+ (5250 - 5330 @ 160), (20), NO-IR, DFS
+ # Channel 100 - 144
+ (5490 - 5730 @ 160), (20), NO-IR, DFS
# Channel 149 - 165
(5735 - 5835 @ 80), (20), NO-IR
# IEEE 802.11ad (60GHz), channels 1..3
@@ -25,6 +28,12 @@
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
+country AF: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
+
country AL: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20.00)
@@ -101,6 +110,13 @@
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
+country BF: DFS-FCC
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
+
country BG: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
@@ -136,6 +152,14 @@
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
+# Source:
+# http://www.bicma.gov.bt/paper/publication/nrrpart4.pdf
+country BT: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
+
country BY: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
@@ -153,6 +177,15 @@
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
+# Source:
+# http://www.art-rca.org
+country CF: DFS-FCC
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (17)
+ (5250 - 5330 @ 40), (24), DFS
+ (5490 - 5730 @ 40), (24), DFS
+ (5735 - 5835 @ 40), (30)
+
country CH: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
@@ -161,6 +194,13 @@
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
+country CI: DFS-FCC
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
+
country CL: DFS-JP
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
@@ -207,7 +247,7 @@
country CZ: DFS-ETSI
(2400 - 2483.5 @ 40), (100 mW)
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS
(5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
@@ -227,8 +267,10 @@
country DE: DFS-ETSI
# entries 279004 and 280006
(2400 - 2483.5 @ 40), (100 mW)
- # entry 303005, 304002 and 305002
- (5150 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ # entry 303005
+ (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
+ # entries 304002 and 305002
+ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS
# entries 308002, 309001 and 310003
(5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
@@ -277,7 +319,7 @@
country ES: DFS-ETSI
(2400 - 2483.5 @ 40), (100 mW)
(5150 - 5250 @ 80), (100 mW), NO-OUTDOOR
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR
+ (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS
(5470 - 5725 @ 80), (500 mW), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
@@ -290,6 +332,13 @@
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
+country FM: DFS-FCC
+ (2402 - 2472 @ 40), (30)
+ (5170 - 5250 @ 80), (24)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
+
country FR: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
@@ -320,6 +369,13 @@
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
+country GH: DFS-FCC
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
+
country GR: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
@@ -347,6 +403,10 @@
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
+country GY:
+ (2402 - 2482 @ 40), (30)
+ (5735 - 5835 @ 80), (30)
+
country HN: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
@@ -369,11 +429,12 @@
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
-country HT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5490 - 5710 @ 80), (27), DFS
+country HT: DFS-FCC
+ (2402 - 2472 @ 40), (30)
+ (5170 - 5250 @ 80), (24)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
country HU: DFS-ETSI
(2402 - 2482 @ 40), (20)
@@ -398,7 +459,8 @@
country IL: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5150 - 5350 @ 80), (200 mW), NO-OUTDOOR
+ (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR
+ (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS
country IN: DFS-JP
(2402 - 2482 @ 40), (20)
@@ -467,7 +529,6 @@
(5735 - 5815 @ 80), (30)
country KR: DFS-JP
- (2402 - 2482 @ 20), (20)
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
(5250 - 5330 @ 80), (20), DFS
@@ -537,6 +598,14 @@
(5170 - 5250 @ 80), (20)
(5250 - 5330 @ 80), (20), DFS
+# Source:
+# http://www.cept.org/files/1050/Tools%20and%20Services/EFIS%20-%20ECO%20Frequency%20Information%20System/National%20frequency%20tables/Montenegro%20NAFT%20-%202010.pdf
+country ME: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
+
country MO:
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 40), (23)
@@ -551,6 +620,14 @@
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
+# Source:
+# http://www.are.mr/pdfs/telec_freq_TNAbf_2010.pdf
+country MR: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
+
country MT: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20)
@@ -574,16 +651,24 @@
country NL: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5330 @ 80), (20), NO-OUTDOOR
+ (5170 - 5250 @ 80), (20), NO-OUTDOOR
+ (5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS
(5490 - 5710 @ 80), (27), DFS
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
+# Data from http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77
+# Power at 5250 - 5350 MHz, 5470 - 5725 MHz and 5815 – 5850 MHz can
+# be doubled if TPC is implemented.
+# Up to 2W (or 4W with TPC) is allowed in the 5725 – 5795 MHz band
+# which has been merged with 5470 - 5725 MHz to allow wide channels
country NO: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5490 - 5710 @ 80), (27), DFS
+ (2400 - 2483.5 @ 40), (100 mW)
+ (5150 - 5250 @ 80), (200 mW)
+ (5250 - 5350 @ 80), (100 mW), DFS
+ (5470 - 5795 @ 80), (500 mW), DFS
+ (5815 - 5850 @ 35), (2000 mW), DFS
+ (17100 - 17300 @ 200), (100 mW)
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
@@ -660,6 +745,13 @@
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
+country PW: DFS-FCC
+ (2402 - 2472 @ 40), (30)
+ (5170 - 5250 @ 80), (24)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
+
country QA: DFS-JP
(2402 - 2482 @ 40), (20)
(5735 - 5835 @ 80), (30)
@@ -733,6 +825,15 @@
# 60 gHz band channels 1-4, ref: Etsi En 302 567
(57240 - 65880 @ 2160), (40), NO-OUTDOOR
+# Source:
+# Regulation N° 2004-005 ART/DG/DRC/D.Rég
+country SN: DFS-FCC
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
+
country SV: DFS-FCC
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
@@ -742,6 +843,18 @@
country SY:
(2402 - 2482 @ 40), (20)
+country TD: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+ (5490 - 5710 @ 80), (27), DFS
+
+country TG: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
+
country TW: DFS-JP
(2402 - 2472 @ 40), (30)
(5270 - 5330 @ 40), (17), DFS
@@ -808,16 +921,20 @@
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
-country UZ: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
+# Source:
+# http://cemc.uz/article/1976/
+country UZ: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (20)
+ (5250 - 5330 @ 80), (20), DFS
+# Source:
+# Official Gazette (Gaceta Oficial) concerning Unlicensed transmitter use
+# (10 June 2013)
+# http://www.conatel.gob.ve/
country VE: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
+ (2402 - 2482 @ 40), (30)
+ (5170 - 5250 @ 80), (23)
(5250 - 5330 @ 80), (23), DFS
(5735 - 5835 @ 80), (30)
@@ -825,6 +942,15 @@
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17)
(5250 - 5330 @ 80), (24), DFS
+ (5490 - 5730 @ 80), (24), DFS
+ (5735 - 5835 @ 80), (30)
+
+# Source:
+# http://www.trr.vu/attachments/category/130/GURL_for_Short-range_Radiocommunication_Devices2.pdf
+country VU: DFS-FCC
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 80), (17)
+ (5250 - 5330 @ 80), (24), DFS
(5490 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
diff -Nru wireless-regdb-2013.11.27/debian/changelog wireless-regdb-2014.06.13/debian/changelog
--- wireless-regdb-2013.11.27/debian/changelog 2014-03-30 15:45:05.000000000 +0100
+++ wireless-regdb-2014.06.13/debian/changelog 2014-10-06 01:37:40.000000000 +0100
@@ -1,3 +1,29 @@
+wireless-regdb (2014.06.13-1~deb7u1) unstable; urgency=medium
+
+ * Upload to wheezy
+
+ -- Ben Hutchings <ben@decadent.org.uk> Mon, 06 Oct 2014 01:36:35 +0100
+
+wireless-regdb (2014.06.13-1) unstable; urgency=medium
+
+ * New upstream version
+ - Correct removal of NO-OFDM and DFS flags from some rules
+ (regression in 2013.11.27)
+ - Add channels 52..64 and 100..144 in 5 GHz band to world regulatory
+ domain
+ - Update rules for Norway (NO): increase frequency range on 5 GHz band
+ and add 17 GHz band
+ - Update rules for Uzbekistan (UZ)
+ - Add rules for Afghanistan (AF), Burkina Faso (BF), Bhutan (BT),
+ Central African Republic (CF), Côte d'Ivoire (CI), Micronesia (FM),
+ Ghana (GH), Guyana (GY), Montenegro (ME), Mauritania (MR), Palau (PW),
+ Senegal (SN), Chad (TD), Togo (TG) and Vanuatu (VU)
+ - Update rules for Venezuela (VE): increase max EIRP in some frequency
+ ranges
+ - Update rules for Haiti (HT)
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sun, 05 Oct 2014 23:52:43 +0100
+
wireless-regdb (2013.11.27-0wheezy1) wheezy; urgency=medium
* Upload to wheezy (Closes: #743049)
diff -Nru wireless-regdb-2013.11.27/debian/patches/keep-setting-NO_IBSS-flag.patch wireless-regdb-2014.06.13/debian/patches/keep-setting-NO_IBSS-flag.patch
--- wireless-regdb-2013.11.27/debian/patches/keep-setting-NO_IBSS-flag.patch 2014-03-30 14:33:41.000000000 +0100
+++ wireless-regdb-2014.06.13/debian/patches/keep-setting-NO_IBSS-flag.patch 2014-10-06 01:03:01.000000000 +0100
@@ -1,11 +1,16 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 24 Feb 2014 22:22:05 +0000
Subject: Set both PASSIVE_SCAN and NO_IBSS flags in binary database
+Forwarded: not-needed
The PASSIVE-SCAN and NO-IBSS flags in db.txt have been collapsed
into a single NO-IR flag. However the kernel may still test only
the NO_IBSS flag so I think we need to keep setting both.
+crda 3.13 deals with this when talking to the kernel so we could drop
+this patch in favour of 'Breaks: crda (<< 3.13)', but that won't be
+compatible with wheezy.
+
--- a/dbparse.py
+++ b/dbparse.py
@@ -12,8 +12,7 @@ flag_definitions = {
@@ -17,4 +22,4 @@
+ 'NO-IR': 1<<7 | 1<<8,
# hole at bit 9. FIXME: Where is NO-HT40 defined?
'NO-HT40': 1<<10,
- }
+ 'AUTO-BW': 1<<11,
Binary files /var/tmp/o12aSV7qub/wireless-regdb-2013.11.27/regulatory.bin and /var/tmp/nI1s53Xh_e/wireless-regdb-2014.06.13/regulatory.bin differ
diff -Nru wireless-regdb-2013.11.27/sha1sum.txt wireless-regdb-2014.06.13/sha1sum.txt
--- wireless-regdb-2013.11.27/sha1sum.txt 2013-11-27 16:21:08.000000000 +0000
+++ wireless-regdb-2014.06.13/sha1sum.txt 2014-06-13 20:08:55.000000000 +0100
@@ -1 +1 @@
-94fbae1fde19ede6fd833e0f91d1c9264310d559 db.txt
+b69cb715febf25a871405767e2bcd827387398dd db.txt
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64
Kernel: Linux 3.16-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Reply to: