summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD31
2 files changed, 28 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6086d4c3366d..8c08bb9ae5c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = abuild
pkgdesc = Script to build Alpine Packages
- pkgver = 3.7.0
+ pkgver = 3.10.0
pkgrel = 1
url = https://git.alpinelinux.org/cgit/abuild/
arch = i686
@@ -8,11 +8,12 @@ pkgbase = abuild
license = GPL2
makedepends = zlib
makedepends = pkgconfig
+ makedepends = scdoc
depends = busybox
depends = glibc
depends = pax-utils
depends = openssl
- depends = apk-tools
+ depends = alpine-apk-tools
depends = attr
depends = tar
depends = pkgconf
@@ -21,7 +22,14 @@ pkgbase = abuild
depends = bubblewrap
depends = gettext
depends = git
- source = https://git.alpinelinux.org/abuild/snapshot/abuild-3.7.0.tar.gz
- sha512sums = d807cf37a355e1a43e9cb34108a301e6823b4502e7d932097027c62434bde94cc2a439d4c95c882a1cea41ad8b32424e323be20b163c59e8b1747e670a9f3909
+ optdepends = perl: for cpan resolver
+ optdepends = perl-libwww: for cpan resolver
+ optdepends = perl-json: for cpan resolver
+ optdepends = perl-module-build-tiny: for cpan resolver
+ optdepends = perl-lwp-protocol-https: for cpan resolver
+ optdepends = ruby: for gem resolver
+ optdepends = ruby-augeas: for gem resolver
+ source = https://git.alpinelinux.org/abuild/snapshot/abuild-3.10.0.tar.gz
+ sha512sums = 5acf9f2b0681ae1bc83505699769d3042b9380008f8fe064bc87fc6280bbe25ec76ea6f5c356c3bb0fa123b575f89e98319b3bca21d642cce3f0bcba1a39c2fc
pkgname = abuild
diff --git a/PKGBUILD b/PKGBUILD
index 785fe80d6a89..41401cffd5b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,26 @@
-# Alpine Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Clar Fon <them@lightdark.xyz>
+# Maintainer: Dominic Meiser [git at msrd0 dot de]
+# Contributor: Clar Fon <them@lightdark.xyz>
pkgname="abuild"
-pkgver=3.7.0
+pkgver=3.10.0
_ver=${pkgver%_git*}
pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch=("i686" "x86_64")
license=("GPL2")
-makedepends=("zlib" "pkgconfig")
-depends=("busybox" "glibc" "pax-utils" "openssl" "apk-tools" "attr" "tar" "pkgconf" "lzip" "curl"
+makedepends=("zlib" "pkgconfig" "scdoc")
+depends=("busybox" "glibc" "pax-utils" "openssl" "alpine-apk-tools" "attr" "tar" "pkgconf" "lzip" "curl"
"bubblewrap" "gettext" "git")
-opt_depends=("perl: for cpan resolver"
- "perl-libwww: for cpan resolver"
- "perl-json: for cpan resolver"
- "perl-module-build-tiny: for cpan resolver"
- "perl-lwp-protocol-https: for cpan resolver"
- "ruby: for gem resolver"
- "ruby-augeas: for gem resolver")
-pkggroups="abuild"
+optdepends=("perl: for cpan resolver"
+ "perl-libwww: for cpan resolver"
+ "perl-json: for cpan resolver"
+ "perl-module-build-tiny: for cpan resolver"
+ "perl-lwp-protocol-https: for cpan resolver"
+ "ruby: for gem resolver"
+ "ruby-augeas: for gem resolver")
source=("https://git.alpinelinux.org/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('d807cf37a355e1a43e9cb34108a301e6823b4502e7d932097027c62434bde94cc2a439d4c95c882a1cea41ad8b32424e323be20b163c59e8b1747e670a9f3909')
+sha512sums=('5acf9f2b0681ae1bc83505699769d3042b9380008f8fe064bc87fc6280bbe25ec76ea6f5c356c3bb0fa123b575f89e98319b3bca21d642cce3f0bcba1a39c2fc')
prepare() {
cd "$srcdir/$pkgname-$_ver"
@@ -37,7 +36,9 @@ package() {
cd "$srcdir/$pkgname-$_ver"
make install VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir"
for bin in "$pkgdir"/usr/bin/*; do
- sed -e "1s|#!/bin/ash|#!/bin/busybox ash|" -i "$bin"
+ sed -E -i "$bin" \
+ -e '1s|#!/bin/ash$|#!/bin/busybox ash|' \
+ -e '1s|#!/bin/ash\s+(.*)$|#!/bin/busybox ash\nset \1|'
done
install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
install -d -m 775 -o nobody -g nobody "$pkgdir"/var/cache/distfiles