Merge pull request #11 from sorenisanerd/main

Rebase systemd patch (now at 259)

Author: sorenisanerd

mkosi.profiles/build-systemd/systemd.build.chroot

@@ -3,8 +3,8 @@
 set -e
 
 cd ${BUILDDIR}
-dpkg-source -x ${SRCDIR}/pkg/systemd/systemd_258.1-2ubuntu1.dsc
-cd systemd-258.1
+dpkg-source -x ${SRCDIR}/pkg/systemd/systemd_259-1ubuntu2.dsc
+cd systemd-259
 patch -p1 < ${SRCDIR}/mkosi.profiles/build-systemd/sysupdated.patch
 dpkg-buildpackage -us -uc -b
 cd ..

mkosi.profiles/build-systemd/systemd.sync

@@ -2,6 +2,6 @@
 pkg=${SRCDIR}/pkg/systemd
 mkdir -p "$pkg"
 cd "$pkg"
-for url in https://archive.ubuntu.com/ubuntu/pool/main/s/systemd/systemd_258.1{-2ubuntu1{.dsc,.debian.tar.xz},.orig.tar.gz}; do
+for url in https://archive.ubuntu.com/ubuntu/pool/main/s/systemd/systemd_259{-1ubuntu2{.dsc,.debian.tar.xz},.orig.tar.gz}; do
     test -f "$(basename "$url")" || wget -O "$(basename "$url")" "$url"
 done

mkosi.profiles/build-systemd/sysupdated.patch

@@ -1,20 +1,20 @@
-diff -urNw systemd-258.1.orig/debian/changelog systemd-258.1/debian/changelog
---- systemd-258.1.orig/debian/changelog	2025-11-04 01:35:17.000000000 -0800
-+++ systemd-258.1/debian/changelog	2025-11-06 11:50:55.192685337 -0800
+diff -urN systemd-259.orig/debian/changelog systemd-259/debian/changelog
+--- systemd-259.orig/debian/changelog	2026-01-06 13:22:23.318713797 -0800
++++ systemd-259/debian/changelog	2026-01-06 13:26:41.580185774 -0800
 @@ -1,3 +1,9 @@
-+systemd (258.1-2ubuntu1mangos1) unstable; urgency=medium
++systemd (259-1ubuntu2mangos1) unstable; urgency=medium
 +
 +  * Enable systemd-updated and updatectl.
 +
-+ -- Soren Hansen <[email protected]>  Thu, 06 Nov 2025 11:29:05 -0800
++ -- Soren Hansen <[email protected]>  Tue, 06 Jan 2026 13:26:20 -0800
 +
- systemd (258.1-2ubuntu1) resolute; urgency=medium
+ systemd (259-1ubuntu2) resolute; urgency=medium
 
-   * Merge with Debian unstable (LP: #2130132). Remaining changes:
-diff -urNw systemd-258.1.orig/debian/control systemd-258.1/debian/control
---- systemd-258.1.orig/debian/control	2025-11-03 06:02:38.000000000 -0800
-+++ systemd-258.1/debian/control	2025-11-06 11:54:17.089591773 -0800
-@@ -552,9 +552,9 @@
+   * d/control: have systemd-boot depend on efibootmgr for amd64 and arm64 only
+diff -urN systemd-259.orig/debian/control systemd-259/debian/control
+--- systemd-259.orig/debian/control	2026-01-06 13:22:23.318879464 -0800
++++ systemd-259/debian/control	2026-01-06 13:25:54.687470456 -0800
+@@ -551,9 +551,9 @@
  Recommends: ${dlopen:Recommends},
  Suggests: ${dlopen:Suggests},
  Breaks: systemd-boot (<< 257.4-2~),
@@ -26,10 +26,10 @@ diff -urNw systemd-258.1.orig/debian/control systemd-258.1/debian/control
  Description: simple UEFI boot manager - tools
   systemd-boot (short: sd-boot) is a simple UEFI boot manager. It provides a
   textual menu to select the entry to boot and an editor for the kernel command
-diff -urNw systemd-258.1.orig/debian/rules systemd-258.1/debian/rules
---- systemd-258.1.orig/debian/rules	2025-11-04 01:26:51.000000000 -0800
-+++ systemd-258.1/debian/rules	2025-11-06 11:50:55.193600945 -0800
-@@ -149,7 +149,8 @@
+diff -urN systemd-259.orig/debian/rules systemd-259/debian/rules
+--- systemd-259.orig/debian/rules	2026-01-06 13:22:23.320149861 -0800
++++ systemd-259/debian/rules	2026-01-06 13:25:54.687549537 -0800
+@@ -147,7 +147,8 @@
  	-Dpcre2=enabled \
  	-Dukify=enabled \
  	-Dbootloader=$(if $(filter amd64 i386 arm64 armhf loong64 riscv64,$(DEB_HOST_ARCH)),enabled,disabled) \
@@ -39,7 +39,7 @@ diff -urNw systemd-258.1.orig/debian/rules systemd-258.1/debian/rules
  else
  CONFFLAGS += \
  	-Daudit=disabled \
-@@ -175,7 +176,8 @@
+@@ -173,7 +174,8 @@
  	-Dukify=disabled \
  	-Dbootloader=disabled \
  	-Dbpf-framework=disabled \
@@ -49,9 +49,9 @@ diff -urNw systemd-258.1.orig/debian/rules systemd-258.1/debian/rules
  endif
 
  # BPF/BTF are only enabled and usable on a few architectures
-diff -urNw systemd-258.1.orig/debian/systemd-container.install systemd-258.1/debian/systemd-container.install
---- systemd-258.1.orig/debian/systemd-container.install	2025-11-03 06:02:38.000000000 -0800
-+++ systemd-258.1/debian/systemd-container.install	2025-11-06 11:50:55.193688764 -0800
+diff -urN systemd-259.orig/debian/systemd-container.install systemd-259/debian/systemd-container.install
+--- systemd-259.orig/debian/systemd-container.install	2026-01-06 13:22:23.320395921 -0800
++++ systemd-259/debian/systemd-container.install	2026-01-06 13:25:54.687622075 -0800
 @@ -1,6 +1,6 @@
  #!/usr/bin/dh-exec
  usr/bin/importctl
@@ -68,7 +68,7 @@ diff -urNw systemd-258.1.orig/debian/systemd-container.install systemd-258.1/deb
 +usr/lib/systemd/system/dbus-org.freedesktop.sysupdate1.service
  usr/lib/systemd/user/machine.slice
  usr/lib/systemd/user/machines.target
- <pkg.systemd.upstream> usr/lib/systemd/user/dbus-org.freedesktop.import1.service
+ usr/lib/systemd/user/dbus-org.freedesktop.import1.service
 @@ -57,17 +57,17 @@
  usr/share/dbus-1/system.d/org.freedesktop.import1.conf
  usr/share/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -90,9 +90,9 @@ diff -urNw systemd-258.1.orig/debian/systemd-container.install systemd-258.1/deb
  usr/share/zsh/vendor-completions/_systemd-nspawn
  usr/share/zsh/vendor-completions/_sd_machines
  usr/share/zsh/vendor-completions/_machinectl
-diff -urNw systemd-258.1.orig/debian/systemd-container.manpages systemd-258.1/debian/systemd-container.manpages
---- systemd-258.1.orig/debian/systemd-container.manpages	2025-11-03 06:02:38.000000000 -0800
-+++ systemd-258.1/debian/systemd-container.manpages	2025-11-06 11:50:55.196428755 -0800
+diff -urN systemd-259.orig/debian/systemd-container.manpages systemd-259/debian/systemd-container.manpages
+--- systemd-259.orig/debian/systemd-container.manpages	2026-01-06 13:22:23.320414186 -0800
++++ systemd-259/debian/systemd-container.manpages	2026-01-06 13:25:54.687673984 -0800
 @@ -1,11 +1,11 @@
  #!/usr/bin/dh-exec
  debian/tmp/usr/share/man/man1/importctl.1