diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-04-25 19:12:18 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-04-25 19:12:18 +0000 |
| commit | a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64 (patch) | |
| tree | 4b714afe7b584ba090771728c33fbcbbd84a2a6c /dev-libs/glib/files | |
| parent | Version bumps by Afrever. (diff) | |
| download | historical-a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64.tar.gz historical-a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64.tar.bz2 historical-a33d8d9d7e0b1f6311b2fb06261246ef0b41dd64.zip | |
drop old
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-libs/glib/files')
7 files changed, 0 insertions, 632 deletions
diff --git a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch deleted file mode 100644 index df1378eb12c6..000000000000 --- a/dev-libs/glib/files/glib-2.31.x-external-gdbus-codegen.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 732f04b55f59b8107a7fbe317317edb5f184ea8f Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Fri, 3 Feb 2012 09:08:28 +0200 -Subject: [PATCH] Split out gdbus codegen - ---- - configure.ac | 4 +--- - docs/reference/gio/Makefile.am | 3 +-- - gio/Makefile.am | 2 +- - gio/tests/Makefile.am | 6 ++---- - gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- - 5 files changed, 7 insertions(+), 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4cf04a1..0bb18c8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -356,7 +356,7 @@ fi - AC_SUBST(PERL_PATH) - - # Need suitable python path for greport --AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") -+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") - - - dnl *********************** -@@ -3525,8 +3525,6 @@ gobject/glib-mkenums - gobject/tests/Makefile - gthread/Makefile - gio/Makefile --gio/gdbus-2.0/codegen/Makefile --gio/gdbus-2.0/codegen/config.py - gio/xdgmime/Makefile - gio/inotify/Makefile - gio/fen/Makefile -diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am -index 535aa26..5027dd5 100644 ---- a/docs/reference/gio/Makefile.am -+++ b/docs/reference/gio/Makefile.am -@@ -144,8 +144,7 @@ man_MANS = \ - glib-compile-resources.1 \ - gsettings.1 \ - gresource.1 \ -- gdbus.1 \ -- gdbus-codegen.1 -+ gdbus.1 - - if ENABLE_MAN - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 67eeae6..277931b 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl - - NULL = - --SUBDIRS = gdbus-2.0/codegen -+SUBDIRS = - - if OS_UNIX - SUBDIRS += xdgmime -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index e987fd1..66af8cf 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -275,10 +275,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses - gdbus_close_pending_LDADD = $(progs_ldadd) - - if OS_UNIX --gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.project. \ - --generate-c-code gdbus-test-codegen-generated \ - --c-generate-object-manager \ -diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am -index 9861d0e..9ca6eb9 100644 ---- a/gio/tests/gdbus-object-manager-example/Makefile.am -+++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -21,10 +21,8 @@ GDBUS_GENERATED = \ - gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ - $(NULL) - --$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ - --c-namespace Example \ - --c-generate-object-manager \ --- -1.7.8.4 - diff --git a/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch b/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch deleted file mode 100644 index 92e6c8125e5b..000000000000 --- a/dev-libs/glib/files/glib-2.32.4-CVE-2012-3524.patch +++ /dev/null @@ -1,247 +0,0 @@ -From 4c2928a54482913cf236bff0e66650a8f47e17ea Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Wed, 22 Aug 2012 18:26:11 +0000 -Subject: CVE-2012-3524: Hardening for being run in a setuid environment - -Some programs attempt to use libglib (or even libgio) when setuid. -For a long time, GTK+ simply aborted if launched in this -configuration, but we never had a real policy for GLib. - -I'm not sure whether we should advertise such support. However, given -that there are real-world programs that do this currently, we can make -them safer with not too much effort. - -Better to fix a problem caused by an interaction between two -components in *both* places if possible. - -This patch adds a private function g_check_setuid() which is used to -first ensure we don't run an external dbus-launch binary if -DBUS_SESSION_BUS_ADDRESS isn't set. - -Second, we also ensure the local VFS is used in this case. The -gdaemonvfs extension point will end up talking to the session bus -which is typically undesirable in a setuid context. - -Implementing g_check_setuid() is interesting - whether or not we're -running in a privilege-escalated path is operating system specific. -Note that GTK+'s code to check euid versus uid worked historically on -Unix, more modern systems have filesystem capabilities and SELinux -domain transitions, neither of which are captured by the uid -comparison. - -On Linux/glibc, the way this works is that the kernel sets an -AT_SECURE flag in the ELF auxiliary vector, and glibc looks for it on -startup. If found, then glibc sets a public-but-undocumented -__libc_enable_secure variable which we can use. Unfortunately, while -it *previously* worked to check this variable, a combination of newer -binutils and RPM break it: -http://www.openwall.com/lists/owl-dev/2012/08/14/1 - -So for now on Linux/glibc, we fall back to the historical Unix version -until we get glibc fixed. - -On some BSD variants, there is a issetugid() function. On other Unix -variants, we fall back to what GTK+ has been doing. - -Reported-By: Sebastian Krahmer <krahmer@suse.de> -Signed-off-by: Colin Walters <walters@verbum.org> ---- -diff --git a/configure.ac b/configure.ac -index 584df1d..67ea1a9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -583,9 +583,20 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], - # Checks for library functions. - AC_FUNC_VPRINTF - AC_FUNC_ALLOCA --AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2) -+AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2 issetugid) - AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r) - -+AC_CACHE_CHECK([for __libc_enable_secure], glib_cv_have_libc_enable_secure, -+ [AC_TRY_LINK([#include <unistd.h> -+ extern int __libc_enable_secure;], -+ [return __libc_enable_secure;], -+ glib_cv_have_libc_enable_secure=yes, -+ glib_cv_have_libc_enable_secure=no)]) -+AS_IF([test x$glib_cv_have_libc_enable_secure = xyes], [ -+ AC_DEFINE(HAVE_LIBC_ENABLE_SECURE, 1, -+ [Define if you have the __libc_enable_secure variable (GNU libc, eglibc)]) -+]) -+ - AC_CHECK_SIZEOF(char) - AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(long) -@@ -984,7 +995,7 @@ AC_MSG_RESULT(unsigned $glib_size_type) - - # Check for some functions - AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf stpcpy strcasecmp strncasecmp poll getcwd vasprintf setenv unsetenv getc_unlocked readlink symlink fdwalk memmem) --AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid) -+AC_CHECK_FUNCS(chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid) - AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat) - # Check for high-resolution sleep functions - AC_CHECK_FUNCS(splice) -diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c -index 4aa13b9..96b6343 100644 ---- a/gio/gdbusaddress.c -+++ b/gio/gdbusaddress.c -@@ -37,6 +37,7 @@ - #include "giostream.h" - #include "gasyncresult.h" - #include "gsimpleasyncresult.h" -+#include "glib-private.h" - #include "gdbusprivate.h" - #include "giomodule-priv.h" - #include "gdbusdaemon.h" -@@ -1023,6 +1024,14 @@ get_session_address_dbus_launch (GError **error) - restore_dbus_verbose = FALSE; - old_dbus_verbose = NULL; - -+ /* Don't run binaries as root if we're setuid. */ -+ if (GLIB_PRIVATE_CALL (g_check_setuid) ()) -+ { -+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, -+ _("Cannot spawn a message bus when setuid")); -+ goto out; -+ } -+ - machine_id = _g_dbus_get_machine_id (error); - if (machine_id == NULL) - { -diff --git a/gio/gvfs.c b/gio/gvfs.c -index dda8afb..9afbcec 100644 ---- a/gio/gvfs.c -+++ b/gio/gvfs.c -@@ -23,6 +23,7 @@ - #include "config.h" - #include <string.h> - #include "gvfs.h" -+#include "glib-private.h" - #include "glocalvfs.h" - #include "gresourcefile.h" - #include "giomodule-priv.h" -@@ -191,6 +192,8 @@ g_vfs_parse_name (GVfs *vfs, - GVfs * - g_vfs_get_default (void) - { -+ if (GLIB_PRIVATE_CALL (g_check_setuid) ()) -+ return g_vfs_get_local (); - return _g_io_module_get_default (G_VFS_EXTENSION_POINT_NAME, - "GIO_USE_VFS", - (GIOModuleVerifyFunc)g_vfs_is_active); -diff --git a/glib/genviron.c b/glib/genviron.c -index 59a8bbe..9525cf0 100644 ---- a/glib/genviron.c -+++ b/glib/genviron.c -@@ -40,6 +40,7 @@ - #include <windows.h> - #endif - -+#include "glib-private.h" - #include "gmem.h" - #include "gmessages.h" - #include "gstrfuncs.h" -diff --git a/glib/glib-private.c b/glib/glib-private.c -index 3946e77..3506782 100644 ---- a/glib/glib-private.c -+++ b/glib/glib-private.c -@@ -38,7 +38,9 @@ glib__private__ (void) - g_wakeup_signal, - g_wakeup_acknowledge, - -- g_get_worker_context -+ g_get_worker_context, -+ -+ g_check_setuid - }; - - return &table; -diff --git a/glib/glib-private.h b/glib/glib-private.h -index fde0be8..87da6f3 100644 ---- a/glib/glib-private.h -+++ b/glib/glib-private.h -@@ -25,6 +25,8 @@ - - G_GNUC_INTERNAL - GMainContext * g_get_worker_context (void); -+G_GNUC_INTERNAL -+gboolean g_check_setuid (void); - - #define GLIB_PRIVATE_CALL(symbol) (glib__private__()->symbol) - -@@ -40,6 +42,8 @@ typedef struct { - /* See gmain.c */ - GMainContext * (* g_get_worker_context) (void); - /* Add other private functions here, initialize them in glib-private.c */ -+ -+ gboolean (* g_check_setuid) (void); - } GLibPrivateVTable; - - GLibPrivateVTable *glib__private__ (void); -diff --git a/glib/gutils.c b/glib/gutils.c -index 38b5e44..f8a38d1 100644 ---- a/glib/gutils.c -+++ b/glib/gutils.c -@@ -2409,3 +2409,60 @@ g_get_tmp_dir (void) - } - - #endif -+ -+/* Private API: -+ * -+ * Returns %TRUE if the current process was executed as setuid (or an -+ * equivalent __libc_enable_secure is available). See: -+ * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html -+ */ -+gboolean -+g_check_setuid (void) -+{ -+ /* TODO: get __libc_enable_secure exported from glibc. -+ * See http://www.openwall.com/lists/owl-dev/2012/08/14/1 -+ */ -+#if 0 && defined(HAVE_LIBC_ENABLE_SECURE) -+ { -+ /* See glibc/include/unistd.h */ -+ extern int __libc_enable_secure; -+ return __libc_enable_secure; -+ } -+#elif defined(HAVE_ISSETUGID) -+ /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */ -+ return issetugid (); -+#elif defined(G_OS_UNIX) -+ uid_t ruid, euid, suid; /* Real, effective and saved user ID's */ -+ gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */ -+ -+ static gsize check_setuid_initialised; -+ static gboolean is_setuid; -+ -+ if (g_once_init_enter (&check_setuid_initialised)) -+ { -+#ifdef HAVE_GETRESUID -+ /* These aren't in the header files, so we prototype them here. -+ */ -+ int getresuid(uid_t *ruid, uid_t *euid, uid_t *suid); -+ int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); -+ -+ if (getresuid (&ruid, &euid, &suid) != 0 || -+ getresgid (&rgid, &egid, &sgid) != 0) -+#endif /* HAVE_GETRESUID */ -+ { -+ suid = ruid = getuid (); -+ sgid = rgid = getgid (); -+ euid = geteuid (); -+ egid = getegid (); -+ } -+ -+ is_setuid = (ruid != euid || ruid != suid || -+ rgid != egid || rgid != sgid); -+ -+ g_once_init_leave (&check_setuid_initialised, 1); -+ } -+ return is_setuid; -+#else -+ return FALSE; -+#endif -+} --- -cgit v0.9.0.2 diff --git a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch b/dev-libs/glib/files/glib-2.32.4-bashcomp.patch deleted file mode 100644 index 33abffcf7d6c..000000000000 --- a/dev-libs/glib/files/glib-2.32.4-bashcomp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6d032421b4871105e1f37bb75a5ec7b012f19f61 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sun, 15 Jul 2012 22:30:07 -0400 -Subject: [PATCH] gio: use /usr/share/bash-completion for bashcomp - -In Gentoo, we use /usr/share/bash-completion, not -/usr/share/bash-completion/completions. ---- - gio/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 704367c..bee9dc6 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -715,7 +715,7 @@ gdbus_LDADD = libgio-2.0.la \ - $(top_builddir)/glib/libglib-2.0.la \ - $(top_builddir)/gobject/libgobject-2.0.la - --completiondir = $(datadir)/bash-completion/completions -+completiondir = $(datadir)/bash-completion - completion_DATA = \ - completion/gdbus \ - completion/gsettings \ --- -1.7.8.6 - diff --git a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch deleted file mode 100644 index aff75cbeff58..000000000000 --- a/dev-libs/glib/files/glib-2.34.0-testsuite-skip-gdbus-auth-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6e6aa7de746b78bc5fc6d2cad1cac762f6d2205f Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Tue, 3 Jul 2012 12:50:44 +0300 -Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1 - tests - -https://bugzilla.gnome.org/show_bug.cgi?id=679308 ---- - gio/tests/gdbus-auth.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c -index 737770e..9f42c24 100644 ---- a/gio/tests/gdbus-auth.c -+++ b/gio/tests/gdbus-auth.c -@@ -89,11 +89,14 @@ auth_client_external (void) - auth_client_mechanism ("EXTERNAL"); - } - -+#if 0 -+// https://bugzilla.gnome.org/show_bug.cgi?id=679308 - static void - auth_client_dbus_cookie_sha1 (void) - { - auth_client_mechanism ("DBUS_COOKIE_SHA1"); - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -250,11 +253,13 @@ auth_server_external (void) - auth_server_mechanism ("EXTERNAL"); - } - -+#if 0 - static void - auth_server_dbus_cookie_sha1 (void) - { - auth_server_mechanism ("DBUS_COOKIE_SHA1"); - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -272,10 +277,14 @@ main (int argc, - session_bus_up (); - - g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external); -+#if 0 - g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1); -+#endif - g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous); - g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external); -+#if 0 - g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1); -+#endif - - ret = g_test_run(); - --- -1.7.8.6 - diff --git a/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch b/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch deleted file mode 100644 index 5f4e7b6bbd32..000000000000 --- a/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch +++ /dev/null @@ -1,23 +0,0 @@ -Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36 - -diff --git a/configure.ac b/configure.ac -index a3567b3..3e3d697 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ m4_define([glib_debug_default], - AC_INIT(glib, [glib_version], - [http://bugzilla.gnome.org/enter_bug.cgi?product=glib]) - --AC_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_SRCDIR([glib/glib.h]) - AC_CONFIG_MACRO_DIR([m4macros]) - -@@ -291,7 +291,6 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) - AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) - AC_LANG_RESTORE - --AM_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_INSTALL - diff --git a/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch b/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch deleted file mode 100644 index c7c3f3364f4f..000000000000 --- a/dev-libs/glib/files/glib-2.34.3-testsuite-skip-gdbus-auth-tests.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 86bc94d3783ba53a944451f4eba4c78130eeef3b Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Tue, 3 Jul 2012 12:50:44 +0300 -Subject: [PATCH] Gentoo: skip over gdbus-auth /gdbus/auth/*/DBUS_COOKIE_SHA1 - tests - -https://bugzilla.gnome.org/show_bug.cgi?id=679308 ---- - gio/tests/gdbus-auth.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/gio/tests/gdbus-auth.c b/gio/tests/gdbus-auth.c -index 737770e..d528c6b 100644 ---- a/gio/tests/gdbus-auth.c -+++ b/gio/tests/gdbus-auth.c -@@ -89,11 +89,14 @@ auth_client_external (void) - auth_client_mechanism ("EXTERNAL"); - } - -+#if 0 -+// https://bugzilla.gnome.org/show_bug.cgi?id=679308 - static void - auth_client_dbus_cookie_sha1 (void) - { - auth_client_mechanism ("DBUS_COOKIE_SHA1"); - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -250,11 +253,13 @@ auth_server_external (void) - auth_server_mechanism ("EXTERNAL"); - } - -+#if 0 - static void - auth_server_dbus_cookie_sha1 (void) - { - auth_server_mechanism ("DBUS_COOKIE_SHA1"); - } -+#endif - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -272,10 +277,14 @@ main (int argc, - session_bus_up (); - - g_test_add_func ("/gdbus/auth/client/EXTERNAL", auth_client_external); -+#if 0 - g_test_add_func ("/gdbus/auth/client/DBUS_COOKIE_SHA1", auth_client_dbus_cookie_sha1); -+#endif - g_test_add_func ("/gdbus/auth/server/ANONYMOUS", auth_server_anonymous); -+#if 0 - g_test_add_func ("/gdbus/auth/server/EXTERNAL", auth_server_external); - g_test_add_func ("/gdbus/auth/server/DBUS_COOKIE_SHA1", auth_server_dbus_cookie_sha1); -+#endif - - ret = g_test_run(); - --- -1.8.3.2 - diff --git a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch deleted file mode 100644 index a7fb01986e1d..000000000000 --- a/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Thu, 28 Feb 2013 08:28:01 +0200 -Subject: [PATCH] Split out gdbus codegen - ---- - configure.ac | 17 ++++++++--------- - docs/reference/gio/Makefile.am | 3 +-- - gio/Makefile.am | 2 +- - gio/tests/Makefile.am | 6 ++---- - gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- - 5 files changed, 14 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f734b7c..8076e7f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -374,14 +374,14 @@ AC_SUBST(PERL_PATH) - # option to specify python interpreter to use; this just sets $PYTHON, so that - # we will fallback to reading $PYTHON if --with-python is not given, and - # python.m4 will get the expected input --AC_ARG_WITH(python, -- AS_HELP_STRING([--with-python=PATH], -- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), -- [PYTHON="$withval"], []) --if test x"$PYTHON" = xyes; then -- AC_MSG_ERROR([--with-python option requires a path or program argument]) --fi --AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") -+# AC_ARG_WITH(python, -+# AS_HELP_STRING([--with-python=PATH], -+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), -+# [PYTHON="$withval"], []) -+# if test x"$PYTHON" = xyes; then -+# AC_MSG_ERROR([--with-python option requires a path or program argument]) -+# fi -+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") - - - dnl *********************** -@@ -3697,7 +3697,6 @@ gobject/glib-mkenums - gobject/tests/Makefile - gthread/Makefile - gio/Makefile --gio/gdbus-2.0/codegen/Makefile - gio/gdbus-2.0/codegen/config.py - gio/gnetworking.h - gio/xdgmime/Makefile -diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am -index 99606d3..067cd50 100644 ---- a/docs/reference/gio/Makefile.am -+++ b/docs/reference/gio/Makefile.am -@@ -152,8 +152,7 @@ man_MANS += \ - glib-compile-resources.1 \ - gsettings.1 \ - gresource.1 \ -- gdbus.1 \ -- gdbus-codegen.1 -+ gdbus.1 - - XSLTPROC_FLAGS = \ - --nonet \ -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 94d7f59..c07d00d 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl - - NULL = - --SUBDIRS = gdbus-2.0/codegen -+SUBDIRS = - - if OS_UNIX - SUBDIRS += xdgmime -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index c8a4090..feece02 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h - gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c - - if OS_UNIX --gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.project. \ - --generate-c-code gdbus-test-codegen-generated \ - --c-generate-object-manager \ -diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am -index 6875210..264c3c1 100644 ---- a/gio/tests/gdbus-object-manager-example/Makefile.am -+++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -21,10 +21,8 @@ GDBUS_GENERATED = \ - gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ - $(NULL) - --$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ - --c-namespace Example \ - --c-generate-object-manager \ --- -1.8.1.2 - |