aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-07-07 14:39:49 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-07-07 14:39:49 +0000
commit9b06e4bb86d3151e0d69b6b5ddf6b554e215581a (patch)
tree66d58d0a46a7e4aacf0b9f67880751b679c21358 /main
parent9485fcd2d360167cc28ae121e9840d48c7547681 (diff)
downloadaports-9b06e4bb86d3151e0d69b6b5ddf6b554e215581a.tar.bz2
aports-9b06e4bb86d3151e0d69b6b5ddf6b554e215581a.tar.xz
main/alpine-conf: fix setup-apkrepos
ref #4365
Diffstat (limited to 'main')
-rw-r--r--main/alpine-conf/0001-setup-apkrepos-fix-speed-test-of-mirrors.patch28
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 33 insertions, 1 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-fix-speed-test-of-mirrors.patch b/main/alpine-conf/0001-setup-apkrepos-fix-speed-test-of-mirrors.patch
new file mode 100644
index 0000000000..3ca7be609e
--- /dev/null
+++ b/main/alpine-conf/0001-setup-apkrepos-fix-speed-test-of-mirrors.patch
@@ -0,0 +1,28 @@
+From 2a97a54f983f16aaea7d9ef77023d32ddcf8b6c7 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 16 Jun 2015 10:31:14 +0200
+Subject: [PATCH] setup-apkrepos: fix speed test of mirrors
+
+Some mirrors error on double / in path.
+
+ref #4365
+---
+ setup-apkrepos.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup-apkrepos.in b/setup-apkrepos.in
+index 1956b19..1bbccca 100644
+--- a/setup-apkrepos.in
++++ b/setup-apkrepos.in
+@@ -48,7 +48,7 @@ find_fastest_mirror() {
+ local url=
+ for url in $MIRRORS; do
+ local time=$(time_cmd apk update --quiet $apk_root_opt \
+- --repository $url/edge/main \
++ --repository ${url%/}/edge/main \
+ --repositories-file /dev/null)
+ if [ -n "$time" ]; then
+ echo "$time $url"
+--
+2.4.5
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index fe05f82c3a..e8d2249b78 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
license="GPL2"
depends="openrc>0.13"
source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
+ 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch
0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch
"
@@ -36,8 +37,11 @@ package() {
}
md5sums="d8863487539eb41de219303addf71aa1 alpine-conf-3.2.1.tar.xz
+f1439adcfc377c56b987b379b725f0af 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch
f2da5b6cf6e4f1c1d24b59210b172bd8 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch"
sha256sums="f0e7954bb1a5144f551694acfde818bbad4e42a575e7a8e3a06a777ade7a5d9d alpine-conf-3.2.1.tar.xz
+e30d5fc4c1ae6af9673c543427561d027792c1bb26e3901ce954d15689dc66e9 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch
6e532930bc263d004975fe1feac115f17452e9f80b5efb22f538e7ebcbb6636d 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch"
sha512sums="20c11b134234708d86fe4cc093c4073df3496a43d13994d0df369066afed39a9a3c97cebacdbb6518f212e414c9456c31ee41bd600b3fc29e892448118a7b5e8 alpine-conf-3.2.1.tar.xz
+135bd0a0638f14a90d896c31de09eb3aa08cd7b2b1452fa20fdf12d128282c5c9eee5c1d76f7d8b62714f15395f225bf61c9968ad04ff164e64e8924c89abbd6 0001-setup-apkrepos-fix-speed-test-of-mirrors.patch
cd2c1f3adef443edf4473719f1cf4f277336fb59527ba70ed30f1f2c87d3cc63afe55a009b5bb5666ff79784ea8a79730dfb67a37d8e3fd8fe8fd7eb88a564fc 0001-setup-disk-add-raid-to-initfs-if-root-is-on-lvm.patch"