core/systemd to 230-3

core/systemd/PKGBUILD

@@ -7,7 +7,7 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=229
+pkgver=230
 pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -22,29 +22,34 @@ source=("git://github.com/systemd/systemd.git#tag=v$pkgver"
         'initcpio-install-udev'
         'arch.conf'
         'loader.conf'
-        'splash-arch.bmp')
+        'splash-arch.bmp'
+        'udev-hwdb.hook')
 md5sums=('SKIP'
          '90ea67a7bb237502094914622a39e281'
-         '976c5511b6493715e381f43f16cdb151'
+         'cfb3f8ea657ab24535cc061bb38ec4c1'
          '1b3aa3a0551b08af9305d33f85b5c2fc'
          '20ead378f5d6df4b2a3e670301510a7d'
          'ddaef54f68f6c86c6c07835fc668f62a'
-         '1e2f9a8b0fa32022bf0a8f39123e5f4e')
+         '1e2f9a8b0fa32022bf0a8f39123e5f4e'
+         'a475a5ed8f03fb0f6b58b4684998d05c')
+
+_backports=(
+  # Revert "rules: allow users to access frame buffer devices" (#3333)
+  e77813ca9f4e0735fd0e3e2caae4d7d1ee436011
+
+  # {machine,system}ctl: always pass &changes and &n_changes (#3350)
+  acc0269cad31d1aaef2034a055b34c07c88a353d
+
+  # systemctl: fix return values on success
+  5f056378b0ceffb6e6fba3513f7eae72e2d09dc8
+)
 
 prepare() {
   cd "$pkgbase"
 
-  # networkd: FIONREAD is not reliable on some sockets
+  if (( ${#_backports[*]} > 0 )); then
-  git cherry-pick -n 4edc2c9b6b5b921873eb82e58719ed4d9e0d69bf
+    git cherry-pick -n "${_backports[@]}"
-
+  fi
-  # fix assertion failure in src/core/timer.c on bootup (FS#48197)
-  git cherry-pick -n 3f51aec8647fe13f4b1e46b2f75ff635403adf91
-
-  # fix udevd error checking from cg_unified() (FS#48188)
-  git cherry-pick -n 6d2353394fc33e923d1ab464c8f88df2a5105ffb
-
-  # revert "core: resolve specifier in config_parse_exec()"
-  git cherry-pick -n bd1b973fb326e9b7587494fd6108e5ded46e9163
 
   ./autogen.sh
 }
@@ -58,16 +63,23 @@ build() {
   CFLAGS+=" -fno-lto"
   CXXFLAGS+=" -fno-lto"
 
-  ./configure \
+  local configure_options=(
-      --libexecdir=/usr/lib \
+    --libexecdir=/usr/lib
-      --localstatedir=/var \
+    --localstatedir=/var
-      --sysconfdir=/etc \
+    --sysconfdir=/etc
-      --enable-lz4 \
+
-      --disable-audit \
+    --enable-lz4
-      --disable-ima \
+    --disable-audit
-      --with-sysvinit-path= \
+    --disable-ima
-      --with-sysvrcnd-path= \
+
-      --with-ntp-servers="${timeservers[*]}"
+    --with-sysvinit-path=
+    --with-sysvrcnd-path=
+    --with-ntp-servers="${timeservers[*]}"
+    --with-default-dnssec=no
+    --without-kill-user-processes
+  )
+
+  ./configure "${configure_options[@]}"
 
   make
 }
@@ -75,7 +87,7 @@ build() {
 package_systemd() {
   pkgdesc="system and service manager"
   license=('GPL2' 'LGPL2.1')
-  depends=('acl' 'bash' 'dbus' 'glib2' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
+  depends=('acl' 'bash' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap'
            'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
            'util-linux' 'xz')
   provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
@@ -95,7 +107,6 @@ package_systemd() {
           etc/dbus-1/system.d/org.freedesktop.import1.conf
           etc/dbus-1/system.d/org.freedesktop.network1.conf
           etc/pam.d/systemd-user
-          etc/systemd/bootchart.conf
           etc/systemd/coredump.conf
           etc/systemd/journald.conf
           etc/systemd/journal-remote.conf
@@ -156,6 +167,8 @@ package_systemd() {
   install -Dm644 "$srcdir/arch.conf" "$pkgdir"/usr/share/systemd/bootctl/arch.conf
   install -Dm644 "$srcdir/loader.conf" "$pkgdir"/usr/share/systemd/bootctl/loader.conf
   install -Dm644 "$srcdir/splash-arch.bmp" "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp
+
+  install -Dm644 "$srcdir/udev-hwdb.hook" "$pkgdir/usr/share/libalpm/hooks/udev-hwdb.hook"
 }
 
 package_libsystemd() {

core/systemd/initcpio-install-systemd

@@ -108,8 +108,6 @@ build() {
         /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
         /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
 
-    add_module "kdbus?"
-
     # udev rules and systemd units
     map add_udev_rule "$rules" \
             50-udev-default.rules \
@@ -123,6 +121,7 @@ build() {
             initrd-fs.target \
             initrd-parse-etc.service \
             initrd-root-fs.target \
+            initrd-root-device.target \
             initrd-switch-root.service \
             initrd-switch-root.target \
             initrd-udevadm-cleanup-db.service \

core/systemd/udev-hwdb.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/udev/hwdb.d/*
+
+[Action]
+Description = Updating udev Hardware Database...
+When = PostTransaction
+Exec = /usr/bin/udevadm hwdb --update