diff options
Diffstat (limited to 'main/apk-tools/APKBUILD')
-rw-r--r-- | main/apk-tools/APKBUILD | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 59f5710424f..e6145a84df0 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.12.9 -pkgrel=5 +pkgver=2.14.1 +pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" arch="all" url="https://gitlab.alpinelinux.org/alpine/apk-tools" @@ -9,9 +9,14 @@ license="GPL-2.0-only" 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" -makedepends_host="zlib-dev openssl1.1-compat-dev zlib-static openssl1.1-compat-libs-static linux-headers" +# 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" if [ "$CBUILD" = "$CHOST" ]; then @@ -22,7 +27,7 @@ if [ "$CBUILD" = "$CHOST" ]; then # 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" @@ -50,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 @@ -86,6 +91,6 @@ luaapk() { } sha512sums=" -2e299e50c5ca8733f04fad971247146ff4bebb697c3589e4692c9a940ede89432dd9fea48004dc947cb493db1206a336ac0ad1e876b02683183d69b4a127d1c6 apk-tools-v2.12.9.tar.gz +172a299465a4849995e2c40240c55d1877668fc742c22e3f63f9d0500c6bae92f94a91218b5f7c7270447a90cfe50e06101cb0b27858ddf56c49e372f69259ae apk-tools-v2.14.1.tar.gz 7870676720f5007eee9482786e02246f8e3474afb90e76c9c83aebe914747a8e007b5d2eed6441933f4922024b3f0664db270f21981ad6c2db877a110b0cd79e _apk " |