diff options
| -rw-r--r-- | system/abuild/APKBUILD | 10 | ||||
| -rw-r--r-- | system/abuild/apkpath.patch | 25 | ||||
| -rw-r--r-- | system/abuild/fix-apk-invocation.patch | 29 | ||||
| -rw-r--r-- | system/argon2/APKBUILD | 5 | ||||
| -rw-r--r-- | user/apkfoundry/APKBUILD | 4 |
5 files changed, 8 insertions, 65 deletions
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD index 53d53a818..1ec934da1 100644 --- a/system/abuild/APKBUILD +++ b/system/abuild/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=abuild -pkgver=3.4.1 -pkgrel=2 +pkgver=3.4.2 +pkgrel=0 pkgdesc="Script to build APK packages" url="https://code.foxkit.us/adelie/abuild" arch="all" @@ -19,8 +19,6 @@ makedepends="$makedepends_host $makedepends_build" subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc" install="$pkgname.pre-install $pkgname.pre-upgrade" source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz - apkpath.patch - fix-apk-invocation.patch keyhole.patch " @@ -55,7 +53,5 @@ _rootbld() { mkdir -p "$subpkgdir" } -sha512sums="6446171cc68d8341b5267816e7a05e0dc7b8a4e89c8c8410ae61e9501b163cc32db888476b14f032c16ef15bdd4dd4844e087394c2d061db8281f7bdfb34d450 abuild-3.4.1.tar.xz -bc373c93344d498a48675256bb26cf9bebac74f54d8e53a09c0975e3047c481ee35c6b88e5de392efd2d0ce2a8de23ebbf0822e1a093ee01ea99349f238c62f7 apkpath.patch -4ae8a0d7efb94e8390250c2c43294ba40afcf27409257cccffb9315f00e887972e29573ddbfb830a82eab473c6d292fe7a1bf30fb9761b6fa24b8fe8c0940c79 fix-apk-invocation.patch +sha512sums="9bdeb31f54879878697b4a5436ec2bc7764e1b9840798e913ba3dd47c344437e362a3067b89440ca8a7940af1efcaa83a24e7c1077187f924bf73fb058f97fbf abuild-3.4.2.tar.xz 757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch" diff --git a/system/abuild/apkpath.patch b/system/abuild/apkpath.patch deleted file mode 100644 index 4390fe0b0..000000000 --- a/system/abuild/apkpath.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d9811dee71cfafde1fe6d596a2b9922b60dd0c4f Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 21 Feb 2020 19:28:36 -0600 -Subject: [PATCH] abuild: Solve, once and for all, 'apk: not found' - ---- - abuild.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index 1b8898b..2212789 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -23,7 +23,7 @@ fi - # defaults - : ${FAKEROOT:="fakeroot"} - : ${SUDO_APK:="abuild-apk"} --: ${APK:="apk"} -+: ${APK:="/sbin/apk"} - : ${ADDUSER:="abuild-adduser"} - : ${ADDGROUP:="abuild-addgroup"} - --- -2.25.0 - diff --git a/system/abuild/fix-apk-invocation.patch b/system/abuild/fix-apk-invocation.patch deleted file mode 100644 index 71bc3d1c9..000000000 --- a/system/abuild/fix-apk-invocation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9f703d3222a6a8d52ac560035fb1a988d2f9bff7 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Thu, 27 Feb 2020 04:41:04 -0600 -Subject: [PATCH] abuild: Use $APK instead of apk - -This is the only appearance of `apk` in the source. Appears accidental. - -Fixes: 41343329 ("abuild: fix dependency tracing for cross builds") -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> ---- - abuild.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/abuild.in b/abuild.in -index 2212789..7daa366 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -1255,7 +1255,7 @@ trace_apk_deps() { - autodeps="$autodeps pc:$pcprefix$i" - elif subpkg_provides_pc "$i" \ - || $APK $apkroot info --quiet --installed "pc:$i"; then -- local provider="$(apk $apkroot search --quiet "pc:$i")" -+ local provider="$($APK $apkroot search --quiet "pc:$i")" - if list_has "$provider" $depends_dev; then - warning "$provider should be removed from depends_dev" - fi --- -2.25.1 - diff --git a/system/argon2/APKBUILD b/system/argon2/APKBUILD index 42d459e1f..c7a1bd6c2 100644 --- a/system/argon2/APKBUILD +++ b/system/argon2/APKBUILD @@ -4,7 +4,7 @@ pkgname=argon2 _pkgname=phc-winner-argon2 pkgver=20190702 -pkgrel=0 +pkgrel=1 pkgdesc="Password hashing library" url="https://github.com/P-H-C/phc-winner-argon2" arch="all" @@ -30,7 +30,8 @@ package() { sed -i 's#libdir=${prefix}/lib#libdir=/lib#' "$builddir"/libargon2.pc make OPTTARGET=none DESTDIR="$pkgdir" LIBRARY_REL=lib install # ...but cryptsetup needs this in /lib for early-boot - mv "$pkgdir"/usr/lib "$pkgdir"/ + mkdir "$pkgdir"/lib + mv "$pkgdir"/usr/lib/lib* "$pkgdir"/lib } sha512sums="0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f argon2-20190702.tar.gz" diff --git a/user/apkfoundry/APKBUILD b/user/apkfoundry/APKBUILD index 007c3d913..c06c33e20 100644 --- a/user/apkfoundry/APKBUILD +++ b/user/apkfoundry/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=apkfoundry -pkgver=0.5 +pkgver=0.6 pkgrel=0 pkgdesc="APK build orchestrator and distribution builder" url="https://dev.sick.bike/apkfoundry/" @@ -28,4 +28,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="169caf3b594929814c87fa7a3b7d8e56476a7862d64eaf7bfdf13468c4258e8879f5de738758de39631085a5cbae4b47f7656b4335bb4d7fafd2abce834ee233 apkfoundry-0.5.tar.gz" +sha512sums="71c1a0baabb2d1092e8873d438a14fba40eb953f7a11a93754e2dd6753da34a4427b2b7d50de6b7e7d34eb99b9bb91f829453d431649d3596a9789e1f1b34a0b apkfoundry-0.6.tar.gz" |