summaryrefslogtreecommitdiff
path: root/testing/systemd
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-07-29 00:03:59 +0000
committerroot <root@rshg054.dnsready.net>2012-07-29 00:03:59 +0000
commitddab05fd84b7fa1d67fcd18b532f0427189d8df1 (patch)
tree3a7175c54dfa9c4ae09f2b009b209134af81ba63 /testing/systemd
parent4704d1255f08718ed432ba919b4087d0a52ce5a7 (diff)
Sun Jul 29 00:03:59 UTC 2012
Diffstat (limited to 'testing/systemd')
-rw-r--r--testing/systemd/PKGBUILD9
-rw-r--r--testing/systemd/use-split-usr-path.patch14
2 files changed, 20 insertions, 3 deletions
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
index e8f6573ff..82ac3b88f 100644
--- a/testing/systemd/PKGBUILD
+++ b/testing/systemd/PKGBUILD
@@ -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 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'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 \
diff --git a/testing/systemd/use-split-usr-path.patch b/testing/systemd/use-split-usr-path.patch
new file mode 100644
index 000000000..057045bf1
--- /dev/null
+++ b/testing/systemd/use-split-usr-path.patch
@@ -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) {