Merge ~r41k0u/ubuntu/+source/needrestart:ubuntu/oracular-devel into ubuntu/+source/needrestart:ubuntu/oracular-devel

[Pragyansh Chaturvedi]

* Don't restart glusterd automatically (LP: #2085070)
  - d/p/lp2085070/0022-ubuntu-avoid-restart-glusterd.patch:
    Add regex to ignore glusterd for automatic restart
* Don't restart keepalived automatically (LP: #2089155)
  - d/p/lp2089155/0023-ubuntu-avoid-restart-keepalived.patch:
    Add regex to ignore keepalived and for automatic restart

5766711... by Pragyansh Chaturvedi on 2024-12-04

* Don't restart keepalived automatically (LP: #2089155)
   - d/p/lp2089155/0023-ubuntu-avoid-restart-keepalived.patch:
     Add regex to ignore keepalived for automatic restart
   - d/p/series: Add new patch to patch series

8b4e50f... by Pragyansh Chaturvedi on 2024-12-04

changelog

[Simon Quigley (tsimonq2)]

Hey! It looks like there has been a security update since you created this patch, could you please rebase it?

Thanks in advance!

review: Needs Fixing

[Pragyansh Chaturvedi (r41k0u)]

Done!

Unmerged commits

8b4e50f... by Pragyansh Chaturvedi on 2024-12-04

changelog

5766711... by Pragyansh Chaturvedi on 2024-12-04

* Don't restart keepalived automatically (LP: #2089155)
   - d/p/lp2089155/0023-ubuntu-avoid-restart-keepalived.patch:
     Add regex to ignore keepalived for automatic restart
   - d/p/series: Add new patch to patch series

527b6c0... by Pragyansh Chaturvedi on 2024-11-20

* Don't restart glusterd automatically (LP: #2085070)
  - d/p/lp2085070/0022-ubuntu-avoid-restart-glusterd.patch:
    Add regex to ignore glusterd for automatic restart
  - d/p/series: Add new patch to patch series

diff --git a/debian/changelog b/debian/changelog
index 010ada7..917be7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+needrestart (3.6-8ubuntu4.5) oracular; urgency=medium
+
+  * Don't restart glusterd automatically (LP: #2085070)
+    - d/p/lp2085070/0022-ubuntu-avoid-restart-glusterd.patch:
+      Add regex to ignore glusterd for automatic restart
+  * Don't restart keepalived automatically (LP: #2089155)
+    - d/p/lp2089155/0023-ubuntu-avoid-restart-keepalived.patch:
+      Add regex to ignore keepalived and for automatic restart
+
+ -- Pragyansh Chaturvedi <[e-mail]>  Tue, 10 Dec 2024 13:26:15 +0530
+
 needrestart (3.6-8ubuntu4.4) oracular-security; urgency=medium
 
   * SECURITY REGRESSION: false positives for killing processes in LXC
diff --git a/debian/patches/lp2085070/0022-ubuntu-avoid-restart-glusterd.patch b/debian/patches/lp2085070/0022-ubuntu-avoid-restart-glusterd.patch
new file mode 100644
index 0000000..1acbe16
--- /dev/null
+++ b/debian/patches/lp2085070/0022-ubuntu-avoid-restart-glusterd.patch
@@ -0,0 +1,21 @@
+Description: Don't restart glusterd automatically
+ Add regex to prevent glusterd from restarting
+ automatically. Glusterd should not automatically restart after
+ an update. Other services can depend on it and because of that
+ also get an unwanted / unplanned restart. It should be deferred.
+Author: Pragyansh Chaturvedi <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/needrestart/+bug/2085070
+Last-Update: 2024-11-20
+---
+
+--- a/ex/needrestart.conf	2024-12-04 14:22:18.370320503 +0530
++++ b/ex/needrestart.conf	2024-12-04 14:22:24.755325093 +0530
+@@ -122,6 +122,8 @@
+     qr(^google-(shutdown|startup)-scripts\.service$) => 0,
+     # LP: #2067800
+     qr(^runner-provisionner\.service$) => 0,
++    # LP: #2085070
++    qr(^glusterd\.service$) => 0,
+ 
+     # systemd stuff
+     # (see also Debian Bug#784238 & #784437)
diff --git a/debian/patches/lp2089155/0023-ubuntu-avoid-restart-keepalived.patch b/debian/patches/lp2089155/0023-ubuntu-avoid-restart-keepalived.patch
new file mode 100644
index 0000000..66f90fe
--- /dev/null
+++ b/debian/patches/lp2089155/0023-ubuntu-avoid-restart-keepalived.patch
@@ -0,0 +1,21 @@
+Description: Don't restart keepalived automatically
+ Add regex to prevent keepalived from restarting automatically.
+ keepalived should not automatically restart after an update.
+ Other services can depend on it and it's state and might get
+ disrupted due to an unwanted / unplanned restart. It should be
+ deferred.
+Author: Pragyansh Chaturvedi <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/needrestart/+bug/2089155
+Last-Update: 2024-12-04
+---
+--- a/ex/needrestart.conf	2024-12-04 15:12:35.573261273 +0530
++++ b/ex/needrestart.conf	2024-12-04 15:13:21.364036394 +0530
+@@ -124,6 +124,8 @@
+     qr(^runner-provisionner\.service$) => 0,
+     # LP: #2085070
+     qr(^glusterd\.service$) => 0,
++    # LP: #2089155
++    qr(^keepalived\.service$) => 0,
+ 
+     # systemd stuff
+     # (see also Debian Bug#784238 & #784437)
diff --git a/debian/patches/series b/debian/patches/series
index a693b54..bd90632 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,5 @@ CVE-2024-48990.patch
 CVE-2024-48991.patch
 lp2089193/0020-fix-chroot-mountns-fp.patch
 lp2091096/0021-fix-lxc-fp.patch
+lp2085070/0022-ubuntu-avoid-restart-glusterd.patch
+lp2089155/0023-ubuntu-avoid-restart-keepalived.patch