Import upstream patch for security #449310

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 79 insertions, 1 deletions

diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog
index 411597e4982d..f24255954bfc 100644
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/fribidi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.68 2012/12/30 13:56:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.69 2012/12/30 15:07:12 ssuominen Exp $
+
+*fribidi-0.19.5-r1 (30 Dec 2012)
+
+  30 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +fribidi-0.19.5-r1.ebuild, +files/fribidi-0.19.5-signedwarning.patch:
+  Import upstream patch for security #449310
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> fribidi-0.19.5.ebuild:
   Stable for sparc, wrt bug #448522
diff --git a/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch b/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch
new file mode 100644
index 000000000000..2619bf375510
--- /dev/null
+++ b/dev-libs/fribidi/files/fribidi-0.19.5-signedwarning.patch
@@ -0,0 +1,22 @@
+From 78dc3af68ed0e1aafe54c176b28dadee66eb306c Mon Sep 17 00:00:00 2001
+From: Behdad Esfahbod <behdad@behdad.org>
+Date: Thu, 06 Dec 2012 17:17:53 +0000
+Subject: Fix theoretically possible overflow
+
+https://bugzilla.redhat.com/show_bug.cgi?id=884000
+---
+diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
+index ac9e2ff..dd27f0d 100644
+--- a/bin/fribidi-main.c
++++ b/bin/fribidi-main.c
+@@ -519,7 +519,7 @@ main (
+ 				  idx++;
+ 				}
+ #endif /* !FRIBIDI_MAIN_USE_ICONV_H */
+-			    if (wid < 0 && idx > st + 1)
++			    if (wid < 0 && idx - st > 1)
+ 			      idx--;
+ 			    inlen = idx - st;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
new file mode 100644
index 000000000000..ad7f69ac4153
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.5-r1.ebuild,v 1.1 2012/12/30 15:07:12 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="http://fribidi.org/"
+SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RESTRICT="test" #397347
+
+RDEPEND=">=dev-libs/glib-2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS NEWS README ChangeLog THANKS TODO"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.19.2-nodoc.patch \
+		"${FILESDIR}"/${P}-signedwarning.patch
+
+	# Fix compability with dev-libs/glib >= 2.31
+	sed -i \
+		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
+		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
+		charset/fribidi-char-sets.c lib/mem.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
+	# present in /usr/lib/pkgconfig/fribidi.pc
+	econf \
+		$(use_enable static-libs static) \
+		--with-glib=yes
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}