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

[Dave Reisner]

    Date: Thursday, September 27, 2012 @ 21:01:33
  Author: dreisner
Revision: 167206

upgpkg: systemd 193-1

- backport patch to fix tmpfiles file creation (FS#31705)

Added:
  systemd/trunk/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
Modified:
  systemd/trunk/PKGBUILD

-------------------------------------------------------+
 0001-tmpfiles-restore-previous-behavior-for-F-f.patch |   30 ++++++++++++++++
 PKGBUILD                                              |    9 +++-
 2 files changed, 37 insertions(+), 2 deletions(-)

Added: 0001-tmpfiles-restore-previous-behavior-for-F-f.patch
===================================================================
--- 0001-tmpfiles-restore-previous-behavior-for-F-f.patch	                        (rev 0)
+++ 0001-tmpfiles-restore-previous-behavior-for-F-f.patch	2012-09-28 01:01:33 UTC (rev 167206)
@@ -0,0 +1,30 @@
+From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Thu, 27 Sep 2012 20:48:13 -0400
+Subject: [PATCH] tmpfiles: restore previous behavior for F/f
+
+d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
+them to glob_item(). Restore the old behavior and shortcut straight to
+write_one_file().
+---
+ src/tmpfiles/tmpfiles.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index f10f908..bf900fa 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -673,6 +673,10 @@ static int create_item(Item *i) {
+ 
+         case CREATE_FILE:
+         case TRUNCATE_FILE:
++                r = write_one_file(i, i->path);
++                if (r < 0)
++                        return r;
++                break;
+         case WRITE_FILE:
+                 r = glob_item(i, write_one_file);
+                 if (r < 0)
+-- 
+1.7.12.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-27 23:00:52 UTC (rev 167205)
+++ PKGBUILD	2012-09-28 01:01:33 UTC (rev 167206)
@@ -3,7 +3,7 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=192
+pkgver=193
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -18,12 +18,14 @@
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
+        '0001-tmpfiles-restore-previous-behavior-for-F-f.patch'
         'use-split-usr-path.patch')
-md5sums=('e8692055923e87f7f9cb634d44314edb'
+md5sums=('732a9de2b1d2a15cab639c987ff9e90e'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
+         '1f435290db227c3a4f4396f86819227e'
          'fd5b5f04ab0a847373d357555129d4c0')
 
 build() {
@@ -35,6 +37,9 @@
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
+  # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0
+  patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch"
+
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \