diff options
Diffstat (limited to 'main/apk-tools/APKBUILD')
| -rw-r--r-- | main/apk-tools/APKBUILD | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 7c0976cbc9e..8d91e7a456a 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,16 +1,21 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.12.6 +pkgver=2.14.4 pkgrel=0 pkgdesc="Alpine Package Keeper - package manager for alpine" arch="all" url="https://gitlab.alpinelinux.org/alpine/apk-tools" license="GPL-2.0-only" -subpackages="$pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion" +subpackages="$pkgname-dbg $pkgname-dev $pkgname-static $pkgname-doc $pkgname-zsh-completion" # Musl 1.2 introduced new ABI for time64 => upgrading apk-tools # while staying on musl <1.2 causes missing symbols -depends="musl>=1.2" -makedepends_build="openssl lua5.3 lua5.3-lzlib scdoc" +# starting with musl 1.2.3_git (pre 1.2.3), we added DT_RELR +# it is possible for old systems to upgrade, and apk-tools would upgrade first, +# which would upgrade to a binary that cannot run until musl is upgraded. +# forcing this constraint makes apk upgrade musl as part of the 'critical' transaction, +# and update musl first. +depends="musl>=1.2.3_git20230424" +makedepends_build="openssl>3 lua5.3 lua5.3-lzlib scdoc" makedepends_host="zlib-dev openssl-dev zlib-static openssl-libs-static linux-headers" makedepends="$makedepends_build $makedepends_host" _lua="no" @@ -18,8 +23,11 @@ if [ "$CBUILD" = "$CHOST" ]; then _lua="lua5.3" subpackages="$subpackages $_lua-apk:luaapk" makedepends="$makedepends $_lua-dev" + + # ca-certificates-bundle needed for https certificate validation + depends="$depends ca-certificates-bundle" fi -source="https://gitlab.alpinelinux.org/alpine/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz +source="https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v$pkgver/apk-tools-v$pkgver.tar.gz _apk " builddir="$srcdir/$pkgname-v$pkgver" @@ -47,8 +55,8 @@ check() { package() { make DESTDIR="$pkgdir" LUA="$_lua" install - install -d "$pkgdir"/var/lib/apk \ - "$pkgdir"/var/cache/misc \ + install -d "$pkgdir"/lib/apk/db \ + "$pkgdir"/lib/apk/exec \ "$pkgdir"/etc/apk/keys \ "$pkgdir"/etc/apk/protected_paths.d @@ -83,6 +91,6 @@ luaapk() { } sha512sums=" -ebdda710ed11ef404cf0e68a3842fcb7f12b329e870f1341039b3f1a0de12dfcad31228f59bc291e0542f1c1cf4e587e1613478f0d0fd930900bb689fbf52251 apk-tools-v2.12.6.tar.gz -102e6d01a984fb7a84c9432f797e4d8d2c90e9570dd26208b8485569ab471ea88a2cc81eabd3b3f7e4c9685a37afc458dec172a65b03c19c78a7efb598c54f45 _apk +33aa67a1752e4188cd52a869df4bcf4e397bca082ce407e6ada3735621d56e17219c5c47e73ae90102bb0db2b6a479ff9da0466c5fd5e7dedfb903a74056592c apk-tools-v2.14.4.tar.gz +7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e _apk " |