community/cloud-init: upgrade to 20.4

Upgrade to 20.4 release.

Remove patches no longer necessary.

3 files changed, 3 insertions, 83 deletions

diff --git a/community/cloud-init/01-remove-debug-line.patch b/community/cloud-init/01-remove-debug-line.patch
deleted file mode 100644
index 12d1b6d7b7..0000000000
--- a/community/cloud-init/01-remove-debug-line.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Thu, 4 Sep 2020 14:51 +0100
-Subject: [PATCH] cloud-init: Prevent debug output line appearing on console
-
-During boot a debug lines appears on the console, this appears to be been
-mistakenly added to the upstream code.
-
-This patch removes the debug line. This change has already been applied
-upstream, therefore this patch can be removed upon the next upstream release.
-
----
-
---- a/cloudinit/util.py
-+++ b/cloudinit/util.py
-@@ -2490,7 +2490,6 @@
-         LOG.debug("dmidata is not supported on %s", uname_arch)
-         return None
- 
--    print("hi, now its: %s\n", subp)
-     dmidecode_path = subp.which('dmidecode')
-     if dmidecode_path:
-         return _call_dmidecode(key, dmidecode_path)
diff --git a/community/cloud-init/02-add-wakeonlan-support.patch b/community/cloud-init/02-add-wakeonlan-support.patch
deleted file mode 100644
index 6f7c1cf062..0000000000
--- a/community/cloud-init/02-add-wakeonlan-support.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Dermot Bradley <dermot_bradley@yahoo.com>
-Date: Thu, 15 Oct 2020 00:17 +0100
-Subject: [PATCH] cloud-init: Make wakeonlan setting actually work
-
-The "wakeonlan" option in cloud-init Network Config v2 YAML files did
-not actually do anything on Linux systems using /etc/network/interfaces
-files (i.e. Alpine and Debian).
-
-This patch ensures that when "wakeonlan: true" is present in a
-Network Config v2 YAML file that the equivalent entry will be written
-to /e/n/i.
-
-This change has already been submitted upstream as PR #626, therefore
-this patch can be (hopefully) removed upon the next upstream release.
-
----
-
-diff -aur a/cloudinit/net/eni.py b/cloudinit/net/eni.py
---- a/cloudinit/net/eni.py
-+++ b/cloudinit/net/eni.py
-@@ -401,6 +401,10 @@
-         sections = []
-         subnets = iface.get('subnets', {})
-         accept_ra = iface.pop('accept-ra', None)
-+        ethernet_wol = iface.pop('wakeonlan', None)
-+        if ethernet_wol is not None:
-+            # Specify WOL setting 'g' for using "Magic Packet"
-+            iface['ethernet-wol'] = 'g'
-         if subnets:
-             for index, subnet in enumerate(subnets):
-                 ipv4_subnet_mtu = None
-diff -aur a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
---- a/cloudinit/net/network_state.py
-+++ b/cloudinit/net/network_state.py
-@@ -369,6 +369,9 @@
-         accept_ra = command.get('accept-ra', None)
-         if accept_ra is not None:
-             accept_ra = util.is_true(accept_ra)
-+        wakeonlan = command.get('wakeonlan', None)
-+        if wakeonlan is not None:
-+            wakeonlan = util.is_true(wakeonlan)
-         iface.update({
-             'name': command.get('name'),
-             'type': command.get('type'),
-@@ -379,7 +382,8 @@
-             'address': None,
-             'gateway': None,
-             'subnets': subnets,
--            'accept-ra': accept_ra
-+            'accept-ra': accept_ra,
-+            'wakeonlan': wakeonlan
-         })
-         self._network_state['interfaces'].update({command.get('name'): iface})
-         self.dump_network_state()
diff --git a/community/cloud-init/APKBUILD b/community/cloud-init/APKBUILD
index 6d35a46747..365745e2c1 100644
--- a/community/cloud-init/APKBUILD
+++ b/community/cloud-init/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Dermot Bradley <dermot_bradley@yahoo.com>
 # Maintainer: Dermot Bradley <dermot_bradley@yahoo.com>
 pkgname=cloud-init
-pkgver=20.3
-pkgrel=4
+pkgver=20.4
+pkgrel=0
 pkgdesc="Cloud instance init scripts"
 url="https://cloud-init.io"
 # Dependant package "cloud-utils-growpart" is not available for mips,
@@ -33,8 +33,6 @@ depends="
 makedepends="py3-setuptools"
 subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-openrc"
 source="cloud-init-$pkgver.tar.gz::https://github.com/canonical/cloud-init/archive/$pkgver.tar.gz
-	01-remove-debug-line.patch
-	02-add-wakeonlan-support.patch
 	interfaces
 	setup-cloud-init
 	README.Alpine
@@ -91,9 +89,7 @@ package() {
 	rm "$pkgdir"/etc/cloud/templates/timesyncd.conf.tmpl
 }
 
-sha512sums="10008710f1876538dab445b07e768953adf8ee31c8848bdf4c95201d6bc894b15ed042e7c90b2cf59491c9dc4b163f64d2be275fbd954f52cb6e4bf37b8e227b  cloud-init-20.3.tar.gz
-6f0e5c93c3136e3b06f6cfe71bb3160a800a681fa7ebb9aaf551b33fcfb5ac25cf24588c147e1d99e9b361482a8e6cedf4ff3a91d5b6b52e160c456a7033a77a  01-remove-debug-line.patch
-4323030ff106202b4dafee849ff3affd56c91b44df1a0c2acd9e76b6fa8f01f0546e4b04759047fe0200a75c37fcd5bd1addbe46007f5ddc2d2a77ded66bab5d  02-add-wakeonlan-support.patch
+sha512sums="c5acf4843504a20d1d0d92c42dceb82b2b979af9e105ad9a84a60732dcde9335af4535cb1fd21a45914a37b8d93e0a0a6b899c05ab5eb1fc34d6cc24f490dc83  cloud-init-20.4.tar.gz
 48b25ec4457c2b3772a7d210033551d041749a0d1869818d888030e6df7fd9bbc13a38b95cf465de3d46d96881a722f94a337584ce48f280c4a52b819586563a  interfaces
 f32b90f26d1df0d88fbea7a1a9ab6704a20babdb750b933484bb7c4e91cc19a587d4bfbc95489a354003ecd00795d1592e71b4b93eccd41e392bb7170bfebb0e  setup-cloud-init
 3cfba05374bc13eb83c8cec03ae91e0bd0093643e5d9b66f12fb1d9dfd7a097534f989d7f6b1d42cf0acca5352f34b31271eeb63c265ea8e5f763c4bb7e85d32  README.Alpine"