diff -pruN 2022.06.06-1/debian/certs/benh@debian.org.x509.pem 2022.06.06-0ubuntu1/debian/certs/benh@debian.org.x509.pem --- 2022.06.06-1/debian/certs/benh@debian.org.x509.pem 2020-01-30 19:15:29.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/certs/benh@debian.org.x509.pem 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICvTCCAaUCFFd+Ahy5gODoIIIbp7VLSWG4tPrfMA0GCSqGSIb3DQEBCwUAMBox -GDAWBgNVBAMMD2JlbmhAZGViaWFuLm9yZzAgFw0yMDAxMzAxMzI2MTNaGA8yMTIw -MDEwNjEzMjYxM1owGjEYMBYGA1UEAwwPYmVuaEBkZWJpYW4ub3JnMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAneF3oCSg1XllOgeQyfalph+EHCMHS0+l -A8YP91TVi355gQDS6T30l/6EzVW9yY8hV4gGOZBmQSZ5LMo/lYcBES8vsOELQ/xf -L09nBNtNt3JN0cV2c02RabBxFzbqqwo6zZWbdhuOIRePxQK/JMfAQLE7xIB8caVR -3Pc6WH+xB4GKENH2kxdx4PpReRXU14+tvW844SZ9vPA+gIm07I5pkNuXivAjI4OC -O2qxrOvnmXQqNY6pZP1GnujlSGExbub8GRhUwxtP1gBEhxw3Rer1ycsPDFXsz2rC -RSYjojFSTe4hff1YcsIoxY6p0O4Bdwil8CIrR3krz5pGtY/9ZKK17QIDAQABMA0G -CSqGSIb3DQEBCwUAA4IBAQAgRP6pnt2b6s4ldQjwK1P3WjYcSiN/0EE8Eiu5gE6K -FV0fQKcmKDLDWwYoLT0ICR4B6WfjM+YVRTnuF4PbQv9/NfSsFtu6uBogIUH/85L/ -ZW4pFtC/jd9ILHM2fyLm7ni0Y4MOOeuvECqQ0/zmw4+XW3a/m/WY0lMGi/ikBJsb -YmqdrOZLDcnXVmMVATiMvvFExDgn4M9y1j3k90s70rEM1YNtHhAEaSmIaeB919u0 -WXKNnTxDr8Z9tyEVUorpm2su6Cc8Py2E+5oiCp9qJeY55HRztipwqh3LzNSgGyZx -YwTFEiFIupInBqg+baFDpdIq98rEJuhbH+TcidwfBHk/ ------END CERTIFICATE----- diff -pruN 2022.06.06-1/debian/certs/romain.perier@gmail.com.x509.pem 2022.06.06-0ubuntu1/debian/certs/romain.perier@gmail.com.x509.pem --- 2022.06.06-1/debian/certs/romain.perier@gmail.com.x509.pem 2020-04-12 18:27:50.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/certs/romain.perier@gmail.com.x509.pem 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICzTCCAbUCFDq7xuwUbgnRtgFqudbPcd0jPwMoMA0GCSqGSIb3DQEBCwUAMCIx -IDAeBgNVBAMMF3JvbWFpbi5wZXJpZXJAZ21haWwuY29tMCAXDTIwMDIyNDE5MDE0 -NFoYDzIxMjAwMTMxMTkwMTQ0WjAiMSAwHgYDVQQDDBdyb21haW4ucGVyaWVyQGdt -YWlsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPC4Tz9wePh0 -RaIorwR1BKPzp8cErLbh/OHAPeAmkIpFYMR18xozN1Z9MAd1DqZ5BpWdFzwJqX+r -lV3t4HUmL2VlzWGxMydnQaEBE+kTam1OmOGeewtbRO9oWm99l6EzIpcSIQmPkOAl -lN2KOvdKYAQmbQCC5M9kHHkVJPJChvUQhqwgiJCH34w3fL811W+fd8PNaSUGwmVR -cYl/bk3l1Yo2Gq3BGNYUQofwk4PxmXTEE6o7ZoVv4LxftkCmQQYKug7pMkQQOVPN -v/PTJva2K0AuuYjB9OOgKHdPuqjKnAW6iJaZVImijfNzoYxKqHHuLtKDFEi9mMbO -3Kijly5AFi8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdl0DPbaWABtuDN27yN+8 -62wBQBorB2ChGuFDV/q+3ruPc/OSoqqDAcEX5J0JQeAyM5dL8twPi6i4WgSG9nGh -l9BUVhCOVJkNKqmvG1VZBiukX7FUpuzH1kPuhiybGJ2PAILBiGEWhTwXVv5qoHpo -xXs9PLYTGJltdGUTZ7f8WkRIcqBzuP8CnXxb+Xx1CjyBgDxB8tX6PR/j2oylFx9T -GnWtThEcB+wKaf0z+jJ+ZvUp6E2K+g1LaMOVEbpvHgeMhcfHycEwo3CwoeDVhRWU -d8EckfFfUM0sV0siT+6V16ekWWKuub/XY1oE/CQRrjRL9AyfC1l9JzlUaU/9bkSf -IQ== ------END CERTIFICATE----- diff -pruN 2022.06.06-1/debian/changelog 2022.06.06-0ubuntu1/debian/changelog --- 2022.06.06-1/debian/changelog 2022-07-30 20:10:23.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/changelog 2022-06-29 13:23:01.000000000 +0000 @@ -1,189 +1,85 @@ -wireless-regdb (2022.06.06-1) unstable; urgency=medium +wireless-regdb (2022.06.06-0ubuntu1) kinetic; 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 Sat, 30 Jul 2022 22:10:23 +0200 - -wireless-regdb (2022.04.08-2) unstable; urgency=medium - - * debian/tests: Add check that regulatory.db signatures are valid - * d/wireless-regdb.postinst: Remove regular files installed by d-i - (Closes: #1012601) - - -- Ben Hutchings Thu, 30 Jun 2022 00:01:25 +0200 - -wireless-regdb (2022.04.08-1) unstable; urgency=medium - - * New upstream version: - - Raise DFS TX power limit to 250 mW (24 dBm) for the US - - Update regulatory rules for Croatia (HR) on 6GHz - - Update regulatory rules for France (FR) on 6 and 60 GHz - - add support for US S1G channels - - add 802.11ah bands to world regulatory domain - - Update regulatory rules for Spain (ES) on 6GHz - - Update regulatory rules for South Korea (KR) - - Update regulatory rules for China (CN) (Closes: #1006127) - - Update regulatory rules for the Netherlands (NL) on 6GHz - - Update regulatory rules for Israel (IL) - - Update regulatory rules for Australia (AU) - * d/salsa-ci.yml: Add CI configuration for salsa.debian.org - * Remove support for loading through crda (Closes: #973551, #1004347) - * d/.gitignore: Ignore another debhelper temporary file - - -- Ben Hutchings Sat, 04 Jun 2022 23:59:01 +0100 - -wireless-regdb (2021.08.28-1) unstable; urgency=medium - - * New upstream version (Closes: #986208): - - Update regulatory rules for Egypt (EG), Croatia (HR), Pakistan (PK) - on 5GHz, Great Britain (GB), Kazakhstan (KZ), Ukraine (UA), Cuba (CU) - on 5Ghz, Germany (DE) on 6GHz, Norway (NO) on 6 and 60 GHz, Ecuador (EC) - - US: restore channel 12 & 13 limitation - - US: remove PTMP-ONLY from 5850-5895 MHz - - US: reduce bandwidth for 5730-5850 and 5850-5895 MHz - - ES: Update CNAF regulation url - - -- Romain Perier Fri, 17 Sep 2021 18:30:37 +0200 - -wireless-regdb (2020.04.29-2) unstable; urgency=medium - - * Re-upload without binary packages (SourceOnlyUpload) - - -- Romain Perier Tue, 30 Jun 2020 19:34:44 +0200 - -wireless-regdb (2020.04.29-1) unstable; urgency=medium - - [ Romain Perier ] - * New upstream version: - - GB: Extend to cover DMG channels 5 & 6 - - Update regulatory rules for Russia (RU), Indonesia (ID), Singapore (SG), - United States (US) on 2.4/5G. - - Harmonize ranges of CEPT countries (stand of July 2019) - - Fix ranges of EU countries as they are harmonized since 2014 - - Extend 5470-5725 MHz range to 5730 MHz for Taiwan (TW) - - Fix overlapping ranges for Switzerland and Liechtenstein - * Rebased enable_recording_and_using_an_external_signature.patch onto - 2020.04.29 - * Rebased run-scripts-with-python-3.patch onto 2020.04.29 - * debian/gbp.conf: Rename old style config section - - [ Debian Janitor ] - * Add missing ${misc:Depends} to Depends for wireless-regdb-udeb. - * Bump debhelper from deprecated 9 to 12. - * Set debhelper-compat version in Build-Depends. - * Set upstream metadata fields: Repository. - * Update standards version to 4.5.0, no changes needed. - * Remove Priority on wireless-regdb-udeb that duplicates source. - - -- Romain Perier Sun, 24 May 2020 13:15:10 +0200 - -wireless-regdb (2019.06.03-3) unstable; urgency=medium - - * Re-upload without self-built binary packages - - -- Ben Hutchings Sun, 12 Apr 2020 19:28:35 +0100 - -wireless-regdb (2019.06.03-2) unstable; urgency=medium - - [ Ben Hutchings ] - * Add wireless-regdb-udeb package for use in the installer - * debian/control: Use my debian.org email in Maintainers field - * debian/control: Change to team-maintained, with me and Romain as - Uploaders - * debian/README.source: Update instructions for setting REGDB_AUTHOR - - [ Romain Perier ] - * debian/certs: Add my certificate - * debian/rules: Get REGDB_AUTHOR by using dpkg-parsechangelog - - -- Ben Hutchings Tue, 31 Mar 2020 20:39:33 +0100 - -wireless-regdb (2019.06.03-1) unstable; urgency=medium - - * New upstream version (Closes: #949553): - - Install regulatory.db and regulatory.db.p7s to /lib/firmware - (Closes: #892229) - - Update rules for Australia (AU), Canada (CA), Switzerland (CH), - Germany (DE), Denmark (DK), Spain (ES), Finland (FI), France (FR), - Hungary (HU), India (IN), Japan (JP), Republic of Korea (KR), - Kazakhstan (KZ), Lithuania (LI), Panama (PA), Portugal (PT), - Qatar (QA), Sweden (SE), Singapore (SG), Turkey (TR), Taiwan (TW), - and United States (US) - - Add ETSI WMM rules and apply them to various territories - - Make scripts compatible with Python 3 - * debian/control: Point Vcs URLs to Salsa - * Drop "Set both PASSIVE_SCAN and NO_IBSS flags in binary database", - only needed for compatibility with wheezy - * debian/rules: Use $(MAKE) for recursive make - * debian/patches: Refresh and update for Python 3 compatibility - * Run scripts with Python 3 (Closes: #938829) - * Expect Debian regulatory.db detached signature in source package - * debian/rules: Build under debian/build to avoid overwriting shipped - binaries - * debian/rules: Only build regulatory.{bin,db} during binary build - * debian/rules: Update exclusion of custom public keys from the package - * debian/rules: Verify that our binaries match upstream unless db.txt is - patched - * Install upstream and Debian versions of regulatory.db as alternatives - * debian/contol: Rewrite package description - * debian/copyright: Use https: scheme in Format - * Add upstream public key and enable signature checking in debian/watch - * debian/control: Set Rules-Requires-Root: no - * debian/control: Update Standards-Version to 4.4.1 - * lintian: Override orig-tarball-missing-upstream-signature warning as - this is blocked by bug #882694 - * Add and use a static certificate for my signing key - * debian/README.source: Introduce a shell variable for author ID - * debian/README.source: Update to cover the certificate - - -- Ben Hutchings Thu, 30 Jan 2020 20:47:17 +0100 - -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 + * New upstream version 2022.06.06 (LP: #1980145) + + -- Seth Forshee Wed, 29 Jun 2022 08:23:01 -0500 + +wireless-regdb (2021.08.28-0ubuntu2) kinetic; urgency=medium + + * d/control: Remove suggestion to crda since this package was removed + + -- Alexandre Ghiti Thu, 12 May 2022 13:10:31 +0200 + +wireless-regdb (2021.08.28-0ubuntu1) impish; urgency=medium + + * New upstream version 2021.08.28 (LP: #1941955) + + -- Seth Forshee Sat, 28 Aug 2021 11:56:48 -0500 + +wireless-regdb (2021.07.14-0ubuntu1) impish; urgency=medium + + * New upstream version 2021.07.14 (LP: #1936255) + * debian/gbp.conf: Add upstream tag format + * debian/control: Update maintainer email address + + -- Seth Forshee Wed, 14 Jul 2021 15:47:05 -0500 + +wireless-regdb (2020.11.20-0ubuntu1) hirsute; urgency=medium + + * New upstream release. + * debian/patches: + - Drop patches which are now upstream. + - Add run-scripts-with-python-3.patch to update python interpreter name. + * debian/rules: Build database binaries and compare to upstream binaries, + modulo signatures, and fail the build if they do not match. Continue + shipping upstream binaries to keep the upstream signatures. + * debian/control: + - Update to compat level 13. + - Update Build-Depends needed to build binaries. + - Set Rules-Requires-Root: no + - Update standards version to 4.5.0, no changes needed. + - Update Homepage. + * Remove obsolete postinst file. + + -- Seth Forshee Mon, 30 Nov 2020 18:32:33 -0600 + +wireless-regdb (2018.05.09-0ubuntu1) cosmic; urgency=medium + + * New upstream release. (LP: #1769980) + * debian/patches: + - Drop existing patches. + - 0001-wireless-regdb-Fix-comparison-of-WmmRule-with-NoneTy.patch, + 0002-wireless-regdb-Fix-iteration-in-create_wmms-for-pyth.patch: Fix + errors when building regdb with python 3. + * debian/rules: Change to no longer build from source; use upstream + binaries instead. + * debian/control: Update Build-Depends and maintainer information + + -- Seth Forshee Fri, 18 May 2018 12:07:58 -0500 + +wireless-regdb (2016.06.10-0ubuntu1) zesty; urgency=medium + + * New upstream release. + * debian/control: + - bump Standards-Version to 3.9.8. + - update debhelper Build-Depends to (>= 9). + * debian/compat: bump to compat level 9. - -- Ben Hutchings Sun, 04 Dec 2016 23:47:35 +0000 + -- Mathieu Trudel-Lapierre Thu, 03 Nov 2016 17:56:03 -0600 + +wireless-regdb (2015.07.20-1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Replace REGDB_AUTHOR with the ubuntu-devel-discuss@ list, to create + our own private key for signing the regulatory data. + - Explicitly override dh_auto_build to make a new private key. + - Don't remove pubkeys, to make sure the key can be verified; but still + remove /lib/crda/pubkeys/linville.key.pub.pem since that conflicts + with crda. + - debian/patches/dont_auto_create_keypair: Drop the tilde from the key + path, since it isn't guaranteed to work on buildds. + + -- Andy Whitcroft Thu, 05 Nov 2015 19:51:09 +0000 wireless-regdb (2015.07.20-1) unstable; urgency=medium @@ -211,6 +107,21 @@ wireless-regdb (2015.07.20-1) unstable; -- Ben Hutchings Sun, 30 Aug 2015 10:20:04 +0100 +wireless-regdb (2014.11.18-1ubuntu1) wily; urgency=medium + + * Resynchronise with Debian. LP: #1284093 + Remaining changes: + - Replace REGDB_AUTHOR with the ubuntu-devel-discuss@ list, to create + our own private key for signing the regulatory data. + - Explicitly override dh_auto_build to make a new private key. + - Don't remove pubkeys, to make sure the key can be verified; but still + remove /lib/crda/pubkeys/linville.key.pub.pem since that conflicts + with crda. + - debian/patches/dont_auto_create_keypair: Drop the tilde from the key + path, since it isn't guaranteed to work on buildds. + + -- Ryan Finnie Mon, 13 Apr 2015 19:56:45 +0000 + wireless-regdb (2014.11.18-1) unstable; urgency=medium * New upstream version @@ -307,6 +218,20 @@ wireless-regdb (2013.11.27-1) unstable; -- Ben Hutchings Mon, 24 Feb 2014 22:39:31 +0000 +wireless-regdb (2013.02.13-1ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Replace REGDB_AUTHOR with the ubuntu-devel-discuss@ list, to create + our own private key for signing the regulatory data. + - Explicitly override dh_auto_build to make a new private key. + - Don't remove pubkeys, to make sure the key can be verified; but still + remove /lib/crda/pubkeys/linville.key.pub.pem since that conflicts + with crda. + - debian/patches/dont_auto_create_keypair: Drop the tilde from the key + path, since it isn't guaranteed to work on buildds. + + -- Colin Watson Mon, 01 Jul 2013 13:01:55 +0100 + wireless-regdb (2013.02.13-1) unstable; urgency=low * New upstream version @@ -330,6 +255,31 @@ wireless-regdb (2013.02.13-1) unstable; -- Ben Hutchings Sun, 30 Jun 2013 20:27:44 +0100 +wireless-regdb (2011.04.28-1ubuntu3) precise; urgency=low + + * Don't install /lib/crda/pubkeys/linville.key.pub.pem; this conflicts + with crda. + + -- Colin Watson Fri, 25 Nov 2011 20:05:57 +0000 + +wireless-regdb (2011.04.28-1ubuntu2) precise; urgency=low + + * Make wireless-regdb Multi-Arch: foreign + + -- Tim Gardner Mon, 21 Nov 2011 10:51:52 -0700 + +wireless-regdb (2011.04.28-1ubuntu1) oneiric; urgency=low + + * debian/rules: (LP: #831364) + - replace REGDB_AUTHOR with the ubuntu-devel-discuss@ list, to create our + own private key for signing the regulatory data. + - explicitly override dh_auto_build to make a new private key. + - don't remove pubkeys, to make sure the key can be verified. + * debian/patches/dont_auto_create_keypair: drop the tilde from the key path, + since it isn't guaranteed to work on buildds. + + -- Mathieu Trudel-Lapierre Thu, 22 Sep 2011 11:10:26 -0400 + wireless-regdb (2011.04.28-1) unstable; urgency=low * New upstream version (Closes: #626816) diff -pruN 2022.06.06-1/debian/control 2022.06.06-0ubuntu1/debian/control --- 2022.06.06-1/debian/control 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/control 2022-06-28 19:29:30.000000000 +0000 @@ -1,36 +1,26 @@ Source: wireless-regdb Section: net Priority: optional -Maintainer: Debian kernel team -Uploaders: Ben Hutchings , Romain Perier -Build-Depends: debhelper-compat (= 12), +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Seth Forshee +Build-Depends: debhelper-compat (= 13), openssl, python3, python3-m2crypto, quilt Rules-Requires-Root: no Standards-Version: 4.5.0 -Vcs-Git: https://salsa.debian.org/kernel-team/wireless-regdb.git -Vcs-Browser: https://salsa.debian.org/kernel-team/wireless-regdb Homepage: https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb Package: wireless-regdb Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Description: wireless regulatory database for Linux - This package provides a machine-readable database of legal - regulations on radio emissions that affect use of wireless networking. - The Linux kernel and drivers use this to maintain compliance with - those regulations. - -Package: wireless-regdb-udeb -Package-Type: udeb -Architecture: all -Section: debian-installer -Depends: ${misc:Depends} -Description: wireless regulatory database for Linux - udeb - This package provides a machine-readable database of legal - regulations on radio emissions that affect use of wireless networking. - The Linux kernel and drivers use this to maintain compliance with - those regulations. +Description: wireless regulatory database + This package contains the wireless regulatory database used by the Central + Regulatory Database Agent (CRDA) to configure wireless devices to operate + within the radio spectrum allowed in the local jurisdiction. + . + This regulatory information is provided with no warranty either expressed or + implied. Only Linux drivers which use cfg80211 framework can make use of the + regulatory database and CRDA. diff -pruN 2022.06.06-1/debian/copyright 2022.06.06-0ubuntu1/debian/copyright --- 2022.06.06-1/debian/copyright 2020-01-29 22:23:01.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/copyright 2021-08-28 16:54:08.000000000 +0000 @@ -1,7 +1,7 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: wireless-regdb Upstream-Contact: Seth Forshee -Source: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git +Source: git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git Files: * Copyright: 2008, Luis R. Rodriguez diff -pruN 2022.06.06-1/debian/gbp.conf 2022.06.06-0ubuntu1/debian/gbp.conf --- 2022.06.06-1/debian/gbp.conf 2022-06-05 23:19:55.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/gbp.conf 2021-08-28 16:54:08.000000000 +0000 @@ -1,2 +1,5 @@ -[buildpackage] +[DEFAULT] +upstream-tag = master-%(version)s + +[git-buildpackage] compression=xz diff -pruN 2022.06.06-1/debian/patches/dont_auto_create_keypair 2022.06.06-0ubuntu1/debian/patches/dont_auto_create_keypair --- 2022.06.06-1/debian/patches/dont_auto_create_keypair 2020-01-29 18:11:06.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/patches/dont_auto_create_keypair 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -From: Ben Hutchings -Subject: [PATCH] Don't automatically create key-pairs - -If the private key is missing, this is probably an error in the build -configuration. Don't create a private key unless it's the only -explicit goal for make. - -Signed-off-by: Ben Hutchings - ---- a/Makefile -+++ b/Makefile -@@ -30,7 +30,7 @@ REGDB_AUTHOR ?= $(shell if [ -f $(DISTRO - echo custom-user; \ - fi) - --REGDB_PRIVKEY ?= ~/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem -+REGDB_PRIVKEY ?= $(HOME)/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem - REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem - REGDB_PUBCERT ?= $(REGDB_AUTHOR).x509.pem - -@@ -85,8 +85,15 @@ $(REGDB_PUBCERT): $(REGDB_PRIVKEY) - - - $(REGDB_PRIVKEY): -+ifeq ($(MAKECMDGOALS),$(REGDB_PRIVKEY)) - @echo "Generating private key for $(REGDB_AUTHOR)..." - openssl genrsa -out $(REGDB_PRIVKEY) 2048 -+else -+ @echo "No private key found. To generate a private key, run:" -+ @echo " make ~/.wireless-regdb-.key.priv.pem" -+ @echo "Your author-id is currently \"$(REGDB_AUTHOR)\"; set REGDB_AUTHOR to override this." -+ @exit 1 -+endif - - ifneq ($(shell test -e $(DISTRO_PRIVKEY) && echo yes),yes) - $(DISTRO_PRIVKEY): diff -pruN 2022.06.06-1/debian/patches/run-scripts-with-python-3.patch 2022.06.06-0ubuntu1/debian/patches/run-scripts-with-python-3.patch --- 2022.06.06-1/debian/patches/run-scripts-with-python-3.patch 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/patches/run-scripts-with-python-3.patch 2021-08-28 16:54:08.000000000 +0000 @@ -14,8 +14,6 @@ Python 3, change the shebang lines. dbparse.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/db2bin.py b/db2bin.py -index d1b7fc6..3e781ca 100755 --- a/db2bin.py +++ b/db2bin.py @@ -1,4 +1,4 @@ @@ -24,8 +22,6 @@ index d1b7fc6..3e781ca 100755 from io import BytesIO, open import struct -diff --git a/db2fw.py b/db2fw.py -index 3affd5a..84bfb1c 100755 --- a/db2fw.py +++ b/db2fw.py @@ -1,4 +1,4 @@ @@ -34,8 +30,6 @@ index 3affd5a..84bfb1c 100755 from io import BytesIO, open import struct -diff --git a/dbparse.py b/dbparse.py -index 5f7e082..dfd15fd 100755 --- a/dbparse.py +++ b/dbparse.py @@ -1,4 +1,4 @@ diff -pruN 2022.06.06-1/debian/patches/series 2022.06.06-0ubuntu1/debian/patches/series --- 2022.06.06-1/debian/patches/series 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/patches/series 2022-02-19 19:52:22.000000000 +0000 @@ -1,2 +1,2 @@ -dont_auto_create_keypair +store-privkey-in-builddir.patch run-scripts-with-python-3.patch diff -pruN 2022.06.06-1/debian/patches/store-privkey-in-builddir.patch 2022.06.06-0ubuntu1/debian/patches/store-privkey-in-builddir.patch --- 2022.06.06-1/debian/patches/store-privkey-in-builddir.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/patches/store-privkey-in-builddir.patch 2021-08-28 16:54:08.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,7 @@ + echo custom-user; \ + fi) + +-REGDB_PRIVKEY ?= ~/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem ++REGDB_PRIVKEY ?= .wireless-regdb-$(REGDB_AUTHOR).key.priv.pem + REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem + REGDB_PUBCERT ?= $(REGDB_AUTHOR).x509.pem + diff -pruN 2022.06.06-1/debian/README.Debian 2022.06.06-0ubuntu1/debian/README.Debian --- 2022.06.06-1/debian/README.Debian 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -wireless-regdb for Debian -------------------------- - -wireless-regdb provides a machine-readable database of legal -regulations on radio emissions that affect use of wireless networking. -The Linux kernel and drivers use this to maintain compliance with -those regulations. - -The database is loaded directly by the kernel (since Linux 4.15, but -only enabled in the Debian package from 5.5 onward). - -If you use a custom kernel built from upstream source, it will only -trust this database if it is signed by the upstream maintainer of -wireless-regdb. To use the upstream database and signature instead of -the Debian version, run: - - update-alternatives --set regulatory.db \ - /lib/firmware/regulatory.db-upstream - - -- Ben Hutchings , Sat, 22 Jan 2022 16:46:35 +0100 diff -pruN 2022.06.06-1/debian/README.source 2022.06.06-0ubuntu1/debian/README.source --- 2022.06.06-1/debian/README.source 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -If you need to make an NMU, you'll first have to create a key-pair -and certificate. - -1. Set REGDB_AUTHOR to the address you use in the Debian changelog: - REGDB_AUTHOR="example@debian.org" -2. Generate the private key by running: - make REGDB_AUTHOR="$REGDB_AUTHOR" ~/".wireless-regdb-$REGDB_AUTHOR.key.priv.pem" -3. Generate the public key by running: - make REGDB_AUTHOR="$REGDB_AUTHOR" "$REGDB_AUTHOR.key.pub.pem" -4. Generate a certificate by running: - openssl req -new -key ~/.wireless-regdb-"$REGDB_AUTHOR.key.priv.pem" \ - -days 36500 -utf8 -nodes -batch -x509 \ - -outform PEM -out "$REGDB_AUTHOR.x509.pem" \ - -config <(cat <<-EOF - [ req ] - distinguished_name = req_distinguished_name - string_mask = utf8only - prompt = no - [ req_distinguished_name ] - commonName = $REGDB_AUTHOR - EOF - ) -5. Add the certificate to the linux package and regenerate - debian/patches/debian/wireless-add-debian-wireless-regdb-certificates.patch - as documented in its patch header. - -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 , Sat, 22 Jan 2022 16:50:24 +0100 Binary files 2022.06.06-1/debian/regulatory.db.p7s and 2022.06.06-0ubuntu1/debian/regulatory.db.p7s differ diff -pruN 2022.06.06-1/debian/rules 2022.06.06-0ubuntu1/debian/rules --- 2022.06.06-1/debian/rules 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/rules 2021-08-28 16:54:08.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f export CRDA_PATH = /lib/crda -export REGDB_AUTHOR = $(shell dpkg-parsechangelog -SMaintainer | sed 's:.*<\(.*\)>:\1:') +export REGDB_AUTHOR = ubuntu-devel-discuss@lists.ubuntu.com export V = 1 # prevent the build system from calling lsb_release export LSB_ID = Debian/Ubuntu @@ -19,50 +19,32 @@ endef debian/stamps/configure: rm -rf debian/build $(call copy_source,debian/build) - cp debian/regulatory.db.p7s debian/build/ mkdir -p debian/stamps touch $@ override_dh_auto_configure: debian/stamps/configure override_dh_auto_build: - $(MAKE) -C debian/build regulatory.db -# Create regulatory.bin so the upstream install rule works - touch debian/build/regulatory.bin - rm -f debian/build/.custom -# Verify that our binary matches upstream unless db.txt is patched -ifeq ($(shell QUILT_PC=.pc quilt patches --quiltrc - db.txt | wc -l),0) - diff regulatory.db debian/build/regulatory.db -endif - -override_dh_auto_install: install-wireless-regdb install-wireless-regdb-udeb + # Generate keys in source dir, everything else in build dir + $(MAKE) .wireless-regdb-$(REGDB_AUTHOR).key.priv.pem + $(MAKE) $(REGDB_AUTHOR).key.pub.pem $(REGDB_AUTHOR).x509.pem + $(MAKE) -C debian/build all -install-wireless-regdb: DIR = debian/wireless-regdb -install-wireless-regdb: - $(MAKE) -C debian/build DESTDIR=$(CURDIR)/$(DIR) install - for file in regulatory.db regulatory.db.p7s; do \ - install -m644 $$file $(DIR)/lib/firmware/$$file-upstream \ - && mv $(DIR)/lib/firmware/$$file $(DIR)/lib/firmware/$$file-debian \ - || exit; \ - done - rm -r $(DIR)/lib/crda -# regulatory.db.5 just includes regulatory.bin.5, so we need to -# install the latter as regulatory.db.5 - mv $(DIR)/usr/share/man/man5/regulatory.bin.5.gz \ - $(DIR)/usr/share/man/man5/regulatory.db.5.gz - -install-wireless-regdb-udeb: DIR = debian/wireless-regdb-udeb -install-wireless-regdb-udeb: - $(MAKE) -C debian/build DESTDIR=$(CURDIR)/$(DIR) install - rm -r $(DIR)/lib/crda $(DIR)/usr/share/man - rmdir --ignore-fail-on-non-empty -p $(DIR)/usr/share + # Verify that our binaries match upstream + diff regulatory.db debian/build/regulatory.db + size="$$(dd if=regulatory.bin status=none bs=4 skip=2 count=1 | od -td4 --endian=big -An | sed 's/^\s*//')" \ + && dd if=regulatory.bin status=none iflag=skip_bytes,count_bytes skip=12 count=$$size of=debian/build/regulatory.bin.unsigned-upstream \ + && dd if=debian/build/regulatory.bin status=none iflag=skip_bytes,count_bytes skip=12 count=$$size of=debian/build/regulatory.bin.unsigned \ + && diff debian/build/regulatory.bin.unsigned-upstream debian/build/regulatory.bin.unsigned + rm debian/build/regulatory.bin.unsigned-upstream debian/build/regulatory.bin.unsigned + +override_dh_install: DIR=debian/wireless-regdb +override_dh_install: + # Install from source dir to ship upstream binaries + $(MAKE) DESTDIR=$(CURDIR)/$(DIR) install + # crda will install public keys + rm -r $(DIR)/lib/crda/pubkeys override_dh_auto_clean: + rm -rf .wireless-regdb-$(REGDB_AUTHOR).key.priv.pem $(REGDB_AUTHOR).key.pub.pem $(REGDB_AUTHOR).x509.pem rm -rf debian/build debian/stamps - -sign: - rm -rf debian/build - $(call copy_source,debian/build) - cp debian/certs/$(REGDB_AUTHOR).x509.pem debian/build/ - $(MAKE) -C debian/build regulatory.db.p7s - cp debian/build/regulatory.db.p7s debian/ diff -pruN 2022.06.06-1/debian/salsa-ci.yml 2022.06.06-0ubuntu1/debian/salsa-ci.yml --- 2022.06.06-1/debian/salsa-ci.yml 2022-07-30 19:01:30.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml - -variables: - RELEASE: 'unstable' - # We only build arch:all packages - SALSA_CI_DISABLE_BLHC: 'true' - SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 'true' - SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 'true' - SALSA_CI_DISABLE_CROSSBUILD_ARM64: 'true' - # Currently triggering falsely (bug #973313) - SALSA_CI_LINTIAN_SUPPRESS_TAGS: 'groff-message' diff -pruN 2022.06.06-1/debian/source/include-binaries 2022.06.06-0ubuntu1/debian/source/include-binaries --- 2022.06.06-1/debian/source/include-binaries 2020-01-30 19:21:00.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -debian/regulatory.bin.sig -debian/regulatory.db.p7s diff -pruN 2022.06.06-1/debian/source/lintian-overrides 2022.06.06-0ubuntu1/debian/source/lintian-overrides --- 2022.06.06-1/debian/source/lintian-overrides 2022-07-30 20:10:20.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# Blocked by #882694 -wireless-regdb source: orig-tarball-missing-upstream-signature * diff -pruN 2022.06.06-1/debian/tests/check-signatures 2022.06.06-0ubuntu1/debian/tests/check-signatures --- 2022.06.06-1/debian/tests/check-signatures 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/tests/check-signatures 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -#!/usr/bin/python3 - -# Check that signatures on regulatory.db are valid and made by keys -# trusted by the current kernel in the target suite - -import glob -import io -import os -import os.path -import re -import subprocess -import sys - - -tmp_dir = os.getenv('AUTOPKGTEST_TMP') - - -# Find current major/minor kernel version -def get_linux_source_name(): - proc = subprocess.Popen(['dpkg', '-s', 'linux-source'], - stdout=subprocess.PIPE) - with io.open(proc.stdout.fileno(), encoding='utf-8') as pipe: - for line in pipe: - match = re.match(r'^Depends:.*\b(linux-source-[0-9.]*)\b', line) - if match: - return match.group(1) - return None - - -# Extract wireless regdb certificate sources -def extract_certs_source(source_name): - certs_subdir = f'{source_name}/net/wireless/certs' - subprocess.check_call(['tar', '-C', tmp_dir, '-xa', - '-f', f'/usr/src/{source_name}.tar.xz', - certs_subdir]) - return os.path.join(tmp_dir, certs_subdir) - - -c_comment_re = re.compile(r'/\*.*?\*/') -c_hex_byte_re = re.compile(r'\s*0x([0-9A-Fa-f]{2})\s*') - - -# Convert from a C hex literal array to bytes -def convert_c_hex_to_bytes(hex): - decoded = [] - hex = c_comment_re.sub(' ', hex) - for word in hex.split(','): - match = c_hex_byte_re.fullmatch(word) - if match: - decoded.append(int(match.group(1), 16)) - elif word.isspace(): - pass - else: - raise ValueError() - return bytes(decoded) - - -# 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'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE) - pem, _ = proc.communicate(der) - proc.wait() - return pem - - -# Return an array of (cert, is_upstream] pairs. Each cert is in PEM -# format. The is_upstream flag is false for certificates found in -# "debian.hex" and otherwise true. -def convert_certs(certs_source_dir): - certs = [] - - for hex_name in glob.glob(f'{certs_source_dir}/*.hex'): - is_upstream = os.path.basename(hex_name) != 'debian.hex' - decoded = convert_c_hex_to_bytes(open(hex_name).read()) - - # Split into certificates and convert one at a time, as the - # openssl command line doesn't seem to support this - start = 0 - while start < len(decoded): - end = decoded.find(b'\x30\x82\x02', start + 3) - if end < 0: - end = len(decoded) - certs.append((convert_cert_der_to_pem(decoded[start:end]), - is_upstream)) - start = end - - return certs - - -# Verify a PKCS#7 signature where the signer must exactly match -# one of the given PEM-format X.509 certificates -def verify_signature(payload_name, signature_name, certs): - cert_name = os.path.join(tmp_dir, 'certificate.pem') - with open(cert_name, 'wb') as cert_file: - for cert in certs: - cert_file.write(cert) - - # The certificates used here are self-signed and not CAs. This - # means we need to turn off vertification of the certificates - # (-noverify). We then to ignore the certificate in the signature - # (-nointern), so that the signature is required to have been made - # by one of the certificates we pass in (I hope). - # The payload is printed to stdout by default, so disable that. - # Successful verification is reported to stderr, which autopkgtest - # counts as a failure, so redirect that to our stdout. - subprocess.check_call(['openssl', 'smime', '-verify', '-noverify', - '-certfile', cert_name, '-nointern', - '-no_check_time', - '-content', payload_name, - '-in', signature_name, '-inform', 'der'], - stdout=subprocess.DEVNULL, - stderr=1) - - -def main(): - source_name = get_linux_source_name() - certs_source_dir = extract_certs_source(source_name) - certs = convert_certs(certs_source_dir) - certs_upstream = [cert - for cert, is_upstream in certs - if is_upstream] - certs_debian = [cert for cert, is_upstream in certs] - - verify_signature('/lib/firmware/regulatory.db-upstream', - '/lib/firmware/regulatory.db.p7s-upstream', - certs_upstream) - verify_signature('/lib/firmware/regulatory.db-debian', - '/lib/firmware/regulatory.db.p7s-debian', - certs_debian) - - -if __name__ == '__main__': - main() diff -pruN 2022.06.06-1/debian/tests/control 2022.06.06-0ubuntu1/debian/tests/control --- 2022.06.06-1/debian/tests/control 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Tests: check-signatures -Depends: wireless-regdb, linux-source, openssl, python3 diff -pruN 2022.06.06-1/debian/upstream/metadata 2022.06.06-0ubuntu1/debian/upstream/metadata --- 2022.06.06-1/debian/upstream/metadata 2022-06-05 23:19:55.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ ---- -Repository: git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git diff -pruN 2022.06.06-1/debian/upstream/signing-key.asc 2022.06.06-0ubuntu1/debian/upstream/signing-key.asc --- 2022.06.06-1/debian/upstream/signing-key.asc 2020-01-29 22:23:01.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -WgqL/3rROEWF/7Y= -=9NqJ ------END PGP PUBLIC KEY BLOCK----- diff -pruN 2022.06.06-1/debian/watch 2022.06.06-0ubuntu1/debian/watch --- 2022.06.06-1/debian/watch 2020-01-29 22:23:01.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/watch 2021-08-28 16:54:08.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts="pgpmode=mangle, pgpsigurlmangle=s|\.xz$|.sign|, decompress" \ https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-(.*)\.tar\.xz debian diff -pruN 2022.06.06-1/debian/wireless-regdb.postinst 2022.06.06-0ubuntu1/debian/wireless-regdb.postinst --- 2022.06.06-1/debian/wireless-regdb.postinst 2022-07-12 18:40:10.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/wireless-regdb.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ]; then - # d-i currently installs its copies of regulatory.db{,.p7s} as - # regular files, which we need to remove before running - # update-alternatives - if dpkg --compare-versions "$2" lt 2022.04.08-2~; then - for file in regulatory.db regulatory.db.p7s; do - if [ ! -L /lib/firmware/"$file" ] || \ - [ "$(readlink /lib/firmware/"$file")" != \ - /etc/alternatives/"$file" ]; then - rm -f /lib/firmware/"$file" - fi - done - fi - - update-alternatives --install \ - /lib/firmware/regulatory.db regulatory.db /lib/firmware/regulatory.db-debian 100 \ - --slave /lib/firmware/regulatory.db.p7s regulatory.db.p7s /lib/firmware/regulatory.db.p7s-debian - update-alternatives --install \ - /lib/firmware/regulatory.db regulatory.db /lib/firmware/regulatory.db-upstream 50 \ - --slave /lib/firmware/regulatory.db.p7s regulatory.db.p7s /lib/firmware/regulatory.db.p7s-upstream -fi - -#DEBHELPER# diff -pruN 2022.06.06-1/debian/wireless-regdb.prerm 2022.06.06-0ubuntu1/debian/wireless-regdb.prerm --- 2022.06.06-1/debian/wireless-regdb.prerm 2020-01-29 22:23:01.000000000 +0000 +++ 2022.06.06-0ubuntu1/debian/wireless-regdb.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" != "upgrade" ]; then - update-alternatives --remove regulatory.db /lib/firmware/regulatory.db-debian - update-alternatives --remove regulatory.db /lib/firmware/regulatory.db-upstream -fi - -#DEBHELPER#