diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-24 16:20:05 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-24 16:21:30 +0000 |
| commit | ec5b1d80a083abef5665b736e229f3109321c175 (patch) | |
| tree | 6420e8b57db5195830e8d8774ca0b768abe87599 /main/alpine-conf | |
| parent | aac73b34e4a0163a4870b41fc59be2fdb87e1057 (diff) | |
| download | aports-ec5b1d80a083abef5665b736e229f3109321c175.tar.bz2 aports-ec5b1d80a083abef5665b736e229f3109321c175.tar.xz | |
main/alpine-conf: fix for busybox 1.26 and newer
wget -s was removed in busybox-1.26, so use wget --spider instead.
fixes #6683
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-apkrepos-use-wget-spider.patch | 29 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 14 |
2 files changed, 38 insertions, 5 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-use-wget-spider.patch b/main/alpine-conf/0001-setup-apkrepos-use-wget-spider.patch new file mode 100644 index 0000000000..0d08d8f4ef --- /dev/null +++ b/main/alpine-conf/0001-setup-apkrepos-use-wget-spider.patch @@ -0,0 +1,29 @@ +From b21500f3de545fe42832ec5c7fa121f5051594fb Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 24 Jan 2017 16:16:00 +0000 +Subject: [PATCH] setup-apkrepos: use wget --spider + +the wget -s option was removed in busybox 1.26 +https://git.busybox.net/busybox/commit/?id=2972e2c4acb9c46a8cc05c857acac2b3d439bf69 + +ref #6683 +--- + setup-apkrepos.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup-apkrepos.in b/setup-apkrepos.in +index 4565852..05ef08e 100644 +--- a/setup-apkrepos.in ++++ b/setup-apkrepos.in +@@ -51,7 +51,7 @@ find_fastest_mirror() { + for url in $MIRRORS; do + # warm up the dns cache + nslookup $(get_hostname_from_url $url) >/dev/null 2>&1 +- local time=$(time_cmd wget -q -s -T 5 \ ++ local time=$(time_cmd wget --spider -q -T 5 \ + ${url%/}/edge/main/$arch/APKINDEX.tar.gz) + if [ -n "$time" ]; then + echo "$time $url" +-- +2.11.0 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index be1d8aa6f4..da45c9adc0 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="MIT" -depends="openrc>0.13" +depends="openrc>0.13 busybox>=1.26.1-r3" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-update-conf-fix-quoting-in-subshell.patch 0001-setup-disk-dont-use-local-in-global-scope.patch + 0001-setup-apkrepos-use-wget-spider.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -28,10 +29,13 @@ package() { md5sums="168deac2c9bd79d672c7d244a24754cf alpine-conf-3.5.0.tar.xz 6c5f745ed605c97e0a506e71103fa6be 0001-update-conf-fix-quoting-in-subshell.patch -2e85380db1889907b2817f138599cd46 0001-setup-disk-dont-use-local-in-global-scope.patch" +2e85380db1889907b2817f138599cd46 0001-setup-disk-dont-use-local-in-global-scope.patch +543cd005457d40a8f91eb97d60c81e79 0001-setup-apkrepos-use-wget-spider.patch" sha256sums="64fe2a1730105032b37463c465759e4eea2ca0e174a4be1fc01169842450a83f alpine-conf-3.5.0.tar.xz b804c0c80722dfe4e37ab7be9a80387a1a56553eebc3c493f4d0762ec03f48f6 0001-update-conf-fix-quoting-in-subshell.patch -8b6ba2e7c8065975bff59324258bfeccdb44b036f9637838c5f959829e6898c5 0001-setup-disk-dont-use-local-in-global-scope.patch" +8b6ba2e7c8065975bff59324258bfeccdb44b036f9637838c5f959829e6898c5 0001-setup-disk-dont-use-local-in-global-scope.patch +2c9b62ebe381967e9877c143e608ca886a486ba51226eaffe8a3a4c257764b84 0001-setup-apkrepos-use-wget-spider.patch" sha512sums="26958579ebefa7822a11178a202c50f1bef55be8165e87e54b65b1389453e8ddcb5eac83cce2814cd8157716bae7170ae84e7e36ac996fa50804e4b94f2b25bf alpine-conf-3.5.0.tar.xz 0b40ee7565946b34be82bbb951be1ea4592fae35887b4996258e2c98697bd60a5d88df710e97b443d4ca101ef61e118aad82adbe1165d6906ce7ff338ec2b590 0001-update-conf-fix-quoting-in-subshell.patch -6d5994f6ca38b6d7bb1aba0a5bd7fa69d3cb1c5eda2417c53f6060ad61e17952fd01c2c301d904016822986edfe87f0e6122f37d07bd1b7b8fba22e5e5b48358 0001-setup-disk-dont-use-local-in-global-scope.patch" +6d5994f6ca38b6d7bb1aba0a5bd7fa69d3cb1c5eda2417c53f6060ad61e17952fd01c2c301d904016822986edfe87f0e6122f37d07bd1b7b8fba22e5e5b48358 0001-setup-disk-dont-use-local-in-global-scope.patch +be834f0e92730685b2c4447ea226d5fbfe77d9f036eed449bff2ccf66f50105088492dbb2080925473745103920537cfa286015d5ebb2303d0bceb0350a302bb 0001-setup-apkrepos-use-wget-spider.patch" |