diff options
| author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
| commit | 0aa81f04b6149c3eb5faedd57512a981e6d3c624 (patch) | |
| tree | 98b1d03925fafa426c20c3075d69145c8bb2f4d8 /community/systemd | |
| parent | b18caf89fb235f174419d578a7da0237e456ef3d (diff) | |
| parent | c399070d50c89903ec1dea55aa4aa5147a367565 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'community/systemd')
| -rw-r--r-- | community/systemd/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/systemd/mqueue-signed-int.patch | 38 |
2 files changed, 4 insertions, 47 deletions
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 845868e6b..325223225 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47349 2011-05-21 21:23:44Z dreisner $ +# $Id: PKGBUILD 47976 2011-05-26 18:14:34Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=27 -pkgrel=2 +pkgver=28 +pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -26,18 +26,13 @@ backup=(etc/systemd/system.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=('6d6319e1817960459f13b300c4881f18' - '2ba01b4fc5c70eb51c223005fa5b9ecc' +md5sums=('be37500f576a0494f82fed7fa47cc306' '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 deleted file mode 100644 index dc9ac3524..000000000 --- a/community/systemd/mqueue-signed-int.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 } - }; - |