summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-09-17 02:19:54 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-09-17 02:19:54 +0000
commit79dd372e58a08528cb77c24e9d689a8be6e2a033 (patch)
tree9e711f12eb60354ae87420c6c1725582987f9a74
parentMerging upstream version 2022.06.06. (diff)
downloadwireless-regdb-79dd372e58a08528cb77c24e9d689a8be6e2a033.tar.xz
wireless-regdb-79dd372e58a08528cb77c24e9d689a8be6e2a033.zip
Merging debian version 2022.06.06-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog12
-rw-r--r--debian/regulatory.db.p7sbin1225 -> 1225 bytes
-rw-r--r--debian/source/lintian-overrides2
-rwxr-xr-xdebian/tests/check-signatures2
4 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b5137e5..15034b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+wireless-regdb (2022.06.06-1) unstable; urgency=medium
+
+ * New upstream version:
+ - Add rules for the 6 GHz band for Canada (CA), United Kingdom (GB),
+ United States (US)
+ - Remove AUTO-BW from 6 GHz rules
+ - Unify 6 GHz rules for EU countries
+ * d/tests/check-signatures: Fix typo in openssl command line
+ * lintian: Fix override pattern for orig-tarball-missing-upstream-signature
+
+ -- Ben Hutchings <benh@debian.org> Sat, 30 Jul 2022 22:10:23 +0200
+
wireless-regdb (2022.04.08-2~progress6+u1) fuchur-backports; urgency=medium
* Uploading to fuchur-backports, remaining changes:
diff --git a/debian/regulatory.db.p7s b/debian/regulatory.db.p7s
index baeacbb..08646fc 100644
--- a/debian/regulatory.db.p7s
+++ b/debian/regulatory.db.p7s
Binary files differ
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 4b9453f..e395dbf 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,2 @@
# Blocked by #882694
-wireless-regdb source: orig-tarball-missing-upstream-signature .*
+wireless-regdb source: orig-tarball-missing-upstream-signature *
diff --git a/debian/tests/check-signatures b/debian/tests/check-signatures
index 1845f71..a36aae6 100755
--- a/debian/tests/check-signatures
+++ b/debian/tests/check-signatures
@@ -58,7 +58,7 @@ def convert_c_hex_to_bytes(hex):
# Convert an X.509 certificate from DER to PEM format
def convert_cert_der_to_pem(der):
proc = subprocess.Popen(['openssl', 'x509', '-inform', 'der',
- '-outform' 'pem'],
+ '-outform', 'pem'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE)
pem, _ = proc.communicate(der)