tags 639032 + pending tags 644113 + pending thanks Dear maintainer,
I've prepared an NMU for gtklp (versioned as 1.2.7-2.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: JBO: Mir sta'dd'n etz die Feier
diff -u gtklp-1.2.7/debian/changelog gtklp-1.2.7/debian/changelog
--- gtklp-1.2.7/debian/changelog
+++ gtklp-1.2.7/debian/changelog
@@ -1,3 +1,17 @@
+gtklp (1.2.7-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS: gtklp.h:99:1: error: unknown type name 'ppd_file_t'":
+ add patch from Ubuntu / Colin Watson:
+ - bugs/639032.diff: Include <cups/ppd.h> for ppd_file_t
+ (closes: #639032, LP: #831283).
+ * Fix "FTBFS format not a string literal and no format arguments [-
+ Werror=format-security]": add patch from Ubuntu / Daniel T Chen:
+ - bugs/644113.diff: Fix format string literals and some unused variables.
+ Resolves FTBFS. (Closes: #644113)
+
+ -- gregor herrmann <gre...@debian.org> Mon, 21 Nov 2011 17:13:35 +0100
+
gtklp (1.2.7-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u gtklp-1.2.7/debian/patches/series gtklp-1.2.7/debian/patches/series
--- gtklp-1.2.7/debian/patches/series
+++ gtklp-1.2.7/debian/patches/series
@@ -3,0 +4,2 @@
+bugs/639032.diff
+bugs/644113.diff
only in patch2:
unchanged:
--- gtklp-1.2.7.orig/debian/patches/bugs/644113.diff
+++ gtklp-1.2.7/debian/patches/bugs/644113.diff
@@ -0,0 +1,307 @@
+Index: gtklp-1.2.7/libgtklp/libgtklp.c
+===================================================================
+--- gtklp-1.2.7.orig/libgtklp/libgtklp.c 2011-10-30 13:22:09.000000000 -0400
++++ gtklp-1.2.7/libgtklp/libgtklp.c 2011-10-30 13:52:53.000000000 -0400
+@@ -489,7 +489,7 @@
+
+ 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;
+@@ -715,9 +715,6 @@
+ 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
+@@ -761,9 +758,9 @@
+ 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);
+@@ -791,7 +788,7 @@
+ #endif
+ } else {
+ if(strlen(gerror2) == 0)
+- g_warning(gerror1);
++ g_warning("%s",gerror1);
+ else
+ g_warning(gerror1,gerror2);
+ }
+Index: gtklp-1.2.7/gtklp/gtklp.c
+===================================================================
+--- gtklp-1.2.7.orig/gtklp/gtklp.c 2011-10-30 13:22:09.000000000 -0400
++++ gtklp-1.2.7/gtklp/gtklp.c 2011-10-30 13:54:03.000000000 -0400
+@@ -136,7 +136,6 @@
+ int calledLpr;
+ int calledLp;
+ int forceX;
+- char Path[MAXPATH+1];
+ char *z1;
+ char tmpenv[MAX_SERVER_NAME+13];
+
+@@ -216,7 +215,6 @@
+ confdir[0]=(uintptr_t)NULL;
+ ServerName[0]=(uintptr_t)NULL;
+ UserName[0]=(uintptr_t)NULL;
+- Path[0]=(uintptr_t)NULL;
+ ReallyPrint=1;
+ needFileSelection = 1;
+ cmdNumCopies=-1;
+@@ -302,7 +300,7 @@
+ 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;
+@@ -310,7 +308,7 @@
+ if(calledGtkLP)
+ {
+ if(DEBUG)
+- printf("Ignoring Data on stdin !\n");
++ printf("%s","Ignoring Data on stdin !\n");
+ ignore_stdin=1;
+ }
+ if(calledLp)
+@@ -324,7 +322,7 @@
+ break;
+ case 'b':
+ if(DEBUG)
+- printf("Using builtin defaults !\n");
++ printf("%s","Using builtin defaults !\n");
+ builtin=1;
+ break;
+ case 'p':
+@@ -342,7 +340,7 @@
+ if(strlen(optarg) > MAX_PORT)
+ {
+ if(DEBUG)
+- printf("Port too long !\n");
++ printf("%s","Port too long !\n");
+ exitOnError(str2str(_("Invalid Portnumber !")),"",-1);
+ }
+ else
+@@ -368,7 +366,7 @@
+ else
+ {
+ if(DEBUG)
+- printf("PROG-ERROR: Printername too long !\n ");
++ printf("%s","PROG-ERROR: Printername too long !\n ");
+ exitOnError(str2str(_("Invalid Printername !")),"",-1);
+ }
+ break;
+@@ -387,7 +385,7 @@
+ else
+ {
+ if(DEBUG)
+- printf("PROG-ERROR: Servername too long !\n ");
++ printf("%s","PROG-ERROR: Servername too long !\n ");
+ exitOnError(str2str(_("Invalid Servername !")),"",-1);
+ }
+ break;
+@@ -399,7 +397,7 @@
+ else
+ {
+ if(DEBUG)
+- printf("PROG-ERROR: Username too long !\n ");
++ printf("%s","PROG-ERROR: Username too long !\n ");
+ exitOnError(str2str(_("Invalid Username !")),"",-1);
+ }
+ break;
+@@ -474,7 +472,7 @@
+ case 'r':
+ if(calledLpr)
+ {
+- g_print("lp -t not supported !\n");
++ g_print("%s","lp -t not supported !\n");
+ }
+ if(calledLp)
+ break;
+@@ -524,7 +522,7 @@
+ else
+ {
+ if(DEBUG)
+- printf("Prog-Error: MAXPRINTFILES to short !\n");
++ printf("%s","Prog-Error: MAXPRINTFILES to short !\n");
+ exitOnError(str2str(_("Too many files to print !")),"",-3);
+ }
+ }
+@@ -538,7 +536,7 @@
+
+ if(DEBUG)
+ {
+- printf("Files to print: \n");
++ printf("%s","Files to print: \n");
+ for(i1=0;i1<filesToPrintAnz;i1++)
+ printf(" %s\n",filesToPrint[i1]);
+
+@@ -547,10 +545,10 @@
+ {
+ if (optind < argc)
+ {
+- printf ("non-option ARGV-elements: ");
++ printf ("%s","non-option ARGV-elements: ");
+ while (optind < argc)
+ printf ("%s ", argv[optind++]);
+- printf ("\n");
++ printf ("%s","\n");
+ }
+ }
+
+@@ -571,12 +569,12 @@
+ if(ServerName[0]==(uintptr_t)NULL)
+ {
+ if(DEBUG)
+- printf("No Servername given, searching...\n");
++ printf("%s","No Servername given, searching...\n");
+ z1=(char *)cupsServer();
+ if(z1 == (char *)NULL)
+ {
+ if(DEBUG)
+- printf("PROG-ERROR: No Cups-Server found !\n");
++ printf("%s","PROG-ERROR: No Cups-Server found !\n");
+ exitOnError(str2str(_("No Cups-Server found !")),"",-2);
+ }
+ strncpy(ServerName,z1,(size_t)MAX_SERVER_NAME);
+@@ -593,7 +591,7 @@
+ else
+ {
+ if(DEBUG)
+- printf("connected\n");
++ printf("%s","connected\n");
+ snprintf(tmpenv,(size_t)MAX_SERVER_NAME,"CUPS_SERVER=%s",ServerName);
+ cupsSetServer(ServerName);
+ putenv(tmpenv);
+@@ -615,7 +613,7 @@
+
+ /* confdir */
+ if(DEBUG)
+- printf("Search for Confdir.\n");
++ printf("%s","Search for Confdir.\n");
+ getPaths();
+ if(DEBUG)
+ {
+@@ -644,7 +642,7 @@
+ if(DEF_PRN[0] == (uintptr_t)NULL)
+ {
+ if(DEBUG)
+- printf("PROG-ERROR: No Printer found to use for default !\n");
++ printf("%s","PROG-ERROR: No Printer found to use for default !\n");
+ exitOnError(str2str(_("No Printer found to use as default !")),"",-2);
+ }
+ /*--- get Options for this Printer ---*/
+Index: gtklp-1.2.7/gtklp/file.c
+===================================================================
+--- gtklp-1.2.7.orig/gtklp/file.c 2011-10-30 13:22:09.000000000 -0400
++++ gtklp-1.2.7/gtklp/file.c 2011-10-30 13:52:53.000000000 -0400
+@@ -77,12 +77,10 @@
+ #else
+ void fileSelDialogOk(GtkWidget *widget) {
+ GSList *z1,*z2;
+- int i1;
+ gchar *entry[1][1];
+
+ z1=gtk_file_chooser_get_filenames((GtkFileChooser *)widget);
+ z2=z1;
+- i1=0;
+ while(z1 != (GSList *)NULL) {
+ if(filesToPrintAnz >= MAXPRINTFILES) {
+ gtk_widget_set_sensitive(fileAdd,FALSE);
+Index: gtklp-1.2.7/gtklp/gtklp_functions.c
+===================================================================
+--- gtklp-1.2.7.orig/gtklp/gtklp_functions.c 2011-10-30 13:52:53.000000000 -0400
++++ gtklp-1.2.7/gtklp/gtklp_functions.c 2011-10-30 13:52:53.000000000 -0400
+@@ -216,7 +216,7 @@
+
+ void getOptions(char *printername,int which)
+ {
+- int i1,hasrc,nohome,ppdOptAnz;
++ int i1,hasrc,nohome;
+ int needNew=0;
+ int whichfile=0;
+ char printpath[MAXPATH+1],globalpath[MAXPATH+1];
+@@ -264,7 +264,6 @@
+ if(!builtin)
+ {
+ nohome=0;
+- ppdOptAnz=-1;
+ printpath[0]=(uintptr_t)NULL;
+ globalpath[0]=(uintptr_t)NULL;
+ printpath_g[0]=(uintptr_t)NULL;
+Index: gtklp-1.2.7/gtklp/image.c
+===================================================================
+--- gtklp-1.2.7.orig/gtklp/image.c 2011-10-30 13:22:09.000000000 -0400
++++ gtklp-1.2.7/gtklp/image.c 2011-10-30 13:52:53.000000000 -0400
+@@ -109,15 +109,12 @@
+
+ void imageScalingAllChanged(GtkWidget *widget,gpointer data)
+ {
+- int strangeerrortrap;
+ char tmp[MAXLINE+1];
+
+ snprintf(tmp,(size_t)MAXLINE,"%s",gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(scaleTypeCombo)->entry)));
+ if(DEBUG)
+ printf("Scaling Combo changed: %s\n",tmp);
+
+- strangeerrortrap=1;
+-
+ if(strlen(tmp)==0) {
+ if(DEBUG)
+ printf("Ignore empty PopUp-Result in imageScalingAllChanged\n");
+Index: gtklp-1.2.7/gtklpq/gtklpq.c
+===================================================================
+--- gtklp-1.2.7.orig/gtklpq/gtklpq.c 2011-10-30 13:22:09.000000000 -0400
++++ gtklp-1.2.7/gtklpq/gtklpq.c 2011-10-30 13:52:53.000000000 -0400
+@@ -100,7 +100,6 @@
+ GdkBitmap *mgtklpq_exit,*mgtklpq_move,*mgtklpq_prio, *mgtklpq_stop_job, *mgtklpq_stop_jobs;
+ GtkWidget *image;
+ int i1;
+- char Path[MAXPATH+1];
+ char *z1;
+ int queryIntervall=0;
+ int xpos,ypos;
+@@ -237,7 +236,6 @@
+ DEF_PRN[0]=(uintptr_t)NULL;
+ ServerName[0]=(uintptr_t)NULL;
+ UserName[0]=(uintptr_t)NULL;
+- Path[0]=(uintptr_t)NULL;
+ passWord[0]=(uintptr_t)NULL;
+ i1=getopt(argc,argv,GTKLPQ_ProgOpts);
+ while(i1 != -1)
+Index: gtklp-1.2.7/gtklpq/printer.c
+===================================================================
+--- gtklp-1.2.7.orig/gtklpq/printer.c 2011-10-30 13:22:09.000000000 -0400
++++ gtklp-1.2.7/gtklpq/printer.c 2011-10-30 13:52:53.000000000 -0400
+@@ -1163,7 +1163,6 @@
+ void cancelJob (GtkWidget * dialog)
+ {
+ int job_id; /* Job ID */
+- const char *dest; /* Destination printer */
+ char uri[MAX_URI+1]; /* Printer or job URI */
+ char touri[MAX_URI+1];
+ ipp_t *request; /* IPP request */
+@@ -1228,7 +1227,6 @@
+ return;
+ break;
+ }
+- dest = NULL;
+ response = NULL;
+
+ if(dialog != (GtkWidget *)NULL)
only in patch2:
unchanged:
--- gtklp-1.2.7.orig/debian/patches/bugs/639032.diff
+++ gtklp-1.2.7/debian/patches/bugs/639032.diff
@@ -0,0 +1,19 @@
+Description: Include <cups/ppd.h> for ppd_file_t
+Author: Colin Watson <cjwat...@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/639032
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/831283
+Forwarded: no
+Last-Update: 2011-09-14
+
+Index: b/gtklp/gtklp.h
+===================================================================
+--- a/gtklp/gtklp.h
++++ b/gtklp/gtklp.h
+@@ -27,6 +27,7 @@
+ #include <gtk/gtk.h>
+ #include <cups/cups.h>
+ #include <cups/http.h>
++#include <cups/ppd.h>
+
+ #include <defaults.h>
+
signature.asc
Description: Digital signature
