pool/at-spi2-core
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 548496 from home:mgorse:branches:GNOME:Factory

Browse Source 
- Add at-spi2-core-bgo791124-buffer-overflow.patch: fix possible
  buffer overflow reading dbus address in at-spi-bus-launcher
  (bgo#791124).
- Add at-spi2-core-bgo791167-reproducible-build.patch: use
  @basename@ in templates, rather than @filename@; fixes build
  reproducibility and multiarch conflict (bgo#791167).

OBS-URL: https://build.opensuse.org/request/show/548496
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=172
This commit is contained in:
Bjørn Lie 2017-12-05 03:17:28 +00:00 committed by Git OBS Bridge
parent 5134a774c8
commit d8d7b85719
4 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
at-spi2-core-bgo791124-buffer-overflow.patch Normal file
View File

@ -0,0 +1,28 @@
From c2e87fe00b596dba20c9d57d406ab8faa744b15a Mon Sep 17 00:00:00 2001
From: Maya Rashish <maya@NetBSD.org>
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

42
at-spi2-core-bgo791167-reproducible-build.patch Normal file
View File

@ -0,0 +1,42 @@
From 0e9de9eb62088d251b95a7990b35f52ea961a608 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@debian.org>
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

10
at-spi2-core.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Dec 4 21:53:40 UTC 2017 - mgorse@suse.com
- Add at-spi2-core-bgo791124-buffer-overflow.patch: fix possible
buffer overflow reading dbus address in at-spi-bus-launcher
(bgo#791124).
- Add at-spi2-core-bgo791167-reproducible-build.patch: use
@basename@ in templates, rather than @filename@; fixes build
reproducibility and multiarch conflict (bgo#791167).
-------------------------------------------------------------------
Fri Dec 1 07:39:41 UTC 2017 - zaitor@opensuse.org

6
at-spi2-core.spec
View File

@ -25,6 +25,10 @@ Group: System/GUI/GNOME
Url: http://www.gnome.org/
Source0: http://download.gnome.org/sources/at-spi2-core/2.26/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM at-spi2-core-bgo791124-buffer-overflow.patch 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
@ -83,7 +87,7 @@ to develop applications that require these.
%lang_package
%prep
%autosetup
%autosetup -p1
%build
%meson \