[arch-commits] Commit in systemd/trunk (PKGBUILD use-split-usr-path.patch)

[Ionut Biru]

    Date: Friday, July 27, 2012 @ 10:26:01
  Author: ibiru
Revision: 164196

use split user path

Added:
  systemd/trunk/use-split-usr-path.patch
Modified:
  systemd/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    9 ++++++---
 use-split-usr-path.patch |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-27 14:22:36 UTC (rev 164195)
+++ PKGBUILD	2012-07-27 14:26:01 UTC (rev 164196)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
 pkgver=187
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,19 +16,22 @@
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
-        'locale.sh')
+        'locale.sh'
+        'use-split-usr-path.patch')
 md5sums=('26606e3c84448800ef0b3ffd57e6e8b6'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
-         'f15956945052bb911e5df81cf5e7e5dc')
+         'f15956945052bb911e5df81cf5e7e5dc'
+         '482dba45a783f06c2239f1355f4ce72f')
 
 build() {
   cd "$pkgname-$pkgver"
 
   # still waiting on ipw2x00 to get fixed...
   patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
+  patch -Np1 < "$srcdir/use-split-usr-path.patch"
 
   ./configure \
       --libexecdir=/usr/lib \

Added: use-split-usr-path.patch
===================================================================
--- use-split-usr-path.patch	                        (rev 0)
+++ use-split-usr-path.patch	2012-07-27 14:26:01 UTC (rev 164196)
@@ -0,0 +1,14 @@
+--- a/src/core/main.c	2012-07-17 19:46:24.000000000 -0400
++++ b/src/core/main.c	2012-07-27 10:04:13.000000000 -0400
+@@ -1379,11 +1379,7 @@
+ 
+         /* Set up PATH unless it is already set */
+         setenv("PATH",
+-#ifdef HAVE_SPLIT_USR
+                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+-#else
+-               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
+-#endif
+                arg_running_as == MANAGER_SYSTEM);
+ 
+         if (arg_running_as == MANAGER_SYSTEM) {