From 7aea2c126567f2b4b053fe4843c889f241cc310e Mon Sep 17 00:00:00 2001 From: joborun Date: Thu, 1 Feb 2024 21:43:49 +0200 Subject: [PATCH] upg licenses linux-api-headers wireless-regdb --- licenses/PKGBUILD | 9 +++++++-- licenses/PKGBUILD-arch | 6 +++++- linux-api-headers/PKGBUILD | 10 +++++----- linux-api-headers/PKGBUILD-arch | 6 +++--- linux-api-headers/deps | 1 + wireless-regdb/PKGBUILD | 16 ++++++++-------- wireless-regdb/PKGBUILD-arch | 8 ++++---- wireless-regdb/deps | 1 - wireless-regdb/key | 2 +- 9 files changed, 34 insertions(+), 25 deletions(-) diff --git a/licenses/PKGBUILD b/licenses/PKGBUILD index 4bfc172..5fe3187 100644 --- a/licenses/PKGBUILD +++ b/licenses/PKGBUILD @@ -8,7 +8,7 @@ _upstream_name=license-list-data _upstream_version=3.22 pkgname=licenses -pkgver=20240115 +pkgver=20240201 pkgrel=01 pkgdesc="A set of common license files" url="https://www.archlinux.org/" @@ -82,6 +82,7 @@ package() { CPL-1.0 EPL-1.0 EPL-2.0 + FSFAP GFDL-1.1-invariants-only GFDL-1.1-invariants-or-later GFDL-1.1-no-invariants-only @@ -100,6 +101,8 @@ package() { GFDL-1.3-no-invariants-or-later GFDL-1.3-only GFDL-1.3-or-later + GPL-1.0-only + GPL-1.0-or-later GPL-2.0-only GPL-2.0-or-later GPL-3.0-only @@ -134,6 +137,7 @@ package() { GPL-3.0-linking-exception GPL-3.0-linking-source-exception LGPL-3.0-linking-exception + Linux-syscall-note MPL-2.0-no-copyleft-exception ) @@ -157,5 +161,6 @@ license=(LicenseRef-None) sha256sums=(ecc9b78b590f5460b7713c1fc9e2093979b18edc2eb48084ba36ad35d2f13892) # license-list-data-3.22.tar.gz -## a620a4cb0b6d5d862a8c64d1dc3593ac1bdad1ab6223fa596908d1bbd38ef866 licenses-20240115-01-x86_64.pkg.tar.lz +## 5b2ce0faac4f6e758504fb6064b75e48a35996a806e5c4ba0d7903810f1fa0cf licenses-20240201-01-x86_64.pkg.tar.lz + diff --git a/licenses/PKGBUILD-arch b/licenses/PKGBUILD-arch index b34e89d..1264185 100644 --- a/licenses/PKGBUILD-arch +++ b/licenses/PKGBUILD-arch @@ -5,7 +5,7 @@ _upstream_name=license-list-data _upstream_version=3.22 pkgname=licenses -pkgver=20240115 +pkgver=20240201 pkgrel=1 pkgdesc="A set of common license files" arch=(any) @@ -87,6 +87,7 @@ package() { CPL-1.0 EPL-1.0 EPL-2.0 + FSFAP GFDL-1.1-invariants-only GFDL-1.1-invariants-or-later GFDL-1.1-no-invariants-only @@ -105,6 +106,8 @@ package() { GFDL-1.3-no-invariants-or-later GFDL-1.3-only GFDL-1.3-or-later + GPL-1.0-only + GPL-1.0-or-later GPL-2.0-only GPL-2.0-or-later GPL-3.0-only @@ -139,6 +142,7 @@ package() { GPL-3.0-linking-exception GPL-3.0-linking-source-exception LGPL-3.0-linking-exception + Linux-syscall-note MPL-2.0-no-copyleft-exception ) diff --git a/linux-api-headers/PKGBUILD b/linux-api-headers/PKGBUILD index f15e391..5efaeaa 100644 --- a/linux-api-headers/PKGBUILD +++ b/linux-api-headers/PKGBUILD @@ -8,7 +8,7 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc pkgname=linux-api-headers -pkgver=6.4 +pkgver=6.7 pkgrel=01 pkgdesc='Kernel headers sanitized for use in userspace' url='https://www.gnu.org/software/libc' @@ -33,13 +33,13 @@ package() { arch=(x86_64) -license=(GPL2) +license=(GPL-2.0-only) validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman -sha256sums=(8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3 # linux-6.4.tar.xz - 66efdde8fcf5f07451466586b31244559b1e3d5ec3fe4cf6c30ea65b84a0e766) # linux-6.4.tar.sign +sha256sums=(ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069 # linux-6.7.tar.xz + f81148e8461714fb0442efa369e10d2a69a2cc5b02f4347306cc373fb206df1d) # linux-6.7.tar.sign -## 822289016fd798d6ca91ac9866779ba38b9f6409d11e32954abf6c1262f36120 linux-api-headers-6.4-01-x86_64.pkg.tar.lz +## f642a85a411b0aab48cab6792c97591bfdf19211faeba39b2d530cd4a383ae4f linux-api-headers-6.7-01-x86_64.pkg.tar.lz diff --git a/linux-api-headers/PKGBUILD-arch b/linux-api-headers/PKGBUILD-arch index 25de8ff..d1dd590 100644 --- a/linux-api-headers/PKGBUILD-arch +++ b/linux-api-headers/PKGBUILD-arch @@ -6,15 +6,15 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc pkgname=linux-api-headers -pkgver=6.4 +pkgver=6.7 pkgrel=1 pkgdesc='Kernel headers sanitized for use in userspace' arch=(any) url='https://www.gnu.org/software/libc' -license=(GPL2) +license=(GPL-2.0-only) makedepends=(rsync) source=(https://www.kernel.org/pub/linux/kernel/v${pkgver:0:1}.x/linux-${pkgver}.tar.{xz,sign}) -sha256sums=('8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3' +sha256sums=('ef31144a2576d080d8c31698e83ec9f66bf97c677fa2aaf0d5bbb9f3345b1069' 'SKIP') validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E') # Greg Kroah-Hartman diff --git a/linux-api-headers/deps b/linux-api-headers/deps index 83525d5..2e07f18 100644 --- a/linux-api-headers/deps +++ b/linux-api-headers/deps @@ -1,3 +1,4 @@ rsync + diff --git a/wireless-regdb/PKGBUILD b/wireless-regdb/PKGBUILD index 5e3f4c9..2a13296 100644 --- a/wireless-regdb/PKGBUILD +++ b/wireless-regdb/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=wireless-regdb -pkgver=2023.09.01 +pkgver=2024.01.23 pkgrel=01 pkgdesc="Central Regulatory Domain Database" url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" @@ -41,15 +41,15 @@ package() { arch=(x86_64) -license=('custom') +license=('LicenseRef-custom') -validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') # Seth Forshee +validpgpkeys=('B3F2469D78D78BD09D366F37C94035C21B4F2AEB') #Chen-Yu Tsai -sha256sums=(26d4c2a727cc59239b84735aad856b7c7d0b04e30aa5c235c4f7f47f5f053491 # wireless-regdb-2023.09.01.tar.xz - 02e79401a349025cd8a89846cb66f18d331782bd4d3cf13d222c2be8c236bce7 # wireless-regdb-2023.09.01.tar.sign - 192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b # wireless-regdom - 603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3 # set-wireless-regdom +sha256sums=(c8a61c9acf76fa7eb4239e89f640dee3e87098d9f69b4d3518c9c60fc6d20c55 # wireless-regdb-2024.01.23.tar.xz + 0246cfd111f2d4315abbc23115fa9ac2e692c0befb6f66753c19e2534ad12f69 # wireless-regdb-2024.01.23.tar.sign + 192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b # wireless-regdom + 603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3 # set-wireless-regdom f5055dfe7584757a11b419836320bcdcd1d3d1e5caf26e20c63a0c64779f3376) # 85-regulatory.rules -## 5740753dda9627897ef62a730a3914aef3294af683093d47a9a70c7bff3b5714 wireless-regdb-2023.09.01-01-x86_64.pkg.tar.lz +## 50551b7f679f2ff291f6207fc2537e2ea9bb6e810aa169a0e663aeee5a8be0c3 wireless-regdb-2024.01.23-01-x86_64.pkg.tar.lz diff --git a/wireless-regdb/PKGBUILD-arch b/wireless-regdb/PKGBUILD-arch index 76c3562..e691a7f 100644 --- a/wireless-regdb/PKGBUILD-arch +++ b/wireless-regdb/PKGBUILD-arch @@ -1,12 +1,12 @@ # Maintainer: Thomas Bächler pkgname=wireless-regdb -pkgver=2023.09.01 +pkgver=2024.01.23 pkgrel=1 pkgdesc="Central Regulatory Domain Database" arch=('any') url="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" -license=('custom') +license=('LicenseRef-custom') depends=('bash' 'iw') replaces=('crda') provides=('crda') @@ -16,12 +16,12 @@ source=(https://www.kernel.org/pub/software/network/wireless-regdb/${pkgname}-${ wireless-regdom set-wireless-regdom 85-regulatory.rules) -sha256sums=('26d4c2a727cc59239b84735aad856b7c7d0b04e30aa5c235c4f7f47f5f053491' +sha256sums=('c8a61c9acf76fa7eb4239e89f640dee3e87098d9f69b4d3518c9c60fc6d20c55' 'SKIP' '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b' '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3' 'f5055dfe7584757a11b419836320bcdcd1d3d1e5caf26e20c63a0c64779f3376') -validpgpkeys=('2ABCA7498D83E1D32D51D3B5AB4800A62DB9F73A') #Seth Forshee +validpgpkeys=('B3F2469D78D78BD09D366F37C94035C21B4F2AEB') #Chen-Yu Tsai package() { install -Dm644 wireless-regdom -t "${pkgdir}"/etc/conf.d diff --git a/wireless-regdb/deps b/wireless-regdb/deps index 57eb889..22f87cb 100644 --- a/wireless-regdb/deps +++ b/wireless-regdb/deps @@ -1,4 +1,3 @@ iw - diff --git a/wireless-regdb/key b/wireless-regdb/key index 0a6edfe..b545cb5 100644 --- a/wireless-regdb/key +++ b/wireless-regdb/key @@ -1 +1 @@ -gpg -v --recv-key 530399AEE5F431C9 +gpg --recv-key 389A54219C0F2430