Hello community, here is the log from the commit of package xconsole for openSUSE:Factory checked in at 2013-01-22 18:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xconsole (Old) and /work/SRC/openSUSE:Factory/.xconsole.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xconsole", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xconsole/xconsole.changes 2012-05-08 12:02:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xconsole.new/xconsole.changes 2013-01-22 18:05:17.000000000 +0100 @@ -1,0 +2,21 @@ +Sat Jan 19 10:50:22 UTC 2013 - zai...@opensuse.org + +- Update to version 1.0.5: + + Fix implicit conversion from size_t to int warnings in + Deiconified(). + + Open /dev/console with NOCTTY and O_NONBLOCK flags. + + Don't rely on being able to set tab stops. + + Mark functions _X_NORETURN that gcc warnings suggest. + + Remove old Xorg & XFree86 CVS version tags. + + Strip trailing whitespace. + + Require xt >= 1.0 for appdefaultdir (fdo#7237). + + config: + - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS. + - Replace deprecated AC_HELP_STRING with AS_HELP_STRING. + - Move man pages into their own directory. + + man: replace hard coded man page section with substitution + strings. +- Replace pkgconfig(xorg-macros) with pkgconfig(xproto) + BuildRequires, since this is what configure checks for now. + +------------------------------------------------------------------- Old: ---- xconsole-1.0.4.tar.bz2 New: ---- xconsole-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xconsole.spec ++++++ --- /var/tmp/diff_new_pack.EEohRh/_old 2013-01-22 18:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.EEohRh/_new 2013-01-22 18:05:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xconsole # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: xconsole -Version: 1.0.4 +Version: 1.0.5 Release: 0 -License: MIT Summary: Utility to monitor system console messages with X -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xt) +BuildRequires: pkgconfig(xproto) >= 7.0.17 +BuildRequires: pkgconfig(xt) >= 1.0 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xconsole-1.0.4.tar.bz2 -> xconsole-1.0.5.tar.bz2 ++++++ ++++ 10636 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/ChangeLog new/xconsole-1.0.5/ChangeLog --- old/xconsole-1.0.4/ChangeLog 2010-09-24 04:32:20.000000000 +0200 +++ new/xconsole-1.0.5/ChangeLog 2013-01-13 01:25:24.000000000 +0100 @@ -1,3 +1,152 @@ +commit cc0cf84461cfe2c31ddce34863c6433183e8a55d +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sat Jan 12 16:24:44 2013 -0800 + + xconsole 1.0.5 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 98f941d218108a314f979332b19c612f51ace08d +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Jan 4 18:21:23 2013 -0800 + + Fix implicit conversion from size_t to int warnings in Deiconified() + + xconsole.c:423:14: warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + oldlen = strlen (oldName); + ~ ^~~~~~~~~~~~~~~~ + + xconsole.c:426:27: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + newName = malloc (oldlen - 1); + ~~~~~~ ~~~~~~~^~~ + + xconsole.c:429:36: warning: implicit conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + strncpy (newName, oldName, oldlen - 2); + ~~~~~~~ ~~~~~~~^~~ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 60d4a9dc01c9a1bf7a29c4a64ad52a6e27307682 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Jan 4 18:17:18 2013 -0800 + + unifdef -U__UNIXOS2__ + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a7a54829dc89b38bbad7fcd6e70cf001d2274c26 +Author: Arvind Umrao <arvind.um...@oracle.com> +Date: Fri Aug 24 09:44:23 2012 +0530 + + Open /dev/console with NOCTTY and O_NONBLOCK flags + + In some cases, for SPARC servers, special files like fifo need + to open in nonblocking mode otherwise whole xconsole GUI freezes. + Also /dev/console is often a terminal device. So I am opening + /dev/console with NOCTTY and O_NONBLOCK flags. + + Signed-off-by: Arvind Umrao <arvind.um...@oracle.com> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 2e2ccc86fd4e778268ee44897a56535ce37b25e3 +Author: Eric S. Raymond <e...@thyrsus.com> +Date: Thu Aug 23 06:19:16 2012 -0400 + + Don't rely on being able to set tab stops. + + Signed-off-by: Eric S. Raymond <e...@thyrsus.com> + +commit 1dad4492bf1a6668de2b6ef56fd16ef4fc0e380d +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Jun 5 18:25:30 2012 -0700 + + unifdef CRAY + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit ada6e8761138d3e7af42726de15e88204bed1686 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Jun 5 18:22:40 2012 -0700 + + unifdef umips + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f9b34c2eae4c3abe40904e4274c5d82cd16fc7af +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Jun 5 18:20:49 2012 -0700 + + Mark functions _X_NORETURN that gcc warnings suggest + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a12b6b391ab96241aa14f918e36a2fbd92734c7d +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Tue Jun 5 18:16:59 2012 -0700 + + Remove old Xorg & XFree86 CVS version tags + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f7bcc00522e06e33ddb1ff4974c3b15a44d1005f +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Wed Sep 28 20:30:46 2011 -0700 + + Strip trailing whitespace + + Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}' + git diff -w & git diff -b show no diffs from this change + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a03d98d49cd2f2ef6aa6d2ecaf611cccfad7a919 +Author: Jeremy Huddleston <jerem...@apple.com> +Date: Sun Sep 25 00:55:20 2011 -0700 + + Require xt >= 1.0 for appdefaultdir + + https://bugs.freedesktop.org/show_bug.cgi?id=7237 + + Signed-off-by: Jeremy Huddleston <jerem...@apple.com> + +commit 2f34a30d5b4fed4936fa41bb25bc0953d6882ece +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 19 10:06:55 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 037e30485b3d6e22216a8c44e78fdb6fb57b238b +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Jan 13 17:15:36 2011 -0500 + + man: replace hard coded man page section with substitution strings + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit e076a7cc5441e51b1083aba11f5b743156514fc1 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 12 16:28:02 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This silences an Autoconf warning + +commit 2f6ff82050e8a535d633f9b59bb2ec94528d3634 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jan 12 15:29:50 2011 -0500 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + This silences an Automake warning. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + commit d71b95d96588e1ca020fa15db6ceb3050d41bbdc Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Thu Sep 23 19:31:52 2010 -0700 @@ -198,7 +347,7 @@ Build fix for file systems that are not case sensitive commit 2f9d3842be3d5d58270e54821552735cdb098075 -Merge: d5ffc49... cda9968... +Merge: d5ffc49 cda9968 Author: James Cloos <cl...@jhcloos.com> Date: Mon Sep 3 05:59:57 2007 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/Makefile.am new/xconsole-1.0.5/Makefile.am --- old/xconsole-1.0.4/Makefile.am 2010-07-02 02:02:49.000000000 +0200 +++ new/xconsole-1.0.5/Makefile.am 2013-01-13 01:25:00.000000000 +0100 @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xconsole AM_CFLAGS = $(XCONSOLE_CFLAGS) $(CWARNFLAGS) @@ -27,9 +28,6 @@ xconsole_SOURCES = \ xconsole.c -appman_PRE = \ - xconsole.man - # App default files DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -38,20 +36,7 @@ dist_appdefault_DATA = \ app-defaults/XConsole - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ .PHONY: ChangeLog INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/app-defaults/XConsole new/xconsole-1.0.5/app-defaults/XConsole --- old/xconsole-1.0.4/app-defaults/XConsole 2009-10-16 23:38:53.000000000 +0200 +++ new/xconsole-1.0.5/app-defaults/XConsole 2013-01-13 01:25:00.000000000 +0100 @@ -1,10 +1,3 @@ -! $Xorg: XConsole.ad,v 1.3 2000/08/17 19:54:13 cpqbld Exp $ -! -! -! -! -! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.2 2000/03/31 22:55:55 dawes Exp $ - *allowShellResize: true XConsole.translations: #override\ <MapNotify>: Deiconified() \n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/configure.ac new/xconsole-1.0.5/configure.ac --- old/xconsole-1.0.4/configure.ac 2010-09-24 04:30:42.000000000 +0200 +++ new/xconsole-1.0.5/configure.ac 2013-01-13 01:25:00.000000000 +0100 @@ -1,6 +1,6 @@ dnl Copyright 2005 Red Hat, Inc. -dnl +dnl dnl Permission to use, copy, modify, distribute, and sell this software and its dnl documentation for any purpose is hereby granted without fee, provided that dnl the above copyright notice appear in all copies and that both that @@ -10,7 +10,7 @@ dnl specific, written prior permission. Red Hat makes no dnl representations about the suitability of this software for any purpose. It dnl is provided "as is" without express or implied warranty. -dnl +dnl dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -23,7 +23,7 @@ AC_PREREQ([2.60]) AC_INIT([xconsole], - [1.0.4], + [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xconsole]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -35,15 +35,15 @@ XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) # Checks for pkg-config packages -PKG_CHECK_MODULES(XCONSOLE, xaw7 xmu xt x11) +PKG_CHECK_MODULES(XCONSOLE, xaw7 xmu xt >= 1.0 x11 xproto >= 7.0.17) PKG_CHECK_MODULES(APPDEFS, xt) xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt` AC_ARG_WITH(appdefaultdir, - AC_HELP_STRING([--with-appdefaultdir=<pathname>], + AS_HELP_STRING([--with-appdefaultdir=<pathname>], [specify directory for app-defaults files (default is autodetected)]), [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) @@ -51,10 +51,13 @@ AC_SEARCH_LIBS(openpty, [util]) AC_CHECK_FUNC(openpty, [HAS_OPENPTY="yes"]) if test "x$HAS_OPENPTY" = "xyes" ; then - AC_DEFINE([HAS_OPENPTY], 1, + AC_DEFINE([HAS_OPENPTY], 1, [Define to 1 if you have the 'openpty' function.]) AC_CHECK_HEADERS([util.h pty.h], [break]) fi -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/man/Makefile.am new/xconsole-1.0.5/man/Makefile.am --- old/xconsole-1.0.4/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/xconsole-1.0.5/man/Makefile.am 2013-01-13 01:25:00.000000000 +0100 @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xconsole.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/man/xconsole.man new/xconsole-1.0.5/man/xconsole.man --- old/xconsole-1.0.4/man/xconsole.man 1970-01-01 01:00:00.000000000 +0100 +++ new/xconsole-1.0.5/man/xconsole.man 2013-01-13 01:25:00.000000000 +0100 @@ -0,0 +1,113 @@ +.\" Copyright 1994, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" The above copyright notice and this permission notice shall be included in +.\" all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +.\" SOFTWARE. +.\" +.\" Except as contained in this notice, the name of The Open Group shall not +.\" be used in advertising or otherwise to promote the sale, use or other +.\" dealing in this Software without prior written authorization from the +.\" The Open Group. +.\" +.\" +.TH XCONSOLE 1 __xorgversion__ +.SH NAME +xconsole \- monitor system console messages with X +.SH SYNOPSIS +.ta 8n +\fBxconsole\fP [-\fItoolkitoption\fP ...] [-file \fIfile-name\fP] +[-notify] [-stripNonprint] [-daemon] [-verbose] [-exitOnFail] +.SH DESCRIPTION +The +.I xconsole +program displays messages which are usually sent to /dev/console. +.SH OPTIONS +.I Xconsole +accepts all of the standard X Toolkit command line options along with the +additional options listed below: +.TP 8 +.B \-file \fIfile-name\fP +To monitor some other device, use this option to specify the device name. +This does not work on regular files as they are always ready to be read from. +.TP 8 +.B \-notify \-nonotify +When new data are received from the console and the notify option is set, +the icon name of the application has " *" appended, so that it is evident +even when the application is iconified. \-notify is the default. +.TP 8 +.B \-daemon +This option causes +.I xconsole +to place itself in the background, using fork/exit. +.TP 8 +.B \-verbose +When set, this option directs +.I xconsole +to display an informative message in the first line of the text buffer. +.TP 8 +.B \-exitOnFail +When set, this option directs +.I xconsole +to exit when it is unable to redirect the console output. +.TP 8 +.B \-saveLines \fIcount\fP +When set, +.I xconsole +only preserves +.I count +lines of message history instead of growing the text buffer without bound +(a +.I count +of zero \- the default \- is treated as placing no limit on the history). +.SH X DEFAULTS +This program uses the +.I Athena Text +widget, look in the +.I Athena Widget Set +documentation for controlling it. +.PP +.I Xconsole +otherwise accepts resources of the same names as the command-line options +(without the leading dash). "file" is a string type, "saveLines" an +integer, and the remaining options are booleans. +.SH WIDGETS +In order to specify resources, it is useful to know the hierarchy of +the widgets which compose \fIxconsole\fR. In the notation below, +indentation indicates hierarchical structure. The widget class name +is given first, followed by the widget instance name. +.sp +.nf +XConsole xconsole + XConsole text +.fi +.sp +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +to get the default host and display number. +.TP 8 +.B XENVIRONMENT +to get the name of a resource file that overrides the global resources +stored in the RESOURCE_MANAGER property. +.SH FILES +.TP +.I __apploaddir__/XConsole +specifies required resources +.SH "SEE ALSO" +X(__miscmansuffix__), xrdb(__appmansuffix__), Athena Text widget +.SH AUTHOR +Keith Packard (MIT X Consortium) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/xconsole.c new/xconsole-1.0.5/xconsole.c --- old/xconsole-1.0.4/xconsole.c 2009-10-16 23:38:53.000000000 +0200 +++ new/xconsole-1.0.5/xconsole.c 2013-01-13 01:25:00.000000000 +0100 @@ -1,5 +1,4 @@ /* - * $Xorg: xconsole.c,v 1.5 2001/02/09 02:05:40 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,12 +25,13 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/xconsole/xconsole.c,v 3.31tsi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include <X11/Xfuncproto.h> + #include <X11/Intrinsic.h> #include <X11/StringDefs.h> #include <X11/Xatom.h> @@ -150,13 +150,6 @@ #define FILE_NAME "/dev/xcons" #endif -#ifdef __UNIXOS2__ -#define USE_FILE -#define FILE_NAME "/dev/console$" -#define INCL_DOSFILEMGR -#define INCL_DOSDEVIOCTL -#include <os2.h> -#endif #ifdef linux #define USE_FILE @@ -167,7 +160,7 @@ * devpts. This is the fallback if open file FILE_NAME fails. * <wer...@suse.de> */ -# define USE_PTS +# define USE_PTS # endif #endif @@ -215,11 +208,7 @@ #ifdef __hpux #define PTYCHAR1 "zyxwvutsrqp" #else /* !__hpux */ -#ifdef __UNIXOS2__ -#define PTYCHAR1 "pq" -#else #define PTYCHAR1 "pqrstuvwxyzPQRSTUVWXYZ" -#endif /* !__UNIXOS2__ */ #endif /* !__hpux */ #endif /* !PTYCHAR1 */ @@ -254,7 +243,7 @@ if (!strcmp (app_resources.file, "console")) { /* must be owner and have read/write permission */ -#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(Lynx) && !defined(__UNIXOS2__) +#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(Lynx) struct stat sbuf; # if !defined (linux) if (!stat("/dev/console", &sbuf) && @@ -267,23 +256,9 @@ # ifdef linux if (!stat(FILE_NAME, &sbuf)) # endif - input = fopen (FILE_NAME, "r"); -# ifdef __UNIXOS2__ - if (input) - { - ULONG arg = 1,arglen; - APIRET rc; - if ((rc=DosDevIOCtl(fileno(input), 0x76,0x4d, - &arg, sizeof(arg), &arglen, - NULL, 0, NULL)) != 0) - { - fclose(input); - input = 0; - } - } -# endif + input = fopen (FILE_NAME, "r"); #endif - + #ifdef USE_PTY if (!input && get_pty (&pty_fd, &tty_fd, ttydev, ptydev) == 0) { @@ -334,7 +309,11 @@ regularFile = FALSE; if (access(app_resources.file, R_OK) == 0) { - input = fopen (app_resources.file, "r"); + int fd = open (app_resources.file, + O_RDONLY | O_NONBLOCK | O_NOCTTY); + if (fd != -1) + input = fdopen (fd, "r"); + if (input) if (!stat(app_resources.file, &sbuf) && S_ISREG( sbuf.st_mode ) ) @@ -384,7 +363,7 @@ #endif /*ARGSUSED*/ -static void +static void _X_NORETURN Quit(Widget widget, XEvent *event, String *params, Cardinal *num_params) { #ifdef USE_OSM @@ -434,7 +413,7 @@ Arg arglist[1]; char *oldName; char *newName; - int oldlen; + size_t oldlen; iconified = False; if (!app_resources.notify || !notified) @@ -538,7 +517,7 @@ stripNonprint (buffer); n = strlen (buffer); } - + TextAppend ((Widget) text, buffer, n); } } @@ -636,7 +615,7 @@ return False; } -static void +static void _X_NORETURN LoseSelection(Widget w, Atom *selection) { Quit (w, (XEvent*)NULL, (String*)NULL, (Cardinal*)NULL); @@ -868,42 +847,6 @@ #else static int devindex, letter = 0; -#if defined(umips) && defined (SYSTYPE_SYSV) - struct stat fstat_buf; - - *pty = open ("/dev/ptc", O_RDWR); - if (*pty < 0 || (fstat (*pty, &fstat_buf)) < 0) - { - return(1); - } - sprintf (ttydev, "/dev/ttyq%d", minor(fstat_buf.st_rdev)); - sprintf (ptydev, "/dev/ptyq%d", minor(fstat_buf.st_rdev)); - if ((*tty = open (ttydev, O_RDWR)) >= 0) - { - /* got one! */ - return(0); - } - close (*pty); -#else /* not (umips && SYSTYPE_SYSV) */ -#ifdef CRAY - for (; devindex < 256; devindex++) { - sprintf (ttydev, "/dev/ttyp%03d", devindex); - sprintf (ptydev, "/dev/pty/%03d", devindex); - - if ((*pty = open (ptydev, O_RDWR)) >= 0 && - (*tty = open (ttydev, O_RDWR)) >= 0) - { - /* - * We need to set things up for our next entry - * into this function! - */ - (void) devindex++; - return(0); - } - if (*pty >= 0) - close (*pty); - } -#else /* !CRAY */ #ifdef sgi { char *slave; @@ -939,8 +882,6 @@ (void) letter++; } #endif /* sgi else not sgi */ -#endif /* CRAY else not CRAY */ -#endif /* umips && SYSTYPE_SYSV */ #endif /* USE_GET_PSEUDOTTY */ #endif /* SVR4 */ /* @@ -984,7 +925,7 @@ return NULL; #if defined (_AIX) if ((tty = open("/dev/ptc", O_RDWR)) < 0) -#else +#else if ((tty = open("/dev/ptmx", O_RDWR)) < 0) #endif return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xconsole-1.0.4/xconsole.man new/xconsole-1.0.5/xconsole.man --- old/xconsole-1.0.4/xconsole.man 2009-10-16 23:38:53.000000000 +0200 +++ new/xconsole-1.0.5/xconsole.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,117 +0,0 @@ -.\" $Xorg: xconsole.man,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ -.\" Copyright 1994, 1998 The Open Group -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" The above copyright notice and this permission notice shall be included in -.\" all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -.\" SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall not -.\" be used in advertising or otherwise to promote the sale, use or other -.\" dealing in this Software without prior written authorization from the -.\" The Open Group. -.\" -.\" $XFree86: xc/programs/xconsole/xconsole.man,v 1.9 2002/10/12 16:06:47 herrb Exp $ -.\" -.TH XCONSOLE 1 __xorgversion__ -.SH NAME -xconsole \- monitor system console messages with X -.SH SYNOPSIS -.ta 8n -\fBxconsole\fP [-\fItoolkitoption\fP ...] [-file \fIfile-name\fP] -[-notify] [-stripNonprint] [-daemon] [-verbose] [-exitOnFail] -.SH DESCRIPTION -The -.I xconsole -program displays messages which are usually sent to /dev/console. -.SH OPTIONS -.I Xconsole -accepts all of the standard X Toolkit command line options along with the -additional options listed below: -.TP 8 -.B \-file \fIfile-name\fP -To monitor some other device, use this option to specify the device name. -This does not work on regular files as they are always ready to be read from. -.TP 8 -.B \-notify \-nonotify -When new data are received from the console and the notify option is set, -the icon name of the application has " *" appended, so that it is evident -even when the application is iconified. \-notify is the default. -.TP 8 -.B \-daemon -This option causes -.I xconsole -to place itself in the background, using fork/exit. -.TP 8 -.B \-verbose -When set, this option directs -.I xconsole -to display an informative message in the first line of the text buffer. -.TP 8 -.B \-exitOnFail -When set, this option directs -.I xconsole -to exit when it is unable to redirect the console output. -.TP 8 -.B \-saveLines \fIcount\fP -When set, -.I xconsole -only preserves -.I count -lines of message history instead of growing the text buffer without bound -(a -.I count -of zero \- the default \- is treated as placing no limit on the history). -.SH X DEFAULTS -This program uses the -.I Athena Text -widget, look in the -.I Athena Widget Set -documentation for controlling it. -.PP -.I Xconsole -otherwise accepts resources of the same names as the command-line options -(without the leading dash). "file" is a string type, "saveLines" an -integer, and the remaining options are booleans. -.SH WIDGETS -In order to specify resources, it is useful to know the hierarchy of -the widgets which compose \fIxconsole\fR. In the notation below, -indentation indicates hierarchical structure. The widget class name -is given first, followed by the widget instance name. -.sp -.nf -.TA .5i -.ta .5i -XConsole xconsole - XConsole text -.fi -.sp -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -to get the default host and display number. -.TP 8 -.B XENVIRONMENT -to get the name of a resource file that overrides the global resources -stored in the RESOURCE_MANAGER property. -.SH FILES -.TP -.I __apploaddir__/XConsole -specifies required resources -.SH "SEE ALSO" -X(__miscmansuffix__), xrdb(1), Athena Text widget -.SH AUTHOR -Keith Packard (MIT X Consortium) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
