diff options
Diffstat (limited to 'sys-apps/dbus/files')
-rw-r--r-- | sys-apps/dbus/files/dbus-1.2.3-bsd.patch | 50 | ||||
-rw-r--r-- | sys-apps/dbus/files/dbus-1.2.3-panic-from-dbus_signature_validate.patch | 32 |
2 files changed, 0 insertions, 82 deletions
diff --git a/sys-apps/dbus/files/dbus-1.2.3-bsd.patch b/sys-apps/dbus/files/dbus-1.2.3-bsd.patch deleted file mode 100644 index d85b93daa225..000000000000 --- a/sys-apps/dbus/files/dbus-1.2.3-bsd.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=236779 - - -commit 3564e5cbe4d9c0538d6eb519904ef0befab39d75 -Author: Joe Marcus Clarke <marcus@freedesktop.org> -Date: Thu Sep 4 22:13:30 2008 -0400 - - Bug 17061: Handle error return from sysconf correctly - - * dbus/dbus-sysdeps-unix.c: - * dbus/dbus-sysdeps-util-unix.c: Cast return - from sysconf temporarily so we actually see - -1. - - Signed-off-by: Colin Walters <walters@verbum.org> - -diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c -index 3f963bc..24a3774 100644 ---- a/dbus/dbus-sysdeps-unix.c -+++ b/dbus/dbus-sysdeps-unix.c -@@ -1493,7 +1493,11 @@ fill_user_info (DBusUserInfo *info, - /* retrieve maximum needed size for buf */ - buflen = sysconf (_SC_GETPW_R_SIZE_MAX); - -- if (buflen <= 0) -+ /* sysconf actually returns a long, but everything else expects size_t, -+ * so just recast here. -+ * https://bugs.freedesktop.org/show_bug.cgi?id=17061 -+ */ -+ if ((long) buflen <= 0) - buflen = 1024; - - result = -1; -diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c -index 55eb934..0343a90 100644 ---- a/dbus/dbus-sysdeps-util-unix.c -+++ b/dbus/dbus-sysdeps-util-unix.c -@@ -836,7 +836,11 @@ fill_group_info (DBusGroupInfo *info, - /* retrieve maximum needed size for buf */ - buflen = sysconf (_SC_GETGR_R_SIZE_MAX); - -- if (buflen <= 0) -+ /* sysconf actually returns a long, but everything else expects size_t, -+ * so just recast here. -+ * https://bugs.freedesktop.org/show_bug.cgi?id=17061 -+ */ -+ if ((long) buflen <= 0) - buflen = 1024; - - result = -1; diff --git a/sys-apps/dbus/files/dbus-1.2.3-panic-from-dbus_signature_validate.patch b/sys-apps/dbus/files/dbus-1.2.3-panic-from-dbus_signature_validate.patch deleted file mode 100644 index 772da176822a..000000000000 --- a/sys-apps/dbus/files/dbus-1.2.3-panic-from-dbus_signature_validate.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Colin Walters <walters@verbum.org> -Date: Wed, 1 Oct 2008 17:49:48 +0000 (-0400) -Subject: Bug 17803: Panic from dbus_signature_validate -X-Git-Url: http://gitweb.freedesktop.org/?p=dbus/dbus.git;a=commitdiff;h=7b10b46c5c8658449783ce45f1273dd35c353bce - -Bug 17803: Panic from dbus_signature_validate - - * dbus/dbus-marshal-validate.c: Ensure we validate - a basic type before calling is_basic on it. - * dbus-marshal-validate-util.c: Test. ---- - ---- a/dbus/dbus-marshal-validate-util.c -+++ b/dbus/dbus-marshal-validate-util.c -@@ -228,6 +228,7 @@ _dbus_marshal_validate_test (void) - "123", - ".", - "(" -+ "a{(ii)i}" /* https://bugs.freedesktop.org/show_bug.cgi?id=17803 */ - }; - - /* Signature with reason */ ---- a/dbus/dbus-marshal-validate.c -+++ b/dbus/dbus-marshal-validate.c -@@ -247,6 +247,7 @@ _dbus_validate_signature_with_reason (co - } - - if (last == DBUS_DICT_ENTRY_BEGIN_CHAR && -+ _dbus_type_is_valid (*p) && - !dbus_type_is_basic (*p)) - { - result = DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE; |