From 5f26bca2063db04305322b475d182c11eb5fa1cc8a8209ba584f0f0335ab5658 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 10:01:40 +0000 Subject: [PATCH] Accepting request 583531 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583531 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=177 --- at-spi2-core-2.26.2.tar.xz | 3 -- at-spi2-core-2.27.92.tar.xz | 3 ++ at-spi2-core-bgo791124-buffer-overflow.patch | 28 ------------- ...i2-core-bgo791167-reproducible-build.patch | 42 ------------------- at-spi2-core.changes | 18 ++++++++ at-spi2-core.spec | 17 +++----- 6 files changed, 27 insertions(+), 84 deletions(-) delete mode 100644 at-spi2-core-2.26.2.tar.xz create mode 100644 at-spi2-core-2.27.92.tar.xz delete mode 100644 at-spi2-core-bgo791124-buffer-overflow.patch delete mode 100644 at-spi2-core-bgo791167-reproducible-build.patch diff --git a/at-spi2-core-2.26.2.tar.xz b/at-spi2-core-2.26.2.tar.xz deleted file mode 100644 index a3a268a..0000000 --- a/at-spi2-core-2.26.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615 -size 494484 diff --git a/at-spi2-core-2.27.92.tar.xz b/at-spi2-core-2.27.92.tar.xz new file mode 100644 index 0000000..4f335c6 --- /dev/null +++ b/at-spi2-core-2.27.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20d647fd1c0a5b982e816e31fd3f83fa271ecc764f402a1497e951c2d49cb581 +size 186628 diff --git a/at-spi2-core-bgo791124-buffer-overflow.patch b/at-spi2-core-bgo791124-buffer-overflow.patch deleted file mode 100644 index 8a19f8c..0000000 --- a/at-spi2-core-bgo791124-buffer-overflow.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c2e87fe00b596dba20c9d57d406ab8faa744b15a Mon Sep 17 00:00:00 2001 -From: Maya Rashish -Date: Sat, 2 Dec 2017 13:24:29 +0200 -Subject: [PATCH 1/2] Fix inverted logic. - -Don't write more into a buffer than it can hold. - -https://bugzilla.gnome.org/show_bug.cgi?id=791124 ---- - bus/at-spi-bus-launcher.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c -index 261353f..eb2b8e3 100644 ---- a/bus/at-spi-bus-launcher.c -+++ b/bus/at-spi-bus-launcher.c -@@ -244,7 +244,7 @@ unix_read_all_fd_to_string (int fd, - { - ssize_t bytes_read; - -- while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1)))) -+ while (max_bytes > 1 && (bytes_read = read (fd, buf, MIN (4096, max_bytes - 1)))) - { - if (bytes_read < 0) - return FALSE; --- -2.15.0 - diff --git a/at-spi2-core-bgo791167-reproducible-build.patch b/at-spi2-core-bgo791167-reproducible-build.patch deleted file mode 100644 index 68b0701..0000000 --- a/at-spi2-core-bgo791167-reproducible-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0e9de9eb62088d251b95a7990b35f52ea961a608 Mon Sep 17 00:00:00 2001 -From: Chris Lamb -Date: Mon, 4 Dec 2017 14:15:01 -0600 -Subject: [PATCH 2/2] Make the build reproducible - -atspi-enum-types.(c|h).template should use @basename@ rather than @filename@ - -https://bugzilla.gnome.org/show_bug.cgi?id=791167 ---- - atspi/atspi-enum-types.c.template | 2 +- - atspi/atspi-enum-types.h.template | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/atspi/atspi-enum-types.c.template b/atspi/atspi-enum-types.c.template -index cd92f99..385d0ee 100644 ---- a/atspi/atspi-enum-types.c.template -+++ b/atspi/atspi-enum-types.c.template -@@ -4,7 +4,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - #include "@filename@" - - /*** END file-production ***/ -diff --git a/atspi/atspi-enum-types.h.template b/atspi/atspi-enum-types.h.template -index bd297b5..789ad2e 100644 ---- a/atspi/atspi-enum-types.h.template -+++ b/atspi/atspi-enum-types.h.template -@@ -9,7 +9,7 @@ G_BEGIN_DECLS - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* Enumerations from "@filename@" */ -+/* Enumerations from "@basename@" */ - - /*** END file-production ***/ - --- -2.15.0 - diff --git a/at-spi2-core.changes b/at-spi2-core.changes index 8d973df..8593c0b 100644 --- a/at-spi2-core.changes +++ b/at-spi2-core.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Mar 6 09:37:08 UTC 2018 - dimstar@opensuse.org + +- Update to version 2.27.92: + + Dropped autotools support. + + Documentation: Remove list association from + ATSPI_ROLE_DESCRIPTION_{TERM,VALUE} (bgo#791021). + + Fix a potential buffer overflow in at-spi-bus-launcher + (bgo#791124). + + Make the build reproducible (bgo#791167). +- Drop at-spi2-core-bgo791124-buffer-overflow.patch and + at-spi2-core-bgo791167-reproducible-build.patch: fixed upstream. + +------------------------------------------------------------------- +Wed Feb 28 16:23:10 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Mon Dec 4 21:53:40 UTC 2017 - mgorse@suse.com diff --git a/at-spi2-core.spec b/at-spi2-core.spec index cde1e79..9ef00a2 100644 --- a/at-spi2-core.spec +++ b/at-spi2-core.spec @@ -1,7 +1,7 @@ # # spec file for package at-spi2-core # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,14 @@ Name: at-spi2-core -Version: 2.26.2 +Version: 2.27.92 Release: 0 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/GNOME -Url: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/at-spi2-core/2.26/%{name}-%{version}.tar.xz +URL: http://www.gnome.org/ +Source0: http://download.gnome.org/sources/at-spi2-core/2.27/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM at-spi2-core-bgo791124-buffer-overflow.patch boo#1073027 bgo#791124 mgorse@suse.com -- Fix possible buffer overflow reading dbus address in at-spi-bus-launcher. -Patch0: at-spi2-core-bgo791124-buffer-overflow.patch -# PATCH-FIX-UPSTREAM at-spi2-core-bgo791167-reproducible-build.patch bgo#791167 mgorse@suse.com -- use @basename@ rather than @filename@ in templates. -Patch1: at-spi2-core-bgo791167-reproducible-build.patch - BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: meson @@ -106,7 +101,7 @@ to develop applications that require these. %postun -n libatspi0 -p /sbin/ldconfig %files -%doc COPYING +%license COPYING %{_libexecdir}/at-spi2/ %{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop %{_userunitdir}/at-spi-dbus-bus.service