main/alpine-conf: upgrade to 2.0_beta4

3 files changed, 3 insertions, 90 deletions

diff --git a/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch b/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
deleted file mode 100644
index f7ce644d44..0000000000
--- a/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fbe26c92439f4b4f19ee09ec07798a5bbaec0d77 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 29 Jul 2009 19:30:36 +0000
-Subject: [PATCH] lbu: remove packages.list if exist
-
-fixes http://redmine.alpinelinux.org/issues/show/94
----
- lbu.in |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index 48e615e..b84682a 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -233,6 +233,12 @@ cmd_package() {
- 	tmppkg="$tmpdir/$(basename $pkg)"
- 
- 	cd "${ROOT:-/}"
-+	# remove old package.list
-+	if [ -f etc/lbu/packages.list ] && [ -f var/lib/apk/world ]; then
-+		echo "Note: Removing /etc/lbu/packages.list."
-+		echo "      /var/lib/apk/world will be used."
-+		rm -f etc/lbu/packages.list
-+	fi
- 	currentlist=$(apk audit --backup -q)
- 	if [ -f var/lib/apk/world ]; then
- 		currentlist="$currentlist var/lib/apk/world"
-@@ -391,10 +397,10 @@ cmd_commit() {
- 		}' | xargs rm 2>/dev/null
- 
- 	# remove obsolete file. some older version of alpine needs this
--	# to be ble to upgrade
-+	# to be able to upgrade
- 	if [ -z "$DRYRUN" ] && [ -f $mnt/packages.list ]; then
- 		echo "Note: Removing packages.list from $(basename $mnt)."
--		echo "      $PACKAGES_LIST will be used."
-+		echo "      /var/lib/apk/world will be used."
- 		rm -f $mnt/packages.list
- 	fi
- 
--- 
-1.6.3.3
-
diff --git a/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch b/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch
deleted file mode 100644
index 066c8a02e3..0000000000
--- a/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2e3bdc6d581b3efc5446d3b765272f7125bc0cba Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Aug 2009 12:08:06 +0000
-Subject: [PATCH 2/2] setup-disk: copy apk config to new root
-
----
- setup-disk.in |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 6a90d3a..e1a2c6d 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -42,8 +42,12 @@ install_mounted_root() {
- 
- 	echon "Installing system on $rootdev: "
- 	lbu package - | tar -C "$mnt" -zx
-+	# apk reads config from target root so we need to copy the config
-+	mkdir -p "$mnt"/etc/apk/keys/
-+	cp /etc/apk/keys/* "$mnt"/etc/apk/keys/
-+
- 	apk add -q --progress --root "$mnt" $(cat "$mnt"/var/lib/apk/world) \
--		linux-grsec acct mkinitfs
-+		acct linux-grsec alpine-base >/dev/null || return 1
- 	echo ""
- 	# make things bootable
- 	kernel=$(ls "$mnt"/lib/modules)
-@@ -61,7 +65,6 @@ install_mounted_root() {
- 			rootdisk="$rootdisk /dev/${i}"
- 		done
- 	fi
--	chroot "$mnt" /sbin/mkinitfs -F "$features" $kernel
- 
- 	# create an extlinux.conf
- 	sed '/append initrd/d' /media/*/syslinux.cfg > "$mnt"/boot/extlinux.conf
--- 
-1.6.4
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index e520e1e746..fc8d2dec96 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,26 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.0_beta3
-pkgrel=2
+pkgver=2.0_beta4
+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-remove-packages.list-if-exist.patch
-	0002-setup-disk-copy-apk-config-to-new-root.patch
 	"
 license="GPL-2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i ../0001-lbu-remove-packages.list-if-exist.patch || return 1
-	patch -p1 -i ../0002-setup-disk-copy-apk-config-to-new-root.patch || return 1
 	make || return 1
 	make install PREFIX= DESTDIR="$pkgdir"
 	for i in commit exclude include status update; do
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="7786d6d526e96a3fdf51b9284d063caa  alpine-conf-2.0_beta3.tar.bz2
-b09f9702fc6599fcb7d9bfbc855c8b5c  0001-lbu-remove-packages.list-if-exist.patch
-6b32656c7d90567084753471fe9df972  0002-setup-disk-copy-apk-config-to-new-root.patch"
+md5sums="8228e51fd221284ee79aaeb889763a68  alpine-conf-2.0_beta4.tar.bz2"