update to 2018.05.31

3 files changed, 45 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd767881f269..0010daad0d6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = wireless-regdb-pentest
 	pkgdesc = Central Regulatory Domain Database with txpower/channels modified for pentesters. please respect the law in your country
-	pkgver = 2017.12.23
-	pkgrel = 2
+	pkgver = 2018.05.31
+	pkgrel = 1
 	url = http://wireless.kernel.org/en/developers/Regulatory
 	arch = any
 	license = custom
+	makedepends = crda
 	makedepends = python2-m2crypto
 	depends = sh
 	depends = libnl
@@ -16,7 +17,7 @@ pkgbase = wireless-regdb-pentest
 	conflicts = wireless-regdb
 	conflicts = crda
 	backup = etc/conf.d/wireless-regdom
-	source = https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2017.12.23.tar.xz
+	source = https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2018.05.31.tar.xz
 	source = crda.conf.d
 	source = db.txt.patch
 	source = db.txt2.patch
@@ -25,9 +26,9 @@ pkgbase = wireless-regdb-pentest
 	source = 0001-Makefile-Don-t-run-ldconfig.patch
 	source = 0002-fix-gcc6.patch
 	source = https://www.kernel.org/pub/software/network/crda/crda-3.18.tar.xz
-	sha256sums = 0e53e605dd98e7f34429242b5b2afea6dbc91bb913892fa01101e0ec481a4ab9
+	sha256sums = e1dfbc3b97771373077f430c3c05082fae883145b37db5b2cfd12c56676fbe7b
 	sha256sums = 192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b
-	sha256sums = 464037af76e3a90548f30a4a0fcacc35053da8ea9d077c76f9ab728cf0772313
+	sha256sums = 68cec28c36289ff3d04ba1b8ccce38e3b414bece53d7d26390ed6541ccbdb2c1
 	sha256sums = 9c266cb90c9492f617c6b89242723fc81ffa2dc8817d0a6f03dfcffd0d077fbf
 	sha256sums = 603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3
 	sha256sums = 96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520
diff --git a/PKGBUILD b/PKGBUILD
index 5fbd8f39f950..fb5ac1010aae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 
 pkgname=wireless-regdb-pentest
 _pkgname=wireless-regdb
-pkgver=2017.12.23
-pkgrel=2
+pkgver=2018.05.31
+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"
 backup=(etc/conf.d/wireless-regdom)
 license=('custom')
 depends=('sh' 'libnl' 'libgcrypt' 'systemd' 'iw')
-makedepends=('python2-m2crypto')
+makedepends=('crda' 'python2-m2crypto')
 conflicts=('wireless-regdb' 'crda')
 provides=('wireless-regdb' 'crda')
 source=(https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-${pkgver}.tar.xz
@@ -24,9 +24,9 @@ source=(https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regd
 	'0002-fix-gcc6.patch'
 	'https://www.kernel.org/pub/software/network/crda/crda-3.18.tar.xz')
 
-sha256sums=('0e53e605dd98e7f34429242b5b2afea6dbc91bb913892fa01101e0ec481a4ab9'
+sha256sums=('e1dfbc3b97771373077f430c3c05082fae883145b37db5b2cfd12c56676fbe7b'
             '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b'
-            '464037af76e3a90548f30a4a0fcacc35053da8ea9d077c76f9ab728cf0772313'
+            '68cec28c36289ff3d04ba1b8ccce38e3b414bece53d7d26390ed6541ccbdb2c1'
             '9c266cb90c9492f617c6b89242723fc81ffa2dc8817d0a6f03dfcffd0d077fbf'
             '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3'
             '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520'
diff --git a/db.txt.patch b/db.txt.patch
index 06bc8f27a278..e88100aeaf3f 100644
--- a/db.txt.patch
+++ b/db.txt.patch
@@ -26,39 +26,46 @@
  	# IEEE 802.11ad (60GHz), channels 1..3
  	(57240 - 63720 @ 2160), (0)
  
-@@ -360,12 +360,12 @@
- # https://www.bundesnetzagentur.de/SharedDocs/Downloads/DE/Sachgebiete/Telekommunikation/Unternehmen_Institutionen/Frequenzen/Allgemeinzuteilungen/2011_08_MGWS_pdf.pdf
+@@ -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
++
  
- country DE: DFS-ETSI
--	(2400 - 2483.5 @ 40), (100 mW)
--	(5150 - 5250 @ 80), (100 mW), NO-OUTDOOR, AUTO-BW
--	(5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
--	(5470 - 5725 @ 160), (500 mW), DFS
-+	(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
- 	# short range devices (ETSI EN 300 440-1)
--	(5725 - 5875 @ 80), (25 mW)
-+	(5725 - 5875 @ 80), (30)
- 	# 60 GHz band channels 1-4 (ETSI EN 302 567)
- 	(57000 - 66000 @ 2160), (40)
- 
-@@ -462,10 +462,10 @@
+ # 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
--	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
--	(5490 - 5710 @ 160), (27), DFS
-+	(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)
+-	(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)