diff options
| author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-26 11:13:51 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-26 11:13:51 -0500 |
| commit | b18caf89fb235f174419d578a7da0237e456ef3d (patch) | |
| tree | 9a9f7e391135f5ce2b05b3956ced1a00bd664bbb /community/systemd | |
| parent | a084559f421a288dd77f81e458161f95ae8d1be9 (diff) | |
| parent | 6e35be4b44d90f92ddceb8b067cbbf03fc652a35 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Diffstat (limited to 'community/systemd')
| -rw-r--r-- | community/systemd/PKGBUILD | 19 | ||||
| -rw-r--r-- | community/systemd/mqueue-signed-int.patch | 38 |
2 files changed, 51 insertions, 6 deletions
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 2eab37e96..845868e6b 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 45855 2011-04-30 03:24:21Z dreisner $ +# $Id: PKGBUILD 47349 2011-05-21 21:23:44Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=26 -pkgrel=1 +pkgver=27 +pkgrel=2 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -20,17 +20,24 @@ optdepends=('cryptsetup: required for encrypted block devices' groups=('systemd') options=('!libtool') backup=(etc/systemd/system.conf - etc/tmpfiles.d/systemd.conf - etc/tmpfiles.d/x11.conf) + etc/tmpfiles.d/console.conf + usr/lib/tmpfiles.d/legacy.conf + usr/lib/tmpfiles.d/systemd.conf + usr/lib/tmpfiles.d/x11.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" + "mqueue-signed-int.patch" "os-release") -md5sums=('b7c468aa400c64d02d533eba6359e283' +md5sums=('6d6319e1817960459f13b300c4881f18' + '2ba01b4fc5c70eb51c223005fa5b9ecc' '752636def0db3c03f121f8b4f44a63cd') build() { cd "$srcdir/$pkgname-$pkgver" + # fix ABRT on systemctl status + patch -Np1 <"$srcdir/mqueue-signed-int.patch" + ./configure --prefix=/usr \ --with-rootdir= \ --sysconfdir=/etc \ diff --git a/community/systemd/mqueue-signed-int.patch b/community/systemd/mqueue-signed-int.patch new file mode 100644 index 000000000..dc9ac3524 --- /dev/null +++ b/community/systemd/mqueue-signed-int.patch @@ -0,0 +1,38 @@ +diff --git a/src/dbus-common.c b/src/dbus-common.c +index fe7f84b..9bf0dab 100644 +--- a/src/dbus-common.c ++++ b/src/dbus-common.c +@@ -569,15 +569,15 @@ int bus_property_append_ul(DBusMessageIter *i, const char *property, void *data) + } + + int bus_property_append_long(DBusMessageIter *i, const char *property, void *data) { +- uint64_t u; ++ int64_t l; + + assert(i); + assert(property); + assert(data); + +- u = (int64_t) *(long*) data; ++ l = (int64_t) *(long*) data; + +- if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &u)) ++ if (!dbus_message_iter_append_basic(i, DBUS_TYPE_INT64, &l)) + return -ENOMEM; + + return 0; +diff --git a/src/dbus-socket.c b/src/dbus-socket.c +index b81569d..7194611 100644 +--- a/src/dbus-socket.c ++++ b/src/dbus-socket.c +@@ -115,8 +115,8 @@ DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMes + { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned, "u", &u->socket.max_connections }, + { "org.freedesktop.systemd1.Socket", "NConnections", bus_property_append_unsigned, "u", &u->socket.n_connections }, + { "org.freedesktop.systemd1.Socket", "NAccepted", bus_property_append_unsigned, "u", &u->socket.n_accepted }, +- { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"t", &u->socket.mq_maxmsg }, +- { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"t", &u->socket.mq_msgsize }, ++ { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"x", &u->socket.mq_maxmsg }, ++ { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"x", &u->socket.mq_msgsize }, + { NULL, NULL, NULL, NULL, NULL } + }; + |