systemd-248.3-2.parabola1: updating version

5 files changed, 24 insertions, 84 deletions

diff --git a/libre/systemd/0002-Disable-SYSTEMD_URLIFY-by-default.patch b/libre/systemd/0002-Disable-SYSTEMD_URLIFY-by-default.patch
deleted file mode 100644
index b2f04ee7a..000000000
--- a/libre/systemd/0002-Disable-SYSTEMD_URLIFY-by-default.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 29 Mar 2021 00:12:34 +0000
-Subject: [PATCH] Disable SYSTEMD_URLIFY by default
-
-Until https://github.com/gwsw/less/issues/140 is fixed.
----
- src/shared/pretty-print.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
-index 0f02f32760..1d0f9901dd 100644
---- a/src/shared/pretty-print.c
-+++ b/src/shared/pretty-print.c
-@@ -28,7 +28,7 @@ bool urlify_enabled(void) {
-                 if (val >= 0)
-                         cached_urlify_enabled = val;
-                 else
--                        cached_urlify_enabled = colors_enabled();
-+                        cached_urlify_enabled = 0;
-         }
- 
-         return cached_urlify_enabled;
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 45e824062..95c6a1d0a 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -11,10 +11,10 @@ pkgname+=('systemd-common' 'systemd-udev')
 # We split Arch's systemd-libs into systemd-$X, for the following $X:
 _systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
 pkgname+=("${_systemd_libs[@]/#/systemd-}")
-_tag='e13126bd95857eb9344e030edbb4c603aab63884' # git rev-parse v${_tag_name}
-_tag_name=248
+_tag='fd9ad7d3bc35a3633b99edac14ff2a4fb10599b7' # git rev-parse v${_tag_name}
+_tag_name=248.3
 pkgver="${_tag_name/-/}"
-pkgrel=5
+pkgrel=2
 pkgrel+=.parabola1
 arch=('x86_64')
 arch+=('i686' 'armv7h' 'ppc64le')
@@ -33,7 +33,6 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <
 source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
         "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"
         '0001-Use-Arch-Linux-device-access-groups.patch'
-        '0002-Disable-SYSTEMD_URLIFY-by-default.patch'
         '0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
@@ -63,7 +62,6 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
 sha512sums=('SKIP'
             'SKIP'
             '882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41'
-            '313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651'
             '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17'
@@ -72,9 +70,9 @@ sha512sums=('SKIP'
             '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'
             'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'
             'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            'd8ed2e26a6562ed7835a861a7a534842befec22475db0442cd26350ac54446bc9fec6b4c8429ed6d983cc600564446ab2827ea10cacef7e950220d01f0961214'
+            'f47638f4f0c154b7833a055b78b6dad14f17be43af0279f65d26e34926a80263bcec33eeda03debd72cdd2b9b0ef23d91f1a7e5ab2915936046c3231e97e3acb'
             '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5'
-            'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d'
+            '456cbd555bf173252647488c01f4111d9f6c0dc7dc67af6f1fb5a65089649a388b2a2c0364eb4ab626b4dcb02cc9d775bbd9f87b56434780a073f6753ff06d65'
             '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7'
             '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc'
             '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254'
@@ -116,9 +114,6 @@ prepare() {
   # Replace cdrom/dialout/tape groups with optical/uucp/storage
   patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch
 
-  # https://github.com/gwsw/less/issues/140
-  patch -Np1 -i ../0002-Disable-SYSTEMD_URLIFY-by-default.patch
-
   # https://bugs.archlinux.org/task/70264
   # https://github.com/systemd/systemd/issues/19191
   patch -Np1 -i ../0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch
diff --git a/libre/systemd/systemd-hook b/libre/systemd/systemd-hook
index 00252cf79..d40fad3b9 100644
--- a/libre/systemd/systemd-hook
+++ b/libre/systemd/systemd-hook
@@ -1,6 +1,14 @@
 #!/bin/sh -e
 
+is_chrooted() {
+  if systemd-detect-virt --chroot; then
+    echo >&2 "  Skipped: Running in chroot."
+    exit 0
+  fi
+}
+
 systemd_live() {
+  is_chrooted
   if [ ! -d /run/systemd/system ]; then
     echo >&2 "  Skipped: Current root is not booted."
     exit 0
diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install
index 417110181..bbc7efd83 100644
--- a/libre/systemd/systemd.install
+++ b/libre/systemd/systemd.install
@@ -15,44 +15,6 @@ post_common() {
   journalctl --update-catalog
 }
 
-_216_2_changes() {
-  echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
-  echo '   tuned in /etc/systemd/coredump.conf.'
-}
-
-_219_2_changes() {
-  if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
-    chgrp systemd-journal-remote var/log/journal/remote
-  fi
-}
-
-_219_4_changes() {
-  if ! systemctl is-enabled -q remote-fs.target; then
-    systemctl enable -q remote-fs.target
-  fi
-}
-
-_230_1_changes() {
-  echo ':: systemd-bootchart is no longer included with systemd'
-}
-
-_232_8_changes() {
-  # paper over possible effects of CVE-2016-10156
-  local stamps=(/var/lib/systemd/timers/*.timer)
-
-  if [[ -f ${stamps[0]} ]]; then
-    chmod 0644 "${stamps[@]}"
-  fi
-}
-
-_233_75_3_changes() {
-  # upstream installs services to /etc, which we remove
-  # to keep bus activation we re-enable systemd-resolved
-  if systemctl is-enabled -q systemd-resolved.service; then
-    systemctl reenable systemd-resolved.service 2>/dev/null
-  fi
-}
-
 _242_0_2_changes() {
   if [[ -L var/lib/systemd/timesync ]]; then
     rm var/lib/systemd/timesync
@@ -70,7 +32,9 @@ post_install() {
   add_journal_acls
 
   # enable some services by default, but don't track them
-  systemctl enable getty@tty1.service remote-fs.target
+  systemctl enable \
+    getty@tty1.service \
+    remote-fs.target
 
   echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"
   echo "   bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"
@@ -83,19 +47,7 @@ post_install() {
 post_upgrade() {
   post_common "$@"
 
-  # don't reexec if the old version is 231-1 or 231-2.
-  # https://github.com/systemd/systemd/commit/bd64d82c1c
-  if [[ $1 != 231-[12] ]] && sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-
   local v upgrades=(
-    216-2
-    219-2
-    219-4
-    230-1
-    232-8
-    233.75-3
     242.0-2
   )
 
diff --git a/libre/systemd/udev-hook b/libre/systemd/udev-hook
index 61d853293..659463af7 100644
--- a/libre/systemd/udev-hook
+++ b/libre/systemd/udev-hook
@@ -1,6 +1,14 @@
 #!/bin/sh -e
 
+is_chrooted() {
+  if systemd-detect-virt --chroot; then
+    echo >&2 "  Skipped: Running in chroot."
+    exit 0
+  fi
+}
+
 udevd_live() {
+  is_chrooted
   if [ ! -d /run/udev ]; then
     echo >&2 "  Skipped: Device manager is not running."
     exit 0