[arch-commits] Commit in systemd/trunk (2 files)

[Dave Reisner]

    Date: Saturday, February 22, 2014 @ 21:38:47
  Author: dreisner
Revision: 206250

upgpkg: systemd 209-3

- backport fix for crash on bootup with timer units
- remove hackaround for manpage redirects

Added:
  systemd/trunk/0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch
Modified:
  systemd/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch |   30 ++++++++++
 PKGBUILD                                                     |   22 ++++---
 2 files changed, 44 insertions(+), 8 deletions(-)

Added: 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch
===================================================================
--- 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch	                        (rev 0)
+++ 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch	2014-02-22 20:38:47 UTC (rev 206250)
@@ -0,0 +1,30 @@
+From 9ac441c0f40a10a6c498398e5876a5256b833e31 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas at archlinux.org>
+Date: Fri, 21 Feb 2014 11:20:24 +0100
+Subject: [PATCH] sd-event: Fix systemd crash when using timer units.
+
+There was a copy-paste error introduced in commit c2ba3ad6604ef2e189d7e0a36d6911116e84d3ab
+which causes the following error when using timer units:
+
+Assertion '(x->type == SOURCE_MONOTONIC && y->type == SOURCE_MONOTONIC) || (x->type == SOURCE_REALTIME && y->type == SOURCE_REALTIME)'
+failed at src/libsystemd/sd-event/sd-event.c:264, function latest_time_prioq_compare(). Aborting.
+---
+ src/libsystemd/sd-event/sd-event.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
+index 25dfd17..1f039bc 100644
+--- a/src/libsystemd/sd-event/sd-event.c
++++ b/src/libsystemd/sd-event/sd-event.c
+@@ -771,7 +771,7 @@ _public_ int sd_event_add_realtime(sd_event *e,
+                                    sd_event_time_handler_t callback,
+                                    void *userdata) {
+ 
+-        return event_add_time_internal(e, ret, SOURCE_REALTIME, &e->realtime_fd, CLOCK_REALTIME, &e->realtime_earliest, &e->monotonic_latest, usec, accuracy, callback, userdata);
++        return event_add_time_internal(e, ret, SOURCE_REALTIME, &e->realtime_fd, CLOCK_REALTIME, &e->realtime_earliest, &e->realtime_latest, usec, accuracy, callback, userdata);
+ }
+ 
+ static int event_update_signal_fd(sd_event *e) {
+-- 
+1.9.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-22 18:40:57 UTC (rev 206249)
+++ PKGBUILD	2014-02-22 20:38:47 UTC (rev 206250)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=209
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -12,14 +12,22 @@
              'linux-api-headers' 'pam' 'python' 'python-lxml' 'quota-tools' 'xz')
 options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        '0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch'
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev')
 md5sums=('2c7a7c8ffede079a3e1b241565bd4ed7'
+         'bd3f3d91daf425bf76e55682a7274622'
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
          'bde43090d4ac0ef048e3eaee8202a407')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <../0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch
+}
+
 build() {
   cd "$pkgname-$pkgver"
 
@@ -40,9 +48,9 @@
   make
 }
 
-#check() {
-#  make -C "$pkgname-$pkgver" check || :
-#}
+check() {
+  make -C "$pkgname-$pkgver" check || :
+}
 
 package_systemd() {
   pkgdesc="system and service manager"
@@ -76,12 +84,10 @@
 
   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
+  # TODO(dreisner): handle systemd-networkd in the same way in 210 since it'll
+  # have the same "auto opt-in" behavior.
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty at tty1.service"
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants"