summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD17
2 files changed, 23 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0d6759f175b1..1505aa2ce9b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 247.1
- pkgrel = 1
+ pkgrel = 3
url = https://www.github.com/systemd/systemd
arch = x86_64
groups = selinux
@@ -128,7 +128,7 @@ pkgname = systemd-selinux
provides = nss-myhostname
provides = systemd-tools=247.1
provides = udev=247.1
- provides = systemd=247.1-1
+ provides = systemd=247.1-3
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -164,7 +164,7 @@ pkgname = systemd-libs-selinux
provides = libsystemd.so
provides = libudev.so
provides = libsystemd-selinux
- provides = systemd-libs=247.1-1
+ provides = systemd-libs=247.1-3
conflicts = libsystemd
conflicts = libsystemd-selinux
conflicts = systemd-libs
@@ -176,16 +176,16 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
- provides = systemd-resolvconf=247.1-1
+ provides = systemd-resolvconf=247.1-3
conflicts = openresolv
- conflicts = systemd-resolvconf=247.1-1
+ conflicts = systemd-resolvconf=247.1-3
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=247.1-1
- provides = selinux-systemd-sysvcompat=247.1-1
+ provides = systemd-sysvcompat=247.1-3
+ provides = selinux-systemd-sysvcompat=247.1-3
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index 1446afa89ca9..a53104c7614d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=systemd-selinux
pkgname=('systemd-selinux' 'systemd-libs-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
_tag='dcc360e35ecdeadfeaf8441628cfebb452acd59b' # git rev-parse v${pkgver}
pkgver=247.1
-pkgrel=1
+pkgrel=3
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
groups=('selinux')
@@ -77,6 +77,21 @@ sha512sums=('SKIP'
'825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97')
_backports=(
+ # set: introduce set_strjoin()
+ '4dbce717873000cff7b56f89266d1d2fe53f9284'
+ # sd-device: use set_strjoin()
+ '6f3ac0d51766b0b9101676cefe5c4ba81feba436'
+ # sd-device: keep escaped strings in DEVLINK= property
+ '31063db0b4842a452c6eadde5b969aaee2a0516a'
+ # test: add tests for device_new_from_nulstr()
+ 'e6f882871568e4a331ac473871ee8a884f6e48d6'
+
+ # network: do not set broadcast if prefixlen is 31 or 32
+ 'df8aa086420e6ce61e32898b2bb7c88b87fd1c43'
+ # network: fix verification for broadcast address
+ '05a7023d242b9012216c661f253df1c9c3d45b39'
+ # network: ignore broadcast address for /31 or /32 addresses
+ '2a236f9fc0ff8fb2152032551436fde74da7217a'
)
_reverts=(