Hello community,
here is the log from the commit of package xorg-x11
checked in at Sun Aug 12 11:48:39 CEST 2007.
--------
--- xorg-x11/xorg-x11.changes 2007-08-10 15:15:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-08-11 13:43:51.097043000 +0200
@@ -1,0 +2,32 @@
+Sat Aug 11 13:42:15 CEST 2007 - sndirsch@suse.de
+
+- xprop 1.0.3
+ * X.Org bug #10616: Add all the X info commands ...
+ * Coverity #905: Handle_Prop_Requests returned without freeing
+ storage "thunks"
+ * Sun Bug 4474581: xprop fails in Japanese locale
+
+-------------------------------------------------------------------
+Fri Aug 10 20:39:09 CEST 2007 - sndirsch@suse.de
+
+- xdm 1.1.5
+ * Bug #11020: xdm doesn't set SSH_AUTH_SOCK even though using
+ with pam_ssh
+ * Bug #11096: xdm(1) manpage should document Xft-related
+ properties
+ * Document more of the greeter resources in xdm man page
+ * Add --enable-xdm-auth/--disable-xdm-auth to configure options
+ * X.Org Bug #10992: xlogin crashes if window size is too small
+ * Set Xcursor theme to whiteglass in default login screen
+ resources
+ * Make #ifdef XPM only control whether XPM pixmap logo is shown
+ * Set default cursor for entire root window, not just greeter
+ * Bug #10530: xdm's path to xrdb could be configurable at compile
+ time
+ * X.Org Bug 10632 / Debian Bug 256299: race condition in
+ policy.c:Willing()
+- xman 1.0.3
+ * Sun Bug 6504978: xman on Solaris x86 does not render correctly,
+ nroff visible
+
+-------------------------------------------------------------------
Old:
----
xdm-1.1.4.tar.bz2
xman-X11R7.1-1.0.2.tar.bz2
xprop-1.0.2.tar.bz2
New:
----
xdm-1.1.5.tar.bz2
xman-1.0.3.tar.bz2
xprop-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.Q15882/_old 2007-08-12 11:47:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Q15882/_new 2007-08-12 11:47:57.000000000 +0200
@@ -18,7 +18,7 @@
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 109
+Release: 111
License: X11/MIT, xc/fonts/scaled/Type1/Copyright
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -68,7 +68,7 @@
Source36: xcursorgen-X11R7.1-1.0.1.tar.bz2
Source37: xdbedizzy-1.0.2.tar.bz2
Source38: xditview-X11R7.0-1.0.1.tar.bz2
-Source39: xdm-1.1.4.tar.bz2
+Source39: xdm-1.1.5.tar.bz2
Source40: xdpyinfo-1.0.2.tar.bz2
Source41: xdriinfo-X11R7.1-1.0.1.tar.bz2
Source42: xedit-X11R7.1-1.0.2.tar.bz2
@@ -96,7 +96,7 @@
Source64: xlsclients-X11R7.0-1.0.1.tar.bz2
Source65: xlsfonts-1.0.2.tar.bz2
Source66: xmag-X11R7.0-1.0.1.tar.bz2
-Source67: xman-X11R7.1-1.0.2.tar.bz2
+Source67: xman-1.0.3.tar.bz2
Source68: xmessage-1.0.2.tar.bz2
Source69: xmh-X11R7.0-1.0.1.tar.bz2
Source70: xmodmap-1.0.3.tar.bz2
@@ -105,7 +105,7 @@
Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2
Source74: xpr-1.0.2.tar.bz2
Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2
-Source76: xprop-1.0.2.tar.bz2
+Source76: xprop-1.0.3.tar.bz2
Source77: xrandr-1.2.2.tar.bz2
Source78: xrdb-1.0.3.tar.bz2
Source79: xrefresh-X11R7.1-1.0.2.tar.bz2
@@ -455,6 +455,32 @@
/var/lib/xdm/authdir/
%changelog
+* Sat Aug 11 2007 - sndirsch@suse.de
+- xprop 1.0.3
+ * X.Org bug #10616: Add all the X info commands ...
+ * Coverity #905: Handle_Prop_Requests returned without freeing
+ storage "thunks"
+ * Sun Bug 4474581: xprop fails in Japanese locale
+* Fri Aug 10 2007 - sndirsch@suse.de
+- xdm 1.1.5
+ * Bug #11020: xdm doesn't set SSH_AUTH_SOCK even though using
+ with pam_ssh
+ * Bug #11096: xdm(1) manpage should document Xft-related
+ properties
+ * Document more of the greeter resources in xdm man page
+ * Add --enable-xdm-auth/--disable-xdm-auth to configure options
+ * X.Org Bug #10992: xlogin crashes if window size is too small
+ * Set Xcursor theme to whiteglass in default login screen
+ resources
+ * Make #ifdef XPM only control whether XPM pixmap logo is shown
+ * Set default cursor for entire root window, not just greeter
+ * Bug #10530: xdm's path to xrdb could be configurable at compile
+ time
+ * X.Org Bug 10632 / Debian Bug 256299: race condition in
+ policy.c:Willing()
+- xman 1.0.3
+ * Sun Bug 6504978: xman on Solaris x86 does not render correctly,
+ nroff visible
* Fri Aug 10 2007 - sndirsch@suse.de
- xsetroot 1.0.2
* Typo, it's xsetroot, not setroot.
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.Q15882/_old 2007-08-12 11:48:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Q15882/_new 2007-08-12 11:48:01.000000000 +0200
@@ -174,7 +174,7 @@
extern int auth_finalize ( void );
extern int process_command ( char *inputfilename, int lineno, int argc, char **argv );
--- programs/xdm/auth.c.orig 2005-11-09 10:41:27.000000000 +0100
-+++ xdm-1.1.4/auth.c 2005-11-11 11:33:00.000000000 +0100
++++ xdm-1.1.5/auth.c 2005-11-11 11:33:00.000000000 +0100
@@ -680,7 +680,7 @@
}
++++++ xdm-1.1.4.tar.bz2 -> xdm-1.1.5.tar.bz2 ++++++
++++ 7760 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/xdm-1.1.4/acinclude.m4 new/xdm-1.1.5/acinclude.m4
--- old/xdm-1.1.4/acinclude.m4 2006-07-11 04:52:23.000000000 +0200
+++ new/xdm-1.1.5/acinclude.m4 2007-07-26 02:06:57.000000000 +0200
@@ -1,14 +1,47 @@
-dnl From http://autoconf-archive.cryp.to/ac_define_dir.html.
+##### http://autoconf-archive.cryp.to/ac_define_dir.html
+#
+# SYNOPSIS
+#
+# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#
+# DESCRIPTION
+#
+# This macro sets VARNAME to the expansion of the DIR variable,
+# taking care of fixing up ${prefix} and such.
+#
+# VARNAME is then offered as both an output variable and a C
+# preprocessor symbol.
+#
+# Example:
+#
+# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#
+# LAST MODIFICATION
+#
+# 2006-10-13
+#
+# COPYLEFT
+#
+# Copyright (c) 2006 Stepan Kasal
+# Copyright (c) 2006 Andreas Schwab
+# Copyright (c) 2006 Guido U. Draheim
+# Copyright (c) 2006 Alexandre Oliva
+#
+# Copying and distribution of this file, with or without
+# modification, are permitted in any medium without royalty provided
+# the copyright notice and this notice are preserved.
AC_DEFUN([AC_DEFINE_DIR], [
prefix_NONE=
exec_prefix_NONE=
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}. Thus we have to use `eval' twice.
eval ac_define_dir="\"[$]$2\""
+ eval ac_define_dir="\"$ac_define_dir\""
AC_SUBST($1, "$ac_define_dir")
AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
test "$prefix_NONE" && prefix=NONE
test "$exec_prefix_NONE" && exec_prefix=NONE
])
-
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/xdm-1.1.4/ChangeLog new/xdm-1.1.5/ChangeLog
--- old/xdm-1.1.4/ChangeLog 2007-02-06 20:47:45.000000000 +0100
+++ new/xdm-1.1.5/ChangeLog 2007-08-10 19:45:57.000000000 +0200
@@ -1,3 +1,104 @@
+commit ef1be3254966018fede7c33dea2f41b9351ef699
+Author: Alan Coopersmith
+Date: Fri Aug 10 10:43:10 2007 -0700
+
+ Version bump: 1.1.5
+
+commit 3ed70d13a6957c2434753f32d388888eae079d82
+Author: Alan Coopersmith
+Date: Wed Jul 25 17:07:33 2007 -0700
+
+ Update AC_DEFINE_DIR to autoconf-2.60-compatible version
+
+commit dd05076f290b1995f71627324cc74053c870ac21
+Author: Alan Coopersmith
+Date: Wed Jul 25 17:03:56 2007 -0700
+
+ Add AM_PROG_CC_C_O to clear automake-1.10 warning
+
+ Makefile.am:149: compiling `chooser.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit 29dc5825782adf929bce41a18e6a6881ef975d22
+Author: Alan Coopersmith
+Date: Wed Jul 25 17:00:39 2007 -0700
+
+ Bug #10530: xdm's path to xrdb could be configurable at compile time
+
+ Add --with-xrdb=path & --with-default-session=command configure options
+ X.Org Bug #10530: https://bugs.freedesktop.org/show_bug.cgi?id=10530
+
+commit 2719e18c3782c5b21f712711b4198a5bb55f5473
+Author: Alan Coopersmith
+Date: Fri Jun 15 20:14:21 2007 -0700
+
+ Set default cursor for entire root window, not just greeter
+
+commit d0d4581be22aba9021c5a672bd9e5ba719961e29
+Author: Alan Coopersmith
+Date: Fri Jun 15 19:43:46 2007 -0700
+
+ Make #ifdef XPM only control whether XPM pixmap logo is shown
+
+ Make 3D look-and-feel independent of XPM
+
+commit 188415ebf07ff8a25ac663c37615269cd1a741a4
+Author: Alan Coopersmith
+Date: Fri Jun 15 19:23:05 2007 -0700
+
+ Set Xcursor theme to whiteglass in default login screen resources
+
+commit f8585c60831a8e5ddebce18bdd7e78d217a822c5
+Author: Alan Coopersmith
+Date: Fri Jun 15 18:36:15 2007 -0700
+
+ X.Org Bug #10992: xlogin crashes if window size is too small
+
+ X.Org Bugzilla #10992 https://bugs.freedesktop.org/show_bug.cgi?id=10992
+
+commit 0ce4128e19f9fac9a565cce42a6a575486d371a5
+Author: Alan Coopersmith
+Date: Fri Jun 15 14:24:59 2007 -0700
+
+ Add --enable-xdm-auth/--disable-xdm-auth to configure options
+
+commit 8e0b23e24556fb6c6b9943bf3747e70b245fc7aa
+Author: Chip Coldwell
+Date: Thu Jun 24 09:56:19 2004 -0700
+
+ X.Org Bug 10632 / Debian Bug 256299: race condition in policy.c:Willing()
+
+ X.Org Bugzilla #10632 https://bugs.freedesktop.org/show_bug.cgi?id=10632
+ Reported upstream from
+ Debian Bug #256299 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256299
+
+commit a8927ee05efba3afe955731bab5d633879c39833
+Author: Alan Coopersmith
+Date: Thu May 31 17:11:15 2007 -0700
+
+ Document more of the greeter resources in xdm man page
+
+commit 35f563369470139665498640f4cda23d1227073b
+Author: Alan Coopersmith
+Date: Tue May 29 19:57:29 2007 -0700
+
+ Bug #11096: xdm(1) manpage should document Xft-related properties
+
+ X.Org Bugzilla #11096 https://bugs.freedesktop.org/show_bug.cgi?id=11096
+
+ Added descriptions of the Xft *face resources and changed the core fonts
+ *font resource descriptions to match. Also cleaned up various other
+ descriptions to make it easier for users customizing the look of the login
+ screen.
+
+commit e7f1c433dc0bd8e864cec68dbc120f27696bbba6
+Author: Alan Coopersmith
+Date: Thu May 24 10:32:32 2007 -0700
+
+ Bug #11020: xdm doesn't set SSH_AUTH_SOCK even though using with pam_ssh
+
+ Wasn't calling pam_setcred()/pam_getenvlist() if setusercontext() was present
+ X.Org Bugzilla #11020: https://bugs.freedesktop.org/show_bug.cgi?id=11020
+
commit 677d028e41e890103679eec92b58044420b9b4c5
Author: Alan Coopersmith
Date: Tue Feb 6 11:45:41 2007 -0800
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/xdm-1.1.4/config/Xresources.cpp new/xdm-1.1.5/config/Xresources.cpp
--- old/xdm-1.1.4/config/Xresources.cpp 2006-08-14 20:12:34.000000000 +0200
+++ new/xdm-1.1.5/config/Xresources.cpp 2007-06-16 04:25:22.000000000 +0200
@@ -5,6 +5,9 @@
!
! $XFree86: xc/programs/xdm/config/Xres.cpp,v 1.6 2003/01/04 03:11:31 dawes Exp $
!
+
+Xcursor.theme: whiteglass
+
#define BS \ /* cpp can be trickier than m4 */
#define NLBS \n\ /* don't remove these comments */
xlogin*login.translations: #override BS
@@ -19,15 +22,11 @@
<Key>KP_Enter: set-session-argument() finish-field()NLBS
Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
<Key>Return: set-session-argument() finish-field()
-#ifndef XPM
-xlogin*greeting: CLIENTHOST
-xlogin*namePrompt: login:\040
-#else
+
xlogin*greeting: Welcome to CLIENTHOST
xlogin*namePrompt: \040\040\040\040\040\040\040Login:
-#endif /* XPM */
xlogin*fail: Login incorrect
-#ifdef XPM
+
XHASHif WIDTH > 800
xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
@@ -37,21 +36,8 @@
xlogin*face: Helvetica-18
xlogin*promptFace: Helvetica-18:bold
xlogin*failFace: Helvetica-18:bold
-XHASHelse
-xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
-xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
-xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
-xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
-xlogin*greetFace: Serif-18:bold:italic
-xlogin*face: Helvetica-12
-xlogin*promptFace: Helvetica-12:bold
-xlogin*failFace: Helvetica-14:bold
-XHASHendif
-#endif /* XPM */
+
XHASHifdef COLOR
-#ifndef XPM
-xlogin*greetColor: CadetBlue
-#else
xlogin*borderWidth: 1
xlogin*frameWidth: 5
xlogin*innerFramesWidth: 2
@@ -60,22 +46,15 @@
xlogin*background: grey
!xlogin*foreground: darkgreen
xlogin*greetColor: Blue3
-#endif /* XPM */
xlogin*failColor: red
*Foreground: black
*Background: #fffff0
XHASHelse
-#ifdef XPM
xlogin*borderWidth: 3
xlogin*frameWidth: 0
xlogin*innerFramesWidth: 1
xlogin*shdColor: black
xlogin*hiColor: black
-#else
-xlogin*borderWidth: 3
-xlogin*Foreground: black
-xlogin*Background: white
-#endif /* XPM */
XHASHendif
#ifdef XPM
XHASHif PLANES >= 8
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/xdm-1.1.4/config.h.in new/xdm-1.1.5/config.h.in
--- old/xdm-1.1.4/config.h.in 2007-02-06 20:47:12.000000000 +0100
+++ new/xdm-1.1.5/config.h.in 2007-08-10 19:45:14.000000000 +0200
@@ -120,6 +120,9 @@
/* Support os-specific local connections */
#undef LOCALCONN
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
/* Name of package */
#undef PACKAGE
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/xdm-1.1.4/configure.ac new/xdm-1.1.5/configure.ac
--- old/xdm-1.1.4/configure.ac 2007-02-06 20:45:23.000000000 +0100
+++ new/xdm-1.1.5/configure.ac 2007-08-10 19:38:16.000000000 +0200
@@ -24,13 +24,14 @@
dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $
AC_PREREQ([2.57])
-AC_INIT(xdm,[1.1.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.5],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
+AM_PROG_CC_C_O
AC_C_INLINE
AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
@@ -112,7 +113,7 @@
AC_CHECK_FUNC(pam_open_session,
[AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
[if test "x$USE_PAM" != "xtry" ; then
- AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
+ AC_MSG_ERROR([PAM support requested, but pam_open_session not found.])
fi])
fi
@@ -155,7 +156,7 @@
AC_CHECK_FILE([/dev/urandom], [RANDOM_DEVICE=/dev/urandom],
AC_CHECK_FILE([/dev/random], [RANDOM_DEVICE=/dev/random]))
if test x$RANDOM_DEVICE = xyes ; then
- AC_MSG_ERROR(["random device support requested, but no random device was found."])
+ AC_MSG_ERROR([random device support requested, but no random device was found.])
else
if test x$RANDOM_DEVICE = xtry ; then
RANDOM_DEVICE="no"
@@ -370,9 +371,18 @@
XDM_LIBS="$XDM_LIBS $DMCP_LIBS"
AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$DMCP_LIBS])
-AC_SEARCH_LIBS(crypt, crypt)
-AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes)
+AC_ARG_ENABLE(xdm-auth,
+ AC_HELP_STRING([--enable-xdm-auth],
+ [Support XDM-AUTHENTICATION-1 and XDM-AUTHORIZATION-1 (default: auto)]),
+ [xdmauth_enable="$enableval"], [xdmauth_enable="auto"])
+if test "x$xdmauth_enable" = "xyes" -a "x$xdmauth" = "xno" ; then
+ AC_MSG_ERROR([XDM-AUTH support requested, but XdmcpWrap not found in libXdmcp.])
+fi
+
+AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes -a x$xdmauth_enable != xno)
+
+AC_SEARCH_LIBS(crypt, crypt)
AC_SUBST(XDM_CFLAGS)
AC_SUBST(XDM_LIBS)
@@ -413,11 +423,17 @@
[Define to default Xserver file entry for local X server])
# -DXRDB_PROGRAM="$(BINDIR)/xrdb"
-AC_DEFINE_DIR(XRDB_PROGRAM, bindir/xrdb,
+AC_ARG_WITH(xrdb, AC_HELP_STRING([--with-xrdb=path],
+ [Use path for xrdb (default: bindir/xrdb)]),
+ [XRDB=$withval], [XRDB=bindir/xrdb])
+AC_DEFINE_DIR(XRDB_PROGRAM, XRDB,
[Define to pathname for xrdb program])
# -DDEF_SESSION="$(BINDIR)/xterm -ls"
-AC_DEFINE_DIR(DEF_SESSION, bindir/xterm -ls,
+AC_ARG_WITH(default-session, AC_HELP_STRING([--with-default-session=command],
+ [Use command for default session (default: bindir/xterm -ls)]),
+ [DEF_SESSION=$withval], [DEF_SESSION="bindir/xterm -ls"])
+AC_DEFINE_DIR(DEF_SESSION, DEF_SESSION,
[Define to default command to start X session])
# -DDEF_USER_PATH="$(DEF_USER_PATH)"
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/xdm-1.1.4/greeter/Login.c new/xdm-1.1.5/greeter/Login.c
--- old/xdm-1.1.4/greeter/Login.c 2007-02-02 00:15:45.000000000 +0100
+++ new/xdm-1.1.5/greeter/Login.c 2007-06-16 05:12:10.000000000 +0200
@@ -85,9 +85,10 @@
#include
#include
#include
-#include
#endif /* XPM */
+#include
+
#ifdef USE_XINERAMA
#include
#endif
@@ -135,12 +136,14 @@
offset(failpixel), XtRString, XtDefaultForeground},
#endif
-#ifdef XPM
+#ifdef DANCING
/* added by Caolan McNamara */
{XtNlastEventTime, XtCLastEventTime, XtRInt , sizeof (int),
offset(lastEventTime), XtRImmediate, (XtPointer)0},
/* end (caolan) */
+#endif /* DANCING */
+#ifdef XPM
/* added by Ivan Griffin (ivan.griffin@ul.ie) */
{XtNlogoFileName, XtCLogoFileName, XtRString, sizeof(char*),
offset(logoFileName), XtRImmediate, (XtPointer)0},
@@ -149,7 +152,7 @@
{XtNlogoPadding, XtCLogoPadding, XtRInt, sizeof(int),
offset(logoPadding), XtRImmediate, (XtPointer) 5},
/* end (ivan) */
-
+#endif /* XPM */
/* added by Amit Margalit */
{XtNhiColor, XtCForeground, XtRPixel, sizeof (Pixel),
@@ -163,7 +166,6 @@
{XtNsepWidth, XtCFrameWidth, XtRInt, sizeof(int),
offset(sepwidth), XtRImmediate, (XtPointer) 1},
/* end (amit) */
-#endif /* XPM */
#ifndef USE_XFT
{XtNfont, XtCFont, XtRFontStruct, sizeof (XFontStruct *),
@@ -298,11 +300,8 @@
# define STRING_WIDTH(f, s) TEXT_WIDTH (f, s, strlen(s))
-#ifndef XPM
-# define TEXT_PROMPT_W(w, m) STRING_WIDTH(prompt, m)
-#else
+
# define TEXT_PROMPT_W(w, m) (STRING_WIDTH(prompt, m) + w->login.inframeswidth)
-#endif /* XPM */
# define DEF_PROMPT_W(w,n) TEXT_PROMPT_W(w, w->login.prompts[n].defaultPrompt)
# define CUR_PROMPT_W(w,n) (max(MAX_DEF_PROMPT_W(w), PROMPT_TEXT(w,n) ? \
@@ -330,11 +329,8 @@
# define PROMPT_W(w) (w->core.width - (2 * TEXT_X_INC(w)))
# define PROMPT_H(w) (3 * Y_INC(w) / 2)
# define VALUE_X(w,n) (PROMPT_X(w) + CUR_PROMPT_W(w,n))
-#ifndef XPM
-# define PROMPT_SPACE_Y(w) (8 * Y_INC(w) / 5)
-#else
# define PROMPT_SPACE_Y(w) (10 * Y_INC(w) / 5)
-#endif /* XPM */
+
# define ERROR_X(w,m) ((int)(w->core.width - STRING_WIDTH (fail, m)) / 2)
# define FAIL_X(w) ERROR_X(w, w->login.fail)
# define FAIL_Y(w) (PROMPT_Y(w,1) + 2 * FAIL_Y_INC (w) + F_ASCENT(fail))
@@ -373,10 +369,10 @@
height = PROMPT_H(w);
width = PROMPT_W(w) - x - 3;
-#ifdef XPM
height -= (w->login.inframeswidth * 2);
- width -= (w->login.inframeswidth * 2) +
- (w->login.logoWidth + 2*(w->login.logoPadding));
+ width -= (w->login.inframeswidth * 2);
+#ifdef XPM
+ width -= (w->login.logoWidth + 2*(w->login.logoPadding));
#endif
if (cursor > VALUE_SHOW_START(w, promptNum))
curoff = TEXT_WIDTH (text, text, cursor);
@@ -402,14 +398,14 @@
offset = VALUE_SHOW_START(w, promptNum);
textlen = strlen (text + offset);
- do
+ while ((textlen > 0) && (textwidth > width))
{
if (offset < PROMPT_CURSOR(w, promptNum)) {
offset++;
}
textlen--;
textwidth = TEXT_WIDTH (text, text + offset, textlen);
- } while ((textlen > 0) && (textwidth > width));
+ }
VALUE_SHOW_START(w, promptNum) = offset;
VALUE_SHOW_END(w, promptNum) = offset + textlen;
@@ -435,11 +431,11 @@
DrawValue (LoginWidget w, int cursor, int promptNum)
{
realizeValue(w, cursor, promptNum, w->login.textGC);
-#ifdef XPM
+#ifdef DANCING
/*as good a place as any Caolan begin*/
w->login.lastEventTime = time(NULL);
/*as good a place as any Caolan end*/
-#endif /* XPM */
+#endif /* DANCING */
}
static void
@@ -482,10 +478,6 @@
break;
}
-#ifndef XPM
- XFillRectangle (XtDisplay (w), XtWindow (w), gc,
- x, y - F_ASCENT(text), width, height);
-#else
XFillRectangle (XtDisplay (w), XtWindow (w), gc,
x, y+1 - F_ASCENT(text), width, height-1);
XDrawPoint (XtDisplay (w), XtWindow (w), gc,
@@ -504,7 +496,6 @@
x-2 , y - F_ASCENT(text)+height);
XDrawPoint (XtDisplay (w), XtWindow (w), gc,
x+2 , y - F_ASCENT(text)+height);
-#endif /* XPM */
#ifdef FORCE_CURSOR_FLASH
/* Force cursor to flash briefly to give user feedback */
@@ -708,14 +699,11 @@
draw_it (LoginWidget w)
{
int p;
-#ifdef XPM
int i;
int gr_line_x, gr_line_y, gr_line_w;
-#endif /* XPM */
EraseCursor (w);
-#ifdef XPM
if( (w->login.outframewidth) < 1 )
w->login.outframewidth = 1;
for(i=1;i<=(w->login.outframewidth);i++)
@@ -731,11 +719,15 @@
}
/* make separator line */
- gr_line_x = w->login.outframewidth + w->login.logoPadding;
+ gr_line_x = w->login.outframewidth;
gr_line_y = GREET_Y(w) + GREET_Y_INC(w);
- gr_line_w = w->core.width - 2*(w->login.outframewidth) -
- (w->login.logoWidth + 3*(w->login.logoPadding));
-
+ gr_line_w = w->core.width - 2*(w->login.outframewidth);
+
+#ifdef XPM
+ gr_line_x += w->login.logoPadding;
+ gr_line_w -= w->login.logoWidth + (3 * (w->login.logoPadding));
+#endif /* XPM */
+
for(i=1;i<=(w->login.sepwidth);i++)
{
XDrawLine(XtDisplay (w), XtWindow (w), w->login.shdGC,
@@ -752,11 +744,14 @@
int in_frame_y
= PROMPT_Y(w,p) - w->login.inframeswidth - 1 - TEXT_Y_INC(w);
- int in_width = PROMPT_W(w) - VALUE_X(w,p) -
- (w->login.logoWidth + 2*(w->login.logoPadding));
+ int in_width = PROMPT_W(w) - VALUE_X(w,p);
int in_height = PROMPT_H(w) + w->login.inframeswidth + 2;
GC topLeftGC, botRightGC;
+
+#ifdef XPM
+ in_width -= (w->login.logoWidth + 2*(w->login.logoPadding));
+#endif /* XPM */
if ((PROMPT_STATE(w, p) == LOGIN_PROMPT_ECHO_ON) ||
(PROMPT_STATE(w, p) == LOGIN_PROMPT_ECHO_OFF)) {
@@ -787,15 +782,12 @@
in_frame_x + in_width-i, in_frame_y + in_height-i);
}
}
-#endif /* XPM */
if (GREETING(w)[0]) {
- int gx;
+ int gx = GREET_X(w);
#ifdef XPM
- gx = GREET_X(w) - ((w->login.logoWidth/2) + w->login.logoPadding);
-#else
- gx = GREET_X(w);
+ gx -= ((w->login.logoWidth/2) + w->login.logoPadding);
#endif
DRAW_STRING (greet, gx, GREET_Y(w), GREETING(w), strlen (GREETING(w)));
}
@@ -1696,8 +1688,6 @@
XineramaScreenInfo *screens;
int s_num;
#endif
-
-#ifdef XPM
int rv = 0;
myXGCV.foreground = w->login.hipixel;
@@ -1709,7 +1699,6 @@
myXGCV.background = w->core.background_pixel;
valuemask = GCForeground | GCBackground;
w->login.shdGC = XtGetGC(gnew, valuemask, &myXGCV);
-#endif /* XPM */
myXGCV.foreground = TEXT_COLOR(text);
myXGCV.background = w->core.background_pixel;
@@ -1898,10 +1887,9 @@
XtValueMask *valueMask,
XSetWindowAttributes *attrs)
{
-#ifdef XPM
LoginWidget w = (LoginWidget) gw;
Cursor cursor;
-#endif /* XPM */
+
XtCreateWindow( gw, (unsigned)InputOutput, (Visual *)CopyFromParent,
*valueMask, attrs );
InitI18N(gw);
@@ -1913,10 +1901,10 @@
#endif
-#ifdef XPM
cursor = XCreateFontCursor(XtDisplay(gw), XC_left_ptr);
- XDefineCursor(XtDisplay(gw), XtWindow(gw), cursor);
+ XDefineCursor(XtDisplay(gw), DefaultRootWindow(XtDisplay(gw)), cursor);
+#ifdef XPM
/*
* Check if Pixmap was valid
*/
@@ -1990,10 +1978,10 @@
XtReleaseGC(gw, w->login.greetGC);
XtReleaseGC(gw, w->login.failGC);
#endif
-#ifdef XPM
XtReleaseGC(gw, w->login.hiGC);
XtReleaseGC(gw, w->login.shdGC);
+#ifdef XPM
if (True == w->login.logoValid)
{
if (w->login.logoPixmap != 0)
@@ -2101,11 +2089,7 @@
/* expose */ Redisplay,
/* set_values */ SetValues,
/* set_values_hook */ NULL,
-#ifndef XPM
- /* set_values_almost */ NULL,
-#else
/* set_values_almost */ XtInheritSetValuesAlmost,
-#endif /* XPM */
/* get_values_hook */ NULL,
/* accept_focus */ NULL,
/* version */ XtVersion,
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/xdm-1.1.4/greeter/Login.h new/xdm-1.1.5/greeter/Login.h
--- old/xdm-1.1.4/greeter/Login.h 2007-02-06 20:28:45.000000000 +0100
+++ new/xdm-1.1.5/greeter/Login.h 2007-06-16 04:36:06.000000000 +0200
@@ -114,29 +114,30 @@
# define XtRXftFont "XftFont"
# define XtRXftColor "XftColor"
-#ifdef XPM
/* added by Amit Margalit Oct 1996 */
# define XtNhiColor "hiColor"
# define XtNshdColor "shdColor"
# define XtNframeWidth "frameWidth"
+# define XtCFrameWidth "FrameWidth"
# define XtNinnerFramesWidth "innerFramesWidth"
# define XtNsepWidth "sepWidth"
+#ifdef DANCING
/* caolan begin */
#define XtNlastEventTime "lastEventTime"
#define XtCLastEventTime "LastEventTime"
/* caolan end */
+#endif /* DANCING */
+#ifdef XPM
#define XtNuseShape "useShape"
#define XtCUseShape "UseShape"
#define XtNlogoFileName "logoFileName"
#define XtCLogoFileName "LogoFileName"
#define XtNlogoPadding "logoPadding"
#define XtCLogoPadding "LogoPadding"
-
-# define XtCFrameWidth "FrameWidth"
-
#endif /* XPM */
+
# define XtCGreeting "Greeting"
# define XtCNamePrompt "NamePrompt"
# define XtCPasswdPrompt "PasswdPrompt"
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/xdm-1.1.4/greeter/LoginP.h new/xdm-1.1.5/greeter/LoginP.h
--- old/xdm-1.1.4/greeter/LoginP.h 2006-08-14 22:19:28.000000000 +0200
+++ new/xdm-1.1.5/greeter/LoginP.h 2007-06-16 04:34:59.000000000 +0200
@@ -67,9 +67,7 @@
#include "Login.h"
#include
#include
-#ifdef XPM
#include
-#endif /* XPM */
#ifdef USE_XFT
# include
#endif
@@ -103,10 +101,8 @@
Pixel greetpixel; /* greeting pixel */
Pixel failpixel; /* failure pixel */
#endif
-#ifdef XPM
Pixel hipixel; /* frame hilite pixel */
Pixel shdpixel; /* shadow frame pixel */
-#endif /* XPM */
GC textGC; /* pointer to GraphicsContext */
GC bgGC; /* pointer to GraphicsContext */
GC xorGC; /* pointer to GraphicsContext */
@@ -115,10 +111,8 @@
GC greetGC;
GC failGC;
#endif
-#ifdef XPM
GC hiGC; /* for hilight part of frame */
GC shdGC; /* for shaded part of frame */
-#endif /* XPM */
char *greeting; /* greeting */
char *unsecure_greet;/* message displayed when insecure */
char *namePrompt; /* name prompt */
@@ -147,14 +141,18 @@
XIC xic; /* input method of input context */
loginPromptData prompts[NUM_PROMPTS];
time_t msgTimeout;
-#ifdef XPM
+
+#ifdef DANCING
/*caolan begin*/
- int lastEventTime;
+ int lastEventTime;
/*caolan end*/
+#endif /* DANCING */
+
int outframewidth; /* outer frame thickness */
int inframeswidth; /* inner frames thickness */
int sepwidth; /* width of separator line */
+#ifdef XPM
char *logoFileName;
unsigned int logoWidth, logoHeight, logoPadding, logoBorderWidth;
int logoX, logoY;
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/xdm-1.1.4/missing new/xdm-1.1.5/missing
--- old/xdm-1.1.4/missing 2007-02-06 20:47:18.000000000 +0100
+++ new/xdm-1.1.5/missing 2007-08-10 19:45:15.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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/xdm-1.1.4/policy.c new/xdm-1.1.5/policy.c
--- old/xdm-1.1.4/policy.c 2006-07-14 20:13:34.000000000 +0200
+++ new/xdm-1.1.5/policy.c 2007-06-12 00:30:39.000000000 +0200
@@ -140,8 +140,9 @@
if ((fd = popen(willing, "r")))
{
char *s = NULL;
+ errno = 0;
while(!(s = fgets(statusBuf, 256, fd)) && errno == EINTR)
- ;
+ errno = 0;
if (s && strlen(statusBuf) > 0)
statusBuf[strlen(statusBuf)-1] = 0; /* chop newline */
else
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/xdm-1.1.4/session.c new/xdm-1.1.5/session.c
--- old/xdm-1.1.4/session.c 2007-02-02 02:00:51.000000000 +0100
+++ new/xdm-1.1.5/session.c 2007-05-24 19:30:26.000000000 +0200
@@ -627,6 +627,8 @@
return (0);
}
#endif /* QNX4 doesn't support multi-groups, no initgroups() */
+#endif /* !HAS_SETUSERCONTEXT */
+
#ifdef USE_PAM
if (pamh) {
long i;
@@ -647,6 +649,8 @@
}
#endif
+
+#ifndef HAS_SETUSERCONTEXT
if (setuid(verify->uid) < 0) {
LogError ("setuid %d (user \"%s\") failed, errno=%d\n",
verify->uid, name, errno);
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/xdm-1.1.4/xdm.man.cpp new/xdm-1.1.5/xdm.man.cpp
--- old/xdm-1.1.4/xdm.man.cpp 2007-02-02 02:00:51.000000000 +0100
+++ new/xdm-1.1.5/xdm.man.cpp 2007-06-16 04:26:45.000000000 +0200
@@ -196,7 +196,7 @@
.IP "\fB\-resources\fP \fIresource_file\fP"
Specifies the value for the \fBDisplayManager*resources\fP resource. This file
is loaded using
-.I xrdb
+.IR xrdb (__appmansuffix__)
to specify configuration parameters for the
authentication widget.
.IP "\fB\-server\fP \fIserver_entry\fP"
@@ -931,19 +931,47 @@
.fi
.SH "AUTHENTICATION WIDGET"
-The authentication widget reads a name/password pair
-from the keyboard. Nearly every imaginable
+The authentication widget prompts the user for the username, password, and/or
+other required authentication data from the keyboard. Nearly every imaginable
parameter can be controlled with a resource. Resources for this widget
should be put into the file named by
\fBDisplayManager.\fP\fIDISPLAY\fP\fB.resources\fP. All of these have reasonable
default values, so it is not necessary to specify any of them.
+.PP
+The resource file is loaded with
+.IR xrdb (__appmansuffix__)
+so it may use the substitutions defined by that program such as CLIENTHOST
+for the client hostname in the login message, or C pre-processor #ifdef
+statements to produce different displays depending on color depth or other
+variables.
+.PP
+.I Xdm
+can be compiled with support for the
+.IR Xft (__libmansuffix__)
+library for font rendering. If this support is present, font faces are
+specified using the resources with names ending in "face" in the
+fontconfig face format described in the
+.I Font Names
+section of
+.IR fonts.conf (__filemansuffix__).
+If not, then fonts are specified using the resources with names ending in
+"font" in the traditional
+.I X Logical Font Description
+format described in the
+.I Font Names
+section of
+.IR X (__miscmansuffix__).
.IP "\fBxlogin.Login.width, xlogin.Login.height, xlogin.Login.x, xlogin.Login.y\fP"
The geometry of the Login widget is normally computed automatically. If you
wish to position it elsewhere, specify each of these resources.
.IP "\fBxlogin.Login.foreground\fP"
-The color used to display the typed-in user name.
+The color used to display the input typed by the user.
+.IP "\fBxlogin.Login.face\fP"
+The face used to display the input typed by the user when built with Xft
+support. The default is ``Serif-18''.
.IP "\fBxlogin.Login.font\fP"
-The font used to display the typed-in user name.
+The font used to display the input typed by the user when not built with Xft
+support.
.IP "\fBxlogin.Login.greeting\fP"
A string which identifies this window.
The default is ``X Window System.''
@@ -951,8 +979,11 @@
When X authorization is requested in the configuration file for this
display and none is in use, this greeting replaces the standard
greeting. The default is ``This is an unsecure session''
+.IP "\fBxlogin.Login.greetFace\fP"
+The face used to display the greeting when built with Xft support.
+The default is ``Serif-24:italic''.
.IP "\fBxlogin.Login.greetFont\fP"
-The font used to display the greeting.
+The font used to display the greeting when not built with Xft support.
.IP "\fBxlogin.Login.greetColor\fP"
The color used to display the greeting.
.IP "\fBxlogin.Login.namePrompt\fP"
@@ -962,22 +993,62 @@
the end of the prompt (usually a nice thing), add spaces escaped with
backslashes. The default is ``Login: ''
.IP "\fBxlogin.Login.passwdPrompt\fP"
-The string displayed to prompt for a password.
+The string displayed to prompt for a password, when not using an authentication
+system such as PAM that provides its own prompts.
The default is ``Password: ''
+.IP "\fBxlogin.Login.promptFace\fP"
+The face used to display prompts when built with Xft support.
+The default is ``Serif-18:bold''.
.IP "\fBxlogin.Login.promptFont\fP"
-The font used to display both prompts.
+The font used to display prompts when not built with Xft support.
.IP "\fBxlogin.Login.promptColor\fP"
-The color used to display both prompts.
+The color used to display prompts.
+.IP "\fBxlogin.Login.changePasswdMessage\fP"
+A message which is displayed when the users password has expired.
+The default is ``Password Change Required''
.IP "\fBxlogin.Login.fail\fP"
-A message which is displayed when the authentication fails.
+A message which is displayed when the authentication fails, when not using an
+authentication system such as PAM that provides its own prompts.
The default is ``Login incorrect''
+.IP "\fBxlogin.Login.failFace\fP"
+The face used to display the failure message when built with Xft support.
+The default is ``Serif-18:bold''.
.IP "\fBxlogin.Login.failFont\fP"
-The font used to display the failure message.
+The font used to display the failure message when not built with Xft support.
.IP "\fBxlogin.Login.failColor\fP"
The color used to display the failure message.
.IP "\fBxlogin.Login.failTimeout\fP"
The number of seconds that the failure message is displayed.
-The default is 30.
+The default is 10.
+.IP "\fBxlogin.Login.logoFileName\fP"
+Name of an XPM format pixmap to display in the greeter window, if built with
+XPM support. The default is no pixmap.
+.IP "\fBxlogin.Login.logoPadding\fP"
+Number of pixels of space between the logo pixmap and other elements of the
+greeter window, if the pixmap is displayed.
+The default is 5.
+.IP "\fBxlogin.Login.useShape\fP"
+If set to ``true'', when built with XPM support, attempt to use the
+X Non-Rectangular Window Shape Extension to set the window shape.
+The default is ``true''.
+.IP "\fBxlogin.Login.hiColor\fP, \fBxlogin.Login.shdColor\fP"
+Raised appearance bezels may be drawn around
+the greeter frame and text input boxes by setting these resources. hiColor
+is the highlight color, used on the top and left sides of the frame, and the
+bottom and right sides of text input areas. shdColor is the shadow color,
+used on the bottom and right sides of the frame, and the top and left sides
+of text input areas.
+The default for both is the foreground color, providing a flat appearance.
+.IP "\fBxlogin.Login.frameWidth\fP"
+frameWidth is the width in pixels of the area
+around the greeter frame drawn in hiColor and shdColor.
+.IP "\fBxlogin.Login.innerFramesWidth\fP"
+innerFramesWidth is the width in pixels of the
+area around text input areas drawn in hiColor and shdColor.
+.IP "\fBxlogin.Login.sepWidth\fP"
+sepWidth is the width in pixels of the
+bezeled line between the greeting and input areas
+drawn in hiColor and shdColor.
.IP "\fBxlogin.Login.allowRootLogin\fP"
If set to ``false'', don't allow root (and any other user with uid = 0) to
log in directly.
@@ -1368,13 +1439,15 @@
Kerberos credentials cache
.SH "SEE ALSO"
.IR X (__miscmansuffix__),
-.IR xinit (1),
-.IR xauth (1),
+.IR xinit (__appmansuffix__),
+.IR xauth (__appmansuffix__),
+.IR xrdb (__appmansuffix__),
.IR Xsecurity (__miscmansuffix__),
-.IR sessreg (1),
-.IR Xserver (1),
-.\" .IR chooser (1), \" except that there isn't a manual for it yet
-.\" .IR xdmshell (1), \" except that there isn't a manual for it yet
+.IR sessreg (__appmansuffix__),
+.IR Xserver (__appmansuffix__),
+.\" .IR chooser (__appmansuffix__), \" except that there isn't a manual for it yet
+.\" .IR xdmshell (__appmansuffix__), \" except that there isn't a manual for it yet
+.IR fonts.conf (__filemansuffix__).
.br
.I "X Display Manager Control Protocol"
.SH AUTHOR
++++++ xman-X11R7.1-1.0.2.tar.bz2 -> xman-1.0.3.tar.bz2 ++++++
++++ 9213 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/xman-X11R7.1-1.0.2/compile new/xman-1.0.3/compile
--- old/xman-X11R7.1-1.0.2/compile 2006-05-21 03:47:44.000000000 +0200
+++ new/xman-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
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/xman-X11R7.1-1.0.2/config.h.in new/xman-1.0.3/config.h.in
--- old/xman-X11R7.1-1.0.2/config.h.in 2006-05-21 03:47:42.000000000 +0200
+++ new/xman-1.0.3/config.h.in 2007-08-10 16:18:55.000000000 +0200
@@ -39,6 +39,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Default system man page search path (default: none) */
#undef SYSMANPATH
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/xman-X11R7.1-1.0.2/configure.ac new/xman-1.0.3/configure.ac
--- old/xman-X11R7.1-1.0.2/configure.ac 2006-04-02 03:13:58.000000000 +0200
+++ new/xman-1.0.3/configure.ac 2007-08-10 16:18:24.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xman,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xman)
+AC_INIT(xman,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xman)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
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/xman-X11R7.1-1.0.2/main.c new/xman-1.0.3/main.c
--- old/xman-X11R7.1-1.0.2/main.c 2006-01-06 23:39:24.000000000 +0100
+++ new/xman-1.0.3/main.c 2007-08-10 16:14:12.000000000 +0200
@@ -1,5 +1,5 @@
/* $XConsortium: main.c,v 1.23 94/04/17 20:43:55 rws Exp $ */
-/* $XdotOrg: app/xman/main.c,v 1.4 2006/01/06 22:39:24 alanc Exp $ */
+/* $XdotOrg: $ */
/*
Copyright (c) 1987, 1988 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/xman-X11R7.1-1.0.2/man.c new/xman-1.0.3/man.c
--- old/xman-X11R7.1-1.0.2/man.c 2005-11-08 07:33:33.000000000 +0100
+++ new/xman-1.0.3/man.c 2007-08-10 16:14:12.000000000 +0200
@@ -1,5 +1,5 @@
/* $XConsortium: man.c,v 1.30 94/04/17 20:43:56 rws Exp $ */
-/* $XdotOrg: app/xman/man.c,v 1.4 2005/11/08 06:33:33 jkj Exp $ */
+/* $XdotOrg: $ */
/*
Copyright (c) 1987, 1988 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/xman-X11R7.1-1.0.2/man.h new/xman-1.0.3/man.h
--- old/xman-X11R7.1-1.0.2/man.h 2004-09-02 10:40:33.000000000 +0200
+++ new/xman-1.0.3/man.h 2007-08-10 16:14:12.000000000 +0200
@@ -1,5 +1,5 @@
/* $XConsortium: man.h,v 1.31 94/12/16 21:36:53 gildea Exp $ */
-/* $XdotOrg: app/xman/man.h,v 1.8 2004/09/02 08:40:33 kem Exp $ */
+/* $XdotOrg: xc/programs/xman/man.h,v 1.6 2004/07/29 00:40:35 gisburn Exp $ */
/*
Copyright (c) 1987, 1988 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/xman-X11R7.1-1.0.2/misc.c new/xman-1.0.3/misc.c
--- old/xman-X11R7.1-1.0.2/misc.c 2005-11-08 07:33:33.000000000 +0100
+++ new/xman-1.0.3/misc.c 2007-08-10 16:14:12.000000000 +0200
@@ -1,5 +1,5 @@
/* $XConsortium: misc.c,v 1.31 94/12/16 21:36:53 gildea Exp $ */
-/* $XdotOrg: app/xman/misc.c,v 1.8 2005/11/08 06:33:33 jkj Exp $ */
+/* $XdotOrg: xc/programs/xman/misc.c,v 1.6 2004/09/02 08:40:33 kem Exp $ */
/*
Copyright (c) 1987, 1988 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/xman-X11R7.1-1.0.2/missing new/xman-1.0.3/missing
--- old/xman-X11R7.1-1.0.2/missing 2006-05-21 03:47:44.000000000 +0200
+++ new/xman-1.0.3/missing 2007-08-10 16:17:11.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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/xman-X11R7.1-1.0.2/vendor.c new/xman-1.0.3/vendor.c
--- old/xman-X11R7.1-1.0.2/vendor.c 2005-11-08 07:33:33.000000000 +0100
+++ new/xman-1.0.3/vendor.c 2007-08-10 16:14:12.000000000 +0200
@@ -40,7 +40,7 @@
char * suffix;
} SectionNameRec;
-#if defined(SYSV) || defined(__osf__) || defined(SVR4) && !defined(sun)
+#if (defined(SYSV) || defined(__osf__) || defined(SVR4)) && !defined(sun)
static SectionNameRec SectionNames[] = {
{"(1) User Commands", "1"},
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/xman-X11R7.1-1.0.2/vendor.h new/xman-1.0.3/vendor.h
--- old/xman-X11R7.1-1.0.2/vendor.h 2005-11-08 07:33:33.000000000 +0100
+++ new/xman-1.0.3/vendor.h 2007-08-10 16:14:12.000000000 +0200
@@ -1,5 +1,5 @@
/* $XConsortium: vendor.h,v 1.12 94/04/17 20:44:00 rws Exp $ */
-/* $XdotOrg: app/xman/vendor.h,v 1.7 2005/11/08 06:33:33 jkj Exp $ */
+/* $XdotOrg: xc/programs/xman/vendor.h,v 1.4 2004/10/18 14:21:47 eich Exp $ */
/*
Copyright (c) 1991 X Consortium
@@ -59,7 +59,7 @@
# define SEARCHDIR MAN
#endif
-#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || (defined(BSD) && (BSD >= 199103)) || defined(linux) )
+#if ( defined(sgi) || (defined(i386) && (defined(SYSV) || defined(SVR4)) && !defined(sun)) || (defined(BSD) && (BSD >= 199103)) || defined(linux) )
# define SEARCHOTHER CAT
#endif
@@ -83,7 +83,7 @@
# define SYSMANPATH "/usr/share/man"
#elif defined(hcx)
# define SYSMANPATH "/usr/catman/local_man:/usr/catman/u_man:/usr/catman/a_man:/usr/catman/p_man:/usr/catman/ada_man"
-#elif defined(SYSV) && defined(i386) && !defined(__SCO__)
+#elif defined(SYSV) && defined(i386) && !defined(__SCO__) && !defined(sun)
# define SYSMANPATH "/usr/catman/u_man:/usr/catman/p_man"
#elif defined(sgi)
# define SYSMANPATH "/usr/catman/a_man:/usr/catman/g_man:/usr/catman/p_man:/usr/catman/u_man:/usr/man/p_man:/usr/man/u_man:/usr/man"
@@ -101,7 +101,7 @@
#if defined( macII ) || defined( hcx ) || \
(defined(SYSV) && defined(i386) && !defined(ISC) && \
- !defined(__UNIXWARE__) && !defined(__SCO__)) || defined(sgi)
+ !defined(__UNIXWARE__) && !defined(__SCO__) && !defined(sun)) || defined(sgi)
# define COMPRESSION_EXTENSION "z"
# define UNCOMPRESS_FORMAT "pcat %s > %s"
# define NO_COMPRESS /* mac can't handle using pack as a filter and
@@ -217,7 +217,7 @@
* "man" directories.
*/
#if (defined(macII) || defined(CRAY) || defined(hcx) || \
- (defined(SYSV) && defined(i386))) && !defined(SCO)
+ (defined(SYSV) && defined(i386))) && !defined(SCO) && !defined(sun)
# define CAT MAN
#elif defined(SCO)
# define CAT "cat."
++++++ xprop-1.0.2.tar.bz2 -> xprop-1.0.3.tar.bz2 ++++++
++++ 7591 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/xprop-1.0.2/autogen.sh new/xprop-1.0.3/autogen.sh
--- old/xprop-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/xprop-1.0.3/autogen.sh 2006-07-11 04:54:02.000000000 +0200
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
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/xprop-1.0.2/ChangeLog new/xprop-1.0.3/ChangeLog
--- old/xprop-1.0.2/ChangeLog 2006-07-27 05:12:02.000000000 +0200
+++ new/xprop-1.0.3/ChangeLog 2007-08-10 23:53:05.000000000 +0200
@@ -1,31 +1,277 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 9ccda86dae06375750685977a81f4fb1cabf3d00
+Author: Alan Coopersmith
+Date: Fri Aug 10 14:52:27 2007 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.3
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4f7bc8ecad63db6b7557b5556ac6f604e84eb55e
+Author: Jay Hobson
+Date: Wed Aug 8 13:38:33 2001 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Sun Bug 4474581: xprop fails in Japanese locale
+
+ CJK locales need a much longer string as they include
+ many \xXX entries which expand into /XXXXXXXX entries.
+ Increased the buffer from 10000 to 500000 bytes.
+ Make sure buffer pointer doesn't go negative in _put_char.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 23e375f3842b433b0af7f150135537f7381208ae
+Author: Alan Coopersmith
+Date: Fri Aug 10 14:17:51 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Simplify printing of usage message
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit fc788dc35532ebff44b5828f686b42e0deeec52c
+Author: Alan Coopersmith
+Date: Fri Aug 10 13:40:17 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Convert old #ifdefs for HAS_WTYPE_H & HAS_WCHAR_H to autoconf checks
-2005-11-20 Alan Coopersmith
+commit b9860eeb000018a83233cec14ff0db8687a146b5
+Author: Alan Coopersmith
+Date: Fri Aug 10 13:33:17 2007 -0700
- * configure.ac:
- Change dependency from xmu to xmuu since the full xmu
- (with all its baggage like Xt) is not needed here.
+ Replace sprintf's with snprintf's
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 64326bae4e9b9c05b8781403ee27af95065eb2fb
+Author: Alan Coopersmith
+Date: Fri Aug 10 12:08:57 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ Coverity #905: Handle_Prop_Requests returned without freeing storage "thunks"
+commit 866ceb3a671a9ab93b3ecbdf3231902ab2251ce3
+Author: Alan Coopersmith
+Date: Fri Aug 10 11:56:41 2007 -0700
+
+ ANSIfy function declarations in dsimple.c
+
+commit 5424a5c064d96b33a4acdf951734cd3a493a7ea3
+Author: Alan Coopersmith
+Date: Fri Aug 10 11:52:39 2007 -0700
+
+ Purge unused code from dsimple.c
+
+ dsimple.c was originally shared source among several X apps.
+ Since modularization gave each app it's own copy, much of the code is
+ no longer needed in each app.
+
+commit 2d7dc57ae1d5e0af6e6ecb70764c512f6d518d6a
+Author: Alan Coopersmith
+Date: Fri Aug 10 11:43:04 2007 -0700
+
+ Add hooks to check sources with lint/sparse/etc.
+
+commit 7b3c0c95b9bb223ae779b8bf0c7d78967e0dcd9e
+Author: Alan Coopersmith
+Date: Fri Aug 10 11:35:27 2007 -0700
+
+ Change xprop_CFLAGS to AM_CFLAGS to clear automake-1.10 warning
+
+ Makefile.am:27: compiling `dsimple.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit c843fa3f4e65f2e1e133633b445f8693b1cc617c
+Author: Alan Coopersmith
+Date: Fri Aug 10 11:34:23 2007 -0700
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 20955b2e662bb659533287d86fcd4d1cf75d3551
+Author: Alan Coopersmith
+Date: Thu May 24 11:15:36 2007 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 91ca94a1d9e7eed7449c4243d84433180fc04566
+Author: Alan Coopersmith
+Date: Thu May 24 11:12:17 2007 -0700
+
+ X.Org bug #10616: Add all the X info commands to See Also
+
+ X.Org Bugzilla #10616: https://bugs.freedesktop.org/show_bug.cgi?id=10616
+ Reported upstream from
+ Debian bug #350313 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350313
+
+commit 4e8c0ec7c0b6b6602ae402313d8314f7653046ba
+Author: Daniel Stone
+Date: Tue Aug 29 20:03:33 2006 +0300
+
+ bump to 1.0.2
+
+commit b8e4793e6bc939ee7b558f7eba7e4a485ed3bc7f
+Author: Daniel Stone
+Date: Thu Jul 27 09:11:10 2006 +0300
+
+ remove misleading comment
+
+commit 47514347db811d002e7f3ca05d390565bc3ee5e5
+Author: Branden Robinson
+Date: Thu Jul 27 06:14:54 2006 +0300
+
+ handle actual_format_return == 0 (#7647)
+ Handle buggy servers which set actual_format_return == 0, instead of aborting.
+
+commit 56afcb5553455db8486bfb0e65e74506fc681940
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:53 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 851cad34f8905d5111c7b5e30222efba8d630499
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:46 2005 +0000
+
+ Stub COPYING files
+
+commit 587c42a9bf142d16ddb349ab0afada5cbffc42c7
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:10 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 299da02da003a5804e58cf5e613aa1aa3321b3cb
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:25 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 04bfd06dfa055d0143e2a98da1b06f84f02dca6d
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:27 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 47e6c291ac25c8d83e7c70bc6bc4424d96cc8005
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:46 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 3ab40d98cb38bd4f86bf93324af33fc995f9d3fd
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:07 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 454179bc4b51b24975e283c6ba1cd53d68d5e991
+Author: Alan Coopersmith
+Date: Mon Nov 21 03:14:16 2005 +0000
+
+ Change dependency from xmu to xmuu since the full xmu (with all its baggage
+ like Xt) is not needed here.
+
+commit 62ca400ec36c59d941f85ce998cd8b694e121d26
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:55 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 7c240b0e4c3499046f2ba48b3aeefac358a0ded8
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:57 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit a7863c7b5d50c2f1e771501b300855b754799b7b
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:24 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 80aee62a58d653e62726f3cffd632bf91bc170a8
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:47 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 3be3e6aaca45e0084eeb2634508d6644b1d5ce91
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:32 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 54f2394a17da3a991d20d35e072e7fb2ec8df81c
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:37 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 4f970b38bdd2199adcd3510a84db12bcbf94c685
+Author: Adam Jackson
+Date: Wed Jul 20 19:32:03 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit 721114f44cbd225a8fcd3655d4ded2dc8cc8837f
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 8 20:58:05 2005 +0000
+
+ Add build system for xprop
+
+commit aa117205949e38efa5befcef3b206a8ea582109f
+Author: Roland Mainz
+Date: Wed Oct 6 19:29:59 2004 +0000
+
+ Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1518 - Add filter
+ support to "xlsfonts" that it can filter builtin-, glyph- and/or other
+ kinds of printer fonts (controlled by the xp-listfonts-modes attribute
+ as described in the CDE DtPrint and Xprint specifications).
+
+commit d079bb69ea920d386a856d8cdd6b89a0f5632b16
+Author: Egbert Eich
+Date: Fri Apr 23 19:55:03 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit f5a1731210c83736e2b9f9a044e2f94947177229
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:42 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 50acd849cb081dd9c458f1429a3b8108a26af050
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:15 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit f708da3feea11c5b859dc7652c8875f67065692e
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 49eb94d8560ca7609cc9c44f24a9a875ea3a1aca
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 077b108056e58dbc7a46b447c4b4c05de9f30d85
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 28c8159745754e1bd577797c2ef0d0bebded8299
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4cc997bd2d02961b95bff992f6dbfa30138879a9
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:54 2003 +0000
+
+ R6.6 is the Xorg base-line
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/xprop-1.0.2/compile new/xprop-1.0.3/compile
--- old/xprop-1.0.2/compile 2006-08-29 18:57:08.000000000 +0200
+++ new/xprop-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
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/xprop-1.0.2/config.h.in new/xprop-1.0.3/config.h.in
--- old/xprop-1.0.2/config.h.in 2006-08-29 19:04:02.000000000 +0200
+++ new/xprop-1.0.3/config.h.in 2007-08-10 23:52:57.000000000 +0200
@@ -1,5 +1,38 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_WCHAR_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_WCTYPE_H
+
/* Name of package */
#undef PACKAGE
@@ -18,5 +51,17 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
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/xprop-1.0.2/configure.ac new/xprop-1.0.3/configure.ac
--- old/xprop-1.0.2/configure.ac 2006-08-29 19:03:01.000000000 +0200
+++ new/xprop-1.0.3/configure.ac 2007-08-10 23:51:58.000000000 +0200
@@ -22,20 +22,27 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xprop,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xprop)
+AC_INIT(xprop,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xprop)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
AC_PROG_CC
AC_PROG_INSTALL
+AC_CHECK_HEADERS_ONCE([wchar.h wctype.h])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XPROP, xmuu x11)
AC_SUBST(XPROP_CFLAGS)
AC_SUBST(XPROP_LIBS)
+XORG_WITH_LINT
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
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/xprop-1.0.2/dsimple.c new/xprop-1.0.3/dsimple.c
--- old/xprop-1.0.2/dsimple.c 2006-07-27 05:12:02.000000000 +0200
+++ new/xprop-1.0.3/dsimple.c 2007-08-10 20:55:27.000000000 +0200
@@ -41,9 +41,6 @@
* Written by Mark Lillibridge. Last updated 7/1/87
*/
-#ifdef BUILD_PRINTSUPPORT
-#include
-#endif /* BUILD_PRINTSUPPORT */
#include "dsimple.h"
/*
@@ -61,18 +58,11 @@
char *program_name = "unknown_program";
Display *dpy = NULL;
int screen = 0;
-Bool printer_output = False; /* Video or printer output ? */
-#ifdef BUILD_PRINTSUPPORT
-XPContext pcontext = None;
-#endif /* BUILD_PRINTSUPPORT */
-
-static void _bitmap_error(int, char *);
/*
* Malloc: like malloc but handles out of memory using Fatal_Error.
*/
-char *Malloc(size)
- unsigned size;
+char *Malloc(unsigned size)
{
char *data;
@@ -84,31 +74,12 @@
/*
- * Realloc: like Malloc except for realloc, handles NULL using Malloc.
- */
-char *Realloc(ptr, size)
- char *ptr;
- int size;
-{
- char *new_ptr;
-
- if (!ptr)
- return(Malloc(size));
-
- if (!(new_ptr = realloc(ptr, size)))
- Fatal_Error("Out of memory!");
-
- return(new_ptr);
-}
-
-
-/*
* Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
* If found, remove it from command line. Don't go past a lone -.
*/
-char *Get_Display_Name(pargc, argv)
- int *pargc; /* MODIFIED */
- char **argv; /* MODIFIED */
+char *Get_Display_Name(
+ int *pargc, /* MODIFIED */
+ char **argv) /* MODIFIED */
{
int argc = *pargc;
char **pargv = argv+1;
@@ -138,49 +109,12 @@
}
-#ifdef BUILD_PRINTSUPPORT
-/*
- * Get_Printer_Name (argc, argv) Look for -printer, -p,
- * If found, remove it from command line. Don't go past a lone -.
- */
-char *Get_Printer_Name(pargc, argv)
- int *pargc; /* MODIFIED */
- char **argv; /* MODIFIED */
-{
- int argc = *pargc;
- char **pargv = argv+1;
- char *printername = NULL;
- int i;
-
- for (i = 1; i < argc; i++) {
- char *arg = argv[i];
-
- if (!strcmp (arg, "-printer") || !strcmp (arg, "-p")) {
- if (++i >= argc) usage ();
-
- printername = argv[i];
- *pargc -= 2;
- continue;
- }
- if (!strcmp(arg,"-")) {
- while (i .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
SED = sed
@@ -63,3 +71,11 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(xprop_SOURCES)
+endif LINT
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/xprop-1.0.2/missing new/xprop-1.0.3/missing
--- old/xprop-1.0.2/missing 2006-08-29 18:57:07.000000000 +0200
+++ new/xprop-1.0.3/missing 2007-08-10 23:52:58.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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/xprop-1.0.2/xprop.c new/xprop-1.0.3/xprop.c
--- old/xprop-1.0.2/xprop.c 2006-08-29 19:03:25.000000000 +0200
+++ new/xprop-1.0.3/xprop.c 2007-08-10 23:35:12.000000000 +0200
@@ -29,6 +29,7 @@
*/
/* $XFree86: xc/programs/xprop/xprop.c,v 1.15 2003/09/24 02:43:38 dawes Exp $ */
+#include "config.h"
#include
#include
@@ -37,15 +38,15 @@
#include
#include
#include
-#ifdef HAS_WCHAR_H
+#ifdef HAVE_WCHAR_H
#include
#endif
-#ifdef HAS_WCTYPE_H
+#ifdef HAVE_WCTYPE_H
#include
#endif
#include
-#ifndef HAS_WCTYPE_H
+#ifndef HAVE_WCTYPE_H
#define iswprint(x) isprint(x)
#endif
@@ -54,7 +55,7 @@
#include "dsimple.h"
-#define MAXSTR 10000
+#define MAXSTR 500000
#define MAXELEMENTS 64
#ifndef min
@@ -583,21 +584,21 @@
static const char *
Format_Hex (long wrd)
{
- sprintf(_formatting_buffer2, "0x%lx", wrd);
+ snprintf(_formatting_buffer2, sizeof(_formatting_buffer2), "0x%lx", wrd);
return _formatting_buffer2;
}
static const char *
Format_Unsigned (long wrd)
{
- sprintf(_formatting_buffer2, "%lu", wrd);
+ snprintf(_formatting_buffer2, sizeof(_formatting_buffer2), "%lu", wrd);
return _formatting_buffer2;
}
static const char *
Format_Signed (long wrd)
{
- sprintf(_formatting_buffer2, "%ld", wrd);
+ snprintf(_formatting_buffer2, sizeof(_formatting_buffer2), "%ld", wrd);
return _formatting_buffer2;
}
@@ -622,7 +623,8 @@
name = XGetAtomName(dpy, atom);
XSetErrorHandler(handler);
if (! name)
- sprintf(_formatting_buffer, "undefined atom # 0x%lx", atom);
+ snprintf(_formatting_buffer, sizeof(_formatting_buffer),
+ "undefined atom # 0x%lx", atom);
else {
int namelen = strlen(name);
if (namelen > MAXSTR) namelen = MAXSTR;
@@ -669,11 +671,12 @@
static void
_put_char (char c)
{
- if (--_buf_len < 0) {
+ if (_buf_len <= 0) {
_buf_ptr[0] = '\0';
return;
}
_buf_ptr++[0] = c;
+ _buf_len--;
}
static void
@@ -696,7 +699,7 @@
default:
if (!c_isprint(c)) {
_put_char('\\');
- sprintf(_buf_ptr, "%03o", (unsigned char) c);
+ snprintf(_buf_ptr, _buf_len, "%03o", (unsigned char) c);
_buf_ptr += 3;
_buf_len -= 3;
} else
@@ -770,7 +773,7 @@
len -= n;
} else {
_put_char('\\');
- sprintf(_buf_ptr, "%03o", (unsigned char) *string);
+ snprintf(_buf_ptr, _buf_len, "%03o", (unsigned char) *string);
_buf_ptr += 3;
_buf_len -= 3;
string++;
@@ -779,7 +782,7 @@
}
count--;
if (count > 0) {
- sprintf(_buf_ptr, "\\000");
+ snprintf(_buf_ptr, _buf_len, "\\000");
_buf_ptr += 4;
_buf_len -= 4;
}
@@ -1287,14 +1290,14 @@
char *format, *dformat, *prop;
thunk *thunks, t;
- thunks = Create_Thunk_List();
-
/* if no prop referenced, by default list all properties for given window */
if (!argc) {
Show_All_Props();
return NULL;
}
+ thunks = Create_Thunk_List();
+
while (argc > 0) {
format = NULL;
dformat = NULL;
@@ -1513,33 +1516,29 @@
void
usage (void)
{
- char **cpp;
- static char *help_message[] = {
-"where options include:",
-" -grammar print out full grammar for command line",
-" -display host:dpy the X server to contact",
-" -id id resource id of window to examine",
-" -name name name of window to examine",
-" -font name name of font to examine",
-" -remove propname remove a property",
-" -set propname value set a property to a given value",
-" -root examine the root window",
-" -len n display at most n bytes of any property",
-" -notype do not display the type field",
-" -fs filename where to look for formats for properties",
-" -frame don't ignore window manager frames",
-" -f propname format [dformat] formats to use for property of given name",
-" -spy examine window properties forever",
-NULL};
+ static const char help_message[] =
+"where options include:\n"
+" -grammar print out full grammar for command line\n"
+" -display host:dpy the X server to contact\n"
+" -id id resource id of window to examine\n"
+" -name name name of window to examine\n"
+" -font name name of font to examine\n"
+" -remove propname remove a property\n"
+" -set propname value set a property to a given value\n"
+" -root examine the root window\n"
+" -len n display at most n bytes of any property\n"
+" -notype do not display the type field\n"
+" -fs filename where to look for formats for properties\n"
+" -frame don't ignore window manager frames\n"
+" -f propname format [dformat] formats to use for property of given name\n"
+" -spy examine window properties forever\n";
+
fflush (stdout);
fprintf (stderr,
"usage: %s [-options ...] [[format [dformat]] atom] ...\n\n",
program_name);
- for (cpp = help_message; *cpp; cpp++) {
- fprintf (stderr, "%s\n", *cpp);
- }
- fprintf (stderr, "\n");
+ fprintf (stderr, "%s\n", help_message);
exit (1);
}
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/xprop-1.0.2/xprop.man new/xprop-1.0.3/xprop.man
--- old/xprop-1.0.2/xprop.man 2006-07-27 05:12:02.000000000 +0200
+++ new/xprop-1.0.3/xprop.man 2007-05-24 20:09:31.000000000 +0200
@@ -339,6 +339,7 @@
Specifies the name of a file from which additional formats are to be obtained.
.PP
.SH SEE ALSO
-X(__miscmansuffix__), xwininfo(1)
+X(__miscmansuffix__), xdpyinfo(__appmansuffix__), xwininfo(__appmansuffix__),
+xdriinfo(__appmansuffix__), glxinfo(__appmansuffix__), xvinfo(__appmansuffix__)
.SH AUTHOR
Mark Lillibridge, MIT Project Athena
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org