aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine-conf
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-11-11 13:53:38 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-11-11 13:53:48 +0000
commit272bf69e5834baa56c19e2632d39b492e1dff156 (patch)
treedccb7db1f42db6b4d3f877ebdae470638e4159da /main/alpine-conf
parentaa4553429fb1309c8d8f56960b7a9e24e345916e (diff)
downloadaports-272bf69e5834baa56c19e2632d39b492e1dff156.tar.bz2
aports-272bf69e5834baa56c19e2632d39b492e1dff156.tar.xz
main/alpine-conf: upgrade to 3.1.0
Diffstat (limited to 'main/alpine-conf')
-rw-r--r--main/alpine-conf/0001-lbu-use-no-dereference-with-diff-when-possible.patch36
-rw-r--r--main/alpine-conf/APKBUILD14
2 files changed, 5 insertions, 45 deletions
diff --git a/main/alpine-conf/0001-lbu-use-no-dereference-with-diff-when-possible.patch b/main/alpine-conf/0001-lbu-use-no-dereference-with-diff-when-possible.patch
deleted file mode 100644
index 8eb70c1345..0000000000
--- a/main/alpine-conf/0001-lbu-use-no-dereference-with-diff-when-possible.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5368f0a59549b7b26154b2326abfd1f260f1750d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 26 Aug 2014 11:57:53 +0200
-Subject: [PATCH] lbu: use --no-dereference with diff when possible
-
----
- lbu.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lbu.in b/lbu.in
-index 52172c7..67ec631 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -672,6 +672,7 @@ usage: $PROGRAM diff [<media>]
- }
-
- cmd_diff() {
-+ local diff_opts=
- LBU_MEDIA=${1:-"$LBU_MEDIA"}
- [ -z "$LBU_MEDIA" ] && [ -z "$LBU_BACKUPDIR" ] && usage_diff
- local tmp
-@@ -680,7 +681,10 @@ cmd_diff() {
- unpack_apkovl "$tmp/a"
- ENCRYPTION=
- cmd_package - | tar -C "$tmp/b" -zx
-- cd "$tmp" && diff -ruN a b
-+ if diff --help 2>&1 | grep -q -- --no-dereference; then
-+ diff_opts="--no-dereference"
-+ fi
-+ cd "$tmp" && diff -ruN $diff_opts a b
- }
-
- # migrate
---
-2.1.0
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index e951f80548..17788fc518 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,14 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=3.0.4
-pkgrel=1
+pkgver=3.1.0
+pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
license="GPL2"
depends="openrc"
source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
- 0001-lbu-use-no-dereference-with-diff-when-possible.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -35,9 +34,6 @@ package() {
done
}
-md5sums="412900a06e4a2c17bd4f430f5fe1bc95 alpine-conf-3.0.4.tar.xz
-ceede33b44be6a023951c7f6f5d8c9d8 0001-lbu-use-no-dereference-with-diff-when-possible.patch"
-sha256sums="44d034da0d7201fe95690c0beb4a65f39bbfd4257c2b0a3c9a392587d4f69d95 alpine-conf-3.0.4.tar.xz
-49fa3c290a2a68359cb12d3c079ed704be03ef4cedfe0995cb9793c8c3a85728 0001-lbu-use-no-dereference-with-diff-when-possible.patch"
-sha512sums="0f5110ebf521efc2c47f2b59e511a1e25614983a3c69305a0bce33f21fcdbc159aa29fefb99407cca03ae9eac819b69111a8f19f67f2440cf8c8e1f8bc3bd2da alpine-conf-3.0.4.tar.xz
-152a9f23a42a2b21a267bcd4851f7e24732d1f792abec85a4ad1d08ea9021baa72dff799419d6d826a7d927ec4a91f0841a2f7cbf30f6366f200a4dabfaa132b 0001-lbu-use-no-dereference-with-diff-when-possible.patch"
+md5sums="d48adaa13dbba0e4c461b39a59fb1c10 alpine-conf-3.1.0.tar.xz"
+sha256sums="5c5c3081fba18c0303bd29ccf8caab5d550c0a767f9b3b1e6a0644b717661122 alpine-conf-3.1.0.tar.xz"
+sha512sums="22ce9a149171cf8503937b60d36ec2b69fb95123d3e3f7776cc3c9e0f14cdc8a9a2338be8c223233652cd1456f6b55bbc71ed0deda2efb75f0e62b67a4c40088 alpine-conf-3.1.0.tar.xz"