From 202d4fde71c6fddab619df9ad99e2d2e9c0bedfe Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 3 Dec 2010 08:58:45 +0000
Subject: main/alpine-conf: upgrade to 2.5.4

fixes #472
fixes #480
(cherry picked from commit 7016b23025fc387306f35a04391fe2bcd8eebcc2)
---
 ...-lbu-fix-lbu-status-for-encrypted-apkovls.patch | 46 ----------------------
 main/alpine-conf/APKBUILD                          | 11 ++----
 2 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100644 main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch

diff --git a/main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch b/main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch
deleted file mode 100644
index 422a322de4..0000000000
--- a/main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d43136f093e2893457c4e0d944925c97ba86effc Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 22 Nov 2010 14:42:36 +0000
-Subject: [PATCH] lbu: fix lbu status for encrypted apkovls
-
-http://redmine.alpinelinux.org/issues/480
----
- lbu.in |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index 527b9e7..309a8ab 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -140,6 +140,9 @@ unpack_apkovl() {
- 	local count=0
- 	mkdir -p "$dest"
- 	mount_once "$mnt"
-+	if [ -n "$ENCRYPTION" ]; then
-+		f="$f.$ENCRYPTION"
-+	fi	
- 	if [ ! -f "$mnt/$f" ]; then
- 		return 1
- 	fi
-@@ -147,7 +150,6 @@ unpack_apkovl() {
- 		tar -C "$dest" -zxf "$mnt/$f"
- 		return
- 	fi
--	f="$f.$ENCRYPTION"
- 	check_openssl
-         while [ $count -lt 3 ]; do
- 		$OPENSSL enc -d -$ENCRYPTION -in "$mnt/$f" | tar \
-@@ -564,7 +566,10 @@ cmd_status() {
- 	unpack_apkovl "$tmp/a"
- 
- 	# generate new apkovl and extract to tmpdir/b
-+	local save_encryption="$ENCRYPTION"
-+	ENCRYPTION=
- 	cmd_package - | tar -C "$tmp/b" -zx
-+	ENCRYPTION="$save_encryption"
- 
- 	# show files that exists in a but not in b as deleted
- 	local f
--- 
-1.7.3.2
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 2db83fdc77..a32c86e434 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.5.3
-pkgrel=1
+pkgver=2.5.4
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
-source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch
-	"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 license="GPL-2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -35,5 +33,4 @@ package() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="d1b94aa7ee65f31693cd1996c6bef4d6  alpine-conf-2.5.3.tar.bz2
-1ada3c97ecceb791e5f082223f6326b5  0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch"
+md5sums="91a2b8a150917cc06f6c9ec839b70bb0  alpine-conf-2.5.4.tar.bz2"
-- 
cgit v1.2.3