Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chmsee/PKGBUILD
	community/flumotion/PKGBUILD
	community/gnash/PKGBUILD
	community/kadu/PKGBUILD
	community/mythplugins/PKGBUILD
	community/performous/PKGBUILD
	community/sleuthkit/PKGBUILD
	community/virtualbox/PKGBUILD
	community/wbar/PKGBUILD
	core/attr/PKGBUILD
	core/binutils/PKGBUILD
	core/heimdal/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/acpid/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/boost/PKGBUILD
	extra/bs/PKGBUILD
	extra/bzr/PKGBUILD
	extra/cvsps/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/fetchmail/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gptfdisk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libftdi/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libx86/PKGBUILD
	extra/lsdvd/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/scim/PKGBUILD
	extra/socat/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vbetool/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xchat-gnome/xchat-gnome.install
	libre/kernel26-libre/PKGBUILD
	libre/pacman/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install
	multilib/nspluginwrapper/PKGBUILD
	testing/libgweather/libgweather.install
	testing/mesa/PKGBUILD

2 files changed, 45 insertions, 5 deletions

diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 2eab37e96..325223225 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 45855 2011-04-30 03:24:21Z dreisner $
+# $Id: PKGBUILD 47976 2011-05-26 18:14:34Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=systemd
-pkgver=26
+pkgver=28
 pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,12 +20,14 @@ 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"
         "os-release")
-md5sums=('b7c468aa400c64d02d533eba6359e283'
+md5sums=('be37500f576a0494f82fed7fa47cc306'
          '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
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 }
+         };
+