[arch-commits] Commit in cloud-init/trunk (2 files)

[David Runge]

    Date: Tuesday, August 23, 2022 @ 14:17:27
  Author: dvzrv
Revision: 1275446

upgpkg: cloud-init 22.3-1: Upgrade to 22.3.

Remove patch for python-configobj (fixed upstream).

Modified:
  cloud-init/trunk/PKGBUILD
Deleted:
  cloud-init/trunk/cloud-init-22.1-python-configobj.patch

----------------------------------------+
 PKGBUILD                               |   19 +++++++------------
 cloud-init-22.1-python-configobj.patch |   12 ------------
 2 files changed, 7 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-23 14:10:18 UTC (rev 1275445)
+++ PKGBUILD	2022-08-23 14:17:27 UTC (rev 1275446)
@@ -7,8 +7,8 @@
 # Contributor: Sparadox <etienne.lafarge at gmail.com>
 
 pkgname=cloud-init
-pkgver=22.2.2
-pkgrel=2
+pkgver=22.3
+pkgrel=1
 pkgdesc="Cloud instance initialization"
 arch=(any)
 url="https://cloud-init.io"
@@ -15,7 +15,7 @@
 license=(GPL3)
 depends=(dhclient netplan python-configobj python-jinja
 python-jsonpatch python-jsonschema python-netifaces python-oauthlib
-python-requests python-pyyaml sudo systemd)
+python-requests python-pyserial python-pyyaml sudo systemd)
 makedepends=(python-build python-installer python-setuptools python-wheel)
 checkdepends=(python-httpretty python-pytest python-pytest-mock python-responses)
 optdepends=('cloud-guest-utils: for growpart')
@@ -26,21 +26,16 @@
 source=(
   https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
   $pkgname-22.1-lib_dir.patch
-  $pkgname-22.1-python-configobj.patch
 )
-sha512sums=('18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf'
-            '32b7521f0ae4d61a4d86f2f840fb0670e2cdc7bab708fc7b7676b5178b6d660beb3a46b803f5bcd7e0f18c6d6339fc96e20a951dfafadbb0312e4a0cafce325f'
-            '16e414661be0fc382d25ff18fd35147bf6115e64984d8a7e83c479f206a8d20ba0da1901a69eee9e07fe3d7b3c7cebc5702b2932f1847e19b43eccb5c89fa63b')
-b2sums=('fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae'
-        '4e03bd647ca9e1bc3d9c507824d43e4013a20d5bbcb7215755b427d0c7ded9ee48dbfb9faaae703ab2d519aee7c48a40277603c8f874347b574b7ac2b1e1a9fd'
-        'e3470a365ecf7b5fe0ce0df30fab4160770ec128904a36ad57676af3c2c3a6730290a379c623d10fde588378149ef9c1b936f7f01f06fdb524a3f3d12f8d5112')
+sha512sums=('3024b757fdeb994f86de434c2e1c548f4992af4dd50d2a0f52c0e39a6fd6eea0964da724cef62ddb1a03086077bfebcf42cdd67bb00609e709c8c4995a71f430'
+            '32b7521f0ae4d61a4d86f2f840fb0670e2cdc7bab708fc7b7676b5178b6d660beb3a46b803f5bcd7e0f18c6d6339fc96e20a951dfafadbb0312e4a0cafce325f')
+b2sums=('e1eb417ab201b1ede0255c1225e50d44188b9cdeacee0b2c9eeb83f07f654de3a3708d01bc3123d5c36511926e3ff0ec8c0bcc049ed38f841f750b68984c24d1'
+        '4e03bd647ca9e1bc3d9c507824d43e4013a20d5bbcb7215755b427d0c7ded9ee48dbfb9faaae703ab2d519aee7c48a40277603c8f874347b574b7ac2b1e1a9fd')
 
 prepare() {
   cd $pkgname-$pkgver
   # we use /usr/lib
   patch -Np1 -i ../$pkgname-22.1-lib_dir.patch
-  # we have python-configobj > 5.0.6, which does not provide ConfigObj._a_to_u() anymore
-  patch -Np1 -i ../$pkgname-22.1-python-configobj.patch
 }
 
 build() {

Deleted: cloud-init-22.1-python-configobj.patch
===================================================================
--- cloud-init-22.1-python-configobj.patch	2022-08-23 14:10:18 UTC (rev 1275445)
+++ cloud-init-22.1-python-configobj.patch	2022-08-23 14:17:27 UTC (rev 1275446)
@@ -1,12 +0,0 @@
-diff -ruN a/cloudinit/distros/parsers/sys_conf.py b/cloudinit/distros/parsers/sys_conf.py
---- a/cloudinit/distros/parsers/sys_conf.py	2022-02-15 19:02:23.000000000 +0100
-+++ b/cloudinit/distros/parsers/sys_conf.py	2022-02-16 00:09:13.366255298 +0100
-@@ -107,7 +107,7 @@
-         return "%s%s%s%s%s" % (
-             indent_string,
-             key,
--            self._a_to_u("="),
-+            "=",
-             val,
-             cmnt,
-         )