community/cloud-utils: upgrade to 0.32

Upgrade to 0.32 release.

Minor corrections (remove unused scripts and manpages) that didn't
make 0.32 release.

2 files changed, 83 insertions, 8 deletions

diff --git a/community/cloud-utils/01-minor-corrections.patch b/community/cloud-utils/01-minor-corrections.patch
new file mode 100644
index 0000000000..614e95df1f
--- /dev/null
+++ b/community/cloud-utils/01-minor-corrections.patch
@@ -0,0 +1,39 @@
+From: Dermot Bradley <dermot_bradley@yahoo.com>
+Date: Wed, 28 Oct 2020 20:12 +0000
+Subject: [PATCH] cloud-utils: Minor documentation and testcase corrections
+
+cloud-publish-ubuntu relies on 2 scripts that were removed and so in
+non-functional without them. Remove it from README and tox configuration.
+
+This change is part of upstream submitted PR 20.
+
+---
+
+diff -aur a/README.md b/README.md
+--- a/README.md
++++ b/README.md
+@@ -13,12 +13,11 @@
+ 
+ Red Hat based distributions offer the `cloud-utils` package with a subset of binaries and `cloud-utils-growpart` for growpart.
+ 
+-The package is also available in Apline and Arch as `cloud-utils`.
++The package is also available in Alpine and Arch as `cloud-utils`.
+ 
+ ## Usage
+ 
+ * `cloud-localds` - create a disk for cloud-init to utilize the nocloud datasource
+-* `cloud-publish-ubuntu` - import a cloud image to your local cloud
+ * `ec2metadata` - query and display AWS EC2 metadata
+ * `growpart` - rewrite partition table so that partition takes up all the space it can
+ * `mount-image-callback` - mount a file to a temporary mount point and then invoke the provided cmd with args
+diff -aur a/tox.ini b/tox.ini
+--- a/tox.ini
++++ b/tox.ini
+@@ -13,7 +13,6 @@
+     bin/write-mime-multipart
+ shfiles =
+     bin/cloud-localds
+-    bin/cloud-publish-ubuntu
+     bin/growpart
+     bin/mount-image-callback
+     bin/resize-part-image
diff --git a/community/cloud-utils/APKBUILD b/community/cloud-utils/APKBUILD
index b600441189..3a7b19ccb7 100755
--- a/community/cloud-utils/APKBUILD
+++ b/community/cloud-utils/APKBUILD
@@ -2,16 +2,29 @@
 # Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
 # Maintainer: Dermot Bradley <dermot_bradley@yahoo.com>
 pkgname=cloud-utils
-pkgver=0.31
-pkgrel=2
+pkgver=0.32
+pkgrel=0
 pkgdesc="Utilities for interacting with cloud VM images"
 url="https://launchpad.net/cloud-utils/"
 arch="noarch !mips !mips64 !s390x" # tests are broken on big-endian
 license="GPL-3.0-or-later"
-depends="bash cdrkit coreutils e2fsprogs e2fsprogs-extra eudev mtools
-	python3 qemu-img tar util-linux"
+depends="
+	bash
+	cdrkit
+	coreutils
+	e2fsprogs
+	e2fsprogs-extra
+	eudev
+	mtools
+	python3
+	qemu-img
+	tar
+	util-linux
+	"
 subpackages="$pkgname-doc $pkgname-ec2metadata $pkgname-growpart"
-source="https://launchpad.net/cloud-utils/trunk/$pkgver/+download/cloud-utils-$pkgver.tar.gz"
+source="cloud-utils-$pkgver.tar.gz::https://github.com/canonical/cloud-utils/archive/$pkgver.tar.gz
+	01-minor-corrections.patch
+	"
 
 build() {
 	make
@@ -23,19 +36,42 @@ check() {
 }
 
 package() {
+	# Delete a "broken" script and 3 irrelevant manpages.
+	# These changes are addressed by upstream PR 20 which didn't make
+	# the 0.32 release. This can hopefully be remove upon the next
+	# upstream release.
+	rm bin/cloud-publish-ubuntu \
+	   man/cloud-publish-image.1 \
+	   man/cloud-publish-tarball.1 \
+	   man/cloud-run-instances.1
+
+	# Delete an unnecessary script
+	rm bin/vcs-run
+
 	make DESTDIR="$pkgdir" install
+
+	cp README.md $pkgdir/usr/share/doc/$pkgname/
 }
 
 ec2metadata() {
 	pkgdesc="Retrieve metadata on AWS EC2 (and compatible) VMs"
-	depends="python3"
+	depends="
+		python3
+		"
 	amove usr/bin/ec2metadata
 }
 
 growpart() {
 	pkgdesc="Grow the size of disk partitions"
-	depends="blkid coreutils sfdisk util-linux"
+	depends="
+		blkid
+		coreutils
+		eudev
+		sfdisk
+		util-linux
+		"
 	amove usr/bin/growpart
 }
 
-sha512sums="4ca22def9564e101e228ca363d7f2da593f0644a09581bf862d4aeb4b320cc7c8af5a5e7af6283966ee1a8828715bb94725c0aab584b77e97f77a3ad593c2629  cloud-utils-0.31.tar.gz"
+sha512sums="62bc07759c9c74397cd16a6a0781efb50803efc9f59969e16943fcab0d73ef96966c6abfe21edd17c15ac96dbffaaffa594b3abc0d3fab23102d2d6e7f380a7d  cloud-utils-0.32.tar.gz
+0efa8170b41cb5b6799fda9de3d3054aab1f765dfc46d1bada11edb103797ddd8153582dbfa1b4c22fd088d4cbf3a1f0729ff708f128d899645f988a8bc4c35e  01-minor-corrections.patch"