main/alpine-conf: upgrade to 3.0.2

6 files changed, 6 insertions, 126 deletions

diff --git a/main/alpine-base/APKBUILD b/main/alpine-base/APKBUILD
index 1b457567d4..007f3556c0 100644
--- a/main/alpine-base/APKBUILD
+++ b/main/alpine-base/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-base
-pkgver=3.0.0_rc3
+pkgver=3.0.0
 pkgrel=0
 pkgdesc="Meta package for minimal alpine base"
 url="http://alpinelinux.org"
diff --git a/main/alpine-conf/0001-setup-apkrepos-fix-cleanup.patch b/main/alpine-conf/0001-setup-apkrepos-fix-cleanup.patch
deleted file mode 100644
index 647b4bb855..0000000000
--- a/main/alpine-conf/0001-setup-apkrepos-fix-cleanup.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ed5fb1de932a4de41bb854af5d47381096e62e02 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 29 May 2014 15:04:10 +0200
-Subject: [PATCH] setup-apkrepos: fix cleanup
-
-we need uninstall .setup*
----
- setup-apkrepos.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-apkrepos.in b/setup-apkrepos.in
-index e84b928..7744d8b 100644
---- a/setup-apkrepos.in
-+++ b/setup-apkrepos.in
-@@ -210,5 +210,5 @@ fi
- 
- # clean up
- if [ -n "$to_uninstall" ]; then
--	apk del --quiet alpine-mirrors
-+	apk del --quiet $to_uninstall
- fi
--- 
-2.0.0
-
diff --git a/main/alpine-conf/0001-setup-apkrepos-force-install-virtual-package.patch b/main/alpine-conf/0001-setup-apkrepos-force-install-virtual-package.patch
deleted file mode 100644
index 32175f0f6e..0000000000
--- a/main/alpine-conf/0001-setup-apkrepos-force-install-virtual-package.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 36bd76145a20479c867c7868e5c20396b2b9e30a Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 27 May 2014 16:58:42 +0200
-Subject: [PATCH] setup-apkrepos: force install virtual package
-
-it is tmpfs and we know it will be removed on reboot. Infact, we want
-it to be removed on reboot.
----
- setup-apkrepos.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-apkrepos.in b/setup-apkrepos.in
-index ad9c309..e84b928 100644
---- a/setup-apkrepos.in
-+++ b/setup-apkrepos.in
-@@ -161,7 +161,7 @@ done
- # install alpine-mirrors if its not already there
- to_uninstall=
- if ! apk info --quiet --installed alpine-mirrors; then
--	apk add --quiet --virtual .setup-apkrepos alpine-mirrors
-+	apk add --force --quiet --virtual .setup-apkrepos alpine-mirrors
- 	to_uninstall=.setup-apkrepos
- fi
- 
--- 
-1.9.3
-
diff --git a/main/alpine-conf/0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch b/main/alpine-conf/0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
deleted file mode 100644
index 7901447a42..0000000000
--- a/main/alpine-conf/0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dc06856daff9ba68eea716956c2e2383d4097747 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 19 May 2014 15:50:21 +0200
-Subject: [PATCH] setup-disk: fix partitioning of HP raid array (cciss)
-
-ref #2893
----
- setup-disk.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index e5cae87..e7a063c 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -950,7 +950,7 @@ if [ $# -gt 0 ]; then
- 			echo "$i is not a suitable for partitioning"
- 			exit 1
- 		fi
--		diskdevs="$diskdevs /dev/$j"
-+		diskdevs="$diskdevs /dev/${j//!//}"
- 	done
- else
- 	ask_disk "Which disk(s) would you like to use? (or '?' for help or 'none')" \
--- 
-1.9.3
-
diff --git a/main/alpine-conf/0001-setup-disk-fix-progressbar.patch b/main/alpine-conf/0001-setup-disk-fix-progressbar.patch
deleted file mode 100644
index 566fe1c44d..0000000000
--- a/main/alpine-conf/0001-setup-disk-fix-progressbar.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0b5bf00f3cee569883b2dbee1649e24de4d88d7e Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 29 May 2014 15:07:49 +0200
-Subject: [PATCH] setup-disk: fix progressbar
-
-apk now sends progressbar to stdout instead of stderr
----
- setup-disk.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index e7a063c..22053b1 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -323,7 +323,7 @@ EOF
- 	chroot_caps=$(set_grsec chroot_caps 0)
- 	init_chroot_mounts "$mnt"
- 	apk add --root "$mnt" $apkflags --overlay-from-stdin \
--		$repoflags $pkgs <$ovlfiles>/dev/null
-+		$repoflags $pkgs <$ovlfiles
- 	local ret=$?
- 	cleanup_chroot_mounts "$mnt"
- 	set_grsec chroot_caps $chroot_caps > /dev/null
--- 
-2.0.0
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 552ee35177..3ac18c2a87 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,18 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=3.0.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="GPL2"
 depends="openrc"
 source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
-	0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
-	0001-setup-apkrepos-force-install-virtual-package.patch
-	0001-setup-apkrepos-fix-cleanup.patch
-	0001-setup-disk-fix-progressbar.patch
-
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -39,18 +34,6 @@ package() {
 	done
 }
 
-md5sums="905831b30cee21cbad64c2d6a0973516  alpine-conf-3.0.1.tar.xz
-df0d66fd6dcd63f1648b0768ed23df34  0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
-109d4c00c3fa6f34ec9948a8a517787e  0001-setup-apkrepos-force-install-virtual-package.patch
-67ad1f462e426492402737db78597cdf  0001-setup-apkrepos-fix-cleanup.patch
-ea7ba6f62309c81deffaeb73004b1bf5  0001-setup-disk-fix-progressbar.patch"
-sha256sums="928e37a835af314c313b85f166d51b1e2421e36191e987d0eb63aa4aa5a1b640  alpine-conf-3.0.1.tar.xz
-56988a30777e6a7ed0391236aa94d3812ab4b9ee89a7866ce62ab4eb620145f2  0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
-49c1914648feb972c7a9df71641c61e23851618ae6581de51d0223b04e133854  0001-setup-apkrepos-force-install-virtual-package.patch
-7bffdd3ffbac435b8b283993c27aeed4f0dac6ff46c369956894b05af7c1c8c0  0001-setup-apkrepos-fix-cleanup.patch
-06bd56bf618ed95b75383c29f8efc0f013e44e72c9ae92aaf2edf457bdd3738f  0001-setup-disk-fix-progressbar.patch"
-sha512sums="3ff48fe21dafa96cc43a71bbb227961c27f75e04a36dff7c0e2b8f5a6541e63156f692bd50e67f16f2c833b88a671327525f8d1f040dd1fd2982d341589bf309  alpine-conf-3.0.1.tar.xz
-6188cfe76b6acd63c9c9906f590c025ea4d0d8b49c97c0c21dee93670fafda595668534b7fcbbe5095eae967d13fb742823fe1c69412f52341c18e3f5ea7901e  0001-setup-disk-fix-partitioning-of-HP-raid-array-cciss.patch
-f34a5e3cd82abc692e3ed793aead0f985b010bb5c44e16c7de9c130510d081536aab01f27d42ddd62053bdc53f06f6013f7951a97f6c1109e508774eb24ace6f  0001-setup-apkrepos-force-install-virtual-package.patch
-36e0b2426aea48cd347e4879855c21b9a445d78e43bc0e76a73710767193a1bed34804b2e2d998bf764dc31d38360503196212bbd29821e54fdb834d8f61095c  0001-setup-apkrepos-fix-cleanup.patch
-79e68440b1478f5a88fab849a49773e1933e16e76ddf04d53a14c4fdcf719ef198140d6d36f280cc9a05eadf4bde0e0c7b11d278968771efbd72f76acba819da  0001-setup-disk-fix-progressbar.patch"
+md5sums="47d68ae225cd301a4c77230299892c72  alpine-conf-3.0.2.tar.xz"
+sha256sums="2973063ef0bb6da8bab3d6e87d1815ce4844722cc10e98b95367e6f85588d186  alpine-conf-3.0.2.tar.xz"
+sha512sums="08d2d4afe25b27796d08f48a369a245ea695785b5db4eda33a8569b661a16fb1560cbb6e98bebb07bc7afc18f9c0ea648b66ad7596d8636d0ad7d0112a002e22  alpine-conf-3.0.2.tar.xz"