x11-apps: Changes to 'debian-unstable'
debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff | 68 ++++++++++
debian/patches/02_xedit_manpage_typos.diff | 22 +++
debian/patches/03_xconsole_implicit_pointer_conversion.diff | 10 +
debian/patches/04_SECURITY_setuid.diff | 32 ++++
debian/patches/05_xmore_fix_segv_without_xprint.diff | 29 ++++
debian/patches/06_xedit_manpage_typos.diff | 22 ---
debian/patches/13_xconsole_implicit_pointer_conversion.diff | 10 -
debian/patches/14_SECURITY_setuid.diff | 32 ----
debian/patches/15_xmore_fix_segv_without_xprint.diff | 29 ----
debian/patches/series | 9 -
10 files changed, 166 insertions(+), 97 deletions(-)
New commits:
commit 5f7f4dd4b9dbc6ce1b019f36875ef22b9f354be3
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Sat May 19 02:20:36 2007 +0300
debian/patches: rename patches and add 01_xwd which is split from old xlsfonts patch.
diff --git a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
new file mode 100644
index 0000000..622fcdd
--- /dev/null
+++ b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
@@ -0,0 +1,68 @@
+$Id: 099r_xlsfonts_do_not_spew_usage_on_connection_error.diff 480 2005-08-02 20:14:26Z branden $
+
+This patch by Branden Robinson.
+
+General philosophy:
+
+The user should only be shown a usage messages when:
+ * it is asked for with a --help option or the like.
+ * the command line is syntactically invalid.
+
+Not submitted upstream to XFree86 or X.Org.
+
+Index: xlsfonts/dsimple.c
+===================================================================
+--- xlsfonts/dsimple.c.orig 2006-07-11 04:53:33.000000000 +0200
++++ xlsfonts/dsimple.c 2007-02-11 08:14:45.000000000 +0100
+@@ -188,8 +188,7 @@
+ if (d == NULL) {
+ fprintf (stderr, "%s: unable to open display '%s'\n",
+ program_name, XDisplayName (display_name));
+- usage ();
+- /* doesn't return */
++ exit (1);
+ }
+
+ return(d);
+Index: xprop/dsimple.c
+===================================================================
+--- xprop/dsimple.c.orig 2007-02-11 08:15:17.000000000 +0100
++++ xprop/dsimple.c 2007-02-11 08:15:40.000000000 +0100
+@@ -188,8 +188,7 @@
+ if (d == NULL) {
+ fprintf (stderr, "%s: unable to open display '%s'\n",
+ program_name, XDisplayName (display_name));
+- usage ();
+- /* doesn't return */
++ exit(1);
+ }
+
+ return(d);
+Index: xwd/dsimple.c
+===================================================================
+--- xwd/dsimple.c.orig 2007-02-11 08:15:57.000000000 +0100
++++ xwd/dsimple.c 2007-02-11 08:16:10.000000000 +0100
+@@ -188,8 +188,7 @@
+ if (d == NULL) {
+ fprintf (stderr, "%s: unable to open display '%s'\n",
+ program_name, XDisplayName (display_name));
+- usage ();
+- /* doesn't return */
++ exit(1);
+ }
+
+ return(d);
+Index: xwininfo/dsimple.c
+===================================================================
+--- xwininfo/dsimple.c.orig 2007-02-11 08:16:29.000000000 +0100
++++ xwininfo/dsimple.c 2007-02-11 08:16:47.000000000 +0100
+@@ -188,8 +188,7 @@
+ if (d == NULL) {
+ fprintf (stderr, "%s: unable to open display '%s'\n",
+ program_name, XDisplayName (display_name));
+- usage ();
+- /* doesn't return */
++ exit(1);
+ }
+
+ return(d);
diff --git a/debian/patches/02_xedit_manpage_typos.diff b/debian/patches/02_xedit_manpage_typos.diff
new file mode 100644
index 0000000..f20b400
--- /dev/null
+++ b/debian/patches/02_xedit_manpage_typos.diff
@@ -0,0 +1,22 @@
+Index: xbase-clients/xedit/xedit.man
+===================================================================
+--- xbase-clients.orig/xedit/xedit.man 2006-02-18 14:56:14.000000000 -0500
++++ xbase-clients/xedit/xedit.man 2006-02-26 20:37:32.000000000 -0500
+@@ -291,7 +291,7 @@
+ .B autoReplace (\fPClass \fBReplace)
+ This resource is useful to automatically correct common misspelling errors, but
+ can also be used to create simple macros. The format is
+-\fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
++\fI{non-blanks}{blanks}[{string}]\fP. Fields are separated by newlines.
+ Example of use:
+ \"
+ .br
+@@ -308,7 +308,7 @@
+ when you type that words.
+ .TP 8
+ .B ispell.dictionaries (\fPClass \fBispell.Dictionary)
+-Specifies a list of dictionary names, separeted by spaces, available to the
++Specifies a list of dictionary names, separated by spaces, available to the
+ ispell program. The default value is \fI"american americamed+ english"\fP.
+ .TP 8
+ .B ispell.dictionary (\fPClass \fBispell.Dictionary)
diff --git a/debian/patches/03_xconsole_implicit_pointer_conversion.diff b/debian/patches/03_xconsole_implicit_pointer_conversion.diff
new file mode 100644
index 0000000..00dc3c4
--- /dev/null
+++ b/debian/patches/03_xconsole_implicit_pointer_conversion.diff
@@ -0,0 +1,10 @@
+--- xbase-clients-7.1.ds.orig/xconsole/xconsole.c 2006-05-23 20:11:37.000000000 -0600
++++ xbase-clients-7.1.ds/xconsole/xconsole.c 2006-06-17 14:11:47.000000000 -0600
+@@ -28,6 +28,7 @@
+
+ /* $XFree86: xc/programs/xconsole/xconsole.c,v 3.31tsi Exp $ */
+
++#define _XOPEN_SOURCE
+ #include <X11/Intrinsic.h>
+ #include <X11/StringDefs.h>
+ #include <X11/Xatom.h>
diff --git a/debian/patches/04_SECURITY_setuid.diff b/debian/patches/04_SECURITY_setuid.diff
new file mode 100644
index 0000000..1b12381
--- /dev/null
+++ b/debian/patches/04_SECURITY_setuid.diff
@@ -0,0 +1,32 @@
+Index: xbase-clients/xload/xload.c
+===================================================================
+--- xbase-clients.orig/xload/xload.c 2006-06-30 01:08:01.000000000 -0400
++++ xbase-clients/xload/xload.c 2006-06-30 01:08:51.000000000 -0400
+@@ -35,6 +35,7 @@
+ */
+
+
++#include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -162,8 +163,17 @@
+ /* For security reasons, we reset our uid/gid after doing the necessary
+ system initialization and before calling any X routines. */
+ InitLoadPoint();
+- setgid(getgid()); /* reset gid first while still (maybe) root */
+- setuid(getuid());
++ /* reset gid first while still (maybe) root */
++ if (setgid(getgid()) == -1) {
++ fprintf(stderr, "%s: setgid failed: %s\n",
++ ProgramName, strerror(errno));
++ exit(1);
++ }
++ if (setuid(getuid()) == -1) {
++ fprintf(stderr, "%s: setuid failed: %s\n",
++ ProgramName, strerror(errno));
++ exit(1);
++ }
+
+ XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
+
diff --git a/debian/patches/05_xmore_fix_segv_without_xprint.diff b/debian/patches/05_xmore_fix_segv_without_xprint.diff
new file mode 100644
index 0000000..9fd1cd9
--- /dev/null
+++ b/debian/patches/05_xmore_fix_segv_without_xprint.diff
@@ -0,0 +1,29 @@
+This patch by Eugene Konev.
+
+diff -u a/xbase-clients/xmore/xmore.c b/xbase-clients/xmore/xmore.c
+--- a/xbase-clients/xmore/xmore.c Sun Apr 30 13:40:29 2006 +0800
++++ b/app/xbase-clients/xmore/xmore.c Sun Apr 30 13:40:40 2006 +0800
+@@ -150,7 +150,9 @@ static void
+ static void
+ printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
+ {
++#ifdef USE_XPRINT
+ XawPrintDialogClosePrinterConnection(printdialog, False);
++#endif
+ }
+
+ #ifdef USE_XPRINT
+@@ -302,7 +304,12 @@ int main( int argc, char *argv[] )
+ #endif
+
+ n = 0;
+- XtSetArg(args[n], XtNfromHoriz, printbutton); n++;
++#ifdef USE_XPRINT
++ XtSetArg(args[n], XtNfromHoriz, printbutton);
++#else
++ XtSetArg(args[n], XtNfromHoriz, NULL);
++#endif
++ n++;
+ XtSetArg(args[n], XtNfromVert, text); n++;
+ XtSetArg(args[n], XtNlabel, "Quit"); n++;
+ quitbutton = XtCreateManagedWidget("quit", commandWidgetClass, form, args, n);
diff --git a/debian/patches/06_xedit_manpage_typos.diff b/debian/patches/06_xedit_manpage_typos.diff
deleted file mode 100644
index f20b400..0000000
--- a/debian/patches/06_xedit_manpage_typos.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xbase-clients/xedit/xedit.man
-===================================================================
---- xbase-clients.orig/xedit/xedit.man 2006-02-18 14:56:14.000000000 -0500
-+++ xbase-clients/xedit/xedit.man 2006-02-26 20:37:32.000000000 -0500
-@@ -291,7 +291,7 @@
- .B autoReplace (\fPClass \fBReplace)
- This resource is useful to automatically correct common misspelling errors, but
- can also be used to create simple macros. The format is
--\fI{non-blanks}{blanks}[{string}]\fP. Fields are separeted by newlines.
-+\fI{non-blanks}{blanks}[{string}]\fP. Fields are separated by newlines.
- Example of use:
- \"
- .br
-@@ -308,7 +308,7 @@
- when you type that words.
- .TP 8
- .B ispell.dictionaries (\fPClass \fBispell.Dictionary)
--Specifies a list of dictionary names, separeted by spaces, available to the
-+Specifies a list of dictionary names, separated by spaces, available to the
- ispell program. The default value is \fI"american americamed+ english"\fP.
- .TP 8
- .B ispell.dictionary (\fPClass \fBispell.Dictionary)
diff --git a/debian/patches/13_xconsole_implicit_pointer_conversion.diff b/debian/patches/13_xconsole_implicit_pointer_conversion.diff
deleted file mode 100644
index 00dc3c4..0000000
--- a/debian/patches/13_xconsole_implicit_pointer_conversion.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- xbase-clients-7.1.ds.orig/xconsole/xconsole.c 2006-05-23 20:11:37.000000000 -0600
-+++ xbase-clients-7.1.ds/xconsole/xconsole.c 2006-06-17 14:11:47.000000000 -0600
-@@ -28,6 +28,7 @@
-
- /* $XFree86: xc/programs/xconsole/xconsole.c,v 3.31tsi Exp $ */
-
-+#define _XOPEN_SOURCE
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Xatom.h>
diff --git a/debian/patches/14_SECURITY_setuid.diff b/debian/patches/14_SECURITY_setuid.diff
deleted file mode 100644
index 1b12381..0000000
--- a/debian/patches/14_SECURITY_setuid.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: xbase-clients/xload/xload.c
-===================================================================
---- xbase-clients.orig/xload/xload.c 2006-06-30 01:08:01.000000000 -0400
-+++ xbase-clients/xload/xload.c 2006-06-30 01:08:51.000000000 -0400
-@@ -35,6 +35,7 @@
- */
-
-
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -162,8 +163,17 @@
- /* For security reasons, we reset our uid/gid after doing the necessary
- system initialization and before calling any X routines. */
- InitLoadPoint();
-- setgid(getgid()); /* reset gid first while still (maybe) root */
-- setuid(getuid());
-+ /* reset gid first while still (maybe) root */
-+ if (setgid(getgid()) == -1) {
-+ fprintf(stderr, "%s: setgid failed: %s\n",
-+ ProgramName, strerror(errno));
-+ exit(1);
-+ }
-+ if (setuid(getuid()) == -1) {
-+ fprintf(stderr, "%s: setuid failed: %s\n",
-+ ProgramName, strerror(errno));
-+ exit(1);
-+ }
-
- XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
-
diff --git a/debian/patches/15_xmore_fix_segv_without_xprint.diff b/debian/patches/15_xmore_fix_segv_without_xprint.diff
deleted file mode 100644
index 9fd1cd9..0000000
--- a/debian/patches/15_xmore_fix_segv_without_xprint.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-This patch by Eugene Konev.
-
-diff -u a/xbase-clients/xmore/xmore.c b/xbase-clients/xmore/xmore.c
---- a/xbase-clients/xmore/xmore.c Sun Apr 30 13:40:29 2006 +0800
-+++ b/app/xbase-clients/xmore/xmore.c Sun Apr 30 13:40:40 2006 +0800
-@@ -150,7 +150,9 @@ static void
- static void
- printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
- {
-+#ifdef USE_XPRINT
- XawPrintDialogClosePrinterConnection(printdialog, False);
-+#endif
- }
-
- #ifdef USE_XPRINT
-@@ -302,7 +304,12 @@ int main( int argc, char *argv[] )
- #endif
-
- n = 0;
-- XtSetArg(args[n], XtNfromHoriz, printbutton); n++;
-+#ifdef USE_XPRINT
-+ XtSetArg(args[n], XtNfromHoriz, printbutton);
-+#else
-+ XtSetArg(args[n], XtNfromHoriz, NULL);
-+#endif
-+ n++;
- XtSetArg(args[n], XtNfromVert, text); n++;
- XtSetArg(args[n], XtNlabel, "Quit"); n++;
- quitbutton = XtCreateManagedWidget("quit", commandWidgetClass, form, args, n);
diff --git a/debian/patches/series b/debian/patches/series
index 60e1195..6b25a97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-06_xedit_manpage_typos.diff
-13_xconsole_implicit_pointer_conversion.diff
-14_SECURITY_setuid.diff
-15_xmore_fix_segv_without_xprint.diff -p2
+01_xwd_do_not_spew_usage_on_connection_error.diff -p0
+02_xedit_manpage_typos.diff
+03_xconsole_implicit_pointer_conversion.diff
+04_SECURITY_setuid.diff
+05_xmore_fix_segv_without_xprint.diff -p2
Reply to: