From 5c940c59391c6bd32288141dd55028abe8850f02 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 1 Jun 2010 08:49:12 +0000
Subject: main/alpine-conf: upgrade to 2.4 (cherry picked from commit
 8ccbbcf2593450a4b2a6c280af7070cba881dd7b)

---
 main/alpine-conf/APKBUILD             | 11 ++++-------
 main/alpine-conf/setup-disk-fix.patch | 19 -------------------
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 main/alpine-conf/setup-disk-fix.patch

diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 239a9f6ae8..64333a38c4 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,18 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.3
-pkgrel=1
+pkgver=2.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
-	setup-disk-fix.patch"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 license="GPL-2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	cd "$_builddir"
-	patch -p1 -i "$srcdir"/setup-disk-fix.patch
 }
 
 build() {
@@ -27,5 +25,4 @@ package() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="9e7b7602a16fb64a10ded850c508d412  alpine-conf-2.3.tar.bz2
-27b009c1193e396ee145f59cd3844a2c  setup-disk-fix.patch"
+md5sums="4c8db8948a21b0435f577d1e0f8d7c8e  alpine-conf-2.4.tar.bz2"
diff --git a/main/alpine-conf/setup-disk-fix.patch b/main/alpine-conf/setup-disk-fix.patch
deleted file mode 100644
index 2fa7aec461..0000000000
--- a/main/alpine-conf/setup-disk-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e149170d4736017c76b09625fa9a4b6a90b5e3a3
-Author: Natanael Copa <ncopa@alpinelinux.org>
-Date:   Wed May 26 13:59:25 2010 +0000
-
-    setup-disk: fix typo in the option handling
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 7a485b8..aa4a92f 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -401,7 +401,7 @@ while getopts "hk:o:r" opt; do
- 		*) usage;;
- 	esac
- done
--shift $(( OPTIND - 1))
-+shift $(( $OPTIND - 1))
- 
- if [ -d "$1" ]; then
- 	# install to given mounted root
-- 
cgit v1.2.3