systemd-selinux 248.2-2 update

4 files changed, 17 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8086803b6498..e1cea7cd95c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemd-selinux
-	pkgver = 248
-	pkgrel = 5
+	pkgver = 248.2
+	pkgrel = 2
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	groups = selinux
@@ -42,10 +42,9 @@ pkgbase = systemd-selinux
 	makedepends = rsync
 	makedepends = libselinux
 	options = strip
-	source = git+https://github.com/systemd/systemd-stable#tag=e13126bd95857eb9344e030edbb4c603aab63884?signed
+	source = git+https://github.com/systemd/systemd-stable#tag=bc3ad898fc7b74e818c80fdb7b14a3b9c6d91475?signed
 	source = git+https://github.com/systemd/systemd#tag=v248?signed
 	source = 0001-Use-Arch-Linux-device-access-groups.patch
-	source = 0002-Disable-SYSTEMD_URLIFY-by-default.patch
 	source = 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch
 	source = initcpio-hook-udev
 	source = initcpio-install-systemd
@@ -69,7 +68,6 @@ pkgbase = systemd-selinux
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = 882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41
-	sha512sums = 313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651
 	sha512sums = 34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad
 	sha512sums = f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73
 	sha512sums = f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17
@@ -135,9 +133,9 @@ pkgname = systemd-selinux
 	optdepends = libfido2: unlocking LUKS2 volumes with FIDO2 token
 	optdepends = tpm2-tss: unlocking LUKS2 volumes with TPM2
 	provides = nss-myhostname
-	provides = systemd-tools=248
-	provides = udev=248
-	provides = systemd=248-5
+	provides = systemd-tools=248.2
+	provides = udev=248.2
+	provides = systemd=248.2-2
 	conflicts = nss-myhostname
 	conflicts = systemd-tools
 	conflicts = udev
@@ -175,7 +173,7 @@ pkgname = systemd-libs-selinux
 	provides = libsystemd.so
 	provides = libudev.so
 	provides = libsystemd-selinux
-	provides = systemd-libs=248-5
+	provides = systemd-libs=248.2-2
 	conflicts = libsystemd
 	conflicts = libsystemd-selinux
 	conflicts = systemd-libs
@@ -187,16 +185,16 @@ pkgname = systemd-resolvconf-selinux
 	depends = systemd-selinux
 	provides = openresolv
 	provides = resolvconf
-	provides = systemd-resolvconf=248-5
+	provides = systemd-resolvconf=248.2-2
 	conflicts = openresolv
-	conflicts = systemd-resolvconf=248-5
+	conflicts = systemd-resolvconf=248.2-2
 
 pkgname = systemd-sysvcompat-selinux
 	pkgdesc = sysvinit compat for systemd with SELinux support
 	license = GPL2
 	depends = systemd-selinux
-	provides = systemd-sysvcompat=248-5
-	provides = selinux-systemd-sysvcompat=248-5
+	provides = systemd-sysvcompat=248.2-2
+	provides = selinux-systemd-sysvcompat=248.2-2
 	conflicts = sysvinit
 	conflicts = systemd-sysvcompat
 	conflicts = selinux-systemd-sysvcompat
diff --git a/0002-Disable-SYSTEMD_URLIFY-by-default.patch b/0002-Disable-SYSTEMD_URLIFY-by-default.patch
deleted file mode 100644
index b2f04ee7a6a2..000000000000
--- a/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/PKGBUILD b/PKGBUILD
index b9cb5a77ef51..6de0bd347410 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,10 +10,10 @@
 
 pkgbase=systemd-selinux
 pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
-_tag='e13126bd95857eb9344e030edbb4c603aab63884' # git rev-parse v${_tag_name}
-_tag_name=248
+_tag='bc3ad898fc7b74e818c80fdb7b14a3b9c6d91475' # git rev-parse v${_tag_name}
+_tag_name=248.2
 pkgver="${_tag_name/-/}"
-pkgrel=5
+pkgrel=2
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
 groups=('selinux')
@@ -29,7 +29,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'
@@ -51,7 +50,6 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
 sha512sums=('SKIP'
             'SKIP'
             '882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41'
-            '313f3d6cc3d88f718509007e029213a82d84b196afdadc6ef560580acf70ab480aaecd7622f51726cc1af7d7841c6ec5390f72890b055a54fc74722341395651'
             '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad'
             'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
             'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17'
@@ -96,9 +94,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/systemd.install b/systemd.install
index 417110181c5d..bbc7efd83606 100644
--- a/systemd.install
+++ b/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
   )