update to latest version and fix

4 files changed, 73 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01aba5dc4e79..eb57e3f65a42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wireless-regdb-pentest
 	pkgdesc = Central Regulatory Domain Database with txpower/channels modified for pentesters. please respect the law in your country
-	pkgver = 2017.03.07
-	pkgrel = 2
+	pkgver = 2017.12.23
+	pkgrel = 1
 	url = http://wireless.kernel.org/en/developers/Regulatory
 	arch = any
 	license = custom
@@ -12,19 +12,23 @@ 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.03.07.tar.xz
+	source = https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2017.12.23.tar.xz
 	source = crda.conf.d
 	source = db.txt.patch
+	source = db.txt2.patch
 	source = set-wireless-regdom
 	source = 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch
 	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 = 371eafa3b26ece916ef83aca02c4bed2e54099eb5b8c6d22d3a4358dce6535b9
+	sha256sums = 0e53e605dd98e7f34429242b5b2afea6dbc91bb913892fa01101e0ec481a4ab9
 	sha256sums = 192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b
 	sha256sums = 464037af76e3a90548f30a4a0fcacc35053da8ea9d077c76f9ab728cf0772313
+	sha256sums = 2473f0132790fc406d4b7d744d0e6415edd25e72b344bef12edf48fadb46f657
 	sha256sums = 603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3
 	sha256sums = 96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520
 	sha256sums = ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663
+	sha256sums = 49507df6694a9970784bce4ed0d36b9130517638072e721cebe0661fe7ba0f5e
 	sha256sums = 43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf
 
 pkgname = wireless-regdb-pentest
diff --git a/0002-fix-gcc6.patch b/0002-fix-gcc6.patch
new file mode 100644
index 000000000000..4c71668f5c31
--- /dev/null
+++ b/0002-fix-gcc6.patch
@@ -0,0 +1,37 @@
+From f38253e066dee96b148be1b79a6b4a696ee0ae0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause at embedded.rocks>
+Date: Sun, 1 May 2016 10:05:48 +0200
+Subject: [PATCH] drop werror
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building crda with GCC 6 fails because of all compiler warnings are treated as
+errors. Disable the compiler option '-Werror':
+
+keys-gcrypt.c:94:32: error: ‘keys’ defined but not used [-Werror=unused-const-variable=]
+ static const struct key_params keys[] = {
+                                ^~~~
+cc1: all warnings being treated as errors
+
+Signed-off-by: Jörg Krause <joerg.krause at embedded.rocks>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 74f1172..e9b417f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -26,7 +26,7 @@ PUBKEY_DIR?=pubkeys
+ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys
+ 
+ CFLAGS += -O2 -fpic
+-CFLAGS += -std=gnu99 -Wall -Werror -pedantic
++CFLAGS += -std=gnu99 -Wall -pedantic
+ CFLAGS += -Wall -g
+ LDLIBREG += -lreg
+ LDLIBS += $(LDLIBREG)
+-- 
+2.8.2
+
diff --git a/PKGBUILD b/PKGBUILD
index abfda02d2c6f..0a8fea899272 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=wireless-regdb-pentest
 _pkgname=wireless-regdb
-pkgver=2017.03.07
-pkgrel=2
+pkgver=2017.12.23
+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"
@@ -17,25 +17,31 @@ provides=('wireless-regdb' 'crda')
 source=(https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-${pkgver}.tar.xz
         'crda.conf.d'
 	'db.txt.patch'
+	'db.txt2.patch'
 	'set-wireless-regdom'
 	'0001-Makefile-Link-libreg.so-against-the-crypto-library.patch'
 	'0001-Makefile-Don-t-run-ldconfig.patch'
+	'0002-fix-gcc6.patch'
 	'https://www.kernel.org/pub/software/network/crda/crda-3.18.tar.xz')
 
-sha256sums=('371eafa3b26ece916ef83aca02c4bed2e54099eb5b8c6d22d3a4358dce6535b9'
+sha256sums=('0e53e605dd98e7f34429242b5b2afea6dbc91bb913892fa01101e0ec481a4ab9'
             '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b'
             '464037af76e3a90548f30a4a0fcacc35053da8ea9d077c76f9ab728cf0772313'
+            '2473f0132790fc406d4b7d744d0e6415edd25e72b344bef12edf48fadb46f657'
             '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3'
             '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520'
             'ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663'
+            '49507df6694a9970784bce4ed0d36b9130517638072e721cebe0661fe7ba0f5e'
             '43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf')
 
-
 prepare() {
   tar xf crda-3.18.tar.xz
   cd "${srcdir}"/"${_pkgname}"-"${pkgver}"
   patch -Np1 -i ../db.txt.patch
+  patch -Np0 -i ../db.txt2.patch
   sed -i 's/python/python2/' *.py 
+  cd "${srcdir}/crda-3.18"
+  patch -Np1 -i ../0002-fix-gcc6.patch
 }
 
 package() {
@@ -46,7 +52,7 @@ package() {
   sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
   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
-  CC=gcc-5 make
+  make
   
   make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ SBINDIR=/usr/bin/ install
   # Adjust paths in udev rule file
diff --git a/db.txt2.patch b/db.txt2.patch
new file mode 100644
index 000000000000..d71a1aeeedf0
--- /dev/null
+++ b/db.txt2.patch
@@ -0,0 +1,17 @@
+--- db.txt	2017-12-31 00:48:53.047560280 +0100
++++ db.txt	2017-12-31 00:52:22.363875967 +0100
+@@ -200,9 +200,11 @@
+ 	(5735 - 5835 @ 80), (20)
+ 
+ country BO: DFS-JP
+-	(2402 - 2482 @ 40), (20)
+-	(5250 - 5330 @ 80), (30), DFS
+-	(5735 - 5835 @ 80), (30)
++        (2400 - 2483 @ 40), (25)
++        (2474 - 2494 @ 20), (25), NO-IR, NO-OFDM
++        (4910 - 5170 @ 20), (25)
++        (5030 - 5875 @ 160), (25)
++        (57000 - 66000 @ 2160), (40)
+ 
+ country BR: DFS-FCC
+ 	(2402 - 2482 @ 40), (20)