Hello community,
here is the log from the commit of package xorg-x11
checked in at Thu Mar 22 20:49:43 CET 2007.
--------
--- xorg-x11/xorg-x11.changes 2007-03-15 16:48:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-03-22 08:16:30.000000000 +0100
@@ -1,0 +2,20 @@
+Thu Mar 22 08:15:40 CET 2007 - sndirsch@suse.de
+
+- updated xload to release 1.0.2
+ * configure.ac: Update version for another release.
+ * xload.c: Check setuid() return value. Bugzilla #7116
+
+-------------------------------------------------------------------
+Wed Mar 21 22:24:41 CET 2007 - sndirsch@suse.de
+
+- updated mkfontdir to release 1.0.3
+ * No changes, but source tarball uses recent util macros. (This
+ fixes location for man pages for example.)
+
+-------------------------------------------------------------------
+Wed Mar 21 06:15:37 CET 2007 - sndirsch@suse.de
+
+- updated xdpyinfo to release 1.0.2
+ * minor cleanup/bug fix release
+
+-------------------------------------------------------------------
Old:
----
mkfontdir-X11R7.1-1.0.2.tar.bz2
x11r6.9.0-setuid.diff
xdpyinfo-X11R7.0-1.0.1.tar.bz2
xload-X11R7.0-1.0.1.tar.bz2
New:
----
mkfontdir-1.0.3.tar.bz2
xdpyinfo-1.0.2.tar.bz2
xload-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.i13936/_old 2007-03-22 20:48:32.000000000 +0100
+++ /var/tmp/diff_new_pack.i13936/_new 2007-03-22 20:48:32.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 57
+Release: 58
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -35,7 +35,7 @@
Source10: lbxproxy-X11R7.0-1.0.1.tar.bz2
Source11: listres-X11R7.0-1.0.1.tar.bz2
Source12: luit-1.0.2.tar.bz2
-Source14: mkfontdir-X11R7.1-1.0.2.tar.bz2
+Source14: mkfontdir-1.0.3.tar.bz2
Source15: mkfontscale-1.0.3.tar.bz2
Source16: oclock-X11R7.0-1.0.1.tar.bz2
Source17: proxymngr-X11R7.0-1.0.1.tar.bz2
@@ -61,7 +61,7 @@
Source37: xdbedizzy-1.0.2.tar.bz2
Source38: xditview-X11R7.0-1.0.1.tar.bz2
Source39: xdm-1.1.4.tar.bz2
-Source40: xdpyinfo-X11R7.0-1.0.1.tar.bz2
+Source40: xdpyinfo-1.0.2.tar.bz2
Source41: xdriinfo-X11R7.1-1.0.1.tar.bz2
Source42: xedit-X11R7.1-1.0.2.tar.bz2
Source43: xev-1.0.2.tar.bz2
@@ -82,7 +82,7 @@
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
-Source61: xload-X11R7.0-1.0.1.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
@@ -137,7 +137,6 @@
Patch14: p_bugzilla-117193-luit-sometimes-hangs.diff
Patch15: p_xrdb.diff
Patch16: p_twm_sig11.diff
-Patch17: x11r6.9.0-setuid.diff
Patch19: scripts.diff
Patch20: xdm.diff
Patch21: xvidtune.diff
@@ -226,7 +225,6 @@
pushd twm-*/src
%patch16 -p2
popd
-%patch17
patch -d scripts-* -p0 -s < %PATCH19
patch -d xvidtune-* -p0 -s < %PATCH21
patch -d beforelight-* -p0 -s < %PATCH22
@@ -449,6 +447,17 @@
/var/lib/xdm/authdir/
%changelog
+* Thu Mar 22 2007 - sndirsch@suse.de
+- updated xload to release 1.0.2
+ * configure.ac: Update version for another release.
+ * xload.c: Check setuid() return value. Bugzilla #7116
+* Wed Mar 21 2007 - sndirsch@suse.de
+- updated mkfontdir to release 1.0.3
+ * No changes, but source tarball uses recent util macros. (This
+ fixes location for man pages for example.)
+* Wed Mar 21 2007 - sndirsch@suse.de
+- updated xdpyinfo to release 1.0.2
+ * minor cleanup/bug fix release
* Thu Mar 15 2007 - sndirsch@suse.de
- /etc/X11/xdm/Xsetup:
* enable external output on laptops or when configured via
++++++ mkfontdir-X11R7.1-1.0.2.tar.bz2 -> mkfontdir-1.0.3.tar.bz2 ++++++
++++ 3352 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-X11R7.1-1.0.2/ChangeLog new/mkfontdir-1.0.3/ChangeLog
--- old/mkfontdir-X11R7.1-1.0.2/ChangeLog 2006-04-02 02:38:25.000000000 +0200
+++ new/mkfontdir-1.0.3/ChangeLog 2007-03-21 22:09:27.000000000 +0100
@@ -1,3 +1,9 @@
+2007-03-21 Jeremy C. Reed
+
+ * configure.ac:
+ Bump version number. (No changes, but source tarball will
+ use recent util macros.)
+
2006-04-01 Adam Jackson
* configure.ac:
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-X11R7.1-1.0.2/configure.ac new/mkfontdir-1.0.3/configure.ac
--- old/mkfontdir-X11R7.1-1.0.2/configure.ac 2006-04-02 02:38:25.000000000 +0200
+++ new/mkfontdir-1.0.3/configure.ac 2007-03-21 22:02:51.000000000 +0100
@@ -21,7 +21,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(mkfontdir, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontdir)
+AC_INIT(mkfontdir, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], mkfontdir)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
++++++ xdpyinfo-X11R7.0-1.0.1.tar.bz2 -> xdpyinfo-1.0.2.tar.bz2 ++++++
++++ 14451 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/xdpyinfo-X11R7.0-1.0.1/ChangeLog new/xdpyinfo-1.0.2/ChangeLog
--- old/xdpyinfo-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:49.000000000 +0100
+++ new/xdpyinfo-1.0.2/ChangeLog 2007-03-20 22:08:55.000000000 +0100
@@ -1,49 +1,345 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 704cb5aad217a1818c05e3cd5334c484020150e6
+Author: Alan Coopersmith
+Date: Tue Mar 20 14:08:17 2007 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.2
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e7c95f92cb17eb971462074cfcc9b952bb466362
+Author: Alan Coopersmith
+Date: Tue Mar 20 13:34:30 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Clear a couple more memory leaks found by Sun Studio dbx check -leaks
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e411de3d660a5382e7cb8d31fa2fa1bc35823931
+Author: Alan Coopersmith
+Date: Tue Mar 20 13:25:06 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Coverity #748: IsPrintScreen: Returned without freeing storage "pscreens"
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ce6709132a322e82e915b761c0ced1bc418095ea
+Author: Alan Coopersmith
+Date: Tue Mar 20 13:21:56 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Coverity #749: print_XF86VidMode_info: Returned without freeing storage "modelines"
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f4001e881a9f5d57dd99326d4f501737a0ded6e6
+Author: Alan Coopersmith
+Date: Tue Mar 20 13:16:18 2007 -0700
- * Makefile.am:
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Coverity #750: print_xinput_info() returned without freeing storage "ext"
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c896552ee94cf50f8acfccc49096e5ec564e5356
+Author: Alan Coopersmith
+Date: Tue Mar 20 13:10:33 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ Coverity #752: XListDepths return leaked in print_xrender_info()
-2005-07-18 Daniel Stone
+commit ea8455a0932c21ef29e97d469b492dadc85dabdc
+Author: Ingo Bormuth
+Date: Thu May 25 03:13:00 2006 -0800
- * configure.ac:
- Actually make extensions optional.
+ Bug 7027: Add configure options --without-dmx --without-dga --without-xinerama
+
+ X.Org Bug 7027: https://bugs.freedesktop.org/show_bug.cgi?id=7027
+ Patch #5735: https://bugs.freedesktop.org/attachment.cgi?id=5735
+
+ From gentoo bug 132502: http://bugs.gentoo.org/show_bug.cgi?id=132502
-2005-07-09 Keith Packard
+commit 2fe59be76e3a341b601838c3729d0045d49946d3
+Author: Alan Coopersmith
+Date: Tue Mar 20 10:39:36 2007 -0700
- * .cvsignore:
- Add .cvsignore files
+ Fix line wrapping of extensions list in usage message
-2005-07-07 Keith Packard
+commit 91f465babd46f1b39c6f5665e38e4aab58fc921b
+Author: Alan Coopersmith
+Date: Mon Mar 19 19:23:33 2007 -0700
- * Makefile.am:
- * configure.ac:
- Autodetect extension support. Install manual as xdpyinfo.1
- Note that autodetection requires changes to xdpyinfo.c as well,
- which currently lives in the monolithic tree. These changes
- don't have any effect on monolithic builds.
+ Clear sparse warning: Using plain integer as NULL pointer
+
+commit 6a26c41570f1b91f14508cf3d44f4ed3c51127bd
+Author: Alan Coopersmith
+Date: Mon Mar 19 19:15:18 2007 -0700
+
+ Fix typos in comments
+
+commit 752b793aa03b67eeff6b01c7f0bdb729f00bd49b
+Author: Alan Coopersmith
+Date: Mon Mar 19 19:09:27 2007 -0700
+
+ Add support for checking sources with sparse/lint/etc.
+
+commit d66b154dce42319f73f4b0773e44c59c9cf9d7a6
+Author: Alan Coopersmith
+Date: Mon Mar 19 18:53:38 2007 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 767fdebc77faf1b7322e7068a420a7fc2bf4a376
+Author: Alan Coopersmith
+Date: Mon Mar 19 18:53:02 2007 -0700
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 421eee53c9153cfa6bb5ea27e8b8df5f186451a3
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:49 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 263521ee094a1b63fd5ffdd2f81bd4c511fdb479
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:43 2005 +0000
+
+ Stub COPYING files
+
+commit 74da6a6fdc7b90a779fab59811a162fe0571992c
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:06 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 58e6b96a84164845b49112bf6d76def97e909ef1
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:21 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit d4cf291eff395b272590ba1415cdc5744dc39694
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:19 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit bdf02be37894b3e1b87437a8a0186fbd57f80e38
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:41 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 3a79f7e287e091102d56df996a19631709d99737
+Author: Eric Anholt
+Date: Mon Nov 21 10:34:59 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 1b28a57af4956be9a8e7d64dd5f0096ae43b3f6d
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:51 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit d91a0552a4b3c4f40e4b2ec10936c3f212a5d3bc
+Author: Kevin E Martin
+Date: Sat Nov 19 07:15:36 2005 +0000
+
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
+
+commit eddecbe72843f358cf902a3a2081634745e52298
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:53 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 4689eb41b6329fec24a7da63a203576b72b937da
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:21 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 72bc207e91d9d770d17f8330cbba71a83b21d13d
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:44 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 0df7213be00f90d227be44efbb60c8f2fdd712ff
+Author: Alan Coopersmith
+Date: Fri Aug 19 00:13:45 2005 +0000
+
+ More updates for Panoramix -> Xinerama rename
+
+commit 87e9acd02968882740bfbf51b68a1ef19584f371
+Author: Adam Jackson
+Date: Wed Aug 3 04:30:26 2005 +0000
+
+ More unique tokens for PKG_CHECK_MODULES
+
+commit 4fb83e624716886c60474f3bb443ffd730786889
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:32 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 ed783e6948cf7cd937f0570e9578162e35495d45
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:52 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 bcc095561f040a8a0cd19ed94bc800d128e9c0b1
+Author: Daniel Stone
+Date: Mon Jul 18 08:24:50 2005 +0000
+
+ Fail gracefully when extensions not present.
+
+commit 3b4cbb4fe34ff4de91ba6524d7750a2b55f5d67a
+Author: Keith Packard
+Date: Sat Jul 9 23:36:22 2005 +0000
+
+ Add .cvsignore files
+
+commit 1e169a60adf7d9759d3b4a4dfb381043814e121a
+Author: Keith Packard
+Date: Fri Jul 8 04:54:31 2005 +0000
+
+ Autodetect extension support. Install manual as xdpyinfo.1 Note that
+ autodetection requires changes to xdpyinfo.c as well, which currently
+ lives in the monolithic tree. These changes don't have any effect on
+ monolithic builds.
+
+commit d89449b6eacd919005fdad3b378e64fe46591728
+Author: Keith Packard
+Date: Fri Jul 8 04:54:09 2005 +0000
+
+ Add support for modular extension autodetection (ignored in monolithic
+ build)
+
+commit d99fbcde4c892e8d84e02b40ed3f5862a731e9c2
+Author: Søren Sandmann Pedersen
+Date: Wed Jul 6 19:56:47 2005 +0000
+
+ Add buildsystem for xdpyinfo
+
+commit 1b09e416dcaed59d319b295b933506a6f54fe918
+Author: Roland Mainz
+Date: Tue Apr 26 05:33:10 2005 +0000
+
+ //bugs.freedesktop.org/show_bug.cgi?id=2705) attachment #2555
+ (https://bugs.freedesktop.org/attachment.cgi?id=2555) bug 2705 part II:
+ Fix build to work with |#define BuildXprint NO| Patch by Kevin E.
+ Martin .
+
+commit 5adf5a253e5434c2b0c2276ce3733cbb05282980
+Author: Roland Mainz
+Date: Fri Mar 11 21:18:12 2005 +0000
+
+ xc/programs/twm/Imakefile
+ xc/programs/twm/twm.c
+ //bugs.freedesktop.org/show_bug.cgi?id=2705) attachment #2087
+ (https://bugs.freedesktop.org/attachment.cgi?id=2087) Make twm ignore
+ print screens to avoid that users accidentally warp on a non-video
+ screen (which are not visible on any monitor) when the Xserver has both
+ video and print screens. (This includes also a small cleanup of
+ xdpyinfo where parts of the print screen test code comes from) Patch by
+ Julien Lafon (MIT/X.org license).
+
+commit 4d275dcc29658972a3d7c2e72b812140819a10c3
+Author: Kevin E Martin
+Date: Thu Sep 2 05:50:38 2004 +0000
+
+ Clean up defines for Xprint support and fix BuildServersOnly build for
+ libXaw.
+
+commit a667763d5b733f5ae2d8a3ca7e1e99d3deed2830
+Author: Kristian Høgsberg
+Date: Mon Aug 16 16:36:15 2004 +0000
+
+ As discussed and agreed on on the release-wranglers meeting of August 16,
+ I'm committing the patch from bug #1060 to back out unconditional
+ Xprint functionality.
+ Back out Xprint changes.
+ Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to
+ CVS of April 25, to back out unconditional Xprint support.
+ Fix up Xprint config logic to be like the rest of the extensions:
+ BuildXprint is a one-stop option for disabling everything Xprint
+ related. XprtServer controls building Xprt, BuildXprintLib controls
+ building Xprint libs and BuildXprintClients controls building clients
+ related to Xprint. BuiltXprint defaults to YES and the other options
+ respects relevant settings, i.e. BuildServer and BuildServersOnly.
+ Build Xaw regardless of BuildXprintLib setting.
+ Only build xphelloworld, xplsprinters and xprehashprinterlist when
+ BuildXprintClients it YES. Disable building xmore, it has always
+ supported XawPrintShell.
+ Make Xprint support depend on BuildXprintLib.
+
+commit f5e06cb6bc7ddb2b81a819f4ef1ba41f7c66ba20
+Author: Kevin E Martin
+Date: Wed Jun 30 20:06:56 2004 +0000
+
+ Add Distributed Multihead X (DMX) support
+
+commit ec6b1eb0128635b465ba46761b5d9ba3377db0e8
+Author: Roland Mainz
+Date: Tue May 25 02:07:18 2004 +0000
+
+ Fix for http://freedesktop.org/bugzilla/show_bug.cgi?id=672 - RFE: xdpyinfo
+ should print information about print screens
+
+commit 4933a7a9f75fc80afba004f0c55959d35d7ffe41
+Author: Roland Mainz
+Date: Sun May 16 21:52:44 2004 +0000
+
+ Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=623 -
+ RFE: "xdpyinfo" should have support for XpExtension.
+
+commit 0f274e479e7825d535ab04aeadd475d47e1769a5
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:43 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit cccbebfe7ee498cd8beae22831b50d570d623a94
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:14 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 26e6d0a4c391ee1e7ec6c3ca89f0955ca9423f09
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:00 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 4d33162b89fb90f764ce9bc9eed73b1c60ba631c
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:17 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d3552b39fa600adbf6229fad2e3f651d18889178
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:04 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 8dad0c498789e5feb268b70daae210751b98eb24
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:12 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit c9f38bd47df33b0681bdf2cfce02c1b78cb1a038
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 212617e163d792b20d025502f4138b6bdb7829a0
+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/xdpyinfo-X11R7.0-1.0.1/config.h.in new/xdpyinfo-1.0.2/config.h.in
--- old/xdpyinfo-X11R7.0-1.0.1/config.h.in 2005-12-21 08:26:09.000000000 +0100
+++ new/xdpyinfo-1.0.2/config.h.in 2007-03-20 22:08:46.000000000 +0100
@@ -66,5 +66,14 @@
/* 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
+
/* 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/xdpyinfo-X11R7.0-1.0.1/configure.ac new/xdpyinfo-1.0.2/configure.ac
--- old/xdpyinfo-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:49.000000000 +0100
+++ new/xdpyinfo-1.0.2/configure.ac 2007-03-20 22:08:01.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xdpyinfo,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdpyinfo)
+AC_INIT(xdpyinfo,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdpyinfo)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -57,13 +57,20 @@
AC_CHECK_HEADERS([X11/extensions/xf86vmode.h X11/extensions/xf86vmstr.h],,,[#include ])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,,
- [#include
+AC_ARG_WITH(dga, AC_HELP_STRING([--without-dga],[Disable dga support.]),
+ [USE_DGA="$withval"], [USE_DGA="yes"])
+if test "x$USE_DGA" != "xno" ; then
+ PKG_CHECK_MODULES(DPY_XF86DGA, xxf86dga,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $DPY_XF86DGA_CFLAGS $DPY_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/extensions/xf86dga.h X11/extensions/xf86dgastr.h],,,
+ [#include
#include ])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+else
+ echo "without dga"
+fi
+
PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc,
[SAVE_CPPFLAGS="$CPPFLAGS"
@@ -85,17 +92,29 @@
AC_CHECK_HEADERS([X11/extensions/Xrender.h],,,[#include ])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(DPY_XINERAMA, xinerama,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include ])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-PKG_CHECK_MODULES(DPY_DMX, dmx,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include ])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+AC_ARG_WITH(xinerama, AC_HELP_STRING([--without-xinerama],[Disable xinerama support.]),
+ [USE_XINERAMA="$withval"], [USE_XINERAMA="yes"])
+if test "x$USE_XINERAMA" != "xno" ; then
+ PKG_CHECK_MODULES(DPY_XINERAMA, xinerama,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $DPY_XINERAMA_CFLAGS $DPY_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/extensions/Xinerama.h],,,[#include ])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+else
+ echo "without xinerama"
+fi
+
+AC_ARG_WITH(dmx, AC_HELP_STRING([--without-dmx],[Disable dmx support.]),
+ [USE_DMX="$withval"], [USE_DMX="yes"])
+if test "x$USE_DMX" != "xno" ; then
+ PKG_CHECK_MODULES(DPY_DMX, dmx,
+ [SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $DPY_DMX_CFLAGS $DPY_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/extensions/dmxext.h],,,[#include ])
+ CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+else
+ echo "without dmx"
+fi
PKG_CHECK_MODULES(DPY_XPRINT, xp,
[SAVE_CPPFLAGS="$CPPFLAGS"
@@ -109,6 +128,9 @@
AC_CHECK_HEADERS([X11/extensions/record.h],,,[#include ])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdpyinfo-X11R7.0-1.0.1/Makefile.am new/xdpyinfo-1.0.2/Makefile.am
--- old/xdpyinfo-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:21.000000000 +0100
+++ new/xdpyinfo-1.0.2/Makefile.am 2007-03-20 03:00:47.000000000 +0100
@@ -34,7 +34,7 @@
$(DPY_DMX_CFLAGS) \
$(DPY_XPRINT_CFLAGS) \
$(DPY_XTST_CFLAGS)
-
+
xdpyinfo_LDADD = \
$(XDPYINFO_LIBS) \
$(DPY_XEXT_LIBS) \
@@ -60,8 +60,14 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = 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)
+
+dist-hook: ChangeLog
SED = sed
@@ -86,3 +92,11 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xdpyinfo_SOURCES)
+endif LINT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdpyinfo-X11R7.0-1.0.1/missing new/xdpyinfo-1.0.2/missing
--- old/xdpyinfo-X11R7.0-1.0.1/missing 2005-12-21 08:26:10.000000000 +0100
+++ new/xdpyinfo-1.0.2/missing 2007-03-20 22:08:49.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdpyinfo-X11R7.0-1.0.1/xdpyinfo.c new/xdpyinfo-1.0.2/xdpyinfo.c
--- old/xdpyinfo-X11R7.0-1.0.1/xdpyinfo.c 2005-07-08 06:54:09.000000000 +0200
+++ new/xdpyinfo-1.0.2/xdpyinfo.c 2007-03-20 21:53:54.000000000 +0100
@@ -1,7 +1,7 @@
/*
* $Xorg: xdpyinfo.c,v 1.5 2001/02/09 02:05:41 xorgcvs Exp $
*
- * xdpyinfo - print information about X display connecton
+ * xdpyinfo - print information about X display connection
*
*
Copyright 1988, 1998 The Open Group
@@ -424,6 +424,7 @@
pscreens = XpQueryScreens(dpy, &pscrcount);
for( i = 0 ; (i < pscrcount) && pscreens ; i++ ) {
if (s == pscreens[i]) {
+ XFree(pscreens);
return True;
}
}
@@ -438,7 +439,7 @@
{
Screen *s = ScreenOfDisplay (dpy, scr); /* opaque structure */
XVisualInfo viproto; /* fill in for getting info */
- XVisualInfo *vip; /* retured info */
+ XVisualInfo *vip; /* returned info */
int nvi; /* number of elements returned */
int i; /* temp variable: iterator */
char eventbuf[80]; /* want 79 chars per line + nul */
@@ -446,7 +447,7 @@
double xres, yres;
int ndepths = 0, *depths = NULL;
unsigned int width, height;
- Bool isPrintScreen = False; /* Initalise this if |INCLUDE_XPRINT_SUPPORT| is not set */
+ Bool isPrintScreen = False; /* Initialise this if |INCLUDE_XPRINT_SUPPORT| is not set */
/*
* there are 2.54 centimeters to an inch; so there are 25.4 millimeters.
@@ -775,6 +776,10 @@
printf(" vsync range %d: %6.2f - %6.2f\n", i, monitor.vsync[i].lo,
monitor.vsync[i].hi);
}
+ XFree(monitor.vendor);
+ XFree(monitor.model);
+ XFree(monitor.hsync);
+ XFree(monitor.vsync);
if ((majorrev > 0) || (majorrev == 0 && minorrev > 5)) {
if (!XF86VidModeGetAllModeLines(dpy, DefaultScreen(dpy), &modecount,
@@ -800,6 +805,7 @@
if (modelines[i]->flags & V_DBLSCAN) printf(" doublescan");
printf("\n");
}
+ XFree(modelines);
if (!XF86VidModeGetModeLine(dpy, DefaultScreen(dpy),
&dotclock, &modeline))
@@ -861,6 +867,7 @@
return 0;
printf(" Mouse Settings- Device: %s, Type: ",
strlen(mouseinfo.device) == 0 ? "None": mouseinfo.device);
+ XFree(mouseinfo.device);
if (mouseinfo.type == MTYPE_XQUEUE)
printf("Xqueue\n");
else if (mouseinfo.type == MTYPE_OSMOUSE)
@@ -986,6 +993,7 @@
print_standard_extension_info(dpy, extname, ext->major_version,
ext->minor_version);
+ XFree(ext);
extensions = XListExtensions(dpy, &num_extensions);
for (loop = 0; loop < num_extensions &&
@@ -1049,7 +1057,7 @@
XFreeExtensionList(extensions);
if (loop != num_extensions) {
printf (" Render formats :\n");
- for (count = 0; (pictform = XRenderFindFormat (dpy, 0, 0, count)); count++)
+ for (count = 0; (pictform = XRenderFindFormat (dpy, 0, NULL, count)); count++)
{
printf (" pict format:\n");
printf ("\tformat id: 0x%lx\n", pictform->id);
@@ -1120,6 +1128,7 @@
for (count = 0; (pictform = XRenderFindFormat (dpy, PictFormatDepth, &templ, count)); count++)
printf(" pict format id: 0x%lx\n", pictform->id);
}
+ if (depths) XFree (depths);
}
return 1;
}
@@ -1425,12 +1434,15 @@
int i, col;
for (i = 0, col = 6; i < num_known_extensions; i++)
{
- if ((col += strlen(known_extensions[i].extname)+1) > 79)
+ int extlen = strlen(known_extensions[i].extname) + 1;
+
+ if ((col + extlen) > 79)
{
col = 6;
fprintf(f, "\n ");
}
fprintf(f, "%s ", known_extensions[i].extname);
+ col += extlen;
}
}
++++++ xload-X11R7.0-1.0.1.tar.bz2 -> xload-1.0.2.tar.bz2 ++++++
++++ 5238 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/xload-X11R7.0-1.0.1/ChangeLog new/xload-1.0.2/ChangeLog
--- old/xload-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:51.000000000 +0100
+++ new/xload-1.0.2/ChangeLog 2007-03-22 05:18:54.000000000 +0100
@@ -1,3 +1,13 @@
+2007-03-21 Jeremy C. Reed
+
+ * configure.ac
+ Update version for another release.
+
+2006-06-20 Matthieu Herrb
+
+ * xload.c:
+ Check setuid() return value. Bugzilla #7116.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
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/xload-X11R7.0-1.0.1/compile new/xload-1.0.2/compile
--- old/xload-X11R7.0-1.0.1/compile 2005-12-21 08:29:34.000000000 +0100
+++ new/xload-1.0.2/compile 2007-03-22 05:16:48.000000000 +0100
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -17,83 +18,125 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
ofile=
cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
fi
# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-X11R7.0-1.0.1/config.h.in new/xload-1.0.2/config.h.in
--- old/xload-X11R7.0-1.0.1/config.h.in 2005-12-21 08:29:32.000000000 +0100
+++ new/xload-1.0.2/config.h.in 2007-03-22 06:21:14.000000000 +0100
@@ -21,5 +21,14 @@
/* 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
+
/* 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/xload-X11R7.0-1.0.1/configure.ac new/xload-1.0.2/configure.ac
--- old/xload-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:51.000000000 +0100
+++ new/xload-1.0.2/configure.ac 2007-03-22 06:18:04.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xload,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xload)
+AC_INIT(xload,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xload)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-X11R7.0-1.0.1/missing new/xload-1.0.2/missing
--- old/xload-X11R7.0-1.0.1/missing 2005-12-21 08:29:33.000000000 +0100
+++ new/xload-1.0.2/missing 2007-03-22 05:16:48.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xload-X11R7.0-1.0.1/xload.c new/xload-1.0.2/xload.c
--- old/xload-X11R7.0-1.0.1/xload.c 2004-04-23 21:54:57.000000000 +0200
+++ new/xload-1.0.2/xload.c 2006-08-02 03:20:40.000000000 +0200
@@ -34,7 +34,7 @@
* xload - display system load average in a window
*/
-
+#include
#include
#include
#include
@@ -162,8 +162,17 @@
/* For security reasons, we reset our uid/gid after doing the necessary
system initialization and before calling any X routines. */
InitLoadPoint();
- setgid(getgid()); /* reset gid first while still (maybe) root */
- setuid(getuid());
+ /* reset gid first while still (maybe) root */
+ if (setgid(getgid()) == -1) {
+ fprintf(stderr, "%s: setgid failed: %s\n",
+ ProgramName, strerror(errno));
+ exit(1);
+ }
+ if (setuid(getuid()) == -1) {
+ fprintf(stderr, "%s: setuid failed: %s\n",
+ ProgramName, strerror(errno));
+ exit(1);
+ }
XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org