From 6325442ec18ef5142dfa3052b9c1e7578ac011e1b028350d272e3a7902afb155 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Feb 2010 16:57:42 +0000 Subject: [PATCH 1/3] Accepting request 33074 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gegl via accept of submit request 33074 revision 19. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/33074 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=11 --- gegl-fix-overflow.patch | 26 ++++++++++++++++++++++++++ gegl.changes | 5 +++++ gegl.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 gegl-fix-overflow.patch diff --git a/gegl-fix-overflow.patch b/gegl-fix-overflow.patch new file mode 100644 index 0000000..db9522a --- /dev/null +++ b/gegl-fix-overflow.patch @@ -0,0 +1,26 @@ +From 66d2ae5782d1d13224294ecf20e6f63680903550 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Mon, 22 Feb 2010 12:57:00 +0100 +Subject: [PATCH] Use memcpy instead of strcpy to avoid buffer overflow + +https://bugzilla.gnome.org/show_bug.cgi?id=610680 +--- + gegl/buffer/gegl-buffer-save.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gegl/buffer/gegl-buffer-save.c b/gegl/buffer/gegl-buffer-save.c +index 85c7894..aff175c 100644 +--- a/gegl/buffer/gegl-buffer-save.c ++++ b/gegl/buffer/gegl-buffer-save.c +@@ -196,7 +196,7 @@ gegl_buffer_header_init (GeglBufferHeader *header, + gint bpp, + Babl* format) + { +- strcpy (header->magic, "GEGL"); ++ memcpy (header->magic, "GEGL", 4); + + header->flags = GEGL_FLAG_HEADER; + header->tile_width = tile_width; +-- +1.6.6.1 + diff --git a/gegl.changes b/gegl.changes index a3c4d52..24d9d95 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 22 12:59:17 CET 2010 - vuntz@opensuse.org + +- Add gegl-fix-overflow.patch to fix overflow found by gcc 4.5. + ------------------------------------------------------------------- Wed Feb 10 23:42:49 CET 2010 - vuntz@opensuse.org diff --git a/gegl.spec b/gegl.spec index a5ac1bc..57c43c4 100644 --- a/gegl.spec +++ b/gegl.spec @@ -49,6 +49,8 @@ Summary: Generic Graphics Library Source: ftp://ftp.gimp.org/pub/gegl/v0.0/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gegl-fix-build.patch bgo609706 vuntz@opensuse.org -- Remove unneeded printf, which fixes build Patch0: gegl-fix-build.patch +# PATCH-FIX-UPSTREAM gegl-fix-overflow.patch bgo610680 vuntz@opensuse.org -- Fix overflow found by gcc 4.5 +Patch1: gegl-fix-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libgegl-0_1-0 = %{version}-%{release} @@ -126,6 +128,7 @@ input and output. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure\ From 87e6471d07850689c4bc80f4da2c81424c706f65fc884e416dcf99b8b77aa486 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 23 Feb 2010 00:18:04 +0000 Subject: [PATCH 2/3] Accepting request 33134 from graphics checked in (request 33134) OBS-URL: https://build.opensuse.org/request/show/33134 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=12 --- gegl-fix-overflow.patch | 26 -------------------------- gegl.changes | 5 ----- gegl.spec | 3 --- 3 files changed, 34 deletions(-) delete mode 100644 gegl-fix-overflow.patch diff --git a/gegl-fix-overflow.patch b/gegl-fix-overflow.patch deleted file mode 100644 index db9522a..0000000 --- a/gegl-fix-overflow.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 66d2ae5782d1d13224294ecf20e6f63680903550 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Mon, 22 Feb 2010 12:57:00 +0100 -Subject: [PATCH] Use memcpy instead of strcpy to avoid buffer overflow - -https://bugzilla.gnome.org/show_bug.cgi?id=610680 ---- - gegl/buffer/gegl-buffer-save.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gegl/buffer/gegl-buffer-save.c b/gegl/buffer/gegl-buffer-save.c -index 85c7894..aff175c 100644 ---- a/gegl/buffer/gegl-buffer-save.c -+++ b/gegl/buffer/gegl-buffer-save.c -@@ -196,7 +196,7 @@ gegl_buffer_header_init (GeglBufferHeader *header, - gint bpp, - Babl* format) - { -- strcpy (header->magic, "GEGL"); -+ memcpy (header->magic, "GEGL", 4); - - header->flags = GEGL_FLAG_HEADER; - header->tile_width = tile_width; --- -1.6.6.1 - diff --git a/gegl.changes b/gegl.changes index 24d9d95..a3c4d52 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Feb 22 12:59:17 CET 2010 - vuntz@opensuse.org - -- Add gegl-fix-overflow.patch to fix overflow found by gcc 4.5. - ------------------------------------------------------------------- Wed Feb 10 23:42:49 CET 2010 - vuntz@opensuse.org diff --git a/gegl.spec b/gegl.spec index 57c43c4..a5ac1bc 100644 --- a/gegl.spec +++ b/gegl.spec @@ -49,8 +49,6 @@ Summary: Generic Graphics Library Source: ftp://ftp.gimp.org/pub/gegl/v0.0/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gegl-fix-build.patch bgo609706 vuntz@opensuse.org -- Remove unneeded printf, which fixes build Patch0: gegl-fix-build.patch -# PATCH-FIX-UPSTREAM gegl-fix-overflow.patch bgo610680 vuntz@opensuse.org -- Fix overflow found by gcc 4.5 -Patch1: gegl-fix-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libgegl-0_1-0 = %{version}-%{release} @@ -128,7 +126,6 @@ input and output. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %configure\ From 1bd63e19242d93974f44161860d743085b5458554d0165e2d8479ed4f073f211 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 23 Feb 2010 00:18:05 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/gegl revision 11.0 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=521789a1a442fef61a0e70e5f4559fd9 --- gegl-fix-overflow.patch | 26 ++++++++++++++++++++++++++ gegl.changes | 5 +++++ gegl.spec | 5 ++++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gegl-fix-overflow.patch diff --git a/gegl-fix-overflow.patch b/gegl-fix-overflow.patch new file mode 100644 index 0000000..db9522a --- /dev/null +++ b/gegl-fix-overflow.patch @@ -0,0 +1,26 @@ +From 66d2ae5782d1d13224294ecf20e6f63680903550 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Mon, 22 Feb 2010 12:57:00 +0100 +Subject: [PATCH] Use memcpy instead of strcpy to avoid buffer overflow + +https://bugzilla.gnome.org/show_bug.cgi?id=610680 +--- + gegl/buffer/gegl-buffer-save.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gegl/buffer/gegl-buffer-save.c b/gegl/buffer/gegl-buffer-save.c +index 85c7894..aff175c 100644 +--- a/gegl/buffer/gegl-buffer-save.c ++++ b/gegl/buffer/gegl-buffer-save.c +@@ -196,7 +196,7 @@ gegl_buffer_header_init (GeglBufferHeader *header, + gint bpp, + Babl* format) + { +- strcpy (header->magic, "GEGL"); ++ memcpy (header->magic, "GEGL", 4); + + header->flags = GEGL_FLAG_HEADER; + header->tile_width = tile_width; +-- +1.6.6.1 + diff --git a/gegl.changes b/gegl.changes index a3c4d52..24d9d95 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 22 12:59:17 CET 2010 - vuntz@opensuse.org + +- Add gegl-fix-overflow.patch to fix overflow found by gcc 4.5. + ------------------------------------------------------------------- Wed Feb 10 23:42:49 CET 2010 - vuntz@opensuse.org diff --git a/gegl.spec b/gegl.spec index a5ac1bc..7bcd782 100644 --- a/gegl.spec +++ b/gegl.spec @@ -42,13 +42,15 @@ Provides: patched_subset %endif Url: http://gegl.org/ Version: 0.1.2 -Release: 1 +Release: 2 License: GPLv3+ ; LGPLv3+ Group: System/Libraries Summary: Generic Graphics Library Source: ftp://ftp.gimp.org/pub/gegl/v0.0/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gegl-fix-build.patch bgo609706 vuntz@opensuse.org -- Remove unneeded printf, which fixes build Patch0: gegl-fix-build.patch +# PATCH-FIX-UPSTREAM gegl-fix-overflow.patch bgo610680 vuntz@opensuse.org -- Fix overflow found by gcc 4.5 +Patch1: gegl-fix-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libgegl-0_1-0 = %{version}-%{release} @@ -126,6 +128,7 @@ input and output. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure\