| 1 |
commit: b99ad73e6797dc9d517da529586ce635964a3943 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 13 21:14:48 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 13 21:16:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99ad73e |
| 7 |
|
| 8 |
net-print/gtklp: Add patch from Debian for bug 536122, other cleanups |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-print/gtklp/files/gtklp-1.3.1-formatsec.patch | 56 +++++++++++++++++++++++ |
| 13 |
net-print/gtklp/gtklp-1.3.1.ebuild | 11 +++-- |
| 14 |
2 files changed, 63 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch b/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000000..5c513bc14c |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-print/gtklp/files/gtklp-1.3.1-formatsec.patch |
| 21 |
@@ -0,0 +1,56 @@ |
| 22 |
+Source: |
| 23 |
+https://sources.debian.net/src/gtklp/1.3.1-0.1/debian/patches/bugs/644113.diff/ |
| 24 |
+ |
| 25 |
+--- gtklp.orig/libgtklp/libgtklp.c |
| 26 |
++++ gtklp/libgtklp/libgtklp.c |
| 27 |
+@@ -554,7 +554,7 @@ void passwin_response_ok(GtkEditable *ed |
| 28 |
+ |
| 29 |
+ const char *getPass (const char *prompt) |
| 30 |
+ { |
| 31 |
+- GtkWidget *vbox, *hbox, *hbox1, *vbox1, *vbox2, *labell, *labelp, *yes, *no; |
| 32 |
++ GtkWidget *vbox, *hbox, *vbox1, *vbox2, *labell, *labelp; |
| 33 |
+ gint gi1; |
| 34 |
+ #if GTK_MAJOR_VERSION == 1 |
| 35 |
+ GtkWidget *sep,*passwin; |
| 36 |
+@@ -780,9 +780,6 @@ void exitOnError(char *gerror1, char *ge |
| 37 |
+ GtkWidget *exitErrorDialog; |
| 38 |
+ GtkWidget *hbox,*label,*pixmapwid; |
| 39 |
+ char tmplabel[MAXLINE+1]; |
| 40 |
+- GtkStyle *style; |
| 41 |
+- GdkPixmap *pixmap; |
| 42 |
+- GdkBitmap *mask; |
| 43 |
+ #if GTK_MAJOR_VERSION == 1 |
| 44 |
+ GtkWidget *button,*vbox,*sep,*bbox; |
| 45 |
+ #endif |
| 46 |
+@@ -826,9 +823,9 @@ void exitOnError(char *gerror1, char *ge |
| 47 |
+ gtk_widget_show(pixmapwid); |
| 48 |
+ |
| 49 |
+ if(strlen(gerror2) == 0) |
| 50 |
+- snprintf(tmplabel,(size_t)MAXLINE,gerror1); |
| 51 |
++ snprintf(tmplabel,(size_t)MAXLINE,"%s",gerror1); |
| 52 |
+ else |
| 53 |
+- snprintf(tmplabel,(size_t)MAXLINE,gerror1,gerror2); |
| 54 |
++ snprintf(tmplabel,(size_t)MAXLINE,"%s\n%s",gerror1,gerror2); |
| 55 |
+ label=gtk_label_new(tmplabel); |
| 56 |
+ gtk_box_pack_end(GTK_BOX(hbox),label,FALSE, FALSE,FRAME_SPACING_V); |
| 57 |
+ gtk_widget_show(label); |
| 58 |
+@@ -856,7 +853,7 @@ void exitOnError(char *gerror1, char *ge |
| 59 |
+ #endif |
| 60 |
+ } else { |
| 61 |
+ if(strlen(gerror2) == 0) |
| 62 |
+- g_warning(gerror1); |
| 63 |
++ g_warning("%s",gerror1); |
| 64 |
+ else |
| 65 |
+ g_warning(gerror1,gerror2); |
| 66 |
+ } |
| 67 |
+--- gtklp.orig/gtklp/gtklp.c |
| 68 |
++++ gtklp/gtklp/gtklp.c |
| 69 |
+@@ -302,7 +302,7 @@ int main(int argc,char *argv[]) |
| 70 |
+ case '?': |
| 71 |
+ if(calledGtkLP) |
| 72 |
+ { |
| 73 |
+- 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"))); |
| 74 |
++ 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"))); |
| 75 |
+ } |
| 76 |
+ return(0); |
| 77 |
+ break; |
| 78 |
|
| 79 |
diff --git a/net-print/gtklp/gtklp-1.3.1.ebuild b/net-print/gtklp/gtklp-1.3.1.ebuild |
| 80 |
index 72969c5b40..e3aa1c6a45 100644 |
| 81 |
--- a/net-print/gtklp/gtklp-1.3.1.ebuild |
| 82 |
+++ b/net-print/gtklp/gtklp-1.3.1.ebuild |
| 83 |
@@ -1,8 +1,8 @@ |
| 84 |
-# Copyright 1999-2015 Gentoo Foundation |
| 85 |
+# Copyright 1999-2017 Gentoo Foundation |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
# $Id$ |
| 88 |
|
| 89 |
-EAPI=5 |
| 90 |
+EAPI=6 |
| 91 |
|
| 92 |
inherit autotools eutils |
| 93 |
|
| 94 |
@@ -17,15 +17,18 @@ KEYWORDS="amd64 ppc ~sparc x86" |
| 95 |
IUSE="nls ssl" |
| 96 |
|
| 97 |
RDEPEND="x11-libs/gtk+:2 |
| 98 |
- >=net-print/cups-1.6 |
| 99 |
+ net-print/cups |
| 100 |
nls? ( sys-devel/gettext ) |
| 101 |
- ssl? ( dev-libs/openssl )" |
| 102 |
+ ssl? ( dev-libs/openssl:0= )" |
| 103 |
DEPEND="${RDEPEND} |
| 104 |
virtual/pkgconfig" |
| 105 |
|
| 106 |
DOCS="AUTHORS BUGS ChangeLog README TODO USAGE" |
| 107 |
|
| 108 |
+PATCHES=( "${FILESDIR}/${P}-formatsec.patch" ) |
| 109 |
+ |
| 110 |
src_prepare() { |
| 111 |
+ default |
| 112 |
sed -e '/DEF_BROWSER_CMD/{s:netscape:firefox:}' \ |
| 113 |
-e '/DEF_HELP_HOME/{s:631/sum.html#STANDARD_OPTIONS:631/help/:}' \ |
| 114 |
-i include/defaults.h || die |
Archives