[gtk+extra] glib and buffer overflow patches

[Roy Rankin]

commit c006100d4f88c18a6dd6ffd0bc47e3d9b3f80d15
Author: Roy Rankin <rrankin at ihug.com.au>
Date:   Wed Dec 7 16:44:41 2011 +1100

    glib and buffer overflow patches

 gtk+extra-2.1.2-gtkcharsel.patch    |   17 +++++++++++++++++
 gtk+extra-2.1.2-gtkcolorcombo.patch |   24 ++++++++++++++++++++++++
 gtk+extra.spec                      |    9 ++++++++-
 3 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/gtk+extra-2.1.2-gtkcharsel.patch b/gtk+extra-2.1.2-gtkcharsel.patch
new file mode 100644
index 0000000..b953e79
--- /dev/null
+++ b/gtk+extra-2.1.2-gtkcharsel.patch
@@ -0,0 +1,17 @@
+Index: gtkextra/gtkcharsel.c
+===================================================================
+RCS file: /cvsroot/gtkextra/gtkextra-2/gtkextra/gtkcharsel.c,v
+retrieving revision 1.4
+diff -c -r1.4 gtkcharsel.c
+*** gtkextra/gtkcharsel.c	27 Aug 2004 21:46:14 -0000	1.4
+--- gtkextra/gtkcharsel.c	7 Dec 2011 03:30:41 -0000
+***************
+*** 18,24 ****
+   */
+  
+  #include <gtk/gtk.h>
+- #include <glib/gunicode.h>
+  
+  #include <string.h>
+  #include "gtkcharsel.h"
+--- 18,23 ----
diff --git a/gtk+extra-2.1.2-gtkcolorcombo.patch b/gtk+extra-2.1.2-gtkcolorcombo.patch
new file mode 100644
index 0000000..5bd98f6
--- /dev/null
+++ b/gtk+extra-2.1.2-gtkcolorcombo.patch
@@ -0,0 +1,24 @@
+Index: gtkextra/gtkcolorcombo.c
+===================================================================
+RCS file: /cvsroot/gtkextra/gtkextra-2/gtkextra/gtkcolorcombo.c,v
+retrieving revision 1.6
+diff -c -r1.6 gtkcolorcombo.c
+*** gtkextra/gtkcolorcombo.c	19 Sep 2010 04:24:41 -0000	1.6
+--- gtkextra/gtkcolorcombo.c	7 Dec 2011 05:15:50 -0000
+***************
+*** 354,360 ****
+    GdkPixmap *color_pixmap;
+    GtkWidget *pixmap;
+    GtkWidget *box;
+!   gchar color_string[21];
+    gint i,j,n;
+  
+    g_return_if_fail (widget != NULL);
+--- 354,360 ----
+    GdkPixmap *color_pixmap;
+    GtkWidget *pixmap;
+    GtkWidget *box;
+!   gchar color_string[22];
+    gint i,j,n;
+  
+    g_return_if_fail (widget != NULL);
diff --git a/gtk+extra.spec b/gtk+extra.spec
index f04ed5a..c1c6c7d 100644
--- a/gtk+extra.spec
+++ b/gtk+extra.spec
@@ -1,6 +1,6 @@
 Name:		gtk+extra
 Version:	2.1.2
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une bibliothèque de widgets gtk+
 
@@ -12,6 +12,8 @@ Patch:		%{name}-%{version}-gtk2.21.patch
 Patch1:		%{name}-%{version}-make.patch
 Patch2:		%{name}-%{version}-marshal.patch
 Patch3:		%{name}-%{version}-gtkitementry.patch
+Patch4:		%{name}-%{version}-gtkcharsel.patch
+Patch5:		%{name}-%{version}-gtkcolorcombo.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel libtool gtk-doc
@@ -51,6 +53,8 @@ qui utilisent les widgets gtk+extra.
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p0
+%patch5 -p0
 libtoolize --force
 aclocal
 autoheader
@@ -94,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 07 2011 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.2-8
+- patch for glib change, patch buffer overflow
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.1.2-7
 - Rebuild for new libpng