--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
I have updated wireless-regdb in unstable to a new upstream release,
and this has also entered testing. 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-2014.11.18/db.txt wireless-regdb-2016.06.10/db.txt
--- wireless-regdb-2014.11.18/db.txt 2014-11-18 21:13:55.000000000 +0000
+++ wireless-regdb-2016.06.10/db.txt 2016-06-10 14:02:34.000000000 +0100
@@ -2,7 +2,7 @@
country 00:
(2402 - 2472 @ 40), (20)
# Channel 12 - 13.
- (2457 - 2482 @ 40), (20), NO-IR
+ (2457 - 2482 @ 20), (20), NO-IR, AUTO-BW
# Channel 14. Only JP enables this and for 802.11b only
(2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
# Channel 36 - 48
@@ -22,7 +22,7 @@
(5170 - 5250 @ 80), (20)
(5250 - 5330 @ 80), (20), DFS
(5490 - 5710 @ 80), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country AE: DFS-FCC
@@ -54,8 +54,8 @@
country AM: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (18)
- (5250 - 5330 @ 80), (18), DFS
+ (5170 - 5250 @ 20), (18)
+ (5250 - 5330 @ 20), (18), DFS
country AN: DFS-ETSI
(2402 - 2482 @ 40), (20)
@@ -82,10 +82,10 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
-country AU:
+country AU: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17), AUTO-BW
(5250 - 5330 @ 80), (24), DFS, AUTO-BW
@@ -108,7 +108,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country BB: DFS-FCC
@@ -126,7 +126,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country BF: DFS-FCC
@@ -136,19 +136,41 @@
(5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30)
+# Bulgarian rules as defined by the Communications Regulation Commission in the
+# following documents:
+#
+# Rules for carrying out electronic communications through radio equipment using
+# radio spectrum, which does not need to be individually assigned (the Rules):
+# http://www.crc.bg/files/_bg/Pravila_09_06_2015.pdf
+#
+# List of radio equipment that uses harmonized within the European Union bands
+# and electronic communications terminal equipment (the List):
+# http://www.crc.bg/files/_bg/Spisak_2015.pdf
+#
+# Note: The transmit power limits in the 5250-5350 MHz and 5470-5725 MHz bands
+# can be raised by 3 dBm if TPC is enabled. Refer to BDS EN 301 893 for details.
country BG: DFS-ETSI
+ # Wideband data transmission systems (WDTS) in the 2.4GHz ISM band, ref:
+ # I.22 of the List, BDS EN 300 328
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
+ # 5 GHz Radio Local Area Networks (RLANs), ref:
+ # II.H01 of the List, BDS EN 301 893
+ (5170 - 5250 @ 80), (23), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
+ # II.H01 of the List, I.54 from the List, BDS EN 301 893
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
+ # Short range devices (SRDs) in the 5725-5875 MHz frequency range, ref:
+ # I.43 of the List, BDS EN 300 440-2, BDS EN 300 440-1
+ (5725 - 5875 @ 80), (14)
+ # 60 GHz Multiple-Gigabit RLAN Systems, ref:
+ # II.H03 of the List, BDS EN 302 567-2
+ (57000 - 66000 @ 2160), (40), NO-OUTDOOR
country BH: DFS-JP
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5735 - 5835 @ 80), (20)
+ (5170 - 5250 @ 20), (20)
+ (5250 - 5330 @ 20), (20), DFS
+ (5735 - 5835 @ 20), (20)
country BL: DFS-ETSI
(2402 - 2482 @ 40), (20)
@@ -210,7 +232,8 @@
(2402 - 2472 @ 40), (30)
(5170 - 5250 @ 80), (17), AUTO-BW
(5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
+ (5490 - 5600 @ 80), (24), DFS
+ (5650 - 5730 @ 80), (24), DFS
(5735 - 5835 @ 80), (30)
# Source:
@@ -227,7 +250,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country CI: DFS-FCC
@@ -248,7 +271,7 @@
(5170 - 5250 @ 80), (23), AUTO-BW
(5250 - 5330 @ 80), (23), DFS, AUTO-BW
(5735 - 5835 @ 80), (30)
- # 60 gHz band channels 1,4: 28dBm, channels 2,3: 44dBm
+ # 60 GHz band channels 1,4: 28dBm, channels 2,3: 44dBm
# ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
(57240 - 59400 @ 2160), (28)
(59400 - 63720 @ 2160), (44)
@@ -263,10 +286,16 @@
country CR: DFS-FCC
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
+ (5170 - 5250 @ 20), (17)
+ (5250 - 5330 @ 20), (24), DFS
+ (5490 - 5730 @ 20), (24), DFS
+ (5735 - 5835 @ 20), (30)
+
+# http://www.mincom.gob.cu/?q=marcoregulatorio
+# - Redes Informáticas
+# Resolución 127, 2011 - Reglamento Banda 2,4 GHz.
+country CU: DFS-FCC
+ (2400 - 2483.5 @ 40), (200 mW)
country CX: DFS-FCC
(2402 - 2482 @ 40), (20)
@@ -280,7 +309,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
# Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf
@@ -292,31 +321,44 @@
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
(5470 - 5725 @ 160), (500 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
-# Data from "Frequenznutzungsplan" (as published in April 2008), downloaded from
-# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38448/publicationFile/2659/Frequenznutzungsplan2008_Id17448pdf.pdf
-# For the 5GHz range also see
-# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38216/publicationFile/6579/WLAN5GHzVfg7_2010_28042010pdf.pdf
-# The values have been reduced by a factor of 2 (3db) for non TPC devices
-# (in other words: devices with TPC can use twice the tx power of this table).
-# Note that the docs do not require TPC for 5150--5250; the reduction to
-# 100mW thus is not strictly required -- however the conservative 100mW
+# Allocation for the 2.4 GHz band (Vfg 10 / 2013, Allgemeinzuteilung von
+# Frequenzen für die Nutzung in lokalen Netzwerken; Wireless Local Area
+# Networks (WLAN-Funkanwendungen).
+# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2013_10_WLAN_2,4GHz_pdf.pdf
+#
+# Allocation for the 5 GHz band (Vfg. 7 / 2010, Allgemeinzuteilung von
+# Frequenzen in den Bereichen 5150 MHz - 5350 MHz und 5470 MHz - 5725 MHz für
+# Funkanwendungen zur breitbandigen Datenübertragung, WAS/WLAN („Wireless
+# Access Systems including Wireless Local Area Networks“).
+# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2010_07_WLAN_5GHz_pdf.pdf
+# The values for the 5 GHz have been reduced by a factor of 2 (3db) for non TPC
+# devices (in other words: devices with TPC can use twice the tx power of this
+# table). Note that the docs do not require TPC for 5150--5250; the reduction
+# to 100mW thus is not strictly required -- however the conservative 100mW
# limit is used here as the non-interference with radar and satellite
# apps relies on the attenuation by the building walls only in the
# absence of DFS; the neighbour countries have 100mW limit here as well.
+#
+# The ETSI EN 300 440-1 standard for short range devices in the 5 GHz band has
+# been implemented in Germany:
+# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2014_69_SRD_pdf.pdf
+#
+# Allocation for the 60 GHz band (Allgemeinzuteilung von Frequenzen im
+# Bereich 57 GHz - 66 GHz für Funkanwendungen für weitbandige
+# Datenübertragungssysteme; „Multiple Gigabit WAS/RLAN Systems (MGWS)“).
+# https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2011_08_MGWS_pdf.pdf
country DE: DFS-ETSI
- # entries 279004 and 280006
(2400 - 2483.5 @ 40), (100 mW)
- # entry 303005
(5150 - 5250 @ 80), (100 mW), NO-OUTDOOR, AUTO-BW
- # entries 304002 and 305002
(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
- # entries 308002, 309001 and 310003
(5470 - 5725 @ 160), (500 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # short range devices (ETSI EN 300 440-1)
+ (5725 - 5875 @ 80), (25 mW)
+ # 60 GHz band channels 1-4 (ETSI EN 302 567)
(57000 - 66000 @ 2160), (40)
country DK: DFS-ETSI
@@ -324,7 +366,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
# Source:
@@ -349,23 +391,23 @@
country EC: DFS-FCC
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
+ (5170 - 5250 @ 20), (17)
+ (5250 - 5330 @ 20), (24), DFS
+ (5490 - 5730 @ 20), (24), DFS
+ (5735 - 5835 @ 20), (30)
country EE: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country EG: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
# Orden IET/787/2013, de 25 de abril, por la que se aprueba
# el cuadro nacional de atribución de frecuencias.
@@ -379,7 +421,7 @@
(5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
(5470 - 5725 @ 160), (500 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country ET: DFS-ETSI
@@ -389,11 +431,11 @@
(5490 - 5710 @ 160), (27), DFS
country FI: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ (2400 - 2483.5 @ 40), (20)
+ (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW
+ (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
+ (5470 - 5725 @ 160), (27), DFS
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country FM: DFS-FCC
@@ -408,7 +450,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country GB: DFS-ETSI
@@ -416,7 +458,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country GD: DFS-FCC
@@ -430,7 +472,7 @@
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (18), AUTO-BW
(5250 - 5330 @ 80), (18), DFS, AUTO-BW
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country GF: DFS-ETSI
@@ -448,9 +490,9 @@
country GL: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5490 - 5710 @ 80), (27), DFS
+ (5170 - 5250 @ 80), (20), AUTO-BW
+ (5250 - 5330 @ 80), (20), DFS, AUTO-BW
+ (5490 - 5710 @ 160), (27), DFS
country GP: DFS-ETSI
(2402 - 2482 @ 40), (20)
@@ -463,7 +505,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country GT: DFS-FCC
@@ -474,16 +516,16 @@
country GU: DFS-FCC
(2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
+ (5170 - 5250 @ 20), (17)
+ (5250 - 5330 @ 20), (24), DFS
+ (5490 - 5730 @ 20), (24), DFS
+ (5735 - 5835 @ 20), (30)
country GY:
(2402 - 2482 @ 40), (30)
(5735 - 5835 @ 80), (30)
-country HK:
+country HK: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (17), AUTO-BW
(5250 - 5330 @ 80), (24), DFS, AUTO-BW
@@ -498,11 +540,11 @@
(5735 - 5835 @ 80), (30)
country HR: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ (2400 - 2483.5 @ 40), (20)
+ (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW
+ (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
+ (5470 - 5725 @ 160), (27), DFS
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country HT: DFS-FCC
@@ -517,20 +559,20 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country ID: DFS-JP
# ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
- (2402 - 2482 @ 40), (20)
- (5735 - 5815 @ 80), (23)
+ (2402 - 2482 @ 20), (20)
+ (5735 - 5815 @ 20), (23)
country IE: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country IL: DFS-ETSI
@@ -553,7 +595,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country IT: DFS-ETSI
@@ -561,7 +603,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country JM: DFS-FCC
@@ -584,6 +626,9 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (23), DFS
+ # 60 GHz band channels 2-4 at 10mW,
+ # ref: http://www.arib.or.jp/english/html/overview/doc/1-STD-T74v1_1.pdf
+ (59000 - 66000 @ 2160), (10 mW)
country KE: DFS-JP
(2402 - 2482 @ 40), (20)
@@ -607,11 +652,11 @@
(5735 - 5815 @ 80), (30)
country KP: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5630 @ 80), (30), DFS
- (5735 - 5815 @ 80), (30)
+ (2402 - 2482 @ 20), (20)
+ (5170 - 5250 @ 20), (20)
+ (5250 - 5330 @ 20), (20), DFS
+ (5490 - 5630 @ 20), (30), DFS
+ (5735 - 5815 @ 20), (30)
country KR: DFS-JP
(2402 - 2482 @ 40), (20)
@@ -619,6 +664,9 @@
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (30), DFS
(5735 - 5835 @ 80), (30)
+ # 60 GHz band channels 1-4,
+ # ref: http://www.law.go.kr/%ED%96%89%EC%A0%95%EA%B7%9C%EC%B9%99/%EB%AC%B4%EC%84%A0%EC%84%A4%EB%B9%84%EA%B7%9C%EC%B9%99
+ (57000 - 66000 @ 2160), (43)
country KW: DFS-ETSI
(2402 - 2482 @ 40), (20)
@@ -659,10 +707,10 @@
country LK: DFS-FCC
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
+ (5170 - 5250 @ 20), (17)
+ (5250 - 5330 @ 20), (24), DFS
+ (5490 - 5730 @ 20), (24), DFS
+ (5735 - 5835 @ 20), (30)
# Source:
# http://lca.org.ls/images/documents/lesotho_national_frequency_allocation_plan.pdf
@@ -677,7 +725,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country LU: DFS-ETSI
@@ -685,7 +733,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country LV: DFS-ETSI
@@ -693,7 +741,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country MA: DFS-ETSI
@@ -741,7 +789,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country MN: DFS-FCC
@@ -751,11 +799,12 @@
(5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30)
-country MO:
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 40), (23)
- (5250 - 5330 @ 40), (23), DFS
- (5735 - 5835 @ 40), (30)
+country MO: DFS-FCC
+ (2402 - 2482 @ 40), (23)
+ (5170 - 5250 @ 80), (23), AUTO-BW
+ (5250 - 5330 @ 80), (23), DFS, AUTO-BW
+ (5490 - 5730 @ 160), (30), DFS
+ (5735 - 5835 @ 80), (30)
country MP: DFS-FCC
(2402 - 2472 @ 40), (30)
@@ -783,7 +832,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country MU: DFS-FCC
@@ -793,6 +842,14 @@
(5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30)
+# Source:
+# http://www.cam.gov.mv/docs/tech_standards/TAM-TS-100-2004-WLAN.pdf
+country MV: DFS-ETSI
+ (2400 - 2483.5 @ 40), (100 mW)
+ (5150 - 5250 @ 80), (200 mW), AUTO-BW
+ (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW
+ (5725 - 5850 @ 80), (100 mW)
+
country MW: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW
@@ -808,8 +865,14 @@
country MY: DFS-FCC
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
+ (5170 - 5250 @ 80), (24), AUTO-BW
+ (5250 - 5330 @ 80), (24), DFS, AUTO-BW
+ (5490 - 5650 @ 160), (24), DFS
+ (5735 - 5835 @ 80), (24)
+
+country NG: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5250 - 5330 @ 80), (30), DFS
(5735 - 5835 @ 80), (30)
country NI: DFS-FCC
@@ -819,12 +882,19 @@
(5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30)
+# Regulation on the use of frequency space without a license and
+# without notification 2015
+#
+# http://wetten.overheid.nl/BWBR0036378/2015-03-05
+
country NL: DFS-ETSI
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW
(5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # short range devices (ETSI EN 300 440-1)
+ (5725 - 5875 @ 80), (25 mW)
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
# Data from http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77
@@ -839,7 +909,7 @@
(5470 - 5795 @ 160), (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
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country NP: DFS-JP
@@ -848,7 +918,7 @@
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5735 - 5835 @ 80), (20)
-country NZ: DFS-FCC
+country NZ: DFS-ETSI
(2402 - 2482 @ 40), (30)
(5170 - 5250 @ 80), (17), AUTO-BW
(5250 - 5330 @ 80), (24), DFS, AUTO-BW
@@ -903,7 +973,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country PM: DFS-ETSI
@@ -924,7 +994,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country PW: DFS-FCC
@@ -956,7 +1026,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
@@ -966,15 +1036,17 @@
(2400 - 2483.5 @ 40), (100 mW)
(5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
(5470 - 5725 @ 20), (1000 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country RU: DFS-ETSI
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
+ (5170 - 5250 @ 80), (20), AUTO-BW
+ (5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5650 - 5730 @ 80), (30), DFS
(5735 - 5835 @ 80), (30)
+ # 60 GHz band channels 1-4, ref: Changes to NLA 124_Order №129_22042015.pdf
+ (57000 - 66000 @ 2160), (40)
country RW: DFS-FCC
(2402 - 2482 @ 40), (20)
@@ -994,7 +1066,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country SG: DFS-FCC
@@ -1009,7 +1081,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country SK: DFS-ETSI
@@ -1017,7 +1089,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
# Source:
@@ -1037,9 +1109,9 @@
country SV: DFS-FCC
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (23), DFS
- (5735 - 5835 @ 80), (30)
+ (5170 - 5250 @ 20), (17)
+ (5250 - 5330 @ 20), (23), DFS
+ (5735 - 5835 @ 20), (30)
country SY:
(2402 - 2482 @ 40), (20)
@@ -1082,7 +1154,7 @@
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country TT: DFS-FCC
@@ -1092,13 +1164,25 @@
(5490 - 5730 @ 160), (24), DFS
(5735 - 5835 @ 80), (30)
-country TW: DFS-JP
- (2402 - 2472 @ 40), (30)
- (5270 - 5330 @ 40), (17), DFS
- (5490 - 5590 @ 80), (30), DFS
- (5650 - 5710 @ 40), (30), DFS
- (5735 - 5835 @ 80), (30)
+# Source:
+# Table of Frequency Allocations of Republic of China (Taiwan) / Nov 2014:
+# http://www.motc.gov.tw/websitedowndoc?file=post/201411171137330.doc&; \
+# filedisplay=Table+of+radio+frequency+allocation.doc
+# LP0002 Low-power Radio-frequency Devices Technical Regulations / 28 Jun 2011:
+# http://www.ncc.gov.tw/english/show_file.aspx?table_name=news&file_sn=681
+# (section 3.10.1, 4.7)
+country TW: DFS-FCC
+ (2400 - 2483.5 @ 40), (30)
+ # Follow US 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients
+ (5150 - 5250 @ 80), (23), AUTO-BW
+ (5250 - 5350 @ 80), (23), DFS, AUTO-BW
+ (5470 - 5725 @ 160), (23), DFS
+ (5725 - 5850 @ 80), (30)
+country TZ:
+ (2402 - 2482 @ 40), (20)
+ (5735 - 5835 @ 80), (30)
+
# Source:
# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874
# #1174 / 23 Oct 2008: http://www.nkrz.gov.ua/uk/activities/ruling/1225269361
@@ -1108,10 +1192,11 @@
# disputable definitions there.
country UA: DFS-ETSI
(2400 - 2483.5 @ 40), (20), NO-OUTDOOR
- (5150 - 5350 @ 40), (20), NO-OUTDOOR
- (5490 - 5670 @ 80), (20), DFS
+ (5150 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW
+ (5250 - 5350 @ 80), (20), DFS, NO-OUTDOOR, AUTO-BW
+ (5490 - 5670 @ 160), (20), DFS
(5735 - 5835 @ 80), (20)
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
+ # 60 GHz band channels 1-4, ref: Etsi En 302 567
(57000 - 66000 @ 2160), (40)
country UG: DFS-FCC
@@ -1123,8 +1208,10 @@
country US: DFS-FCC
(2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
+ # 5.15 ~ 5.25 GHz: 30 dBm for master mode, 23 dBm for clients
+ (5170 - 5250 @ 80), (23), AUTO-BW
(5250 - 5330 @ 80), (23), DFS, AUTO-BW
+ (5490 - 5730 @ 160), (23), DFS
(5735 - 5835 @ 80), (30)
# 60g band
# reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255
@@ -1133,9 +1220,8 @@
country UY: DFS-FCC
(2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
+ (5170 - 5250 @ 80), (23), AUTO-BW
+ (5250 - 5330 @ 80), (23), DFS, AUTO-BW
(5735 - 5835 @ 80), (30)
# Source:
@@ -1192,6 +1278,12 @@
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
(5490 - 5710 @ 160), (27), DFS
+country WS: DFS-ETSI
+ (2402 - 2482 @ 40), (20)
+ (5170 - 5250 @ 40), (20)
+ (5250 - 5330 @ 40), (20), DFS
+ (5490 - 5710 @ 40), (27), DFS
+
country YE:
(2402 - 2482 @ 40), (20)
@@ -1205,7 +1297,7 @@
(2402 - 2482 @ 40), (20)
(5170 - 5250 @ 80), (20), AUTO-BW
(5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
+ (5490 - 5710 @ 160), (30)
country ZW: DFS-ETSI
(2402 - 2482 @ 40), (20)
diff -Nru wireless-regdb-2014.11.18/debian/changelog wireless-regdb-2016.06.10/debian/changelog
--- wireless-regdb-2014.11.18/debian/changelog 2015-01-02 00:24:37.000000000 +0000
+++ wireless-regdb-2016.06.10/debian/changelog 2017-01-07 15:55:26.000000000 +0000
@@ -1,3 +1,78 @@
+wireless-regdb (2016.06.10-1~deb8u1) jessie; urgency=medium
+
+ * Upload to jessie
+ * Revert "Remove obsolete postinst script"; the script is needed for
+ upgrades from wheezy to jessie
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sat, 07 Jan 2017 15:55:26 +0000
+
+wireless-regdb (2016.06.10-1) unstable; urgency=medium
+
+ * New upstream version (Closes: #830288)
+ - Update rules for Hong Kong (HK): assign to ETSI DFS region
+ - Update rules for South Africa (ZA): remove DFS requirement and increase
+ transmit power limit for channels 100..140 (5490-5710 MHz)
+ - Update rules for Taiwan (TW): extend the 2.4 GHz and 5 GHz bands; change
+ transmit power limits for parts of the 5 GHz band; re-assign to FCC DFS
+ region
+ - Update rules for United States (US): increase transmit power limit for
+ channels 36..48 (5170-5250 MHz)
+ - Update rules for Uruguay (UY): remove channels 100..144 (5490-5730 MHz)
+ - Update rules for Russia (RU): enable VHT80 in 5 GHz band and VHT160
+ for channel 50 (5170-5330 MHz)
+ - Update rules for Ukraine (UA): enable VHT80 in 5 GHz band and VHT160
+ for channels 46..54 (5150-5350 MHz) and 114..118 (5490-5670 MHz)
+ - Update rules for Malaysia (MY): change transmit power limit for the
+ 5 GHz band; enable VHT80 in 5 GHz band and VHT160 for channels 50
+ (5170-5330 MHz) and 114 (5490-5650 MHz)
+ - Update rules for Greenland (GL): enable VHT160 for channels 50
+ (5170-5330 MHz) and 114..126 (5490-5710 MHz)
+ - Update rules for Croatia (HR) and Finland (FI): extend the 2.4 GHz and
+ 5 GHz bands; increase transmit power limit for channels 34..48
+ (5150-5250 MHz); add NO-OUTDOOR flag for channels 34..64 (5150-5350 MHz)
+ - Fix world regulatory domain: correct the channel width for channels
+ 12..13 (2457-2482 MHz)
+ - Add rules for Cuba (CU)
+ - Update rules for Germany (DE) and Netherlands (NL): add channels
+ 147..165 (5725-5875 MHz)
+ - Update rules for Bulgaria (BG): increase transmit power limit for
+ channels 36..48 (5170-5250 MHz); add NO-OUTDOOR flag for 60 GHz band
+ - Update rules for Republic of Korea (KR): add 60 GHz band
+ * debian/control: Change Vcs-Git and Vcs-Browser to canonical HTTP-S URLs
+ * debian/copyright: Change Source to HTTP-S URL
+ * Use debhelper compatibility level 9
+ * debian/control: Update Standards-Version to 3.9.8; no changes needed
+ * Remove obsolete postinst script
+ * debian/control: Update Homepage
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sun, 04 Dec 2016 23:47:35 +0000
+
+wireless-regdb (2015.07.20-1) unstable; urgency=medium
+
+ * New upstream version
+ - Update rules for Armenia (AM), Bahrain (BH), Costa Rica (CR),
+ Ecuador (EC), Guam (GU), Sri Lanka (LK), El Salvador (SV): disable VHT
+ in 5 GHz band
+ - Update rules for Australia (AU), New Zealand (NZ): assign to ETSI DFS
+ region
+ - Update rules for Bulgaria (BG): add channels 147..173 (5725-5875 MHz)
+ - Update rules for Canada (CA): remove channels 120..134 (5600-5650 MHz)
+ - Update rules for Egypt (EG): disable VHT80
+ - Update rules for Indonesia (ID), Democratic People's Republic of Korea
+ (KP): disable VHT
+ - Update rules for Japan (JP): add 60 GHz band
+ - Update rules for Macao (MO): assign to ETSI FCC region; add channels
+ 100..144 (5490-5730 MHz); enable VHT80 and VHT160 in 5 GHz band
+ - Add rules for Maldives (MV), Nigeria (NG), Tanzania (TZ) and Samoa (WS)
+ - Update rules for Russia (RU): disable VHT80; add 60 GHz band
+ - Update rules for United States (US): re-add channels 100..144
+ (5490-5730 MHz)
+ * Generate a detached signature at source preparation time and append
+ it when building the binary package (thanks to Jérémy Bobbio)
+ (Closes: #725803)
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sun, 30 Aug 2015 10:20:04 +0100
+
wireless-regdb (2014.11.18-1) unstable; urgency=medium
* New upstream version
diff -Nru wireless-regdb-2014.11.18/debian/compat wireless-regdb-2016.06.10/debian/compat
--- wireless-regdb-2014.11.18/debian/compat 2011-08-14 17:20:59.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/compat 2016-12-04 23:41:42.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru wireless-regdb-2014.11.18/debian/control wireless-regdb-2016.06.10/debian/control
--- wireless-regdb-2014.11.18/debian/control 2014-10-06 00:40:02.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/control 2016-12-04 23:46:19.000000000 +0000
@@ -2,14 +2,14 @@
Section: net
Priority: optional
Maintainer: Ben Hutchings <ben@decadent.org.uk>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
openssl,
python,
python-m2crypto
-Standards-Version: 3.9.4
-Vcs-Git: git://git.debian.org/kernel/wireless-regdb.git
-Vcs-Browser: http://git.debian.org/?p=kernel/wireless-regdb.git
-Homepage: http://wireless.kernel.org/en/developers/Regulatory/#The_regulatory_database
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/kernel/wireless-regdb.git
+Vcs-Browser: https://anonscm.debian.org/cgit/kernel/wireless-regdb.git
+Homepage: https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb
Package: wireless-regdb
Architecture: all
diff -Nru wireless-regdb-2014.11.18/debian/copyright wireless-regdb-2016.06.10/debian/copyright
--- wireless-regdb-2014.11.18/debian/copyright 2015-01-02 00:07:49.000000000 +0000
+++ wireless-regdb-2016.06.10/debian/copyright 2015-08-30 13:05:05.000000000 +0100
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: wireless-regdb
Upstream-Contact: Seth Forshee <seth.forshee@canonical.com>
-Source: git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
+Source: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git
Files: *
Copyright: 2008, Luis R. Rodriguez <mcgrof@gmail.com>
diff -Nru wireless-regdb-2014.11.18/debian/patches/dont_auto_create_keypair wireless-regdb-2016.06.10/debian/patches/dont_auto_create_keypair
--- wireless-regdb-2014.11.18/debian/patches/dont_auto_create_keypair 2014-10-06 00:48:59.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/patches/dont_auto_create_keypair 2015-08-30 02:23:18.000000000 +0100
@@ -9,7 +9,7 @@
--- a/Makefile
+++ b/Makefile
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ REGDB_AUTHOR ?= $(shell if [ -f $(DISTRO
echo custom-user; \
fi)
@@ -17,8 +17,8 @@
+REGDB_PRIVKEY ?= $(HOME)/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem
REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem
- REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem
-@@ -67,8 +67,15 @@
+ REGDB_UPSTREAM_PUBKEY ?= sforshee.key.pub.pem
+@@ -67,8 +67,15 @@ $(REGDB_PUBKEY): $(REGDB_PRIVKEY)
$(REGDB_PRIVKEY):
diff -Nru wireless-regdb-2014.11.18/debian/patches/enable_recording_and_using_an_external_signature.patch wireless-regdb-2016.06.10/debian/patches/enable_recording_and_using_an_external_signature.patch
--- wireless-regdb-2014.11.18/debian/patches/enable_recording_and_using_an_external_signature.patch 1970-01-01 01:00:00.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/patches/enable_recording_and_using_an_external_signature.patch 2015-08-30 10:11:51.000000000 +0100
@@ -0,0 +1,92 @@
+From: Jérémy Bobbio <lunar@debian.org>
+Date: Mon, 9 Feb 2015 19:52:17 +0100
+Subject: Enable recording and using an external signature
+Bug-Debian: https://bugs.debian.org/725803
+
+To make wireless-regdb build reproducibly, we need a way to save
+the signature of the database to an external file and later reuse
+it instead of requiring the private key.
+
+--- a/db2bin.py
++++ b/db2bin.py
+@@ -11,6 +11,8 @@ VERSION = 19
+
+ if len(sys.argv) < 3:
+ print 'Usage: %s output-file input-file [key-file]' % sys.argv[0]
++ print ' %s -s signature-file input-file key-file' % sys.argv[0]
++ print ' %s -i signature-file output-file input-file' % sys.argv[0]
+ sys.exit(2)
+
+ def create_rules(countries):
+@@ -48,8 +50,27 @@ class PTR(object):
+ def get(self):
+ return self._offset
+
++if sys.argv[1] == '-s':
++ signature_path = sys.argv[2]
++ input_path = sys.argv[3]
++ output_path = None
++ key_path = sys.argv[4]
++elif sys.argv[1] == '-i':
++ signature_path = sys.argv[2]
++ output_path = sys.argv[3]
++ input_path = sys.argv[4]
++ key_path = None
++else:
++ signature_path = None
++ output_path = sys.argv[1]
++ input_path = sys.argv[2]
++ if len(sys.argv) > 3:
++ key_path = sys.argv[3]
++ else:
++ key_path = None
++
+ p = DBParser()
+-countries = p.parse(file(sys.argv[2]))
++countries = p.parse(file(input_path))
+ power = []
+ bands = []
+ for c in countries.itervalues():
+@@ -119,27 +140,37 @@ for alpha2 in countrynames:
+ output.write(struct.pack('>ccxBI', str(alpha2[0]), str(alpha2[1]), coll.dfs_region, reg_rules_collections[coll.permissions]))
+
+
+-if len(sys.argv) > 3:
++if key_path:
+ # Load RSA only now so people can use this script
+ # without having those libraries installed to verify
+ # their SQL changes
+ from M2Crypto import RSA
+
+ # determine signature length
+- key = RSA.load_key(sys.argv[3])
++ key = RSA.load_key(key_path)
+ hash = hashlib.sha1()
+ hash.update(output.getvalue())
+ sig = key.sign(hash.digest())
+- # write it to file
+ siglen.set(len(sig))
++
+ # sign again
+ hash = hashlib.sha1()
+ hash.update(output.getvalue())
+ sig = key.sign(hash.digest())
+
++ if output_path:
++ output.write(sig)
++ else:
++ with file(signature_path, 'w') as sigfile:
++ sigfile.write(sig)
++elif signature_path and output_path:
++ with file(signature_path) as sigfile:
++ sig = sigfile.read()
++ siglen.set(len(sig))
+ output.write(sig)
+ else:
+ siglen.set(0)
+
+-outfile = open(sys.argv[1], 'w')
+-outfile.write(output.getvalue())
++if output_path:
++ outfile = open(output_path, 'w')
++ outfile.write(output.getvalue())
diff -Nru wireless-regdb-2014.11.18/debian/patches/series wireless-regdb-2016.06.10/debian/patches/series
--- wireless-regdb-2014.11.18/debian/patches/series 2015-01-02 00:07:49.000000000 +0000
+++ wireless-regdb-2016.06.10/debian/patches/series 2015-08-30 10:07:18.000000000 +0100
@@ -1,2 +1,4 @@
dont_auto_create_keypair
keep-setting-NO_IBSS-flag.patch
+enable_recording_and_using_an_external_signature.patch
+split_signature_generation.patch
diff -Nru wireless-regdb-2014.11.18/debian/patches/split_signature_generation.patch wireless-regdb-2016.06.10/debian/patches/split_signature_generation.patch
--- wireless-regdb-2014.11.18/debian/patches/split_signature_generation.patch 1970-01-01 01:00:00.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/patches/split_signature_generation.patch 2015-08-30 10:17:04.000000000 +0100
@@ -0,0 +1,45 @@
+From: Jérémy Bobbio <lunar@debian.org>
+Date: Mon, 9 Feb 2015 19:52:17 +0100
+Subject: Split signature generation
+Bug-Debian: https://bugs.debian.org/725803
+
+Now that db2bin.py supports recording a signature to re-use it later,
+we now split the generation of regulatory.bin to create an intermediate
+signature.
+
+The signature can then be shipped in the source to allow the build
+to be reproduced by independent parties.
+
+[bwh: Call the signature file regulatory.bin.sig, not signature]
+
+--- a/Makefile
++++ b/Makefile
+@@ -36,10 +36,11 @@ REGDB_UPSTREAM_PUBKEY ?= sforshee.key.pu
+
+ REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt >/dev/null 2>&1; \
+ if [ $$? -ne 0 ]; then \
+- echo maintainer-clean $(REGDB_PUBKEY); \
++ echo maintainer-clean; \
+ fi)
+
+ .PHONY: all clean mrproper install maintainer-clean install-distro-key
++.SECONDARY: $(REGDB_PRIVKEY) $(REGDB_PUBKEY)
+
+ all: $(REGDB_CHANGED) regulatory.bin sha1sum.txt
+
+@@ -53,9 +54,12 @@ mrproper: clean maintainer-clean
+ @echo Removed public key, regulatory.bin and compresed man pages
+ @rm -f $(REGDB_PUBKEY) .custom
+
+-regulatory.bin: db.txt $(REGDB_PRIVKEY) $(REGDB_PUBKEY)
+- @echo Generating $@ digitally signed by $(REGDB_AUTHOR)...
+- ./db2bin.py regulatory.bin db.txt $(REGDB_PRIVKEY)
++regulatory.bin: db.txt regulatory.bin.sig
++ ./db2bin.py -i regulatory.bin.sig regulatory.bin db.txt
++
++regulatory.bin.sig: db.txt $(REGDB_PRIVKEY) $(REGDB_PUBKEY)
++ @echo Generating signature by $(REGDB_AUTHOR)...
++ ./db2bin.py -s regulatory.bin.sig db.txt $(REGDB_PRIVKEY)
+
+ sha1sum.txt: db.txt
+ sha1sum $< > $@
diff -Nru wireless-regdb-2014.11.18/debian/README.source wireless-regdb-2016.06.10/debian/README.source
--- wireless-regdb-2014.11.18/debian/README.source 2011-08-14 17:20:59.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/README.source 2015-08-30 03:04:52.000000000 +0100
@@ -9,8 +9,8 @@
modify this package to install it in /lib/crda/pubkeys.
5. Set REGDB_AUTHOR=<author-id> in debian/rules.
-Note, you cannot build this package using an automated builder. You can
-use e.g. 'pbuilder --login --bindmounts /home' to create a controlled
-chroot in which to build it.
+When preparing a source package, you must run 'debian/rules sign' to
+create a detached signature so that the private key is not needed when
+building the binary package.
- -- Ben Hutchings <ben@decadent.org.uk>, Mon, 11 Apr 2011 13:31:22 +0100
+ -- Ben Hutchings <ben@decadent.org.uk>, Sun, 30 Aug 2015 03:04:52 +0100
Binary files /var/tmp/WBp34IdB99/wireless-regdb-2014.11.18/debian/regulatory.bin.sig and /var/tmp/liT33ZYlhU/wireless-regdb-2016.06.10/debian/regulatory.bin.sig differ
diff -Nru wireless-regdb-2014.11.18/debian/rules wireless-regdb-2016.06.10/debian/rules
--- wireless-regdb-2014.11.18/debian/rules 2011-08-14 17:20:59.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/rules 2015-08-30 10:18:36.000000000 +0100
@@ -9,6 +9,9 @@
%:
dh ${@}
+override_dh_auto_configure:
+ cp debian/regulatory.bin.sig .
+
override_dh_install:
make DESTDIR=debian/wireless-regdb install
# crda will install public keys
@@ -16,4 +19,10 @@
override_dh_auto_clean:
dh_auto_clean -- mrproper
- rm -f sha1sum.txt
+ rm -f regulatory.bin.sig sha1sum.txt
+
+sign: debian/regulatory.bin.sig
+ @:
+debian/regulatory.bin.sig: db.txt
+ make regulatory.bin.sig
+ cp regulatory.bin.sig debian/
diff -Nru wireless-regdb-2014.11.18/debian/source/include-binaries wireless-regdb-2016.06.10/debian/source/include-binaries
--- wireless-regdb-2014.11.18/debian/source/include-binaries 1970-01-01 01:00:00.000000000 +0100
+++ wireless-regdb-2016.06.10/debian/source/include-binaries 2015-08-30 02:55:45.000000000 +0100
@@ -0,0 +1 @@
+debian/regulatory.bin.sig
diff -Nru wireless-regdb-2014.11.18/debian-example/control wireless-regdb-2016.06.10/debian-example/control
--- wireless-regdb-2014.11.18/debian-example/control 2014-11-18 21:13:55.000000000 +0000
+++ wireless-regdb-2016.06.10/debian-example/control 2016-06-10 14:02:34.000000000 +0100
@@ -12,4 +12,4 @@
Description: The Linux wireless regulatory database
This package contains the wireless regulatory database used by all
cfg80211 based Linux wireless drivers. The wireless database being
- used is maintained by John Linville, the Linux wireless kernel maintainer.
+ used is maintained by Seth Forshee.
diff -Nru wireless-regdb-2014.11.18/linville.key.pub.pem wireless-regdb-2016.06.10/linville.key.pub.pem
--- wireless-regdb-2014.11.18/linville.key.pub.pem 2014-11-18 21:13:55.000000000 +0000
+++ wireless-regdb-2016.06.10/linville.key.pub.pem 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1leZcYjTXc4qLq1oN2Ak
-8vLP85P5cFTrCpqdSI5W4VOwdaJB4TtaxU2fATcH/A2EsE3h1rOfzI0+fBV9DcOO
-qyID+zdILBMb8xK5Zv+78OkBGls/WzvDDVhdmn1TRHvRvmJy7cX1mCT56cnHrZM/
-ZBaFwVfiD9TcqqisyF1sqE5+cMHTWRbxc1+rtojr0eGYrNfK20awlD5KVj6Ejzot
-r9EDWAsL1bH/kGfMdnputcyMapLQpRVruO/jEdjSmhAE/sj1tmHcAXBT6j5al4Oa
-LiBaWnP++rune7rjimwfzp0549/rupQUM7nAZRDLyzXj3J/KEci6dXtjonBUFqDY
-4QIDAQAB
------END PUBLIC KEY-----
diff -Nru wireless-regdb-2014.11.18/Makefile wireless-regdb-2016.06.10/Makefile
--- wireless-regdb-2014.11.18/Makefile 2014-11-18 21:13:55.000000000 +0000
+++ wireless-regdb-2016.06.10/Makefile 2016-06-10 14:02:34.000000000 +0100
@@ -32,7 +32,7 @@
REGDB_PRIVKEY ?= ~/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem
REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem
-REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem
+REGDB_UPSTREAM_PUBKEY ?= sforshee.key.pub.pem
REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt >/dev/null 2>&1; \
if [ $$? -ne 0 ]; then \
@@ -103,7 +103,6 @@
if [ -f .custom ]; then \
install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(shell cat .custom); \
fi
- @# In linville we trust
install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(REGDB_UPSTREAM_PUBKEY)
install -m 644 -t $(DESTDIR)/$(CRDA_PATH)/ regulatory.bin
install -m 755 -d $(DESTDIR)/$(MANDIR)/man5/
Binary files /var/tmp/WBp34IdB99/wireless-regdb-2014.11.18/regulatory.bin and /var/tmp/liT33ZYlhU/wireless-regdb-2016.06.10/regulatory.bin differ
diff -Nru wireless-regdb-2014.11.18/sforshee.key.pub.pem wireless-regdb-2016.06.10/sforshee.key.pub.pem
--- wireless-regdb-2014.11.18/sforshee.key.pub.pem 1970-01-01 01:00:00.000000000 +0100
+++ wireless-regdb-2016.06.10/sforshee.key.pub.pem 2016-06-10 14:02:34.000000000 +0100
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtUDjnCiEOQPyOddmLEE4
+Fax+pYNxJX6QfGjdbz/Z11k4n3xqUsIDKi1+ZvQesxJwIFvUlzI9cYs7GwgXFGth
+xFeLlhYc/STVCwn5aBGE+8pRDNFFGdoQRIrZ/nap/WAtGAsolbIt6oiYuNFWIfBT
+H/ECb+lGm5NfKJAPrDb6aCNxV1b2zNPffSrZG3NF67onhe96f6XLgMcwNtJT7uys
+Hucx8TainGPGZVt/JXVooerTfgBcml7YIBgydwcpEmYeNnPnlwRBN7Gxciv0oSkg
+fJZ5CyvQ2N7IbD+T+8XueFIRFRt69uJomef7RhaE48eh5uDSRtXhxF+gZvTaxP+V
+HQIDAQAB
+-----END PUBLIC KEY-----
diff -Nru wireless-regdb-2014.11.18/sha1sum.txt wireless-regdb-2016.06.10/sha1sum.txt
--- wireless-regdb-2014.11.18/sha1sum.txt 2014-11-18 21:13:55.000000000 +0000
+++ wireless-regdb-2016.06.10/sha1sum.txt 2016-06-10 14:02:34.000000000 +0100
@@ -1 +1 @@
-e6f0835c3b68878c663841528a01a9e0bac5799e db.txt
+755f0c5d5ac772494f66ef3a1cbcdd21874f72e9 db.txt
diff -Nru wireless-regdb-2014.11.18/wireless-regdb.spec wireless-regdb-2016.06.10/wireless-regdb.spec
--- wireless-regdb-2014.11.18/wireless-regdb.spec 2014-11-18 21:13:55.000000000 +0000
+++ wireless-regdb-2016.06.10/wireless-regdb.spec 2016-06-10 14:02:34.000000000 +0100
@@ -16,7 +16,7 @@
%description
This package contains the wireless regulatory database used by all
cfg80211 based Linux wireless drivers. The wireless database being
-used is maintained by John Linville, the Linux wireless kernel maintainer
+used is maintained by Seth Forshee.
http://wireless.kernel.org/en/developers/Regulatory/
%prep
-- System Information:
Debian Release: stretch/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.8.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--- End Message ---