debian/changelog | 7 debian/control | 13 debian/patches/01_luit_fix_race_condition.diff | 146 ++++++++++ debian/patches/02_xev_flush_standard_output.diff | 20 + debian/patches/03_xvinfo_manpage_typo.diff | 13 debian/patches/04_xev_flush_standard_output.diff | 20 - debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff | 68 ++++ debian/patches/07_xvinfo_manpage_typo.diff | 13 debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff | 68 ---- debian/patches/series | 8 10 files changed, 268 insertions(+), 108 deletions(-)
New commits: commit db3583100b68ee51fefd55ad1739021655aba01e Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Sat May 19 01:25:02 2007 +0300 debian/control: add Conflicts:/Replaces, description for luit. debian/patches/series: option for luit patch. diff --git a/debian/changelog b/debian/changelog index 03f8c75..2a18106 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ x11-utils (1) UNRELEASED; urgency=low - Rename Package and Source. - Remove unnecessary Build-Deps. - Modify description. + - Conflicts/Replaces: xbase-clients (<= 1:7.2.ds2-3), + xutils (<=1:7.1.ds.3-1) to make upgrades smoother. + - C/R: <all the included packages> to work around old Ubuntu packaging. * debian/copyright: Leave only copyright notices that relate to this package. FIXME:*luit missing* * debian/x11-utils.install, rules: Edit to reflect new @@ -34,7 +37,7 @@ x11-utils (1) UNRELEASED; urgency=low Also, add a patch for luit from xutils, and rename the patches to start from 01. - -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 18 May 2007 16:12:15 +0300 + -- Timo Aaltonen <[EMAIL PROTECTED]> Sat, 19 May 2007 01:21:19 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index 3795564..0f8fd6f 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,12 @@ Package: x11-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, cpp Pre-Depends: x11-common (>= 1:7.0.0) +Conflicts: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), + appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel, + xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo +Replaces: xbase-clients (<= 1:7.2.ds2-3), xutils (<= 1:7.1.ds.3-1), + appres, editres, listres, luit, viewres, xdpyinfo, xdriinfo, xev, xfd, xfontsel, + xkill, xlsatoms, xlsclients, xlsfonts, xmessage, xprop, xvinfo, xwininfo Suggests: mesa-utils Description: X11 utilities An X client is a program that interfaces with an X server (almost always via @@ -49,6 +55,8 @@ Description: X11 utilities This package provides a miscellaneous assortment of X utilities that ship with the X Window System, including: - appres, editres, listres and viewres, which query the X resource database; + - luit, a filter that can be run between an arbitrary application and a + UTF-8 terminal emulator; - xdpyinfo, a display information utility for X; - xdriinfo, query configuration information of DRI drivers; - xev, an X event displayer; diff --git a/debian/patches/series b/debian/patches/series index 5625030..962bb7a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -01_luit_fix_race_condition.diff +01_luit_fix_race_condition.diff -p0 02_xev_flush_standard_output.diff 03_xvinfo_manpage_typo.diff 04_xlsfonts_do_not_spew_usage_on_connection_error.diff commit 0d43d3bee75173bedcc2ec3ed9c0dc89ff89ed23 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Fri May 18 16:14:02 2007 +0300 Add a patch for luit (from xutils), and rename them to start from 01. debian/control: Edit the description. diff --git a/debian/changelog b/debian/changelog index aaf52c7..03f8c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,8 +31,10 @@ x11-utils (1) UNRELEASED; urgency=low * debian/x11-utils.dirs: Remove. * debian/local/: Remove. * debian/patches: Delete patches which do not relate to this package. + Also, add a patch for luit from xutils, and rename the patches to + start from 01. - -- Timo Aaltonen <[EMAIL PROTECTED]> Wed, 16 May 2007 23:49:05 +0300 + -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 18 May 2007 16:12:15 +0300 xbase-clients (1:7.2.ds2-3) unstable; urgency=low diff --git a/debian/control b/debian/control index b4a3a90..3795564 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,7 @@ Description: X11 utilities the X libraries), and thus with some input and output hardware like a graphics card, monitor, keyboard, and pointing device (such as a mouse). . - This package provides a miscellaneous assortment of several dozen X clients + This package provides a miscellaneous assortment of X utilities that ship with the X Window System, including: - appres, editres, listres and viewres, which query the X resource database; - xdpyinfo, a display information utility for X; diff --git a/debian/patches/01_luit_fix_race_condition.diff b/debian/patches/01_luit_fix_race_condition.diff new file mode 100644 index 0000000..db993ab --- /dev/null +++ b/debian/patches/01_luit_fix_race_condition.diff @@ -0,0 +1,146 @@ +From 33c99a9408fc236ec68cc027c1caddc805e80efe Mon Sep 17 00:00:00 2001 +From: Juliusz Chroboczek <[EMAIL PROTECTED]> +Date: Sun, 5 Nov 2006 23:43:52 +0100 +Subject: [PATCH] Set up parent pty before forking (bug 8490). +This avoids a race condition when the child reads the terminal settings +before the parent has set the pty up. +--- + luit.c | 76 +++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 40 insertions(+), 36 deletions(-) + +diff --git a/luit.c b/luit.c +index c4e1f91..99cee82 100644 +--- luit/luit.c ++++ luit/luit.c +@@ -434,6 +434,17 @@ convert(int ifd, int ofd) + return 0; + } + ++static void ++sigwinchHandler(int sig) ++{ ++ sigwinch_queued = 1; ++} ++ ++static void ++sigchldHandler(int sig) ++{ ++ sigchld_queued = 1; ++} + + static int + condom(int argc, char **argv) +@@ -444,6 +455,7 @@ condom(int argc, char **argv) + char *path; + char **child_argv; + int rc; ++ int val; + + rc = parseArgs(argc, argv, child_argv0, + &path, &child_argv); +@@ -461,6 +473,29 @@ condom(int argc, char **argv) + perror("Couldn't drop priviledges"); + exit(1); + } ++#ifdef SIGWINCH ++ installHandler(SIGWINCH, sigwinchHandler); ++#endif ++ installHandler(SIGCHLD, sigchldHandler); ++ ++ rc = copyTermios(0, pty); ++ if(rc < 0) ++ FatalError("Couldn't copy terminal settings\n"); ++ ++ rc = setRawTermios(); ++ if(rc < 0) ++ FatalError("Couldn't set terminal to raw\n"); ++ ++ val = fcntl(0, F_GETFL, 0); ++ if(val >= 0) { ++ fcntl(0, F_SETFL, val | O_NONBLOCK); ++ } ++ val = fcntl(pty, F_GETFL, 0); ++ if(val >= 0) { ++ fcntl(pty, F_SETFL, val | O_NONBLOCK); ++ } ++ ++ setWindowSize(0, pty); + + pid = fork(); + if(pid < 0) { +@@ -470,6 +505,10 @@ condom(int argc, char **argv) + + if(pid == 0) { + close(pty); ++#ifdef SIGWINCH ++ installHandler(SIGWINCH, SIG_DFL); ++#endif ++ installHandler(SIGCHLD, SIG_DFL); + child(line, path, child_argv); + } else { + free(child_argv); +@@ -490,6 +529,7 @@ child(char *line, char *path, char **arg + close(0); + close(1); + close(2); ++ + pgrp = setsid(); + if(pgrp < 0) { + kill(getppid(), SIGABRT); +@@ -517,53 +557,17 @@ child(char *line, char *path, char **arg + exit(1); + } + +-static void +-sigwinchHandler(int sig) { +- sigwinch_queued = 1; +-} +- +-static void +-sigchldHandler(int sig) +-{ +- sigchld_queued = 1; +-} +- + void + parent(int pid, int pty) + { + unsigned char buf[BUFFER_SIZE]; + int i; +- int val; + int rc; + + if(verbose) { + reportIso2022(outputState); + } + +-#ifdef SIGWINCH +- installHandler(SIGWINCH, sigwinchHandler); +-#endif +- installHandler(SIGCHLD, sigchldHandler); +- +- rc = copyTermios(0, pty); +- if(rc < 0) +- FatalError("Couldn't copy terminal settings\n"); +- +- rc = setRawTermios(); +- if(rc < 0) +- FatalError("Couldn't set terminal to raw\n"); +- +- val = fcntl(0, F_GETFL, 0); +- if(val >= 0) { +- fcntl(0, F_SETFL, val | O_NONBLOCK); +- } +- val = fcntl(pty, F_GETFL, 0); +- if(val >= 0) { +- fcntl(pty, F_SETFL, val | O_NONBLOCK); +- } +- +- setWindowSize(0, pty); +- + for(;;) { + rc = waitForInput(0, pty); + +-- +1.4.3.2 + diff --git a/debian/patches/02_xev_flush_standard_output.diff b/debian/patches/02_xev_flush_standard_output.diff new file mode 100644 index 0000000..f336ef6 --- /dev/null +++ b/debian/patches/02_xev_flush_standard_output.diff @@ -0,0 +1,20 @@ +$Id$ + +Flush standard output after processing each event, since xev's exit(0) is +unreachable code. + +This patch by Branden Robinson. Thanks to Bill Currie for identifying the +problem and the solution. See Debian bug #238638. + +Index: xbase-clients/xev/xev.c +=================================================================== +--- xbase-clients.orig/xev/xev.c 2006-02-18 14:56:32.000000000 -0500 ++++ xbase-clients/xev/xev.c 2006-02-26 19:50:37.000000000 -0500 +@@ -1045,6 +1045,7 @@ + printf ("Unknown event type %d\n", event.type); + break; + } ++ fflush(stdout); + } + + XCloseDisplay (dpy); diff --git a/debian/patches/03_xvinfo_manpage_typo.diff b/debian/patches/03_xvinfo_manpage_typo.diff new file mode 100644 index 0000000..6b3dac4 --- /dev/null +++ b/debian/patches/03_xvinfo_manpage_typo.diff @@ -0,0 +1,13 @@ +Index: xbase-clients/xvinfo/xvinfo.man +=================================================================== +--- xbase-clients.orig/xvinfo/xvinfo.man 2006-02-18 14:55:11.000000000 -0500 ++++ xbase-clients/xvinfo/xvinfo.man 2006-02-26 20:38:32.000000000 -0500 +@@ -11,7 +11,7 @@ + .PP + .B xvinfo + prints out the capabilities of any video adaptors associated +-with the display that are accesible through the X-Video extension. ++with the display that are accessible through the X-Video extension. + .SH OPTIONS + .PP + .TP 8 diff --git a/debian/patches/04_xev_flush_standard_output.diff b/debian/patches/04_xev_flush_standard_output.diff deleted file mode 100644 index f336ef6..0000000 --- a/debian/patches/04_xev_flush_standard_output.diff +++ /dev/null @@ -1,20 +0,0 @@ -$Id$ - -Flush standard output after processing each event, since xev's exit(0) is -unreachable code. - -This patch by Branden Robinson. Thanks to Bill Currie for identifying the -problem and the solution. See Debian bug #238638. - -Index: xbase-clients/xev/xev.c -=================================================================== ---- xbase-clients.orig/xev/xev.c 2006-02-18 14:56:32.000000000 -0500 -+++ xbase-clients/xev/xev.c 2006-02-26 19:50:37.000000000 -0500 -@@ -1045,6 +1045,7 @@ - printf ("Unknown event type %d\n", event.type); - break; - } -+ fflush(stdout); - } - - XCloseDisplay (dpy); diff --git a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff new file mode 100644 index 0000000..622fcdd --- /dev/null +++ b/debian/patches/04_xlsfonts_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/07_xvinfo_manpage_typo.diff b/debian/patches/07_xvinfo_manpage_typo.diff deleted file mode 100644 index 6b3dac4..0000000 --- a/debian/patches/07_xvinfo_manpage_typo.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: xbase-clients/xvinfo/xvinfo.man -=================================================================== ---- xbase-clients.orig/xvinfo/xvinfo.man 2006-02-18 14:55:11.000000000 -0500 -+++ xbase-clients/xvinfo/xvinfo.man 2006-02-26 20:38:32.000000000 -0500 -@@ -11,7 +11,7 @@ - .PP - .B xvinfo - prints out the capabilities of any video adaptors associated --with the display that are accesible through the X-Video extension. -+with the display that are accessible through the X-Video extension. - .SH OPTIONS - .PP - .TP 8 diff --git a/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff b/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff deleted file mode 100644 index 622fcdd..0000000 --- a/debian/patches/08_xlsfonts_do_not_spew_usage_on_connection_error.diff +++ /dev/null @@ -1,68 +0,0 @@ -$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/series b/debian/patches/series index d373d2c..5625030 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -04_xev_flush_standard_output.diff -07_xvinfo_manpage_typo.diff -08_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0 -k +01_luit_fix_race_condition.diff +02_xev_flush_standard_output.diff +03_xvinfo_manpage_typo.diff +04_xlsfonts_do_not_spew_usage_on_connection_error.diff commit fe63ddd68d4ef60f35aa369653845462cbdeed71 Author: Timo Aaltonen <[EMAIL PROTECTED]> Date: Fri May 18 11:10:11 2007 +0300 debian/control: add a description about luit (from xutils). diff --git a/debian/control b/debian/control index b25b0a7..b4a3a90 100644 --- a/debian/control +++ b/debian/control @@ -64,4 +64,5 @@ Description: X11 utilities - xwininfo, a window information utility for X; . The editres and viewres programs use bitmap images provided by the - xbitmaps package. + xbitmaps package. The luit program requires locale information from + the libx11-data package. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]