Hello community,
here is the log from the commit of package xorg-x11
checked in at Fri Nov 10 01:54:35 CET 2006.
--------
--- xorg-x11/xorg-x11.changes 2006-11-06 22:50:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-11-09 20:58:43.000000000 +0100
@@ -1,0 +2,46 @@
+Thu Nov 9 20:57:16 CET 2006 - sndirsch@suse.de
+
+- get the system default locale settings in Xsession script when
+ $LANG is still not set; important for xdm (Bug #216518)
+
+-------------------------------------------------------------------
+Thu Nov 9 15:09:50 CET 2006 - sndirsch@suse.de
+
+- /etc/X11/xdm/SuSEconfig.xdm:
+ * only create symlink to Xserver if possible (Bug #219373)
+
+-------------------------------------------------------------------
+Thu Nov 9 09:38:32 CET 2006 - sndirsch@suse.de
+
+- updated sessreg to release 1.0.1 (X.Org 7.2 RC2)
+ * Manpage cleanups & fix to make autoconf utmpx check work on
+ Solaris
+
+-------------------------------------------------------------------
+Wed Nov 8 22:41:20 CET 2006 - sndirsch@suse.de
+
+- updated mkfontscale to release 1.0.3 (X.Org 7.2 RC2)
+ * Fix typos in manual page, update author's address, update COPYING.
+ * Allow SemiBold weight for Type 1 fonts.
+- fix xdm PAM login on SUSE 10.1
+
+-------------------------------------------------------------------
+Wed Nov 8 17:11:02 CET 2006 - sndirsch@suse.de
+
+- updated luit to release 1.0.2 (X.Org 7.2 RC2)
+ * Updated COPYING.
+ * Added random IBM codepages to the encodings vector.
+ * Set up parent pty before forking (bug 8490).
+- luit update obsoletes p_bugzilla-117193-luit-sometimes-hangs.diff
+- updated xkbcomp to release 1.0.3 (X.Org 7.2 RC2)
+ * parser: accept negative numbers in geometry co-ordinates
+ (bug #8763)
+ * compat: avoid use of uninitialised variable (bug #8846)
+
+-------------------------------------------------------------------
+Tue Nov 7 07:42:38 CET 2006 - sndirsch@suse.de
+
+- "Requires: dbus-1-x11" --> "Recommends: dbus-1-x11" (Bug #218227,
+ comment #10)
+
+-------------------------------------------------------------------
Old:
----
luit-X11R7.0-1.0.1.tar.bz2
mkfontscale-1.0.2.tar.bz2
sessreg-X11R7.0-1.0.0.tar.bz2
xkbcomp-X11R7.1-1.0.2.tar.bz2
New:
----
luit-1.0.2.tar.bz2
mkfontscale-1.0.3.tar.bz2
sessreg-1.0.1.tar.bz2
sessreg.diff
xkbcomp-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.04sHBc/_old 2006-11-10 01:54:14.000000000 +0100
+++ /var/tmp/diff_new_pack.04sHBc/_new 2006-11-10 01:54:14.000000000 +0100
@@ -14,11 +14,12 @@
BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 13
+Release: 15
License: X11/MIT, Other License(s), see package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
-Requires: cpp dbus-1-x11
+Requires: cpp
+Recommends: dbus-1-x11
Provides: XFree86
Summary: X.Org core and sample applications
Source0: appres-X11R7.0-1.0.0.tar.bz2
@@ -33,16 +34,16 @@
Source9: ico-X11R7.0-1.0.1.tar.bz2
Source10: lbxproxy-X11R7.0-1.0.1.tar.bz2
Source11: listres-X11R7.0-1.0.1.tar.bz2
-Source12: luit-X11R7.0-1.0.1.tar.bz2
+Source12: luit-1.0.2.tar.bz2
Source13: mkcfm-X11R7.0-1.0.1.tar.bz2
Source14: mkfontdir-X11R7.1-1.0.2.tar.bz2
-Source15: mkfontscale-1.0.2.tar.bz2
+Source15: mkfontscale-1.0.3.tar.bz2
Source16: oclock-X11R7.0-1.0.1.tar.bz2
Source17: proxymngr-X11R7.0-1.0.1.tar.bz2
Source18: rgb-X11R7.1-1.0.1.tar.bz2
Source19: rstart-X11R7.1-1.0.2.tar.bz2
Source20: scripts-X11R7.0-1.0.1.tar.bz2
-Source21: sessreg-X11R7.0-1.0.0.tar.bz2
+Source21: sessreg-1.0.1.tar.bz2
Source22: setxkbmap-X11R7.1-1.0.2.tar.bz2
Source23: showfont-X11R7.0-1.0.1.tar.bz2
Source24: smproxy-X11R7.1-1.0.2.tar.bz2
@@ -77,7 +78,7 @@
Source53: xgc-X11R7.0-1.0.1.tar.bz2
Source54: xhost-X11R7.1-1.0.1.tar.bz2
Source55: xinit-1.0.3.tar.bz2
-Source56: xkbcomp-X11R7.1-1.0.2.tar.bz2
+Source56: xkbcomp-1.0.3.tar.bz2
Source57: xkbevd-X11R7.1-1.0.2.tar.bz2
Source58: xkbprint-X11R7.0-1.0.1.tar.bz2
Source59: xkbutils-X11R7.0-1.0.1.tar.bz2
@@ -140,6 +141,7 @@
Patch19: scripts.diff
Patch20: xdm.diff
Patch21: xdm-pam_tty.diff
+Patch22: sessreg.diff
%description
This package contains the X.Org core and sample applications.
@@ -209,9 +211,10 @@
popd
%patch12
%patch13
-pushd luit-*
-%patch14 -p3
-popd
+# seems to be obsolete since luit 1.0.2
+#pushd luit-*
+#%patch14 -p3
+#popd
pushd xrdb-*
%patch15 -p2
popd
@@ -221,6 +224,7 @@
%patch17
patch -d scripts-* -p0 -s < %PATCH19
patch -d xdm-* -p1 -s < %PATCH21
+patch -d sessreg-* -p0 -s < %PATCH22
%build
@@ -235,7 +239,7 @@
case $dir in
mkcfm-*) option="--with-ciddir=/usr/share/fonts/CID" ;;
xdm-*) option="--with-pam --with-xdmconfigdir=/etc/X11/xdm --with-xdmscriptdir=/etc/X11/xdm" ;;
- xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*)
+ xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*)
option=""; autoreconf -fi ;;
*) option="" ;;
esac
@@ -297,6 +301,7 @@
tar xjf $RPM_SOURCE_DIR/xdm.tar.bz2
%if %suse_version <= 1010
rm etc/pam.d/xdm-np
+ sed -i 's/pam_loginuid.so/pam_devperm.so/g' etc/pam.d/xdm
%endif
%ifarch s390 s390x
patch -p0 -s < $RPM_SOURCE_DIR/xdm.diff
@@ -435,6 +440,34 @@
/var/lib/xdm/authdir/
%changelog -n xorg-x11
+* Thu Nov 09 2006 - sndirsch@suse.de
+- get the system default locale settings in Xsession script when
+ $LANG is still not set; important for xdm (Bug #216518)
+* Thu Nov 09 2006 - sndirsch@suse.de
+- /etc/X11/xdm/SuSEconfig.xdm:
+ * only create symlink to Xserver if possible (Bug #219373)
+* Thu Nov 09 2006 - sndirsch@suse.de
+- updated sessreg to release 1.0.1 (X.Org 7.2 RC2)
+ * Manpage cleanups & fix to make autoconf utmpx check work on
+ Solaris
+* Wed Nov 08 2006 - sndirsch@suse.de
+- updated mkfontscale to release 1.0.3 (X.Org 7.2 RC2)
+ * Fix typos in manual page, update author's address, update COPYING.
+ * Allow SemiBold weight for Type 1 fonts.
+- fix xdm PAM login on SUSE 10.1
+* Wed Nov 08 2006 - sndirsch@suse.de
+- updated luit to release 1.0.2 (X.Org 7.2 RC2)
+ * Updated COPYING.
+ * Added random IBM codepages to the encodings vector.
+ * Set up parent pty before forking (bug 8490).
+- luit update obsoletes p_bugzilla-117193-luit-sometimes-hangs.diff
+- updated xkbcomp to release 1.0.3 (X.Org 7.2 RC2)
+ * parser: accept negative numbers in geometry co-ordinates
+ (bug #8763)
+ * compat: avoid use of uninitialised variable (bug #8846)
+* Tue Nov 07 2006 - sndirsch@suse.de
+- "Requires: dbus-1-x11" --> "Recommends: dbus-1-x11" (Bug #218227,
+ comment #10)
* Mon Nov 06 2006 - sndirsch@suse.de
- added Requires: cpp to fix broken look of xdm login screen
- added Requires: dbus-1-x11 (Bug #218227)
++++++ luit-X11R7.0-1.0.1.tar.bz2 -> luit-1.0.2.tar.bz2 ++++++
++++ 12548 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/luit-X11R7.0-1.0.1/COPYING new/luit-1.0.2/COPYING
--- old/luit-X11R7.0-1.0.1/COPYING 2005-12-19 17:22:40.000000000 +0100
+++ new/luit-1.0.2/COPYING 2006-11-08 15:21:35.000000000 +0100
@@ -1,12 +1,20 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2001 by Juliusz Chroboczek
+Copyright (c) 2002 by Tomohiro KUBOTA
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
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/luit-X11R7.0-1.0.1/charset.c new/luit-1.0.2/charset.c
--- old/luit-X11R7.0-1.0.1/charset.c 2004-04-23 21:54:35.000000000 +0200
+++ new/luit-1.0.2/charset.c 2006-11-08 15:21:35.000000000 +0100
@@ -138,6 +138,10 @@
{"CP 1251", T_128, 0, "microsoft-cp1251", 0x80, 0, 0},
{"CP 1250", T_128, 0, "microsoft-cp1250", 0x80, 0, 0},
+ {"CP 437", T_128, 0, "ibm-cp437", 0x80, 0, 0},
+ {"CP 850", T_128, 0, "ibm-cp850", 0x80, 0, 0},
+ {"CP 866", T_128, 0, "ibm-cp866", 0x80, 0, 0},
+
{"Big 5", T_94192, 0, "big5.eten-0", 0x8000, 0, 0},
{0, 0, 0, 0, 0, 0, 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/luit-X11R7.0-1.0.1/compile new/luit-1.0.2/compile
--- old/luit-X11R7.0-1.0.1/compile 2005-12-21 08:21:40.000000000 +0100
+++ new/luit-1.0.2/compile 2006-11-08 15:23:02.000000000 +0100
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+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
@@ -17,83 +18,125 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
+# 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=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+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 "$prog" $args
+ # 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/'`
+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
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ 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
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+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/luit-X11R7.0-1.0.1/configure.ac new/luit-1.0.2/configure.ac
--- old/luit-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:43.000000000 +0100
+++ new/luit-1.0.2/configure.ac 2006-11-08 15:21:57.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(luit,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
+AC_INIT(luit,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
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/luit-X11R7.0-1.0.1/luit.c new/luit-1.0.2/luit.c
--- old/luit-X11R7.0-1.0.1/luit.c 2004-04-23 21:54:35.000000000 +0200
+++ new/luit-1.0.2/luit.c 2006-11-08 15:21:35.000000000 +0100
@@ -434,6 +434,17 @@
return 0;
}
+static void
+sigwinchHandler(int sig)
+{
+ sigwinch_queued = 1;
+}
+
+static void
+sigchldHandler(int sig)
+{
+ sigchld_queued = 1;
+}
static int
condom(int argc, char **argv)
@@ -444,6 +455,7 @@
char *path;
char **child_argv;
int rc;
+ int val;
rc = parseArgs(argc, argv, child_argv0,
&path, &child_argv);
@@ -461,6 +473,29 @@
perror("Couldn't drop priviledges");
exit(1);
}
+#ifdef SIGWINCH
+ installHandler(SIGWINCH, sigwinchHandler);
+#endif
+ installHandler(SIGCHLD, sigchldHandler);
+
+ rc = copyTermios(0, pty);
+ if(rc < 0)
+ FatalError("Couldn't copy terminal settings\n");
+
+ rc = setRawTermios();
+ if(rc < 0)
+ FatalError("Couldn't set terminal to raw\n");
+
+ val = fcntl(0, F_GETFL, 0);
+ if(val >= 0) {
+ fcntl(0, F_SETFL, val | O_NONBLOCK);
+ }
+ val = fcntl(pty, F_GETFL, 0);
+ if(val >= 0) {
+ fcntl(pty, F_SETFL, val | O_NONBLOCK);
+ }
+
+ setWindowSize(0, pty);
pid = fork();
if(pid < 0) {
@@ -470,6 +505,10 @@
if(pid == 0) {
close(pty);
+#ifdef SIGWINCH
+ installHandler(SIGWINCH, SIG_DFL);
+#endif
+ installHandler(SIGCHLD, SIG_DFL);
child(line, path, child_argv);
} else {
free(child_argv);
@@ -490,6 +529,7 @@
close(0);
close(1);
close(2);
+
pgrp = setsid();
if(pgrp < 0) {
kill(getppid(), SIGABRT);
@@ -517,53 +557,17 @@
exit(1);
}
-static void
-sigwinchHandler(int sig) {
- sigwinch_queued = 1;
-}
-
-static void
-sigchldHandler(int sig)
-{
- sigchld_queued = 1;
-}
-
void
parent(int pid, int pty)
{
unsigned char buf[BUFFER_SIZE];
int i;
- int val;
int rc;
if(verbose) {
reportIso2022(outputState);
}
-#ifdef SIGWINCH
- installHandler(SIGWINCH, sigwinchHandler);
-#endif
- installHandler(SIGCHLD, sigchldHandler);
-
- rc = copyTermios(0, pty);
- if(rc < 0)
- FatalError("Couldn't copy terminal settings\n");
-
- rc = setRawTermios();
- if(rc < 0)
- FatalError("Couldn't set terminal to raw\n");
-
- val = fcntl(0, F_GETFL, 0);
- if(val >= 0) {
- fcntl(0, F_SETFL, val | O_NONBLOCK);
- }
- val = fcntl(pty, F_GETFL, 0);
- if(val >= 0) {
- fcntl(pty, F_SETFL, val | O_NONBLOCK);
- }
-
- setWindowSize(0, pty);
-
for(;;) {
rc = waitForInput(0, pty);
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/luit-X11R7.0-1.0.1/missing new/luit-1.0.2/missing
--- old/luit-X11R7.0-1.0.1/missing 2005-12-21 08:21:40.000000000 +0100
+++ new/luit-1.0.2/missing 2006-11-08 15:23:02.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# 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
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# 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
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
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'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ 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
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
++++++ mkfontscale-1.0.2.tar.bz2 -> mkfontscale-1.0.3.tar.bz2 ++++++
++++ 7265 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/mkfontscale-1.0.2/COPYING new/mkfontscale-1.0.3/COPYING
--- old/mkfontscale-1.0.2/COPYING 2006-10-12 00:14:07.000000000 +0200
+++ new/mkfontscale-1.0.3/COPYING 2006-11-08 15:25:29.000000000 +0100
@@ -1,12 +1,19 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2002-2003 by Juliusz Chroboczek
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
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/mkfontscale-1.0.2/configure.ac new/mkfontscale-1.0.3/configure.ac
--- old/mkfontscale-1.0.2/configure.ac 2006-10-13 23:29:03.000000000 +0200
+++ new/mkfontscale-1.0.3/configure.ac 2006-11-08 15:25:47.000000000 +0100
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(mkfontscale, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontscale)
+AC_INIT(mkfontscale, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontscale)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
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/mkfontscale-1.0.2/mkfontscale.c new/mkfontscale-1.0.3/mkfontscale.c
--- old/mkfontscale-1.0.2/mkfontscale.c 2006-10-12 00:14:07.000000000 +0200
+++ new/mkfontscale-1.0.3/mkfontscale.c 2006-11-08 15:25:29.000000000 +0100
@@ -444,6 +444,8 @@
return "semibold";
if(strcmp(weight, "DemiBold") == 0)
return "semibold";
+ if(strcmp(weight, "SemiBold") == 0) /* some TeX fonts apparently do that */
+ return "semibold";
else if(strcmp(weight, "Bold") == 0)
return "bold";
else if(strcmp(weight, "Black") == 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/mkfontscale-1.0.2/mkfontscale.man new/mkfontscale-1.0.3/mkfontscale.man
--- old/mkfontscale-1.0.2/mkfontscale.man 2006-10-12 00:14:07.000000000 +0200
+++ new/mkfontscale-1.0.3/mkfontscale.man 2006-11-08 15:25:29.000000000 +0100
@@ -66,6 +66,7 @@
is set, this flag has the side effect of enabling the reading of
.B fonts.scale
files.
+.TP
.BI \-o " filename"
send program output to
.IR filename ;
@@ -82,7 +83,7 @@
.TP
.BI \-x " suffix"
exclude all files with the specified
-.I suffix
+.IR suffix .
.TP
.BI \-a " encoding"
add
@@ -118,6 +119,8 @@
encoding directories to absolute directories by prepending the current
directory. The positioning of this options is significant, as this
option only applies to subsequent
+.B \-e
+options.
.TP
.B \-n
do not scan for fonts, do not write font directory files. This option
@@ -146,8 +149,8 @@
.SH AUTHOR
The version of
.B mkfontscale
-included in this X.Org Foundataion release
-was originally written by Juliusz Chroboczek for the XFree86
-project. The functionality of this program was inspired by the
+included in this X.Org Foundataion release was originally written by
+Juliusz Chroboczek for the XFree86 project. The
+functionality of this program was inspired by the
.B ttmkfdir
utility by Joerg Pommnitz.
++++++ sessreg-X11R7.0-1.0.0.tar.bz2 -> sessreg-1.0.1.tar.bz2 ++++++
++++ 6996 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/sessreg-X11R7.0-1.0.0/ChangeLog new/sessreg-1.0.1/ChangeLog
--- old/sessreg-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:04.000000000 +0100
+++ new/sessreg-1.0.1/ChangeLog 2006-11-09 00:35:46.000000000 +0100
@@ -1,38 +1,249 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 82fbb553114e8d00b6b3886aee4554dfd178cb01
+Author: Alan Coopersmith
+Date: Wed Nov 8 13:51:50 2006 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Improve formatting of file names in sessreg.man
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 02379845b074cb252c0cb42d18c6cb8effcdc9f5
+Author: Alan Coopersmith
+Date: Wed Nov 8 13:48:05 2006 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Fix builds when $(srcdir) != $(objdir)
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c472f5f9257e6dcb9e82042a99ef028e3390e93e
+Author: Alan Coopersmith
+Date: Tue Nov 7 18:46:11 2006 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit aa27f60ff70230990bd7351bbfda3d38f95afe3b
+Author: Alan Coopersmith
+Date: Tue Nov 7 18:39:58 2006 -0800
- * Makefile.am:
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Add hooks for checking code with lint/sparse/etc.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit fd251f039f74f2ef8ef8a019566eebf9d22be098
+Author: Alan Coopersmith
+Date: Tue Nov 7 18:32:54 2006 -0800
- * configure.ac:
- Update package version number for RC1 release.
+ Clear unused variable warnings from lint
-2005-10-17 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 21bee0694be43d4be1d93a8bcafbcd0f0ef9a9b4
+Author: Alan Coopersmith
+Date: Tue Nov 7 18:28:20 2006 -0800
- * Makefile.am:
- Fixed man page processing
+ AC_CHECK_MEMBER needs to include when checking for utmpx.ut_syslen
-2005-10-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 63f21c67aa6d025d8fa06793dc7f83f37e7c3fb4
+Author: Alan Coopersmith
+Date: Tue Nov 7 18:27:45 2006 -0800
- * Makefile.am:
- Get sessreg.man from $(srcdir) to fix make distcheck
+ Substitute correct pathnames for utmp/wtmp files in man pages
+
+ ifdefs to find the paths on each platform have been broken out into a new
+ sessreg.h header that is also preprocessed into sed rules applied to the
+ man page. Old ifdefs left for Imake compatibility in the 6.9/7.0 hybrid
+ release have been dropped now that autoconf is required to build.
- * configure.ac:
- Add check for utmpx.ut_syslen structure member
+commit 98a651ec2ac289b966e0a09557e81b33e202ee9c
+Author: Alan Coopersmith
+Date: Tue Nov 7 16:49:53 2006 -0800
+
+ Add *~ to .gitignore to skip emacs/patch droppings
+
+commit 5d7eed376aa9e8e623b0c46790a70b0cb3278207
+Author: Alan Coopersmith
+Date: Tue Nov 7 16:49:26 2006 -0800
+
+ renamed: .cvsignore -> .gitignore
+
+commit de39e20707b0affebf4c4c0e8485bdf08cf88a82
+Author: Alan Coopersmith
+Date: Tue Nov 7 16:48:27 2006 -0800
+
+ List default Xservers path as /etc/X11/xdm instead of /usr/X11R6/lib/xdm
+
+commit 8e657d70ef4fe5b4dfa51b506a8adca16b0ca8a0
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:04 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 7a587391f1b18192731e611ff65d74e414b67d60
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:18 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit fbfb7cb1e77418310e42cf38fc4faa411c103bec
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:17 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 021e9ec8d71ea9de9fa14743792e7528e0417daf
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:38 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 88f5deb277ffdf8253463eb0470f49306ac036de
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:57 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit eab9fb30fe89009f7791f4ab502c89d99cb2b84d
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:49 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit e35111966e6d66c176ed0955c1c25942c567632b
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:36 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit d90d5ab54582b04ad93e9cf6182652fdd6d3b4a3
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:50 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 5e79e3663bf5e14c7ae4f97798ee4430a02687f5
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:20 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 5ec50a516f66a7a57477dfc1ec51f8215084d29a
+Author: Kevin E Martin
+Date: Mon Oct 17 18:08:25 2005 +0000
+
+ Fixed man page processing
+
+commit adbf0a45e0c68512eb46c8bd8e024d5cdfd6b68f
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:42 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit f7e326bd50466f9197e75b2b71ccf0fb1996f4f8
+Author: Kevin E Martin
+Date: Wed Oct 5 04:10:02 2005 +0000
+
+ Add check for utmpx.ut_syslen structure member
+
+commit e33c62dfa7641e8e37a2ef64d98aa5171f2ef705
+Author: Kevin E Martin
+Date: Wed Oct 5 04:06:35 2005 +0000
+
+ Get sessreg.man from $(srcdir) to fix make distcheck
+ Add check for utmpx.ut_syslen structure member
+
+commit af48c05e4b8639935e8e0738dc0269708c2e929c
+Author: Alan Coopersmith
+Date: Mon Oct 3 17:50:57 2005 +0000
+
+ Bug #4678 https://bugs.freedesktop.org/show_bug.cgi?id=4678 Patch #3472
+ https://bugs.freedesktop.org/attachment.cgi?id=3472 Use SysV-style
+ utmp on GNU/kFreeBSD (Robert Millan)
+
+commit 5932bb94ffc5c10ab00831b70e703451acdc76b5
+Author: Alan Coopersmith
+Date: Mon Oct 3 17:18:44 2005 +0000
+
+ Add AC_SYS_LARGEFILE for systems that need it to access large
+ wtmpx/lastlogs Set version string in man page
+
+commit 26e33eae6ff593878b1402ef6d5596dc1f7c7fe3
+Author: Kristian Høgsberg
+Date: Tue Sep 27 18:07:40 2005 +0000
+
+ Add ChangeLog so autogen.sh will run.
+
+commit 95c055a072fe0b7b6e6b50b89c5ff7264b25e1a4
+Author: Alan Coopersmith
+Date: Thu Aug 18 22:40:09 2005 +0000
+
+ Undo regression in checking for lastlog support in monolithic builds
+ (reported by Dan McNichol of IBM)
+
+commit defb333b8190b058a437985bedd4bff90ea2d98c
+Author: Alan Coopersmith
+Date: Wed Aug 10 21:33:09 2005 +0000
+
+ Merge in utmpx code from Solaris sessreg. Add #ifdefs for autoconf defines.
+
+commit 8cd395d3bd86ba74888b7ea8cec2d0228c00c312
+Author: Alan Coopersmith
+Date: Wed Aug 10 21:20:03 2005 +0000
+
+ AUTHORS: Copy info from comments in sessreg.c configure.ac: Add checks for
+ lastlog.h, utmpx.h, & sys/param.h to replace OS-specific #ifdefs
+
+commit c8bfcd300e8da2510c101211db7bffb2955e593d
+Author: Alan Coopersmith
+Date: Wed Aug 10 20:51:27 2005 +0000
+
+ Add sessreg.man to app/sessreg module
+
+commit a487143d0b4f0183d602346adc7dedcccf158336
+Author: Daniel Stone
+Date: Wed Aug 10 11:17:07 2005 +0000
+
+ Add build system for sessreg, broken out from xdm.
+
+commit e3025b01b3fdd32bde8120dec1b0061e1449c6e9
+Author: Adam Jackson
+Date: Wed Oct 13 22:14:22 2004 +0000
+
+ Bug #1627: Zero out struct utmp before writing it to prevent garbage
+ fields. (Egmont Koblinger)
+
+commit 922a3ce29d3fe91f57fd41ea87e0e56b72ee9670
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:42 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 67ee3273cd7cc450e73b0f8a9a9178ae67b17ea3
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:12 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit aadb852d2af964c29514d9c345ab91f267223754
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:00 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 730d1970ee78e5f98452d2b6ef28972678522308
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:17 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 90395833b58cf129800f7372d0dd957fbe277afa
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:04 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 83d734abd26ba5e3cf8c197de581da2379290860
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4a979ad921e2733b8e3e178928240cf8a60ad07b
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:53 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/sessreg-X11R7.0-1.0.0/Makefile.am new/sessreg-1.0.1/Makefile.am
--- old/sessreg-X11R7.0-1.0.0/Makefile.am 2005-12-06 23:48:18.000000000 +0100
+++ new/sessreg-1.0.1/Makefile.am 2006-11-08 22:46:44.000000000 +0100
@@ -23,6 +23,7 @@
sessreg_CFLAGS = $(SESSREG_CFLAGS)
sessreg_SOURCES = \
+ sessreg.h \
sessreg.c
appman_PRE = sessreg.man
@@ -31,8 +32,8 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA)
+EXTRA_DIST = $(appman_PRE) filenames.sed.c ChangeLog
+CLEANFILES = $(appman_DATA) filenames.sed
SED = sed
@@ -40,7 +41,7 @@
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
-MAN_SUBSTS = \
+MAN_SUBSTS = -f filenames.sed \
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
@@ -57,3 +58,24 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+sessreg.$(APP_MAN_SUFFIX): filenames.sed
+
+filenames.sed: filenames.sed.c
+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's\|__' > $@
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES)
+endif LINT
+
+MAINTAINERCLEANFILES=ChangeLog
+
+ChangeLog:
+ git-log > ChangeLog
+
+dist-hook: ChangeLog
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/sessreg-X11R7.0-1.0.0/compile new/sessreg-1.0.1/compile
--- old/sessreg-X11R7.0-1.0.0/compile 2005-12-21 08:22:58.000000000 +0100
+++ new/sessreg-1.0.1/compile 2006-11-08 22:30:31.000000000 +0100
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+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
@@ -17,83 +18,125 @@
#
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
+# 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=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+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 "$prog" $args
+ # 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/'`
+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
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ 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
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+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/sessreg-X11R7.0-1.0.0/configure.ac new/sessreg-1.0.1/configure.ac
--- old/sessreg-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:04.000000000 +0100
+++ new/sessreg-1.0.1/configure.ac 2006-11-09 00:33:45.000000000 +0100
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(sessreg, [1.0.0],
+AC_INIT(sessreg, [1.0.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
sessreg)
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -29,13 +29,18 @@
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([lastlog.h utmpx.h sys/param.h])
AC_CHECK_MEMBER([struct utmpx.ut_syslen],
HAVE_SYSLEN=1,
- HAVE_SYSLEN=0)
+ HAVE_SYSLEN=0,
+ [#include ])
AC_DEFINE_UNQUOTED(HAVE_UTMPX_UT_SYSLEN,$HAVE_SYSLEN,
[utmpx structure includes ut_syslen field])
@@ -45,6 +50,9 @@
PKG_CHECK_MODULES(SESSREG, x11)
AC_SUBST(SESSREG_CFLAGS)
+# Allow checking code with lint, sparse, etc.
+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/sessreg-X11R7.0-1.0.0/filenames.sed.c new/sessreg-1.0.1/filenames.sed.c
--- old/sessreg-X11R7.0-1.0.0/filenames.sed.c 1970-01-01 01:00:00.000000000 +0100
+++ new/sessreg-1.0.1/filenames.sed.c 2006-11-08 02:48:36.000000000 +0100
@@ -0,0 +1,21 @@
+#include "sessreg.h"
+
+#ifdef UTMPX_FILE
+# define UTF UTMPX_FILE
+#else
+# define UTF UTMP_FILE
+#endif
+
+#ifdef WTMPX_FILE
+# define WTF WTMPX_FILE
+#else
+# define WTF WTMP_FILE
+#endif
+
+#ifndef TTYS_FILE
+# define TTYS_FILE "/etc/ttys"
+#endif
+
+s|__utmp_file__|UTF|g
+s|__wtmp_file__|WTF|g
+s|__ttys_file__|TTYS_FILE|g
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/sessreg-X11R7.0-1.0.0/missing new/sessreg-1.0.1/missing
--- old/sessreg-X11R7.0-1.0.0/missing 2005-12-21 08:22:58.000000000 +0100
+++ new/sessreg-1.0.1/missing 2006-11-08 22:30:31.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# 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
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# 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
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
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'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ 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
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# 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/sessreg-X11R7.0-1.0.0/sessreg.c new/sessreg-1.0.1/sessreg.c
--- old/sessreg-X11R7.0-1.0.0/sessreg.c 2005-10-05 06:10:02.000000000 +0200
+++ new/sessreg-1.0.1/sessreg.c 2006-11-08 03:32:05.000000000 +0100
@@ -1,7 +1,4 @@
/*
- * $Xorg: sessreg.c,v 1.5 2000/08/17 19:54:15 cpqbld Exp $
- * $XdotOrg: $
- *
* Copyright 1990, 1998 The Open Group
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -62,8 +59,6 @@
* by Andreas Stolcke
*/
-/* $XFree86: xc/programs/xdm/sessreg.c,v 3.18 2001/12/14 20:01:24 dawes Exp $ */
-
/*
* sessreg
*
@@ -79,9 +74,7 @@
* one of -a or -d must be specified
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "sessreg.h"
# include
# include
@@ -89,83 +82,8 @@
# include
# include
-#ifndef HAVE_CONFIG_H /* Imake fallback - hardcode platforms with utmpx */
-# if (defined(sun) && defined (__SVR4))
-# define HAVE_UTMPX_H
-# define HAVE_UTMPX_UT_SYSLEN 1
-# endif
-#endif
-
-#ifdef HAVE_UTMPX_H
-# if HAVE_UTMPX_UT_SYSLEN
-# include
-# define USE_UTMPX
-# endif
-#endif
-
-#ifdef HAVE_CONFIG_H
-# ifndef HAVE_LASTLOG_H
-# define NO_LASTLOG
-# endif
-#else /* Imake */
-# if defined(SYSV) || (defined(SVR4) && !defined(sun)) || defined(Lynx) || defined(__QNX__) || defined(__DARWIN__) || defined(_SEQUENT_)
-# define NO_LASTLOG
-# endif
-#endif
-
-#if defined(CSRG_BASED) || defined(HAVE_SYS_PARAM_H)
-#include
-#endif
-
-#ifndef NO_LASTLOG
-# ifdef CSRG_BASED
-# if (BSD < 199103)
-# include
-# endif
-# else
-# include
-# endif
-# include
-#endif
-
#if defined(__SVR4) || defined(SVR4) || defined(linux) || defined(__GLIBC__)
-#define SYSV
-#endif
-
-#ifdef CSRG_BASED
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
-/* *BSD doesn't like a ':0' type entry in utmp */
-#define NO_UTMP
-#endif
-#endif
-
-#ifndef WTMP_FILE
-# ifdef _PATH_WTMP
-# define WTMP_FILE _PATH_WTMP
-# else
-# define WTMP_FILE "/usr/adm/wtmp"
-# endif
-#endif
-#ifndef UTMP_FILE
-# ifdef _PATH_UTMP
-# define UTMP_FILE _PATH_UTMP
-# else
-# define UTMP_FILE "/etc/utmp"
-# endif
-#endif
-#ifndef NO_LASTLOG
-# ifndef LLOG_FILE
-# ifdef _PATH_LASTLOG
-# define LLOG_FILE _PATH_LASTLOG
-# else
-# define LLOG_FILE "/usr/adm/lastlog"
-# endif
-# endif
-#endif
-#ifndef SYSV
-# ifndef TTYS_FILE
-# define TTYS_FILE "/etc/ttys"
-# endif
+# define SYSV
#endif
#include
@@ -270,11 +188,12 @@
int utmp;
#endif
char *line_tmp;
+#ifndef USE_UTMPX
int wtmp;
+#endif
Time_t current_time;
struct utmp utmp_entry;
#ifdef USE_UTMPX
- int wtmpx;
struct utmpx utmpx_entry;
#endif
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/sessreg-X11R7.0-1.0.0/sessreg.h new/sessreg-1.0.1/sessreg.h
--- old/sessreg-X11R7.0-1.0.0/sessreg.h 1970-01-01 01:00:00.000000000 +0100
+++ new/sessreg-1.0.1/sessreg.h 2006-11-08 02:28:49.000000000 +0100
@@ -0,0 +1,121 @@
+/*
+ * Copyright 1990, 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 dealings in this Software without prior written authorization
+ * from The Open Group.
+ *
+ */
+
+/* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ *
+ * 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
+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * of the copyright holder.
+ */
+
+#include "config.h"
+
+#include
+
+#ifdef HAVE_UTMPX_H
+# if HAVE_UTMPX_UT_SYSLEN
+# include
+# define USE_UTMPX
+# endif
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+# include
+#endif
+
+#ifndef HAVE_LASTLOG_H
+# define NO_LASTLOG
+#endif
+
+#ifndef NO_LASTLOG
+# ifdef CSRG_BASED
+# if (BSD < 199103)
+# include
+# endif
+# else
+# include
+# endif
+# include
+#endif
+
+#ifdef CSRG_BASED
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
+/* *BSD doesn't like a ':0' type entry in utmp */
+#define NO_UTMP
+#endif
+#endif
+
+#ifndef WTMP_FILE
+# ifdef _PATH_WTMP
+# define WTMP_FILE _PATH_WTMP
+# else
+# define WTMP_FILE "/usr/adm/wtmp"
+# endif
+#endif
+#ifndef UTMP_FILE
+# ifdef _PATH_UTMP
+# define UTMP_FILE _PATH_UTMP
+# else
+# define UTMP_FILE "/etc/utmp"
+# endif
+#endif
+#ifndef NO_LASTLOG
+# ifndef LLOG_FILE
+# ifdef _PATH_LASTLOG
+# define LLOG_FILE _PATH_LASTLOG
+# else
+# define LLOG_FILE "/usr/adm/lastlog"
+# endif
+# endif
+#endif
+#ifndef SYSV
+# ifndef TTYS_FILE
+# define TTYS_FILE "/etc/ttys"
+# endif
+#endif
+
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/sessreg-X11R7.0-1.0.0/sessreg.man new/sessreg-1.0.1/sessreg.man
--- old/sessreg-X11R7.0-1.0.0/sessreg.man 2004-04-23 21:54:42.000000000 +0200
+++ new/sessreg-1.0.1/sessreg.man 2006-11-08 22:50:48.000000000 +0100
@@ -25,7 +25,7 @@
.\"
.\" $XFree86: xc/programs/xdm/sessreg.man,v 1.7 2001/04/23 20:31:09 dawes Exp $
.\"
-.TH SESSREG 1 __xorgversion__
+.TH SESSREG __appmansuffix__ __xorgversion__
.SH NAME
sessreg \- manage utmp/wtmp entries for non-init clients
.SH SYNOPSIS
@@ -45,19 +45,22 @@
\fISessreg\fP is a simple program for managing utmp/wtmp
entries for xdm sessions.
.PP
-System V has a better interface to /etc/utmp than BSD; it
+System V has a better interface to utmp than BSD; it
dynamically allocates entries in the file, instead of writing them at fixed
-positions indexed by position in /etc/ttys.
+positions indexed by position in
+.BR __ttys_file__ .
.PP
To manage BSD-style utmp files, \fIsessreg\fP has two strategies. In
-conjunction with xdm, the -x option counts the number of lines in /etc/ttys
+conjunction with xdm, the -x option counts the number of lines in
+.B __ttys_file__
and then adds to that the number of the line in the Xservers file which
specifies the display. The display name must be specified as the
"line-name" using the -l option. This sum is used as the "slot-number" in
-/etc/utmp that this entry will be written at. In the more general case, the
--s option specifies the slot-number directly. If for some strange reason
-your system uses a file other that /etc/ttys to manage init, the -t option
-can direct
+the utmp file that this entry will be written at. In the more general case,
+the -s option specifies the slot-number directly. If for some strange reason
+your system uses a file other than
+.B __ttys_file__
+to manage init, the -t option can direct
\fIsessreg\fP to look elsewhere for a count of terminal sessions.
.PP
Conversely, System V managers will not ever need to use these options (-x,
@@ -73,22 +76,23 @@
In Xstartup, place a call like:
.nf
- sessreg -a -l $DISPLAY -x /usr/X11R6/lib/xdm/Xservers $USER
+ sessreg -a -l $DISPLAY -x /etc/X11/xdm/Xservers $USER
.fi
and in Xreset:
.nf
- sessreg -d -l $DISPLAY -x /usr/X11R6/lib/xdm/Xservers $USER
+ sessreg -d -l $DISPLAY -x /etc/X11/xdm/Xservers $USER
.fi
.SH OPTIONS
.IP "\fB-w\fP \fIwtmp-file\fP"
-This specifies an alternate wtmp file, instead of /usr/adm/wtmp for BSD or
-/etc/wtmp for sysV. The special name "none" disables writing records to
-/usr/adm/wtmp.
+This specifies an alternate wtmp file, instead of
+.BR __wtmp_file__ .
+The special name "none" disables writing records to the wtmp file.
.IP "\fB-u\fP \fIutmp-file\fP"
-This specifies an alternate utmp file, instead of "/etc/utmp". The special
-name "none" disables writing records to /etc/utmp.
+This specifies an alternate utmp file, instead of
+.BR __utmp_file__ .
+The special name "none" disables writing records to the utmp file.
.IP "\fB-l\fP \fIline-name\fP"
This describes the "line" name of the entry. For terminal sessions,
this is the final pathname segment of the terminal device filename
@@ -101,7 +105,8 @@
a remote host. In typical xdm usage, this options is not used.
.IP "\fB-s\fP \fIslot-number\fP"
Each potential session has a unique slot number in BSD systems, most are
-identified by the position of the \fIline-name\fP in the /etc/ttys file.
+identified by the position of the \fIline-name\fP in the
+.BR __ttys_file__ file.
This option overrides the default position determined with ttyslot(3).
This option is inappropriate for use with xdm, the -x option is more useful.
.IP "\fB-x\fP \fIXservers-file\fP"
@@ -118,6 +123,6 @@
This session should be deleted from utmp/wtmp. One of -a/-d must
be specified.
.SH "SEE ALSO"
-xdm(1)
+xdm(__appmansuffix__)
.SH AUTHOR
Keith Packard, MIT X Consortium
++++++ sessreg.diff ++++++
--- Makefile.am.orig 2006-11-09 10:39:32.000000000 +0100
+++ Makefile.am 2006-11-09 10:41:36.000000000 +0100
@@ -63,7 +63,7 @@
filenames.sed: filenames.sed.c
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's\|__' > $@
+ $(CPPFLAGS) $(srcdir)/filenames.sed.c | grep 's\|__' | grep "^s|" > $@
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++++++ xdm.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/SuSEconfig.xdm new/etc/X11/xdm/SuSEconfig.xdm
--- old/etc/X11/xdm/SuSEconfig.xdm 2006-08-21 18:50:44.000000000 +0200
+++ new/etc/X11/xdm/SuSEconfig.xdm 2006-11-09 15:09:15.000000000 +0100
@@ -47,12 +47,15 @@
if test $r/etc/sysconfig/displaymanager -nt /var/X11R6/bin/X; then
if test -n "$DISPLAYMANAGER_XSERVER" ; then
if test -f "/usr/bin/$DISPLAYMANAGER_XSERVER" -a -x "/usr/bin/$DISPLAYMANAGER_XSERVER" ; then
- ln -snf "/usr/bin/$DISPLAYMANAGER_XSERVER" /var/X11R6/bin/X
+ test -d /var/X11R6/bin && \
+ ln -snf "/usr/bin/$DISPLAYMANAGER_XSERVER" /var/X11R6/bin/X
else
- ln -snf /usr/bin/Xorg /var/X11R6/bin/X
+ test -d /var/X11R6/bin && \
+ ln -snf /usr/bin/Xorg /var/X11R6/bin/X
fi
else
- ln -snf /usr/bin/Xorg /var/X11R6/bin/X
+ test -d /var/X11R6/bin && \
+ ln -snf /usr/bin/Xorg /var/X11R6/bin/X
fi
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession 2006-11-06 22:46:34.000000000 +0100
+++ new/etc/X11/xdm/Xsession 2006-11-09 20:56:50.000000000 +0100
@@ -173,6 +173,12 @@
fi
fi
+# If LANG is still not set, get the system default locale settings:
+#
+if [ -z "$LANG" -a -f /etc/profile.d/lang.sh ] ; then
+ . /etc/profile.d/lang.sh
+fi
+
#
# No window manager? Get system default
#
++++++ xkbcomp-X11R7.1-1.0.2.tar.bz2 -> xkbcomp-1.0.3.tar.bz2 ++++++
++++ 10075 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org