summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-06-01 08:49:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-06-01 08:49:27 +0000
commit8ccbbcf2593450a4b2a6c280af7070cba881dd7b (patch)
tree8ad69ef0c1b1498d63379b10f27323d81d5d6e8e
parent4f6f25f4573ead961138da57abea8319bb6f8f01 (diff)
downloadaports-8ccbbcf2593450a4b2a6c280af7070cba881dd7b.tar.bz2
aports-8ccbbcf2593450a4b2a6c280af7070cba881dd7b.tar.xz
main/alpine-conf: upgrade to 2.4
-rw-r--r--main/alpine-conf/APKBUILD11
-rw-r--r--main/alpine-conf/setup-disk-fix.patch19
2 files changed, 4 insertions, 26 deletions
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 239a9f6a..64333a38 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 2fa7aec4..00000000
--- 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