Hello community, here is the log from the commit of package xorg-x11 checked in at Fri Sep 1 01:43:28 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-08-22 18:32:58.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-08-31 21:40:05.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Aug 31 21:39:20 CEST 2006 - sndirsch@suse.de + +- added xdm init script +- aded xrdb compatibility symlink for SUSE <= 10.1 + +------------------------------------------------------------------- +Wed Aug 30 05:35:07 CEST 2006 - sndirsch@suse.de + +- updated xprop to release 1.0.2 + * Don't abort() when actual_format from XGetWindowAttributes is 0 + +------------------------------------------------------------------- Old: ---- xprop-X11R7.0-1.0.1.tar.bz2 New: ---- xdm.diff xprop-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.4CKPCK/_old 2006-09-01 01:42:38.000000000 +0200 +++ /var/tmp/diff_new_pack.4CKPCK/_new 2006-09-01 01:42:38.000000000 +0200 @@ -11,10 +11,10 @@ # norootforbuild Name: xorg-x11 -BuildRequires: cpp 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 +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.1 -Release: 17 +Release: 18 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -96,7 +96,7 @@ Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2 Source74: xpr-X11R7.0-1.0.1.tar.bz2 Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2 -Source76: xprop-X11R7.0-1.0.1.tar.bz2 +Source76: xprop-1.0.2.tar.bz2 Source77: xrandr-X11R7.1-1.0.2.tar.bz2 Source78: xrdb-X11R7.1-1.0.2.tar.bz2 Source79: xrefresh-X11R7.1-1.0.2.tar.bz2 @@ -138,6 +138,7 @@ Patch17: x11r6.9.0-setuid.diff Patch18: fonttosfnt.diff Patch19: scripts.diff +Patch20: xdm.diff %description This package contains the X.Org core and sample applications. @@ -146,52 +147,30 @@ Authors: -------- - Egbert Eich - Keith Packard - Roland Mainz + Alan Coopersmith - Russ Blaine - Alexander Gottwald - Alan Hourihane - Chisato Yamauchi + Amit Margalit + Andreas Stolcke + Bob Scheifler + Caolan McNamara + David Reveman + David Rosenthal + Dmitry Yu. Bolkhovityanov + Doug Moran Eric Anholt - Nolan Leake - Stefan Dirsch - Rik Faith - Daniel Berrange - Matthieu Herrb - John Heasley - Ryan Underwood - Alex Deucher - Ty Sarna - Torrey T Lyons Darwin - Stuart Kreitman - Kevin E. Martin - Greg Parker - John Harper - Adam Jackson - Peter Kunzman - Aaron Plattner - Chisato Yamauchi - Michel Daenzer - Kristian Høgsberg - Søren Sandmann - Owen Taylor - Mike A. Harris - Ivan Kokshaysky - Bryan Stine - Guy Martin - Paul Anderson - Yu Shao - David Dawes - Harold L. Hunt II - Andreas Luik - Travis Tilley - Ryan Lortie - Ryan Breen - Deron Johnson - Ronny Vindenes + Felix Külhing + Ivan Griffin + Jim Fulton Jim Gettys + Keith Packard + Lars Knoll + Manish Singh + Matthew Allum + Matthias Hopf + Matthieu Herrb & OpenBSD Team + Phil Karlton + Stephen Gildea + Werner Fink %prep %setup -n . -T -D @@ -317,6 +296,10 @@ # SuSE default XDM configuration pushd $RPM_BUILD_ROOT tar xjf $RPM_SOURCE_DIR/xdm.tar.bz2 +%ifarch s390 s390x + patch -p0 -s < $RPM_SOURCE_DIR/xdm.diff + rm -f var/adm/fillup-templates/sysconfig.displaymanager.orig +%endif popd # Correct location (FHS-2.1) rm -f $RPM_BUILD_ROOT/etc/X11/xdm/authdir @@ -328,6 +311,9 @@ ln -snf /etc/X11/xdm/SuSEconfig.xdm \ $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.xdm ln -s /usr/bin/xdm $RPM_BUILD_ROOT/usr/X11R6/bin/xdm + rm $RPM_BUILD_ROOT/etc/init.d/xdm \ + $RPM_BUILD_ROOT/usr/sbin/rcxdm \ + $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.displaymanager %endif ;; xfs-*) @@ -346,6 +332,11 @@ xmag-*) %suse_update_desktop_file -i -u xmag DesktopUtility ;; + xrdb-*) +%if %suse_version <= 1010 + ln -s /usr/bin/xrdb $RPM_BUILD_ROOT/usr/X11R6/bin/xrdb +%endif + ;; xrefresh-*) %suse_update_desktop_file -i -u Xrefresh DesktopUtility ;; @@ -377,6 +368,10 @@ %post # Create symbolic run level links for xfs start script: %{fillup_and_insserv -p xfs} +%if %suse_version > 1010 +%{fillup_and_insserv -py xdm} +%{fillup_only -n displaymanager} +%endif %run_permissions exit 0 @@ -397,17 +392,24 @@ %config /etc/pam.d/xdm %config /etc/skel/.xinitrc.template /etc/X11/* +%if %suse_version > 1010 +/etc/init.d/xdm +%endif /etc/init.d/xfs %if %suse_version <= 1010 /sbin/conf.d/SuSEconfig.xdm /usr/X11R6/bin/mkfontdir /usr/X11R6/bin/startx /usr/X11R6/bin/xdm +/usr/X11R6/bin/xrdb /usr/X11R6/bin/xset %endif /usr/X11R6/bin/xauth /usr/sbin/mkallcomposecaches /usr/sbin/mkcomposecache +%if %suse_version > 1010 +/usr/sbin/rcxdm +%endif /usr/sbin/rcxfs /usr/bin/* /usr/include/X11/bitmaps/* @@ -419,11 +421,20 @@ %{_mandir}/man8/* /usr/share/pixmaps/*.png /usr/share/xsessions/twm.desktop +%if %suse_version > 1010 +/var/adm/fillup-templates/sysconfig.displaymanager +%endif %ghost /var/log/xdm.errors %ghost /var/run/xdm.pid /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Thu Aug 31 2006 - sndirsch@suse.de +- added xdm init script +- aded xrdb compatibility symlink for SUSE <= 10.1 +* Wed Aug 30 2006 - sndirsch@suse.de +- updated xprop to release 1.0.2 + * Don't abort() when actual_format from XGetWindowAttributes is 0 * Tue Aug 22 2006 - sndirsch@suse.de - cleanup * Mon Aug 21 2006 - sndirsch@suse.de ++++++ xdm.diff ++++++ --- var/adm/fillup-templates/sysconfig.displaymanager +++ var/adm/fillup-templates/sysconfig.displaymanager @@ -18,1 +18,1 @@ -DISPLAYMANAGER_REMOTE_ACCESS="no" +DISPLAYMANAGER_REMOTE_ACCESS="yes" @@ -34,1 +34,1 @@ -DISPLAYMANAGER_STARTS_XSERVER="yes" +DISPLAYMANAGER_STARTS_XSERVER="no" ++++++ xdm.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/init.d/xdm 2006-08-19 11:46:55.000000000 +0200 @@ -0,0 +1,184 @@ +#! /bin/bash +# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Florian La Roche, 1996 +# Werner Fink <werner@suse.de>, 1996,98,99 +# Martin Scherbaum, 1997 +# Reinhard Max <max@suse.de>, 1997 +# +# Please send feedback to http://www.suse.de/feedback +# +# /etc/init.d/xdm +# +### BEGIN INIT INFO +# Provides: xdm +# Required-Start: $remote_fs +# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlykdm +# Required-Stop: +# Default-Start: 5 +# Default-Stop: +# Description: X Display Manager +### END INIT INFO + +. /etc/rc.status +. /etc/sysconfig/displaymanager +. /etc/sysconfig/language +. /etc/sysconfig/windowmanager +test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile +test -r /etc/profile.d/desktop-data.sh && . /etc/profile.d/desktop-data.sh + +locale_vars=" \ +LANG \ +LC_CTYPE \ +LC_NUMERIC \ +LC_TIME \ +LC_COLLATE \ +LC_MONETARY \ +LC_MESSAGES \ +LC_PAPER \ +LC_NAME \ +LC_ADDRESS \ +LC_TELEPHONE \ +LC_MEASUREMENT \ +LC_IDENTIFICATION \ +LC_ALL" + +unset LC_ALL +for lc in $locale_vars +do + eval val="\$RC_$lc" + if test -n "$val"; then + eval $lc="\$RC_$lc" + export $lc + fi +done +unset lc val + +test -z "$DEFAULT_WM" && DEFAULT_WM=twm +SAVEPATH=$PATH +PATH=$PATH:/usr/X11R6/bin:/opt/gnome/bin:/usr/openwin/bin +WINDOWMANAGER="`type -p ${DEFAULT_WM##*/}`" +PATH=$SAVEPATH +export WINDOWMANAGER +unset DEFAULT_WM SAVEPATH + +PIDFILE="/var/run/xdm.pid" +KDEROOTHOME=/root/.kdm +export KDEROOTHOME +XDMDIR=/etc/X11/xdm +if [ -x /usr/bin/xdm ]; then + XDM_BIN=/usr/bin/xdm +else + XDM_BIN=/usr/X11R6/bin/xdm +fi + + +case "${DISPLAYMANAGER##*/}" in + kdm|kde|KDM|KDE) DISPLAYMANAGER=/opt/kde3/bin/kdm + PIDFILE="/var/run/kdm.pid" + ;; + xdm) DISPLAYMANAGER=$XDM_BIN + ;; + gdm|GDM|Gnome|GNOME) DISPLAYMANAGER=/opt/gnome/sbin/gdm + PIDFILE="/var/run/gdm.pid" + ;; + wdm|WDM) DISPLAYMANAGER=/usr/X11R6/bin/wdm + ;; + console) exit 0 + ;; + *) DISPLAYMANAGER=$XDM_BIN + if test -x /opt/kde3/bin/kdm; then + DISPLAYMANAGER=/opt/kde3/bin/kdm + PIDFILE="/var/run/kdm.pid" + fi + ;; +esac +test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=$XDM_BIN + +DM=${DISPLAYMANAGER##*/} + +rc_reset +case "$1" in + start) + # Avoid duplicated messages when earlykdm is in use + if test "$DISPLAYMANAGER" = /opt/kde3/bin/kdm && \ + test -s /var/run/kdm.pid && \ + /sbin/checkproc -p /var/run/kdm.pid /opt/kde3/bin/kdm; then + rc_exit 0 + fi + + test -x /etc/X11/xdm/SuSEconfig.xdm && /etc/X11/xdm/SuSEconfig.xdm + + echo -n "Starting service $DM" + # Don't start xdm if no Xserver is configured and xdm is not + # configured for remote access + if [ ! -x /usr/bin/X -a ! -x /usr/X11R6/bin/X -a \ + "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ]; then + rc_status -u + rc_exit + fi + if [ "$DISPLAYMANAGER" = "/opt/gnome/sbin/gdm" -a \ + "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" -a \ + "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then + XDMOPTIONS="--no-console" + fi + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + # After a crash or a kill signal we may have + # a wrong owner ship of /dev/xconsole + if rc_status ; then + if test -x $XDMDIR/TakeDevices ; then + $XDMDIR/TakeDevices + else + chown root:tty /dev/xconsole /dev/tty0 + chmod 622 /dev/xconsole /dev/tty0 + fi + fi + rc_status -v + ;; + stop) + echo -n "Shutting down service $DM" + # + # killproc(8) sleep upto five seconds and sends + # SIGKILL if xdm does not terminate within + # + killproc -p $PIDFILE -TERM $DISPLAYMANAGER + rc_status -v + ;; + restart) + $0 stop + $0 start + rc_status + ;; + reload|force-reload) + test -x /etc/X11/xdm/SuSEconfig.xdm && /etc/X11/xdm/SuSEconfig.xdm + echo -n "Reload service $DM" + killproc -p $PIDFILE -HUP $DISPLAYMANAGER + rc_status -v + ;; + status|check) + echo -n "Checking for service ${DM}: " + checkproc -p $PIDFILE $DISPLAYMANAGER + rc_status -v + ;; + probe) + if test $XDMDIR/xdm-config -nt $PIDFILE -o \ + $XDMDIR/Xservers -nt $PIDFILE + then + echo reload + fi + ;; + try-restart|condrestart) + $0 status + if test $? = 0; then + $0 restart + else + rc_reset + fi + rc_status + ;; + *) + echo "Usage: $0 {start|stop|status|restart|reload|force-reload|probe|try-restart}" + exit 1 +esac +rc_exit diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/usr/sbin/rcxdm new/usr/sbin/rcxdm --- old/usr/sbin/rcxdm 1970-01-01 01:00:00.000000000 +0100 +++ new/usr/sbin/rcxdm 2006-09-01 01:42:42.000000000 +0200 @@ -0,0 +1 @@ +symbolic link to /etc/init.d/xdm diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/var/adm/fillup-templates/sysconfig.displaymanager new/var/adm/fillup-templates/sysconfig.displaymanager --- old/var/adm/fillup-templates/sysconfig.displaymanager 1970-01-01 01:00:00.000000000 +0100 +++ new/var/adm/fillup-templates/sysconfig.displaymanager 2006-08-31 21:16:08.000000000 +0200 @@ -0,0 +1,87 @@ +## Path: Desktop/Display manager +## Description: settings to generate a proper displaymanager config +## Config: xdm,kdm,gdm + +## Type: string(kdm,xdm,gdm,wdm,console) +## Default: "" +# +# Here you can set the default Display manager (kdm/xdm/gdm/wdm/console). +# all changes in this file require a restart of the displaymanager +# +DISPLAYMANAGER="" + +## Type: yesno +## Default: no +# +# Allow remote access (XDMCP) to your display manager (xdm/kdm/gdm). Please note +# that a modified kdm or xdm configuration, e.g. by KDE control center +# will not be changed. For gdm, values will be updated after change. +# XDMCP service should run only on trusted networks and you have to disable +# firewall for interfaces, where you want to provide this service. +# +DISPLAYMANAGER_REMOTE_ACCESS="no" + +## Type: yesno +## Default: no +# +# Allow remote access of the user root to your display manager. Note +# that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and +# System/Security/Permissions/PERMISSION_SECURITY is "paranoid" +# +DISPLAYMANAGER_ROOT_LOGIN_REMOTE="no" + +## Type: yesno +## Default: yes +# +# Let the displaymanager start a local Xserver. +# Set to "no" for remote-access only. +# Set to "no" on architectures without any Xserver (e.g. s390/s390x). +# +DISPLAYMANAGER_STARTS_XSERVER="yes" + +## Type: yesno +## Default: no +# +# TCP port 6000 of Xserver. When set to "no" (default) Xserver is +# started with "-nolisten tcp". Only set this to "yes" if you really +# need to. Remote X service should run only on trusted networks and +# you have to disable firewall for interfaces, where you want to +# provide this service. Use ssh X11 port forwarding whenever possible. +# +DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN="no" + +## Type: string +## Default: +# +# Define the user whom should get logged in without request. If string +# is empty, display standard login dialog. +# +DISPLAYMANAGER_AUTOLOGIN="" + +## Type: yesno +## Default: no +# +# Allow all users to login without password, but ask for the user, if +# DISPLAYMANAGER_AUTOLOGIN is empty. +# +DISPLAYMANAGER_PASSWORD_LESS_LOGIN="no" + +## Type: yesno +## Default: no +# +# Display a combobox for Active Directory domains. +# +DISPLAYMANAGER_AD_INTEGRATION="no" + +## Type: list(root,all,none,auto) +## Default: auto +# +# Determine who will be able to shutdown or reboot the system in kdm +# and gdm. Valid values are: "root" (only root can shutdown), "all" +# (everybody can shutdown), "none" (nobody can shutdown from +# displaymanager), "auto" (follow +# System/Security/Permissions/PERMISSION_SECURITY to decide: "easy +# local" is equal to "all", everything else is equal to "root"). Note +# that remote user can never shutdown in GDM. +# +DISPLAYMANAGER_SHUTDOWN="auto" ++++++ xprop-X11R7.0-1.0.1.tar.bz2 -> xprop-1.0.2.tar.bz2 ++++++ ++++ 12023 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xprop-X11R7.0-1.0.1/compile new/xprop-1.0.2/compile --- old/xprop-X11R7.0-1.0.1/compile 2005-12-21 08:31:48.000000000 +0100 +++ new/xprop-1.0.2/compile 2006-08-29 18:57:08.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 <tromey@cygnus.com>. # # 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 <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +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 <bug-automake@gnu.org>. +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/xprop-X11R7.0-1.0.1/configure.ac new/xprop-1.0.2/configure.ac --- old/xprop-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:53.000000000 +0100 +++ new/xprop-1.0.2/configure.ac 2006-08-29 19:03:01.000000000 +0200 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xprop,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xprop) +AC_INIT(xprop,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xprop) 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/xprop-X11R7.0-1.0.1/missing new/xprop-1.0.2/missing --- old/xprop-X11R7.0-1.0.1/missing 2005-12-21 08:31:48.000000000 +0100 +++ new/xprop-1.0.2/missing 2006-08-29 18:57:07.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 <pinard@iro.umontreal.ca>, 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 <bug-automake@gnu.org>." + 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/xprop-X11R7.0-1.0.1/xprop.c new/xprop-1.0.2/xprop.c --- old/xprop-X11R7.0-1.0.1/xprop.c 2004-04-23 21:55:03.000000000 +0200 +++ new/xprop-1.0.2/xprop.c 2006-08-29 19:03:25.000000000 +0200 @@ -1199,6 +1199,8 @@ nbytes = sizeof(short); else if (actual_format == 8) nbytes = 1; + else if (actual_format == 0) + nbytes = 0; else abort(); *length = min(nitems * nbytes, max_len); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org