From 1209cb3c472f837124e9bb3576ab4adc7a7586d4748acbf67a376d4a32ff8c96 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 21 Feb 2017 22:34:46 +0000 Subject: [PATCH] wayland-1.13 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland?expand=0&rev=73 --- wayland-1.12.0.tar.xz | 3 -- wayland-1.12.0.tar.xz.sig | Bin 72 -> 0 bytes wayland-1.13.0.tar.xz | 3 ++ wayland-1.13.0.tar.xz.sig | Bin 0 -> 72 bytes ...t_data_to_invalid_address_after_free.patch | 50 ------------------ wayland.changes | 8 +++ wayland.spec | 9 ++-- 7 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 wayland-1.12.0.tar.xz delete mode 100644 wayland-1.12.0.tar.xz.sig create mode 100644 wayland-1.13.0.tar.xz create mode 100644 wayland-1.13.0.tar.xz.sig delete mode 100644 wayland-wl_array_Set_data_to_invalid_address_after_free.patch diff --git a/wayland-1.12.0.tar.xz b/wayland-1.12.0.tar.xz deleted file mode 100644 index 739da51..0000000 --- a/wayland-1.12.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1 -size 379520 diff --git a/wayland-1.12.0.tar.xz.sig b/wayland-1.12.0.tar.xz.sig deleted file mode 100644 index 89bb9a169f9ae49fbdeac2b98ca0afd0c94a800084042f7e12ca904e93ef8054..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0$1U6_5cbA5D}vRR^aA#5y(gYof0%c;EZTKA eGj3;4JpiD)DnB&El53kPiTa`?V`wWoW_Jo$Ga4TN literal 0 HcmV?d00001 diff --git a/wayland-wl_array_Set_data_to_invalid_address_after_free.patch b/wayland-wl_array_Set_data_to_invalid_address_after_free.patch deleted file mode 100644 index 228a12d..0000000 --- a/wayland-wl_array_Set_data_to_invalid_address_after_free.patch +++ /dev/null @@ -1,50 +0,0 @@ - -m e8ad23266f36521215dcd7cfcc524e0ef67d66dd Mon Sep 17 00:00:00 2001 -From: Yong Bakos -Date: Tue, 27 Sep 2016 13:03:48 -0500 -Subject: wl_array: Set data to invalid address after free - -Explicitly set the data member to an invalid memory address during -wl_array_release, such that re-using a freed wl_array without re-initializing -causes a crash. In addition, this pointer assignment makes wl_array_release -testable. - -Define a constant for the invalid memory address, and add documentation about -this behavior, starting at libwayland version 1.13. - -See https://lists.freedesktop.org/archives/wayland-devel/2016-September/031116.html - -Signed-off-by: Yong Bakos -Reviewed-by: Eric Engestrom -[Pekka: remove the doc about crashing] -Signed-off-by: Pekka Paalanen - -diff --git a/src/wayland-private.h b/src/wayland-private.h -index ac712d9..ef58ccf 100644 ---- a/src/wayland-private.h -+++ b/src/wayland-private.h -@@ -36,6 +36,9 @@ - - #include "wayland-util.h" - -+/* Invalid memory address */ -+#define WL_ARRAY_POISON_PTR (void *) 4 -+ - #define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0]) - - #define container_of(ptr, type, member) ({ \ -diff --git a/src/wayland-util.c b/src/wayland-util.c -index 639ccf8..077fec7 100644 ---- a/src/wayland-util.c -+++ b/src/wayland-util.c -@@ -102,6 +102,7 @@ WL_EXPORT void - wl_array_release(struct wl_array *array) - { - free(array->data); -+ array->data = WL_ARRAY_POISON_PTR; - } - - WL_EXPORT void * --- -cgit v0.10.2 - diff --git a/wayland.changes b/wayland.changes index 216ff23..f597357 100644 --- a/wayland.changes +++ b/wayland.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 21 22:33:07 UTC 2017 - jengelh@inai.de + +- Update to new upstrea mrelease 1.13.0 + * Add some API for controlling the visibility of globals. +- Drop wayland-wl_array_Set_data_to_invalid_address_after_free.patch + (no longer needed) + ------------------------------------------------------------------- Sat Nov 5 21:51:01 UTC 2016 - zaitor@opensuse.org diff --git a/wayland.spec b/wayland.spec index 104d2c5..de9a0b5 100644 --- a/wayland.spec +++ b/wayland.spec @@ -18,7 +18,7 @@ %define lname libwayland0 Name: wayland -Version: 1.12.0 +Version: 1.13.0 Release: 0 Summary: Wayland Compositor Infrastructure License: MIT @@ -31,8 +31,6 @@ Source: http://wayland.freedesktop.org/releases/%name-%version.tar.xz Source2: http://wayland.freedesktop.org/releases/%name-%version.tar.xz.sig Source3: %name.keyring Source4: baselibs.conf -# PATCH-FIX-UPSTREAM wayland-wl_array_Set_data_to_invalid_address_after_free.patch zaitor@opensuse.org -- Fix a crash after free. -Patch0: wayland-wl_array_Set_data_to_invalid_address_after_free.patch #git#BuildRequires: autoconf >= 2.64 #git#BuildRequires: automake >= 1.11 #git#BuildRequires: libtool >= 2.2 @@ -122,12 +120,11 @@ This subpackage contains the documentation to Wayland. %prep %setup -q -%patch0 -p1 %build if [ ! -e configure ]; then - autoreconf -fi; -fi; + autoreconf -fi +fi %configure --disable-static --includedir="%_includedir/%name" \ %if %with_doc --docdir="%_defaultdocdir/%name"