Merge ~mirespace/ubuntu/+source/azure-proxy-agent:circle-dependency-jammy-2125930 into ubuntu/+source/azure-proxy-agent:ubuntu/jammy-devel

[Miriam España Acebal]

Hi again,

same as in newer LTSs:

- Package is built at [1] .
- Test for pre-SRU cases and check the specific bug are in the bug, comment #3 [2] and #4 [3]
- autopkgtets pased:

   - azure-proxy-agent: jammy/azure-proxy-agent/1.0.30-0ubuntu6~22.04.1+ppa4 [amd64]
    + ✅ azure-proxy-agent on jammy for amd64 @ 01.10.25 13:52:08
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-mirespace-azure-proxy-agent/jammy/amd64/a/azure-proxy-agent/20251001_135208_92683@/log.gz
  - azure-proxy-agent: jammy/azure-proxy-agent/1.0.30-0ubuntu6~22.04.1+ppa4 [arm64]
    + ✅ azure-proxy-agent on jammy for arm64 @ 01.10.25 13:52:20
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-mirespace-azure-proxy-agent/jammy/arm64/a/azure-proxy-agent/20251001_135220_f15c6@/log.gz

Thanks!

[1] https://launchpad.net/~mirespace/+archive/ubuntu/azure-proxy-agent/+sourcepub/17616180/+listing-archive-extra
[2] https://bugs.launchpad.net/ubuntu/+source/azure-proxy-agent/+bug/2125930/comments/3
[3] https://bugs.launchpad.net/ubuntu/+source/azure-proxy-agent/+bug/2125930/comments/4

[Nick Rosbrook (enr0n)]

LGTM and sponsored.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index e97ff03..7e60fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+azure-proxy-agent (1.0.30-0ubuntu6~22.04.1) jammy; urgency=medium
+
+  [ Daniel Draper ]
+  * d/p/fix-systemd-deps-cycle.patch: ensure the service is terminated on
+    system shutdown (LP: #2125930)
+
+ -- Miriam España Acebal <[e-mail]>  Tue, 30 Sep 2025 16:55:01 +0200
+
 azure-proxy-agent (1.0.30-0ubuntu4~22.04.3) jammy; urgency=medium
 
   * d/p/fix-systemd-deps-cycle.patch: fix dependency cycle in the unit file.
diff --git a/debian/patches/fix-systemd-deps-cycle.patch b/debian/patches/fix-systemd-deps-cycle.patch
index 0f6c2d0..a7eac73 100644
--- a/debian/patches/fix-systemd-deps-cycle.patch
+++ b/debian/patches/fix-systemd-deps-cycle.patch
@@ -13,14 +13,19 @@ Author: [e-mail]
 Origin: upstream, https://github.com/Azure/GuestProxyAgent/pull/272
 Bug: https://github.com/Azure/GuestProxyAgent/issues/271
 Forwarded: https://github.com/Azure/GuestProxyAgent/pull/272
-Last-Update: 2025-09-08
+Last-Update: 2025-09-18
 --- a/proxy_agent_setup/src/linux/azure-proxy-agent.service
 +++ b/proxy_agent_setup/src/linux/azure-proxy-agent.service
-@@ -1,6 +1,7 @@
+@@ -1,9 +1,11 @@
  [Unit]
  Description=Microsoft Azure GuestProxyAgent
  Documentation=man:azure-proxy-agent(8)
 +DefaultDependencies=no
  After=local-fs.target
  Before=network-pre.target
- Wants=network-pre.target
+-Wants=network-pre.target
++Before=shutdown.target
++Conflicts=shutdown.target
+ 
+ [Service]
+ Type=simple