Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Wed Apr 7 13:22:31 CEST 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-03-21 11:43:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-04-06 15:07:25.000000000 +0200
@@ -1,0 +2,57 @@
+Tue Apr 6 11:51:00 UTC 2010 - eich@suse.de
+
+- xcursorgen: change dependency on libpng from libpng12 to libpng.
+ This change makes it build with libpng14, too.
+
+
+-------------------------------------------------------------------
+Mon Apr 5 08:45:06 CEST 2010 - sndirsch@suse.de
+
+- xdm 1.1.9
+- xsm 1.0.1-20100211-4f56a25
+- adjusted xdm-consolekit.diff
+- removed xphelloworld-X11R7.0-1.0.1.tar.bz2 (requires Xaw8)
+
+-------------------------------------------------------------------
+Sun Apr 4 21:45:19 CEST 2010 - sndirsch@suse.de
+
+- bdftopcf 1.0.2
+- iceauth 1.0.3
+- luit 1.0.4
+- mkfontdir 1.0.5
+- mkfontscale 1.0.7
+- sessreg 1.0.5
+- smproxy 1.0.3
+- x11perf 1.5.1
+- xbacklight 1.1.1
+- xcmsdb 1.0.2
+- xcursor-themes 1.0.2
+- xcursorgen 1.0.3
+- xev 1.0.4
+- xgamma 1.0.3
+- xhost 1.0.3
+- xinput 1.5.0
+- xkbcomp 1.1.1
+- xkbevd 1.1.0
+- xkbutils 1.0.2
+- xkill 1.0.2
+- xlsatoms 1.0.2
+- xlsclients 1.0.2
+- xmodmap 1.0.4
+- xpr 1.0.3
+- xprop 1.1.0
+- xrdb 1.0.6
+- xrefresh 1.0.3
+- xset 1.1.0
+- xsetroot 1.0.3
+- xvinfo 1.1.0
+- xwd 1.0.3
+- xwininfo 1.0.5
+- xwud 1.0.2
+- obsoletes xbacklight_5512e16_Use-Backlight-RandR-property-fall-back-to-legacy.patch
+- obsoletes C89-fix.patch
+- obsoletes Change-xauth_CFLAGS-to-AM_CFLAGS-to-make-automake-1.patch
+- obsoletes Replace-rsh-by-ssh-the-extract-merge-example.-Rsh-is.patch
+- bumped version number to 7.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
C89-fix.patch
Change-xauth_CFLAGS-to-AM_CFLAGS-to-make-automake-1.patch
Replace-rsh-by-ssh-the-extract-merge-example.-Rsh-is.patch
bdftopcf-1.0.1.tar.bz2
iceauth-1.0.2.tar.bz2
luit-1.0.3.tar.bz2
mkfontdir-1.0.4.tar.bz2
mkfontscale-1.0.6.tar.bz2
sessreg-1.0.4.tar.bz2
smproxy-X11R7.1-1.0.2.tar.bz2
x11perf-1.5.tar.bz2
xauth-1.0.3.tar.bz2
xbacklight-1.1.tar.bz2
xbacklight_5512e16_Use-Backlight-RandR-property-fall-back-to-legacy.patch
xcmsdb-X11R7.0-1.0.1.tar.bz2
xcursor-themes-X11R7.0-1.0.1.tar.bz2
xcursorgen-1.0.2.tar.bz2
xdm-1.1.8.tar.bz2
xev-1.0.3.tar.bz2
xgamma-1.0.2.tar.bz2
xhost-1.0.2.tar.bz2
xinput-1.4.2.tar.bz2
xkbcomp-1.1.0.tar.bz2
xkbevd-X11R7.1-1.0.2.tar.bz2
xkbutils-X11R7.0-1.0.1.tar.bz2
xkill-X11R7.0-1.0.1.tar.bz2
xlsatoms-X11R7.0-1.0.1.tar.bz2
xlsclients-X11R7.0-1.0.1.tar.bz2
xmodmap-1.0.3.tar.bz2
xphelloworld-X11R7.0-1.0.1.tar.bz2
xpr-1.0.2.tar.bz2
xprop-1.0.4.tar.bz2
xrdb-1.0.5.tar.bz2
xrefresh-X11R7.1-1.0.2.tar.bz2
xset-1.0.4.tar.bz2
xsetroot-1.0.2.tar.bz2
xsm-X11R7.0-1.0.1.tar.bz2
xvinfo-1.0.2.tar.bz2
xwd-1.0.2.tar.bz2
xwininfo-1.0.4.tar.bz2
xwud-X11R7.0-1.0.1.tar.bz2
New:
----
bdftopcf-1.0.2.tar.bz2
iceauth-1.0.3.tar.bz2
luit-1.0.4.tar.bz2
mkfontdir-1.0.5.tar.bz2
mkfontscale-1.0.7.tar.bz2
sessreg-1.0.5.tar.bz2
smproxy-1.0.3.tar.bz2
x11perf-1.5.1.tar.bz2
xauth-1.0.4.tar.bz2
xbacklight-1.1.1.tar.bz2
xcmsdb-1.0.2.tar.bz2
xcursor-themes-1.0.2.tar.bz2
xcursorgen-1.0.3.tar.bz2
xcursorgen-libpng.diff
xdm-1.1.9.tar.bz2
xev-1.0.4.tar.bz2
xgamma-1.0.3.tar.bz2
xhost-1.0.3.tar.bz2
xinput-1.5.0.tar.bz2
xkbcomp-1.1.1.tar.bz2
xkbevd-1.1.0.tar.bz2
xkbutils-1.0.2.tar.bz2
xkill-1.0.2.tar.bz2
xlsatoms-1.0.2.tar.bz2
xlsclients-1.0.2.tar.bz2
xmodmap-1.0.4.tar.bz2
xpr-1.0.3.tar.bz2
xprop-1.1.0.tar.bz2
xrdb-1.0.6.tar.bz2
xrefresh-1.0.3.tar.bz2
xset-1.1.0.tar.bz2
xsetroot-1.0.3.tar.bz2
xsm-1.0.1-20100211-4f56a25.tar.bz2
xvinfo-1.1.0.tar.bz2
xwd-1.0.3.tar.bz2
xwininfo-1.0.5.tar.bz2
xwud-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.iUm58h/_old 2010-04-07 13:21:59.000000000 +0200
+++ /var/tmp/diff_new_pack.iUm58h/_new 2010-04-07 13:21:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11 (Version 7.4)
+# spec file for package xorg-x11 (Version 7.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,8 +25,8 @@
BuildRequires: mcpp
%endif
Url: http://xorg.freedesktop.org/
-Version: 7.4
-Release: 46
+Version: 7.5
+Release: 1
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -41,47 +41,47 @@
Obsoletes: xcompmgr xrestop
Summary: X.Org core and sample applications
Source0: appres-1.0.1.tar.bz2
-Source1: bdftopcf-1.0.1.tar.bz2
+Source1: bdftopcf-1.0.2.tar.bz2
Source2: beforelight-1.0.3.tar.bz2
Source3: bitmap-1.0.3.tar.bz2
Source4: editres-1.0.3.tar.bz2
Source5: fonttosfnt-1.0.4.tar.bz2
Source6: fslsfonts-1.0.2.tar.bz2
Source7: fstobdf-1.0.3.tar.bz2
-Source8: iceauth-1.0.2.tar.bz2
+Source8: iceauth-1.0.3.tar.bz2
Source9: ico-1.0.2.tar.bz2
Source10: lbxproxy-1.0.2.tar.bz2
Source11: listres-X11R7.0-1.0.1.tar.bz2
-Source12: luit-1.0.3.tar.bz2
-Source14: mkfontdir-1.0.4.tar.bz2
-Source15: mkfontscale-1.0.6.tar.bz2
+Source12: luit-1.0.4.tar.bz2
+Source14: mkfontdir-1.0.5.tar.bz2
+Source15: mkfontscale-1.0.7.tar.bz2
Source16: oclock-X11R7.0-1.0.1.tar.bz2
Source17: proxymngr-X11R7.0-1.0.1.tar.bz2
Source18: rgb-1.0.3.tar.bz2
Source19: rstart-1.0.3.tar.bz2
Source20: scripts-X11R7.0-1.0.1.tar.bz2
-Source21: sessreg-1.0.4.tar.bz2
+Source21: sessreg-1.0.5.tar.bz2
Source22: setxkbmap-1.1.0.tar.bz2
Source23: showfont-1.0.2.tar.bz2
-Source24: smproxy-X11R7.1-1.0.2.tar.bz2
+Source24: smproxy-1.0.3.tar.bz2
Source25: twm-1.0.4.tar.bz2
Source26: viewres-X11R7.0-1.0.1.tar.bz2
-Source27: x11perf-1.5.tar.bz2
-Source28: xauth-1.0.3.tar.bz2
+Source27: x11perf-1.5.1.tar.bz2
+Source28: xauth-1.0.4.tar.bz2
Source29: xbiff-X11R7.0-1.0.1.tar.bz2
Source30: xcalc-1.0.2.tar.bz2
Source31: xclipboard-X11R7.0-1.0.1.tar.bz2
Source32: xclock-1.0.3.tar.bz2
-Source33: xcmsdb-X11R7.0-1.0.1.tar.bz2
+Source33: xcmsdb-1.0.2.tar.bz2
Source34: xconsole-1.0.3.tar.bz2
-Source35: xcursor-themes-X11R7.0-1.0.1.tar.bz2
-Source36: xcursorgen-1.0.2.tar.bz2
+Source35: xcursor-themes-1.0.2.tar.bz2
+Source36: xcursorgen-1.0.3.tar.bz2
Source37: xdbedizzy-1.0.2.tar.bz2
Source38: xditview-X11R7.0-1.0.1.tar.bz2
-Source39: xdm-1.1.8.tar.bz2
+Source39: xdm-1.1.9.tar.bz2
Source40: xdpyinfo-1.1.0.tar.bz2
Source42: xedit-1.1.2.tar.bz2
-Source43: xev-1.0.3.tar.bz2
+Source43: xev-1.0.4.tar.bz2
Source44: xeyes-X11R7.0-1.0.1.tar.bz2
Source45: xf86dga-1.0.2.tar.bz2
Source46: xfd-X11R7.0-1.0.1.tar.bz2
@@ -90,51 +90,50 @@
Source49: xfs-1.1.0.tar.bz2
Source50: xfsinfo-1.0.2.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
-Source52: xgamma-1.0.2.tar.bz2
+Source52: xgamma-1.0.3.tar.bz2
Source53: xgc-X11R7.0-1.0.1.tar.bz2
-Source54: xhost-1.0.2.tar.bz2
+Source54: xhost-1.0.3.tar.bz2
Source55: xinit-1.1.1.tar.bz2
-Source56: xkbcomp-1.1.0.tar.bz2
-Source57: xkbevd-X11R7.1-1.0.2.tar.bz2
+Source56: xkbcomp-1.1.1.tar.bz2
+Source57: xkbevd-1.1.0.tar.bz2
Source58: xkbprint-X11R7.0-1.0.1.tar.bz2
-Source59: xkbutils-X11R7.0-1.0.1.tar.bz2
-Source60: xkill-X11R7.0-1.0.1.tar.bz2
+Source59: xkbutils-1.0.2.tar.bz2
+Source60: xkill-1.0.2.tar.bz2
Source61: xload-1.0.2.tar.bz2
Source62: xlogo-X11R7.0-1.0.1.tar.bz2
-Source63: xlsatoms-X11R7.0-1.0.1.tar.bz2
-Source64: xlsclients-X11R7.0-1.0.1.tar.bz2
+Source63: xlsatoms-1.0.2.tar.bz2
+Source64: xlsclients-1.0.2.tar.bz2
Source65: xlsfonts-1.0.2.tar.bz2
Source66: xmag-1.0.3.tar.bz2
Source67: xman-1.0.3.tar.bz2
Source68: xmessage-1.0.2.tar.bz2
Source69: xmh-X11R7.0-1.0.1.tar.bz2
-Source70: xmodmap-1.0.3.tar.bz2
+Source70: xmodmap-1.0.4.tar.bz2
Source71: xmore-X11R7.0-1.0.1.tar.bz2
-Source72: xphelloworld-X11R7.0-1.0.1.tar.bz2
Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2
-Source74: xpr-1.0.2.tar.bz2
+Source74: xpr-1.0.3.tar.bz2
Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2
-Source76: xprop-1.0.4.tar.bz2
+Source76: xprop-1.1.0.tar.bz2
Source77: xrandr-1.3.2.tar.bz2
-Source78: xrdb-1.0.5.tar.bz2
-Source79: xrefresh-X11R7.1-1.0.2.tar.bz2
+Source78: xrdb-1.0.6.tar.bz2
+Source79: xrefresh-1.0.3.tar.bz2
Source80: xrx-1.0.3.tar.bz2
-Source81: xset-1.0.4.tar.bz2
+Source81: xset-1.1.0.tar.bz2
Source82: xsetmode-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
+Source84: xsetroot-1.0.3.tar.bz2
+Source85: xsm-1.0.1-20100211-4f56a25.tar.bz2
Source86: xstdcmap-X11R7.0-1.0.1.tar.bz2
Source87: xtrap-X11R7.1-1.0.2.tar.bz2
Source88: xvidtune-X11R7.0-1.0.1.tar.bz2
-Source89: xvinfo-1.0.2.tar.bz2
-Source90: xwd-1.0.2.tar.bz2
-Source91: xwininfo-1.0.4.tar.bz2
-Source92: xwud-X11R7.0-1.0.1.tar.bz2
+Source89: xvinfo-1.1.0.tar.bz2
+Source90: xwd-1.0.3.tar.bz2
+Source91: xwininfo-1.0.5.tar.bz2
+Source92: xwud-1.0.2.tar.bz2
Source93: mkcomposecache-1.2.tar.bz2
Source94: rendercheck-1.3.tar.bz2
-Source96: xbacklight-1.1.tar.bz2
-Source97: xinput-1.4.2.tar.bz2
+Source96: xbacklight-1.1.1.tar.bz2
+Source97: xinput-1.5.0.tar.bz2
Source98: xcompmgr-1.1.4.tar.bz2
Source99: xrestop-0.4.tar.bz2
Source200: misc.tar.bz2
@@ -162,15 +161,12 @@
Patch46: xfd.diff
Patch47: xfs-no_config_file.diff
Patch48: mkfontscale-skip_symlinks.diff
-Patch50: C89-fix.patch
-Patch51: Change-xauth_CFLAGS-to-AM_CFLAGS-to-make-automake-1.patch
-Patch52: Replace-rsh-by-ssh-the-extract-merge-example.-Rsh-is.patch
Patch53: xconsole-no-stropts.patch
Patch54: xinit-client-session.patch
Patch55: xset-spurious-xprint.patch
Patch56: xdm-consolekit.diff
-Patch57: xbacklight_5512e16_Use-Backlight-RandR-property-fall-back-to-legacy.patch
Patch58: 0001-XDM-Add-support-for-clients-that-sent-ipv4-addresses.patch
+Patch59: xcursorgen-libpng.diff
%description
This package contains the X.Org core and sample applications.
@@ -263,7 +259,7 @@
pushd xinit-*
%patch7
popd
-pushd xsm-*
+pushd xsm
%patch8
popd
pushd xrx-*
@@ -283,9 +279,6 @@
popd
pushd xauth-*
%patch24
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
popd
pushd xfd-*
%patch46
@@ -304,8 +297,8 @@
patch -d xfs-* -p0 -s < %PATCH47
patch -d mkfontscale-* -p1 -s < %PATCH48
patch -d xdm-* -p1 -s < %PATCH56
-patch -d xbacklight-* -p1 -s < %PATCH57
patch -d xdm-* -p1 -s < %PATCH58
+patch -d xcursorgen-* -p1 -s < %PATCH59
%build
@@ -318,9 +311,10 @@
#autoreconf -fi
case $dir in
xdm-*) option='--with-pam --with-xdmconfigdir=/etc/X11/xdm --with-xdmscriptdir=/etc/X11/xdm'; autoreconf -fi ;;
- xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*|beforelight-*|xrx-*)
+ xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm|scripts-*|sessreg-*|beforelight-*|xrx-*)
option=''; autoreconf -fi ;;
luit-*) option='--with-localealiasfile=/usr/share/X11/locale/locale.alias' ;;
+ xcursorgen-*) autoreconf -fi; options='' ;;
*) option='' ;;
esac
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
++++++ bdftopcf-1.0.1.tar.bz2 -> bdftopcf-1.0.2.tar.bz2 ++++++
++++ 10452 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/bdftopcf-1.0.1/ChangeLog new/bdftopcf-1.0.2/ChangeLog
--- old/bdftopcf-1.0.1/ChangeLog 2007-04-26 01:30:49.000000000 +0200
+++ new/bdftopcf-1.0.2/ChangeLog 2009-09-22 04:58:17.000000000 +0200
@@ -1,3 +1,48 @@
+commit 74b5dca54052c778d49e96b92fc2ef888a80cf8f
+Author: Alan Coopersmith
+Date: Mon Sep 21 19:57:36 2009 -0700
+
+ bdftopcf 1.0.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4f63878eab32d41c8a010d5e187f0c4cdc7eff32
+Author: Alan Coopersmith
+Date: Mon Sep 21 19:51:44 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 96a182df6f4168ec0b5585f08b088bfd58a383f6
+Author: Alan Coopersmith
+Date: Mon Sep 21 19:43:10 2009 -0700
+
+ Add pointers to mailing list, bugzilla, wiki & git repo to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7f1a66ecbe983e83e91941706218cde705b6cc0b
+Author: Paulo Cesar Pereira de Andrade
+Date: Thu Jan 15 18:18:52 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck. There weren't any gcc 4.3 or sparse warnings.
+
+commit 74541609dccff6e8405286b3f27661e2f4a00b29
+Author: James Cloos
+Date: Thu Dec 6 15:51:03 2007 -0500
+
+ Add missing PHONY line for automatic ChangeLog generation
+
+commit d6286044123ff787acf494a376dc22b2265623e2
+Author: Alan Coopersmith
+Date: Wed Apr 25 17:05:43 2007 -0700
+
+ Version bump: 1.0.1
+
commit 963c88d67500b581fd4d44d4f561089c66bf7c56
Author: Alan Coopersmith
Date: Tue Apr 24 20:04:39 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/bdftopcf-1.0.1/Makefile.am new/bdftopcf-1.0.2/Makefile.am
--- old/bdftopcf-1.0.1/Makefile.am 2007-04-25 05:02:32.000000000 +0200
+++ new/bdftopcf-1.0.2/Makefile.am 2009-09-22 04:44:31.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = bdftopcf
-bdftopcf_CFLAGS = @BDFTOPCF_CFLAGS@
+bdftopcf_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@
bdftopcf_LDADD = @BDFTOPCF_LIBS@
bdftopcf_SOURCES = bdftopcf.c
@@ -59,8 +59,10 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+.PHONY: ChangeLog
+
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
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/bdftopcf-1.0.1/README new/bdftopcf-1.0.2/README
--- old/bdftopcf-1.0.1/README 2006-07-11 04:50:27.000000000 +0200
+++ new/bdftopcf-1.0.2/README 2009-09-22 04:06:17.000000000 +0200
@@ -4,3 +4,27 @@
them directly without reformatting. This allows fast reading on the
appropriate machine, but the files are still portable (but read more
slowly) on other machines.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/bdftopcf
+
+ http://cgit.freedesktop.org/xorg/app/bdftopcf
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/bdftopcf-1.0.1/compile new/bdftopcf-1.0.2/compile
--- old/bdftopcf-1.0.1/compile 2007-04-26 01:29:46.000000000 +0200
+++ new/bdftopcf-1.0.2/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bdftopcf-1.0.1/config.h.in new/bdftopcf-1.0.2/config.h.in
--- old/bdftopcf-1.0.1/config.h.in 2007-04-26 01:29:44.000000000 +0200
+++ new/bdftopcf-1.0.2/config.h.in 2009-09-22 04:58:17.000000000 +0200
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -27,5 +54,8 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bdftopcf-1.0.1/configure.ac new/bdftopcf-1.0.2/configure.ac
--- old/bdftopcf-1.0.1/configure.ac 2007-04-26 01:29:01.000000000 +0200
+++ new/bdftopcf-1.0.2/configure.ac 2009-09-22 04:56:13.000000000 +0200
@@ -21,26 +21,26 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(bdftopcf, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], bdftopcf)
+AC_INIT(bdftopcf, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], bdftopcf)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(BDFTOPCF, xfont)
AC_SUBST(BDFTOPCF_CFLAGS)
AC_SUBST(BDFTOPCF_LIBS)
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])
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/bdftopcf-1.0.1/missing new/bdftopcf-1.0.2/missing
--- old/bdftopcf-1.0.1/missing 2007-04-26 01:29:45.000000000 +0200
+++ new/bdftopcf-1.0.2/missing 2009-09-22 04:45:24.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -103,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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)
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -145,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -154,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -164,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -192,8 +203,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,80 +218,78 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
++++++ iceauth-1.0.2.tar.bz2 -> iceauth-1.0.3.tar.bz2 ++++++
++++ 9230 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/iceauth-1.0.2/ChangeLog new/iceauth-1.0.3/ChangeLog
--- old/iceauth-1.0.2/ChangeLog 2007-07-24 03:24:52.000000000 +0200
+++ new/iceauth-1.0.3/ChangeLog 2009-10-11 04:59:30.000000000 +0200
@@ -1,3 +1,36 @@
+commit 42a269e9d35234306d3208eef9c8bdb2c04caf08
+Author: Alan Coopersmith
+Date: Sat Oct 10 19:58:20 2009 -0700
+
+ iceauth 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit e772cc19bf632b3f94c5a6e841f4eef4f7b89e72
+Author: Alan Coopersmith
+Date: Sat Oct 10 19:57:34 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 42a6f0bc10530c31643b2fd768c48750ec451391
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:17 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 04f61947ea6c3638001057934588938473b454b3
+Author: Paulo Cesar Pereira de Andrade
+Date: Thu Jan 15 18:38:12 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck. There weren't any gcc 4.3 and sparse warnings.
+
commit 5e52eb5d27986490dfad02781a452b8d0650f4b9
Author: Alan Coopersmith
Date: Mon Jul 23 18:23:56 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/iceauth-1.0.2/Makefile.am new/iceauth-1.0.3/Makefile.am
--- old/iceauth-1.0.2/Makefile.am 2007-07-24 02:49:05.000000000 +0200
+++ new/iceauth-1.0.3/Makefile.am 2009-10-11 04:55:41.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = iceauth
-AM_CFLAGS = $(ICEAUTH_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(ICEAUTH_CFLAGS)
iceauth_LDADD = $(ICEAUTH_LIBS)
iceauth_SOURCES = \
@@ -45,7 +45,7 @@
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
@@ -71,7 +71,7 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
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/iceauth-1.0.2/README new/iceauth-1.0.3/README
--- old/iceauth-1.0.2/README 2006-07-11 04:50:59.000000000 +0200
+++ new/iceauth-1.0.3/README 2009-10-02 00:08:59.000000000 +0200
@@ -0,0 +1,27 @@
+The iceauth program is used to edit and display the authorization
+information used in connecting with ICE. It operates very much
+like the xauth program for X11 connection authentication records.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/iceauth
+
+ http://cgit.freedesktop.org/xorg/app/iceauth
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/iceauth-1.0.2/config.h.in new/iceauth-1.0.3/config.h.in
--- old/iceauth-1.0.2/config.h.in 2007-07-24 03:24:38.000000000 +0200
+++ new/iceauth-1.0.3/config.h.in 2009-10-11 04:59:20.000000000 +0200
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -30,5 +57,8 @@
/* 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
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iceauth-1.0.2/configure.ac new/iceauth-1.0.3/configure.ac
--- old/iceauth-1.0.2/configure.ac 2007-07-24 03:23:40.000000000 +0200
+++ new/iceauth-1.0.3/configure.ac 2009-10-11 04:58:00.000000000 +0200
@@ -22,28 +22,29 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(iceauth,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],iceauth)
+AC_INIT(iceauth,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],iceauth)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
AC_PROG_INSTALL
AC_TYPE_SIGNAL
+XORG_DEFAULT_OPTIONS
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(ICEAUTH, xproto ice)
AC_SUBST(ICEAUTH_CFLAGS)
AC_SUBST(ICEAUTH_LIBS)
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])
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/iceauth-1.0.2/missing new/iceauth-1.0.3/missing
--- old/iceauth-1.0.2/missing 2007-07-24 03:24:39.000000000 +0200
+++ new/iceauth-1.0.3/missing 2009-10-11 04:59:22.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
++++++ luit-1.0.3.tar.bz2 -> luit-1.0.4.tar.bz2 ++++++
++++ 11055 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-1.0.3/ChangeLog new/luit-1.0.4/ChangeLog
--- old/luit-1.0.3/ChangeLog 2008-02-01 00:28:18.000000000 +0100
+++ new/luit-1.0.4/ChangeLog 2009-10-02 03:15:07.000000000 +0200
@@ -1,3 +1,54 @@
+commit f5e4bc812cec6503722ee289a0cc1099ce6fb3f5
+Author: Alan Coopersmith
+Date: Thu Oct 1 18:14:18 2009 -0700
+
+ luit 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit 61bb775852796628207a5062d8fdd8bcd6ec77bd
+Author: Alan Coopersmith
+Date: Thu Oct 1 18:01:27 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8f9d685e4bb91640fb01392c6d73e7d9e365b41b
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:17 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4823838f77ab03cccd07860fdf8002bc577e0f04
+Author: Alan Coopersmith
+Date: Thu Apr 9 14:55:03 2009 -0700
+
+ luit: Convert platform #ifdefs to configure tests for functions & headers
+
+ Also check for __SVR4 in remaining SVR4 check to match Solaris compiler
+ default definition.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 638f4ac8e233973dc3c89d87cd9f6ac05489fef4
+Author: Paulo Cesar Pereira de Andrade
+Date: Fri Jan 16 20:01:11 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and most gcc 4.3 and sparse warnings.
+
+commit 51eae7b3a07faab716ea7ef3186cee658f393d04
+Author: Jeremy Huddleston
+Date: Fri Apr 11 10:32:59 2008 -0700
+
+ Apple: Use secure tty
+ Thanks to Martin Otte for the patch
+
commit 2547b637ab615884ea51458dfb793f1a70bc5201
Author: Julien Cristau
Date: Fri Feb 1 00:08:27 2008 +0100
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-1.0.3/Makefile.am new/luit-1.0.4/Makefile.am
--- old/luit-1.0.3/Makefile.am 2008-02-01 00:05:01.000000000 +0100
+++ new/luit-1.0.4/Makefile.am 2009-10-02 03:13:19.000000000 +0200
@@ -23,7 +23,8 @@
LOCALEALIASFILE = @LOCALEALIASFILE@
-AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
+AM_CFLAGS = $(CWARNFLAGS) $(LUIT_CFLAGS) \
+ -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
luit_LDADD = $(LUIT_LIBS)
luit_SOURCES = \
@@ -59,7 +60,7 @@
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
@@ -84,4 +85,4 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-1.0.3/README new/luit-1.0.4/README
--- old/luit-1.0.3/README 2006-11-04 14:58:45.000000000 +0100
+++ new/luit-1.0.4/README 2009-10-02 00:16:58.000000000 +0200
@@ -0,0 +1,28 @@
+Luit is a filter that can be run between an arbitrary application and
+a UTF-8 terminal emulator such as xterm. It will convert application
+output from the locale's encoding into UTF-8, and convert terminal
+input from UTF-8 into the locale's encoding.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/luit
+
+ http://cgit.freedesktop.org/xorg/app/luit
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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-1.0.3/charset.c new/luit-1.0.4/charset.c
--- old/luit-1.0.3/charset.c 2008-01-29 21:01:42.000000000 +0100
+++ new/luit-1.0.4/charset.c 2009-01-22 16:09:12.000000000 +0100
@@ -75,13 +75,13 @@
return -1;
}
-CharsetRec Unknown94Charset =
+static CharsetRec Unknown94Charset =
{ "Unknown (94)", T_94, 0, IdentityRecode, NullReverse, NULL, NULL};
-CharsetRec Unknown96Charset =
+static CharsetRec Unknown96Charset =
{ "Unknown (96)", T_96, 0, IdentityRecode, NullReverse, NULL, NULL};
-CharsetRec Unknown9494Charset =
+static CharsetRec Unknown9494Charset =
{ "Unknown (94x94)", T_9494, 0, IdentityRecode, NullReverse, NULL, NULL};
-CharsetRec Unknown9696Charset =
+static CharsetRec Unknown9696Charset =
{ "Unknown (96x96)", T_9696, 0, IdentityRecode, NullReverse, NULL, NULL};
typedef struct _FontencCharset {
@@ -94,7 +94,7 @@
FontMapReversePtr reverse;
} FontencCharsetRec, *FontencCharsetPtr;
-FontencCharsetRec fontencCharsets[] = {
+static FontencCharsetRec fontencCharsets[] = {
{"ISO 646 (1973)", T_94, '@', "iso646.1973-0", 0x00, NULL, NULL},
{"ASCII", T_94, 'B', "iso8859-1", 0x00, NULL, NULL},
{"JIS X 0201:GL", T_94, 'J', "jisx0201.1976-0", 0x00, NULL, NULL},
@@ -154,7 +154,7 @@
int (*stack)(unsigned char, OtherStatePtr);
} OtherCharsetRec, *OtherCharsetPtr;
-OtherCharsetRec otherCharsets[] = {
+static OtherCharsetRec otherCharsets[] = {
{"GBK", init_gbk, mapping_gbk, reverse_gbk, stack_gbk},
{"UTF-8", init_utf8, mapping_utf8, reverse_utf8, stack_utf8},
{"SJIS", init_sjis, mapping_sjis, reverse_sjis, stack_sjis},
@@ -393,7 +393,7 @@
return getUnknownCharset(T_94);
}
-const LocaleCharsetRec localeCharsets[] = {
+static const LocaleCharsetRec localeCharsets[] = {
{ "C", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
{ "POSIX", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
{ "ISO8859-1", 0, 2, "ASCII", NULL, "ISO 8859-1", NULL, NULL},
@@ -481,7 +481,7 @@
}
if(p->name == NULL) {
- if (resolved != 0)
+ if (resolved != NULL)
free(resolved);
return -1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-1.0.3/config.h.in new/luit-1.0.4/config.h.in
--- old/luit-1.0.3/config.h.in 2008-02-01 00:08:39.000000000 +0100
+++ new/luit-1.0.4/config.h.in 2009-10-02 03:14:41.000000000 +0200
@@ -1,8 +1,59 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the `grantpt' function. */
+#undef HAVE_GRANTPT
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_POLL_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_PTY_H
+
+/* Define to 1 if you have the `select' function. */
+#undef HAVE_SELECT
+
+/* 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_STROPTS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_SELECT_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
+
/* Name of package */
#undef PACKAGE
@@ -30,5 +81,8 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/luit-1.0.3/configure.ac new/luit-1.0.4/configure.ac
--- old/luit-1.0.3/configure.ac 2008-01-31 23:59:11.000000000 +0100
+++ new/luit-1.0.4/configure.ac 2009-10-02 03:13:57.000000000 +0200
@@ -22,16 +22,25 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(luit,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
+AC_INIT(luit,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],luit)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
AC_CANONICAL_HOST
+XORG_DEFAULT_OPTIONS
+
+AC_CHECK_HEADERS([poll.h pty.h stropts.h sys/param.h sys/select.h])
+AC_CHECK_FUNCS([poll select grantpt])
+
AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([zlib not found]))
AC_ARG_WITH(localealiasfile,
@@ -57,7 +66,4 @@
AC_SUBST(LUIT_CFLAGS)
AC_SUBST(LUIT_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile])
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-1.0.3/iso2022.c new/luit-1.0.4/iso2022.c
--- old/luit-1.0.3/iso2022.c 2006-11-04 14:58:45.000000000 +0100
+++ new/luit-1.0.4/iso2022.c 2009-01-22 16:09:12.000000000 +0100
@@ -37,8 +37,8 @@
#include "iso2022.h"
#define BUFFERED_INPUT_SIZE 4
-unsigned char buffered_input[BUFFERED_INPUT_SIZE];
-int buffered_input_count = 0;
+static unsigned char buffered_input[BUFFERED_INPUT_SIZE];
+static int buffered_input_count = 0;
static void
FatalError(char *f, ...)
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-1.0.3/luit.c new/luit-1.0.4/luit.c
--- old/luit-1.0.3/luit.c 2008-01-29 21:01:42.000000000 +0100
+++ new/luit-1.0.4/luit.c 2009-04-09 23:46:27.000000000 +0200
@@ -34,8 +34,12 @@
#include
#include
-#ifdef SVR4
-#include
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#ifdef HAVE_STROPTS_H
+# include
#endif
#include
@@ -52,11 +56,11 @@
int ilog = -1;
int olog = -1;
int verbose = 0;
-int converter = 0;
-int exitOnChild = 0;
+static int converter = 0;
+static int exitOnChild = 0;
-volatile int sigwinch_queued = 0;
-volatile int sigchld_queued = 0;
+static volatile int sigwinch_queued = 0;
+static volatile int sigchld_queued = 0;
static int convert(int, int);
static int condom(int, char**);
@@ -452,6 +456,8 @@
int rc;
int val;
+ path = NULL;
+ child_argv = NULL;
rc = parseArgs(argc, argv, child_argv0,
&path, &child_argv);
if(rc < 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-1.0.3/missing new/luit-1.0.4/missing
--- old/luit-1.0.3/missing 2008-02-01 00:08:39.000000000 +0100
+++ new/luit-1.0.4/missing 2009-10-02 03:14:43.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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-1.0.3/sys.c new/luit-1.0.4/sys.c
--- old/luit-1.0.3/sys.c 2008-01-29 21:01:42.000000000 +0100
+++ new/luit-1.0.4/sys.c 2009-04-09 23:53:58.000000000 +0200
@@ -34,14 +34,8 @@
#include
#include
-#ifdef SVR4
-#define HAVE_POLL
-#endif
-
-#ifndef HAVE_POLL
-#ifndef _MINIX
-#define HAVE_SELECT
-#endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
#ifdef HAVE_POLL
@@ -49,27 +43,20 @@
#undef HAVE_SELECT
#endif
-#ifdef __QNX__
-#include
+#ifdef HAVE_SYS_SELECT_H
+# include
#endif
-
-#if (defined(__GLIBC__) && \
- (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))) || \
- defined(SVR4)
-#define HAVE_GRANTPT
+#ifdef HAVE_PTY_H
+# include
#endif
-#ifdef __GLIBC__
-#include
+#ifdef HAVE_STROPTS_H
+# include
#endif
-#ifdef SVR4
-#include
-#endif
-
-#if (defined(__unix__) || defined(unix)) && !defined(USG)
-#include
+#ifdef HAVE_SYS_PARAM_H
+# include
#endif
#include "sys.h"
@@ -340,7 +327,12 @@
char *temp_line;
int rc;
+#ifdef __APPLE__
+ pty = posix_openpt(O_RDWR);
+#else
pty = open("/dev/ptmx", O_RDWR);
+#endif
+
if(pty < 0)
goto bsd;
@@ -428,7 +420,7 @@
}
#endif
-#ifdef SVR4
+#if defined(SVR4) || defined(__SVR4)
rc = ioctl(tty, I_PUSH, "ptem");
if(rc < 0)
goto bail;
++++++ mkfontdir-1.0.4.tar.bz2 -> mkfontdir-1.0.5.tar.bz2 ++++++
++++ 8950 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/mkfontdir-1.0.4/ChangeLog new/mkfontdir-1.0.5/ChangeLog
--- old/mkfontdir-1.0.4/ChangeLog 2008-03-06 22:45:22.000000000 +0100
+++ new/mkfontdir-1.0.5/ChangeLog 2009-10-11 07:48:28.000000000 +0200
@@ -1,3 +1,39 @@
+commit e8be20c2cd3ba3ac94b3a9d9b5a22b31aa2686a8
+Author: Alan Coopersmith
+Date: Sat Oct 10 22:47:34 2009 -0700
+
+ mkfontdir 1.0.5
+
+ Signed-off-by: Alan Coopersmith
+
+commit 006fa08ebb08b03b2c390c708e96d005f3613538
+Author: Alan Coopersmith
+Date: Sat Oct 10 22:47:09 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit ca2834cb13734a4a3fa7b44f00ae1d69f7b8d364
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:18 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5cff04431124e447f3499850924601ae28d4fceb
+Author: Paulo Cesar Pereira de Andrade
+Date: Fri Jan 16 20:11:47 2009 -0200
+
+ Use XORG_CHANGELOG to correct "make distcheck"
+
+commit ae3643d936ae4eed9d0b1dfa60fe83718a9987e8
+Author: Adam Jackson
+Date: Thu Mar 6 16:47:38 2008 -0500
+
+ mkfontdir 1.0.4
+
commit 24c0bbb24d2bc5aa37f4ef0bc79882d9ed48b94d
Author: Alan Coopersmith
Date: Fri Jan 11 12:40:52 2008 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontdir-1.0.4/Makefile.am new/mkfontdir-1.0.5/Makefile.am
--- old/mkfontdir-1.0.4/Makefile.am 2008-03-06 22:44:46.000000000 +0100
+++ new/mkfontdir-1.0.5/Makefile.am 2009-10-11 07:35:36.000000000 +0200
@@ -24,7 +24,7 @@
appman_PRE = mkfontdir.man
.cpp:
- $(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < $< | $(SED) s/XCOMM/\#/ > $@
+ $(AM_V_GEN)$(SED) s,BINDIR,`echo @bindir@/mkfontscale | $(SED) s,/[^/]*$$,,`, < $< | $(SED) s/XCOMM/\#/ > $@
EXTRA_DIST = mkfontdir.cpp
CLEANFILES = $(bin_SCRIPTS)
@@ -36,8 +36,6 @@
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@@ -58,7 +56,7 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man .cpp
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -66,6 +64,6 @@
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
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/mkfontdir-1.0.4/README new/mkfontdir-1.0.5/README
--- old/mkfontdir-1.0.4/README 2008-03-06 22:44:46.000000000 +0100
+++ new/mkfontdir-1.0.5/README 2009-10-02 00:20:28.000000000 +0200
@@ -0,0 +1,27 @@
+mkfontdir creates the fonts.dir files needed by the legacy X server
+core font system. The current implementation is a simple wrapper script
+around the mkfontscale program, which must be built and installed first.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/mkfontdir
+
+ http://cgit.freedesktop.org/xorg/app/mkfontdir
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/mkfontdir-1.0.4/configure.ac new/mkfontdir-1.0.5/configure.ac
--- old/mkfontdir-1.0.4/configure.ac 2008-03-06 22:45:11.000000000 +0100
+++ new/mkfontdir-1.0.5/configure.ac 2009-10-11 07:47:17.000000000 +0200
@@ -21,16 +21,19 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(mkfontdir, [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontdir)
+AC_INIT(mkfontdir, [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontdir)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
AC_PROG_INSTALL
AC_PATH_PROG(SED, sed)
AC_SUBST([bindir])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile])
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/mkfontdir-1.0.4/missing new/mkfontdir-1.0.5/missing
--- old/mkfontdir-1.0.4/missing 2008-03-06 22:45:20.000000000 +0100
+++ new/mkfontdir-1.0.5/missing 2009-10-11 07:48:04.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
++++++ mkfontscale-1.0.6.tar.bz2 -> mkfontscale-1.0.7.tar.bz2 ++++++
++++ 9003 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.6/ChangeLog new/mkfontscale-1.0.7/ChangeLog
--- old/mkfontscale-1.0.6/ChangeLog 2008-12-19 01:59:50.000000000 +0100
+++ new/mkfontscale-1.0.7/ChangeLog 2009-10-11 07:33:06.000000000 +0200
@@ -1,3 +1,33 @@
+commit 34a5a7ae5dc6c8d5f8cb50755d16ef0f573ff2f2
+Author: Alan Coopersmith
+Date: Sat Oct 10 22:31:00 2009 -0700
+
+ mkfontscale 1.0.7
+
+ Signed-off-by: Alan Coopersmith
+
+commit acedad9e929c1edfa17fc1cb9d37a19701cd200d
+Author: Alan Coopersmith
+Date: Sat Oct 10 22:29:08 2009 -0700
+
+ Add link to SubmittingPatches wiki page to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit 245160adaca3957ead8fc278387c20e11b9bb7d2
+Author: Alan Coopersmith
+Date: Sat Oct 10 22:26:24 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 2ff1863a387a393e237e9f05525a48806e900368
+Author: Paulo Cesar Pereira de Andrade
+Date: Fri Jan 16 20:17:08 2009 -0200
+
+ Silence sparse warnings and update .gitignore.
+
commit a34031ea9074a453aee217b5845d07333019f26c
Author: Alan Coopersmith
Date: Thu Dec 18 16:56:12 2008 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mkfontscale-1.0.6/Makefile.am new/mkfontscale-1.0.7/Makefile.am
--- old/mkfontscale-1.0.6/Makefile.am 2008-12-18 04:27:28.000000000 +0100
+++ new/mkfontscale-1.0.7/Makefile.am 2009-10-11 07:23:20.000000000 +0200
@@ -66,7 +66,7 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: 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/mkfontscale-1.0.6/README new/mkfontscale-1.0.7/README
--- old/mkfontscale-1.0.6/README 2008-12-18 04:20:10.000000000 +0100
+++ new/mkfontscale-1.0.7/README 2009-10-11 07:28:55.000000000 +0200
@@ -1,21 +1,26 @@
mkfontscale creates the fonts.scale and fonts.dir index files used by the
legacy X11 font system.
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/app/mkfontscale
http://cgit.freedesktop.org/xorg/app/mkfontscale
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage
+
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.6/configure.ac new/mkfontscale-1.0.7/configure.ac
--- old/mkfontscale-1.0.6/configure.ac 2008-12-18 04:30:00.000000000 +0100
+++ new/mkfontscale-1.0.7/configure.ac 2009-10-11 07:29:34.000000000 +0200
@@ -21,20 +21,22 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(mkfontscale, [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontscale)
+AC_INIT(mkfontscale, [1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontscale)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version >= 1.2.0 for XORG_CWARNFLAGS & XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
-XORG_CWARNFLAGS
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
AC_CHECK_LIB(z, gzopen, [],
[AC_MSG_ERROR([zlib is required, but was not found.])])
@@ -59,8 +61,4 @@
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile])
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.6/data.h new/mkfontscale-1.0.7/data.h
--- old/mkfontscale-1.0.6/data.h 2006-07-11 04:51:21.000000000 +0200
+++ new/mkfontscale-1.0.7/data.h 2009-01-22 16:09:20.000000000 +0100
@@ -27,7 +27,7 @@
/* Order is significant. For example, some B&H fonts are hinted by
URW++, and both strings appear in the notice. */
-char *notice_foundries[][2] =
+static char *notice_foundries[][2] =
{{"Bigelow", "b&h"},
{"Adobe", "adobe"},
{"Bitstream", "bitstream"},
@@ -50,7 +50,7 @@
/* It should not contain useless entries (such as UNKN) nor duplicate
entries for padding both with spaces and NULs. */
-char *vendor_foundries[][2] =
+static char *vendor_foundries[][2] =
{{"ADBE", "adobe"},
{"AGFA", "agfa"},
{"ALTS", "altsys"},
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.6/missing new/mkfontscale-1.0.7/missing
--- old/mkfontscale-1.0.6/missing 2008-12-19 01:57:38.000000000 +0100
+++ new/mkfontscale-1.0.7/missing 2009-10-11 07:31:40.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/mkfontscale-1.0.6/mkfontscale.c new/mkfontscale-1.0.7/mkfontscale.c
--- old/mkfontscale-1.0.6/mkfontscale.c 2008-08-22 03:35:00.000000000 +0200
+++ new/mkfontscale-1.0.7/mkfontscale.c 2009-01-22 16:09:20.000000000 +0100
@@ -63,7 +63,7 @@
#define MAXFONTNAMELEN 1024
#endif
-char *encodings_array[] =
+static char *encodings_array[] =
{ "ascii-0",
"iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5",
"iso8859-6", "iso8859-6.8", "iso8859-6.8x", "iso8859-6.16",
@@ -82,11 +82,11 @@
"gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",
"ksc5601.1987-0", "ksc5601.1992-3"};
-char *extra_encodings_array[] =
+static char *extra_encodings_array[] =
{ "iso10646-1", "adobe-fontspecific", "microsoft-symbol" };
-ListPtr encodings, extra_encodings;
-char *outfilename;
+static ListPtr encodings, extra_encodings;
+static char *outfilename;
#define countof(_a) (sizeof(_a)/sizeof((_a)[0]))
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.iUm58h/_old 2010-04-07 13:21:59.000000000 +0200
+++ /var/tmp/diff_new_pack.iUm58h/_new 2010-04-07 13:21:59.000000000 +0200
@@ -1,7 +1,7 @@
Index: xauth-1.0.3/gethost.c
===================================================================
--- xauth-1.0.3/gethost.c.orig
-+++ xauth-1.0.3/gethost.c
++++ xauth-1.0.4/gethost.c
@@ -244,7 +244,8 @@ struct addrlist *get_address_info (
int family,
char *fulldpyname,
@@ -24,7 +24,7 @@
Index: xauth-1.0.3/parsedpy.c
===================================================================
--- xauth-1.0.3/parsedpy.c.orig
-+++ xauth-1.0.3/parsedpy.c
++++ xauth-1.0.4/parsedpy.c
@@ -74,20 +74,24 @@ copystring (char *src, int len)
@@ -73,7 +73,7 @@
Index: xauth-1.0.3/process.c
===================================================================
--- xauth-1.0.3/process.c.orig
-+++ xauth-1.0.3/process.c
++++ xauth-1.0.4/process.c
@@ -466,7 +466,7 @@ read_auth_entries(FILE *fp, Bool numeric
}
@@ -131,7 +131,7 @@
Index: xauth-1.0.3/xauth.h
===================================================================
--- xauth-1.0.3/xauth.h.orig
-+++ xauth-1.0.3/xauth.h
++++ xauth-1.0.4/xauth.h
@@ -51,10 +51,10 @@ struct addrlist {
};
@@ -146,10 +146,10 @@
extern int auth_initialize ( char *authfilename );
extern int auth_finalize ( void );
extern int process_command ( char *inputfilename, int lineno, int argc, char **argv );
-Index: xdm-1.1.8/auth.c
+Index: xdm-1.1.9/auth.c
===================================================================
---- xdm-1.1.8/auth.c.orig
-+++ xdm-1.1.8/auth.c
+--- xdm-1.1.9/auth.c.orig
++++ xdm-1.1.9/auth.c
@@ -680,7 +680,7 @@ writeAddr (
}
++++++ sessreg-1.0.4.tar.bz2 -> sessreg-1.0.5.tar.bz2 ++++++
++++ 9391 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-1.0.4/ChangeLog new/sessreg-1.0.5/ChangeLog
--- old/sessreg-1.0.4/ChangeLog 2008-06-11 23:46:53.000000000 +0200
+++ new/sessreg-1.0.5/ChangeLog 2009-10-12 20:19:36.000000000 +0200
@@ -1,3 +1,52 @@
+commit eb6ef63fb284cc91c04dcb68fda2ad8ca6fe0e1a
+Author: Alan Coopersmith
+Date: Mon Oct 12 11:11:42 2009 -0700
+
+ sessreg 1.0.5
+
+ Signed-off-by: Alan Coopersmith
+
+commit 46646524a74c1834de103a2f469142ab50f6bfd6
+Author: Alan Coopersmith
+Date: Mon Oct 12 11:03:01 2009 -0700
+
+ Document -L option for lastlog files
+
+ Signed-off-by: Alan Coopersmith
+
+commit a594e318996d0e8c02018eef1837135b382076c5
+Author: Alan Coopersmith
+Date: Mon Oct 12 10:50:51 2009 -0700
+
+ Add utmp/utmpx man page to See Also section of man page
+
+ Signed-off-by: Alan Coopersmith
+
+commit be736ebbfc5510997ae227e903a5b9d66ba0ee1a
+Author: Alan Coopersmith
+Date: Mon Oct 12 10:44:07 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit ebc9f3d2483623dcb2ccca7f12cc2769173eb4a9
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:19 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3ba14d85abede72a40c5ba8fe18d1a2e1625d19e
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 19 15:47:29 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
commit 3db21d655b0a2988ae0fd47e360d29bb8763cd03
Author: Alan Coopersmith
Date: Wed Jun 11 14:46:29 2008 -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/sessreg-1.0.4/Makefile.am new/sessreg-1.0.5/Makefile.am
--- old/sessreg-1.0.4/Makefile.am 2008-06-11 23:30:54.000000000 +0200
+++ new/sessreg-1.0.5/Makefile.am 2009-10-12 19:43:11.000000000 +0200
@@ -20,7 +20,7 @@
bin_PROGRAMS = sessreg
-AM_CFLAGS = $(SESSREG_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS)
sessreg_SOURCES = \
sessreg.h \
@@ -57,13 +57,14 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(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|__' > $@
+ $(AM_V_GEN)$(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) \
@@ -78,6 +79,6 @@
.PHONY: ChangeLog
ChangeLog:
- git-log > ChangeLog
+ $(CHANGELOG_CMD)
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-1.0.4/README new/sessreg-1.0.5/README
--- old/sessreg-1.0.4/README 2008-06-11 23:30:54.000000000 +0200
+++ new/sessreg-1.0.5/README 2009-10-02 00:30:46.000000000 +0200
@@ -0,0 +1,27 @@
+Sessreg is a simple program for managing utmp/wtmp entries for X sessions.
+It was originally written for use with xdm, but may also be used with
+other display managers such as gdm or kdm.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/sessreg
+
+ http://cgit.freedesktop.org/xorg/app/sessreg
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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-1.0.4/configure.ac new/sessreg-1.0.5/configure.ac
--- old/sessreg-1.0.4/configure.ac 2008-06-11 23:45:53.000000000 +0200
+++ new/sessreg-1.0.5/configure.ac 2009-10-12 20:10:57.000000000 +0200
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(sessreg, [1.0.4],
+AC_INIT(sessreg, [1.0.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
sessreg)
AM_INIT_AUTOMAKE([dist-bzip2])
@@ -29,13 +29,16 @@
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)
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
AC_CHECK_HEADERS([lastlog.h utmpx.h sys/param.h])
AC_CHECK_MEMBER([struct utmpx.ut_syslen],
HAVE_SYSLEN=1,
@@ -53,7 +56,4 @@
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile])
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-1.0.4/filenames.sed.c new/sessreg-1.0.5/filenames.sed.c
--- old/sessreg-1.0.4/filenames.sed.c 2008-06-11 23:30:54.000000000 +0200
+++ new/sessreg-1.0.5/filenames.sed.c 2009-10-12 19:58:46.000000000 +0200
@@ -2,8 +2,10 @@
#ifdef UTMPX_FILE
# define UTF UTMPX_FILE
+# define UTM utmpx
#else
# define UTF UTMP_FILE
+# define UTM utmp
#endif
#ifdef WTMPX_FILE
@@ -16,6 +18,12 @@
# define TTYS_FILE "/etc/ttys"
#endif
+#ifndef LLOG_FILE
+# define LLOG_FILE "/var/log/lastlog"
+#endif
+
+s|__utmp_manpage__|UTM|g
s|__utmp_file__|UTF|g
s|__wtmp_file__|WTF|g
s|__ttys_file__|TTYS_FILE|g
+s|__lastlog_file__|LLOG_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-1.0.4/missing new/sessreg-1.0.5/missing
--- old/sessreg-1.0.4/missing 2008-06-11 23:46:44.000000000 +0200
+++ new/sessreg-1.0.5/missing 2009-10-12 20:12:06.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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-1.0.4/sessreg.c new/sessreg-1.0.5/sessreg.c
--- old/sessreg-1.0.4/sessreg.c 2008-06-11 23:37:37.000000000 +0200
+++ new/sessreg-1.0.5/sessreg.c 2009-10-12 19:52:12.000000000 +0200
@@ -66,6 +66,7 @@
*
* usage: sessreg [ -w <wtmp-file> ] [ -u <utmp-file> ]
* [ -l <line> ]
+ * [ -L <lastlog-file> ] / #ifndef NO_LASTLOG
* [ -h <host-name> ] / BSD only
* [ -s <slot-number> ] [ -x Xservers-file ] / BSD only
* [ -t <ttys-file> ] / BSD only
@@ -96,28 +97,28 @@
const char *host, Time_t date, int addp);
#endif
-int wflag, uflag, lflag;
-char *wtmp_file, *utmp_file, *line;
+static int wflag, uflag, lflag;
+static char *wtmp_file, *utmp_file, *line;
#ifdef USE_UTMPX
static char *wtmpx_file = NULL, *utmpx_file = NULL;
#endif
-int utmp_none, wtmp_none;
+static int utmp_none, wtmp_none;
/*
* BSD specific variables. To make life much easier for Xstartup/Xreset
* maintainers, these arguments are accepted but ignored for sysV
*/
-int hflag, sflag, xflag, tflag;
-char *host_name = NULL;
-int slot_number;
-char *xservers_file, *ttys_file;
-char *user_name;
-int aflag, dflag;
+static int hflag, sflag, xflag, tflag;
+static char *host_name = NULL;
+static int slot_number;
+static char *xservers_file, *ttys_file;
+static char *user_name;
+static int aflag, dflag;
#ifndef NO_LASTLOG
-char *llog_file;
-int llog_none, Lflag;
+static char *llog_file;
+static int llog_none, Lflag;
#endif
-char *program_name;
+static char *program_name;
#ifndef SYSV
static int findslot (char *line_name, char *host_name, int addp, int slot);
@@ -239,7 +240,7 @@
}
}
usage (!(user_name = *argv++));
- usage (*argv != 0);
+ usage (*argv != NULL);
/*
* complain if neither aflag nor dflag are set,
* or if both are set.
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-1.0.4/sessreg.man new/sessreg-1.0.5/sessreg.man
--- old/sessreg-1.0.4/sessreg.man 2008-06-11 23:30:54.000000000 +0200
+++ new/sessreg-1.0.5/sessreg.man 2009-10-12 20:02:27.000000000 +0200
@@ -32,6 +32,7 @@
.B sessreg
[-w \fIwtmp-file\fP]
[-u \fIutmp-file\fP]
+[-L \fIlastlog-file\fP]
[-l \fIline-name\fP]
[-h \fIhost-name\fP]
[-s \fIslot-number\fP]
@@ -42,7 +43,7 @@
\fIuser-name\fP
.SH DESCRIPTION
.PP
-\fISessreg\fP is a simple program for managing utmp/wtmp
+\fISessreg\fP is a simple program for managing utmp/wtmp and lastlog
entries for xdm sessions.
.PP
System V has a better interface to utmp than BSD; it
@@ -93,6 +94,11 @@
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 \fIlastlog-file\fP"
+This specifies an alternate lastlog file, instead of
+.BR __lastlog_file__ ,
+if the platform supports lastlog files.
+The special name "none" disables writing records to the lastlog 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
@@ -123,6 +129,7 @@
This session should be deleted from utmp/wtmp. One of -a/-d must
be specified.
.SH "SEE ALSO"
-xdm(__appmansuffix__)
+.BR xdm (__appmansuffix__),
+.BR __utmp_manpage__ (__filemansuffix__)
.SH AUTHOR
Keith Packard, MIT X Consortium
++++++ smproxy-X11R7.1-1.0.2.tar.bz2 -> smproxy-1.0.3.tar.bz2 ++++++
++++ 15403 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/smproxy-X11R7.1-1.0.2/ChangeLog new/smproxy-1.0.3/ChangeLog
--- old/smproxy-X11R7.1-1.0.2/ChangeLog 2006-04-02 02:43:00.000000000 +0200
+++ new/smproxy-1.0.3/ChangeLog 2009-10-17 01:33:22.000000000 +0200
@@ -1,35 +1,220 @@
-2006-04-01 Adam Jackson
+commit 170f17b373da6f45db8bce2f0b3cc18b9f05e6bd
+Author: Alan Coopersmith
+Date: Fri Oct 16 16:32:38 2009 -0700
- * configure.ac:
- Bump to 1.0.2.
+ smproxy 1.0.3
+
+ Signed-off-by: Alan Coopersmith
-2006-02-03 Alan Coopersmith
+commit db43f974d4b653cc903dbbc9d22fca0711cf0ee6
+Author: Alan Coopersmith
+Date: Mon Oct 12 18:31:59 2009 -0700
- * smproxy.man:
- Wrong name in .TH line in smproxy man page.
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6519b61438b36e66a42e44b42fbf6b7f75a450d0
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:19 2009 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c2514a2a3fb2e01f904d9a0e4b4b50bf24ed316d
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 19 16:38:49 2009 -0200
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c3f8e7bd4dcb059265ad47152c57305b1ebf1652
+Author: James Cloos
+Date: Thu Dec 6 16:37:07 2007 -0500
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c1e12fb138711721d74d9c4accf1c76f1829a411
+Author: James Cloos
+Date: Mon Sep 3 05:51:12 2007 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add *~ to .gitignore to skip patch/emacs droppings
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 142c50a44b9bca6ecc2d137a52f3a2d2d18ea753
+Author: James Cloos
+Date: Thu Aug 23 19:24:37 2007 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ Rename .cvsignore to .gitignore
+commit a712e5b1ac3fba792e2696a52781fee3ac7f2c26
+Author: Adam Jackson
+Date: Sun Apr 2 00:43:00 2006 +0000
+
+ Bump to 1.0.2
+
+commit 5df8681ca60408ec2b0f2e73930cf34d46474e02
+Author: Alan Coopersmith
+Date: Fri Feb 3 23:24:37 2006 +0000
+
+ Wrong name in .TH line in smproxy man page.
+
+commit 129d0d20f0fe3b4e2d007b40eb8d18493e72feb5
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:47 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit a24c9fb0dfc98f5e2a1c530b2e5623ca37085e92
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:41 2005 +0000
+
+ Stub COPYING files
+
+commit ca04f02395af13eb7411b6d7a2235441260162ed
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:04 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 8bfee9823e3352b2b891815fb17ac8b4b0b9ec1f
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:18 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit c6ddfcb8295f9bd95ff6c10dfc72eb06c1dfebfc
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:17 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 1cda990e2da2c81676263a743148792cdd24bf76
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:39 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 f316c47cd92a8787aa054454b328992ea5a1c335
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:58 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit adf4750e5d0b867f9aebcb9e04f45615c78d564b
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:50 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 62c0c632565fc25c6af2199fecc1e8cec21beb82
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:50 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 7154ca09d51094eee67bd38d35ea1a42f0243165
+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 4b08eb40f81ad4ac6f276d91a485e7eb3d690a61
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:42 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 8be426eb8e1d2be0264c34bd618a25822055fcc6
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:28 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit a1da8fe3444ec4373d823b55d3db4c20f70b813c
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:30 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 1c36f6e6523670598c310ad5cd55e6e3c800ba36
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:50 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 4c13f27d1178fa4c1176686d53c5641addf675b8
+Author: Alan Coopersmith
+Date: Sat Jul 16 22:07:13 2005 +0000
+
+ Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get
+ HAS_MKSTEMP defined in modular builds.
+
+commit b3d8e92288c109bec89946ae3d550616dbc8d04c
+Author: Alan Coopersmith
+Date: Sat Jul 16 21:59:14 2005 +0000
+
+ Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection
+ against tempfile race conditions in many places)
+
+commit 05ef9ba24d0b1b5c17e04036d03770a44efd6b78
+Author: Søren Sandmann Pedersen
+Date: Wed Jul 6 17:25:57 2005 +0000
+
+ Build system for smproxy
+
+commit 2935d0350a985e7638cdeaa32b06d935bef2a983
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:37 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 5bab1fd41c825d7e89cd7329eead0169640cc3dd
+Author: Egbert Eich
+Date: Sun Mar 14 08:34:56 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit c43c8cfd14136c9486ddf269a0e876c20670848e
+Author: Egbert Eich
+Date: Wed Mar 3 12:12:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit ad7fbb2be57bc3aef4b403b3e3341627c98d88b6
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:15 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit b3303bf17a8975b4a3f13462cb7b13207a016395
+Author: Egbert Eich
+Date: Thu Feb 26 09:23:57 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 2a637a09ff68246161945821392656492f1fbde1
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit f4d5033f594bf278ff1171091219b3c28dc45446
+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/smproxy-X11R7.1-1.0.2/Makefile.am new/smproxy-1.0.3/Makefile.am
--- old/smproxy-X11R7.1-1.0.2/Makefile.am 2005-12-06 23:48:18.000000000 +0100
+++ new/smproxy-1.0.3/Makefile.am 2009-10-13 03:31:25.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = smproxy
-smproxy_CFLAGS = $(SMPROXY_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(SMPROXY_CFLAGS)
smproxy_LDADD = $(SMPROXY_LIBS)
smproxy_SOURCES = \
@@ -62,4 +62,14 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+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/smproxy-X11R7.1-1.0.2/README new/smproxy-1.0.3/README
--- old/smproxy-X11R7.1-1.0.2/README 2005-07-06 19:25:57.000000000 +0200
+++ new/smproxy-1.0.3/README 2009-10-02 00:52:53.000000000 +0200
@@ -0,0 +1,26 @@
+smproxy allows X applications that do not support X11R6 session
+management to participate in an X11R6 session.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/smproxy
+
+ http://cgit.freedesktop.org/xorg/app/smproxy
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/smproxy-X11R7.1-1.0.2/compile new/smproxy-1.0.3/compile
--- old/smproxy-X11R7.1-1.0.2/compile 2006-05-21 03:45:04.000000000 +0200
+++ new/smproxy-1.0.3/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/smproxy-X11R7.1-1.0.2/config.h.in new/smproxy-1.0.3/config.h.in
--- old/smproxy-X11R7.1-1.0.2/config.h.in 2006-05-21 03:45:02.000000000 +0200
+++ new/smproxy-1.0.3/config.h.in 2009-10-17 01:33:07.000000000 +0200
@@ -1,8 +1,35 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* Define to 1 if you have the `mkstemp' function. */
+/* Define to 1 if you have the "mkstemp" function. */
#undef HAS_MKSTEMP
+/* 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
+
/* Name of package */
#undef PACKAGE
@@ -21,5 +48,17 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/smproxy-X11R7.1-1.0.2/configure.ac new/smproxy-1.0.3/configure.ac
--- old/smproxy-X11R7.1-1.0.2/configure.ac 2006-04-02 02:43:00.000000000 +0200
+++ new/smproxy-1.0.3/configure.ac 2009-10-17 01:32:30.000000000 +0200
@@ -21,24 +21,28 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(smproxy,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],smproxy)
+AC_INIT(smproxy, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],smproxy)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
AC_CHECK_FUNC([mkstemp],
- AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
+ AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.]))
# Checks for pkg-config packages
PKG_CHECK_MODULES(SMPROXY, xt xmu)
AC_SUBST(SMPROXY_CFLAGS)
AC_SUBST(SMPROXY_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile])
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/smproxy-X11R7.1-1.0.2/missing new/smproxy-1.0.3/missing
--- old/smproxy-X11R7.1-1.0.2/missing 2006-05-21 03:45:04.000000000 +0200
+++ new/smproxy-1.0.3/missing 2009-10-17 01:33:09.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -103,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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)
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -145,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -154,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -164,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -192,8 +203,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,80 +218,78 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/smproxy-X11R7.1-1.0.2/save.c new/smproxy-1.0.3/save.c
--- old/smproxy-X11R7.1-1.0.2/save.c 2004-04-23 21:54:37.000000000 +0200
+++ new/smproxy-1.0.3/save.c 2009-01-22 16:09:37.000000000 +0100
@@ -33,9 +33,7 @@
#endif
-ProxyFileEntry *proxyFileHead = NULL;
-
-extern WinInfo *win_head;
+static ProxyFileEntry *proxyFileHead = NULL;
static int write_byte ( FILE *file, unsigned char b );
static int write_short ( FILE *file, unsigned short s );
@@ -73,11 +71,7 @@
static int
-write_counted_string (file, string)
-
-FILE *file;
-char *string;
-
+write_counted_string(FILE *file, char *string)
{
if (string)
{
@@ -100,11 +94,7 @@
static int
-read_byte (file, bp)
-
-FILE *file;
-unsigned char *bp;
-
+read_byte(FILE *file, unsigned char *bp)
{
if (fread ((char *) bp, 1, 1, file) != 1)
return 0;
@@ -113,11 +103,7 @@
static int
-read_short (file, shortp)
-
-FILE *file;
-unsigned short *shortp;
-
+read_short(FILE *file, unsigned short *shortp)
{
unsigned char file_short[2];
@@ -129,11 +115,7 @@
static int
-read_counted_string (file, stringp)
-
-FILE *file;
-char **stringp;
-
+read_counted_string(FILE *file, char **stringp)
{
unsigned char len;
char *data;
@@ -141,7 +123,7 @@
if (read_byte (file, &len) == 0)
return 0;
if (len == 0) {
- data = 0;
+ data = NULL;
} else {
data = (char *) malloc ((unsigned) len + 1);
if (!data)
@@ -178,11 +160,7 @@
*/
int
-WriteProxyFileEntry (proxyFile, theWindow)
-
-FILE *proxyFile;
-WinInfo *theWindow;
-
+WriteProxyFileEntry(FILE *proxyFile, WinInfo *theWindow)
{
int i;
@@ -214,11 +192,7 @@
int
-ReadProxyFileEntry (proxyFile, pentry)
-
-FILE *proxyFile;
-ProxyFileEntry **pentry;
-
+ReadProxyFileEntry(FILE *proxyFile, ProxyFileEntry **pentry)
{
ProxyFileEntry *entry;
unsigned char byte;
@@ -294,10 +268,7 @@
void
-ReadProxyFile (filename)
-
-char *filename;
-
+ReadProxyFile(char *filename)
{
FILE *proxyFile;
ProxyFileEntry *entry;
@@ -332,17 +303,11 @@
#ifndef HAS_MKSTEMP
static char *
-unique_filename (path, prefix)
-char *path;
-char *prefix;
+unique_filename(char *path, char *prefix)
#else
static char *
-unique_filename (path, prefix, pFd)
-char *path;
-char *prefix;
-int *pFd;
+unique_filename(char *path, char *prefix, int *pFd)
#endif
-
{
#ifndef HAS_MKSTEMP
#ifndef X_NOT_POSIX
@@ -380,8 +345,7 @@
char *
-WriteProxyFile ()
-
+WriteProxyFile(void)
{
FILE *proxyFile = NULL;
char *filename = NULL;
@@ -449,10 +413,7 @@
char *
-LookupClientID (theWindow)
-
-WinInfo *theWindow;
-
+LookupClientID(WinInfo *theWindow)
{
ProxyFileEntry *ptr;
int found = 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/smproxy-X11R7.1-1.0.2/smproxy.c new/smproxy-1.0.3/smproxy.c
--- old/smproxy-X11R7.1-1.0.2/smproxy.c 2004-04-23 21:54:37.000000000 +0200
+++ new/smproxy-1.0.3/smproxy.c 2009-01-22 16:09:37.000000000 +0100
@@ -31,75 +31,72 @@
#include
#include
-XtAppContext appContext;
-Display *disp;
+static XtAppContext appContext;
+static Display *disp;
-Atom wmProtocolsAtom;
-Atom wmSaveYourselfAtom;
-Atom wmStateAtom;
-Atom smClientIdAtom;
-Atom wmClientLeaderAtom;
-
-Bool debug = 0;
-
-SmcConn proxy_smcConn;
-XtInputId proxy_iceInputId;
-char *proxy_clientId = NULL;
+static Atom wmProtocolsAtom;
+static Atom wmSaveYourselfAtom;
+static Atom wmStateAtom;
+static Atom smClientIdAtom;
+static Atom wmClientLeaderAtom;
+
+static Bool debug = 0;
+
+static SmcConn proxy_smcConn;
+static XtInputId proxy_iceInputId;
+static char *proxy_clientId = NULL;
WinInfo *win_head = NULL;
-int proxy_count = 0;
-int die_count = 0;
+static int proxy_count = 0;
+static int die_count = 0;
-Bool ok_to_die = 0;
+static Bool ok_to_die = 0;
-Bool caught_error = 0;
+static Bool caught_error = 0;
-Bool sent_save_done = 0;
+static Bool sent_save_done = 0;
-int Argc;
-char **Argv;
-
-Bool HasSaveYourself ( Window window );
-Bool HasXSMPsupport ( Window window );
-WinInfo * GetClientLeader ( WinInfo *winptr );
-char * CheckFullyQuantifiedName ( char *name, int *newstring );
-void FinishSaveYourself ( WinInfo *winInfo, Bool has_WM_SAVEYOURSELF );
-void SaveYourselfCB ( SmcConn smcConn, SmPointer clientData, int saveType,
- Bool shutdown, int interactStyle, Bool fast );
-void DieCB ( SmcConn smcConn, SmPointer clientData );
-void SaveCompleteCB ( SmcConn smcConn, SmPointer clientData );
-void ShutdownCancelledCB ( SmcConn smcConn, SmPointer clientData );
-void ProcessIceMsgProc ( XtPointer client_data, int *source, XtInputId *id );
-void NullIceErrorHandler ( IceConn iceConn, Bool swap,
+static int Argc;
+static char **Argv;
+
+static Bool HasSaveYourself ( Window window );
+static Bool HasXSMPsupport ( Window window );
+static WinInfo * GetClientLeader ( WinInfo *winptr );
+static char * CheckFullyQuantifiedName ( char *name, int *newstring );
+static void FinishSaveYourself ( WinInfo *winInfo, Bool has_WM_SAVEYOURSELF );
+static void SaveYourselfCB ( SmcConn smcConn, SmPointer clientData, int saveType,
+ Bool shutdown, int interactStyle, Bool fast );
+static void DieCB ( SmcConn smcConn, SmPointer clientData );
+static void SaveCompleteCB ( SmcConn smcConn, SmPointer clientData );
+static void ShutdownCancelledCB ( SmcConn smcConn, SmPointer clientData );
+static void ProcessIceMsgProc ( XtPointer client_data, int *source, XtInputId *id );
+static void NullIceErrorHandler ( IceConn iceConn, Bool swap,
int offendingMinorOpCode,
unsigned long offendingSequence,
int errorClass, int severity, IcePointer values );
-void ConnectClientToSM ( WinInfo *winInfo );
-int MyErrorHandler ( Display *display, XErrorEvent *event );
-Bool LookupWindow ( Window window, WinInfo **ptr_ret, WinInfo **prev_ptr_ret );
-WinInfo * AddNewWindow ( Window window );
-void RemoveWindow ( WinInfo *winptr );
-void Got_WM_STATE ( WinInfo *winptr );
-void HandleCreate ( XCreateWindowEvent *event );
-void HandleDestroy ( XDestroyWindowEvent *event );
-void HandleUpdate ( XPropertyEvent *event );
-void ProxySaveYourselfPhase2CB ( SmcConn smcConn, SmPointer clientData );
-void ProxySaveYourselfCB ( SmcConn smcConn, SmPointer clientData,
+static void ConnectClientToSM ( WinInfo *winInfo );
+static int MyErrorHandler ( Display *display, XErrorEvent *event );
+static Bool LookupWindow ( Window window, WinInfo **ptr_ret, WinInfo **prev_ptr_ret );
+static WinInfo * AddNewWindow ( Window window );
+static void RemoveWindow ( WinInfo *winptr );
+static void Got_WM_STATE ( WinInfo *winptr );
+static void HandleCreate ( XCreateWindowEvent *event );
+static void HandleDestroy ( XDestroyWindowEvent *event );
+static void HandleUpdate ( XPropertyEvent *event );
+static void ProxySaveYourselfPhase2CB ( SmcConn smcConn, SmPointer clientData );
+static void ProxySaveYourselfCB ( SmcConn smcConn, SmPointer clientData,
int saveType, Bool shutdown, int interactStyle,
Bool fast );
-void ProxyDieCB ( SmcConn smcConn, SmPointer clientData );
-void ProxySaveCompleteCB ( SmcConn smcConn, SmPointer clientData );
-void ProxyShutdownCancelledCB ( SmcConn smcConn, SmPointer clientData );
-Status ConnectProxyToSM ( char *previous_id );
-void CheckForExistingWindows ( Window root );
+static void ProxyDieCB ( SmcConn smcConn, SmPointer clientData );
+static void ProxySaveCompleteCB ( SmcConn smcConn, SmPointer clientData );
+static void ProxyShutdownCancelledCB ( SmcConn smcConn, SmPointer clientData );
+static Status ConnectProxyToSM ( char *previous_id );
+static void CheckForExistingWindows ( Window root );
-Bool
-HasSaveYourself (window)
-
-Window window;
-
+static Bool
+HasSaveYourself(Window window)
{
Atom *protocols;
int numProtocols;
@@ -126,11 +123,8 @@
-Bool
-HasXSMPsupport (window)
-
-Window window;
-
+static Bool
+HasXSMPsupport(Window window)
{
XTextProperty tp;
Bool hasIt = 0;
@@ -149,11 +143,8 @@
-WinInfo *
-GetClientLeader (winptr)
-
-WinInfo *winptr;
-
+static WinInfo *
+GetClientLeader(WinInfo *winptr)
{
Atom actual_type;
int actual_format;
@@ -201,12 +192,8 @@
-char *
-CheckFullyQuantifiedName (name, newstring)
-
-char *name;
-int *newstring;
-
+static char *
+CheckFullyQuantifiedName(char *name, int *newstring)
{
/*
* Due to a bug in Xlib (for hpux in particular), some clients
@@ -250,11 +237,8 @@
-void FinishSaveYourself (winInfo, has_WM_SAVEYOURSELF)
-
-WinInfo *winInfo;
-Bool has_WM_SAVEYOURSELF;
-
+static void
+FinishSaveYourself(WinInfo *winInfo, Bool has_WM_SAVEYOURSELF)
{
SmProp prop1, prop2, prop3, *props[3];
SmPropValue prop1val, prop2val, prop3val;
@@ -345,16 +329,9 @@
-void
-SaveYourselfCB (smcConn, clientData, saveType, shutdown, interactStyle, fast)
-
-SmcConn smcConn;
-SmPointer clientData;
-int saveType;
-Bool shutdown;
-int interactStyle;
-Bool fast;
-
+static void
+SaveYourselfCB(SmcConn smcConn, SmPointer clientData, int saveType,
+ Bool shutdown, int interactStyle, Bool fast)
{
WinInfo *winInfo = (WinInfo *) clientData;
@@ -402,12 +379,8 @@
-void
-DieCB (smcConn, clientData)
-
-SmcConn smcConn;
-SmPointer clientData;
-
+static void
+DieCB(SmcConn smcConn, SmPointer clientData)
{
WinInfo *winInfo = (WinInfo *) clientData;
@@ -440,12 +413,8 @@
-void
-SaveCompleteCB (smcConn, clientData)
-
-SmcConn smcConn;
-SmPointer clientData;
-
+static void
+SaveCompleteCB(SmcConn smcConn, SmPointer clientData)
{
/*
* Nothing to do here.
@@ -454,12 +423,8 @@
-void
-ShutdownCancelledCB (smcConn, clientData)
-
-SmcConn smcConn;
-SmPointer clientData;
-
+static void
+ShutdownCancelledCB(SmcConn smcConn, SmPointer clientData)
{
/*
* Since we did not request to interact or request save yourself
@@ -470,13 +435,8 @@
-void
-ProcessIceMsgProc (client_data, source, id)
-
-XtPointer client_data;
-int *source;
-XtInputId *id;
-
+static void
+ProcessIceMsgProc(XtPointer client_data, int *source, XtInputId *id)
{
IceConn ice_conn = (IceConn) client_data;
@@ -485,28 +445,17 @@
-void
-NullIceErrorHandler (iceConn, swap,
- offendingMinorOpcode, offendingSequence, errorClass, severity, values)
-
-IceConn iceConn;
-Bool swap;
-int offendingMinorOpcode;
-unsigned long offendingSequence;
-int errorClass;
-int severity;
-IcePointer values;
-
+static void
+NullIceErrorHandler(IceConn iceConn, Bool swap, int offendingMinorOpcode,
+ unsigned long offendingSequence, int errorClass,
+ int severity, IcePointer values)
{
return;
}
-void
-ConnectClientToSM (winInfo)
-
-WinInfo *winInfo;
-
+static void
+ConnectClientToSM(WinInfo *winInfo)
{
char errorMsg[256];
unsigned long mask;
@@ -576,12 +525,8 @@
-int
-MyErrorHandler (display, event)
-
-Display *display;
-XErrorEvent *event;
-
+static int
+MyErrorHandler(Display *display, XErrorEvent *event)
{
caught_error = 1;
return 0;
@@ -589,13 +534,8 @@
-Bool
-LookupWindow (window, ptr_ret, prev_ptr_ret)
-
-Window window;
-WinInfo **ptr_ret;
-WinInfo **prev_ptr_ret;
-
+static Bool
+LookupWindow(Window window, WinInfo **ptr_ret, WinInfo **prev_ptr_ret)
{
WinInfo *ptr, *prev;
@@ -627,11 +567,8 @@
-WinInfo *
-AddNewWindow (window)
-
-Window window;
-
+static WinInfo *
+AddNewWindow(Window window)
{
WinInfo *newptr;
@@ -666,11 +603,8 @@
-void
-RemoveWindow (winptr)
-
-WinInfo *winptr;
-
+static void
+RemoveWindow(WinInfo *winptr)
{
WinInfo *ptr, *prev;
@@ -705,11 +639,8 @@
-void
-Got_WM_STATE (winptr)
-
-WinInfo *winptr;
-
+static void
+Got_WM_STATE(WinInfo *winptr)
{
WinInfo *leader_winptr;
@@ -802,11 +733,8 @@
-void
-HandleCreate (event)
-
-XCreateWindowEvent *event;
-
+static void
+HandleCreate(XCreateWindowEvent *event)
{
Atom actual_type;
int actual_format;
@@ -887,11 +815,8 @@
-void
-HandleDestroy (event)
-
-XDestroyWindowEvent *event;
-
+static void
+HandleDestroy(XDestroyWindowEvent *event)
{
WinInfo *winptr;
@@ -917,11 +842,8 @@
-void
-HandleUpdate (event)
-
-XPropertyEvent *event;
-
+static void
+HandleUpdate(XPropertyEvent *event)
{
Window window = event->window;
WinInfo *winptr;
@@ -955,12 +877,8 @@
-void
-ProxySaveYourselfPhase2CB (smcConn, clientData)
-
-SmcConn smcConn;
-SmPointer clientData;
-
+static void
+ProxySaveYourselfPhase2CB(SmcConn smcConn, SmPointer clientData)
{
char *filename;
Bool success = True;
@@ -1080,17 +998,9 @@
-void
-ProxySaveYourselfCB (smcConn, clientData, saveType,
- shutdown, interactStyle, fast)
-
-SmcConn smcConn;
-SmPointer clientData;
-int saveType;
-Bool shutdown;
-int interactStyle;
-Bool fast;
-
+static void
+ProxySaveYourselfCB(SmcConn smcConn, SmPointer clientData, int saveType,
+ Bool shutdown, int interactStyle, Bool fast)
{
/*
* We want the proxy to respond to the Save Yourself after all
@@ -1110,12 +1020,8 @@
-void
-ProxyDieCB (smcConn, clientData)
-
-SmcConn smcConn;
-SmPointer clientData;
-
+static void
+ProxyDieCB(SmcConn smcConn, SmPointer clientData)
{
SmcCloseConnection (proxy_smcConn, 0, NULL);
XtRemoveInput (proxy_iceInputId);
@@ -1128,24 +1034,16 @@
-void
-ProxySaveCompleteCB (smcConn, clientData)
-
-SmcConn smcConn;
-SmPointer clientData;
-
+static void
+ProxySaveCompleteCB(SmcConn smcConn, SmPointer clientData)
{
;
}
-void
-ProxyShutdownCancelledCB (smcConn, clientData)
-
-SmcConn smcConn;
-SmPointer clientData;
-
+static void
+ProxyShutdownCancelledCB(SmcConn smcConn, SmPointer clientData)
{
if (!sent_save_done)
{
@@ -1156,11 +1054,8 @@
-Status
-ConnectProxyToSM (previous_id)
-
-char *previous_id;
-
+static Status
+ConnectProxyToSM(char *previous_id)
{
char errorMsg[256];
unsigned long mask;
@@ -1210,11 +1105,8 @@
-void
-CheckForExistingWindows (root)
-
-Window root;
-
+static void
+CheckForExistingWindows(Window root)
{
Window dontCare1, dontCare2, *children, client_window;
unsigned int nchildren, i;
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/smproxy-X11R7.1-1.0.2/smproxy.h new/smproxy-1.0.3/smproxy.h
--- old/smproxy-X11R7.1-1.0.2/smproxy.h 2005-07-17 00:07:13.000000000 +0200
+++ new/smproxy-1.0.3/smproxy.h 2009-01-22 16:09:37.000000000 +0100
@@ -1,5 +1,5 @@
/* $Xorg: smproxy.h,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $ */
-/* $XdotOrg: app/smproxy/smproxy.h,v 1.3 2005/07/16 22:07:13 alanc Exp $ */
+/* $XdotOrg: $ */
/******************************************************************************
Copyright 1994, 1998 The Open Group
@@ -107,5 +107,6 @@
extern char * WriteProxyFile ( void );
extern char * LookupClientID ( WinInfo *theWindow );
+extern WinInfo *win_head;
#define SAVEFILE_VERSION 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/smproxy-X11R7.1-1.0.2/smproxy.man new/smproxy-1.0.3/smproxy.man
--- old/smproxy-X11R7.1-1.0.2/smproxy.man 2006-02-04 00:24:37.000000000 +0100
+++ new/smproxy-1.0.3/smproxy.man 2006-07-11 04:51:46.000000000 +0200
@@ -1,4 +1,4 @@
-.\" $XdotOrg: app/smproxy/smproxy.man,v 1.3 2006/02/03 23:24:37 alanc Exp $
+.\" $XdotOrg: $
.\" $Xorg: smproxy.man,v 1.4 2001/02/09 02:05:36 xorgcvs Exp $
.\" Copyright 1994, 1998 The Open Group
.\"
++++++ x11perf-1.5.tar.bz2 -> x11perf-1.5.1.tar.bz2 ++++++
++++ 11271 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/x11perf-1.5/ChangeLog new/x11perf-1.5.1/ChangeLog
--- old/x11perf-1.5/ChangeLog 2008-03-07 22:53:00.000000000 +0100
+++ new/x11perf-1.5.1/ChangeLog 2009-10-17 02:20:27.000000000 +0200
@@ -1,3 +1,36 @@
+commit 98ca2c35b05a2d248063047c50770a018e35e810
+Author: Alan Coopersmith
+Date: Fri Oct 16 17:19:36 2009 -0700
+
+ x11perf 1.5.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit 266da0b9c176cf0dc615005bb0ad4aa585892bd8
+Author: Alan Coopersmith
+Date: Fri Oct 16 17:17:41 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 9851abff574fe041f4e3f45b39c61d943e3a7f86
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:20 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit c7f3c6652e9507e4303fd9ed913c593afb7447f0
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 13 18:55:51 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, and corrects
+ make distcheck.
+
commit 828c0323450eadaf040749c010918679f5e4fe53
Author: Adam Jackson
Date: Fri Mar 7 16:51:53 2008 -0500
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/x11perf-1.5/Makefile.am new/x11perf-1.5.1/Makefile.am
--- old/x11perf-1.5/Makefile.am 2008-03-07 22:49:26.000000000 +0100
+++ new/x11perf-1.5.1/Makefile.am 2009-10-17 01:37:53.000000000 +0200
@@ -28,7 +28,7 @@
x11perfcompdir = $(LIBPATH)
dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark
-AM_CFLAGS = $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XEXT_CFLAGS) $(XFT_CFLAGS) $(XRENDER_CFLAGS) $(X11PERF_CFLAGS)
x11perf_LDADD = $(XEXT_LIBS) $(XFT_LIBS) $(XRENDER_LIBS) $(X11PERF_LIBS) -lm
x11perf_SOURCES = \
@@ -58,7 +58,7 @@
Xmark.man
x11perfcomp: x11pcomp.cpp
- $(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \
+ $(AM_V_GEN)$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \
$(SED) s/XCOMM/\#/ > $@
@@ -73,8 +73,6 @@
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-SED = sed
-
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@@ -95,7 +93,7 @@
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -103,6 +101,6 @@
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
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/x11perf-1.5/README new/x11perf-1.5.1/README
--- old/x11perf-1.5/README 2008-03-07 22:49:26.000000000 +0100
+++ new/x11perf-1.5.1/README 2009-10-01 23:54:20.000000000 +0200
@@ -0,0 +1,24 @@
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/x11perf
+
+ http://cgit.freedesktop.org/xorg/app/x11perf
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/x11perf-1.5/bitmaps.c new/x11perf-1.5.1/bitmaps.c
--- old/x11perf-1.5/bitmaps.c 2008-03-07 22:49:26.000000000 +0100
+++ new/x11perf-1.5.1/bitmaps.c 2009-01-22 16:09:42.000000000 +0100
@@ -782,9 +782,7 @@
# define GCBits (GCFillStyle|GCTileStipXOrigin|GCTileStipYOrigin)
-void SetFillStyle(xp, p)
- XParms xp;
- Parms p;
+void SetFillStyle(XParms xp, Parms p)
{
int xorg = 0, yorg = 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/x11perf-1.5/config.h.in new/x11perf-1.5.1/config.h.in
--- old/x11perf-1.5/config.h.in 2008-03-07 22:51:35.000000000 +0100
+++ new/x11perf-1.5.1/config.h.in 2009-10-17 02:19:54.000000000 +0200
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Define to 1 if you have the `XShmQueryExtension' function. */
#undef HAVE_XSHMQUERYEXTENSION
@@ -36,6 +63,9 @@
/* 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
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/x11perf-1.5/configure.ac new/x11perf-1.5.1/configure.ac
--- old/x11perf-1.5/configure.ac 2008-03-07 22:50:57.000000000 +0100
+++ new/x11perf-1.5.1/configure.ac 2009-10-17 02:17:53.000000000 +0200
@@ -21,15 +21,22 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(x11perf,[1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x11perf)
+AC_INIT(x11perf,[1.5.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],x11perf)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
AC_PATH_PROG(SED,sed)
if [[ -z $SED ]] ; then
AC_MSG_ERROR([sed is needed to build x11perf])
@@ -76,7 +83,4 @@
;;
esac
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile])
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/x11perf-1.5/do_blt.c new/x11perf-1.5.1/do_blt.c
--- old/x11perf-1.5/do_blt.c 2008-03-07 22:49:26.000000000 +0100
+++ new/x11perf-1.5.1/do_blt.c 2009-01-22 16:09:42.000000000 +0100
@@ -200,7 +200,7 @@
/* Create pixmap to write stuff into, and initialize it */
pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT, xp->vinfo.depth);
- pixgc = XCreateGC(xp->d, pix, 0, 0);
+ pixgc = XCreateGC(xp->d, pix, 0, NULL);
/* need a gc with GXcopy cos pixmaps contain junk on creation. mmm */
XCopyArea(xp->d, xp->w, pix, pixgc, 0, 0, WIDTH, HEIGHT, 0, 0);
XFreeGC(xp->d, pixgc);
@@ -214,8 +214,8 @@
/* Create image to stuff bits into */
image = XGetImage(xp->d, xp->w, 0, 0, WIDTH, HEIGHT, xp->planemask,
- p->font==0?ZPixmap:XYPixmap);
- if(image==0){
+ p->font==NULL?ZPixmap:XYPixmap);
+ if(image==NULL){
printf("XGetImage failed\n");
return False;
}
@@ -284,7 +284,7 @@
int format;
size = p->special;
- format = (p->font == 0) ? ZPixmap : XYPixmap;
+ format = (p->font == NULL) ? ZPixmap : XYPixmap;
for (sa = segsa, sb = segsb, i = 0; i != reps; i++, sa++, sb++) {
XDestroyImage(image);
image = XGetImage(xp->d, xp->w, sa->x1, sa->y1, size, size,
@@ -404,7 +404,7 @@
perror ("shmget");
return False;
}
- shm_info.shmaddr = (char *) shmat(shm_info.shmid, 0, 0);
+ shm_info.shmaddr = (char *) shmat(shm_info.shmid, NULL, 0);
if (shm_info.shmaddr == ((char *) -1))
{
/*
@@ -417,7 +417,7 @@
free(segsa);
free(segsb);
perror ("shmat");
- shmctl (shm_info.shmid, IPC_RMID, 0);
+ shmctl (shm_info.shmid, IPC_RMID, NULL);
return False;
}
shm_info.readOnly = True;
@@ -439,7 +439,7 @@
free(segsb);
if(shmdt (shm_info.shmaddr)==-1)
perror("shmdt:");
- if(shmctl (shm_info.shmid, IPC_RMID, 0)==-1)
+ if(shmctl (shm_info.shmid, IPC_RMID, NULL)==-1)
perror("shmctl rmid:");
return False;
}
@@ -478,7 +478,7 @@
XSync(xp->d, False); /* need server to detach so can remove id */
if(shmdt (shm_info.shmaddr)==-1)
perror("shmdt:");
- if(shmctl (shm_info.shmid, IPC_RMID, 0)==-1)
+ if(shmctl (shm_info.shmid, IPC_RMID, NULL)==-1)
perror("shmctl rmid:");
}
@@ -528,7 +528,7 @@
/* Create pixmap to write stuff into, and initialize it */
pix = XCreatePixmap(xp->d, xp->w, WIDTH, HEIGHT,
- p->font==0 ? 1 : xp->vinfo.depth);
+ p->font==NULL ? 1 : xp->vinfo.depth);
gcv.graphics_exposures = False;
gcv.foreground = 0;
gcv.background = 1;
@@ -608,6 +608,9 @@
case PictStandardA1:
depth = 1;
break;
+ default:
+ depth = 0;
+ break;
}
if (!format)
format = XRenderFindStandardFormat (xp->d, xp->planemask);
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/x11perf-1.5/do_text.c new/x11perf-1.5.1/do_text.c
--- old/x11perf-1.5/do_text.c 2008-03-07 22:49:26.000000000 +0100
+++ new/x11perf-1.5.1/do_text.c 2009-01-22 16:09:42.000000000 +0100
@@ -444,8 +444,8 @@
printf ("Cannot allocate black\n");
XftFontClose (xp->d, aafont);
XftDrawDestroy (aadraw);
- aafont = 0;
- aadraw = 0;
+ aafont = NULL;
+ aadraw = NULL;
return 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/x11perf-1.5/do_traps.c new/x11perf-1.5.1/do_traps.c
--- old/x11perf-1.5/do_traps.c 2008-03-07 22:49:26.000000000 +0100
+++ new/x11perf-1.5.1/do_traps.c 2009-01-22 16:09:42.000000000 +0100
@@ -172,8 +172,8 @@
maskFormat = XRenderFindStandardFormat (xp->d, std_fmt);
maskPixmap = XCreatePixmap (xp->d, xp->w, WIDTH, HEIGHT, depth);
-
- mask = XRenderCreatePicture (xp->d, maskPixmap, maskFormat, 0, 0);
+
+ mask = XRenderCreatePicture (xp->d, maskPixmap, maskFormat, 0, NULL);
color.red = 0;
color.green = 0;
@@ -185,7 +185,7 @@
&color, &aablack))
{
XftDrawDestroy (aadraw);
- aadraw = 0;
+ aadraw = NULL;
return 0;
}
color.red = 0xffff;
@@ -198,7 +198,7 @@
&color, &aawhite))
{
XftDrawDestroy (aadraw);
- aadraw = 0;
+ aadraw = NULL;
return 0;
}
@@ -304,7 +304,7 @@
0);
}
else
- maskFormat = 0;
+ maskFormat = NULL;
color.red = 0;
color.green = 0;
color.blue = 0;
@@ -315,7 +315,7 @@
&color, &aablack))
{
XftDrawDestroy (aadraw);
- aadraw = 0;
+ aadraw = NULL;
return 0;
}
color.red = 0xffff;
@@ -328,7 +328,7 @@
&color, &aawhite))
{
XftDrawDestroy (aadraw);
- aadraw = 0;
+ aadraw = NULL;
return 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/x11perf-1.5/missing new/x11perf-1.5.1/missing
--- old/x11perf-1.5/missing 2008-03-07 22:51:36.000000000 +0100
+++ new/x11perf-1.5.1/missing 2009-10-17 02:19:56.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/x11perf-1.5/x11perf.c new/x11perf-1.5.1/x11perf.c
--- old/x11perf-1.5/x11perf.c 2008-03-07 22:49:26.000000000 +0100
+++ new/x11perf-1.5.1/x11perf.c 2009-01-22 16:09:42.000000000 +0100
@@ -49,7 +49,7 @@
typedef struct _RopNames { char *name; int rop; } RopNameRec, *RopNamePtr;
-RopNameRec ropNames[] = {
+static RopNameRec ropNames[] = {
{ "clear", GXclear }, /* 0 */
{ "and", GXand }, /* src AND dst */
{ "andReverse", GXandReverse }, /* src AND NOT dst */
@@ -68,7 +68,7 @@
{ "set", GXset } /* 1 */
};
-RopNameRec popNames[] = {
+static RopNameRec popNames[] = {
{ "Clear", PictOpClear },
{ "Src", PictOpSrc },
{ "Dst", PictOpDst },
@@ -85,7 +85,7 @@
{ "Saturate", PictOpSaturate },
};
-RopNameRec formatNames[] = {
+static RopNameRec formatNames[] = {
{ "RGB24", PictStandardRGB24 },
{ "ARGB32", PictStandardARGB32 },
{ "A8", PictStandardA8 },
@@ -94,7 +94,7 @@
{ "NATIVE", PictStandardNative },
};
-char *(visualClassNames)[] = {
+static char *(visualClassNames)[] = {
"StaticGray",
"GrayScale",
"StaticColor",
@@ -1093,14 +1093,14 @@
len = strlen(argv[i]);
if(len>=3)
ForEachTest (j) {
- if (Strstr (test[j].option, argv[i]+1) != 0) {
+ if (Strstr (test[j].option, argv[i]+1) != NULL) {
fprintf(stderr," -> %s %s\n", test[j].option, LABELP(j));
doit[j] = found = True;
}
}
if(!found)
ForEachTest (j) {
- if (Strstr (LABELP(j), argv[i]+1) != 0) {
+ if (Strstr (LABELP(j), argv[i]+1) != NULL) {
fprintf(stderr," -> %s %s\n", test[j].option, LABELP(j));
doit[j] = found = True;
}
++++++ xauth-1.0.3.tar.bz2 -> xauth-1.0.4.tar.bz2 ++++++
++++ 11763 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/xauth-1.0.3/ChangeLog new/xauth-1.0.4/ChangeLog
--- old/xauth-1.0.3/ChangeLog 2008-03-06 22:56:27.000000000 +0100
+++ new/xauth-1.0.4/ChangeLog 2009-09-22 05:33:23.000000000 +0200
@@ -1,3 +1,92 @@
+commit d2d802ea9f882b7b7eac1251309d8141e55f213e
+Author: Alan Coopersmith
+Date: Mon Sep 21 20:25:09 2009 -0700
+
+ xauth 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit e4ab625fd4e31a6cc043dfabbb7d5a801e87d526
+Author: Alan Coopersmith
+Date: Mon Sep 21 20:22:28 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 2cbcbed9dedb696535fe54290189478c6c007270
+Author: Alan Coopersmith
+Date: Mon Sep 21 20:17:48 2009 -0700
+
+ Man page updates: add "SEE ALSO", update xdm references
+
+ Also trim trailing whitespaces and fix a spelling error
+
+ Signed-off-by: Alan Coopersmith
+
+commit d376341c3cbeca0aec335462dffb796e5a8e5d03
+Author: Alan Coopersmith
+Date: Mon Sep 21 20:08:10 2009 -0700
+
+ Add pointers to mailing list, bugzilla, wiki & git repo to README
+
+ Signed-off-by: Alan Coopersmith
+
+commit 6d47c482a198f5421a7007221a69ee24d5f0a2a4
+Author: Matthieu Herrb
+Date: Sun Jul 19 10:27:49 2009 +0200
+
+ Initialize ed.used_stdout at the beginning of do_extract()
+
+ This avoids reading uninitialized memory later.
+ Problem reported by Philip Guenther. Thanks.
+
+ Signed-off-by: Matthieu Herrb
+
+commit b0aec5d07ea5c9fccacf250fe1c665d92243fb61
+Author: Michael Scherer
+Date: Sat Mar 7 12:14:26 2009 +0100
+
+ Fix format error
+
+commit 31395a96cff3570440229b2715c8ba557a6ce8d4
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 19 19:05:44 2009 -0200
+
+ Correct make distcheck.
+
+ No warnings were generated by gcc 4.3 neither sparse when using
+ XORG_CWARNFLAGS.
+
+commit 64d1fe69362bb0edcd5736ee6988d9bd394ea5c0
+Author: Matthieu Herrb
+Date: Tue Jun 17 23:31:58 2008 +0200
+
+ Replace rsh by ssh the extract/merge example. Rsh is no more.
+
+commit 3cc17297124ea5c9917e6eacc0ab7ae021e8a386
+Author: Jens Granseuer
+Date: Sun Mar 9 20:06:49 2008 +0100
+
+ C89 fix
+
+ 65a0917d4661e370b50beed8f06f5577bfeea59f broke the build with non-C99
+ aware compilers.
+
+commit 85459f9fee2ad4d5954e8f549df9a269cf3bff76
+Author: Julien Cristau
+Date: Fri Mar 7 18:20:15 2008 +0100
+
+ Change xauth_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:27: compiling `gethost.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit a9c0960c94b9299bcf2bb08c05a6f66579d4a862
+Author: Adam Jackson
+Date: Thu Mar 6 16:56:33 2008 -0500
+
+ xauth 1.0.3
+
commit 65a0917d4661e370b50beed8f06f5577bfeea59f
Author: Jeremy Huddleston
Date: Thu Jan 10 21:15:56 2008 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.3/Makefile.am new/xauth-1.0.4/Makefile.am
--- old/xauth-1.0.3/Makefile.am 2008-03-06 22:54:13.000000000 +0100
+++ new/xauth-1.0.4/Makefile.am 2009-09-22 05:20:30.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = xauth
-xauth_CFLAGS = $(XAUTH_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XAUTH_CFLAGS)
xauth_LDADD = $(XAUTH_LIBS)
xauth_SOURCES = \
@@ -43,7 +43,7 @@
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(xauth_CFLAGS)
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(XAUTH_CFLAGS)
lint:
$(LINT) $(ALL_LINT_FLAGS) $(xauth_SOURCES) $(xauth_LDADD)
@@ -79,6 +79,6 @@
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
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/xauth-1.0.3/README new/xauth-1.0.4/README
--- old/xauth-1.0.3/README 2008-03-06 22:54:13.000000000 +0100
+++ new/xauth-1.0.4/README 2009-09-22 05:07:43.000000000 +0200
@@ -0,0 +1,26 @@
+The xauth program is used to edit and display the authorization
+information used in connecting to the X server.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/xauth
+
+ http://cgit.freedesktop.org/xorg/app/xauth
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/xauth-1.0.3/config.h.in new/xauth-1.0.4/config.h.in
--- old/xauth-1.0.3/config.h.in 2008-03-06 22:55:44.000000000 +0100
+++ new/xauth-1.0.4/config.h.in 2009-09-22 05:33:23.000000000 +0200
@@ -6,12 +6,18 @@
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
+#undef HAVE_LIBWS2_32
+
/* Define to 1 if you have the header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the header file. */
#undef HAVE_NET_ERRNO_H
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the header file. */
#undef HAVE_STDINT_H
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/xauth-1.0.3/configure.ac new/xauth-1.0.4/configure.ac
--- old/xauth-1.0.3/configure.ac 2008-03-06 22:54:46.000000000 +0100
+++ new/xauth-1.0.4/configure.ac 2009-09-22 05:24:22.000000000 +0200
@@ -21,19 +21,21 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xauth,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
+AC_INIT(xauth,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
+# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
AC_TYPE_SIGNAL
AC_CHECK_HEADERS([net/errno.h])
@@ -48,7 +50,5 @@
XTRANS_CONNECTION_FLAGS
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])
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/xauth-1.0.3/gethost.c new/xauth-1.0.4/gethost.c
--- old/xauth-1.0.3/gethost.c 2008-03-06 22:54:13.000000000 +0100
+++ new/xauth-1.0.4/gethost.c 2008-03-17 23:25:34.000000000 +0100
@@ -295,6 +295,8 @@
hints.ai_protocol = 0;
if (getaddrinfo(host,NULL,&hints,&firstai) !=0) return NULL;
for (ai = firstai; ai != NULL; ai = ai->ai_next) {
+ struct addrlist *duplicate;
+
if (ai->ai_family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in *)ai->ai_addr;
src = &(sin->sin_addr);
@@ -307,7 +309,6 @@
family = FamilyInternet6;
}
- struct addrlist *duplicate;
for(duplicate = retval; duplicate != NULL; duplicate = duplicate->next) {
if(duplicate->family == family && duplicate->len == len &&
memcmp(duplicate->address, src, len) == 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/xauth-1.0.3/missing new/xauth-1.0.4/missing
--- old/xauth-1.0.3/missing 2008-03-06 22:55:45.000000000 +0100
+++ new/xauth-1.0.4/missing 2009-09-22 05:20:13.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/xauth-1.0.3/process.c new/xauth-1.0.4/process.c
--- old/xauth-1.0.3/process.c 2008-03-06 22:54:13.000000000 +0100
+++ new/xauth-1.0.4/process.c 2009-07-27 22:27:33.000000000 +0200
@@ -960,7 +960,7 @@
char *hex;
hex = bintohex(len, cp);
- fprintf(fp, hex);
+ fprintf(fp, "%s", hex);
free(hex);
}
@@ -1500,6 +1500,7 @@
ed.fp = NULL;
ed.filename = argv[1];
+ ed.used_stdout = False;
ed.numeric = (argv[0][0] == 'n');
ed.nwritten = 0;
ed.cmd = argv[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/xauth-1.0.3/xauth.man new/xauth-1.0.4/xauth.man
--- old/xauth-1.0.3/xauth.man 2008-03-06 22:54:13.000000000 +0100
+++ new/xauth-1.0.4/xauth.man 2009-09-22 05:17:22.000000000 +0200
@@ -1,15 +1,14 @@
-.\" $Xorg: xauth.man,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
.\" Copyright 1993, 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.
@@ -17,13 +16,12 @@
.\" 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.
.\"
-.\" $XFree86: xc/programs/xauth/xauth.man,v 1.8tsi Exp $
.\"
.TH XAUTH 1 __xorgversion__
.SH NAME
@@ -33,17 +31,18 @@
[ \fB\-f\fP \fIauthfile\fP ] [ \fB\-vqibn\fP ] [ \fIcommand arg ...\fP ]
.SH DESCRIPTION
.PP
-The \fIxauth\fP program is used to edit and display the authorization
+The \fIxauth\fP program is used to edit and display the authorization
information used in connecting to the X server. This program is usually
-used to extract authorization records from one machine and merge them in on
+used to extract authorization records from one machine and merge them in on
another (as is the case when using remote logins or granting access to
other users). Commands (described below) may be entered interactively,
on the \fIxauth\fP command line, or in scripts. Note that this program
does \fBnot\fP contact the X server except when the generate command is used.
Normally \fIxauth\fP is not used to create the authority file entry in
-the first place; \fIxdm\fP does that.
+the first place; the program that starts the X server (often \fIxdm\fP
+or \fIstartx\fP) does that.
.SH OPTIONS
-The following options may be used with \fIxauth\fP. They may be given
+The following options may be used with \fIxauth\fP. They may be given
individually (e.g., \fI\-q \-i\|\fP) or may combined (e.g., \fI\-qi\|\fP).
.TP 8
.B "\-f \fIauthfile\fP"
@@ -67,7 +66,7 @@
.B \-i
This option indicates that \fIxauth\fP should ignore any authority file
locks. Normally, \fIxauth\fP will refuse to read or edit any authority files
-that have been locked by other programs (usually \fIxdm\fP or another
+that have been locked by other programs (usually \fIxdm\fP or another
\fIxauth\fP).
.TP 8
.B \-b
@@ -84,11 +83,11 @@
.B "add \fIdisplayname protocolname hexkey"
An authorization entry for the indicated display using the given protocol
and key data is added to the authorization file. The data is specified as
-an even-lengthed string of hexadecimal digits, each pair representing
+an even-lengthed string of hexadecimal digits, each pair representing
one octet. The first digit of each pair gives the most significant 4 bits
of the octet, and the second digit of the pair gives the least significant 4
bits. For example, a 32 character hexkey would represent a 128-bit value.
-A protocol name consisting of just a
+A protocol name consisting of just a
single period is treated as an abbreviation for \fIMIT-MAGIC-COOKIE-1\fP.
.TP 8
@@ -135,24 +134,24 @@
.TP 8
.B "[n]extract \fIfilename displayname..."
-Authorization entries for each of the specified displays are written to the
+Authorization entries for each of the specified displays are written to the
indicated file. If the \fInextract\fP command is used, the entries are written
in a numeric format suitable for non-binary transmission (such as secure
-electronic mail). The extracted entries can be read back in using the
-\fImerge\fP and \fInmerge\fP commands. If the filename consists of
+electronic mail). The extracted entries can be read back in using the
+\fImerge\fP and \fInmerge\fP commands. If the filename consists of
just a single dash, the entries will be written to the standard output.
.TP 8
.B "[n]list \fR[\fIdisplayname\fP...]"
Authorization entries for each of the specified displays (or all if no
displays are named) are printed on the standard output. If the \fInlist\fP
-command is used, entries will be shown in the numeric format used by
+command is used, entries will be shown in the numeric format used by
the \fInextract\fP command; otherwise, they are shown in a textual format.
Key data is always displayed in the hexadecimal format given in the
description of the \fIadd\fP command.
.TP 8
.B "[n]merge \fR[\fIfilename\fP...]"
Authorization entries are read from the specified files and are merged into
-the authorization database, superceding any matching existing entries. If
+the authorization database, superseding any matching existing entries. If
the \fInmerge\fP command is used, the numeric format given in the description
of the \fIextract\fP command is used. If a filename consists of just a single
dash, the standard input will be read if it hasn't been read before.
@@ -163,14 +162,14 @@
.TP 8
.B "source \fIfilename"
The specified file is treated as a script containing \fIxauth\fP commands
-to execute. Blank lines and lines beginning with a sharp sign (#) are
+to execute. Blank lines and lines beginning with a sharp sign (#) are
ignored. A single dash may be used to indicate the standard input, if it
hasn't already been read.
.TP 8
.B "info"
Information describing the authorization file, whether or not any changes
have been made, and from where \fIxauth\fP commands are being read
-is printed on the standard output.
+is printed on the standard output.
.TP 8
.B "exit"
If any modifications have been made, the authority file is written out (if
@@ -194,17 +193,17 @@
argument. Display-specific information (such as the screen number)
is unnecessary and will be ignored.
Same-machine connections (such as local-host sockets,
-shared memory, and the Internet Protocol hostname \fIlocalhost\fP) are
+shared memory, and the Internet Protocol hostname \fIlocalhost\fP) are
referred to as \fIhostname\fP/unix:\fIdisplaynumber\fP so that
local entries for different machines may be stored in one authority file.
.SH EXAMPLE
.PP
-The most common use for \fIxauth\fP is to extract the entry for the
-current display, copy it to another machine, and merge it into the
+The most common use for \fIxauth\fP is to extract the entry for the
+current display, copy it to another machine, and merge it into the
user's authority file on the remote machine:
.sp
.nf
- % xauth extract \- $DISPLAY | rsh otherhost xauth merge \-
+ % xauth extract \- $DISPLAY | ssh otherhost xauth merge \-
.fi
.PP
.sp
@@ -227,10 +226,14 @@
.TP 8
.I $HOME/.Xauthority
default authority file if XAUTHORITY isn't defined.
+.SH "SEE ALSO"
+X(__miscmansuffix__), Xsecurity(__miscmansuffix__), xhost(__appmansuffix__),
+Xserver(__appmansuffix__), xdm(__appmansuffix__), startx(__appmansuffix__),
+Xau(__libmansuffix__).
.SH BUGS
.PP
-Users that have unsecure networks should take care to use encrypted
-file transfer mechanisms to copy authorization entries between machines.
+Users that have unsecure networks should take care to use encrypted
+file transfer mechanisms to copy authorization entries between machines.
Similarly, the \fIMIT-MAGIC-COOKIE-1\fP protocol is not very useful in
unsecure environments. Sites that are interested in additional security
may need to use encrypted authorization mechanisms such as Kerberos.
++++++ xbacklight-1.1.tar.bz2 -> xbacklight-1.1.1.tar.bz2 ++++++
++++ 10603 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/xbacklight-1.1/ChangeLog new/xbacklight-1.1.1/ChangeLog
--- old/xbacklight-1.1/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/xbacklight-1.1.1/ChangeLog 2009-09-25 02:59:44.000000000 +0200
@@ -0,0 +1,80 @@
+commit cbf474d6751dd32154163b8997519319655f0545
+Author: Alan Coopersmith
+Date: Thu Sep 24 17:54:45 2009 -0700
+
+ xbacklight 1.1.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit da0d7d89130b9a9e31905897627f0c805a58b2b3
+Author: Alan Coopersmith
+Date: Thu Sep 24 17:53:43 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 1b52fc41b59899b45dd1b06f9c1268b4458f9cd6
+Author: Alan Coopersmith
+Date: Thu Sep 24 17:43:47 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 5512e161157d6ac8a8d8a27fc99d596c6686b1da
+Author: Matthias Hopf
+Date: Wed Aug 19 14:38:31 2009 +0200
+
+ Use "Backlight" RandR property, fall back to legacy "BACKLIGHT".
+
+commit 97a3f5665a62ff3a606da48f3854d082f249e6a8
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 19 19:17:58 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
+commit a0dc8902b476fc2dddf02fceec7a7186d81f48fc
+Author: Alan Coopersmith
+Date: Thu Sep 6 16:27:47 2007 -0700
+
+ Man page typo ("faiding")
+
+commit 922cec4e60a4fb4db6c7333b7264cd940e763239
+Author: Keith Packard
+Date: Thu Jun 21 14:51:57 2007 +0100
+
+ Update to version 1.1
+
+commit 4440d319f20d1970b2a3f94a1c4f2b5142158ce3
+Author: Keith Packard
+Date: Thu Jun 21 14:50:54 2007 +0100
+
+ Add licenses (oops)
+
+commit ba34df17cfbd7bcf029b1fdc4bcd7b894a49a63d
+Author: Keith Packard
+Date: Thu Jun 21 11:36:30 2007 +0100
+
+ Fix version in configure.ac
+
+commit 3000145191a00d4c9b90efb221fadb9ce37380c0
+Author: Keith Packard
+Date: Thu Mar 29 23:18:14 2007 -0700
+
+ Add -time and -steps options to adjust fade
+
+commit 38c2c45514d50b825a5c74abedc30cb2272064d7
+Author: Keith Packard
+Date: Thu Mar 29 22:59:29 2007 -0700
+
+ Add autogen.sh
+
+commit d52f81e43da29d94122d62c1b1be34946960033c
+Author: Keith Packard
+Date: Thu Mar 29 22:56:13 2007 -0700
+
+ Initial xbacklight program
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/xbacklight-1.1/Makefile.am new/xbacklight-1.1.1/Makefile.am
--- old/xbacklight-1.1/Makefile.am 2007-06-21 15:48:14.000000000 +0200
+++ new/xbacklight-1.1.1/Makefile.am 2009-09-25 02:45:57.000000000 +0200
@@ -23,7 +23,7 @@
bin_PROGRAMS = xbacklight
-AM_CFLAGS = $(XRANDR_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XRANDR_CFLAGS)
xbacklight_LDADD = $(XRANDR_LIBS)
xbacklight_SOURCES = \
@@ -62,3 +62,13 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+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/xbacklight-1.1/README new/xbacklight-1.1.1/README
--- old/xbacklight-1.1/README 1970-01-01 01:00:00.000000000 +0100
+++ new/xbacklight-1.1.1/README 2009-09-25 02:42:59.000000000 +0200
@@ -0,0 +1,28 @@
+Xbacklight is used to adjust the backlight brightness where supported.
+It uses the RandR extension to find all outputs on the X server
+supporting backlight brightness control and changes them all in the
+same way.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/xbacklight
+
+ http://cgit.freedesktop.org/xorg/app/xbacklight
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
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/xbacklight-1.1/config.h.in new/xbacklight-1.1.1/config.h.in
--- old/xbacklight-1.1/config.h.in 2007-06-21 15:51:24.000000000 +0200
+++ new/xbacklight-1.1.1/config.h.in 2009-09-25 02:59:13.000000000 +0200
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -18,5 +45,17 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xbacklight-1.1/configure.ac new/xbacklight-1.1.1/configure.ac
--- old/xbacklight-1.1/configure.ac 2007-06-21 15:51:04.000000000 +0200
+++ new/xbacklight-1.1.1/configure.ac 2009-09-25 02:53:57.000000000 +0200
@@ -22,21 +22,24 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xbacklight,[1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xbacklight)
+AC_INIT(xbacklight,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xbacklight)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
+XORG_DEFAULT_OPTIONS
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0 xrender x11)
AC_SUBST(XRANDR_CFLAGS)
AC_SUBST(XRANDR_LIBS)
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([Makefile])
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/xbacklight-1.1/missing new/xbacklight-1.1.1/missing
--- old/xbacklight-1.1/missing 2007-03-30 08:03:11.000000000 +0200
+++ new/xbacklight-1.1.1/missing 2009-09-25 02:59:15.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -103,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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)
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -145,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -154,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -164,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -192,8 +203,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,80 +218,78 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/xbacklight-1.1/xbacklight.c new/xbacklight-1.1.1/xbacklight.c
--- old/xbacklight-1.1/xbacklight.c 2007-06-21 15:46:03.000000000 +0200
+++ new/xbacklight-1.1.1/xbacklight.c 2009-08-31 04:57:37.000000000 +0200
@@ -25,11 +25,15 @@
#include
#include
+#include