diff --git a/archlinux-keyring/PKGBUILD b/archlinux-keyring/PKGBUILD index 9bf3d77..67cd1c2 100644 --- a/archlinux-keyring/PKGBUILD +++ b/archlinux-keyring/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=archlinux-keyring -_tag='016d5e3ff24adac873ad833e4fe84c515fdc19bb' # git rev-parse ${pkgver} -pkgver=20230918 +_tag='165078dbbc3f805ebffad2071f965670970e9468' # git rev-parse ${pkgver} +pkgver=20231011 pkgrel=01 pkgdesc='Arch Linux PGP keyring' url='https://gitlab.archlinux.org/archlinux/archlinux-keyring/' @@ -55,4 +55,5 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse pkgname=archlinux-keyring -_tag='016d5e3ff24adac873ad833e4fe84c515fdc19bb' # git rev-parse ${pkgver} -pkgver=20230918 +_tag='165078dbbc3f805ebffad2071f965670970e9468' # git rev-parse ${pkgver} +pkgver=20231011 pkgrel=1 pkgdesc='Arch Linux PGP keyring' arch=('any') diff --git a/curl/PKGBUILD b/curl/PKGBUILD index 2c80bb6..7c7217d 100644 --- a/curl/PKGBUILD +++ b/curl/PKGBUILD @@ -7,8 +7,8 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -_tag='8c537ee308eca91d0a240315b24025048ae54e61' # git rev-parse v${_tag_name} -_tag_name='8_3_0' +_tag='817204c6e41f66dafbaa704d67f828a4288b3577' # git rev-parse v${_tag_name} +_tag_name='8_4_0' pkgver="${_tag_name//_/.}" pkgrel=01 pkgdesc='command line tool and library for transferring data with URLs - w/o ipv6 & zstd' @@ -184,8 +184,7 @@ validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg sha256sums=(SKIP) - -## f79fc9758652a19180ad6adc2b2bc94ccaa5403d90b7f9da0ddb4d10e6cb88da curl-8.3.0-01-x86_64.pkg.tar.lz -## c733628675c75c5233cd3a25cdcb2777292159790315d46b3235a2f234dff297 libcurl-compat-8.3.0-01-x86_64.pkg.tar.lz -## 2cdbd82eb6094bae1e2194ca07fc75fdb09571adafcfd11d6b3aab3bde6d8423 libcurl-gnutls-8.3.0-01-x86_64.pkg.tar.lz +## 8b5b3fc74e1376bfdc14548d50484b3b147d0083c69ef709ed697b9cf62870e2 curl-8.4.0-01-x86_64.pkg.tar.lz +## 344ae31093413e2c81fa0c2050279be3206f46fd8d41746feb43aaf8e700f821 libcurl-compat-8.4.0-01-x86_64.pkg.tar.lz +## 79396ed2e79d23662b06013bb3d6e4c369d84ccb1c45bedfeed2d57b887fc577 libcurl-gnutls-8.4.0-01-x86_64.pkg.tar.lz diff --git a/curl/PKGBUILD-arch b/curl/PKGBUILD-arch index 5acf8cf..a563523 100644 --- a/curl/PKGBUILD-arch +++ b/curl/PKGBUILD-arch @@ -6,8 +6,8 @@ pkgbase=curl pkgname=(curl libcurl-compat libcurl-gnutls) -_tag='8c537ee308eca91d0a240315b24025048ae54e61' # git rev-parse v${_tag_name} -_tag_name='8_3_0' +_tag='817204c6e41f66dafbaa704d67f828a4288b3577' # git rev-parse v${_tag_name} +_tag_name='8_4_0' pkgver="${_tag_name//_/.}" pkgrel=1 pkgdesc='command line tool and library for transferring data with URLs' diff --git a/licenses/PKGBUILD b/licenses/PKGBUILD index 8fc91bc..a45f7fa 100644 --- a/licenses/PKGBUILD +++ b/licenses/PKGBUILD @@ -8,42 +8,18 @@ _upstream_name=license-list-data _upstream_version=3.21 pkgname=licenses -pkgver=20230917 +pkgver=20231011 pkgrel=01 pkgdesc="A set of common license files" url="https://www.archlinux.org/" -source=( +source=($_upstream_name-$_upstream_version.tar.gz::https://github.com/spdx/$_upstream_name/archive/refs/tags/v$_upstream_version.tar.gz https://www.gnu.org/licenses/agpl-3.0.txt - apache-2.0.txt::https://www.apache.org/licenses/LICENSE-2.0.txt - artistic-2_0.txt - boost-1.0.txt::https://www.boost.org/LICENSE_1_0.txt - cc-by-3.0.txt - cc-by-nc-3.0.txt - cc-by-nc-nd-3.0.txt - cc-by-nc-sa-3.0.txt - cc-by-nd-3.0.txt - cc-by-sa-3.0.txt - cc-readme.txt - cddl-1.0.txt - cpl-1.0.txt - eclipse-1.0.txt https://www.gnu.org/licenses/fdl-1.2.txt https://www.gnu.org/licenses/fdl-1.3.txt https://www.gnu.org/licenses/gpl-2.0.txt https://www.gnu.org/licenses/gpl-3.0.txt https://www.gnu.org/licenses/lgpl-2.1.txt https://www.gnu.org/licenses/lgpl-3.0.txt - https://www.latex-project.org/lppl.txt - mpl-1.1.txt::https://www.mozilla.org/media/MPL/1.1/index.txt - mpl-2.0.txt::https://www.mozilla.org/media/MPL/2.0/index.txt - perlartistic.txt - php-3.01.txt::https://www.php.net/license/3_01.txt - python-2.txt - ruby-license.txt - unlicense.txt - w3c.txt - ZopePublicLicense.txt - $_upstream_name-$_upstream_version.tar.gz::https://github.com/spdx/$_upstream_name/archive/refs/tags/v$_upstream_version.tar.gz ) prepare() { @@ -58,8 +34,8 @@ prepare() { } package() { - local license - local standard_licenses=( + local license + local standard_licenses=( AGPL-3.0-only AGPL-3.0-or-later Apache-2.0 @@ -160,71 +136,89 @@ package() { ZPL-1.1 ZPL-2.0 ZPL-2.1 - ) - - - local _license_dir="$pkgdir/usr/share/licenses/common" - - install -vDm 644 agpl-3.0.txt "$_license_dir/"AGPL3/license.txt - ln -s AGPL3 "$_license_dir/"AGPL - - install -vDm 644 apache-2.0.txt "$_license_dir/"Apache/license.txt - ln -s Apache "$_license_dir/"APACHE - - install -vDm 644 artistic-2_0.txt "$_license_dir/"Artistic2.0/license.txt - - install -vDm 644 boost-1.0.txt "$_license_dir/"Boost/license.txt - - install -vDm 644 cc-by-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nc-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nc-nd-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nc-sa-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nd-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-sa-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-readme.txt -t "$_license_dir/"CCPL/ - - install -vDm 644 cddl-1.0.txt "$_license_dir/"CDDL/license.txt - - install -vDm 644 cpl-1.0.txt "$_license_dir/"CPL/license.txt - - install -vDm 644 eclipse-1.0.txt "$_license_dir/"EPL/license.txt - - install -vDm 644 gpl-2.0.txt "$_license_dir/"GPL2/license.txt - install -vDm 644 gpl-3.0.txt "$_license_dir/"GPL3/license.txt - ln -s GPL2 "$_license_dir/"GPL - - install -vDm 644 fdl-1.2.txt "$_license_dir/"FDL1.2/license.txt - install -vDm 644 fdl-1.3.txt "$_license_dir/"FDL1.3/license.txt - ln -s FDL1.2 "$_license_dir/"FDL - - install -vDm 644 lgpl-2.1.txt "$_license_dir/"LGPL2.1/license.txt - install -vDm 644 lgpl-3.0.txt "$_license_dir/"LGPL3/license.txt - ln -s LGPL2.1 "$_license_dir/"LGPL - - install -vDm 644 lppl.txt "$_license_dir/"LPPL/license.txt - - install -vDm 644 mpl-1.1.txt "$_license_dir/"MPL/license.txt - - install -vDm 644 mpl-2.0.txt "$_license_dir/"MPL2/license.txt - - install -vDm 644 perlartistic.txt "$_license_dir/"PerlArtistic/license.txt - - install -vDm 644 php-3.01.txt "$_license_dir/"PHP/license.txt - - install -vDm 644 python-2.txt "$_license_dir/"PSF/license.txt - - install -vDm 644 ruby-license.txt "$_license_dir/"RUBY/license.txt - - install -vDm 644 unlicense.txt "$_license_dir/"Unlicense/license.txt - - install -vDm 644 w3c.txt "$_license_dir/"W3C/license.txt - - install -vDm 644 ZopePublicLicense.txt "$_license_dir/"ZPL/license.txt + ) + local legacy_license_dir="$pkgdir/usr/share/licenses/common" 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/" + + # NOTE: all below license files and directories are provided for **legacy** compatibility only! + # Once all use in relevant downstreams have been removed, they will be deleted. + + install -vDm 644 agpl-3.0.txt "$legacy_license_dir/"AGPL3/license.txt + ln -s AGPL3 "$legacy_license_dir/"AGPL + + install -vdm 755 "$legacy_license_dir/Apache/" + ln -s ../../spdx/Apache-2.0.txt "$legacy_license_dir/Apache/license.txt" + ln -s Apache "$legacy_license_dir/"APACHE + + install -vdm 755 "$legacy_license_dir/Artistic2.0/" + ln -s ../../spdx/Artistic-2.0.txt "$legacy_license_dir/Artistic2.0/license.txt" + + install -vdm 755 "$legacy_license_dir/Boost/" + ln -s ../../spdx/BSL-1.0.txt "$legacy_license_dir/Boost/license.txt" + + install -vdm 755 "$legacy_license_dir/CCPL/" + ln -s ../../spdx/CC-BY-3.0.txt "$legacy_license_dir/CCPL/cc-by-3.0.txt" + ln -s ../../spdx/CC-BY-NC-3.0.txt "$legacy_license_dir/CCPL/cc-by-nc-3.0.txt" + ln -s ../../spdx/CC-BY-NC-ND-3.0.txt "$legacy_license_dir/CCPL/cc-by-nc-nd-3.0.txt" + ln -s ../../spdx/CC-BY-NC-SA-3.0.txt "$legacy_license_dir/CCPL/cc-by-nc-sa-3.0.txt" + ln -s ../../spdx/CC-BY-ND-3.0.txt "$legacy_license_dir/CCPL/cc-by-nd-3.0.txt" + ln -s ../../spdx/CC-BY-SA-3.0.txt "$legacy_license_dir/CCPL/cc-by-sa-3.0.txt" + + install -vdm 755 "$legacy_license_dir/CDDL/" + ln -s ../../spdx/CDDL-1.0.txt "$legacy_license_dir/CDDL/license.txt" + + install -vdm 755 "$legacy_license_dir/CPL/" + ln -s ../../spdx/CPL-1.0.txt "$legacy_license_dir/CPL/license.txt" + + install -vdm 755 "$legacy_license_dir/EPL/" + ln -s ../../spdx/EPL-1.0.txt "$legacy_license_dir/EPL/license.txt" + + install -vDm 644 gpl-2.0.txt "$legacy_license_dir/"GPL2/license.txt + install -vDm 644 gpl-3.0.txt "$legacy_license_dir/"GPL3/license.txt + ln -s GPL2 "$legacy_license_dir/"GPL + + install -vDm 644 fdl-1.2.txt "$legacy_license_dir/"FDL1.2/license.txt + install -vDm 644 fdl-1.3.txt "$legacy_license_dir/"FDL1.3/license.txt + ln -s FDL1.2 "$legacy_license_dir/"FDL + + install -vDm 644 lgpl-2.1.txt "$legacy_license_dir/"LGPL2.1/license.txt + install -vDm 644 lgpl-3.0.txt "$legacy_license_dir/"LGPL3/license.txt + ln -s LGPL2.1 "$legacy_license_dir/"LGPL + + install -vdm 755 "$legacy_license_dir/LPPL/" + ln -s ../../spdx/LPPL-1.3c.txt "$legacy_license_dir/LPPL/license.txt" + + install -vdm 755 "$legacy_license_dir/MPL/" + ln -s ../../spdx/MPL-1.1.txt "$legacy_license_dir/MPL/license.txt" + + install -vdm 755 "$legacy_license_dir/MPL2/" + ln -s ../../spdx/MPL-2.0.txt "$legacy_license_dir/MPL2/license.txt" + + install -vdm 755 "$legacy_license_dir/PerlArtistic/" + ln -s ../../spdx/Artistic-1.0-Perl.txt "$legacy_license_dir/PerlArtistic/license.txt" + + install -vdm 755 "$legacy_license_dir/PHP/" + ln -s ../../spdx/PHP-3.01.txt "$legacy_license_dir/PHP/license.txt" + + install -vdm 755 "$legacy_license_dir/PSF/" + ln -s ../../spdx/PSF-2.0.txt "$legacy_license_dir/PSF/license.txt" + + install -vdm 755 "$legacy_license_dir/Ruby/" + ln -s ../../spdx/Ruby.txt "$legacy_license_dir/Ruby/license.txt" + ln -s Ruby "$legacy_license_dir/RUBY" + + install -vdm 755 "$legacy_license_dir/Unlicense/" + ln -s ../../spdx/Unlicense.txt "$legacy_license_dir/Unlicense/license.txt" + + install -vdm 755 "$legacy_license_dir/W3C/" + ln -s ../../spdx/W3C.txt "$legacy_license_dir/W3C/license.txt" + + install -vdm 755 "$legacy_license_dir/ZPL/" + ln -s ../../spdx/ZPL-2.1.txt "$legacy_license_dir/ZPL/license.txt" } #---- arch license gpg-key & sha256sums ---- @@ -233,36 +227,13 @@ arch=(x86_64) license=(custom:none) -sha256sums=(0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0 # agpl-3.0.txt - cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 # apache-2.0.txt - f2e0707902c4cd92155bb081a6eb0d77ebab789eafb212659fa6f44fcdca531b # artistic-2_0.txt - c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566 # boost-1.0.txt - 896318172b9bf75b9c863df45c38495a968c3e711c405ed03a2a47eb0ed896e3 # cc-by-3.0.txt - 150775691f276de61f7e244e2e1250313b55f0648b1c1b06015c6348994d6787 # cc-by-nc-3.0.txt - db1f35b12da8faedece276d01f90a238c429a2d6a3dd727587ce5cb162684395 # cc-by-nc-nd-3.0.txt - 95f13d3047233ade320b4fce712d1b17de395649d6958c4254f1c21148cc7de8 # cc-by-nc-sa-3.0.txt - baefca0b2da73617d2791390c7893f46d690e36f9ff6f791808c0b4be359d202 # cc-by-nd-3.0.txt - e550f7bd34d25b04bb0a3fac7f3981d51b41df363d21f35952ee27da259039a2 # cc-by-sa-3.0.txt - ba17f78e76d11463e8419b6771522f0e219428fe15da415f6ebb3808a4377ceb # cc-readme.txt - 8778a2687ad7936c20ab77bedc4d28a788e853637ef3edc39708100dd0c90cef # cddl-1.0.txt - fe53ee559be099a8c964e95817c55d2a40ef43630150b11c292ccab7b2dd425d # cpl-1.0.txt - 8367b0edc81df80e6b42eb1b71f783111224e058cb3da37894d065d2deb7ab0a # eclipse-1.0.txt +sha256sums=(7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149 # license-list-data-3.21.tar.gz + 0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0 # agpl-3.0.txt d8e94ae5fdb5433fcae2961aeb1a8cf17174d6f4a0465d24bf37dd8a038bd439 # fdl-1.2.txt 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 # fdl-1.3.txt 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 # gpl-2.0.txt 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 # gpl-3.0.txt dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 # lgpl-2.1.txt - e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 # lgpl-3.0.txt - 3d262cdf34dafa6955f703c634a8c238ec44109bc8dd6ef34fb7aa54809f7e66 # lppl.txt - f849fc26a7a99981611a3a370e83078deb617d12a45776d6c4cada4d338be469 # mpl-1.1.txt - 3f3d9e0024b1921b067d6f7f88deb4a60cbe7a78e76c64e3f1d7fc3b779b9d04 # mpl-2.0.txt - 5e8219a37b4c1a146096f17862ef7d6ce689b2137c0161a3936c358a28014169 # perlartistic.txt - 0967ad6cf4b7fe81d38709d7aaef3fecb3bd685be7eebb37b864aa34c991baa7 # php-3.01.txt - 4516a0f2f58e8d6f4ac77c14261cab67d386fa9afa2e79ee09dff190a6eae9f4 # python-2.txt - f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864 # ruby-license.txt - 7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c # unlicense.txt - ec2f99fa32da2236c60b1054f8967ccce5175370de5215e8f018cb7be397512e # w3c.txt - 281c83248297ed2070a2e61ac140e707697511a6a065ba3808cbfa6de5bb5611 # ZopePublicLicense.txt - 7f7a4ffb4aa2d6ac32610a629a6fe127e5d5a3a5e41774b555dccc9284f3e149) # license-list-data-3.21.tar.gz + e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118) # lgpl-3.0.txt -## 060f91b66054c17d82dc9ecf846424c0df0f5dec4ee2b9296634fe70eb138a49 licenses-20230917-01-x86_64.pkg.tar.lz +## be1de306d3f6a11ea9d6f8f51f8d033111c88f015a1c1c9358090db887356d71 licenses-20231011-01-x86_64.pkg.tar.lz diff --git a/licenses/PKGBUILD-arch b/licenses/PKGBUILD-arch index 20ed351..94d7c9a 100644 --- a/licenses/PKGBUILD-arch +++ b/licenses/PKGBUILD-arch @@ -5,107 +5,38 @@ _upstream_name=license-list-data _upstream_version=3.21 pkgname=licenses -pkgver=20230917 +pkgver=20231011 pkgrel=1 pkgdesc="A set of common license files" arch=(any) license=(custom:none) url="https://www.archlinux.org/" source=( + $_upstream_name-$_upstream_version.tar.gz::https://github.com/spdx/$_upstream_name/archive/refs/tags/v$_upstream_version.tar.gz https://www.gnu.org/licenses/agpl-3.0.txt - apache-2.0.txt::https://www.apache.org/licenses/LICENSE-2.0.txt - artistic-2_0.txt - boost-1.0.txt::https://www.boost.org/LICENSE_1_0.txt - cc-by-3.0.txt - cc-by-nc-3.0.txt - cc-by-nc-nd-3.0.txt - cc-by-nc-sa-3.0.txt - cc-by-nd-3.0.txt - cc-by-sa-3.0.txt - cc-readme.txt - cddl-1.0.txt - cpl-1.0.txt - eclipse-1.0.txt https://www.gnu.org/licenses/fdl-1.2.txt https://www.gnu.org/licenses/fdl-1.3.txt https://www.gnu.org/licenses/gpl-2.0.txt https://www.gnu.org/licenses/gpl-3.0.txt https://www.gnu.org/licenses/lgpl-2.1.txt https://www.gnu.org/licenses/lgpl-3.0.txt - https://www.latex-project.org/lppl.txt - mpl-1.1.txt::https://www.mozilla.org/media/MPL/1.1/index.txt - mpl-2.0.txt::https://www.mozilla.org/media/MPL/2.0/index.txt - perlartistic.txt - php-3.01.txt::https://www.php.net/license/3_01.txt - python-2.txt - ruby-license.txt - unlicense.txt - w3c.txt - ZopePublicLicense.txt - $_upstream_name-$_upstream_version.tar.gz::https://github.com/spdx/$_upstream_name/archive/refs/tags/v$_upstream_version.tar.gz ) -sha512sums=('3568a76677f3d55dbbc7fc33c4073b4714cc6f68d92cd842a9ca2b230e8bd2140e59c3fc3cce34be34ffed78d75ab6e9d991ba59bf7c4addde7fb96648d3375d' - '98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8' - 'c07582f49d8d774385c37fb15804bac136bf8c6eef4cc1b37d5bf890b785f31eeb6ca537385edb469e35003d5adc5fe752d1805ef4b31909bc1be7bc1bb38695' - 'd6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8' - 'c51c6e3eab06f1d1876f2c4672f839d2bc6730ee71b80f33105e907d4f93fa39e62bf2d914bc6ad6657eb66a0e32d26787294bad37023d4ae2349ea200f7dd95' - '26132167b1dc2a451af1c1aadf677a7c5adbe94a8c614c8b270834e8ee24ccb75b9bca33da312ef5a9fd8b79c7d2653052ecb089659cf63dfe33f70f64596e8f' - '5b63cf312ec557af66ab55e6b4d338d5f4f6a6a86b240dc18eecdd9c618feec92239a4ced9d8b5edde0b20ba6a67c26d371f2b06f0031b6642244fbb5774bb02' - '4ec4234198d9c919bfd795f2be64a43d60316944af07f0e9c815231f991f9d850f8b419d268b1e372e3072d1db6c26d79bd6167db36363913642c7708d3a356f' - '6cf3f7be5a5f5e5d5bc0436dcf050bdecb0a28c62b33f4b574624e332240b547dae67ce8b1729407955343d9504cc8f7276d9251a3da53ae97789bf7b8ffc762' - '95f6c764dcf30a0e225929d880144c10166da67fba6d690190f77e04a0daa66f26f1eba08b2a8c4893da2853cd3cd52572dcfc857ffa038bd2596e70e1885918' - '228b25c065796615e756137a4b52d952624670348e4ea5c937065ae63f96f28cb2342fba9d671ff17f09555b53edf658716c2219b432a75e73e2f3e933184ea1' - '3f09a16f19941b39e5206fcdfb8ae4e0b4adeaaf17baba3cce3f0573bb319ac213033392af55eb75355e3f39382ee1b381d6c58b294f376cdbf87537356f9617' - '51a43c9de1a8ef92264655118e053b4a2dd1e1fe4a8680cfe90a6a1a87c2c2c5253a1a70f8b12b18aa5ab33756e8a7a9a86fc67701edccd05156bc38ea2cd79c' - '861e7f297c4df79b4f218876b850ce1f70687edb7029898e8bfa4255a321ba7e48a82f6b3a9f56779d29b214cce4ce81f0e36c44462065d3b848f3fd30375eb6' +sha512sums=('f271cf86b061262c8e4be8ff6ebaa98cf039f50489008880549fc6a07a0abd58626e7d388b8962b818ccaa05502fedb03fad83f2b8b0ae3dd8d6bc413067f60a' + '3568a76677f3d55dbbc7fc33c4073b4714cc6f68d92cd842a9ca2b230e8bd2140e59c3fc3cce34be34ffed78d75ab6e9d991ba59bf7c4addde7fb96648d3375d' '22d2414762188840be68198978b9ece122813d1cac522632b8fa8315749335b43b1b58a6475fec0ef593a7bc568368526a90e199999808a118a7c6bb55906ac1' '22d46818d3998ad841f537af4de7c50440dd918099fb6c5d4ab324cd71dc03066bfe1b67210a5efde77abd1d97b88da3c3dbfc39a24ae7248ee2d64e7f0fe6bb' 'aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957' 'd361e5e8201481c6346ee6a886592c51265112be550d5224f1a7a6e116255c2f1ab8788df579d9b8372ed7bfd19bac4b6e70e00b472642966ab5b319b99a2686' '1bca76c9f2f559a7851c278650125cd4f44a7ae4a96ceee6a6ba81d34d28fe7d6125c5ee459fef729b6a2a0eba3075c0841c8a156b3a26f66194f77f7d49151c' - '6a21e9f6706dacb99162dd4c70ec704e3fdf283b93ca2cc1521e08e55e0727db4c7384d027d54739f100cd26c8d3d5be717715c6b21086a9bb22efb893c34fcf' - '12336a106ce751169af566210cbd7f542172e175f49c4a37345aaf39fea1663dd847e87e3ab1f21e8642ccb0532395f95acd03643a8fddd0e40a75cba9887b21' - '4d54a4a55189e36134fd8af9e0800a037d360dc05246dd2cd942e809f95db305cdf39b89d0e9732318075afd0e1ed2f90856eaa66a67a98ccbe8cfde99750af3' - '239dbc27d68e0a03e92c68fb746602d8183084c9624a533fe92a991b8a4658d5154c901ff64826992eabcf89a5b52cb32f9cf29fd25a42bef2b5d3932010d806' - 'dc6efc925c7ef8df903d7f7f66b6d3ab17e73e5037bc12c50109925f12c6011e18d873d081d4da1ff2d52669584b7168239132ff2f665ca6d5178f7efe1beaf6' - 'f6acda74831a984baf170b1e423bbea8fdeb41c5e7266614e203bc4265dcfd56a78740c2369d6408dadcec7835a52dd80efa0a0f5466cac55491d99cfe0ec075' - 'f9d70fce91b44721124b2e1249a93ac902318c294da182a53ef0cf2e8f2f47c19f6b4abf964b598798ecbb954810cf66192a52ec3ace00ea5aacbbfcf8c22363' - '767242ed40e94d11521fba9e2a248ae998276f57b7b34e94d91ac392add2f835d8e0c01d1b13ce1def7782dca5dbfdbef37ea9cb802b51561718d299a3b87818' - 'aa647966e7fb62ffcd7bfc1e56a8ebe38e8384a36c14e07fec4ccf3be91ffa1b3bbd9798901fa7956056c26d124f067582366bdb9581db1f742291c86e64e39d' - '5cd651f40ea91397774d2bad8dcfdac0354d5930d892c07908caf6127eb8ee1255744959d51b9a756efa588aefce49d34c9764844282a711b50602295f8a2b3a' - '541777a015eb17bfd2dc07f5fb3a9aba950ded5bd0f53a80c52d6f4e2cb85a28a94294dbba1ca54560d0f3aadd749c94a31d67d76c1e4e6fd2255056415d52c7' - 'f271cf86b061262c8e4be8ff6ebaa98cf039f50489008880549fc6a07a0abd58626e7d388b8962b818ccaa05502fedb03fad83f2b8b0ae3dd8d6bc413067f60a') -b2sums=('b6829320f725e3e45c4807ef5deb4738a691fb3ab146d8531b81fdbccd8376a826c8ec76165985cdf37d534f68e395652c96841ba7636c4bd34c49b7c7b3a9ec' - '1bbdb8ea81b42a8ce554f92fd57009eef6b296472f910c5542d8a445e34bb0eee0e627a74462b9f453fe9d8853bde71fdb0eea11102bb604129753de6ecc6e06' - '4d249b4e8d54d2d2790a3afb6cf9fe3903985fd540efdc8f26b62b50378f3ac484f7998ee1663d3f4a7cfb624ab1ce4365ac7b9c9b4fde96faa5c33dd13ab237' - '3e7074b0bcbdd537026ae4508d915e0b14d5e97d305fcd26bb1ff5494509057cd8e60363ab416e4dd68e6fb7a84e5f456ecc3d5e46a33cb2f598758691ffeaf2' - '6b8f6fdebc86fc05d931fdf0b8013c815ffd775560ae4a69e917b204999a5cfa5413d665222f140d22e3623c37763794e86dcba17641dad8c226d1d35e17f00b' - '9afeb52cf4d5ad9d429fff6c9eade39fad242061b5ddca7e511070c4cfd0d33c73747b6801abb9132aeba09529d80ca0168bd7dbf1b2635d2d2dab76c4fe2d36' - '7f376e3d72866e4882f755f973b06fcae1291c9e1ad8d5549f95e637e4b9bafbe3120c465ef3e8128e01edb50da689ba57327d24eab819f57bc8b705d447709c' - '14accb9372c6308f2761f9c9cd4489f7f1555ff04084acda9d9ec8e9517c3eb119544b228db0578d7ca229b9d47341a5bf0a1a948499bd35d8d97f508cf51f45' - 'a25af7d323742405c2872d7f4c0b62038684239d8bf111b3a94398930d737bb1818b2eba4d9031b6bc79be26ef59087f63ed64d17f0208de5a7ac28ecc1c95b0' - '714c13820c79b96799138cada5ea414a79d16c4ed6c6b65dcf532ed73612a25632cbbe6104af4aedf0dc8fe159a18621c849efae25a0503c9e50e611efd1b92a' - '086c30075b8ab1f15734df28d739ec7d65b6d1f1ebf681641b5cc7f2d8a2760dc6d40a627bb41046f44e72b2fd9b40b2456fa9bb41a00602fd3a7fefa6b2661c' - 'ac86541da47d3d9b05b7b84357a21dca7e170e25b5ae99ab177eacbe7f16298b031302ad01deafee81bfbdef72cb9679abfd24722551b37a55341af03b510146' - 'c1f8c0a7c2596a9e8db61505b63f5b7ea54d7c0c86f4e8821bd27160a3976cc3876baef386bfecfc21816a2230a539bf54ae333c6c9241e392312e910ba9f342' - '113530ed800ced04cc82a7424577f1edc3234601068ab485c9aaf1ca3f45fe43fed01eee6b2642cba9618a11ab33ac73a3beefbbd6f0de879905df5109935992' + '6a21e9f6706dacb99162dd4c70ec704e3fdf283b93ca2cc1521e08e55e0727db4c7384d027d54739f100cd26c8d3d5be717715c6b21086a9bb22efb893c34fcf') +b2sums=('f4f762da3c7c286596e1e047c6e083017e2662334ab039faeb57e0947ab700e0c8540727375c2170a35bac5b983fd80e8824ebbe5b051a5e23be0f7bdcb173ed' + 'b6829320f725e3e45c4807ef5deb4738a691fb3ab146d8531b81fdbccd8376a826c8ec76165985cdf37d534f68e395652c96841ba7636c4bd34c49b7c7b3a9ec' 'a580eceb4f7514964ef00e8c5130b9568fb2cf99d9bef0222662fa994af7b1634c1034c846eac9d63c21b67c4f94f91b79d144b1d3b4a856ca10243548407b84' '85947e91ba1da3f15c1d2c55f592aaaa1ede964ca8f48c9a68799c7a405a8f43b927ce9bac65c893e3b4c7925e879bdfcc852e46f03ae04e48b036fdff6c29f7' '1e1e108a77d8676eb68467cdfbf95684f0bad991bfcc24e7bd3d1eec58d746f14d20798c3bcf64e9bdd1ff4a9c5ec02ccb4c06331bcf251a9d1d0f28b6875296' '74915e048cf8b5207abf603136e7d5fcf5b8ad512cce78a2ebe3c88fc3150155893bf9824e6ed6a86414bbe4511a6bd4a42e8ec643c63353dc8eea4a44a021cd' 'b15551a6f0f0923dfb15912db9f6976898bc3d60ab3f5505e48d5e252341bb0855f4c7f23d66e9ce8809a23187b5f2ea08c99c8eb2c3d4d0407466c222cfdcca' - '4f97bb19f3d6aa5af71bec5a070b4317c0742069d23f591092e435ff8805788f7279524a1bb8a10e67a1013e0391e4a719bb8d89ccdae728b4eb134d7697a3c8' - '6ac73d500448fe0b62b5fcf4f8705720e987be7efaf3cb3f4eeb50e887edbfcd5aad307b42e355729631a757e76601dd953f75d803da51a58edd6e787f5369df' - '5d342f32a42b4563b5604b3101cc7122516c6a514b853eb3974b61ecb68ef0691b9da1742e5d0c688247e51c178b26d34957b01b357ec8a8be28b22554bac73a' - '4b8113182ec7889743d2c3f153ae13a64c3ea0a2d1b9d6a5bd85be446e87882fddf70afea5d8acae413bbea00e258bd79d0c002ea29c7b6c21073cdbbeedbfdd' - '953343f375b14990dde1f51b9f9dc1f11d3c70a75f82575698390404af31e2983ba9acf03139e65026c737bf7afadd7b956e4ddd94fe303e1438041dc1667c79' - '144613d910215899c1183e7dc2588ca7272fbd3b92023704536f007feb0746b9c1ef9890a5245275623c20c14de45ef1514fab2dc6d62274db6a10c276a96681' - '9ff800831a5c1d3b45a98c56d513935dc5b1e50e285de658d499fdc6d52736998b58cc5a5ecca83b8c98d38869122f01633e8e3ed8b9771e5919ab0f61da2cc4' - '0b1e59408032239cd6ea8765eabca5cafccfce94a05785824aba1dc8b37188695bf7990e3454b0f2d0b399f1a22c30de7f056e2f685fafadcef71cd1a91a6796' - '560b95eb5bc04b02762fe9fa42554b47d161d22251f2b18f642d9c45f8bfa574fd847228935ee5244e6dbb5ee0f1fa446fe4ce6f5ff9feeb7ef3e5a91b894549' - '41fe12d3613e61134c9b027c6e3dacacdc368e6eecc1614578850f5b784813b41cf2089418738706939db2c7fb9f17cdab005cd134a440a8aadf8b887aa8fa48' - '63aefec94bf37792b1b10ee4ae36a5ad54f5df1ef175eddf8528bc8fb1c5a71cf7c258f856f99a9ed4e678c9226f0ac99ea825fc68e10695e905a618c36896e8' - 'f4f762da3c7c286596e1e047c6e083017e2662334ab039faeb57e0947ab700e0c8540727375c2170a35bac5b983fd80e8824ebbe5b051a5e23be0f7bdcb173ed') + '4f97bb19f3d6aa5af71bec5a070b4317c0742069d23f591092e435ff8805788f7279524a1bb8a10e67a1013e0391e4a719bb8d89ccdae728b4eb134d7697a3c8') prepare() { local license @@ -222,68 +153,88 @@ package() { ZPL-2.0 ZPL-2.1 ) - local _license_dir="$pkgdir/usr/share/licenses/common" - - install -vDm 644 agpl-3.0.txt "$_license_dir/"AGPL3/license.txt - ln -s AGPL3 "$_license_dir/"AGPL - - install -vDm 644 apache-2.0.txt "$_license_dir/"Apache/license.txt - ln -s Apache "$_license_dir/"APACHE - - install -vDm 644 artistic-2_0.txt "$_license_dir/"Artistic2.0/license.txt - - install -vDm 644 boost-1.0.txt "$_license_dir/"Boost/license.txt - - install -vDm 644 cc-by-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nc-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nc-nd-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nc-sa-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-nd-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-by-sa-3.0.txt -t "$_license_dir/"CCPL/ - install -vDm 644 cc-readme.txt -t "$_license_dir/"CCPL/ - - install -vDm 644 cddl-1.0.txt "$_license_dir/"CDDL/license.txt - - install -vDm 644 cpl-1.0.txt "$_license_dir/"CPL/license.txt - - install -vDm 644 eclipse-1.0.txt "$_license_dir/"EPL/license.txt - - install -vDm 644 gpl-2.0.txt "$_license_dir/"GPL2/license.txt - install -vDm 644 gpl-3.0.txt "$_license_dir/"GPL3/license.txt - ln -s GPL2 "$_license_dir/"GPL - - install -vDm 644 fdl-1.2.txt "$_license_dir/"FDL1.2/license.txt - install -vDm 644 fdl-1.3.txt "$_license_dir/"FDL1.3/license.txt - ln -s FDL1.2 "$_license_dir/"FDL - - install -vDm 644 lgpl-2.1.txt "$_license_dir/"LGPL2.1/license.txt - install -vDm 644 lgpl-3.0.txt "$_license_dir/"LGPL3/license.txt - ln -s LGPL2.1 "$_license_dir/"LGPL - - install -vDm 644 lppl.txt "$_license_dir/"LPPL/license.txt - - install -vDm 644 mpl-1.1.txt "$_license_dir/"MPL/license.txt - - install -vDm 644 mpl-2.0.txt "$_license_dir/"MPL2/license.txt - - install -vDm 644 perlartistic.txt "$_license_dir/"PerlArtistic/license.txt - - install -vDm 644 php-3.01.txt "$_license_dir/"PHP/license.txt - - install -vDm 644 python-2.txt "$_license_dir/"PSF/license.txt - - install -vDm 644 ruby-license.txt "$_license_dir/"RUBY/license.txt - - install -vDm 644 unlicense.txt "$_license_dir/"Unlicense/license.txt - - install -vDm 644 w3c.txt "$_license_dir/"W3C/license.txt - - install -vDm 644 ZopePublicLicense.txt "$_license_dir/"ZPL/license.txt + local legacy_license_dir="$pkgdir/usr/share/licenses/common" 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/" + + # NOTE: all below license files and directories are provided for **legacy** compatibility only! + # Once all use in relevant downstreams have been removed, they will be deleted. + + install -vDm 644 agpl-3.0.txt "$legacy_license_dir/"AGPL3/license.txt + ln -s AGPL3 "$legacy_license_dir/"AGPL + + install -vdm 755 "$legacy_license_dir/Apache/" + ln -s ../../spdx/Apache-2.0.txt "$legacy_license_dir/Apache/license.txt" + ln -s Apache "$legacy_license_dir/"APACHE + + install -vdm 755 "$legacy_license_dir/Artistic2.0/" + ln -s ../../spdx/Artistic-2.0.txt "$legacy_license_dir/Artistic2.0/license.txt" + + install -vdm 755 "$legacy_license_dir/Boost/" + ln -s ../../spdx/BSL-1.0.txt "$legacy_license_dir/Boost/license.txt" + + install -vdm 755 "$legacy_license_dir/CCPL/" + ln -s ../../spdx/CC-BY-3.0.txt "$legacy_license_dir/CCPL/cc-by-3.0.txt" + ln -s ../../spdx/CC-BY-NC-3.0.txt "$legacy_license_dir/CCPL/cc-by-nc-3.0.txt" + ln -s ../../spdx/CC-BY-NC-ND-3.0.txt "$legacy_license_dir/CCPL/cc-by-nc-nd-3.0.txt" + ln -s ../../spdx/CC-BY-NC-SA-3.0.txt "$legacy_license_dir/CCPL/cc-by-nc-sa-3.0.txt" + ln -s ../../spdx/CC-BY-ND-3.0.txt "$legacy_license_dir/CCPL/cc-by-nd-3.0.txt" + ln -s ../../spdx/CC-BY-SA-3.0.txt "$legacy_license_dir/CCPL/cc-by-sa-3.0.txt" + + install -vdm 755 "$legacy_license_dir/CDDL/" + ln -s ../../spdx/CDDL-1.0.txt "$legacy_license_dir/CDDL/license.txt" + + install -vdm 755 "$legacy_license_dir/CPL/" + ln -s ../../spdx/CPL-1.0.txt "$legacy_license_dir/CPL/license.txt" + + install -vdm 755 "$legacy_license_dir/EPL/" + ln -s ../../spdx/EPL-1.0.txt "$legacy_license_dir/EPL/license.txt" + + install -vDm 644 gpl-2.0.txt "$legacy_license_dir/"GPL2/license.txt + install -vDm 644 gpl-3.0.txt "$legacy_license_dir/"GPL3/license.txt + ln -s GPL2 "$legacy_license_dir/"GPL + + install -vDm 644 fdl-1.2.txt "$legacy_license_dir/"FDL1.2/license.txt + install -vDm 644 fdl-1.3.txt "$legacy_license_dir/"FDL1.3/license.txt + ln -s FDL1.2 "$legacy_license_dir/"FDL + + install -vDm 644 lgpl-2.1.txt "$legacy_license_dir/"LGPL2.1/license.txt + install -vDm 644 lgpl-3.0.txt "$legacy_license_dir/"LGPL3/license.txt + ln -s LGPL2.1 "$legacy_license_dir/"LGPL + + install -vdm 755 "$legacy_license_dir/LPPL/" + ln -s ../../spdx/LPPL-1.3c.txt "$legacy_license_dir/LPPL/license.txt" + + install -vdm 755 "$legacy_license_dir/MPL/" + ln -s ../../spdx/MPL-1.1.txt "$legacy_license_dir/MPL/license.txt" + + install -vdm 755 "$legacy_license_dir/MPL2/" + ln -s ../../spdx/MPL-2.0.txt "$legacy_license_dir/MPL2/license.txt" + + install -vdm 755 "$legacy_license_dir/PerlArtistic/" + ln -s ../../spdx/Artistic-1.0-Perl.txt "$legacy_license_dir/PerlArtistic/license.txt" + + install -vdm 755 "$legacy_license_dir/PHP/" + ln -s ../../spdx/PHP-3.01.txt "$legacy_license_dir/PHP/license.txt" + + install -vdm 755 "$legacy_license_dir/PSF/" + ln -s ../../spdx/PSF-2.0.txt "$legacy_license_dir/PSF/license.txt" + + install -vdm 755 "$legacy_license_dir/Ruby/" + ln -s ../../spdx/Ruby.txt "$legacy_license_dir/Ruby/license.txt" + ln -s Ruby "$legacy_license_dir/RUBY" + + install -vdm 755 "$legacy_license_dir/Unlicense/" + ln -s ../../spdx/Unlicense.txt "$legacy_license_dir/Unlicense/license.txt" + + install -vdm 755 "$legacy_license_dir/W3C/" + ln -s ../../spdx/W3C.txt "$legacy_license_dir/W3C/license.txt" + + install -vdm 755 "$legacy_license_dir/ZPL/" + ln -s ../../spdx/ZPL-2.1.txt "$legacy_license_dir/ZPL/license.txt" } # vim: ts=2 sw=2 et: diff --git a/licenses/clean b/licenses/clean index bb5c614..1820065 100644 --- a/licenses/clean +++ b/licenses/clean @@ -1,2 +1 @@ -rm -rf {src,pkg} -rm -rf $(cat clean.list) +rm -rf {src,pkg,lic*.gz,*.txt} diff --git a/licenses/time b/licenses/time index 49e0721..d8da6a5 100644 --- a/licenses/time +++ b/licenses/time @@ -1,6 +1,6 @@ -real 0m35.675s -user 0m5.591s -sys 0m2.208s +real 0m4.827s +user 0m4.195s +sys 0m1.591s diff --git a/openldap/PKGBUILD b/openldap/PKGBUILD index f227391..c1da281 100644 --- a/openldap/PKGBUILD +++ b/openldap/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=openldap pkgname=('openldap' 'libldap') pkgdesc='Lightweight Directory Access Protocol (LDAP) client, libraries, and server, w/o ipv6 & systemd' pkgver=2.6.6 -pkgrel=01 +pkgrel=02 url='https://www.openldap.org' source=($url/software/download/OpenLDAP/openldap-release/$pkgbase-$pkgver.tgz{,.asc} openldap.tmpfiles @@ -177,6 +177,5 @@ sha256sums=(082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0 # 0be46138e53ff2fa6d4b4c06bfbdd2100426e0bd2ed29bf3419ade6b5974e9a0 # openldap.tmpfiles c6e3fa72138edfebb4ecb17f677e217c885ff9eef805b5c8ad1c09169bb0ff8e) # openldap.sysusers -## 9de0f3576d44b9571c94ee37fe11dcf895c3893673b241d3167b14b3c7f41f38 openldap-2.6.6-01-x86_64.pkg.tar.lz -## 4bf34a251c3c5095f39d10e4d85a29e76ddfce40887a948bab9eb94adc3901ce libldap-2.6.6-01-x86_64.pkg.tar.lz - +## e9fa0cd03a921ced16cca39631cc4918602b907ba28fd91e3df45379b2467d59 libldap-2.6.6-02-x86_64.pkg.tar.lz +## 2e1333c63ebc50bcea1cebb00c253e1b22ed04b5b935dfc2e7d5d3427b88d208 openldap-2.6.6-02-x86_64.pkg.tar.lz diff --git a/openldap/PKGBUILD-arch b/openldap/PKGBUILD-arch index 3118d30..5420d08 100644 --- a/openldap/PKGBUILD-arch +++ b/openldap/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgbase=openldap pkgname=('openldap' 'libldap') pkgver=2.6.6 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://www.openldap.org/" license=('custom') diff --git a/openldap/time b/openldap/time index 8bada27..e6f8262 100644 --- a/openldap/time +++ b/openldap/time @@ -1,5 +1,6 @@ -real 61m26.696s -user 6m5.829s -sys 2m49.494s +real 2m49.913s +user 2m33.141s +sys 0m16.956s +