From f3451882dcce86e5e001dc482ee94ce2c96787c5 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 17 Aug 2019 15:44:44 -0700 Subject: Updated to 19.03.01 Made only Country 00 unrestricted. Fixed incorrect Country CA bands. --- 0001-Makefile-Don-t-run-ldconfig.patch | 24 ---------- 0002-Makefile-Don-t-run-ldconfig.patch | 24 ++++++++++ PKGBUILD | 21 +++++---- db.txt | 67 +++++++++++++++++----------- db.txt.patch | 81 ---------------------------------- db.txt2.patch | 15 ------- 6 files changed, 77 insertions(+), 155 deletions(-) delete mode 100644 0001-Makefile-Don-t-run-ldconfig.patch create mode 100644 0002-Makefile-Don-t-run-ldconfig.patch delete mode 100644 db.txt.patch delete mode 100644 db.txt2.patch diff --git a/0001-Makefile-Don-t-run-ldconfig.patch b/0001-Makefile-Don-t-run-ldconfig.patch deleted file mode 100644 index e9f102d..0000000 --- a/0001-Makefile-Don-t-run-ldconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 15bc8065e9dc5485c650c528f8d80f7536e378d6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Fri, 21 Feb 2014 20:30:24 +0100 -Subject: [PATCH] Makefile: Don't run ldconfig - ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 80f4946..c003195 100644 ---- a/Makefile -+++ b/Makefile -@@ -130,7 +130,6 @@ install-libreg: - $(NQ) ' INSTALL libreg' - $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ -- $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) - $(NQ) ' CC ' $@ --- -1.9.0 - diff --git a/0002-Makefile-Don-t-run-ldconfig.patch b/0002-Makefile-Don-t-run-ldconfig.patch new file mode 100644 index 0000000..e9f102d --- /dev/null +++ b/0002-Makefile-Don-t-run-ldconfig.patch @@ -0,0 +1,24 @@ +From 15bc8065e9dc5485c650c528f8d80f7536e378d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:30:24 +0100 +Subject: [PATCH] Makefile: Don't run ldconfig + +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 80f4946..c003195 100644 +--- a/Makefile ++++ b/Makefile +@@ -130,7 +130,6 @@ install-libreg: + $(NQ) ' INSTALL libreg' + $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) + $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ +- $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) + $(NQ) ' CC ' $@ +-- +1.9.0 + diff --git a/PKGBUILD b/PKGBUILD index 8023bef..294b24f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,39 +7,42 @@ pkgname=wireless-regdb-pentest _pkgname=wireless-regdb -pkgver=2018.10.24 +pkgver=2019.03.01 pkgrel=1 pkgdesc="Central Regulatory Domain Database with txpower/channels modified for pentesters. please respect the law in your country" arch=('any') -url="http://wireless.kernel.org/en/developers/Regulatory" +url="https://wireless.kernel.org/en/developers/Regulatory" backup=(etc/conf.d/wireless-regdom) license=('custom') depends=('sh' 'libnl' 'libgcrypt' 'iw') makedepends=('crda' 'python2-m2crypto' 'python-attrs' 'python-m2crypto') conflicts=('wireless-regdb' 'crda') provides=('wireless-regdb' 'crda') -source=(https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-${pkgver}.tar.xz +source=(https://www.kernel.org/pub/software/network/wireless-regdb/${_pkgname}-${pkgver}.tar.{xz,sign} crda.conf.d db.txt set-wireless-regdom 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch - 0001-Makefile-Don-t-run-ldconfig.patch + 0002-Makefile-Don-t-run-ldconfig.patch https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/crda-4.14.tar.gz) -sha256sums=('0d3e845ac77d21aac9b88642c3dd043a83e3920d706b63d5e5c31dffdbec9116' +sha256sums=('3a4e6f7006599bc5764f86e1e86422710da13ad80e0242147b61c6855ebc915f' + 'SKIP' '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b' - '4cf0a9c20540bc1974ae7e14007d6d7538aa27c7f1d8e489cecdc40fc71ed699' + '4a8e3eb0335acccb10f747f7de0d4d4661b9f4df369da3040aa85a7180fe62dd' '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3' '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520' 'ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663' '5a8f35bb8b27474f466b0e75d451ba917433d8aab1889678a64d9c4e72a8b8c2') +validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') #Seth Forshee + prepare() { - tar xf crda-4.14.tar.gz + tar -xf crda-4.14.tar.gz sed 's|^#!/usr/bin/env python|#!/usr/bin/env python2|' -i "${srcdir}"/crda-4.14/utils/key2pub.py cd "${srcdir}"/crda-4.14 patch -p1 -i "${srcdir}"/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch - patch -p1 -i "${srcdir}"/0001-Makefile-Don-t-run-ldconfig.patch + patch -p1 -i "${srcdir}"/0002-Makefile-Don-t-run-ldconfig.patch cp "${srcdir}"/db.txt "${srcdir}"/"${_pkgname}"-"${pkgver}"/db.txt } @@ -57,7 +60,7 @@ package() { # Adjust paths in udev rule file sed 's|/sbin/crda|/usr/bin/crda|' -i "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules + echo 'ACTION=="add", SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules install -D -m644 "${srcdir}"/crda-4.14/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE diff --git a/db.txt b/db.txt index 37b6308..77b8bf6 100644 --- a/db.txt +++ b/db.txt @@ -10,9 +10,9 @@ wmmrule ETSI: # This is the world regulatory domain country 00: - (2402 - 2494 @ 40), (30) - (5170 - 5835 @ 80), (30) - (57000 - 66000 @ 2160), (40) + (2402 - 2494 @ 40), (30) + (5170 - 5835 @ 80), (30) + (57000 - 66000 @ 2160), (40) country AD: (2402 - 2482 @ 40), (20) @@ -235,8 +235,12 @@ country BZ: DFS-JP # Source: # https://www.ic.gc.ca/eic/site/smt-gst.nsf/vwapj/rss-247-i2-e.pdf/$file/rss-247-i2-e.pdf +# 2400-2483.5, 5150-5250, 5250-5350, 5470-5600, 5650-5725, 5725-5850 are the correct ranges +# but set-wireless-regdom rejects them as invalid. +# See https://www.ic.gc.ca/eic/site/smt-gst.nsf/eng/sf10971.html +# Yet if I allowed everything like Country 00, it happily accepts it. Madness. country CA: DFS-FCC - (2402 - 2472 @ 40), (30) + (2402 - 2482 @ 40), (30) (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW (5250 - 5350 @ 80), (24), DFS, AUTO-BW (5470 - 5600 @ 80), (24), DFS @@ -278,9 +282,15 @@ country CL: DFS-JP (5735 - 5835 @ 80), (20) country CN: DFS-FCC - (2402 - 2494 @ 40), (30) - (5170 - 5835 @ 80), (30) - (57000 - 66000 @ 2160), (40) + (2402 - 2482 @ 40), (20) + (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 + # ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf + (57240 - 59400 @ 2160), (28) + (59400 - 63720 @ 2160), (44) + (63720 - 65880 @ 2160), (28) country CO: DFS-FCC (2402 - 2482 @ 40), (20) @@ -340,13 +350,6 @@ country CZ: DFS-ETSI # 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: @@ -465,8 +468,11 @@ country FR: DFS-ETSI (57000 - 66000 @ 2160), (40) country GB: DFS-ETSI - (2402 - 2494 @ 40), (30) - (5170 - 5835 @ 80), (30) + (2402 - 2482 @ 40), (20) + (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI + (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI + (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI + # 60 GHz band channels 1-4, ref: Etsi En 302 567 (57000 - 66000 @ 2160), (40) country GD: DFS-FCC @@ -602,8 +608,10 @@ country IL: DFS-ETSI country IN: (2402 - 2482 @ 40), (20) - (5150 - 5350 @ 160), (23) - (5725 - 5875 @ 80), (23) + (5150 - 5250 @ 80), (30) + (5250 - 5350 @ 80), (24) + (5470 - 5725 @ 160), (24) + (5725 - 5875 @ 80), (30) country IR: DFS-JP (2402 - 2482 @ 40), (20) @@ -1029,6 +1037,8 @@ country PT: DFS-ETSI (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI + # 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) @@ -1100,13 +1110,18 @@ country SA: DFS-ETSI (5250 - 5330 @ 80), (20), DFS, AUTO-BW (5490 - 5710 @ 160), (27), DFS +# Source: +# https://pts.se/globalassets/startpage/dokument/legala-dokument/foreskrifter/radio/beslutade_ptsfs-2018-3-undantagsforeskrifter.pdf country SE: DFS-ETSI - (2402 - 2482 @ 40), (20) - (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI - (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI - (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI + (2400 - 2483.5 @ 40), (20) + (5150 - 5250 @ 80), (23), NO-OUTDOOR, AUTO-BW, wmmrule=ETSI + # note: max would be +3dB with TPC @ 5250-5725 + (5250 - 5350 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW, wmmrule=ETSI + (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI + # short range devices (ETSI EN 300 440) + (5725 - 5875 @ 80), (25 mW) # 60 GHz band channels 1-4, ref: Etsi En 302 567 - (57000 - 66000 @ 2160), (40) + (57000 - 66000 @ 2160), (40), NO-OUTDOOR # Source # https://www.imda.gov.sg/~/media/imda/files/regulation%20licensing%20and%20consultations/ict%20standards/telecommunication%20standards/radio-comms/imdatssrd.pdf?la=en @@ -1265,9 +1280,9 @@ country US: DFS-FCC (5490 - 5730 @ 160), (23), DFS (5735 - 5835 @ 80), (30) # 60g band - # reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255 - # channels 1,2,3, EIRP=40dBm(43dBm peak) - (57240 - 63720 @ 2160), (40) + # reference: section IV-D https://docs.fcc.gov/public/attachments/FCC-16-89A1.pdf + # channels 1-6 EIRP=40dBm(43dBm peak) + (57240 - 71000 @ 2160), (40) country UY: DFS-FCC (2402 - 2482 @ 40), (20) diff --git a/db.txt.patch b/db.txt.patch deleted file mode 100644 index e88100a..0000000 --- a/db.txt.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/db.txt 2017-03-07 14:13:09.000000000 +0100 -+++ b/db.txt 2017-04-16 14:53:01.930630453 +0200 -@@ -1,18 +1,18 @@ - # This is the world regulatory domain - country 00: -- (2402 - 2472 @ 40), (20) -+ (2402 - 2472 @ 40), (30) - # Channel 12 - 13. -- (2457 - 2482 @ 20), (20), NO-IR, AUTO-BW -+ (2457 - 2482 @ 20), (30), NO-IR, AUTO-BW - # Channel 14. Only JP enables this and for 802.11b only -- (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM -+ (2474 - 2494 @ 20), (30), NO-IR, NO-OFDM - # Channel 36 - 48 -- (5170 - 5250 @ 80), (20), NO-IR, AUTO-BW -+ (5170 - 5250 @ 80), (30), NO-IR, AUTO-BW - # Channel 52 - 64 -- (5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW -+ (5250 - 5330 @ 80), (30), NO-IR, DFS, AUTO-BW - # Channel 100 - 144 -- (5490 - 5730 @ 160), (20), NO-IR, DFS -+ (5490 - 5730 @ 160), (30), NO-IR, DFS - # Channel 149 - 165 -- (5735 - 5835 @ 80), (20), NO-IR -+ (5735 - 5835 @ 80), (30), NO-IR - # IEEE 802.11ad (60GHz), channels 1..3 - (57240 - 63720 @ 2160), (0) - -@@ -385,12 +385,14 @@ - # 5GHz: https://erhvervsstyrelsen.dk/sites/default/files/007_interface-datanet_5-6_ghz.pdf.pdf - # 60GHz: https://erhvervsstyrelsen.dk/sites/default/files/radiograenseflader-63.pdf - country DK: DFS-ETSI -- (2400 - 2483.5 @ 40), (20) -- (5150 - 5250 @ 80), (23), AUTO-BW, wmmrule=ETSI -- (5250 - 5350 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI -- (5470 - 5725 @ 160), (27), DFS, wmmrule=ETSI -- # 60 GHz band channels 1-4 (ETSI EN 302 567) -- (57000 - 66000 @ 2160), (40), NO-OUTDOOR -+ (2400 - 2483.5 @ 40), (30) -+ (5150 - 5250 @ 80), (30), NO-OUTDOOR, AUTO-BW -+ (5250 - 5350 @ 80), (30), NO-OUTDOOR, DFS, AUTO-BW -+ (5470 - 5725 @ 160), (30), DFS -+ (5725 - 5875 @ 80), (30) -+ # 60 GHz band channels 1-4 (ETSI EN 302 567) -+ (57000 - 66000 @ 2160), (40), NO-OUTDOOR -+ - - # Source: - # http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=blog&id=10&Itemid=55 -@@ -481,12 +483,12 @@ - (57000 - 66000 @ 2160), (40) - - country GB: DFS-ETSI -- (2402 - 2482 @ 40), (20) -- (5170 - 5250 @ 80), (20), AUTO-BW, wmmrule=ETSI -- (5250 - 5330 @ 80), (20), DFS, AUTO-BW, wmmrule=ETSI -- (5490 - 5710 @ 160), (27), DFS, wmmrule=ETSI -- # 60 GHz band channels 1-4, ref: Etsi En 302 567 -- (57000 - 66000 @ 2160), (40) -+ (2402 - 2482 @ 40), (30) -+ (5170 - 5250 @ 80), (30), AUTO-BW -+ (5250 - 5330 @ 80), (30), DFS, AUTO-BW -+ (5490 - 5710 @ 160), (30), DFS -+ # 60 GHz band channels 1-4, ref: Etsi En 302 567 -+ (57000 - 66000 @ 2160), (40) - - country GD: DFS-FCC - (2402 - 2472 @ 40), (30) -@@ -1216,9 +1216,9 @@ - country US: DFS-FCC - (2402 - 2472 @ 40), (30) - # 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 -+ (5170 - 5250 @ 80), (30), AUTO-BW -+ (5250 - 5330 @ 80), (30), DFS, AUTO-BW -+ (5490 - 5730 @ 160), (30), DFS - (5735 - 5835 @ 80), (30) - # 60g band - # reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255 diff --git a/db.txt2.patch b/db.txt2.patch deleted file mode 100644 index e8fef4b..0000000 --- a/db.txt2.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- db.txt 2017-12-31 01:11:23.493163766 +0100 -+++ db.txt 2017-12-31 01:13:58.479794252 +0100 -@@ -200,9 +200,9 @@ - (5735 - 5835 @ 80), (20) - - country BO: DFS-JP -- (2402 - 2482 @ 40), (20) -- (5250 - 5330 @ 80), (30), DFS -- (5735 - 5835 @ 80), (30) -+ (2400 - 2494 @ 40), (30) -+ (4910 - 5835 @ 40), (30) -+ (57000 - 66000 @ 2160), (40) - - country BR: DFS-FCC - (2402 - 2482 @ 40), (20) -- cgit v1.2.1