aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine-conf
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-06-06 09:17:05 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-06-06 09:18:07 +0000
commit71b7a7a3dc494dc0092231876722e30bf7be73e1 (patch)
tree080283a7d66434b3f6aaf17c899cf4ad21e6f18e /main/alpine-conf
parent85077a06712b42ab4cbeb0575bdec23fce5f37bb (diff)
downloadaports-71b7a7a3dc494dc0092231876722e30bf7be73e1.tar.bz2
aports-71b7a7a3dc494dc0092231876722e30bf7be73e1.tar.xz
main/alpine-conf: upgrade to 2.8.1
ref #673 ref #674
Diffstat (limited to 'main/alpine-conf')
-rw-r--r--main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch27
-rw-r--r--main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch37
-rw-r--r--main/alpine-conf/APKBUILD10
3 files changed, 3 insertions, 71 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch b/main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch
deleted file mode 100644
index 704a2a95fe..0000000000
--- a/main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c23761a2c183f30c22a1811ba2e13b4c933f744f Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 3 May 2011 06:04:38 +0000
-Subject: [PATCH 1/2] setup-apkrepos: avoid double // in url
-
----
- setup-apkrepos.in | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup-apkrepos.in b/setup-apkrepos.in
-index 21eb802..d4e8d80 100755
---- a/setup-apkrepos.in
-+++ b/setup-apkrepos.in
-@@ -102,8 +102,8 @@ get_alpine_release() {
-
- add_mirror() {
- local mirror="$1"
-- echo "$mirror/$release/main" >> $APKREPOS_PATH
-- echo "#$mirror/$release/testing" >> $APKREPOS_PATH
-+ echo "${mirror%/}/${release}/main" >> $APKREPOS_PATH
-+ echo "#${mirror%/}/${release}/testing" >> $APKREPOS_PATH
- echo "" >> $APKREPOS_PATH
- echo "Added mirror $(get_hostname_from_url $mirror)"
- }
---
-1.7.4.5
-
diff --git a/main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch b/main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
deleted file mode 100644
index 08c2964f3e..0000000000
--- a/main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1a62591fa4176e9068e89f52194c4bac29e529a0 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 3 May 2011 08:34:01 +0000
-Subject: [PATCH 2/2] setup-disk: add raidmodules to /etc/modules if needed
-
----
- setup-disk.in | 8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index ffbbc43..b27f76b 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -564,12 +564,20 @@ setup_var() {
- rmdir /.var
-
- /etc/init.d/syslog --quiet restart
-+ setup_mdadm_conf
- }
-
- setup_mdadm_conf() {
-+ local mods= mod=
- if [ -n "$USE_RAID" ]; then
- mdadm --detail --scan > /etc/mdadm.conf
- rc-update --quiet add mdadm-raid boot
-+ mods=$(awk '/^raid/ {print $1}' /proc/modules)
-+ for mod in $mods; do
-+ if ! grep -q "^$mod" /etc/modules; then
-+ echo $mod >> /etc/modules
-+ fi
-+ done
- fi
- }
-
---
-1.7.4.5
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index a29c989cb3..e2028cc0d6 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.8.0
-pkgrel=1
+pkgver=2.8.1
+pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
depends="openrc"
source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-setup-apkrepos-avoid-double-in-url.patch
- 0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
"
arch="all"
license="GPL-2"
@@ -37,6 +35,4 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="067f87974e78c895ec3a7404061c11d0 alpine-conf-2.8.0.tar.bz2
-17cd6f91f68b4bbb1bc180dd17857e70 0001-setup-apkrepos-avoid-double-in-url.patch
-1403684c448c416733544bc13c660e86 0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch"
+md5sums="a8068da6ae47c1bc567ba215b0da6187 alpine-conf-2.8.1.tar.bz2"