diff --git a/licenses/PKGBUILD b/licenses/PKGBUILD index eb3e288..8fc91bc 100644 --- a/licenses/PKGBUILD +++ b/licenses/PKGBUILD @@ -8,7 +8,7 @@ _upstream_name=license-list-data _upstream_version=3.21 pkgname=licenses -pkgver=20230903 +pkgver=20230917 pkgrel=01 pkgdesc="A set of common license files" url="https://www.archlinux.org/" @@ -46,7 +46,19 @@ source=( $_upstream_name-$_upstream_version.tar.gz::https://github.com/spdx/$_upstream_name/archive/refs/tags/v$_upstream_version.tar.gz ) +prepare() { + local license + + # create list of known SPDX license identifiers + { + for license in "$_upstream_name-$_upstream_version/text/"*.txt; do + printf "%s\n" "$(basename "${license//.txt/}")" + done + } > known_spdx_license_identifiers.txt +} + package() { + local license local standard_licenses=( AGPL-3.0-only AGPL-3.0-or-later @@ -212,6 +224,7 @@ package() { for license in "${standard_licenses[@]}"; do install -vDm 644 "$_upstream_name-$_upstream_version/text/$license.txt" -t "$pkgdir/usr/share/licenses/spdx/" done + install -vDm 644 known_spdx_license_identifiers.txt -t "$pkgdir/usr/share/licenses/" } #---- arch license gpg-key & sha256sums ---- @@ -252,4 +265,4 @@ sha256sums=(0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0 # 281c83248297ed2070a2e61ac140e707697511a6a065ba3808cbfa6de5bb5611 # ZopePublicLicense.txt 7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149) # license-list-data-3.21.tar.gz -## 9d89ea3f9d6a41a82443df9b0fe71a55a804826f4db0f9179e538bd57b67532b licenses-20230903-01-x86_64.pkg.tar.lz +## 060f91b66054c17d82dc9ecf846424c0df0f5dec4ee2b9296634fe70eb138a49 licenses-20230917-01-x86_64.pkg.tar.lz diff --git a/licenses/PKGBUILD-arch b/licenses/PKGBUILD-arch index 23e3b1e..20ed351 100644 --- a/licenses/PKGBUILD-arch +++ b/licenses/PKGBUILD-arch @@ -5,7 +5,7 @@ _upstream_name=license-list-data _upstream_version=3.21 pkgname=licenses -pkgver=20230903 +pkgver=20230917 pkgrel=1 pkgdesc="A set of common license files" arch=(any) @@ -107,7 +107,19 @@ b2sums=('b6829320f725e3e45c4807ef5deb4738a691fb3ab146d8531b81fdbccd8376a826c8ec7 '63aefec94bf37792b1b10ee4ae36a5ad54f5df1ef175eddf8528bc8fb1c5a71cf7c258f856f99a9ed4e678c9226f0ac99ea825fc68e10695e905a618c36896e8' 'f4f762da3c7c286596e1e047c6e083017e2662334ab039faeb57e0947ab700e0c8540727375c2170a35bac5b983fd80e8824ebbe5b051a5e23be0f7bdcb173ed') +prepare() { + local license + + # create list of known SPDX license identifiers + { + for license in "$_upstream_name-$_upstream_version/text/"*.txt; do + printf "%s\n" "$(basename "${license//.txt/}")" + done + } > known_spdx_license_identifiers.txt +} + package() { + local license local standard_licenses=( AGPL-3.0-only AGPL-3.0-or-later @@ -271,6 +283,7 @@ package() { for license in "${standard_licenses[@]}"; do install -vDm 644 "$_upstream_name-$_upstream_version/text/$license.txt" -t "$pkgdir/usr/share/licenses/spdx/" done + install -vDm 644 known_spdx_license_identifiers.txt -t "$pkgdir/usr/share/licenses/" } # vim: ts=2 sw=2 et: diff --git a/licenses/time b/licenses/time index 77daada..49e0721 100644 --- a/licenses/time +++ b/licenses/time @@ -1,3 +1,6 @@ -real 0m2.552s -user 0m2.317s -sys 0m0.430s + + +real 0m35.675s +user 0m5.591s +sys 0m2.208s + diff --git a/openssl-1.1/PKGBUILD b/openssl-1.1/PKGBUILD index b67bde3..7cc37b6 100644 --- a/openssl-1.1/PKGBUILD +++ b/openssl-1.1/PKGBUILD @@ -7,7 +7,7 @@ pkgname=openssl-1.1 _pkgname=openssl -_ver=1.1.1v +_ver=1.1.1w # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=01 @@ -74,7 +74,6 @@ package() { install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } - #---- arch license gpg-key & sha256sums ---- arch=(x86_64) @@ -86,10 +85,8 @@ validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' 'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C' 'EFC0A467D613CB83C7ED6D30D894E2CE8B3D79F5') -sha256sums=(d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 # openssl-1.1.1v.tar.gz - 8f3fc7e6c7b685144373c8acdc2c9a64435076b4cfbcb4264293af8093cc5b5c # openssl-1.1.1v.tar.gz.asc +sha256sums=(cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8 # openssl-1.1.1w.tar.gz + 5e5c3694cda755231c0438ac3c96af00d7510abd7b916d79c51bb979567040db # openssl-1.1.1w.tar.gz.asc 75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2) # ca-dir.patch -## 421a5e6fec289bda090c00cb2c1ed42fdc8843d6e43a4c8932279dd7caa448f9 openssl-1.1-1.1.1.v-01-x86_64.pkg.tar.lz - - +## e4cc4a90e115eda2426032fb4601009e36ac10c15581eeb434032aab4d0dbcd9 openssl-1.1-1.1.1.w-01-x86_64.pkg.tar.lz diff --git a/openssl-1.1/PKGBUILD-arch b/openssl-1.1/PKGBUILD-arch index f189bd5..df867bf 100644 --- a/openssl-1.1/PKGBUILD-arch +++ b/openssl-1.1/PKGBUILD-arch @@ -2,7 +2,7 @@ pkgname=openssl-1.1 _pkgname=openssl -_ver=1.1.1v +_ver=1.1.1w # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -15,7 +15,7 @@ provides=('libcrypto.so' 'libssl.so') makedepends=('perl') source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc} 'ca-dir.patch') -sha256sums=('d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0' +sha256sums=('cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8' 'SKIP' '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2') validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'