Fix building with -Werror=format-security (#517612 by ago) and look for lpoptions in proper place (from Fedora)

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 64 insertions, 2 deletions

diff --git a/net-print/libgnomecups/ChangeLog b/net-print/libgnomecups/ChangeLog
index c67b5a05531c..6efcc2ff3eca 100644
--- a/net-print/libgnomecups/ChangeLog
+++ b/net-print/libgnomecups/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/libgnomecups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/ChangeLog,v 1.99 2014/06/29 09:43:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/ChangeLog,v 1.100 2014/07/20 19:42:37 pacho Exp $
+
+*libgnomecups-0.2.3-r5 (20 Jul 2014)
+
+  20 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/libgnomecups-0.2.3-format-string.patch,
+  +files/libgnomecups-0.2.3-lpoptions.patch, +libgnomecups-0.2.3-r5.ebuild,
+  -libgnomecups-0.2.3-r4.ebuild:
+  Fix building with -Werror=format-security (#517612 by ago) and look for
+  lpoptions in proper place (from Fedora)
 
 *libgnomecups-0.2.3-r4 (29 Jun 2014)
 
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch
new file mode 100644
index 000000000000..797231416b64
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch
@@ -0,0 +1,34 @@
+From afe4d5299e6f48ace0fbedbfba8159812afcdd1c Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Tue, 14 Jan 2014 15:23:59 +0100
+Subject: [PATCH] Fix build with -Werror=format-security
+
+---
+ libgnomecups/gnome-cups-request.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c
+index c94f623..fa1bd97 100644
+--- a/libgnomecups/gnome-cups-request.c
++++ b/libgnomecups/gnome-cups-request.c
+@@ -353,7 +353,7 @@ request_thread_main (GnomeCupsRequest *request,
+ 			g_warning ("IPP request failed with status %d", status);
+ 			if (request->error != NULL)
+ 				*(request->error) = g_error_new (GNOME_CUPS_ERROR, 
+-								 status, ippErrorString (status));
++								 status, "%s", ippErrorString (status));
+ 		} else if (request->response && _gnome_cups_debug) {
+ 			g_print ("response = \n");
+ 			dump_request (request->response);
+@@ -364,7 +364,7 @@ request_thread_main (GnomeCupsRequest *request,
+ 		request->response = NULL;
+ 		if (HTTP_OK != status && request->error != NULL)
+ 			*(request->error) = g_error_new (GNOME_CUPS_ERROR, 
+-							 status, httpStatus (status));
++							 status, "%s", httpStatus (status));
+ 	} else {
+ 		g_warning ("Neither request nor output_fd set");
+ 		if (request->error != NULL)
+-- 
+1.8.3.1
+
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch
new file mode 100644
index 000000000000..b682e450746a
--- /dev/null
+++ b/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch
@@ -0,0 +1,13 @@
+--- libgnomecups-0.2.2.orig/libgnomecups/gnome-cups-printer.c
++++ libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c
+@@ -510,6 +510,10 @@
+ 	num_dests = cups_get_dests (filename, num_dests, dests);
+ 	g_free (filename);
+ 
++	filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions", NULL);
++	num_dests = cups_get_dests (filename, num_dests, dests);
++	g_free (filename);
++
+ 	return num_dests;
+ }
+ 
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r4.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
index 3b151aa48fb1..ca0ae2d335d1 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r4.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/libgnomecups-0.2.3-r4.ebuild,v 1.1 2014/06/29 09:43:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild,v 1.1 2014/07/20 19:42:37 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="yes"
@@ -45,6 +45,12 @@ src_prepare() {
 	# and also use AC_PATH_TOOL to respect $CHOST
 	epatch "${FILESDIR}/${P}-cups-config.patch"
 
+	# Fix building with -Werror=format-security, bug #517612
+	epatch "${FILESDIR}/${P}-format-string.patch"
+
+	# Look for lpoptions in the right spot, upstream bug #520449
+	epatch "${FILESDIR}/${P}-lpoptions.patch"
+
 	eautoreconf # To fix intltool files making LINGUAS to be honored
 	gnome2_src_prepare
 }