summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2018-11-11 21:59:23 +0100
committerNicolas Iooss2018-11-12 00:40:20 +0100
commit81cb456cec1cb26fa395733ef73f0cb84b4857da (patch)
tree41c967a5dcc831ea4fd55445f2db61b5147ff5c9
parent647cad76876fee813367347ebdc93b304fd9cb86 (diff)
downloadaur-81cb456cec1cb26fa395733ef73f0cb84b4857da.tar.gz
systemd-selinux 239.300-1 update
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD19
2 files changed, 18 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7be113722e99..4406c9d5aa5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = systemd-selinux
- pkgver = 239.2
+ pkgver = 239.300
pkgrel = 1
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=239.2
- provides = udev=239.2
- provides = systemd=239.2-1
+ provides = systemd-tools=239.300
+ provides = udev=239.300
+ provides = systemd=239.300-1
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=239.2-1
+ provides = libsystemd=239.300-1
conflicts = libsystemd
pkgname = systemd-resolvconf-selinux
@@ -150,16 +150,16 @@ pkgname = systemd-resolvconf-selinux
depends = systemd-selinux
provides = openresolv
provides = resolvconf
- provides = systemd-resolvconf=239.2-1
+ provides = systemd-resolvconf=239.300-1
conflicts = openresolv
- conflicts = systemd-resolvconf=239.2-1
+ conflicts = systemd-resolvconf=239.300-1
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=239.2-1
- provides = selinux-systemd-sysvcompat=239.2-1
+ provides = systemd-sysvcompat=239.300-1
+ provides = selinux-systemd-sysvcompat=239.300-1
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index a247016a8d6b..b94b29ed6153 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='c38499d476026d999558a7eee9c95ca2fa41e115'
-pkgver=239.2
+_commit='25d1ba1173e4cce9dab8a2c2164ce60f63fc68a5'
+pkgver=239.300
pkgrel=1
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
@@ -78,14 +78,13 @@ sha512sums=('SKIP'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
_backports=(
- # nss: do not modify errno when NSS_STATUS_NOTFOUND or NSS_STATUS_SUCCESS
- # https://github.com/systemd/systemd/pull/9587
- # https://github.com/systemd/systemd/issues/9585
- # https://sourceware.org/bugzilla/show_bug.cgi?id=23410
- 06202b9e659e5cc72aeecc5200155b7c012fccbc
- # statx fixes
- '75720bff62a84896e9a0654afc7cf9408cf89a38'
- '9c869d08d82c73f62ab3527567858ce4b0cf1257'
+ # Building with lz4-1.8.3 fails:
+ # https://github.com/systemd/systemd/issues/10259
+ # https://github.com/systemd/systemd/pull/10563
+ 'e0a1d4b049e6991919a0eacd5d96f7f39dc6ddd1'
+ 'ba17efce44e6a1e139c1671205e9a6ed3824af1b'
+ 'e41ef6fd0027d3619dc1cf062100b2d224d0ee7e'
+ '029427043b2e0523a21f54374f872b23cf744350'
)
_reverts=(