summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-02-10 18:55:17 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-02-10 19:05:48 +0000
commitef7ba4bc0f90e8c4cf782c32470e92cc38a0661b (patch)
tree02c25f4e1da20001a2d146d01d2e6615348fd032
parentf52b3d2066e7d349c9668f18775d1f53e7d53080 (diff)
downloadaports-ef7ba4bc0f90e8c4cf782c32470e92cc38a0661b.tar.bz2
aports-ef7ba4bc0f90e8c4cf782c32470e92cc38a0661b.tar.xz
main/alpine-conf: upgrade to 2.1
fixes #271 (cherry picked from commit 74238644a69a4f2bddce10412717901534e71044)
-rw-r--r--main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch27
-rw-r--r--main/alpine-conf/APKBUILD20
2 files changed, 10 insertions, 37 deletions
diff --git a/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch b/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
deleted file mode 100644
index 858c3b816..000000000
--- a/main/alpine-conf/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From dedf250425d3cb082cae9f0005d94fbc01e1e953 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 11 Jan 2010 20:56:02 +0000
-Subject: [PATCH] lbu: fix the way we check if a dir is mounted or not
-
-this works around an issue when lbu wrongly assumes /media/usb is
-mounted when /media/usbdisk is.
----
- lbu.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index 7709567..da8ba86 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -65,7 +65,7 @@ exit_clean() {
- }
-
- mount_once() {
-- if ! grep $1 /proc/mounts >/dev/null; then
-+ if awk "\$2 == \"$1\" {exit 1}" /proc/mounts; then
- mount $1 && UMOUNT_LIST="$1 $UMOUNT_LIST"
- fi
- }
---
-1.6.6
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 902dd78d7..06e26daba 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,24 +1,24 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=2.0
-pkgrel=1
+pkgver=2.1
+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-the-way-we-check-if-a-dir-is-mounted-or-not.patch
- "
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
license="GPL-2"
+_builddir="$srcdir"/$pkgname-$pkgver
build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i "$srcdir"/0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch || return 1
-
+ cd "$_builddir"
make || return 1
+}
+
+package() {
+ cd "$_builddir"
make install PREFIX= DESTDIR="$pkgdir"
for i in commit exclude include status update; do
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="0aa966ef854de61b375d7e08bdb105b4 alpine-conf-2.0.tar.bz2
-3b520ebbf30e4e5c2ff76f14a1e2d8f2 0001-lbu-fix-the-way-we-check-if-a-dir-is-mounted-or-not.patch"
+md5sums="d9b13b849abbe5f2061aa8af0c4ac7ce alpine-conf-2.1.tar.bz2"