Thu Sep 19 02:13:45 PDT 2013

1 files changed, 27 insertions, 21 deletions

diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 9b17e6d8f..6a84686ad 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,43 +3,41 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=204
+pkgver=207
 pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
 options=('!libtool')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
-        0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
         'initcpio-hook-udev'
+        'initcpio-install-systemd'
         'initcpio-install-udev'
-        'initcpio-install-timestamp')
-md5sums=('a07619bb19f48164fbf0761d12fd39a8'
-         '7f39f9fde1ff7b48293ed1e3d0a6c213'
-         '66e3162856ded8eb7dc7383405c6e0d6'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'fb37e34ea006c79be1c54cbb0f803414'
-         'df69615503ad293c9ddf9d8b7755282d')
+        0001-polkit-Avoid-race-condition-in-scraping-proc.patch
+        0001-swap-fix-reverse-dependencies.patch
+        0002-swap-create-.wants-symlink-to-auto-swap-devices.patch)
+md5sums=('7799f3cc9d289b8db1c1fa56ae7ecd88'
+         '2de72238ed5c0df62a7c3b6bdaf8cb7c'
+         '9027b31a875e74a45623954b3b23d09f'
+         'd83d45e67cd75cdbafb81c96a7485319'
+         '9eb0a46aa2a3a6d74117f9a174dbe168'
+         '182be4c729aaecde249b7b05b48a481f'
+         'b54fbe35e2689ac36cda9ac4a5a86f24')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch"
-
-  patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch"
-
-  autoreconf
+  patch -Np1 <"$srcdir"/0001-swap-fix-reverse-dependencies.patch
+  patch -Np1 <"$srcdir"/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
+  patch -Np1 <"$srcdir"/0001-polkit-Avoid-race-condition-in-scraping-proc.patch
 }
 
 build() {
   cd "$pkgname-$pkgver"
 
   ./configure \
-      --enable-static \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
       --sysconfdir=/etc \
@@ -61,6 +59,7 @@ 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')
   provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver"
@@ -77,11 +76,13 @@ package_systemd() {
           etc/dbus-1/system.d/org.freedesktop.hostname1.conf
           etc/dbus-1/system.d/org.freedesktop.login1.conf
           etc/dbus-1/system.d/org.freedesktop.locale1.conf
+          etc/dbus-1/system.d/org.freedesktop.machine1.conf
           etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/systemd/bootchart.conf
+          etc/systemd/journald.conf
+          etc/systemd/logind.conf
           etc/systemd/system.conf
           etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf
           etc/udev/udev.conf)
   install="systemd.install"
 
@@ -99,7 +100,7 @@ package_systemd() {
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
 
   # get rid of RPM macros
-  rm -r "$pkgdir/etc/rpm"
+  rm -r "$pkgdir/usr/lib/rpm/macros.d"
 
   # add back tmpfiles.d/legacy.conf
   install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
@@ -110,19 +111,24 @@ package_systemd() {
           s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
 
   # 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"
-  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
 
   ### split out manpages for sysvcompat
   rm -rf "$srcdir/_sysvcompat"
   install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
   mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
      "$srcdir"/_sysvcompat/usr/share/man/man8
+
+  # include MIT license, since it's technically custom
+  install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
+      "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
 }
 
 package_systemd-sysvcompat() {
   pkgdesc="sysvinit compat for systemd"
+  license=('GPL2')
   groups=('base')
   conflicts=('sysvinit')
   depends=('sysvinit-tools' 'systemd')