core/systemd to 255.6-2

core/systemd/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = systemd
 	pkgver = 255.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
 	license = LGPL-2.1-or-later

core/systemd/PKGBUILD

@@ -14,15 +14,11 @@ pkgname=('systemd'
          'systemd-sysvcompat'
          'systemd-ukify')
 _tag='255.6'
-# Upstream versioning is incompatible with pacman's version comparisons so we
-# replace tildes with the empty string to make sure pacman's version comparing
-# does the right thing for rc versions:
-# ➜ vercmp 255~rc1 255
-# 1
-# ➜ vercmp 255rc1 255
-# -1
-pkgver="${_tag/~/}"
-pkgrel=1.1
+# Upstream versioning is incompatible with pacman's version comparisons, one
+# way or another. So we replace dashes and tildes with the empty string to
+# make sure pacman's version comparing does the right thing for rc versions:
+pkgver="${_tag/[-~]/}"
+pkgrel=2
 arch=('x86_64')
 license=('LGPL-2.1-or-later')
 url='https://www.github.com/systemd/systemd'
@@ -99,6 +95,8 @@ if ((_systemd_UPSTREAM)); then
 fi
 
 _backports=(
+  # 99-systemd.rules: rework SYSTEMD_READY logic for device mapper
+  'c072860593329293e19580b337504adb52248462'
 )
 
 _reverts=(
@@ -147,9 +145,7 @@ build() {
 
   local _meson_options=(
     -Dversion-tag="${_meson_version}-arch"
-    # We use the version without tildes as the shared library tag because
-    # pacman looks at the shared library version.
-    -Dshared-lib-tag="${_meson_version/~/}"
+    -Dshared-lib-tag="${_meson_version}"
     -Dmode="${_meson_mode}"
 
     -Dapparmor=false