summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2019-01-16 21:21:58 +0100
committerNicolas Iooss2019-01-16 21:21:58 +0100
commit1de8487badd15ce2e65db34ce465df2865063656 (patch)
tree8bb8c0ba78a2585ed9560fd5c4d9af862c26a666
parenta6c7b1b02d2e74de204e248763210bbfda1c2e40 (diff)
downloadaur-1de8487badd15ce2e65db34ce465df2865063656.tar.gz
systemd-selinux 240.34-3 update
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD22
2 files changed, 13 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7b24a866c8b3..136d7342a28d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = systemd-selinux
- pkgver = 240.0
+ pkgver = 240.34
pkgrel = 3
url = https://www.github.com/systemd/systemd
arch = x86_64
@@ -110,9 +110,9 @@ pkgname = systemd-selinux
optdepends = polkit: allow administration as unprivileged user
optdepends = curl: machinectl pull-tar and pull-raw
provides = nss-myhostname
- provides = systemd-tools=240.0
- provides = udev=240.0
- provides = systemd=240.0-3
+ provides = systemd-tools=240.34
+ provides = udev=240.34
+ provides = systemd=240.34-3
conflicts = nss-myhostname
conflicts = systemd-tools
conflicts = udev
@@ -141,7 +141,7 @@ pkgname = libsystemd-selinux
depends = libselinux
provides = libsystemd.so
provides = libudev.so
- provides = libsystemd=240.0-3
+ provides = libsystemd=240.34-3
conflicts = libsystemd
pkgname = systemd-resolvconf-selinux
@@ -150,16 +150,16 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
- provides = systemd-resolvconf=240.0-3
+ provides = systemd-resolvconf=240.34-3
conflicts = openresolv
- conflicts = systemd-resolvconf=240.0-3
+ conflicts = systemd-resolvconf=240.34-3
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=240.0-3
- provides = selinux-systemd-sysvcompat=240.0-3
+ provides = systemd-sysvcompat=240.34-3
+ provides = selinux-systemd-sysvcompat=240.34-3
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index a02dc36c161d..7e9e442dbe96 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
pkgbase=systemd-selinux
pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-resolvconf-selinux' 'systemd-sysvcompat-selinux')
# Can be from either systemd or systemd-stable
-_commit='1742aae2aa8cd33897250d6fcfbe10928e43eb2f'
-pkgver=240.0
+_commit='f02b5472c6f0c41e5dc8dc2c84590866baf937ff'
+pkgver=240.34
pkgrel=3
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -78,25 +78,11 @@ sha512sums=('SKIP'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
_backports=(
- # https://github.com/systemd/systemd/issues/11277
- 'b261494128e60dd3168e0ea961606ec4f39c5739'
- 'ff86c92e3043f71fc801cf687600a480ee8f6778'
-
- # https://github.com/systemd/systemd/issues/11264
- '577ab71c58d36bc8577d15f172a306c9c05cd2f4'
-
- # https://github.com/systemd/systemd/issues/11251
- '7334ade4a7e103b1a01d1c8fe1ea7c7a854a1c31'
-
- # https://github.com/systemd/systemd/issues/11255
- 'adeb26c1affd09138bb96a9e25b795d146e64c97'
-
# https://github.com/systemd/systemd/issues/11259
'8ca9e92c742602b8bcd431001e6f5b78c28c184f'
- # https://github.com/systemd/systemd/issues/11293
- '00efd4988b8e4a147f96337de32e54925640f0b7'
- '69bd76f2b90cd00c1596b2e2c05845a4d9596fd2'
+ # https://github.com/systemd/systemd/issues/11314
+ 'ee0b9e721a368742ac6fa9c3d9a33e45dc3203a2'
)
_reverts=(