[arch-commits] Commit in systemd/trunk (2 files)
Dave Reisner
dreisner at nymeria.archlinux.org
Fri Mar 8 01:03:32 UTC 2013
Date: Friday, March 8, 2013 @ 02:03:31
Author: dreisner
Revision: 179606
upgpkg: systemd 198-1
Modified:
systemd/trunk/PKGBUILD
Deleted:
systemd/trunk/0001-dbus-fix-serialization-of-calendar-timers.patch
------------------------------------------------------+
0001-dbus-fix-serialization-of-calendar-timers.patch | 62 -----------------
PKGBUILD | 28 +------
2 files changed, 4 insertions(+), 86 deletions(-)
Deleted: 0001-dbus-fix-serialization-of-calendar-timers.patch
===================================================================
--- 0001-dbus-fix-serialization-of-calendar-timers.patch 2013-03-07 18:13:59 UTC (rev 179605)
+++ 0001-dbus-fix-serialization-of-calendar-timers.patch 2013-03-08 01:03:31 UTC (rev 179606)
@@ -1,62 +0,0 @@
-From 3761902e2e120849c283106fd4b78b6adec7367e Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Tue, 8 Jan 2013 20:00:01 +0100
-Subject: [PATCH] dbus: fix serialization of calendar timers
-
----
- src/core/dbus-timer.c | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
-index 11d18cb..b22fcb5 100644
---- a/src/core/dbus-timer.c
-+++ b/src/core/dbus-timer.c
-@@ -69,22 +69,28 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
- return -ENOMEM;
-
- LIST_FOREACH(value, k, p->values) {
-- char *buf;
-+ _cleanup_free_ char *buf = NULL;
- const char *t;
- size_t l;
- bool b;
-
- t = timer_base_to_string(k->base);
-- assert(endswith(t, "Sec"));
-
-- /* s/Sec/USec/ */
-- l = strlen(t);
-- buf = new(char, l+2);
-- if (!buf)
-- return -ENOMEM;
-+ if (endswith(t, "Sec")) {
-+
-+ /* s/Sec/USec/ */
-+ l = strlen(t);
-+ buf = new(char, l+2);
-+ if (!buf)
-+ return -ENOMEM;
-
-- memcpy(buf, t, l-3);
-- memcpy(buf+l-3, "USec", 5);
-+ memcpy(buf, t, l-3);
-+ memcpy(buf+l-3, "USec", 5);
-+ } else {
-+ buf = strdup(t);
-+ if (!buf)
-+ return -ENOMEM;
-+ }
-
- b = dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2) &&
- dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &buf) &&
-@@ -92,7 +98,6 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
- dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT64, &k->next_elapse) &&
- dbus_message_iter_close_container(&sub, &sub2);
-
-- free(buf);
- if (!b)
- return -ENOMEM;
- }
---
-1.8.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-07 18:13:59 UTC (rev 179605)
+++ PKGBUILD 2013-03-08 01:03:31 UTC (rev 179606)
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=197
-pkgrel=4
+pkgver=198
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -13,13 +13,11 @@
'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
options=('!libtool')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
- '0001-dbus-fix-serialization-of-calendar-timers.patch'
'initcpio-hook-udev'
'initcpio-install-udev'
'initcpio-install-timestamp'
'use-split-usr-path.patch')
-md5sums=('56a860dceadfafe59f40141eb5223743'
- '0341d680d5ab16bab3978bac96bf8797'
+md5sums=('26a75e2a310f8c1c1ea9ec26ddb171c5'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d'
@@ -31,13 +29,8 @@
# hang onto this until we do the /{,s}bin merge
patch -Np1 <"$srcdir/use-split-usr-path.patch"
- # fix assertion failure when using calendar timers
- # upstream 3761902e2e120849c283106fd4b78b6adec7367e
- patch -Np1 <"$srcdir/0001-dbus-fix-serialization-of-calendar-timers.patch"
-
./configure \
- PYTHON=python2 \
- PYTHON_CONFIG=python2-config \
+ --enable-static \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
@@ -48,9 +41,6 @@
--with-sysvinit-path= \
--with-sysvrcnd-path=
- # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
- # https://pokersource.info/show_bug.cgi?id=50989
-
make
}
@@ -69,8 +59,6 @@
'libmicrohttpd: systemd-journal-gatewayd'
'quota-tools: kernel-level quota management'
'python: systemd library bindings'
- 'python2-cairo: systemd-analyze'
- 'python2-gobject: systemd-analyze'
'systemd-sysvcompat: symlink package to provide sysvinit binaries')
backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
etc/dbus-1/system.d/org.freedesktop.hostname1.conf
@@ -91,14 +79,6 @@
install -dm755 "$pkgdir/bin"
ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
- # move bash-completion and symlink for *ctl's
- install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
- "$pkgdir/usr/share/bash-completion/completions/systemctl"
- for ctl in {login,journal,timedate,locale,hostname,systemd-coredump}ctl udevadm; do
- ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl"
- done
- rm -rf "$pkgdir/etc/bash_completion.d"
-
# don't write units to /etc by default -- we'll enable this on post_install
# as a sane default
rm "$pkgdir/etc/systemd/system/getty.target.wants/getty at tty1.service"
More information about the arch-commits
mailing list