From 135e04796a73895fb2cb88ea787eabe636e81c7d Mon Sep 17 00:00:00 2001
From: Hans de Graaff <graaff@gentoo.org>
Date: Wed, 28 Nov 2007 20:02:26 +0000
Subject: Fix bug #200623 (Portage version: 2.1.3.19)

---
 dev-ruby/ruby-gtk2/ChangeLog                          |  8 +++++++-
 dev-ruby/ruby-gtk2/files/digest-ruby-gtk2-0.16.0-r2   |  3 +++
 .../files/ruby-gtk2-0.16.0-format-string.patch        | 15 +++++++++++++++
 dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r2.ebuild         | 19 +++++++++++++++++++
 4 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 dev-ruby/ruby-gtk2/files/digest-ruby-gtk2-0.16.0-r2
 create mode 100644 dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-format-string.patch
 create mode 100644 dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r2.ebuild

(limited to 'dev-ruby')

diff --git a/dev-ruby/ruby-gtk2/ChangeLog b/dev-ruby/ruby-gtk2/ChangeLog
index 9efa69c92d70..339d9670eedc 100644
--- a/dev-ruby/ruby-gtk2/ChangeLog
+++ b/dev-ruby/ruby-gtk2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-gtk2
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ChangeLog,v 1.52 2007/11/17 13:14:06 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ChangeLog,v 1.53 2007/11/28 20:02:25 graaff Exp $
+
+*ruby-gtk2-0.16.0-r2 (28 Nov 2007)
+
+  28 Nov 2007; Hans de Graaff <graaff@gentoo.org>
+  +files/ruby-gtk2-0.16.0-format-string.patch, +ruby-gtk2-0.16.0-r2.ebuild:
+  Fix format string problem reported in bug #200623, thanks to Lars Hartmann.
 
   17 Nov 2007; nixnut <nixnut@gentoo.org> ruby-gtk2-0.16.0-r1.ebuild:
   Stable on ppc wrt bug 198845
diff --git a/dev-ruby/ruby-gtk2/files/digest-ruby-gtk2-0.16.0-r2 b/dev-ruby/ruby-gtk2/files/digest-ruby-gtk2-0.16.0-r2
new file mode 100644
index 000000000000..3a3870dfc695
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/files/digest-ruby-gtk2-0.16.0-r2
@@ -0,0 +1,3 @@
+MD5 b3b4f81ef0fe2ce6b3f965bb7c6d3686 ruby-gnome2-all-0.16.0.tar.gz 1208856
+RMD160 c83c7cdcf633ad5cc213180f641a6c8f18002a9c ruby-gnome2-all-0.16.0.tar.gz 1208856
+SHA256 0910f08c5224bc39aad66c46b506e5c97e260475ede6b427d5365a9ef2d69ad4 ruby-gnome2-all-0.16.0.tar.gz 1208856
diff --git a/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-format-string.patch b/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-format-string.patch
new file mode 100644
index 000000000000..b3e17e65cea8
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/files/ruby-gtk2-0.16.0-format-string.patch
@@ -0,0 +1,15 @@
+This patch fixes a format string vulnerability that got reported in bug #200623.
+It is already fixed in upstream SVN in an identical manner.
+
+--- gtk/src/rbgtkmessagedialog.c
++++ gtk/src/rbgtkmessagedialog.c
+@@ -28,7 +28,8 @@
+                                RVAL2GFLAGS(flags, GTK_TYPE_DIALOG_FLAGS), 
+                                RVAL2GENUM(type, GTK_TYPE_MESSAGE_TYPE), 
+                                RVAL2GENUM(buttons, GTK_TYPE_BUTTONS_TYPE),
+-                               (const gchar*)(NIL_P(message) ? "": RVAL2CSTR(message)));
++                               "%s",
++                               NIL_P(message) ? "": RVAL2CSTR(message));
+     RBGTK_INITIALIZE(self, w);
+     return Qnil;
+ }
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r2.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r2.ebuild
new file mode 100644
index 000000000000..683fd1984abb
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ruby-gtk2-0.16.0-r2.ebuild,v 1.1 2007/11/28 20:02:25 graaff Exp $
+
+inherit ruby ruby-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+USE_RUBY="ruby18 ruby19"
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}
+	dev-ruby/ruby-gdkpixbuf2
+	>=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}
+	>=dev-ruby/ruby-atk-${PV}"
+
+PATCHES="${FILESDIR}/ruby-gtk2-0.16.0-typedef.patch
+	${FILESDIR}/ruby-gtk2-0.16.0-format-string.patch"
-- 
cgit v1.2.3-65-gdbad