aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine-conf
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-05-28 09:44:09 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-05-28 09:45:18 +0000
commit9e7f01099f33c9c2da08c24b1559767f499c0be4 (patch)
tree2af4da2e768c6b82255aab4578ea0a9af611853e /main/alpine-conf
parent0425feadb3965f05b8ed48edb0af3e1c76256b5c (diff)
downloadaports-9e7f01099f33c9c2da08c24b1559767f499c0be4.tar.bz2
aports-9e7f01099f33c9c2da08c24b1559767f499c0be4.tar.xz
main/alpine-conf: setup-apkrepos: do not add empty mirrors
ref #1073
Diffstat (limited to 'main/alpine-conf')
-rw-r--r--main/alpine-conf/0001-setup-apkrepos-do-not-add-empty-mirrors.patch28
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 32 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-do-not-add-empty-mirrors.patch b/main/alpine-conf/0001-setup-apkrepos-do-not-add-empty-mirrors.patch
new file mode 100644
index 0000000000..1394aedea2
--- /dev/null
+++ b/main/alpine-conf/0001-setup-apkrepos-do-not-add-empty-mirrors.patch
@@ -0,0 +1,28 @@
+From 625a07f49ca1699b6b4ad2257b7761c797b1e959 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Sun, 27 May 2012 11:33:42 +0000
+Subject: [PATCH] setup-apkrepos: do not add empty mirrors
+
+ref #1073
+---
+ setup-apkrepos.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/setup-apkrepos.in b/setup-apkrepos.in
+index 69de693..df97bc5 100755
+--- a/setup-apkrepos.in
++++ b/setup-apkrepos.in
+@@ -60,6 +60,10 @@ add_fastest_mirror() {
+ fi
+ done
+ mirror=$mirror_lowest_rtt_mirror
++ if [ -z "$mirror" ]; then
++ eecho "Failed to ping any mirror"
++ return 1
++ fi
+ add_mirror "$mirror"
+ }
+
+--
+1.7.10.2
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index bab882beb0..db544c1df6 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,11 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.11.1
-pkgrel=0
+pkgrel=1
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-setup-apkrepos-do-not-add-empty-mirrors.patch
"
arch="all"
@@ -36,4 +37,5 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="399dbc7c1eedd4b9e7539b141be82b75 alpine-conf-2.11.1.tar.bz2"
+md5sums="399dbc7c1eedd4b9e7539b141be82b75 alpine-conf-2.11.1.tar.bz2
+4513e3c8df12020853c2b87f6ffe380a 0001-setup-apkrepos-do-not-add-empty-mirrors.patch"