Wed Mar 5 03:57:00 UTC 2014

1 files changed, 16 insertions, 86 deletions

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 6943b7e56..e786d6197 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,91 +3,22 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=208
-pkgrel=11
+pkgver=210
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
-makedepends=('acl' 'cryptsetup' 'libdbus' 'docbook-xsl' 'gobject-introspection' 'gperf'
+makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
-             'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
+             'linux-api-headers' 'pam' 'python' 'python-lxml' 'quota-tools' 'xz')
 options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
-        'initcpio-install-udev'
-        '0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch'
-        '0001-Make-hibernation-test-work-for-swap-files.patch'
-        '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
-        '0001-mount-check-for-NULL-before-reading-pm-what.patch'
-        '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch'
-        '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch'
-        '0001-fstab-generator-When-parsing-the-root-cmdline-option.patch'
-        '0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch'
-        '0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch'
-        '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch'
-        '0005-mount-service-drop-FsckPassNo-support.patch'
-        '0006-efi-boot-generator-hookup-to-fsck.patch'
-        '0007-fsck-root-only-run-when-requested-in-fstab.patch'
-        '0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch'
-        '0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch'
-        '0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch'
-        '0001-do-not-accept-garbage-from-acpi-firmware-performance.patch'
-        '0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch')
-md5sums=('df64550d92afbffb4f67a434193ee165'
+        'initcpio-install-udev')
+md5sums=('03efddf8c9eca36d4d590f9967e7e818'
          '29245f7a240bfba66e2b1783b63b6b40'
-         '8b68b0218a3897d4d37a6ccf47914774'
-         'bde43090d4ac0ef048e3eaee8202a407'
-         '8f1182afa1156f0076a912b23e761e02'
-         'a5c6564d5435ee99814effd2aa9baf93'
-         '1b191c4e7a209d322675fd199e3abc66'
-         'a693bef63548163ffc165f4c4801ebf7'
-         'ccafe716d87df9c42af0d1960b5a4105'
-         '441e3d464ee6af5fe4af6a8bc10d7980'
-         '718d841203cf2ea9e24a7d0f1d19d48b'
-         '623c77bad0d2968e44963d72924825f1'
-         'e52fc8368853c7800ab03ab8868cfd41'
-         '2096f33bd36dfa0a7f0431d0a429787a'
-         'd2481a6ea199b581e243a950125b0ca6'
-         'c2aee634a3a6c50778968f0d5c756f40'
-         'ef8b8212d504bb73c10bf4e85f0703b2'
-         '4ba2317bf4d7708fca406f49482b1bf3'
-         '078f10d6fc315b329844cd20fa742eee'
-         'f3e4e5b840cace769556e802466574da'
-         '707d64bad7461c04d4cfce21bfddf712'
-         '13232b7f28100e40990dde1c9e411596')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
-  patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
-  patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
-  # Fix lingering user managers
-  patch -Np1 < "$srcdir"/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
-  # Backport changes in fstab passno handling
-  # Basically, we only need 0001 and 0007, but 0007 is based on earlier patches,
-  # and it doesn't hurt to backport them all.
-  patch -Np1 < "$srcdir"/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
-  patch -Np1 < "$srcdir"/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
-  patch -Np1 < "$srcdir"/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
-  patch -Np1 < "$srcdir"/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
-  patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch
-  patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch
-  patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch
-  # Fix FS#38210 (result of the previous backport)
-  patch -Np1 < "$srcdir"/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
-  # Fix FS#38123
-  patch -Np1 < "$srcdir"/0001-Make-hibernation-test-work-for-swap-files.patch
-  # Fix FS#35671
-  patch -Np1 <"$srcdir"/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
-  # Fix FS#38403
-  patch -Np1 <"$srcdir"/0001-acpi-fpdt-break-on-zero-or-negative-length-read.patch
-  patch -Np1 <"$srcdir"/0001-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch
-  patch -Np1 <"$srcdir"/0001-d""o-not-accept-garbage-from-acpi-firmware-performance.patch
-  patch -Np1 <"$srcdir"/0001-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
-
-  autoreconf
-}
+         '5e04f468a13ae2b9d6a9dfc77c49a7d1'
+         'bde43090d4ac0ef048e3eaee8202a407')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -98,8 +29,10 @@ build() {
       --sysconfdir=/etc \
       --enable-introspection \
       --enable-gtk-doc \
+      --enable-compat-libs \
       --disable-audit \
       --disable-ima \
+      --disable-kdbus \
       --with-sysvinit-path= \
       --with-sysvrcnd-path= \
       --with-firmware-path="/usr/lib/firmware/updates:/usr/lib/firmware"
@@ -114,10 +47,10 @@ check() {
 package_systemd() {
   pkgdesc="system and service manager"
   license=('GPL2' 'LGPL2.1' 'MIT')
-  depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
-           'pam' 'util-linux' 'xz')
+  depends=('acl' 'bash' 'dbus' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
+           'pam' 'libseccomp' 'util-linux' 'xz')
   provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
-            'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
+            'libgudev-1.0.so' 'libsystemd.so' 'libsystemd-daemon.so' 'libsystemd-id128.so'
             'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so')
   replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
   conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev')
@@ -143,13 +76,10 @@ package_systemd() {
 
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
-  # fix .so links in manpage stubs
-  find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
-      -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
-
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
+  # don't write units to /etc by default -- we'll enable the getty on
+  # post_install as a sane default.
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
+  rm "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service"
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
 
   # get rid of RPM macros