gentoo resync : 29.03.2018

3 files changed, 85 insertions, 0 deletions

diff --git a/app-office/pinpoint/Manifest b/app-office/pinpoint/Manifest
index aeb484088aca..df6a10d194c5 100644
--- a/app-office/pinpoint/Manifest
+++ b/app-office/pinpoint/Manifest
@@ -1,3 +1,5 @@
+AUX pinpoint-0.1.8-CVE-2013-7447.patch 1197 BLAKE2B 3a9593e8175ade71784f1f656971b854ea7ccaa69ea28d90f34ed73b4049179871bf1dc731f0a29d0d8c129a1a108d18270a2cc65ba75e89accb616ceef8fa87 SHA512 1ad48cd84f1dc4c14e7e9886263bb595573e3941b9725dc777bee15bbe2404fb5b582a2850a0a6068627af608d0fe960a1775b388c3f175906ad9fd884708756
 DIST pinpoint-0.1.8.tar.xz 772980 BLAKE2B 1ca653b1cece97b47accd3a9cfe2560030f70a35703bd12b52cb692a15181b9bac2d40265bb6eaa486dc1919044f7b74874cb8b7fc8f4f37b78d938c89cb28ca SHA512 dc41405f79bf03b6a7c77ec31304e505d4ae2d13407304fbcc2f338dfe175f91db3c554ea06ba8041edbf99a12551f16efed98b5a07f29b7f24255cad2b1b94d
+EBUILD pinpoint-0.1.8-r1.ebuild 1196 BLAKE2B 2197a1fc639802f43ed6461e7e7401b47146bf024cc6a15e18bd61412c6bc28a33ae7f99d70402daee0a08fcfcb7b906f45f20428c3d3e5341b029b0cee5fdde SHA512 aabe46ea2ff9303ef86039ef44b49e5bd79046fac3142a52bc68b2d2fbda6422f3393621d78e3f58ec7198c9574025f2ddf5b0d55829fc84ecbafb8bbae362a3
 EBUILD pinpoint-0.1.8.ebuild 1074 BLAKE2B 25d7f97330e783ef83ff7af954e2218c1c05deee79ed60d05a90fb74f71f9182d1bae2683a28d5d56969f3a94d509feb7d623df6ef211a40cb6ec3e1be23f459 SHA512 0e282f771c36b73fefcca603242d8d9b760a95aee086a6f658ceee6100ea6e64e45bbe3122060fa90eaf523665a22e0f1a8fe9d4173bd794989ff5562a418e7d
 MISC metadata.xml 507 BLAKE2B e171dd659b7a4c19874ae97040e6241f761a7cdf49228c121ba44b82cba3175f3a444ec69933ece62b70be5d970ba95f5bee0480e4b012564f29921fa5c58f7b SHA512 be6bb803225f307fc7d2a9febd4ece776ce2e99f902d952b80c5bb8068793a9f32ab09c6a79a4c950299a83829fd32fab366600637892fbac02a908f038add74
diff --git a/app-office/pinpoint/files/pinpoint-0.1.8-CVE-2013-7447.patch b/app-office/pinpoint/files/pinpoint-0.1.8-CVE-2013-7447.patch
new file mode 100644
index 000000000000..b9c39ad7206d
--- /dev/null
+++ b/app-office/pinpoint/files/pinpoint-0.1.8-CVE-2013-7447.patch
@@ -0,0 +1,33 @@
+From f90483245250456d6306b4fff2f68f445ef33864 Mon Sep 17 00:00:00 2001
+From: RyuzakiKK <aasonykk@gmail.com>
+Date: Sat, 5 Aug 2017 20:00:30 +0200
+Subject: [PATCH] Avoid integer overflow
+
+pinpoint is affected by a possible integer overflow, that was also
+found and patched upstream in gtk+
+https://git.gnome.org/browse/gtk+/commit/?id=894b1ae76a32720f4bb3d39cf460402e3ce331d6
+
+With g_malloc_m we can avoid the integer overflow.
+
+As pointed out by Pacho Ramos in
+https://bugzilla.gnome.org/show_bug.cgi?id=762029
+---
+ pp-cairo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pp-cairo.c b/pp-cairo.c
+index 8afb362..dc0a452 100644
+--- a/pp-cairo.c
++++ b/pp-cairo.c
+@@ -120,7 +120,7 @@ _cairo_new_surface_from_pixbuf (const GdkPixbuf *pixbuf)
+     format = CAIRO_FORMAT_ARGB32;
+ 
+   cairo_stride = cairo_format_stride_for_width (format, width);
+-  cairo_pixels = g_malloc (height * cairo_stride);
++  cairo_pixels = g_malloc_n (height, cairo_stride);
+   surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
+                                                  format,
+                                                  width, height, cairo_stride);
+-- 
+2.13.4
+
diff --git a/app-office/pinpoint/pinpoint-0.1.8-r1.ebuild b/app-office/pinpoint/pinpoint-0.1.8-r1.ebuild
new file mode 100644
index 000000000000..7bf59666c4c6
--- /dev/null
+++ b/app-office/pinpoint/pinpoint-0.1.8-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A tool for making hackers do excellent presentations"
+HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer +pdf"
+
+# rsvg is used for svg-in-pdf -- clubbing it under pdf for now
+RDEPEND="
+	>=media-libs/clutter-1.23.7:1.0
+	>=media-libs/clutter-gtk-1.6:1.0
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/cairo-1.9.4
+	x11-libs/pango
+	x11-libs/gdk-pixbuf:2
+	gstreamer? ( media-libs/clutter-gst:3.0 )
+	pdf? ( gnome-base/librsvg:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix CVE-2013-7447, bug #574384, https://bugzilla.gnome.org/show_bug.cgi?id=762029
+	"${FILESDIR}"/${P}-CVE-2013-7447.patch
+)
+
+src_configure() {
+	# dax support is disabled because we don't have it in tree yet and it's
+	# experimental
+	gnome2_src_configure \
+		--disable-dax \
+		$(use_enable gstreamer cluttergst) \
+		$(use_enable pdf rsvg)
+}
+
+src_install() {
+	gnome2_src_install
+
+	docompress -x /usr/share/doc/${PF}/examples
+	insinto "/usr/share/doc/${PF}/examples"
+	doins introduction.pin bg.jpg bowls.jpg linus.jpg
+}