summaryrefslogtreecommitdiff
path: root/core/systemd/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'core/systemd/PKGBUILD')
-rw-r--r--core/systemd/PKGBUILD30
1 files changed, 23 insertions, 7 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 82ac3b88f..b20882fd5 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=187
-pkgrel=4
+pkgver=188
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -17,13 +17,17 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-install-timestamp'
'0001-Reinstate-TIMEOUT-handling.patch'
'locale.sh'
+ 0001-shutdown-recursively-mark-root-as-private-before-piv.patch
+ 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
'use-split-usr-path.patch')
-md5sums=('26606e3c84448800ef0b3ffd57e6e8b6'
+md5sums=('d89b42699695554949d072ef46c0dfc9'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'59e91c4d7a69b7bf12c86a9982e37ced'
'df69615503ad293c9ddf9d8b7755282d'
'5543be25f205f853a21fa5ee68e03f0d'
'f15956945052bb911e5df81cf5e7e5dc'
+ '49d145ef3ca299025c085555314212b6'
+ 'bccb994f4cfbd251b6c34d7d90a6ba0f'
'482dba45a783f06c2239f1355f4ce72f')
build() {
@@ -31,7 +35,15 @@ build() {
# still waiting on ipw2x00 to get fixed...
patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
- patch -Np1 < "$srcdir/use-split-usr-path.patch"
+ patch -Np1 <"$srcdir/use-split-usr-path.patch"
+
+ # http://bugs.archlinux.org/task/31089
+ # upstream c516c8d17f77a1c761447f4c40c8dfffeda2e06d
+ patch -Np1 <"$srcdir/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch"
+
+ # http://bugs.archlinux.org/task/31092
+ # upstream 4bfa638d43c05e8db052cd55818765bb3575a405
+ patch -Np1 <"$srcdir/0001-shutdown-recursively-mark-root-as-private-before-piv.patch"
./configure \
--libexecdir=/usr/lib \
@@ -89,8 +101,11 @@ package_systemd() {
rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
- # fix systemd-analyze for python2. the 'plot' verb does not work
- # with py3k due to a bug in python-cairo
+ ### get rid of RPM macros
+ rm -r "$pkgdir/etc/rpm/macros.systemd"
+
+ # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
+ # https://pokersource.info/show_bug.cgi?id=50989
sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
### split off libsystemd (libs, includes, pkgconfig, man3)
@@ -140,7 +155,8 @@ package_systemd() {
mv "$pkgdir"/usr/share/gir-1.0 usr/share
mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
- mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
+ mv "$pkgdir"/usr/share/man/man8/{systemd-tmpfiles,udevadm}.8 usr/share/man/man8
+ mv "$pkgdir"/usr/share/man/man8/systemd-udevd{,.service,{-control,-kernel}.socket}.8 usr/share/man/man8
mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5