Hello community,
here is the log from the commit of package xorg-x11
checked in at Wed Oct 3 01:18:54 CEST 2007.
--------
--- xorg-x11/xorg-x11.changes 2007-09-12 14:55:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-10-02 21:43:37.016663000 +0200
@@ -1,0 +2,32 @@
+Tue Oct 2 21:45:44 CEST 2007 - sndirsch@suse.de
+
+- xfs 1.0.5
+ * Document catalogue:<dir> feature
+ * fix for integer overflows in build_range(). CVE-4568.
+ * Fix for heap overwrite in swap_char2b() CVE-2007-4568.
+- obsoletes bug-30806x.diff
+
+-------------------------------------------------------------------
+Mon Oct 1 16:09:08 CEST 2007 - sndirsch@suse.de
+
+- bug-30806x.diff:
+ * build_range() Server Integer Overflow Vulnerability in X Font
+ Server (Bug #308064, IDEF2708)
+ * fixes swap_char2b() Heap Overflow Vulnerability in X Font
+ Server (Bug #308066, IDEF2709)
+
+-------------------------------------------------------------------
+Sat Sep 29 12:20:44 CEST 2007 - sndirsch@suse.de
+
+- bumped version to 7.3
+
+-------------------------------------------------------------------
+Sat Sep 29 00:43:06 CEST 2007 - sndirsch@suse.de
+
+- xsetpointer 1.0.1
+ * This one just merges the input-hotplug branch
+- xinit 1.0.7
+ * This release fixes a bug that caused the startx script to not
+ be POSIX compatible anymore.
+
+-------------------------------------------------------------------
Old:
----
xfs-1.0.4.tar.bz2
xinit-1.0.5.tar.bz2
xsetpointer-X11R7.0-1.0.0.tar.bz2
New:
----
xfs-1.0.5.tar.bz2
xinit-1.0.7.tar.bz2
xsetpointer-1.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.e11586/_old 2007-10-03 01:18:26.000000000 +0200
+++ /var/tmp/diff_new_pack.e11586/_new 2007-10-03 01:18:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11 (Version 7.2)
+# spec file for package xorg-x11 (Version 7.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,10 +16,10 @@
%if %mcpp
BuildRequires: mcpp
%endif
-URL: http://xorg.freedesktop.org/
-Version: 7.2
-Release: 131
-License: X11/MIT, xc/fonts/scaled/Type1/Copyright
+Url: http://xorg.freedesktop.org/
+Version: 7.3
+Release: 1
+License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
%if %mcpp
@@ -77,13 +77,13 @@
Source46: xfd-X11R7.0-1.0.1.tar.bz2
Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2
Source48: xfontsel-1.0.2.tar.bz2
-Source49: xfs-1.0.4.tar.bz2
+Source49: xfs-1.0.5.tar.bz2
Source50: xfsinfo-X11R7.0-1.0.1.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
Source52: xgamma-1.0.2.tar.bz2
Source53: xgc-X11R7.0-1.0.1.tar.bz2
Source54: xhost-1.0.2.tar.bz2
-Source55: xinit-1.0.5.tar.bz2
+Source55: xinit-1.0.7.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
@@ -111,7 +111,7 @@
Source80: xrx-X11R7.0-1.0.1.tar.bz2
Source81: xset-1.0.3.tar.bz2
Source82: xsetmode-X11R7.0-1.0.0.tar.bz2
-Source83: xsetpointer-X11R7.0-1.0.0.tar.bz2
+Source83: xsetpointer-1.0.1.tar.bz2
Source84: xsetroot-1.0.2.tar.bz2
Source85: xsm-X11R7.0-1.0.1.tar.bz2
Source86: xstdcmap-X11R7.0-1.0.1.tar.bz2
@@ -376,7 +376,6 @@
%clean
rm -rf "$RPM_BUILD_ROOT"
-
%verifyscript
%verify_permissions -e /usr/bin/dga
@@ -454,8 +453,27 @@
%ghost /var/log/xdm.errors
%ghost /var/run/xdm.pid
/var/lib/xdm/authdir/
-
%changelog
+* Tue Oct 02 2007 - sndirsch@suse.de
+- xfs 1.0.5
+ * Document catalogue:<dir> feature
+ * fix for integer overflows in build_range(). CVE-4568.
+ * Fix for heap overwrite in swap_char2b() CVE-2007-4568.
+- obsoletes bug-30806x.diff
+* Mon Oct 01 2007 - sndirsch@suse.de
+- bug-30806x.diff:
+ * build_range() Server Integer Overflow Vulnerability in X Font
+ Server (Bug #308064, IDEF2708)
+ * fixes swap_char2b() Heap Overflow Vulnerability in X Font
+ Server (Bug #308066, IDEF2709)
+* Sat Sep 29 2007 - sndirsch@suse.de
+- bumped version to 7.3
+* Sat Sep 29 2007 - sndirsch@suse.de
+- xsetpointer 1.0.1
+ * This one just merges the input-hotplug branch
+- xinit 1.0.7
+ * This release fixes a bug that caused the startx script to not
+ be POSIX compatible anymore.
* Wed Sep 12 2007 - sndirsch@suse.de
- added acpid to Required-Start of xdm (Bug #309676)
* Mon Sep 10 2007 - sndirsch@suse.de
++++++ ps_suse.diff ++++++
--- /var/tmp/diff_new_pack.e11586/_old 2007-10-03 01:18:29.000000000 +0200
+++ /var/tmp/diff_new_pack.e11586/_new 2007-10-03 01:18:29.000000000 +0200
@@ -18,7 +18,7 @@
Color
--- xinit-X11R7.1-1.0.2.orig/xinitrc.cpp 2006-08-19 11:02:26.000000000 +0200
-+++ xinit-1.0.5/xinitrc.cpp 2006-08-19 11:02:35.000000000 +0200
++++ xinit-1.0.7/xinitrc.cpp 2006-08-19 11:02:35.000000000 +0200
@@ -68,8 +68,10 @@
XCOMM This is the fallback case if nothing else is executed above
@@ -33,7 +33,7 @@
-exec XTERM -geometry 80x66+0+0 -name login
+exec TWM
--- xinit-X11R7.1-1.0.2.orig/startx.cpp 2006-08-19 11:02:26.000000000 +0200
-+++ xinit-1.0.5/startx.cpp 2006-08-19 11:14:43.000000000 +0200
++++ xinit-1.0.7/startx.cpp 2006-08-19 11:14:43.000000000 +0200
@@ -62,10 +62,115 @@
sysclientrc=XINITDIR/xinitrc
#endif
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.e11586/_old 2007-10-03 01:18:29.000000000 +0200
+++ /var/tmp/diff_new_pack.e11586/_new 2007-10-03 01:18:29.000000000 +0200
@@ -289,7 +289,7 @@
}
doWrite = 1;
--- programs/xinit/startx.cpp.orig 2005-11-11 11:16:53.000000000 +0100
-+++ xinit-1.0.5/startx.cpp 2005-11-11 11:35:19.000000000 +0100
++++ xinit-1.0.7/startx.cpp 2005-11-11 11:35:19.000000000 +0100
@@ -328,6 +328,7 @@
. /etc/sysconfig/displaymanager
test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
++++++ xfs-1.0.4.tar.bz2 -> xfs-1.0.5.tar.bz2 ++++++
++++ 4532 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/xfs-1.0.4/config.h.in new/xfs-1.0.5/config.h.in
--- old/xfs-1.0.4/config.h.in 2006-11-30 18:51:00.000000000 +0100
+++ new/xfs-1.0.5/config.h.in 2007-10-01 22:41:51.000000000 +0200
@@ -3,9 +3,39 @@
/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
#undef BSD44SOCKETS
+/* 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
+
/* Support IPv6 for TCP connections */
#undef IPv6
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Name of package */
#undef PACKAGE
@@ -24,9 +54,21 @@
/* 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 as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Support TCP socket connections */
#undef TCPCONN
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/xfs-1.0.4/configure.ac new/xfs-1.0.5/configure.ac
--- old/xfs-1.0.4/configure.ac 2006-11-30 18:50:48.000000000 +0100
+++ new/xfs-1.0.5/configure.ac 2007-10-01 21:55:28.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xfs,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
+AC_INIT(xfs,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -41,6 +41,8 @@
;;
esac
+AC_CHECK_HEADERS([stdint.h])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XFS, libfs xfont xtrans)
XFS_CFLAGS="$XFS_CFLAGS $OS_CFLAGS"
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/xfs-1.0.4/difs/dispatch.c new/xfs-1.0.5/difs/dispatch.c
--- old/xfs-1.0.4/difs/dispatch.c 2006-11-30 18:50:40.000000000 +0100
+++ new/xfs-1.0.5/difs/dispatch.c 2007-09-16 12:16:28.000000000 +0200
@@ -933,6 +933,13 @@
}
item_size = (stuff->reqType == FS_QueryXExtents8) ? 1 : 2;
+ if (stuff->num_ranges >
+ ((stuff->length << 2) - SIZEOF(fsQueryXExtents8Req))/item_size) {
+ int num_ranges = stuff->num_ranges;
+ SendErrToClient(client, FSBadLength, (pointer)&num_ranges);
+ return FSBadLength;
+ }
+
/* get the extents */
err = QueryExtents(client, cfp, item_size,
stuff->num_ranges, stuff->range,
@@ -969,6 +976,12 @@
assert((stuff->reqType == FS_QueryXBitmaps8) || (stuff->reqType == FS_QueryXBitmaps16));
item_size = (stuff->reqType == FS_QueryXBitmaps8) ? 1 : 2;
+ if (stuff->num_ranges >
+ ((stuff->length << 2) - SIZEOF(fsQueryXBitmaps8Req))/item_size) {
+ int num_ranges = stuff->num_ranges;
+ SendErrToClient(client, FSBadLength, (pointer)&num_ranges);
+ return FSBadLength;
+ }
/* get the glyphs */
err = QueryBitmaps(client, cfp, item_size, stuff->format,
stuff->num_ranges, stuff->range,
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/xfs-1.0.4/difs/fontinfo.c new/xfs-1.0.5/difs/fontinfo.c
--- old/xfs-1.0.4/difs/fontinfo.c 2006-11-30 18:50:40.000000000 +0100
+++ new/xfs-1.0.5/difs/fontinfo.c 2007-09-17 08:02:15.000000000 +0200
@@ -62,6 +62,21 @@
#include
#include
+#ifdef HAVE_CONFIG_H
+#include
+#endif
+#ifdef HAVE_STDINT_H
+#include
+#endif
+#include
+#ifndef SIZE_MAX
+# ifdef ULONG_MAX
+# define SIZE_MAX ULONG_MAX
+# else
+# define SIZE_MAX UINT_MAX
+# endif
+#endif
+
void
CopyCharInfo(
CharInfoPtr ci,
@@ -181,6 +196,8 @@
return new;
}
+ if (src_num >= SIZE_MAX / sizeof(fsRange) * 2 - 1)
+ return NULL;
np = new = (fsRange *) fsalloc(sizeof(fsRange) * (src_num + 1) / 2);
if (!np)
return np;
@@ -210,6 +227,8 @@
unsigned char *pp = src;
src_num = *num;
+ if (src_num >= SIZE_MAX / sizeof(fsRange))
+ return NULL;
np = new = (fsRange *) fsalloc(SIZEOF(fsRange) * src_num);
if (!np)
return np;
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/xfs-1.0.4/xfs.man new/xfs-1.0.5/xfs.man
--- old/xfs-1.0.4/xfs.man 2006-11-30 18:50:41.000000000 +0100
+++ new/xfs-1.0.5/xfs.man 2007-09-11 08:41:02.000000000 +0200
@@ -124,9 +124,10 @@
.\" Size in bytes of the font server cache.
.IP "catalogue (list of string)"
Ordered list of font path element names.
-Use of the keyword "catalogue" is very misleading at present,
-the current implementation only supports a single catalogue ("all"),
-containing all of the specified fonts.
+The current implementation only supports a single catalogue ("all")
+containing all of the specified fonts. A special directory with
+symlinks to font paths can be specified using a catalogue:<dir>
+entry. See the CATALOGUE DIR section below for details.
.IP "alternate-servers (list of string)"
List of alternate servers for this font server.
.IP "client-limit (cardinal)"
@@ -167,6 +168,38 @@
.\" Those clients the fontserver will talk to. Others
.\" will be refused for the initial connection. An empty
.\" list means the server will talk to any client.
+.SH "CATALOGUE DIR"
+You can specify a special kind of font path in the form \fBcatalogue:<dir>\fR.
+The directory specified after the catalogue: prefix will be scanned for symlinks
+and each symlink destination will be added as a local fontfile FPE.
+.PP
+The symlink can be suffixed by attributes such as '\fBunscaled\fR', which
+will be passed through to the underlying fontfile FPE. The only exception is
+the newly introduced '\fBpri\fR' attribute, which will be used for ordering
+the font paths specified by the symlinks.
+
+An example configuration:
+
+.nf
+ 75dpi:unscaled:pri=20 \-> /usr/share/X11/fonts/75dpi
+ ghostscript:pri=60 \-> /usr/share/fonts/default/ghostscript
+ misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
+ type1:pri=40 \-> /usr/share/X11/fonts/Type1
+ type1:pri=50 \-> /usr/share/fonts/default/Type1
+.fi
+
+This will add /usr/share/X11/fonts/misc as the first FPE with the attribute
+'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
+the attribute unscaled etc. This is functionally equivalent to setting
+the following font path:
+
+.nf
+ /usr/share/X11/fonts/misc:unscaled,
+ /usr/share/X11/fonts/75dpi:unscaled,
+ /usr/share/X11/fonts/Type1,
+ /usr/share/fonts/default/Type1,
+ /usr/share/fonts/default/ghostscript
+.fi
.SH "EXAMPLE"
.nf
XCOMM
++++++ xinit-1.0.5.tar.bz2 -> xinit-1.0.7.tar.bz2 ++++++
++++ 2388 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/xinit-1.0.5/ChangeLog new/xinit-1.0.7/ChangeLog
--- old/xinit-1.0.5/ChangeLog 2007-09-05 19:15:20.000000000 +0200
+++ new/xinit-1.0.7/ChangeLog 2007-09-17 12:50:12.000000000 +0200
@@ -1,3 +1,43 @@
+commit 051633650c7b7a7eb9ef494a48a6a79fa2e06080
+Author: Tilman Sauerbeck
+Date: Mon Sep 17 12:46:59 2007 +0200
+
+ Bumped version to 1.0.7.
+
+commit 52121e9de907c61a16e41f0f08acecc1dc1546e5
+Author: Tilman Sauerbeck
+Date: Mon Sep 17 08:27:23 2007 +0200
+
+ Bug #12448: Don't try to trap 'ERR'.
+
+ startx is advertised as a POSIX sh script. These shells don't
+ necessarily support trapping 'ERR'. This makes startx work again with
+ dash (and probably others).
+
+commit ff9752bc4304e5a29ef7e06b56bd4e0e5ca32926
+Author: Matthieu Herrb
+Date: Sat Sep 15 18:51:19 2007 +0200
+
+ Bump to 1.0.6
+
+commit af5e859a8da23f063fd3371a9e7266054532d769
+Author: Matthieu Herrb
+Date: Sat Sep 15 18:50:57 2007 +0200
+
+ generate
+
+commit 6c1bef8580a1dcd945c3a89522daa90fe8f4c272
+Author: Matthieu Herrb
+Date: Sat Sep 15 18:43:52 2007 +0200
+
+ MKCOOKIE program for OpenBSD.
+
+commit b9d07ef3e07ef6f00a2f1cc730a481e5e1291f5b
+Author: Matthieu Herrb
+Date: Sat Sep 15 18:12:52 2007 +0200
+
+ remove .serverauth.$$ file on signals or errors
+
commit e91874313c99dfb6be042cd1739e463e080b71fc
Author: Eric Anholt
Date: Wed Sep 5 10:14:52 2007 -0700
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/xinit-1.0.5/configure.ac new/xinit-1.0.7/configure.ac
--- old/xinit-1.0.5/configure.ac 2007-09-05 19:14:40.000000000 +0200
+++ new/xinit-1.0.7/configure.ac 2007-09-17 12:46:38.000000000 +0200
@@ -1,4 +1,3 @@
-
dnl Copyright 2005 Red Hat, Inc.
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xinit,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
+AC_INIT(xinit,[1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -106,6 +105,13 @@
AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE],
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin])
+
+case $host_os in
+ *openbsd*)
+ MCOOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\\"%08x\\\"'
+ ;;
+esac
+
if test "x$MCOOKIE" != x ; then
STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="$(MCOOKIE)"'
fi
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/xinit-1.0.5/INSTALL new/xinit-1.0.7/INSTALL
--- old/xinit-1.0.5/INSTALL 2007-07-13 23:36:56.000000000 +0200
+++ new/xinit-1.0.7/INSTALL 2007-09-16 22:55:39.000000000 +0200
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
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/xinit-1.0.5/startx.cpp new/xinit-1.0.7/startx.cpp
--- old/xinit-1.0.5/startx.cpp 2007-09-05 19:09:14.000000000 +0200
+++ new/xinit-1.0.7/startx.cpp 2007-09-16 23:24:48.000000000 +0200
@@ -198,6 +198,7 @@
XCOMM create a file with auth information for the server. ':0' is a dummy.
xserverauthfile=$HOME/.serverauth.$$
+trap "rm -f $xserverauthfile" HUP INT QUIT ILL TRAP KILL BUS TERM
xauth -q -f $xserverauthfile << EOF
add :$dummy . $mcookie
EOF
++++++ xsetpointer-X11R7.0-1.0.0.tar.bz2 -> xsetpointer-1.0.1.tar.bz2 ++++++
++++ 12141 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/xsetpointer-X11R7.0-1.0.0/ChangeLog new/xsetpointer-1.0.1/ChangeLog
--- old/xsetpointer-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:11.000000000 +0100
+++ new/xsetpointer-1.0.1/ChangeLog 2006-11-02 02:38:11.000000000 +0100
@@ -1,25 +1,220 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0c1e59347c38e2661ebc6f3ccb1d8f1b1b09f70e
+Merge: 49c408e... 325eb66...
+Author: Daniel Stone
+Date: Sun Sep 24 20:21:55 2006 +0300
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Merge branch 'input-hotplug'
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 325eb669a9611819979f1adf92f2bd72e946223b
+Author: Daniel Stone
+Date: Tue Aug 8 00:23:52 2006 +0300
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ fix core request length, exit status, error
+ Make sure we send the correct request length with DEVICE_CORE.
+ exit 1 on failure to find the device, and fix the error message to correctly
+ show which device we couldn't find.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8f05f55390f138deeb17fd16259ce2928cc0d1f0
+Author: Daniel Stone
+Date: Sun Jul 23 18:47:51 2006 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ fix core event toggling
+ Fix hopelessly broken core event toggling.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 49c408e85dfe222f9c1f521a19b809b0e82cf370
+Author: Daniel Stone
+Date: Tue Jul 18 12:05:48 2006 -0400
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ fix ChangeLog dist rule
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 70ec118ecaeeaad781fa2d5010a20bcf14afcbd9
+Author: Daniel Stone
+Date: Tue Jul 18 12:04:44 2006 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ fix ChangeLog dist rule
+commit c8444a41ad8857a1aefd037a27d8fd96da1e97da
+Author: Daniel Stone
+Date: Tue Jul 18 12:00:16 2006 -0400
+
+ bump inputproto dependency, version
+ Bump version to 1.0.1, and bump inputproto dependency to 1.4, for
+ XExtension{Keyboard,Pointer} device classes, and XDeviceCoreControl.
+
+commit 60d89764b808153808a6bfd0f29144cc9a9a08a2
+Author: Daniel Stone
+Date: Tue Jul 18 11:59:02 2006 -0400
+
+ allow toggling of core event sending
+ Allow toggling sending of core events from extension devices with
+ -c (disable) and +c (enable).
+
+commit 2ecc9dc044a81092728c7c14eaeb792cd5102ce5
+Author: Daniel Stone
+Date: Tue Jul 18 11:54:40 2006 -0400
+
+ add support for XExtensionKeyboard, XExtensionPointer
+ Add support for new XExtensionKeyboard and XExtensionPointer types.
+
+commit a62ad9f6c4db9dc2c3ef72ce091f641d1839e5fd
+Author: Daniel Stone
+Date: Tue Jul 18 11:53:35 2006 -0400
+
+ remove ChangeLog, generate automatically
+ Generate ChangeLog automatically out of the dist hook.
+
+commit e583fd807ddf2e0900781e01d43cac9f008616b7
+Author: Daniel Stone
+Date: Sun Jun 25 16:41:51 2006 +0000
+
+ Print out device number as well as name.
+
+commit aac1a64cfbdf489847f28f6fbeec5a26c20542b8
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:11 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 16e3c97b9dee92ac8ebcb502f0aca2f119a61c99
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:26 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit e77de3b2110b99a99966bc782bba2b709cad1143
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:28 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 22377c013163fc86d45f2739f8d9cb7eca0a87b4
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:47 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 426d7282773039e9c843ca9b83d9bc5ea168a78a
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:08 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit a2157f26c2c816ee08a3b6a4b582fc06eea90071
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:55 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit fd324de793aeefa79665e9f4f4c4756c17c0e421
+Author: Kevin E Martin
+Date: Wed Nov 9 21:09:22 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit f70c27e7775972bd4ef5dfc4800f84b031a92f05
+Author: Alan Coopersmith
+Date: Wed Nov 9 17:56:13 2005 +0000
+
+ Bug #4620 https://bugs.freedesktop.org/show_bug.cgi?id=4620 xsetpointer
+ man page refers to "xsetmode" by mistake (Ortwin Gl�ck)
+
+commit 62083b4e548ad8064fa91a0c07eea570fe1e2497
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:57 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit f08cf64510f5bb329584a67508128bc410982594
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:25 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 7b6239a5271fe80e2801da13b03e246170af64d8
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:48 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 61eeb2dc509fd89e3b0d9cb5618bfdd82254e414
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:38 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 a8487bbc99fe3f6ea9bac04500154413b5efdc35
+Author: Adam Jackson
+Date: Wed Jul 20 19:32:04 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 7f993553ef3c72321edfd4e819b1e3e7ff5ccbb9
+Author: Daniel Stone
+Date: Tue Jul 19 04:44:14 2005 +0000
+
+ Add COPYING files, fix manpage locations.
+
+commit dbc7be0804516de1905e1787e16874818a7e683a
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 1 18:29:34 2005 +0000
+
+ Build system for xsetpointer
+
+commit 7f7a735b54f803f43f472ab16dbd91be21e46f96
+Author: Egbert Eich
+Date: Fri Apr 23 19:55:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 200f50c2f0a7e93b947775440f82839603186040
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:45 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 483834b02883acfe0ca4cbd1bc178c00ab7b35a3
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:18 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 3dea8998879cceddfc12037a943c37f97c3c5e6c
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit fdd94f6e464e05e79ff926955105f67e8a1d8bba
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:17 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 7573ce2573e32bc626e59c0bae6cbf7e52310a2f
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:17 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit c525f185a390123a3a8adf49003272543f9058d4
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit f11dbf0a679d914d48334b36a865c853d99cb7cb
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ Initial revision
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/xsetpointer-X11R7.0-1.0.0/compile new/xsetpointer-1.0.1/compile
--- old/xsetpointer-X11R7.0-1.0.0/compile 2005-12-21 08:33:13.000000000 +0100
+++ new/xsetpointer-1.0.1/compile 2006-07-18 18:02:36.000000000 +0200
@@ -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/xsetpointer-X11R7.0-1.0.0/configure.ac new/xsetpointer-1.0.1/configure.ac
--- old/xsetpointer-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:11.000000000 +0100
+++ new/xsetpointer-1.0.1/configure.ac 2006-09-24 19:21:54.000000000 +0200
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xsetpointer,[1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetpointer)
+AC_INIT(xsetpointer,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetpointer)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -32,7 +32,7 @@
AC_PROG_INSTALL
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XSETPOINTER, xi x11)
+PKG_CHECK_MODULES(XSETPOINTER, xi x11 [inputproto >= 1.4])
AC_SUBST(XSETPOINTER_CFLAGS)
AC_SUBST(XSETPOINTER_LIBS)
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/xsetpointer-X11R7.0-1.0.0/Makefile.am new/xsetpointer-1.0.1/Makefile.am
--- old/xsetpointer-X11R7.0-1.0.0/Makefile.am 2005-12-06 23:48:26.000000000 +0100
+++ new/xsetpointer-1.0.1/Makefile.am 2006-07-18 18:05:39.000000000 +0200
@@ -34,8 +34,15 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
-CLEANFILES = $(appman_DATA)
+EXTRA_DIST = $(appman_PRE) ChangeLog
+CLEANFILES = $(appman_DATA) ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ GIT_DIR=$(srcdir)/.git git-log > ChangeLog
+
+dist-hook: ChangeLog
SED = sed
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/xsetpointer-X11R7.0-1.0.0/missing new/xsetpointer-1.0.1/missing
--- old/xsetpointer-X11R7.0-1.0.0/missing 2005-12-21 08:33:13.000000000 +0100
+++ new/xsetpointer-1.0.1/missing 2006-07-18 18:02:35.000000000 +0200
@@ -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/xsetpointer-X11R7.0-1.0.0/xsetpointer.c new/xsetpointer-1.0.1/xsetpointer.c
--- old/xsetpointer-X11R7.0-1.0.0/xsetpointer.c 2004-04-23 21:55:06.000000000 +0200
+++ new/xsetpointer-1.0.1/xsetpointer.c 2006-09-24 19:21:54.000000000 +0200
@@ -59,20 +59,28 @@
int
main(int argc, char * argv[])
{
- int loop, num_extensions, num_devices;
- char **extensions;
- XDeviceInfo *devices;
- Display *dpy;
- int list = 0;
+ int loop, num_extensions, num_devices;
+ char **extensions;
+ XDeviceInfo *devices;
+ XDeviceCoreControl corectl;
+ Display *dpy;
+ int list = 0, core = 0;
+ XDevice *device;
- if (argc != 2) {
- fprintf(stderr, "usage : %s (-l | <device name>)\n", argv[0]);
+ if (argc < 2 || argc > 3) {
+ fprintf(stderr, "usage : %s (-l | -c | +c ) <device name>)\n", argv[0]);
exit(1);
}
if (strcmp(argv[1], "-l") == 0) {
list = 1;
}
+ else if (strcmp(argv[1], "-c") == 0) {
+ core = 1;
+ }
+ else if (strcmp(argv[1], "+c") == 0) {
+ core = 2;
+ }
dpy = XOpenDisplay(NULL);
@@ -95,7 +103,7 @@
for(loop=0; loop