aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-12-11 18:04:01 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-12-12 13:04:51 +0000
commit394139d99a1db70862678314bfba18276f8211cd (patch)
treeeb16c6efdf674b1c561490767e5644a2cbf0ddff
parentd1483e0e7dc55c3c65f98b7d7f4b77fc47c334f4 (diff)
downloadaports-394139d99a1db70862678314bfba18276f8211cd.tar.bz2
aports-394139d99a1db70862678314bfba18276f8211cd.tar.xz
main/alpine-conf: use cdn as default answer in setup-apkrepos
-rw-r--r--main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch26
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 30 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch b/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch
new file mode 100644
index 0000000000..e37241230f
--- /dev/null
+++ b/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch
@@ -0,0 +1,26 @@
+From 5358f24b8ba5c359db504421d09fc16cf9e7f8cf Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 11 Dec 2019 18:01:26 +0000
+Subject: [PATCH] setup-apkrepos: use cdn as default answer
+
+use '1', which should be dl-cdn, as the default answer
+---
+ setup-apkrepos.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup-apkrepos.in b/setup-apkrepos.in
+index 81e768e..1b05978 100644
+--- a/setup-apkrepos.in
++++ b/setup-apkrepos.in
+@@ -175,7 +175,7 @@ if [ -r "$APKREPOS_PATH" ]; then
+ fi
+
+ get_alpine_release
+-default_answer=f
++default_answer=1
+ changed=false
+
+ if [ $# -gt 0 ]; then
+--
+2.24.1
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 4846060938..a2e99038e1 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.8.3
-pkgrel=2
+pkgrel=3
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
arch="all"
@@ -10,6 +10,7 @@ depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
0001-libalpine-use-correct-exit-code-in-trap.patch
0001-setup-disk-let-user-set-ROOT_SIZE.patch
+ 0001-setup-apkrepos-use-cdn-as-default-answer.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -28,4 +29,5 @@ package() {
sha512sums="73bd999b552d266c994cc1535570b86ddd7a7379f3b9e244c4985722f5754b11323a4e677cdae91fa4f0098dadd388eba679a99d98e140354ab7681bb85f9dfa alpine-conf-3.8.3.tar.xz
b5a4ed4e1507a6dde503edca5bc71c9f26e81e3f85dd01aa3705b300d7e9b9f48b7005250dea3105bef89a688bbf70257290e921d49534f6e6dd8848bb5b2fdb 0001-libalpine-use-correct-exit-code-in-trap.patch
-bf59558e5477929a0692c9ba182b71f7913533b50abd53303be6c47897348c53ec587c27a20442c180564c552f84d90d3c7d700b5f6e2cb4bb0a6ac1a7dafd1d 0001-setup-disk-let-user-set-ROOT_SIZE.patch"
+bf59558e5477929a0692c9ba182b71f7913533b50abd53303be6c47897348c53ec587c27a20442c180564c552f84d90d3c7d700b5f6e2cb4bb0a6ac1a7dafd1d 0001-setup-disk-let-user-set-ROOT_SIZE.patch
+a11e69e18da2c86cb5a419b2fc9db144b7fef4676fb4cd7c33bfe6dbf638adb872f7dd43b5c86fba916e94bdcd2d3c352931c579ea3e3333736c1fc3e5cd22fa 0001-setup-apkrepos-use-cdn-as-default-answer.patch"