Date: Monday, August 7, 2017 @ 05:54:33
  Author: eworm
Revision: 301714

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  systemd/repos/testing-i686/PKGBUILD
    (from rev 301713, systemd/trunk/PKGBUILD)
  systemd/repos/testing-i686/arch.conf
    (from rev 301713, systemd/trunk/arch.conf)
  systemd/repos/testing-i686/initcpio-hook-udev
    (from rev 301713, systemd/trunk/initcpio-hook-udev)
  systemd/repos/testing-i686/initcpio-install-systemd
    (from rev 301713, systemd/trunk/initcpio-install-systemd)
  systemd/repos/testing-i686/initcpio-install-udev
    (from rev 301713, systemd/trunk/initcpio-install-udev)
  systemd/repos/testing-i686/loader.conf
    (from rev 301713, systemd/trunk/loader.conf)
  systemd/repos/testing-i686/splash-arch.bmp
    (from rev 301713, systemd/trunk/splash-arch.bmp)
  systemd/repos/testing-i686/systemd-hwdb.hook
    (from rev 301713, systemd/trunk/systemd-hwdb.hook)
  systemd/repos/testing-i686/systemd-sysusers.hook
    (from rev 301713, systemd/trunk/systemd-sysusers.hook)
  systemd/repos/testing-i686/systemd-tmpfiles.hook
    (from rev 301713, systemd/trunk/systemd-tmpfiles.hook)
  systemd/repos/testing-i686/systemd-update.hook
    (from rev 301713, systemd/trunk/systemd-update.hook)
  systemd/repos/testing-i686/systemd-user.pam
    (from rev 301713, systemd/trunk/systemd-user.pam)
  systemd/repos/testing-i686/systemd.install
    (from rev 301713, systemd/trunk/systemd.install)
  systemd/repos/testing-x86_64/PKGBUILD
    (from rev 301713, systemd/trunk/PKGBUILD)
  systemd/repos/testing-x86_64/arch.conf
    (from rev 301713, systemd/trunk/arch.conf)
  systemd/repos/testing-x86_64/initcpio-hook-udev
    (from rev 301713, systemd/trunk/initcpio-hook-udev)
  systemd/repos/testing-x86_64/initcpio-install-systemd
    (from rev 301713, systemd/trunk/initcpio-install-systemd)
  systemd/repos/testing-x86_64/initcpio-install-udev
    (from rev 301713, systemd/trunk/initcpio-install-udev)
  systemd/repos/testing-x86_64/loader.conf
    (from rev 301713, systemd/trunk/loader.conf)
  systemd/repos/testing-x86_64/splash-arch.bmp
    (from rev 301713, systemd/trunk/splash-arch.bmp)
  systemd/repos/testing-x86_64/systemd-hwdb.hook
    (from rev 301713, systemd/trunk/systemd-hwdb.hook)
  systemd/repos/testing-x86_64/systemd-sysusers.hook
    (from rev 301713, systemd/trunk/systemd-sysusers.hook)
  systemd/repos/testing-x86_64/systemd-tmpfiles.hook
    (from rev 301713, systemd/trunk/systemd-tmpfiles.hook)
  systemd/repos/testing-x86_64/systemd-update.hook
    (from rev 301713, systemd/trunk/systemd-update.hook)
  systemd/repos/testing-x86_64/systemd-user.pam
    (from rev 301713, systemd/trunk/systemd-user.pam)
  systemd/repos/testing-x86_64/systemd.install
    (from rev 301713, systemd/trunk/systemd.install)
Deleted:
  systemd/repos/testing-i686/PKGBUILD
  systemd/repos/testing-i686/arch.conf
  systemd/repos/testing-i686/initcpio-hook-udev
  systemd/repos/testing-i686/initcpio-install-systemd
  systemd/repos/testing-i686/initcpio-install-udev
  systemd/repos/testing-i686/loader.conf
  systemd/repos/testing-i686/splash-arch.bmp
  systemd/repos/testing-i686/systemd-hwdb.hook
  systemd/repos/testing-i686/systemd-sysusers.hook
  systemd/repos/testing-i686/systemd-tmpfiles.hook
  systemd/repos/testing-i686/systemd-update.hook
  systemd/repos/testing-i686/systemd-user.pam
  systemd/repos/testing-i686/systemd.install
  systemd/repos/testing-x86_64/PKGBUILD
  systemd/repos/testing-x86_64/arch.conf
  systemd/repos/testing-x86_64/initcpio-hook-udev
  systemd/repos/testing-x86_64/initcpio-install-systemd
  systemd/repos/testing-x86_64/initcpio-install-udev
  systemd/repos/testing-x86_64/loader.conf
  systemd/repos/testing-x86_64/splash-arch.bmp
  systemd/repos/testing-x86_64/systemd-hwdb.hook
  systemd/repos/testing-x86_64/systemd-sysusers.hook
  systemd/repos/testing-x86_64/systemd-tmpfiles.hook
  systemd/repos/testing-x86_64/systemd-update.hook
  systemd/repos/testing-x86_64/systemd-user.pam
  systemd/repos/testing-x86_64/systemd.install

-----------------------------------------+
 /PKGBUILD                               |  556 ++++++++++++++++++++++++++++++
 /arch.conf                              |   14 
 /initcpio-hook-udev                     |   44 ++
 /initcpio-install-systemd               |  396 +++++++++++++++++++++
 /initcpio-install-udev                  |   58 +++
 /loader.conf                            |    2 
 /systemd-hwdb.hook                      |   22 +
 /systemd-sysusers.hook                  |   22 +
 /systemd-tmpfiles.hook                  |   22 +
 /systemd-update.hook                    |   22 +
 /systemd-user.pam                       |   10 
 /systemd.install                        |  198 ++++++++++
 testing-i686/PKGBUILD                   |  275 --------------
 testing-i686/arch.conf                  |    7 
 testing-i686/initcpio-hook-udev         |   22 -
 testing-i686/initcpio-install-systemd   |  198 ----------
 testing-i686/initcpio-install-udev      |   29 -
 testing-i686/loader.conf                |    1 
 testing-i686/systemd-hwdb.hook          |   11 
 testing-i686/systemd-sysusers.hook      |   11 
 testing-i686/systemd-tmpfiles.hook      |   11 
 testing-i686/systemd-update.hook        |   11 
 testing-i686/systemd-user.pam           |    5 
 testing-i686/systemd.install            |   99 -----
 testing-x86_64/PKGBUILD                 |  275 --------------
 testing-x86_64/arch.conf                |    7 
 testing-x86_64/initcpio-hook-udev       |   22 -
 testing-x86_64/initcpio-install-systemd |  198 ----------
 testing-x86_64/initcpio-install-udev    |   29 -
 testing-x86_64/loader.conf              |    1 
 testing-x86_64/systemd-hwdb.hook        |   11 
 testing-x86_64/systemd-sysusers.hook    |   11 
 testing-x86_64/systemd-tmpfiles.hook    |   11 
 testing-x86_64/systemd-update.hook      |   11 
 testing-x86_64/systemd-user.pam         |    5 
 testing-x86_64/systemd.install          |   99 -----
 36 files changed, 1366 insertions(+), 1360 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD       2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/PKGBUILD       2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,275 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <m...@eworm.de>
-# Maintainer: Dave Reisner <dreis...@archlinux.org>
-# Maintainer: Tom Gundersen <t...@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-# latest commit on stable branch
-_commit='d52e2bb9c20216972754c054e8534bca28baab66'
-# Bump this to latest major release for signed tag verification,
-# the commit count is handled by pkgver() function.
-pkgver=234.11
-pkgrel=5
-arch=('i686' 'x86_64')
-url="https://www.github.com/systemd/systemd";
-makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
-             'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
-             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
-             'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
-             'meson')
-options=('strip')
-source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
-        'git://github.com/systemd/systemd.git' # pull in for tags
-        'initcpio-hook-udev'
-        'initcpio-install-systemd'
-        'initcpio-install-udev'
-        'arch.conf'
-        'loader.conf'
-        'splash-arch.bmp'
-        'systemd-user.pam'
-        'systemd-hwdb.hook'
-        'systemd-sysusers.hook'
-        'systemd-tmpfiles.hook'
-        'systemd-update.hook')
-sha512sums=('SKIP'
-            'SKIP'
-            
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            
'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159'
-            
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
-            
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
-            
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
-            
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
-            
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            
'2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
-            
'9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
-            
'0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
-            
'10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618')
-validpgpkeys=(
-  '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering
-)
-
-_backports=(
-  # cryptsetup: fix infinite timeout (#6486)
-  '0864d311766498563331f486909a0d950ba7de87'
-
-  # process-util: add getpid_cached() as a caching wrapper for getpid()
-  '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47'
-  # tree-wide: make use of getpid_cached() wherever we can
-  'df0ff127758809a45105893772de76082d12a26d'
-)
-
-_reverts=(
-)
-
-_validate_tag() {
-  local success fingerprint trusted status tag=v${pkgver%.*}
-
-  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-
-  if (( ! success )); then
-    error 'failed to validate tag %s\n' "$tag"
-    return 1
-  fi
-
-  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
-    error 'unknown or untrusted public key: %s\n' "$fingerprint"
-    return 1
-  fi
-
-  case $status in
-    'expired')
-      warning 'the signature has expired'
-      ;;
-    'expiredkey')
-      warning 'the key has expired'
-      ;;
-  esac
-
-  return 0
-}
-
-pkgver() {
-  local version count
-
-  cd "$pkgbase-stable"
-
-  version="$(git describe --abbrev=0 --tags)"
-  count="$(git rev-list --count ${version}..)"
-  printf '%s.%s' "${version#v}" "${count}"
-}
-
-prepare() {
-  cd "$pkgbase-stable"
-
-  git remote add upstream ../systemd/
-  git fetch --all
-
-  _validate_tag || return
-
-  local _commit
-  for _commit in "${_backports[@]}"; do
-    git cherry-pick -n "$_commit"
-  done
-  for _commit in "${_reverts[@]}"; do
-    git revert -n "$_commit"
-  done
-
-  # core: store the invocation ID in the per-service keyring
-  # core: run each system service with a fresh session keyring
-  git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \
-    '74dd6b515fa968c5710b396a7664cac335e25ca8' \
-    -- . ':!src/test/test-id128.c' | git apply --reverse --index
-}
-
-build() {
-  local timeservers=({0..3}.arch.pool.ntp.org)
-
-  local meson_options=(
-    --buildtype=release
-    -Db_lto=true
-
-    -Daudit=false
-    -Dgnuefi=true
-    -Dima=false
-    -Dlz4=true
-
-    -Ddbuspolicydir=/usr/share/dbus-1/system.d
-    -Ddefault-dnssec=no
-    # TODO(dreisner): consider changing this to unified
-    -Ddefault-hierarchy=hybrid
-    -Ddefault-kill-user-processes=false
-    -Dfallback-hostname='archlinux'
-    -Dntp-servers="${timeservers[*]}"
-    -Drpmmacrosdir=no
-    -Dsysvinit-path=
-    -Dsysvrcnd-path=
-  )
-
-  meson "$pkgbase-stable" build "${meson_options[@]}"
-
-  ninja -C build
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  license=('GPL2' 'LGPL2.1')
-  depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 
'libcap'
-           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
-           'util-linux' 'xz')
-  provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('nss-myhostname' 'systemd-tools' 'udev')
-  conflicts=('nss-myhostname' 'systemd-tools' 'udev')
-  optdepends=('libmicrohttpd: remote journald capabilities'
-              'quota-tools: kernel-level quota management'
-              'systemd-sysvcompat: symlink package to provide sysvinit 
binaries'
-              'polkit: allow administration as unprivileged user')
-  backup=(etc/pam.d/systemd-user
-          etc/systemd/coredump.conf
-          etc/systemd/journald.conf
-          etc/systemd/journal-remote.conf
-          etc/systemd/journal-upload.conf
-          etc/systemd/logind.conf
-          etc/systemd/system.conf
-          etc/systemd/timesyncd.conf
-          etc/systemd/resolved.conf
-          etc/systemd/user.conf
-          etc/udev/udev.conf)
-  install="systemd.install"
-
-  DESTDIR="$pkgdir" ninja -C build install
-
-  # don't write units to /etc by default. some of these will be re-enabled on
-  # post_install.
-  rm -r "$pkgdir/etc/systemd/system/"*.wants
-  rm -r "$pkgdir/etc/systemd/system/"*.service
-
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" 
"$pkgdir/usr/lib/tmpfiles.d"
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
-          s#GROUP="tape"#GROUP="storage"#g;
-          s#GROUP="cdrom"#GROUP="optical"#g' 
"$pkgdir"/usr/lib/udev/rules.d/*.rules
-  sed -i 's/dialout/uucp/g;
-          s/tape/storage/g;
-          s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
-
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-systemd" 
"$pkgdir/usr/lib/initcpio/install/systemd"
-  install -Dm644 "$srcdir/initcpio-install-udev" 
"$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" 
"$pkgdir/usr/lib/initcpio/hooks/udev"
-
-  # ensure proper permissions for /var/log/journal. This is only to placate
-  chown root:systemd-journal "$pkgdir/var/log/journal"
-  chmod 2755 "$pkgdir/var/log/journal"
-
-  # match directory owner/group and mode from extra/polkit
-  chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d
-  chmod 0750     "$pkgdir"/usr/share/polkit-1/rules.d
-
-  # we'll create this on installation
-  rmdir "$pkgdir/var/log/journal/remote"
-
-  # ship default policy to leave services disabled
-  echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
-
-  # manpages shipped with systemd-sysvcompat
-  rm 
"$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-
-  # runtime libraries shipped with libsystemd
-  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
-
-  # allow core/filesystem to pristine nsswitch.conf
-  rm "$pkgdir/usr/share/factory/etc/nsswitch.conf"
-  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf"
-
-  # add example bootctl configuration
-  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/systemd-hwdb.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook"
-  install -Dm644 "$srcdir/systemd-sysusers.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
-  install -Dm644 "$srcdir/systemd-tmpfiles.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
-  install -Dm644 "$srcdir/systemd-update.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-update.hook"
-
-  # overwrite the systemd-user PAM configuration with our own
-  install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user"
-}
-
-package_libsystemd() {
-  pkgdesc="systemd client libraries"
-  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
-  license=('GPL2')
-  provides=('libsystemd.so' 'libudev.so')
-
-  # meson does not support installing subsets of files, no?
-  # So do a full install to temporary directory, then install what we need.
-  DESTDIR="$srcdir"/full-install ninja -C build install
-
-  install -dm755 "$pkgdir"/usr/lib/
-  cp --archive "$srcdir"/full-install/usr/lib/lib{nss_*,systemd,udev}.so* 
"$pkgdir"/usr/lib/
-}
-
-package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  license=('GPL2')
-  groups=('base')
-  conflicts=('sysvinit')
-  depends=('systemd')
-
-  install -dm755 "$pkgdir"/usr/share/man/man8
-  cp -d --no-preserve=ownership,timestamp \
-    build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-    "$pkgdir"/usr/share/man/man8
-
-  install -dm755 "$pkgdir/usr/bin"
-  for tool in runlevel reboot shutdown poweroff halt telinit; do
-    ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
-  done
-
-  ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
-}
-
-# vim: ft=sh syn=sh et

Copied: systemd/repos/testing-i686/PKGBUILD (from rev 301713, 
systemd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD                               (rev 0)
+++ testing-i686/PKGBUILD       2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,278 @@
+# $Id$
+# Maintainer: Christian Hesse <m...@eworm.de>
+# Maintainer: Dave Reisner <dreis...@archlinux.org>
+# Maintainer: Tom Gundersen <t...@jklm.no>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
+# latest commit on stable branch
+_commit='d52e2bb9c20216972754c054e8534bca28baab66'
+# Bump this to latest major release for signed tag verification,
+# the commit count is handled by pkgver() function.
+pkgver=234.11
+pkgrel=6
+arch=('i686' 'x86_64')
+url="https://www.github.com/systemd/systemd";
+makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
+             'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
+             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
+             'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
+             'meson')
+options=('strip')
+source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
+        'git://github.com/systemd/systemd.git' # pull in for tags
+        'initcpio-hook-udev'
+        'initcpio-install-systemd'
+        'initcpio-install-udev'
+        'arch.conf'
+        'loader.conf'
+        'splash-arch.bmp'
+        'systemd-user.pam'
+        'systemd-hwdb.hook'
+        'systemd-sysusers.hook'
+        'systemd-tmpfiles.hook'
+        'systemd-update.hook')
+sha512sums=('SKIP'
+            'SKIP'
+            
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
+            
'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159'
+            
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
+            
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
+            
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
+            
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
+            
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
+            
'2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
+            
'9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
+            
'0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
+            
'10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618')
+validpgpkeys=(
+  '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering
+)
+
+_backports=(
+  # cryptsetup: fix infinite timeout (#6486)
+  '0864d311766498563331f486909a0d950ba7de87'
+
+  # process-util: add getpid_cached() as a caching wrapper for getpid()
+  '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47'
+  # tree-wide: make use of getpid_cached() wherever we can
+  'df0ff127758809a45105893772de76082d12a26d'
+
+  # call chase_symlinks without the /sysroot prefix (#6411) (FS#54958)
+  '98eda38aed6a10c4f6d6ad0cac6e5361e87de52b'
+)
+
+_reverts=(
+)
+
+_validate_tag() {
+  local success fingerprint trusted status tag=v${pkgver%.*}
+
+  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
+
+  if (( ! success )); then
+    error 'failed to validate tag %s\n' "$tag"
+    return 1
+  fi
+
+  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
+    error 'unknown or untrusted public key: %s\n' "$fingerprint"
+    return 1
+  fi
+
+  case $status in
+    'expired')
+      warning 'the signature has expired'
+      ;;
+    'expiredkey')
+      warning 'the key has expired'
+      ;;
+  esac
+
+  return 0
+}
+
+pkgver() {
+  local version count
+
+  cd "$pkgbase-stable"
+
+  version="$(git describe --abbrev=0 --tags)"
+  count="$(git rev-list --count ${version}..)"
+  printf '%s.%s' "${version#v}" "${count}"
+}
+
+prepare() {
+  cd "$pkgbase-stable"
+
+  git remote add upstream ../systemd/
+  git fetch --all
+
+  _validate_tag || return
+
+  local _commit
+  for _commit in "${_backports[@]}"; do
+    git cherry-pick -n "$_commit"
+  done
+  for _commit in "${_reverts[@]}"; do
+    git revert -n "$_commit"
+  done
+
+  # core: store the invocation ID in the per-service keyring
+  # core: run each system service with a fresh session keyring
+  git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \
+    '74dd6b515fa968c5710b396a7664cac335e25ca8' \
+    -- . ':!src/test/test-id128.c' | git apply --reverse --index
+}
+
+build() {
+  local timeservers=({0..3}.arch.pool.ntp.org)
+
+  local meson_options=(
+    --buildtype=release
+    -Db_lto=true
+
+    -Daudit=false
+    -Dgnuefi=true
+    -Dima=false
+    -Dlz4=true
+
+    -Ddbuspolicydir=/usr/share/dbus-1/system.d
+    -Ddefault-dnssec=no
+    # TODO(dreisner): consider changing this to unified
+    -Ddefault-hierarchy=hybrid
+    -Ddefault-kill-user-processes=false
+    -Dfallback-hostname='archlinux'
+    -Dntp-servers="${timeservers[*]}"
+    -Drpmmacrosdir=no
+    -Dsysvinit-path=
+    -Dsysvrcnd-path=
+  )
+
+  meson "$pkgbase-stable" build "${meson_options[@]}"
+
+  ninja -C build
+}
+
+package_systemd() {
+  pkgdesc="system and service manager"
+  license=('GPL2' 'LGPL2.1')
+  depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 
'libcap'
+           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
+           'util-linux' 'xz')
+  provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+  replaces=('nss-myhostname' 'systemd-tools' 'udev')
+  conflicts=('nss-myhostname' 'systemd-tools' 'udev')
+  optdepends=('libmicrohttpd: remote journald capabilities'
+              'quota-tools: kernel-level quota management'
+              'systemd-sysvcompat: symlink package to provide sysvinit 
binaries'
+              'polkit: allow administration as unprivileged user')
+  backup=(etc/pam.d/systemd-user
+          etc/systemd/coredump.conf
+          etc/systemd/journald.conf
+          etc/systemd/journal-remote.conf
+          etc/systemd/journal-upload.conf
+          etc/systemd/logind.conf
+          etc/systemd/system.conf
+          etc/systemd/timesyncd.conf
+          etc/systemd/resolved.conf
+          etc/systemd/user.conf
+          etc/udev/udev.conf)
+  install="systemd.install"
+
+  DESTDIR="$pkgdir" ninja -C build install
+
+  # don't write units to /etc by default. some of these will be re-enabled on
+  # post_install.
+  rm -r "$pkgdir/etc/systemd/system/"*.wants
+  rm -r "$pkgdir/etc/systemd/system/"*.service
+
+  # add back tmpfiles.d/legacy.conf
+  install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" 
"$pkgdir/usr/lib/tmpfiles.d"
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
+          s#GROUP="tape"#GROUP="storage"#g;
+          s#GROUP="cdrom"#GROUP="optical"#g' 
"$pkgdir"/usr/lib/udev/rules.d/*.rules
+  sed -i 's/dialout/uucp/g;
+          s/tape/storage/g;
+          s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
+
+  # add mkinitcpio hooks
+  install -Dm644 "$srcdir/initcpio-install-systemd" 
"$pkgdir/usr/lib/initcpio/install/systemd"
+  install -Dm644 "$srcdir/initcpio-install-udev" 
"$pkgdir/usr/lib/initcpio/install/udev"
+  install -Dm644 "$srcdir/initcpio-hook-udev" 
"$pkgdir/usr/lib/initcpio/hooks/udev"
+
+  # ensure proper permissions for /var/log/journal. This is only to placate
+  chown root:systemd-journal "$pkgdir/var/log/journal"
+  chmod 2755 "$pkgdir/var/log/journal"
+
+  # match directory owner/group and mode from extra/polkit
+  chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d
+  chmod 0750     "$pkgdir"/usr/share/polkit-1/rules.d
+
+  # we'll create this on installation
+  rmdir "$pkgdir/var/log/journal/remote"
+
+  # ship default policy to leave services disabled
+  echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
+
+  # manpages shipped with systemd-sysvcompat
+  rm 
"$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+
+  # runtime libraries shipped with libsystemd
+  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
+
+  # allow core/filesystem to pristine nsswitch.conf
+  rm "$pkgdir/usr/share/factory/etc/nsswitch.conf"
+  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf"
+
+  # add example bootctl configuration
+  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/systemd-hwdb.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook"
+  install -Dm644 "$srcdir/systemd-sysusers.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
+  install -Dm644 "$srcdir/systemd-tmpfiles.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
+  install -Dm644 "$srcdir/systemd-update.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-update.hook"
+
+  # overwrite the systemd-user PAM configuration with our own
+  install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user"
+}
+
+package_libsystemd() {
+  pkgdesc="systemd client libraries"
+  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+  license=('GPL2')
+  provides=('libsystemd.so' 'libudev.so')
+
+  # meson does not support installing subsets of files, no?
+  # So do a full install to temporary directory, then install what we need.
+  DESTDIR="$srcdir"/full-install ninja -C build install
+
+  install -dm755 "$pkgdir"/usr/lib/
+  cp --archive "$srcdir"/full-install/usr/lib/lib{nss_*,systemd,udev}.so* 
"$pkgdir"/usr/lib/
+}
+
+package_systemd-sysvcompat() {
+  pkgdesc="sysvinit compat for systemd"
+  license=('GPL2')
+  groups=('base')
+  conflicts=('sysvinit')
+  depends=('systemd')
+
+  install -dm755 "$pkgdir"/usr/share/man/man8
+  cp -d --no-preserve=ownership,timestamp \
+    build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+    "$pkgdir"/usr/share/man/man8
+
+  install -dm755 "$pkgdir/usr/bin"
+  for tool in runlevel reboot shutdown poweroff halt telinit; do
+    ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
+  done
+
+  ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
+}
+
+# vim: ft=sh syn=sh et

Deleted: testing-i686/arch.conf
===================================================================
--- testing-i686/arch.conf      2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/arch.conf      2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,7 +0,0 @@
-## This is just an example config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title   Arch Linux
-linux   /vmlinuz-linux
-initrd  /initramfs-linux.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap

Copied: systemd/repos/testing-i686/arch.conf (from rev 301713, 
systemd/trunk/arch.conf)
===================================================================
--- testing-i686/arch.conf                              (rev 0)
+++ testing-i686/arch.conf      2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,7 @@
+## This is just an example config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title   Arch Linux
+linux   /vmlinuz-linux
+initrd  /initramfs-linux.img
+options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap

Deleted: testing-i686/initcpio-hook-udev
===================================================================
--- testing-i686/initcpio-hook-udev     2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/initcpio-hook-udev     2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,22 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-    systemd-tmpfiles --prefix=/dev --create --boot
-    /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-i686/initcpio-hook-udev (from rev 301713, 
systemd/trunk/initcpio-hook-udev)
===================================================================
--- testing-i686/initcpio-hook-udev                             (rev 0)
+++ testing-i686/initcpio-hook-udev     2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,22 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+    systemd-tmpfiles --prefix=/dev --create --boot
+    /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
+    udevd_running=1
+}
+
+run_hook() {
+    msg ":: Triggering uevents..."
+    udevadm trigger --action=add --type=subsystems
+    udevadm trigger --action=add --type=devices
+    udevadm settle
+}
+
+run_cleanuphook() {
+    udevadm control --exit
+    udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: testing-i686/initcpio-install-systemd
===================================================================
--- testing-i686/initcpio-install-systemd       2017-08-07 05:54:25 UTC (rev 
301713)
+++ testing-i686/initcpio-install-systemd       2017-08-07 05:54:33 UTC (rev 
301714)
@@ -1,198 +0,0 @@
-#!/bin/bash
-
-strip_quotes() {
-  local len=${#1} quotes=$'[\'"]' str=${!1}
-
-  if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
-    printf -v "$1" %s "${str:1:-1}"
-  fi
-}
-
-add_udev_rule() {
-    # Add an udev rules file to the initcpio image. Dependencies on binaries
-    # will be discovered and added.
-    #   $1: path to rules file (or name of rules file)
-
-    local rules= rule= key= value= binary=
-
-    rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
-    if [[ -z $rules ]]; then
-        # complain about not found rules
-        return 1
-    fi
-
-    add_file "$rules"
-
-    while IFS=, read -ra rule; do
-        # skip empty lines, comments
-        [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
-
-        for pair in "${rule[@]}"; do
-            IFS=' =' read -r key value <<< "$pair"
-            case $key in
-                RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
-                    strip_quotes 'value'
-                    # just take the first word as the binary name
-                    binary=${value%% *}
-                    [[ ${binary:0:1} == '$' ]] && continue
-                    if [[ ${binary:0:1} != '/' ]]; then
-                        binary=$(PATH=/usr/lib/udev:/lib/udev type -P 
"$binary")
-                    fi
-                    add_binary "$binary"
-                    ;;
-            esac
-        done
-    done <"$rules"
-}
-
-add_systemd_unit() {
-    # Add a systemd unit file to the initcpio image. Hard dependencies on 
binaries
-    # and other unit files will be discovered and added.
-    #   $1: path to rules file (or name of rules file)
-
-    local unit= rule= entry= key= value= binary= dep=
-
-    unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
-    if [[ -z $unit ]]; then
-        # complain about not found unit file
-        return 1
-    fi
-
-    add_file "$unit"
-
-    while IFS='=' read -r key values; do
-        read -ra values <<< "$values"
-
-        case $key in
-            Requires|OnFailure)
-                # only add hard dependencies (not Wants)
-                map add_systemd_unit "${values[@]}"
-                ;;
-            Exec*)
-                # don't add binaries unless they are required
-                if [[ ${values[0]:0:1} != '-' ]]; then
-                    add_binary "${values[0]}"
-                fi
-                ;;
-        esac
-
-    done <"$unit"
-
-    # preserve reverse soft dependency
-    for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
-        if [[ -L $dep ]]; then
-            add_symlink "$dep"
-        fi
-    done
-
-    # add hard dependencies
-    if [[ -d $unit.requires ]]; then
-        for dep in "$unit".requires/*; do
-            add_systemd_unit ${dep##*/}
-        done
-    fi
-}
-
-add_systemd_drop_in() {
-    local unit=$1 dropin_name=$2
-
-    mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
-    cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
-}
-
-build() {
-    local rules unit
-
-    # from base
-    add_binary /bin/mount
-    add_binary /usr/bin/kmod /usr/bin/modprobe
-    add_binary /usr/lib/systemd/systemd /init
-    add_binary /usr/bin/sulogin
-
-    map add_binary \
-        /usr/bin/systemd-tmpfiles \
-        /usr/lib/systemd/systemd-hibernate-resume \
-        /usr/lib/systemd/systemd-sulogin-shell \
-        /usr/lib/systemd/system-generators/systemd-fstab-generator \
-        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
-        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-
-    # udev rules and systemd units
-    map add_udev_rule "$rules" \
-            50-udev-default.rules \
-            60-persistent-storage.rules \
-            64-btrfs.rules \
-            80-drivers.rules \
-            99-systemd.rules
-
-    map add_systemd_unit \
-            initrd-cleanup.service \
-            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 \
-            initrd.target \
-            kmod-static-nodes.service \
-            local-fs.target \
-            local-fs-pre.target \
-            paths.target \
-            reboot.target \
-            slices.target \
-            sockets.target \
-            swap.target \
-            systemd-fsck@.service \
-            systemd-hibernate-resume@.service \
-            systemd-journald.service \
-            systemd-journald-audit.socket \
-            systemd-journald-dev-log.socket \
-            systemd-modules-load.service \
-            systemd-tmpfiles-setup-dev.service \
-            systemd-udev-trigger.service \
-            systemd-udevd-control.socket \
-            systemd-udevd-kernel.socket \
-            systemd-udevd.service \
-            timers.target \
-            rescue.target \
-            emergency.target
-
-    add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
-    add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
-
-    add_binary "$(readlink -f /usr/lib/libnss_files.so)"
-    printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
-        'passwd: files' \
-        'group: files' \
-        'shadow: files'
-
-    echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
-    echo "root:x:0:root" >"$BUILDROOT/etc/group"
-    echo "root::::::::" >"$BUILDROOT/etc/shadow"
-
-    add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
-EOF
-
-    add_dir "/etc/modules-load.d"
-    (
-      . "$_f_config"
-      set -f
-      printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
-    )
-}
-
-help() {
-    cat <<HELPEOF
-This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime
-components will need to be ported, and will not work as intended. You also may
-wish to still include the 'base' hook (before this hook) to ensure that a
-rescue shell exists on your initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-i686/initcpio-install-systemd (from rev 301713, 
systemd/trunk/initcpio-install-systemd)
===================================================================
--- testing-i686/initcpio-install-systemd                               (rev 0)
+++ testing-i686/initcpio-install-systemd       2017-08-07 05:54:33 UTC (rev 
301714)
@@ -0,0 +1,198 @@
+#!/bin/bash
+
+strip_quotes() {
+  local len=${#1} quotes=$'[\'"]' str=${!1}
+
+  if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
+    printf -v "$1" %s "${str:1:-1}"
+  fi
+}
+
+add_udev_rule() {
+    # Add an udev rules file to the initcpio image. Dependencies on binaries
+    # will be discovered and added.
+    #   $1: path to rules file (or name of rules file)
+
+    local rules= rule= key= value= binary=
+
+    rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+    if [[ -z $rules ]]; then
+        # complain about not found rules
+        return 1
+    fi
+
+    add_file "$rules"
+
+    while IFS=, read -ra rule; do
+        # skip empty lines, comments
+        [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+        for pair in "${rule[@]}"; do
+            IFS=' =' read -r key value <<< "$pair"
+            case $key in
+                RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+                    strip_quotes 'value'
+                    # just take the first word as the binary name
+                    binary=${value%% *}
+                    [[ ${binary:0:1} == '$' ]] && continue
+                    if [[ ${binary:0:1} != '/' ]]; then
+                        binary=$(PATH=/usr/lib/udev:/lib/udev type -P 
"$binary")
+                    fi
+                    add_binary "$binary"
+                    ;;
+            esac
+        done
+    done <"$rules"
+}
+
+add_systemd_unit() {
+    # Add a systemd unit file to the initcpio image. Hard dependencies on 
binaries
+    # and other unit files will be discovered and added.
+    #   $1: path to rules file (or name of rules file)
+
+    local unit= rule= entry= key= value= binary= dep=
+
+    unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
+    if [[ -z $unit ]]; then
+        # complain about not found unit file
+        return 1
+    fi
+
+    add_file "$unit"
+
+    while IFS='=' read -r key values; do
+        read -ra values <<< "$values"
+
+        case $key in
+            Requires|OnFailure)
+                # only add hard dependencies (not Wants)
+                map add_systemd_unit "${values[@]}"
+                ;;
+            Exec*)
+                # don't add binaries unless they are required
+                if [[ ${values[0]:0:1} != '-' ]]; then
+                    add_binary "${values[0]}"
+                fi
+                ;;
+        esac
+
+    done <"$unit"
+
+    # preserve reverse soft dependency
+    for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+        if [[ -L $dep ]]; then
+            add_symlink "$dep"
+        fi
+    done
+
+    # add hard dependencies
+    if [[ -d $unit.requires ]]; then
+        for dep in "$unit".requires/*; do
+            add_systemd_unit ${dep##*/}
+        done
+    fi
+}
+
+add_systemd_drop_in() {
+    local unit=$1 dropin_name=$2
+
+    mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
+    cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
+}
+
+build() {
+    local rules unit
+
+    # from base
+    add_binary /bin/mount
+    add_binary /usr/bin/kmod /usr/bin/modprobe
+    add_binary /usr/lib/systemd/systemd /init
+    add_binary /usr/bin/sulogin
+
+    map add_binary \
+        /usr/bin/systemd-tmpfiles \
+        /usr/lib/systemd/systemd-hibernate-resume \
+        /usr/lib/systemd/systemd-sulogin-shell \
+        /usr/lib/systemd/system-generators/systemd-fstab-generator \
+        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
+        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+    # udev rules and systemd units
+    map add_udev_rule "$rules" \
+            50-udev-default.rules \
+            60-persistent-storage.rules \
+            64-btrfs.rules \
+            80-drivers.rules \
+            99-systemd.rules
+
+    map add_systemd_unit \
+            initrd-cleanup.service \
+            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 \
+            initrd.target \
+            kmod-static-nodes.service \
+            local-fs.target \
+            local-fs-pre.target \
+            paths.target \
+            reboot.target \
+            slices.target \
+            sockets.target \
+            swap.target \
+            systemd-fsck@.service \
+            systemd-hibernate-resume@.service \
+            systemd-journald.service \
+            systemd-journald-audit.socket \
+            systemd-journald-dev-log.socket \
+            systemd-modules-load.service \
+            systemd-tmpfiles-setup-dev.service \
+            systemd-udev-trigger.service \
+            systemd-udevd-control.socket \
+            systemd-udevd-kernel.socket \
+            systemd-udevd.service \
+            timers.target \
+            rescue.target \
+            emergency.target
+
+    add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+    add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
+
+    add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+    printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
+        'passwd: files' \
+        'group: files' \
+        'shadow: files'
+
+    echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+    echo "root:x:0:root" >"$BUILDROOT/etc/group"
+    echo "root::::::::" >"$BUILDROOT/etc/shadow"
+
+    add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
+EOF
+
+    add_dir "/etc/modules-load.d"
+    (
+      . "$_f_config"
+      set -f
+      printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+    )
+}
+
+help() {
+    cat <<HELPEOF
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: testing-i686/initcpio-install-udev
===================================================================
--- testing-i686/initcpio-install-udev  2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/initcpio-install-udev  2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_binary /usr/lib/systemd/systemd-udevd
-    add_binary /usr/bin/udevadm
-    add_binary /usr/bin/systemd-tmpfiles
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 
64-btrfs.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook adds the udev daemon to the initramfs, allowing for dynamic loading
-of modules and reliable detection of the root device via tags (e.g. UUID or
-LABEL). Do not remove this hook unless you are using the systemd hook, or you
-know what you're doing.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-i686/initcpio-install-udev (from rev 301713, 
systemd/trunk/initcpio-install-udev)
===================================================================
--- testing-i686/initcpio-install-udev                          (rev 0)
+++ testing-i686/initcpio-install-udev  2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+build() {
+    local rules tool
+
+    add_binary /usr/lib/systemd/systemd-udevd
+    add_binary /usr/bin/udevadm
+    add_binary /usr/bin/systemd-tmpfiles
+
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 
64-btrfs.rules 80-drivers.rules; do
+        add_file "/usr/lib/udev/rules.d/$rules"
+    done
+    for tool in ata_id scsi_id; do
+        add_file "/usr/lib/udev/$tool"
+    done
+
+    add_runscript
+}
+
+help() {
+    cat <<HELPEOF
+This hook adds the udev daemon to the initramfs, allowing for dynamic loading
+of modules and reliable detection of the root device via tags (e.g. UUID or
+LABEL). Do not remove this hook unless you are using the systemd hook, or you
+know what you're doing.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: testing-i686/loader.conf
===================================================================
--- testing-i686/loader.conf    2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/loader.conf    2017-08-07 05:54:33 UTC (rev 301714)
@@ -1 +0,0 @@
-default arch

Copied: systemd/repos/testing-i686/loader.conf (from rev 301713, 
systemd/trunk/loader.conf)
===================================================================
--- testing-i686/loader.conf                            (rev 0)
+++ testing-i686/loader.conf    2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1 @@
+default arch

Deleted: testing-i686/splash-arch.bmp
===================================================================
(Binary files differ)

Copied: systemd/repos/testing-i686/splash-arch.bmp (from rev 301713, 
systemd/trunk/splash-arch.bmp)
===================================================================
(Binary files differ)

Deleted: testing-i686/systemd-hwdb.hook
===================================================================
--- testing-i686/systemd-hwdb.hook      2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/systemd-hwdb.hook      2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,11 +0,0 @@
-[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/systemd-hwdb --usr update

Copied: systemd/repos/testing-i686/systemd-hwdb.hook (from rev 301713, 
systemd/trunk/systemd-hwdb.hook)
===================================================================
--- testing-i686/systemd-hwdb.hook                              (rev 0)
+++ testing-i686/systemd-hwdb.hook      2017-08-07 05:54:33 UTC (rev 301714)
@@ -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/systemd-hwdb --usr update

Deleted: testing-i686/systemd-sysusers.hook
===================================================================
--- testing-i686/systemd-sysusers.hook  2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/systemd-sysusers.hook  2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysusers.d/*.conf
-
-[Action]
-Description = Updating system user accounts...
-When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
-NeedsTargets

Copied: systemd/repos/testing-i686/systemd-sysusers.hook (from rev 301713, 
systemd/trunk/systemd-sysusers.hook)
===================================================================
--- testing-i686/systemd-sysusers.hook                          (rev 0)
+++ testing-i686/systemd-sysusers.hook  2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Updating system user accounts...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
+NeedsTargets

Deleted: testing-i686/systemd-tmpfiles.hook
===================================================================
--- testing-i686/systemd-tmpfiles.hook  2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/systemd-tmpfiles.hook  2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/tmpfiles.d/*.conf
-
-[Action]
-Description = Creating temporary files...
-When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create 
"/$f"; done'
-NeedsTargets

Copied: systemd/repos/testing-i686/systemd-tmpfiles.hook (from rev 301713, 
systemd/trunk/systemd-tmpfiles.hook)
===================================================================
--- testing-i686/systemd-tmpfiles.hook                          (rev 0)
+++ testing-i686/systemd-tmpfiles.hook  2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/tmpfiles.d/*.conf
+
+[Action]
+Description = Creating temporary files...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create 
"/$f"; done'
+NeedsTargets

Deleted: testing-i686/systemd-update.hook
===================================================================
--- testing-i686/systemd-update.hook    2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/systemd-update.hook    2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/
-
-[Action]
-Description = Arming ConditionNeedsUpdate...
-When = PostTransaction
-Exec = /usr/bin/touch -c /usr

Copied: systemd/repos/testing-i686/systemd-update.hook (from rev 301713, 
systemd/trunk/systemd-update.hook)
===================================================================
--- testing-i686/systemd-update.hook                            (rev 0)
+++ testing-i686/systemd-update.hook    2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/
+
+[Action]
+Description = Arming ConditionNeedsUpdate...
+When = PostTransaction
+Exec = /usr/bin/touch -c /usr

Deleted: testing-i686/systemd-user.pam
===================================================================
--- testing-i686/systemd-user.pam       2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/systemd-user.pam       2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,5 +0,0 @@
-# Used by systemd --user instances.
-
-account  include system-login
-session  required pam_loginuid.so
-session  include system-login

Copied: systemd/repos/testing-i686/systemd-user.pam (from rev 301713, 
systemd/trunk/systemd-user.pam)
===================================================================
--- testing-i686/systemd-user.pam                               (rev 0)
+++ testing-i686/systemd-user.pam       2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,5 @@
+# Used by systemd --user instances.
+
+account  include system-login
+session  required pam_loginuid.so
+session  include system-login

Deleted: testing-i686/systemd.install
===================================================================
--- testing-i686/systemd.install        2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-i686/systemd.install        2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,99 +0,0 @@
-#!/bin/bash
-
-sd_booted() {
-  [[ -d run/systemd/system && ! -L run/systemd/system ]]
-}
-
-add_journal_acls() {
-  # ignore errors, since the filesystem might not support ACLs
-  setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 
2>/dev/null
-  :
-}
-
-post_common() {
-  systemd-sysusers
-  journalctl --update-catalog
-}
-
-_216_2_changes() {
-  echo ':: Coredumps are handled by systemd by default. Collection behavior 
can be'
-  echo '   tuned in /etc/systemd/coredump.conf.'
-}
-
-_219_2_changes() {
-  if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
-    chgrp systemd-journal-remote var/log/journal/remote
-  fi
-}
-
-_219_4_changes() {
-  if ! systemctl is-enabled -q remote-fs.target; then
-    systemctl enable -q remote-fs.target
-  fi
-}
-
-_230_1_changes() {
-  echo ':: systemd-bootchart is no longer included with systemd'
-}
-
-_232_8_changes() {
-  # paper over possible effects of CVE-2016-10156
-  local stamps=(/var/lib/systemd/timers/*.timer)
-
-  if [[ -f ${stamps[0]} ]]; then
-    chmod 0644 "${stamps[@]}"
-  fi
-}
-
-_233_75_3_changes() {
-  # upstream installs services to /etc, which we remove
-  # to keep bus activation we re-enable systemd-resolved
-  if systemctl is-enabled -q systemd-resolved.service; then
-    systemctl reenable systemd-resolved.service 2>/dev/null
-  fi
-}
-
-post_install() {
-  systemd-machine-id-setup
-
-  post_common "$@"
-
-  add_journal_acls
-
-  # enable some services by default, but don't track them
-  systemctl enable getty@tty1.service remote-fs.target
-
-  echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line 
in your"
-  echo "   bootloader to replace sysvinit with systemd, or install 
systemd-sysvcompat"
-
-  # group 'systemd-journal-remote' is created by systemd-sysusers
-  mkdir -m2755 var/log/journal/remote
-  chgrp systemd-journal-remote var/log/journal/remote
-}
-
-post_upgrade() {
-  post_common "$@"
-
-  # don't reexec if the old version is 231-1 or 231-2.
-  # https://github.com/systemd/systemd/commit/bd64d82c1c
-  if [[ $1 != 231-[12] ]] && sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-
-  local v upgrades=(
-    216-2
-    219-2
-    219-4
-    230-1
-    232-8
-    233.75-3
-  )
-
-  for v in "${upgrades[@]}"; do
-    if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
-      "_${v//[.-]/_}_changes"
-    fi
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: systemd/repos/testing-i686/systemd.install (from rev 301713, 
systemd/trunk/systemd.install)
===================================================================
--- testing-i686/systemd.install                                (rev 0)
+++ testing-i686/systemd.install        2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+sd_booted() {
+  [[ -d run/systemd/system && ! -L run/systemd/system ]]
+}
+
+add_journal_acls() {
+  # ignore errors, since the filesystem might not support ACLs
+  setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 
2>/dev/null
+  :
+}
+
+post_common() {
+  systemd-sysusers
+  journalctl --update-catalog
+}
+
+_216_2_changes() {
+  echo ':: Coredumps are handled by systemd by default. Collection behavior 
can be'
+  echo '   tuned in /etc/systemd/coredump.conf.'
+}
+
+_219_2_changes() {
+  if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
+    chgrp systemd-journal-remote var/log/journal/remote
+  fi
+}
+
+_219_4_changes() {
+  if ! systemctl is-enabled -q remote-fs.target; then
+    systemctl enable -q remote-fs.target
+  fi
+}
+
+_230_1_changes() {
+  echo ':: systemd-bootchart is no longer included with systemd'
+}
+
+_232_8_changes() {
+  # paper over possible effects of CVE-2016-10156
+  local stamps=(/var/lib/systemd/timers/*.timer)
+
+  if [[ -f ${stamps[0]} ]]; then
+    chmod 0644 "${stamps[@]}"
+  fi
+}
+
+_233_75_3_changes() {
+  # upstream installs services to /etc, which we remove
+  # to keep bus activation we re-enable systemd-resolved
+  if systemctl is-enabled -q systemd-resolved.service; then
+    systemctl reenable systemd-resolved.service 2>/dev/null
+  fi
+}
+
+post_install() {
+  systemd-machine-id-setup
+
+  post_common "$@"
+
+  add_journal_acls
+
+  # enable some services by default, but don't track them
+  systemctl enable getty@tty1.service remote-fs.target
+
+  echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line 
in your"
+  echo "   bootloader to replace sysvinit with systemd, or install 
systemd-sysvcompat"
+
+  # group 'systemd-journal-remote' is created by systemd-sysusers
+  mkdir -m2755 var/log/journal/remote
+  chgrp systemd-journal-remote var/log/journal/remote
+}
+
+post_upgrade() {
+  post_common "$@"
+
+  # don't reexec if the old version is 231-1 or 231-2.
+  # https://github.com/systemd/systemd/commit/bd64d82c1c
+  if [[ $1 != 231-[12] ]] && sd_booted; then
+    systemctl --system daemon-reexec
+  fi
+
+  local v upgrades=(
+    216-2
+    219-2
+    219-4
+    230-1
+    232-8
+    233.75-3
+  )
+
+  for v in "${upgrades[@]}"; do
+    if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+      "_${v//[.-]/_}_changes"
+    fi
+  done
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD     2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/PKGBUILD     2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,275 +0,0 @@
-# $Id$
-# Maintainer: Christian Hesse <m...@eworm.de>
-# Maintainer: Dave Reisner <dreis...@archlinux.org>
-# Maintainer: Tom Gundersen <t...@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-# latest commit on stable branch
-_commit='d52e2bb9c20216972754c054e8534bca28baab66'
-# Bump this to latest major release for signed tag verification,
-# the commit count is handled by pkgver() function.
-pkgver=234.11
-pkgrel=5
-arch=('i686' 'x86_64')
-url="https://www.github.com/systemd/systemd";
-makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
-             'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
-             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
-             'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
-             'meson')
-options=('strip')
-source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
-        'git://github.com/systemd/systemd.git' # pull in for tags
-        'initcpio-hook-udev'
-        'initcpio-install-systemd'
-        'initcpio-install-udev'
-        'arch.conf'
-        'loader.conf'
-        'splash-arch.bmp'
-        'systemd-user.pam'
-        'systemd-hwdb.hook'
-        'systemd-sysusers.hook'
-        'systemd-tmpfiles.hook'
-        'systemd-update.hook')
-sha512sums=('SKIP'
-            'SKIP'
-            
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-            
'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159'
-            
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
-            
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
-            
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
-            
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
-            
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
-            
'2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
-            
'9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
-            
'0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
-            
'10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618')
-validpgpkeys=(
-  '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering
-)
-
-_backports=(
-  # cryptsetup: fix infinite timeout (#6486)
-  '0864d311766498563331f486909a0d950ba7de87'
-
-  # process-util: add getpid_cached() as a caching wrapper for getpid()
-  '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47'
-  # tree-wide: make use of getpid_cached() wherever we can
-  'df0ff127758809a45105893772de76082d12a26d'
-)
-
-_reverts=(
-)
-
-_validate_tag() {
-  local success fingerprint trusted status tag=v${pkgver%.*}
-
-  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
-
-  if (( ! success )); then
-    error 'failed to validate tag %s\n' "$tag"
-    return 1
-  fi
-
-  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
-    error 'unknown or untrusted public key: %s\n' "$fingerprint"
-    return 1
-  fi
-
-  case $status in
-    'expired')
-      warning 'the signature has expired'
-      ;;
-    'expiredkey')
-      warning 'the key has expired'
-      ;;
-  esac
-
-  return 0
-}
-
-pkgver() {
-  local version count
-
-  cd "$pkgbase-stable"
-
-  version="$(git describe --abbrev=0 --tags)"
-  count="$(git rev-list --count ${version}..)"
-  printf '%s.%s' "${version#v}" "${count}"
-}
-
-prepare() {
-  cd "$pkgbase-stable"
-
-  git remote add upstream ../systemd/
-  git fetch --all
-
-  _validate_tag || return
-
-  local _commit
-  for _commit in "${_backports[@]}"; do
-    git cherry-pick -n "$_commit"
-  done
-  for _commit in "${_reverts[@]}"; do
-    git revert -n "$_commit"
-  done
-
-  # core: store the invocation ID in the per-service keyring
-  # core: run each system service with a fresh session keyring
-  git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \
-    '74dd6b515fa968c5710b396a7664cac335e25ca8' \
-    -- . ':!src/test/test-id128.c' | git apply --reverse --index
-}
-
-build() {
-  local timeservers=({0..3}.arch.pool.ntp.org)
-
-  local meson_options=(
-    --buildtype=release
-    -Db_lto=true
-
-    -Daudit=false
-    -Dgnuefi=true
-    -Dima=false
-    -Dlz4=true
-
-    -Ddbuspolicydir=/usr/share/dbus-1/system.d
-    -Ddefault-dnssec=no
-    # TODO(dreisner): consider changing this to unified
-    -Ddefault-hierarchy=hybrid
-    -Ddefault-kill-user-processes=false
-    -Dfallback-hostname='archlinux'
-    -Dntp-servers="${timeservers[*]}"
-    -Drpmmacrosdir=no
-    -Dsysvinit-path=
-    -Dsysvrcnd-path=
-  )
-
-  meson "$pkgbase-stable" build "${meson_options[@]}"
-
-  ninja -C build
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  license=('GPL2' 'LGPL2.1')
-  depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 
'libcap'
-           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
-           'util-linux' 'xz')
-  provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('nss-myhostname' 'systemd-tools' 'udev')
-  conflicts=('nss-myhostname' 'systemd-tools' 'udev')
-  optdepends=('libmicrohttpd: remote journald capabilities'
-              'quota-tools: kernel-level quota management'
-              'systemd-sysvcompat: symlink package to provide sysvinit 
binaries'
-              'polkit: allow administration as unprivileged user')
-  backup=(etc/pam.d/systemd-user
-          etc/systemd/coredump.conf
-          etc/systemd/journald.conf
-          etc/systemd/journal-remote.conf
-          etc/systemd/journal-upload.conf
-          etc/systemd/logind.conf
-          etc/systemd/system.conf
-          etc/systemd/timesyncd.conf
-          etc/systemd/resolved.conf
-          etc/systemd/user.conf
-          etc/udev/udev.conf)
-  install="systemd.install"
-
-  DESTDIR="$pkgdir" ninja -C build install
-
-  # don't write units to /etc by default. some of these will be re-enabled on
-  # post_install.
-  rm -r "$pkgdir/etc/systemd/system/"*.wants
-  rm -r "$pkgdir/etc/systemd/system/"*.service
-
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" 
"$pkgdir/usr/lib/tmpfiles.d"
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
-          s#GROUP="tape"#GROUP="storage"#g;
-          s#GROUP="cdrom"#GROUP="optical"#g' 
"$pkgdir"/usr/lib/udev/rules.d/*.rules
-  sed -i 's/dialout/uucp/g;
-          s/tape/storage/g;
-          s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
-
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-systemd" 
"$pkgdir/usr/lib/initcpio/install/systemd"
-  install -Dm644 "$srcdir/initcpio-install-udev" 
"$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" 
"$pkgdir/usr/lib/initcpio/hooks/udev"
-
-  # ensure proper permissions for /var/log/journal. This is only to placate
-  chown root:systemd-journal "$pkgdir/var/log/journal"
-  chmod 2755 "$pkgdir/var/log/journal"
-
-  # match directory owner/group and mode from extra/polkit
-  chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d
-  chmod 0750     "$pkgdir"/usr/share/polkit-1/rules.d
-
-  # we'll create this on installation
-  rmdir "$pkgdir/var/log/journal/remote"
-
-  # ship default policy to leave services disabled
-  echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
-
-  # manpages shipped with systemd-sysvcompat
-  rm 
"$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
-
-  # runtime libraries shipped with libsystemd
-  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
-
-  # allow core/filesystem to pristine nsswitch.conf
-  rm "$pkgdir/usr/share/factory/etc/nsswitch.conf"
-  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf"
-
-  # add example bootctl configuration
-  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/systemd-hwdb.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook"
-  install -Dm644 "$srcdir/systemd-sysusers.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
-  install -Dm644 "$srcdir/systemd-tmpfiles.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
-  install -Dm644 "$srcdir/systemd-update.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-update.hook"
-
-  # overwrite the systemd-user PAM configuration with our own
-  install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user"
-}
-
-package_libsystemd() {
-  pkgdesc="systemd client libraries"
-  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
-  license=('GPL2')
-  provides=('libsystemd.so' 'libudev.so')
-
-  # meson does not support installing subsets of files, no?
-  # So do a full install to temporary directory, then install what we need.
-  DESTDIR="$srcdir"/full-install ninja -C build install
-
-  install -dm755 "$pkgdir"/usr/lib/
-  cp --archive "$srcdir"/full-install/usr/lib/lib{nss_*,systemd,udev}.so* 
"$pkgdir"/usr/lib/
-}
-
-package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  license=('GPL2')
-  groups=('base')
-  conflicts=('sysvinit')
-  depends=('systemd')
-
-  install -dm755 "$pkgdir"/usr/share/man/man8
-  cp -d --no-preserve=ownership,timestamp \
-    build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-    "$pkgdir"/usr/share/man/man8
-
-  install -dm755 "$pkgdir/usr/bin"
-  for tool in runlevel reboot shutdown poweroff halt telinit; do
-    ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
-  done
-
-  ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
-}
-
-# vim: ft=sh syn=sh et

Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 301713, 
systemd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD                             (rev 0)
+++ testing-x86_64/PKGBUILD     2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,278 @@
+# $Id$
+# Maintainer: Christian Hesse <m...@eworm.de>
+# Maintainer: Dave Reisner <dreis...@archlinux.org>
+# Maintainer: Tom Gundersen <t...@jklm.no>
+
+pkgbase=systemd
+pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
+# latest commit on stable branch
+_commit='d52e2bb9c20216972754c054e8534bca28baab66'
+# Bump this to latest major release for signed tag verification,
+# the commit count is handled by pkgver() function.
+pkgver=234.11
+pkgrel=6
+arch=('i686' 'x86_64')
+url="https://www.github.com/systemd/systemd";
+makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
+             'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'
+             'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'
+             'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git'
+             'meson')
+options=('strip')
+source=("git://github.com/systemd/systemd-stable.git#commit=${_commit}"
+        'git://github.com/systemd/systemd.git' # pull in for tags
+        'initcpio-hook-udev'
+        'initcpio-install-systemd'
+        'initcpio-install-udev'
+        'arch.conf'
+        'loader.conf'
+        'splash-arch.bmp'
+        'systemd-user.pam'
+        'systemd-hwdb.hook'
+        'systemd-sysusers.hook'
+        'systemd-tmpfiles.hook'
+        'systemd-update.hook')
+sha512sums=('SKIP'
+            'SKIP'
+            
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
+            
'a70a779828e03c91275df1e046f78bdface08e2a8df0245a3f6e8d5904e3dbbe5d498cbf7f32d5ce61f2fb0d0a3d440d47ce9e41352a5547d80fa1bc29687159'
+            
'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'
+            
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
+            
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
+            
'5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75'
+            
'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'
+            
'2c1f765e7cefc50f07ad994634ea25d9396e6b9c0de46e58f18377e642a471517a0dbf5eb547070a38c6ecf84ec8e030f650a6cee010871cd7a466a32534adda'
+            
'9d27d97f172a503f5b7044480a0b9ccc0c4ed5dbb2eb3b2b1aa929332c3bcfe38ef0c0310b6566f23b34f9c05b77035221164a7ab7677784c4a54664f12fca22'
+            
'0f4efddd25256e09c42b953caeee4b93eb49ecc6eaebf02e616b4dcbfdac9860c3d8a3d1a106325b2ebc4dbc6e08ac46702abcb67a06737227ccb052aaa2a067'
+            
'10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618')
+validpgpkeys=(
+  '63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering
+)
+
+_backports=(
+  # cryptsetup: fix infinite timeout (#6486)
+  '0864d311766498563331f486909a0d950ba7de87'
+
+  # process-util: add getpid_cached() as a caching wrapper for getpid()
+  '5c30a6d2b805ae9b5dd0ad003b9ee86b8965bc47'
+  # tree-wide: make use of getpid_cached() wherever we can
+  'df0ff127758809a45105893772de76082d12a26d'
+
+  # call chase_symlinks without the /sysroot prefix (#6411) (FS#54958)
+  '98eda38aed6a10c4f6d6ad0cac6e5361e87de52b'
+)
+
+_reverts=(
+)
+
+_validate_tag() {
+  local success fingerprint trusted status tag=v${pkgver%.*}
+
+  parse_gpg_statusfile /dev/stdin < <(git verify-tag --raw "$tag" 2>&1)
+
+  if (( ! success )); then
+    error 'failed to validate tag %s\n' "$tag"
+    return 1
+  fi
+
+  if ! in_array "$fingerprint" "${validpgpkeys[@]}" && (( ! trusted )); then
+    error 'unknown or untrusted public key: %s\n' "$fingerprint"
+    return 1
+  fi
+
+  case $status in
+    'expired')
+      warning 'the signature has expired'
+      ;;
+    'expiredkey')
+      warning 'the key has expired'
+      ;;
+  esac
+
+  return 0
+}
+
+pkgver() {
+  local version count
+
+  cd "$pkgbase-stable"
+
+  version="$(git describe --abbrev=0 --tags)"
+  count="$(git rev-list --count ${version}..)"
+  printf '%s.%s' "${version#v}" "${count}"
+}
+
+prepare() {
+  cd "$pkgbase-stable"
+
+  git remote add upstream ../systemd/
+  git fetch --all
+
+  _validate_tag || return
+
+  local _commit
+  for _commit in "${_backports[@]}"; do
+    git cherry-pick -n "$_commit"
+  done
+  for _commit in "${_reverts[@]}"; do
+    git revert -n "$_commit"
+  done
+
+  # core: store the invocation ID in the per-service keyring
+  # core: run each system service with a fresh session keyring
+  git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \
+    '74dd6b515fa968c5710b396a7664cac335e25ca8' \
+    -- . ':!src/test/test-id128.c' | git apply --reverse --index
+}
+
+build() {
+  local timeservers=({0..3}.arch.pool.ntp.org)
+
+  local meson_options=(
+    --buildtype=release
+    -Db_lto=true
+
+    -Daudit=false
+    -Dgnuefi=true
+    -Dima=false
+    -Dlz4=true
+
+    -Ddbuspolicydir=/usr/share/dbus-1/system.d
+    -Ddefault-dnssec=no
+    # TODO(dreisner): consider changing this to unified
+    -Ddefault-hierarchy=hybrid
+    -Ddefault-kill-user-processes=false
+    -Dfallback-hostname='archlinux'
+    -Dntp-servers="${timeservers[*]}"
+    -Drpmmacrosdir=no
+    -Dsysvinit-path=
+    -Dsysvrcnd-path=
+  )
+
+  meson "$pkgbase-stable" build "${meson_options[@]}"
+
+  ninja -C build
+}
+
+package_systemd() {
+  pkgdesc="system and service manager"
+  license=('GPL2' 'LGPL2.1')
+  depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 
'libcap'
+           'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp'
+           'util-linux' 'xz')
+  provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver")
+  replaces=('nss-myhostname' 'systemd-tools' 'udev')
+  conflicts=('nss-myhostname' 'systemd-tools' 'udev')
+  optdepends=('libmicrohttpd: remote journald capabilities'
+              'quota-tools: kernel-level quota management'
+              'systemd-sysvcompat: symlink package to provide sysvinit 
binaries'
+              'polkit: allow administration as unprivileged user')
+  backup=(etc/pam.d/systemd-user
+          etc/systemd/coredump.conf
+          etc/systemd/journald.conf
+          etc/systemd/journal-remote.conf
+          etc/systemd/journal-upload.conf
+          etc/systemd/logind.conf
+          etc/systemd/system.conf
+          etc/systemd/timesyncd.conf
+          etc/systemd/resolved.conf
+          etc/systemd/user.conf
+          etc/udev/udev.conf)
+  install="systemd.install"
+
+  DESTDIR="$pkgdir" ninja -C build install
+
+  # don't write units to /etc by default. some of these will be re-enabled on
+  # post_install.
+  rm -r "$pkgdir/etc/systemd/system/"*.wants
+  rm -r "$pkgdir/etc/systemd/system/"*.service
+
+  # add back tmpfiles.d/legacy.conf
+  install -m644 "$pkgbase-stable/tmpfiles.d/legacy.conf" 
"$pkgdir/usr/lib/tmpfiles.d"
+
+  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
+  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
+          s#GROUP="tape"#GROUP="storage"#g;
+          s#GROUP="cdrom"#GROUP="optical"#g' 
"$pkgdir"/usr/lib/udev/rules.d/*.rules
+  sed -i 's/dialout/uucp/g;
+          s/tape/storage/g;
+          s/cdrom/optical/g' "$pkgdir"/usr/lib/sysusers.d/basic.conf
+
+  # add mkinitcpio hooks
+  install -Dm644 "$srcdir/initcpio-install-systemd" 
"$pkgdir/usr/lib/initcpio/install/systemd"
+  install -Dm644 "$srcdir/initcpio-install-udev" 
"$pkgdir/usr/lib/initcpio/install/udev"
+  install -Dm644 "$srcdir/initcpio-hook-udev" 
"$pkgdir/usr/lib/initcpio/hooks/udev"
+
+  # ensure proper permissions for /var/log/journal. This is only to placate
+  chown root:systemd-journal "$pkgdir/var/log/journal"
+  chmod 2755 "$pkgdir/var/log/journal"
+
+  # match directory owner/group and mode from extra/polkit
+  chown root:102 "$pkgdir"/usr/share/polkit-1/rules.d
+  chmod 0750     "$pkgdir"/usr/share/polkit-1/rules.d
+
+  # we'll create this on installation
+  rmdir "$pkgdir/var/log/journal/remote"
+
+  # ship default policy to leave services disabled
+  echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset
+
+  # manpages shipped with systemd-sysvcompat
+  rm 
"$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+
+  # runtime libraries shipped with libsystemd
+  rm "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so*
+
+  # allow core/filesystem to pristine nsswitch.conf
+  rm "$pkgdir/usr/share/factory/etc/nsswitch.conf"
+  sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir/usr/lib/tmpfiles.d/etc.conf"
+
+  # add example bootctl configuration
+  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/systemd-hwdb.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-hwdb.hook"
+  install -Dm644 "$srcdir/systemd-sysusers.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-sysusers.hook"
+  install -Dm644 "$srcdir/systemd-tmpfiles.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-tmpfiles.hook"
+  install -Dm644 "$srcdir/systemd-update.hook" 
"$pkgdir/usr/share/libalpm/hooks/systemd-update.hook"
+
+  # overwrite the systemd-user PAM configuration with our own
+  install -Dm644 systemd-user.pam "$pkgdir/etc/pam.d/systemd-user"
+}
+
+package_libsystemd() {
+  pkgdesc="systemd client libraries"
+  depends=('glibc' 'libcap' 'libgcrypt' 'lz4' 'xz')
+  license=('GPL2')
+  provides=('libsystemd.so' 'libudev.so')
+
+  # meson does not support installing subsets of files, no?
+  # So do a full install to temporary directory, then install what we need.
+  DESTDIR="$srcdir"/full-install ninja -C build install
+
+  install -dm755 "$pkgdir"/usr/lib/
+  cp --archive "$srcdir"/full-install/usr/lib/lib{nss_*,systemd,udev}.so* 
"$pkgdir"/usr/lib/
+}
+
+package_systemd-sysvcompat() {
+  pkgdesc="sysvinit compat for systemd"
+  license=('GPL2')
+  groups=('base')
+  conflicts=('sysvinit')
+  depends=('systemd')
+
+  install -dm755 "$pkgdir"/usr/share/man/man8
+  cp -d --no-preserve=ownership,timestamp \
+    build/man/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
+    "$pkgdir"/usr/share/man/man8
+
+  install -dm755 "$pkgdir/usr/bin"
+  for tool in runlevel reboot shutdown poweroff halt telinit; do
+    ln -s 'systemctl' "$pkgdir/usr/bin/$tool"
+  done
+
+  ln -s '../lib/systemd/systemd' "$pkgdir/usr/bin/init"
+}
+
+# vim: ft=sh syn=sh et

Deleted: testing-x86_64/arch.conf
===================================================================
--- testing-x86_64/arch.conf    2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/arch.conf    2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,7 +0,0 @@
-## This is just an example config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title   Arch Linux
-linux   /vmlinuz-linux
-initrd  /initramfs-linux.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap

Copied: systemd/repos/testing-x86_64/arch.conf (from rev 301713, 
systemd/trunk/arch.conf)
===================================================================
--- testing-x86_64/arch.conf                            (rev 0)
+++ testing-x86_64/arch.conf    2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,7 @@
+## This is just an example config file.
+## Please edit the paths and kernel parameters according to your system.
+
+title   Arch Linux
+linux   /vmlinuz-linux
+initrd  /initramfs-linux.img
+options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap

Deleted: testing-x86_64/initcpio-hook-udev
===================================================================
--- testing-x86_64/initcpio-hook-udev   2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/initcpio-hook-udev   2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,22 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
-    systemd-tmpfiles --prefix=/dev --create --boot
-    /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 301713, 
systemd/trunk/initcpio-hook-udev)
===================================================================
--- testing-x86_64/initcpio-hook-udev                           (rev 0)
+++ testing-x86_64/initcpio-hook-udev   2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,22 @@
+#!/usr/bin/ash
+
+run_earlyhook() {
+    kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
+    systemd-tmpfiles --prefix=/dev --create --boot
+    /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
+    udevd_running=1
+}
+
+run_hook() {
+    msg ":: Triggering uevents..."
+    udevadm trigger --action=add --type=subsystems
+    udevadm trigger --action=add --type=devices
+    udevadm settle
+}
+
+run_cleanuphook() {
+    udevadm control --exit
+    udevadm info --cleanup-db
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: testing-x86_64/initcpio-install-systemd
===================================================================
--- testing-x86_64/initcpio-install-systemd     2017-08-07 05:54:25 UTC (rev 
301713)
+++ testing-x86_64/initcpio-install-systemd     2017-08-07 05:54:33 UTC (rev 
301714)
@@ -1,198 +0,0 @@
-#!/bin/bash
-
-strip_quotes() {
-  local len=${#1} quotes=$'[\'"]' str=${!1}
-
-  if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
-    printf -v "$1" %s "${str:1:-1}"
-  fi
-}
-
-add_udev_rule() {
-    # Add an udev rules file to the initcpio image. Dependencies on binaries
-    # will be discovered and added.
-    #   $1: path to rules file (or name of rules file)
-
-    local rules= rule= key= value= binary=
-
-    rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
-    if [[ -z $rules ]]; then
-        # complain about not found rules
-        return 1
-    fi
-
-    add_file "$rules"
-
-    while IFS=, read -ra rule; do
-        # skip empty lines, comments
-        [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
-
-        for pair in "${rule[@]}"; do
-            IFS=' =' read -r key value <<< "$pair"
-            case $key in
-                RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
-                    strip_quotes 'value'
-                    # just take the first word as the binary name
-                    binary=${value%% *}
-                    [[ ${binary:0:1} == '$' ]] && continue
-                    if [[ ${binary:0:1} != '/' ]]; then
-                        binary=$(PATH=/usr/lib/udev:/lib/udev type -P 
"$binary")
-                    fi
-                    add_binary "$binary"
-                    ;;
-            esac
-        done
-    done <"$rules"
-}
-
-add_systemd_unit() {
-    # Add a systemd unit file to the initcpio image. Hard dependencies on 
binaries
-    # and other unit files will be discovered and added.
-    #   $1: path to rules file (or name of rules file)
-
-    local unit= rule= entry= key= value= binary= dep=
-
-    unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
-    if [[ -z $unit ]]; then
-        # complain about not found unit file
-        return 1
-    fi
-
-    add_file "$unit"
-
-    while IFS='=' read -r key values; do
-        read -ra values <<< "$values"
-
-        case $key in
-            Requires|OnFailure)
-                # only add hard dependencies (not Wants)
-                map add_systemd_unit "${values[@]}"
-                ;;
-            Exec*)
-                # don't add binaries unless they are required
-                if [[ ${values[0]:0:1} != '-' ]]; then
-                    add_binary "${values[0]}"
-                fi
-                ;;
-        esac
-
-    done <"$unit"
-
-    # preserve reverse soft dependency
-    for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
-        if [[ -L $dep ]]; then
-            add_symlink "$dep"
-        fi
-    done
-
-    # add hard dependencies
-    if [[ -d $unit.requires ]]; then
-        for dep in "$unit".requires/*; do
-            add_systemd_unit ${dep##*/}
-        done
-    fi
-}
-
-add_systemd_drop_in() {
-    local unit=$1 dropin_name=$2
-
-    mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
-    cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
-}
-
-build() {
-    local rules unit
-
-    # from base
-    add_binary /bin/mount
-    add_binary /usr/bin/kmod /usr/bin/modprobe
-    add_binary /usr/lib/systemd/systemd /init
-    add_binary /usr/bin/sulogin
-
-    map add_binary \
-        /usr/bin/systemd-tmpfiles \
-        /usr/lib/systemd/systemd-hibernate-resume \
-        /usr/lib/systemd/systemd-sulogin-shell \
-        /usr/lib/systemd/system-generators/systemd-fstab-generator \
-        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
-        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
-
-    # udev rules and systemd units
-    map add_udev_rule "$rules" \
-            50-udev-default.rules \
-            60-persistent-storage.rules \
-            64-btrfs.rules \
-            80-drivers.rules \
-            99-systemd.rules
-
-    map add_systemd_unit \
-            initrd-cleanup.service \
-            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 \
-            initrd.target \
-            kmod-static-nodes.service \
-            local-fs.target \
-            local-fs-pre.target \
-            paths.target \
-            reboot.target \
-            slices.target \
-            sockets.target \
-            swap.target \
-            systemd-fsck@.service \
-            systemd-hibernate-resume@.service \
-            systemd-journald.service \
-            systemd-journald-audit.socket \
-            systemd-journald-dev-log.socket \
-            systemd-modules-load.service \
-            systemd-tmpfiles-setup-dev.service \
-            systemd-udev-trigger.service \
-            systemd-udevd-control.socket \
-            systemd-udevd-kernel.socket \
-            systemd-udevd.service \
-            timers.target \
-            rescue.target \
-            emergency.target
-
-    add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
-    add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
-
-    add_binary "$(readlink -f /usr/lib/libnss_files.so)"
-    printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
-        'passwd: files' \
-        'group: files' \
-        'shadow: files'
-
-    echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
-    echo "root:x:0:root" >"$BUILDROOT/etc/group"
-    echo "root::::::::" >"$BUILDROOT/etc/shadow"
-
-    add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
-EOF
-
-    add_dir "/etc/modules-load.d"
-    (
-      . "$_f_config"
-      set -f
-      printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
-    )
-}
-
-help() {
-    cat <<HELPEOF
-This will install a basic systemd setup in your initramfs, and is meant to
-replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime
-components will need to be ported, and will not work as intended. You also may
-wish to still include the 'base' hook (before this hook) to ensure that a
-rescue shell exists on your initramfs.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-x86_64/initcpio-install-systemd (from rev 301713, 
systemd/trunk/initcpio-install-systemd)
===================================================================
--- testing-x86_64/initcpio-install-systemd                             (rev 0)
+++ testing-x86_64/initcpio-install-systemd     2017-08-07 05:54:33 UTC (rev 
301714)
@@ -0,0 +1,198 @@
+#!/bin/bash
+
+strip_quotes() {
+  local len=${#1} quotes=$'[\'"]' str=${!1}
+
+  if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
+    printf -v "$1" %s "${str:1:-1}"
+  fi
+}
+
+add_udev_rule() {
+    # Add an udev rules file to the initcpio image. Dependencies on binaries
+    # will be discovered and added.
+    #   $1: path to rules file (or name of rules file)
+
+    local rules= rule= key= value= binary=
+
+    rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")
+    if [[ -z $rules ]]; then
+        # complain about not found rules
+        return 1
+    fi
+
+    add_file "$rules"
+
+    while IFS=, read -ra rule; do
+        # skip empty lines, comments
+        [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue
+
+        for pair in "${rule[@]}"; do
+            IFS=' =' read -r key value <<< "$pair"
+            case $key in
+                RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+                    strip_quotes 'value'
+                    # just take the first word as the binary name
+                    binary=${value%% *}
+                    [[ ${binary:0:1} == '$' ]] && continue
+                    if [[ ${binary:0:1} != '/' ]]; then
+                        binary=$(PATH=/usr/lib/udev:/lib/udev type -P 
"$binary")
+                    fi
+                    add_binary "$binary"
+                    ;;
+            esac
+        done
+    done <"$rules"
+}
+
+add_systemd_unit() {
+    # Add a systemd unit file to the initcpio image. Hard dependencies on 
binaries
+    # and other unit files will be discovered and added.
+    #   $1: path to rules file (or name of rules file)
+
+    local unit= rule= entry= key= value= binary= dep=
+
+    unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")
+    if [[ -z $unit ]]; then
+        # complain about not found unit file
+        return 1
+    fi
+
+    add_file "$unit"
+
+    while IFS='=' read -r key values; do
+        read -ra values <<< "$values"
+
+        case $key in
+            Requires|OnFailure)
+                # only add hard dependencies (not Wants)
+                map add_systemd_unit "${values[@]}"
+                ;;
+            Exec*)
+                # don't add binaries unless they are required
+                if [[ ${values[0]:0:1} != '-' ]]; then
+                    add_binary "${values[0]}"
+                fi
+                ;;
+        esac
+
+    done <"$unit"
+
+    # preserve reverse soft dependency
+    for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+        if [[ -L $dep ]]; then
+            add_symlink "$dep"
+        fi
+    done
+
+    # add hard dependencies
+    if [[ -d $unit.requires ]]; then
+        for dep in "$unit".requires/*; do
+            add_systemd_unit ${dep##*/}
+        done
+    fi
+}
+
+add_systemd_drop_in() {
+    local unit=$1 dropin_name=$2
+
+    mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"
+    cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"
+}
+
+build() {
+    local rules unit
+
+    # from base
+    add_binary /bin/mount
+    add_binary /usr/bin/kmod /usr/bin/modprobe
+    add_binary /usr/lib/systemd/systemd /init
+    add_binary /usr/bin/sulogin
+
+    map add_binary \
+        /usr/bin/systemd-tmpfiles \
+        /usr/lib/systemd/systemd-hibernate-resume \
+        /usr/lib/systemd/systemd-sulogin-shell \
+        /usr/lib/systemd/system-generators/systemd-fstab-generator \
+        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
+        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+    # udev rules and systemd units
+    map add_udev_rule "$rules" \
+            50-udev-default.rules \
+            60-persistent-storage.rules \
+            64-btrfs.rules \
+            80-drivers.rules \
+            99-systemd.rules
+
+    map add_systemd_unit \
+            initrd-cleanup.service \
+            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 \
+            initrd.target \
+            kmod-static-nodes.service \
+            local-fs.target \
+            local-fs-pre.target \
+            paths.target \
+            reboot.target \
+            slices.target \
+            sockets.target \
+            swap.target \
+            systemd-fsck@.service \
+            systemd-hibernate-resume@.service \
+            systemd-journald.service \
+            systemd-journald-audit.socket \
+            systemd-journald-dev-log.socket \
+            systemd-modules-load.service \
+            systemd-tmpfiles-setup-dev.service \
+            systemd-udev-trigger.service \
+            systemd-udevd-control.socket \
+            systemd-udevd-kernel.socket \
+            systemd-udevd.service \
+            timers.target \
+            rescue.target \
+            emergency.target
+
+    add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+    add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
+
+    add_binary "$(readlink -f /usr/lib/libnss_files.so)"
+    printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \
+        'passwd: files' \
+        'group: files' \
+        'shadow: files'
+
+    echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+    echo "root:x:0:root" >"$BUILDROOT/etc/group"
+    echo "root::::::::" >"$BUILDROOT/etc/shadow"
+
+    add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
+[Service]
+ExecStart=
+ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
+EOF
+
+    add_dir "/etc/modules-load.d"
+    (
+      . "$_f_config"
+      set -f
+      printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+    )
+}
+
+help() {
+    cat <<HELPEOF
+This will install a basic systemd setup in your initramfs, and is meant to
+replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime
+components will need to be ported, and will not work as intended. You also may
+wish to still include the 'base' hook (before this hook) to ensure that a
+rescue shell exists on your initramfs.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: testing-x86_64/initcpio-install-udev
===================================================================
--- testing-x86_64/initcpio-install-udev        2017-08-07 05:54:25 UTC (rev 
301713)
+++ testing-x86_64/initcpio-install-udev        2017-08-07 05:54:33 UTC (rev 
301714)
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_binary /usr/lib/systemd/systemd-udevd
-    add_binary /usr/bin/udevadm
-    add_binary /usr/bin/systemd-tmpfiles
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 
64-btrfs.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook adds the udev daemon to the initramfs, allowing for dynamic loading
-of modules and reliable detection of the root device via tags (e.g. UUID or
-LABEL). Do not remove this hook unless you are using the systemd hook, or you
-know what you're doing.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Copied: systemd/repos/testing-x86_64/initcpio-install-udev (from rev 301713, 
systemd/trunk/initcpio-install-udev)
===================================================================
--- testing-x86_64/initcpio-install-udev                                (rev 0)
+++ testing-x86_64/initcpio-install-udev        2017-08-07 05:54:33 UTC (rev 
301714)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+build() {
+    local rules tool
+
+    add_binary /usr/lib/systemd/systemd-udevd
+    add_binary /usr/bin/udevadm
+    add_binary /usr/bin/systemd-tmpfiles
+
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 
64-btrfs.rules 80-drivers.rules; do
+        add_file "/usr/lib/udev/rules.d/$rules"
+    done
+    for tool in ata_id scsi_id; do
+        add_file "/usr/lib/udev/$tool"
+    done
+
+    add_runscript
+}
+
+help() {
+    cat <<HELPEOF
+This hook adds the udev daemon to the initramfs, allowing for dynamic loading
+of modules and reliable detection of the root device via tags (e.g. UUID or
+LABEL). Do not remove this hook unless you are using the systemd hook, or you
+know what you're doing.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:

Deleted: testing-x86_64/loader.conf
===================================================================
--- testing-x86_64/loader.conf  2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/loader.conf  2017-08-07 05:54:33 UTC (rev 301714)
@@ -1 +0,0 @@
-default arch

Copied: systemd/repos/testing-x86_64/loader.conf (from rev 301713, 
systemd/trunk/loader.conf)
===================================================================
--- testing-x86_64/loader.conf                          (rev 0)
+++ testing-x86_64/loader.conf  2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1 @@
+default arch

Deleted: testing-x86_64/splash-arch.bmp
===================================================================
(Binary files differ)

Copied: systemd/repos/testing-x86_64/splash-arch.bmp (from rev 301713, 
systemd/trunk/splash-arch.bmp)
===================================================================
(Binary files differ)

Deleted: testing-x86_64/systemd-hwdb.hook
===================================================================
--- testing-x86_64/systemd-hwdb.hook    2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/systemd-hwdb.hook    2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,11 +0,0 @@
-[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/systemd-hwdb --usr update

Copied: systemd/repos/testing-x86_64/systemd-hwdb.hook (from rev 301713, 
systemd/trunk/systemd-hwdb.hook)
===================================================================
--- testing-x86_64/systemd-hwdb.hook                            (rev 0)
+++ testing-x86_64/systemd-hwdb.hook    2017-08-07 05:54:33 UTC (rev 301714)
@@ -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/systemd-hwdb --usr update

Deleted: testing-x86_64/systemd-sysusers.hook
===================================================================
--- testing-x86_64/systemd-sysusers.hook        2017-08-07 05:54:25 UTC (rev 
301713)
+++ testing-x86_64/systemd-sysusers.hook        2017-08-07 05:54:33 UTC (rev 
301714)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/sysusers.d/*.conf
-
-[Action]
-Description = Updating system user accounts...
-When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
-NeedsTargets

Copied: systemd/repos/testing-x86_64/systemd-sysusers.hook (from rev 301713, 
systemd/trunk/systemd-sysusers.hook)
===================================================================
--- testing-x86_64/systemd-sysusers.hook                                (rev 0)
+++ testing-x86_64/systemd-sysusers.hook        2017-08-07 05:54:33 UTC (rev 
301714)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/sysusers.d/*.conf
+
+[Action]
+Description = Updating system user accounts...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-sysusers "/$f" ; done'
+NeedsTargets

Deleted: testing-x86_64/systemd-tmpfiles.hook
===================================================================
--- testing-x86_64/systemd-tmpfiles.hook        2017-08-07 05:54:25 UTC (rev 
301713)
+++ testing-x86_64/systemd-tmpfiles.hook        2017-08-07 05:54:33 UTC (rev 
301714)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Target = usr/lib/tmpfiles.d/*.conf
-
-[Action]
-Description = Creating temporary files...
-When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create 
"/$f"; done'
-NeedsTargets

Copied: systemd/repos/testing-x86_64/systemd-tmpfiles.hook (from rev 301713, 
systemd/trunk/systemd-tmpfiles.hook)
===================================================================
--- testing-x86_64/systemd-tmpfiles.hook                                (rev 0)
+++ testing-x86_64/systemd-tmpfiles.hook        2017-08-07 05:54:33 UTC (rev 
301714)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = usr/lib/tmpfiles.d/*.conf
+
+[Action]
+Description = Creating temporary files...
+When = PostTransaction
+Exec = /bin/sh -c 'while read -r f; do /usr/bin/systemd-tmpfiles --create 
"/$f"; done'
+NeedsTargets

Deleted: testing-x86_64/systemd-update.hook
===================================================================
--- testing-x86_64/systemd-update.hook  2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/systemd-update.hook  2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/
-
-[Action]
-Description = Arming ConditionNeedsUpdate...
-When = PostTransaction
-Exec = /usr/bin/touch -c /usr

Copied: systemd/repos/testing-x86_64/systemd-update.hook (from rev 301713, 
systemd/trunk/systemd-update.hook)
===================================================================
--- testing-x86_64/systemd-update.hook                          (rev 0)
+++ testing-x86_64/systemd-update.hook  2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/
+
+[Action]
+Description = Arming ConditionNeedsUpdate...
+When = PostTransaction
+Exec = /usr/bin/touch -c /usr

Deleted: testing-x86_64/systemd-user.pam
===================================================================
--- testing-x86_64/systemd-user.pam     2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/systemd-user.pam     2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,5 +0,0 @@
-# Used by systemd --user instances.
-
-account  include system-login
-session  required pam_loginuid.so
-session  include system-login

Copied: systemd/repos/testing-x86_64/systemd-user.pam (from rev 301713, 
systemd/trunk/systemd-user.pam)
===================================================================
--- testing-x86_64/systemd-user.pam                             (rev 0)
+++ testing-x86_64/systemd-user.pam     2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,5 @@
+# Used by systemd --user instances.
+
+account  include system-login
+session  required pam_loginuid.so
+session  include system-login

Deleted: testing-x86_64/systemd.install
===================================================================
--- testing-x86_64/systemd.install      2017-08-07 05:54:25 UTC (rev 301713)
+++ testing-x86_64/systemd.install      2017-08-07 05:54:33 UTC (rev 301714)
@@ -1,99 +0,0 @@
-#!/bin/bash
-
-sd_booted() {
-  [[ -d run/systemd/system && ! -L run/systemd/system ]]
-}
-
-add_journal_acls() {
-  # ignore errors, since the filesystem might not support ACLs
-  setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 
2>/dev/null
-  :
-}
-
-post_common() {
-  systemd-sysusers
-  journalctl --update-catalog
-}
-
-_216_2_changes() {
-  echo ':: Coredumps are handled by systemd by default. Collection behavior 
can be'
-  echo '   tuned in /etc/systemd/coredump.conf.'
-}
-
-_219_2_changes() {
-  if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
-    chgrp systemd-journal-remote var/log/journal/remote
-  fi
-}
-
-_219_4_changes() {
-  if ! systemctl is-enabled -q remote-fs.target; then
-    systemctl enable -q remote-fs.target
-  fi
-}
-
-_230_1_changes() {
-  echo ':: systemd-bootchart is no longer included with systemd'
-}
-
-_232_8_changes() {
-  # paper over possible effects of CVE-2016-10156
-  local stamps=(/var/lib/systemd/timers/*.timer)
-
-  if [[ -f ${stamps[0]} ]]; then
-    chmod 0644 "${stamps[@]}"
-  fi
-}
-
-_233_75_3_changes() {
-  # upstream installs services to /etc, which we remove
-  # to keep bus activation we re-enable systemd-resolved
-  if systemctl is-enabled -q systemd-resolved.service; then
-    systemctl reenable systemd-resolved.service 2>/dev/null
-  fi
-}
-
-post_install() {
-  systemd-machine-id-setup
-
-  post_common "$@"
-
-  add_journal_acls
-
-  # enable some services by default, but don't track them
-  systemctl enable getty@tty1.service remote-fs.target
-
-  echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line 
in your"
-  echo "   bootloader to replace sysvinit with systemd, or install 
systemd-sysvcompat"
-
-  # group 'systemd-journal-remote' is created by systemd-sysusers
-  mkdir -m2755 var/log/journal/remote
-  chgrp systemd-journal-remote var/log/journal/remote
-}
-
-post_upgrade() {
-  post_common "$@"
-
-  # don't reexec if the old version is 231-1 or 231-2.
-  # https://github.com/systemd/systemd/commit/bd64d82c1c
-  if [[ $1 != 231-[12] ]] && sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-
-  local v upgrades=(
-    216-2
-    219-2
-    219-4
-    230-1
-    232-8
-    233.75-3
-  )
-
-  for v in "${upgrades[@]}"; do
-    if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
-      "_${v//[.-]/_}_changes"
-    fi
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: systemd/repos/testing-x86_64/systemd.install (from rev 301713, 
systemd/trunk/systemd.install)
===================================================================
--- testing-x86_64/systemd.install                              (rev 0)
+++ testing-x86_64/systemd.install      2017-08-07 05:54:33 UTC (rev 301714)
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+sd_booted() {
+  [[ -d run/systemd/system && ! -L run/systemd/system ]]
+}
+
+add_journal_acls() {
+  # ignore errors, since the filesystem might not support ACLs
+  setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 
2>/dev/null
+  :
+}
+
+post_common() {
+  systemd-sysusers
+  journalctl --update-catalog
+}
+
+_216_2_changes() {
+  echo ':: Coredumps are handled by systemd by default. Collection behavior 
can be'
+  echo '   tuned in /etc/systemd/coredump.conf.'
+}
+
+_219_2_changes() {
+  if mkdir -m2755 var/log/journal/remote 2>/dev/null; then
+    chgrp systemd-journal-remote var/log/journal/remote
+  fi
+}
+
+_219_4_changes() {
+  if ! systemctl is-enabled -q remote-fs.target; then
+    systemctl enable -q remote-fs.target
+  fi
+}
+
+_230_1_changes() {
+  echo ':: systemd-bootchart is no longer included with systemd'
+}
+
+_232_8_changes() {
+  # paper over possible effects of CVE-2016-10156
+  local stamps=(/var/lib/systemd/timers/*.timer)
+
+  if [[ -f ${stamps[0]} ]]; then
+    chmod 0644 "${stamps[@]}"
+  fi
+}
+
+_233_75_3_changes() {
+  # upstream installs services to /etc, which we remove
+  # to keep bus activation we re-enable systemd-resolved
+  if systemctl is-enabled -q systemd-resolved.service; then
+    systemctl reenable systemd-resolved.service 2>/dev/null
+  fi
+}
+
+post_install() {
+  systemd-machine-id-setup
+
+  post_common "$@"
+
+  add_journal_acls
+
+  # enable some services by default, but don't track them
+  systemctl enable getty@tty1.service remote-fs.target
+
+  echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line 
in your"
+  echo "   bootloader to replace sysvinit with systemd, or install 
systemd-sysvcompat"
+
+  # group 'systemd-journal-remote' is created by systemd-sysusers
+  mkdir -m2755 var/log/journal/remote
+  chgrp systemd-journal-remote var/log/journal/remote
+}
+
+post_upgrade() {
+  post_common "$@"
+
+  # don't reexec if the old version is 231-1 or 231-2.
+  # https://github.com/systemd/systemd/commit/bd64d82c1c
+  if [[ $1 != 231-[12] ]] && sd_booted; then
+    systemctl --system daemon-reexec
+  fi
+
+  local v upgrades=(
+    216-2
+    219-2
+    219-4
+    230-1
+    232-8
+    233.75-3
+  )
+
+  for v in "${upgrades[@]}"; do
+    if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+      "_${v//[.-]/_}_changes"
+    fi
+  done
+}
+
+# vim:set ts=2 sw=2 et:

Reply via email to