From 8d198296cc73cb6d4d4e76bd5c84c2eef4a4dcd44fd3f28b0c462cc2dd6c61a5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sun, 27 Apr 2014 22:07:42 +0000 Subject: [PATCH 1/3] Obsoletes: xorg-x11-proto-devel -> Provides: xorg-x11-proto-devel OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXau?expand=0&rev=12 --- libXau.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libXau.spec b/libXau.spec index ca9b220..f82d5ff 100644 --- a/libXau.spec +++ b/libXau.spec @@ -1,7 +1,7 @@ # # spec file for package libXau # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From bee2a0d1a6d7553e25b40fc005db3badb5a70e6475a1708048949347b69a65d4 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 11 Feb 2019 11:24:33 +0000 Subject: [PATCH 2/3] - Update to version 1.0.9: * Update configure.ac bug URL for gitlab migration * autogen.sh: use quoted string variables * autogen: add default patch prefix * autogen.sh: use exec instead of waiting for configure to finish * XauFileName: always go through buf allocation if buf is NULL * XauFileName: reset bsize when malloc failed * AuDispose.c:remove redundant null check on calling free() * AuFileName.c: remove redundant null check on calling free() * AuRead.c: remove redundant null check on calling free() * Avoid out of boundary read access - supersedes U_0001-XauFileName-reset-bsize-when-malloc-failed.patch, U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXau?expand=0&rev=13 --- ...eName-reset-bsize-when-malloc-failed.patch | 32 ------------------- ...ys-go-through-buf-allocation-if-buf-.patch | 27 ---------------- libXau-1.0.8.tar.bz2 | 3 -- libXau-1.0.9.tar.bz2 | 3 ++ libXau.changes | 17 ++++++++++ libXau.spec | 10 ++---- 6 files changed, 23 insertions(+), 69 deletions(-) delete mode 100644 U_0001-XauFileName-reset-bsize-when-malloc-failed.patch delete mode 100644 U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch delete mode 100644 libXau-1.0.8.tar.bz2 create mode 100644 libXau-1.0.9.tar.bz2 diff --git a/U_0001-XauFileName-reset-bsize-when-malloc-failed.patch b/U_0001-XauFileName-reset-bsize-when-malloc-failed.patch deleted file mode 100644 index a9d6072..0000000 --- a/U_0001-XauFileName-reset-bsize-when-malloc-failed.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 67beb3d0bc41c3416902c858f595b35306f76704 Mon Sep 17 00:00:00 2001 -From: Fuminobu TAKEYAMA -Date: Sun, 29 Sep 2013 09:21:05 -0700 -Subject: [PATCH 1/2] XauFileName: reset bsize when malloc failed - -https://bugs.freedesktop.org/show_bug.cgi?id=69929 - -Reviewed-by: Alan Coopersmith -Signed-off-by: Alan Coopersmith ---- - AuFileName.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/AuFileName.c b/AuFileName.c -index 0904273..63d4956 100644 ---- a/AuFileName.c -+++ b/AuFileName.c -@@ -70,8 +70,10 @@ XauFileName (void) - if (buf) - free (buf); - buf = malloc (size); -- if (!buf) -+ if (!buf) { -+ bsize = 0; - return NULL; -+ } - - if (!atexit_registered) { - atexit(free_filename_buffer); --- -1.8.1.4 - diff --git a/U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch b/U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch deleted file mode 100644 index d87fde4..0000000 --- a/U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 304a11be4727c5a7feeb2501e8e001466f8ce84e Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Sun, 29 Sep 2013 09:23:45 -0700 -Subject: [PATCH 2/2] XauFileName: always go through buf allocation if buf is - NULL - -Signed-off-by: Alan Coopersmith ---- - AuFileName.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/AuFileName.c b/AuFileName.c -index 63d4956..7cedfcc 100644 ---- a/AuFileName.c -+++ b/AuFileName.c -@@ -66,7 +66,7 @@ XauFileName (void) - return NULL; - } - size = strlen (name) + strlen(&slashDotXauthority[1]) + 2; -- if (size > bsize) { -+ if ((size > bsize) || (buf == NULL)) { - if (buf) - free (buf); - buf = malloc (size); --- -1.8.1.4 - diff --git a/libXau-1.0.8.tar.bz2 b/libXau-1.0.8.tar.bz2 deleted file mode 100644 index d06bbd6..0000000 --- a/libXau-1.0.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 -size 295297 diff --git a/libXau-1.0.9.tar.bz2 b/libXau-1.0.9.tar.bz2 new file mode 100644 index 0000000..edc325a --- /dev/null +++ b/libXau-1.0.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec +size 322650 diff --git a/libXau.changes b/libXau.changes index 3ca2564..fb98c11 100644 --- a/libXau.changes +++ b/libXau.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Feb 11 11:15:25 UTC 2019 - sndirsch@suse.com + +- Update to version 1.0.9: + * Update configure.ac bug URL for gitlab migration + * autogen.sh: use quoted string variables + * autogen: add default patch prefix + * autogen.sh: use exec instead of waiting for configure to finish + * XauFileName: always go through buf allocation if buf is NULL + * XauFileName: reset bsize when malloc failed + * AuDispose.c:remove redundant null check on calling free() + * AuFileName.c: remove redundant null check on calling free() + * AuRead.c: remove redundant null check on calling free() + * Avoid out of boundary read access +- supersedes U_0001-XauFileName-reset-bsize-when-malloc-failed.patch, + U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch + ------------------------------------------------------------------- Mon Sep 30 10:12:46 UTC 2013 - sndirsch@suse.com diff --git a/libXau.spec b/libXau.spec index f82d5ff..b3d70fc 100644 --- a/libXau.spec +++ b/libXau.spec @@ -1,7 +1,7 @@ # # spec file for package libXau # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -18,7 +18,7 @@ Name: libXau %define lname libXau6 -Version: 1.0.8 +Version: 1.0.9 Release: 0 Summary: X11 authorization protocol library License: MIT @@ -28,8 +28,6 @@ Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXau #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXau/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 -Patch1: U_0001-XauFileName-reset-bsize-when-malloc-failed.patch -Patch2: U_0002-XauFileName-always-go-through-buf-allocation-if-buf-.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake BuildRequires: fdupes @@ -47,8 +45,8 @@ know a server-specific key called a "magic cookie". %package -n %lname Summary: X11 authorization protocol library -Group: System/Libraries # O/P added for 12.2 +Group: System/Libraries Provides: xorg-x11-libXau = 7.6_%version-%release Obsoletes: xorg-x11-libXau < 7.6_%version-%release @@ -79,8 +77,6 @@ in %lname. %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build %configure --disable-static From 60ca766e4b0e2499db40cdd11db95e58eee5ce13c19049a831944e71d3e473e5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 11 Feb 2019 13:19:11 +0000 Subject: [PATCH 3/3] added baselibs.conf to specfile OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXau?expand=0&rev=14 --- libXau.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libXau.spec b/libXau.spec index b3d70fc..df81eba 100644 --- a/libXau.spec +++ b/libXau.spec @@ -28,6 +28,7 @@ Url: http://xorg.freedesktop.org/ #Git-Clone: git://anongit.freedesktop.org/xorg/lib/libXau #Git-Web: http://cgit.freedesktop.org/xorg/lib/libXau/ Source: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2 +Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.60, automake BuildRequires: fdupes