diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-21 13:18:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-21 13:19:17 +0000 |
| commit | b41b6740e2bf0aa63d1c2389df349d58f749dd72 (patch) | |
| tree | ee6a5aa5c8899a0f5232140ba8dce851be6cce86 | |
| parent | 022d20b2731c8e6fe329483da2202fd0eca67e9a (diff) | |
| download | aports-b41b6740e2bf0aa63d1c2389df349d58f749dd72.tar.bz2 aports-b41b6740e2bf0aa63d1c2389df349d58f749dd72.tar.xz | |
main/alpine-conf: fix update-conf
| -rw-r--r-- | main/alpine-conf/0001-update-conf-fix-quoting-in-subshell.patch | 25 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 18 |
2 files changed, 36 insertions, 7 deletions
diff --git a/main/alpine-conf/0001-update-conf-fix-quoting-in-subshell.patch b/main/alpine-conf/0001-update-conf-fix-quoting-in-subshell.patch new file mode 100644 index 0000000000..52775b7bc0 --- /dev/null +++ b/main/alpine-conf/0001-update-conf-fix-quoting-in-subshell.patch @@ -0,0 +1,25 @@ +From d58ab5e7e511f55b08f34683bd6978fb35f5b76a Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Wed, 21 Dec 2016 13:17:08 +0000 +Subject: [PATCH] update-conf: fix quoting in subshell + +--- + update-conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/update-conf.in b/update-conf.in +index fd03afa..b59151d 100644 +--- a/update-conf.in ++++ b/update-conf.in +@@ -26,7 +26,7 @@ usage() { + + is_modified() { + [ -f "$LBUCACHE" ] || lbu status -a | awk '{print $2}' > "$LBUCACHE" +- test -n "$( ( echo \"$1\" ; cat \"$LBUCACHE\" ) | sort | uniq -d)" ++ test -n "$( ( echo "$1" ; cat "$LBUCACHE" ) | sort | uniq -d)" + } + + +-- +2.11.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 3cde3d2d40..e747b5f377 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,29 +1,33 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.5.0 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="MIT" depends="openrc>0.13" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz + 0001-update-conf-fix-quoting-in-subshell.patch " -_builddir="$srcdir"/$pkgname-$pkgver +builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" + cd "$builddir" make VERSION=$pkgver-r$pkgrel || return 1 } package() { - cd "$_builddir" + cd "$builddir" make install PREFIX= DESTDIR="$pkgdir" || return 1 for i in commit exclude include status update; do ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="168deac2c9bd79d672c7d244a24754cf alpine-conf-3.5.0.tar.xz" -sha256sums="64fe2a1730105032b37463c465759e4eea2ca0e174a4be1fc01169842450a83f alpine-conf-3.5.0.tar.xz" -sha512sums="26958579ebefa7822a11178a202c50f1bef55be8165e87e54b65b1389453e8ddcb5eac83cce2814cd8157716bae7170ae84e7e36ac996fa50804e4b94f2b25bf alpine-conf-3.5.0.tar.xz" +md5sums="168deac2c9bd79d672c7d244a24754cf alpine-conf-3.5.0.tar.xz +6c5f745ed605c97e0a506e71103fa6be 0001-update-conf-fix-quoting-in-subshell.patch" +sha256sums="64fe2a1730105032b37463c465759e4eea2ca0e174a4be1fc01169842450a83f alpine-conf-3.5.0.tar.xz +b804c0c80722dfe4e37ab7be9a80387a1a56553eebc3c493f4d0762ec03f48f6 0001-update-conf-fix-quoting-in-subshell.patch" +sha512sums="26958579ebefa7822a11178a202c50f1bef55be8165e87e54b65b1389453e8ddcb5eac83cce2814cd8157716bae7170ae84e7e36ac996fa50804e4b94f2b25bf alpine-conf-3.5.0.tar.xz +0b40ee7565946b34be82bbb951be1ea4592fae35887b4996258e2c98697bd60a5d88df710e97b443d4ca101ef61e118aad82adbe1165d6906ce7ff338ec2b590 0001-update-conf-fix-quoting-in-subshell.patch" |