Fix bug #200623

Package-Manager: portage-2.1.3.19

5 files changed, 69 insertions, 5 deletions

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/Manifest b/dev-ruby/ruby-gtk2/Manifest
index 3da442e37585..1d4a8187d613 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ruby-gtk2-0.16.0-format-string.patch 707 RMD160 be61bb6c29aa907aa08fe781c6f06d80171651e9 SHA1 6bf0c8ffe3d520fab981b3e055b150a213b4ba61 SHA256 f8023d997396ba31383f5a23ec661955dae3a2710ac8666d9ece5eaaf11bd82f
+MD5 5d6d56a685fea1fd8f2f40df34ccfba1 files/ruby-gtk2-0.16.0-format-string.patch 707
+RMD160 be61bb6c29aa907aa08fe781c6f06d80171651e9 files/ruby-gtk2-0.16.0-format-string.patch 707
+SHA256 f8023d997396ba31383f5a23ec661955dae3a2710ac8666d9ece5eaaf11bd82f files/ruby-gtk2-0.16.0-format-string.patch 707
 AUX ruby-gtk2-0.16.0-typedef.patch 549 RMD160 3af4208381e939c74e64c33708b16cb13c775f52 SHA1 a5dc6d0ebd9d0b453c128d4a60d5a2a98dc8a893 SHA256 4b0cf22b2a80bbc921cd5791cb26366411c7954cbf6eebd627fea4f95c3ff14f
 MD5 e4fc3c8fa2cb049385c186911090e3ee files/ruby-gtk2-0.16.0-typedef.patch 549
 RMD160 3af4208381e939c74e64c33708b16cb13c775f52 files/ruby-gtk2-0.16.0-typedef.patch 549
@@ -17,14 +24,18 @@ EBUILD ruby-gtk2-0.16.0-r1.ebuild 574 RMD160 17012eb18e2a24f03425ad366008ebf4275
 MD5 f270f6edfc3e013ea9c048d39c7f8f7c ruby-gtk2-0.16.0-r1.ebuild 574
 RMD160 17012eb18e2a24f03425ad366008ebf427556c32 ruby-gtk2-0.16.0-r1.ebuild 574
 SHA256 ccbd0b628ac68ec2995646826726f61fd0607e49910f5a0d126d82a9738ae7ec ruby-gtk2-0.16.0-r1.ebuild 574
+EBUILD ruby-gtk2-0.16.0-r2.ebuild 630 RMD160 07cb9c7faf57d36f9c26ce81fef9314b6dd41f64 SHA1 720a3513c0b4b48dc889b0a48b6741637d0e776f SHA256 820e2b285c240251636f58ddff60844fb0b948a5d11555fd2f85176f77960d1f
+MD5 ef95612af2808a4098b23191a208515c ruby-gtk2-0.16.0-r2.ebuild 630
+RMD160 07cb9c7faf57d36f9c26ce81fef9314b6dd41f64 ruby-gtk2-0.16.0-r2.ebuild 630
+SHA256 820e2b285c240251636f58ddff60844fb0b948a5d11555fd2f85176f77960d1f ruby-gtk2-0.16.0-r2.ebuild 630
 EBUILD ruby-gtk2-0.16.0.ebuild 518 RMD160 8e3241e2128c1fd6a5d77047b7e152f4bdb6e5b3 SHA1 c173107319410149795b81bffc8fc0fadd036fbf SHA256 182c7674ce6df4d0223d1d602b977200556086cb0af00f087ff6552ef260fee8
 MD5 0016dd826a96c8ec40a20cfc1b41bcf8 ruby-gtk2-0.16.0.ebuild 518
 RMD160 8e3241e2128c1fd6a5d77047b7e152f4bdb6e5b3 ruby-gtk2-0.16.0.ebuild 518
 SHA256 182c7674ce6df4d0223d1d602b977200556086cb0af00f087ff6552ef260fee8 ruby-gtk2-0.16.0.ebuild 518
-MISC ChangeLog 7203 RMD160 2f3e48f0df4253e8f4fe49d66defb2937376b3f7 SHA1 1a6e30c59c1bc4a485288c49024af65883f07606 SHA256 4f8f6ffc44ced9f90db215de7c81ece50c7afceba9d487e2404d700b958b96ea
-MD5 83a5148f557a159b5afc058fd915029b ChangeLog 7203
-RMD160 2f3e48f0df4253e8f4fe49d66defb2937376b3f7 ChangeLog 7203
-SHA256 4f8f6ffc44ced9f90db215de7c81ece50c7afceba9d487e2404d700b958b96ea ChangeLog 7203
+MISC ChangeLog 7444 RMD160 d74c34c502302094f22b3e73e92b97ead33de795 SHA1 69635a4077d19427db54dfa8558f13adcc087cc3 SHA256 648e2586316f8e862417e5bffa122bf1289296230337a2104010f67f1d8bc1a9
+MD5 566f47488f4460f7a6d07b599f0e9791 ChangeLog 7444
+RMD160 d74c34c502302094f22b3e73e92b97ead33de795 ChangeLog 7444
+SHA256 648e2586316f8e862417e5bffa122bf1289296230337a2104010f67f1d8bc1a9 ChangeLog 7444
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -41,3 +52,13 @@ SHA256 088599799e062e45fb5eee803a9bb1d349ca7c6ba9fd60638edd1557bcab4e1a files/di
 MD5 502b7d91321b650b261e5363f1211d20 files/digest-ruby-gtk2-0.16.0-r1 271
 RMD160 f113e366affba68c0310698ecd3ee7f6a3f9ec19 files/digest-ruby-gtk2-0.16.0-r1 271
 SHA256 088599799e062e45fb5eee803a9bb1d349ca7c6ba9fd60638edd1557bcab4e1a files/digest-ruby-gtk2-0.16.0-r1 271
+MD5 502b7d91321b650b261e5363f1211d20 files/digest-ruby-gtk2-0.16.0-r2 271
+RMD160 f113e366affba68c0310698ecd3ee7f6a3f9ec19 files/digest-ruby-gtk2-0.16.0-r2 271
+SHA256 088599799e062e45fb5eee803a9bb1d349ca7c6ba9fd60638edd1557bcab4e1a files/digest-ruby-gtk2-0.16.0-r2 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHTclX0BM77Tkv120RAsCwAJ4lCBQhbr47EEWveIo+ZPbX6GDHAQCeNmTz
+EMlpMiG3r5E7kpWehUBwYQI=
+=Mco9
+-----END PGP SIGNATURE-----
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"