net-print/gtklp: Add patch from Debian for bug 536122, other cleanups

Package-Manager: Portage-2.3.3, Repoman-2.3.1

2 files changed, 63 insertions, 4 deletions

diff --git a/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch b/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch
new file mode 100644
index 000000000000..5c513bc14cd3
--- /dev/null
+++ b/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch
@@ -0,0 +1,56 @@
+Source:
+https://sources.debian.net/src/gtklp/1.3.1-0.1/debian/patches/bugs/644113.diff/
+
+--- gtklp.orig/libgtklp/libgtklp.c
++++ gtklp/libgtklp/libgtklp.c
+@@ -554,7 +554,7 @@ void passwin_response_ok(GtkEditable *ed
+ 
+ const char *getPass (const char *prompt)
+ {
+-  GtkWidget *vbox, *hbox, *hbox1, *vbox1, *vbox2, *labell, *labelp, *yes, *no;
++  GtkWidget *vbox, *hbox, *vbox1, *vbox2, *labell, *labelp;
+ 	gint gi1;
+ #if GTK_MAJOR_VERSION == 1
+ 	GtkWidget *sep,*passwin;
+@@ -780,9 +780,6 @@ void exitOnError(char *gerror1, char *ge
+ 	GtkWidget *exitErrorDialog;
+ 	GtkWidget *hbox,*label,*pixmapwid;
+ 	char tmplabel[MAXLINE+1];
+-	GtkStyle *style;
+-	GdkPixmap *pixmap;
+-	GdkBitmap *mask;
+ #if GTK_MAJOR_VERSION == 1
+ 	GtkWidget *button,*vbox,*sep,*bbox;
+ #endif
+@@ -826,9 +823,9 @@ void exitOnError(char *gerror1, char *ge
+ 		gtk_widget_show(pixmapwid);
+ 
+ 		if(strlen(gerror2) == 0)
+-			snprintf(tmplabel,(size_t)MAXLINE,gerror1);
++			snprintf(tmplabel,(size_t)MAXLINE,"%s",gerror1);
+ 		else
+-			snprintf(tmplabel,(size_t)MAXLINE,gerror1,gerror2);
++			snprintf(tmplabel,(size_t)MAXLINE,"%s\n%s",gerror1,gerror2);
+ 		label=gtk_label_new(tmplabel);
+ 		gtk_box_pack_end(GTK_BOX(hbox),label,FALSE, FALSE,FRAME_SPACING_V);
+ 		gtk_widget_show(label);
+@@ -856,7 +853,7 @@ void exitOnError(char *gerror1, char *ge
+ #endif
+ 	} else {
+ 		if(strlen(gerror2) == 0)
+-			g_warning(gerror1);
++			g_warning("%s",gerror1);
+ 		else
+ 			g_warning(gerror1,gerror2);
+ 	}
+--- gtklp.orig/gtklp/gtklp.c
++++ gtklp/gtklp/gtklp.c
+@@ -302,7 +302,7 @@ int main(int argc,char *argv[])
+ 			case '?':
+ 				if(calledGtkLP)
+ 				{
+-					g_print(str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n")));
++					g_print("%s", str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n")));
+ 				}
+ 				return(0);
+ 			break;
diff --git a/net-print/gtklp/gtklp-1.3.1.ebuild b/net-print/gtklp/gtklp-1.3.1.ebuild
index 72969c5b4027..e3aa1c6a45fd 100644
--- a/net-print/gtklp/gtklp-1.3.1.ebuild
+++ b/net-print/gtklp/gtklp-1.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit autotools eutils
 
@@ -17,15 +17,18 @@ KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="nls ssl"
 
 RDEPEND="x11-libs/gtk+:2
-	>=net-print/cups-1.6
+	net-print/cups
 	nls? ( sys-devel/gettext )
-	ssl? ( dev-libs/openssl )"
+	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="AUTHORS BUGS ChangeLog README TODO USAGE"
 
+PATCHES=( "${FILESDIR}/${P}-formatsec.patch" )
+
 src_prepare() {
+	default
 	sed -e '/DEF_BROWSER_CMD/{s:netscape:firefox:}' \
 		-e '/DEF_HELP_HOME/{s:631/sum.html#STANDARD_OPTIONS:631/help/:}' \
 		-i include/defaults.h || die