diff options
| author |   Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-05-21 23:09:42 +0200 |
|---|---|---|
| committer | Henry Gebhardt <hsggebhardt@googlemail.com> | 2011-05-21 23:09:42 +0200 |
| commit | d9e5749a0f1204085b6113366844847200906124 (patch) | |
| tree | 571aec2acf3896cb8ef0b5dee0718acffea41a1c | |
| parent | sys-apps/systemd-9999: Apply user patches automatically (diff) | |
| download | systemd-d9e5749a0f1204085b6113366844847200906124.tar.gz systemd-d9e5749a0f1204085b6113366844847200906124.tar.bz2 systemd-d9e5749a0f1204085b6113366844847200906124.zip | |
sys-apps/systemd-27-r1: Include patch to fix mqueue support
| -rw-r--r-- | sys-apps/systemd/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd/files/mqueue-signed-int.patch | 38 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-27-r1.ebuild (renamed from sys-apps/systemd/systemd-27.ebuild) | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index fa55bb9..8daa22e 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -1,6 +1,7 @@ +AUX mqueue-signed-int.patch 1991 RMD160 aca832b189992a9ceb9c34d739ad10e94f9e3d59 SHA1 f7b93ceb1fcab69e3f8b58e3b47d9e784ce79318 SHA256 cabd0724d339042dd5abe2d17aa9b03afc2a049b0c4cd13440d31d264011e525 DIST systemd-26.tar.bz2 791117 RMD160 06836ca8daf0c5ebc113940357289348561dac56 SHA1 901486904aeb1d8a3ae20e5971afd9b42b847450 SHA256 d7a222c09cdb0a9eebe97c7c499c458cc29ef8b3b2d0ca79bb949b2fd3d077d3 DIST systemd-27.tar.bz2 809898 RMD160 bd9a2b0c065ff7d07e0fb5d0346ab9e355aaa6cf SHA1 2ccd50681a52ae5de5e5c5f1c3fc9233dfb26ad1 SHA256 3a8d978721a404b25df6a59dc666cf30a02f14d3c680c4f8c3a91e68a9407e53 EBUILD systemd-26.ebuild 4327 RMD160 d26de8d5b632a0c96b2dc19441d0d0d57bbfa2da SHA1 188fa736286c9bbc48147b732512243ed0e9a60d SHA256 0499bf01d2e23cf5106139597d0d2eec54625463da808285f9562dc7a6c735e1 -EBUILD systemd-27.ebuild 4348 RMD160 9ad9e796ba8ffacf398e3345fddb51f4d652dfa6 SHA1 8f6d29a16d6a5f07bc22561a21c22023e22efe31 SHA256 50ef6b10292843bad29704a2ba0f1074ce373339f53c1f73710831261f1104ef +EBUILD systemd-27-r1.ebuild 4401 RMD160 64685e0aa99719f8480c7dc64c2f54deae13091a SHA1 6f20f45377f1289f1aebac6f8b52578a3eb54bb0 SHA256 4e6b8c15008f6bb30689f81fc6da828f7530390e8a2e74996f5ff88a90a031c0 EBUILD systemd-9999.ebuild 4405 RMD160 2c5a3056bcb324e699cf91335e269accfd09e084 SHA1 93faa0d5fc75516ee410df92de2dc4ee8c994384 SHA256 fa1281797ded87f02d624580ed83d7ff4054929b37331950dd963fa3d699d85c MISC metadata.xml 737 RMD160 cdd440f38c039bfa7967fd713ef238588c2e1fb4 SHA1 1dea5e1d1e388bf43131297667bb4dbba10e65dd SHA256 042b1b68c02c274920954280705e21c2ca2ef5eece3229aab03d8dd43e06422d diff --git a/sys-apps/systemd/files/mqueue-signed-int.patch b/sys-apps/systemd/files/mqueue-signed-int.patch new file mode 100644 index 0000000..dc9ac35 --- /dev/null +++ b/sys-apps/systemd/files/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 } + }; + diff --git a/sys-apps/systemd/systemd-27.ebuild b/sys-apps/systemd/systemd-27-r1.ebuild index d143859..10453e0 100644 --- a/sys-apps/systemd/systemd-27.ebuild +++ b/sys-apps/systemd/systemd-27-r1.ebuild @@ -4,7 +4,7 @@ EAPI=4 -inherit linux-info pam +inherit eutils linux-info pam DESCRIPTION="systemd is a system and service manager for Linux" HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" @@ -71,6 +71,7 @@ pkg_setup() { src_prepare() { # Force the rebuild of .vala sources touch src/*.vala + epatch "${FILESDIR}"/mqueue-signed-int.patch } src_configure() { |