From ebae09e180b677a098840cec55f76bd8cf825301 Mon Sep 17 00:00:00 2001
From: James Falcon <james.falcon@canonical.com>
Date: Mon, 27 Mar 2023 10:37:00 -0500
Subject: Refresh patches against upstream/main -
 d/p/expire-on-hashed-users.patch - d/p/retain-netplan-world-readable.patch

---
 debian/patches/expire-on-hashed-users.patch        | 6 +++---
 debian/patches/retain-netplan-world-readable.patch | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/expire-on-hashed-users.patch b/debian/patches/expire-on-hashed-users.patch
index 6c414c63..c54eb7e1 100644
--- a/debian/patches/expire-on-hashed-users.patch
+++ b/debian/patches/expire-on-hashed-users.patch
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  in cc_set_passwords, hashed passwords will be expired. Previous to 22.3,
 --- a/tests/unittests/config/test_cc_set_passwords.py
 +++ b/tests/unittests/config/test_cc_set_passwords.py
-@@ -192,61 +192,6 @@ class TestSetPasswordsHandle:
+@@ -191,61 +191,6 @@ class TestSetPasswordsHandle:
      @pytest.mark.parametrize(
          "user_cfg",
          [
@@ -58,7 +58,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -        with mock.patch.object(
 -            cloud.distro, "uses_systemd", return_value=False
 -        ):
--            setpass.handle("IGNORED", cfg=cfg, cloud=cloud, log=LOG, args=[])
+-            setpass.handle("IGNORED", cfg=cfg, cloud=cloud, args=[])
 -        assert [
 -            mock.call(
 -                ["pw", "usermod", "ubuntu", "-h", "0"],
@@ -80,7 +80,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              {"expire": "false", "list": ["root:R", "ubuntu:RANDOM"]},
              {
                  "expire": "false",
-@@ -506,6 +451,7 @@ expire_cases = [
+@@ -505,6 +450,7 @@ expire_cases = [
  class TestExpire:
      @pytest.mark.parametrize("cfg", expire_cases)
      def test_expire(self, cfg, mocker, caplog):
diff --git a/debian/patches/retain-netplan-world-readable.patch b/debian/patches/retain-netplan-world-readable.patch
index 2e206a41..82944aa6 100644
--- a/debian/patches/retain-netplan-world-readable.patch
+++ b/debian/patches/retain-netplan-world-readable.patch
@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  be written as a single root readon-only file /etc/netplan/50-cloud-init.yaml.
 --- a/tests/unittests/distros/test_netconfig.py
 +++ b/tests/unittests/distros/test_netconfig.py
-@@ -592,32 +592,41 @@ class TestNetCfgDistroUbuntuNetplan(Test
+@@ -608,32 +608,41 @@ class TestNetCfgDistroUbuntuNetplan(Test
              (self.netplan_path(), V1_TO_V2_NET_CFG_OUTPUT, 0o600),
          )
  
@@ -77,7 +77,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
      def test_apply_network_config_v2_passthrough_retain_orig_perms(self):
          """Custom permissions on existing netplan is kept when more strict."""
-@@ -657,11 +666,14 @@ class TestNetCfgDistroUbuntuNetplan(Test
+@@ -673,11 +682,14 @@ class TestNetCfgDistroUbuntuNetplan(Test
          expected_cfgs = (
              (self.netplan_path(), V2_PASSTHROUGH_NET_CFG_OUTPUT, 0o600),
          )
@@ -97,7 +97,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          self.assertIn("Passthrough netplan v2 config", self.logs.getvalue())
          self.assertIn(
              "Selected renderer 'netplan' from priority list: ['netplan']",
-@@ -1056,12 +1068,16 @@ class TestNetCfgDistroArch(TestNetCfgDis
+@@ -1072,12 +1084,16 @@ class TestNetCfgDistroArch(TestNetCfgDis
          with mock.patch(
              "cloudinit.net.netplan.get_devicelist", return_value=[]
          ):
-- 
cgit v1.2.1