diff options
author | Mart Raudsepp <leio@gentoo.org> | 2020-01-11 20:11:39 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2020-01-11 20:12:17 +0200 |
commit | 0b605b42363650b0b8dcd49bb1b9787d317eceec (patch) | |
tree | 4e690eced6d6ebf3a191a404df1dfc9d5a223c3b /dev-libs/glib/files | |
parent | dev-util/gdbus-codegen: remove old (diff) | |
download | gentoo-0b605b42363650b0b8dcd49bb1b9787d317eceec.tar.gz gentoo-0b605b42363650b0b8dcd49bb1b9787d317eceec.tar.bz2 gentoo-0b605b42363650b0b8dcd49bb1b9787d317eceec.zip |
dev-libs/glib: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'dev-libs/glib/files')
3 files changed, 0 insertions, 297 deletions
diff --git a/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch b/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch deleted file mode 100644 index 949ac56431f1..000000000000 --- a/dev-libs/glib/files/2.58.3-CVE-2019-12450.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e6b769819d63d2b24b251dbc9f902fe6fd614da3 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy <oholy@redhat.com> -Date: Thu, 23 May 2019 10:41:53 +0200 -Subject: [PATCH] gfile: Limit access to files when copying - -file_copy_fallback creates new files with default permissions and -set the correct permissions after the operation is finished. This -might cause that the files can be accessible by more users during -the operation than expected. Use G_FILE_CREATE_PRIVATE for the new -files to limit access to those files. ---- - gio/gfile.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/gio/gfile.c b/gio/gfile.c -index 1cc69166a..13b435480 100644 ---- a/gio/gfile.c -+++ b/gio/gfile.c -@@ -3284,12 +3284,12 @@ file_copy_fallback (GFile *source, - out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)), - FALSE, NULL, - flags & G_FILE_COPY_BACKUP, -- G_FILE_CREATE_REPLACE_DESTINATION, -- info, -+ G_FILE_CREATE_REPLACE_DESTINATION | -+ G_FILE_CREATE_PRIVATE, info, - cancellable, error); - else - out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)), -- FALSE, 0, info, -+ FALSE, G_FILE_CREATE_PRIVATE, info, - cancellable, error); - } - else if (flags & G_FILE_COPY_OVERWRITE) -@@ -3297,12 +3297,13 @@ file_copy_fallback (GFile *source, - out = (GOutputStream *)g_file_replace (destination, - NULL, - flags & G_FILE_COPY_BACKUP, -- G_FILE_CREATE_REPLACE_DESTINATION, -+ G_FILE_CREATE_REPLACE_DESTINATION | -+ G_FILE_CREATE_PRIVATE, - cancellable, error); - } - else - { -- out = (GOutputStream *)g_file_create (destination, 0, cancellable, error); -+ out = (GOutputStream *)g_file_create (destination, G_FILE_CREATE_PRIVATE, cancellable, error); - } - - if (!out) --- -2.20.1 - diff --git a/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch b/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch deleted file mode 100644 index 0828132003d3..000000000000 --- a/dev-libs/glib/files/2.58.3-gdbusmessage-limit-fix.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 2d655ef8954695cabf9e99cc61411de2bb4cb847 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <withnall@endlessm.com> -Date: Mon, 28 Jan 2019 14:36:42 +0000 -Subject: [PATCH] gdbusmessage: Fix check on upper limit of message size - -There was a typo in the figure checked against. Add a unit test. - -Signed-off-by: Philip Withnall <withnall@endlessm.com> - -https://gitlab.gnome.org/GNOME/glib/issues/1642 ---- - gio/gdbusmessage.c | 2 +- - gio/tests/gdbus-message.c | 72 ++++++++++++++++++++++++++++++++++++++- - 2 files changed, 72 insertions(+), 2 deletions(-) - -diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c -index 169e6fd15..2ad51f888 100644 ---- a/gio/gdbusmessage.c -+++ b/gio/gdbusmessage.c -@@ -1984,7 +1984,7 @@ g_dbus_message_bytes_needed (guchar *blob, - "Unable to determine message blob length - given blob is malformed"); - } - -- if (ret > (2<<27)) -+ if (ret > (1<<27)) - { - g_set_error (error, - G_IO_ERROR, -diff --git a/gio/tests/gdbus-message.c b/gio/tests/gdbus-message.c -index 88a9c5d86..74e0f712e 100644 ---- a/gio/tests/gdbus-message.c -+++ b/gio/tests/gdbus-message.c -@@ -141,6 +141,74 @@ message_copy (void) - - /* ---------------------------------------------------------------------------------------------------- */ - -+/* Test g_dbus_message_bytes_needed() returns correct results for a variety of -+ * arbitrary binary inputs.*/ -+static void -+message_bytes_needed (void) -+{ -+ const struct -+ { -+ const guint8 blob[16]; -+ gssize expected_bytes_needed; -+ } -+ vectors[] = -+ { -+ /* Little endian with header rounding */ -+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */ -+ 50, 0, 0, 0, /* body length */ -+ 1, 0, 0, 0, /* message serial */ -+ 7, 0, 0, 0 /* header length */}, 74 }, -+ /* Little endian without header rounding */ -+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */ -+ 50, 0, 0, 0, /* body length */ -+ 1, 0, 0, 0, /* message serial */ -+ 8, 0, 0, 0 /* header length */}, 74 }, -+ /* Big endian with header rounding */ -+ { { 'B', 0, 0, 1, /* endianness, message type, flags, protocol version */ -+ 0, 0, 0, 50, /* body length */ -+ 0, 0, 0, 1, /* message serial */ -+ 0, 0, 0, 7 /* header length */}, 74 }, -+ /* Big endian without header rounding */ -+ { { 'B', 0, 0, 1, /* endianness, message type, flags, protocol version */ -+ 0, 0, 0, 50, /* body length */ -+ 0, 0, 0, 1, /* message serial */ -+ 0, 0, 0, 8 /* header length */}, 74 }, -+ /* Invalid endianness */ -+ { { '!', 0, 0, 1, /* endianness, message type, flags, protocol version */ -+ 0, 0, 0, 50, /* body length */ -+ 0, 0, 0, 1, /* message serial */ -+ 0, 0, 0, 8 /* header length */}, -1 }, -+ /* Oversized */ -+ { { 'l', 0, 0, 1, /* endianness, message type, flags, protocol version */ -+ 0, 0, 0, 0x08, /* body length (128MiB) */ -+ 1, 0, 0, 0, /* message serial */ -+ 7, 0, 0, 0 /* header length */}, -1 }, -+ }; -+ gsize i; -+ -+ for (i = 0; i < G_N_ELEMENTS (vectors); i++) -+ { -+ gssize bytes_needed; -+ GError *local_error = NULL; -+ -+ g_test_message ("Vector: %" G_GSIZE_FORMAT, i); -+ -+ bytes_needed = g_dbus_message_bytes_needed ((guchar *) vectors[i].blob, -+ G_N_ELEMENTS (vectors[i].blob), -+ &local_error); -+ -+ if (vectors[i].expected_bytes_needed < 0) -+ g_assert_error (local_error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT); -+ else -+ g_assert_no_error (local_error); -+ g_assert_cmpint (bytes_needed, ==, vectors[i].expected_bytes_needed); -+ -+ g_clear_error (&local_error); -+ } -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -+ - int - main (int argc, - char *argv[]) -@@ -151,6 +219,8 @@ main (int argc, - - g_test_add_func ("/gdbus/message/lock", message_lock); - g_test_add_func ("/gdbus/message/copy", message_copy); -- return g_test_run(); -+ g_test_add_func ("/gdbus/message/bytes-needed", message_bytes_needed); -+ -+ return g_test_run (); - } - --- -2.20.1 - diff --git a/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch deleted file mode 100644 index 7615dbb248bd..000000000000 --- a/dev-libs/glib/files/glib-2.58.2-external-gdbus-codegen.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 69da419c33c24a05126d21fb3098139d30ba9093 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Wed, 19 Dec 2018 14:01:43 +0200 -Subject: [PATCH] build: don't build gdbus-codegen and rely on external - gdbus-codegen for tests - ---- - configure.ac | 1 - - docs/reference/gio/Makefile.am | 1 - - gio/Makefile.am | 2 +- - gio/tests/Makefile.am | 22 ++++++------------- - .../gdbus-object-manager-example/Makefile.am | 6 ++--- - 5 files changed, 10 insertions(+), 22 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4b15b69b8..9187a12bb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3481,7 +3481,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 08093e8a0..9ce11f824 100644 ---- a/docs/reference/gio/Makefile.am -+++ b/docs/reference/gio/Makefile.am -@@ -212,7 +212,6 @@ man_MANS += \ - gsettings.1 \ - gresource.1 \ - gdbus.1 \ -- gdbus-codegen.1 \ - gio.1 \ - $(NULL) - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index 05b20cdef..ed5d7d4cb 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -1,6 +1,6 @@ - include $(top_srcdir)/glib.mk - --SUBDIRS = gdbus-2.0/codegen -+SUBDIRS = - - if OS_UNIX - SUBDIRS += xdgmime -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index c4e7a9257..4b538b1e9 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -253,9 +253,7 @@ gdbus-daemon-impl.c: $(top_srcdir)/gio/gdbusdaemon.c - # These files are only generated on Windows builds inside GIO, - # but we want them on non-Windows builds for the tests - gdbus-daemon-generated.h gdbus-daemon-generated.c: $(top_srcdir)/gio/dbus-daemon.xml $(GDBUS_PYTHON_DEPS) -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_srcdir)/gio/gdbus-2.0/codegen/gdbus-codegen.in \ -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org. \ - --generate-c-code gdbus-daemon-generated \ - --c-namespace _G \ -@@ -494,10 +492,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica - - BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.c gdbus-test-codegen-generated-interface-info.h - gdbus-test-codegen.o: gdbus-test-codegen-generated.h gdbus-test-codegen-generated-interface-info.h --gdbus-test-codegen-generated.h: 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: test-codegen.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.project. \ - --generate-c-code gdbus-test-codegen-generated \ - --c-generate-object-manager \ -@@ -516,10 +512,8 @@ gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gd - $(NULL) - gdbus-test-codegen-generated.c: gdbus-test-codegen-generated.h - @: # Generated as side-effect of .h --gdbus-test-codegen-generated-interface-info.h: 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-interface-info.h: test-codegen.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-info-header \ - --annotate "org.project.Bar" Key1 Value1 \ - --annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \ -@@ -532,10 +526,8 @@ gdbus-test-codegen-generated-interface-info.h: test-codegen.xml Makefile $(top_b - --output $@ \ - $(srcdir)/test-codegen.xml \ - $(NULL) --gdbus-test-codegen-generated-interface-info.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-interface-info.c: test-codegen.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-info-body \ - --annotate "org.project.Bar" Key1 Value1 \ - --annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \ -diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am -index 1d0464c5c..0603d9b0a 100644 ---- a/gio/tests/gdbus-object-manager-example/Makefile.am -+++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -11,10 +11,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 \ --- -2.17.0 - |