main/alpine-conf: upgrade to 3.6.0_rc1

4 files changed, 3 insertions, 96 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
deleted file mode 100644
index 0d08d8f4ef..0000000000
--- a/main/alpine-conf/0001-setup-apkrepos-use-wget-spider.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/0001-setup-disk-dont-use-local-in-global-scope.patch b/main/alpine-conf/0001-setup-disk-dont-use-local-in-global-scope.patch
deleted file mode 100644
index 3d745026df..0000000000
--- a/main/alpine-conf/0001-setup-disk-dont-use-local-in-global-scope.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f133bfa2ddf73b07e4ecf92d724ed7c416f4ff81 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 21 Dec 2016 20:44:08 +0000
-Subject: [PATCH] setup-disk: dont use local in global scope
-
----
- setup-disk.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 588d37f..ab785fb 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -1031,7 +1031,7 @@ if [ -n "$diskdevs" ] && [ -z "$DISK_MODE" ]; then
- 	while true; do
- 		echo "The following $disk_is_or_disks_are selected${USE_LVM:+ (with LVM)}:"
- 		show_disk_info $diskdevs
--		local _lvm=${USE_LVM:-", 'lvm'"}
-+		_lvm=${USE_LVM:-", 'lvm'"}
- 		echon "How would you like to use $it_them? ('sys', 'data'${_lvm#_lvm} or '?' for help) [?] "
- 		default_read answer '?'
- 		case "$answer" in
--- 
-2.11.0
-
diff --git a/main/alpine-conf/0001-update-conf-fix-quoting-in-subshell.patch b/main/alpine-conf/0001-update-conf-fix-quoting-in-subshell.patch
deleted file mode 100644
index 52775b7bc0..0000000000
--- a/main/alpine-conf/0001-update-conf-fix-quoting-in-subshell.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d58ab5e7e511f55b08f34683bd6978fb35f5b76a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 21 Dec 2016 13:17:08 +0000
-Subject: [PATCH] update-conf: fix quoting in subshell
-
----
- update-conf.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/update-conf.in b/update-conf.in
-index fd03afa..b59151d 100644
---- a/update-conf.in
-+++ b/update-conf.in
-@@ -26,7 +26,7 @@ usage() {
- 
- is_modified() {
- 	[ -f "$LBUCACHE" ] || lbu status -a | awk '{print $2}' > "$LBUCACHE"
--	test -n "$( ( echo \"$1\" ; cat \"$LBUCACHE\" ) | sort | uniq -d)"
-+	test -n "$( ( echo "$1" ; cat "$LBUCACHE" ) | sort | uniq -d)"
- }
- 
- 
--- 
-2.11.0
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index da45c9adc0..8027b15875 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,16 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=3.5.0
-pkgrel=3
+pkgver=3.6.0_rc1
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="MIT"
 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
@@ -27,15 +24,4 @@ package() {
 	done
 }
 
-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
-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
-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
-be834f0e92730685b2c4447ea226d5fbfe77d9f036eed449bff2ccf66f50105088492dbb2080925473745103920537cfa286015d5ebb2303d0bceb0350a302bb  0001-setup-apkrepos-use-wget-spider.patch"
+sha512sums="3d1b7c18a406791948485cd871942b94a0f2eadd6f1f0e9c87f92fb15750b9b41ffec0d7d2d16361a1e25f029765005e72b266ce48609ea0b7c5e5c99606d04f  alpine-conf-3.6.0_rc1.tar.xz"