summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2018-11-17 14:36:36 +0100
committerNicolas Iooss2018-11-17 14:36:36 +0100
commitd90d7d647ef6be2c43ff1d69d837c69c99e95b37 (patch)
treeec35cb17eee75b428a9cfe54872226a9fe4277c4
parent81cb456cec1cb26fa395733ef73f0cb84b4857da (diff)
downloadaur-d90d7d647ef6be2c43ff1d69d837c69c99e95b37.tar.gz
systemd-selinux 239.300-2 update
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD13
2 files changed, 13 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4406c9d5aa5a..e2681c8e9d1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = systemd-selinux
pkgver = 239.300
- pkgrel = 1
+ pkgrel = 2
url = https://www.github.com/systemd/systemd
arch = x86_64
groups = selinux
@@ -112,7 +112,7 @@ pkgname = systemd-selinux
provides = nss-myhostname
provides = systemd-tools=239.300
provides = udev=239.300
- provides = systemd=239.300-1
+ provides = systemd=239.300-2
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.300-1
+ provides = libsystemd=239.300-2
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.300-1
+ provides = systemd-resolvconf=239.300-2
conflicts = openresolv
- conflicts = systemd-resolvconf=239.300-1
+ conflicts = systemd-resolvconf=239.300-2
pkgname = systemd-sysvcompat-selinux
pkgdesc = sysvinit compat for systemd with SELinux support
license = GPL2
depends = systemd-selinux
- provides = systemd-sysvcompat=239.300-1
- provides = selinux-systemd-sysvcompat=239.300-1
+ provides = systemd-sysvcompat=239.300-2
+ provides = selinux-systemd-sysvcompat=239.300-2
conflicts = sysvinit
conflicts = systemd-sysvcompat
conflicts = selinux-systemd-sysvcompat
diff --git a/PKGBUILD b/PKGBUILD
index b94b29ed6153..62a3787e3160 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('systemd-selinux' 'libsystemd-selinux' 'systemd-resolvconf-selinux' 'sy
# Can be from either systemd or systemd-stable
_commit='25d1ba1173e4cce9dab8a2c2164ce60f63fc68a5'
pkgver=239.300
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='https://www.github.com/systemd/systemd'
groups=('selinux')
@@ -78,16 +78,15 @@ sha512sums=('SKIP'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67')
_backports=(
- # Building with lz4-1.8.3 fails:
- # https://github.com/systemd/systemd/issues/10259
- # https://github.com/systemd/systemd/pull/10563
- 'e0a1d4b049e6991919a0eacd5d96f7f39dc6ddd1'
- 'ba17efce44e6a1e139c1671205e9a6ed3824af1b'
+ # journal: adapt for new improved LZ4_decompress_safe_partial()
'e41ef6fd0027d3619dc1cf062100b2d224d0ee7e'
- '029427043b2e0523a21f54374f872b23cf744350'
)
_reverts=(
+ # shared/sleep-config: add switches to kill specific sleep modes
+ '6ebddf92527b5de840f021b8672b2977c2a58af5'
+ # shared/sleep-config: forbid hibernation if resume= is not configured
+ '6789dca0a26df0c44ff8020f0a4206bf21e52a7a'
)
prepare() {