Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Fri Mar 7 23:40:00 CET 2008.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2008-02-29 16:26:53.000000000 +0100
+++ xorg-x11-libs/xorg-x11-libs.changes 2008-03-06 21:57:53.061103000 +0100
@@ -1,0 +2,12 @@
+Thu Mar 6 22:14:04 CET 2008 - sndirsch@suse.de
+
+- libpciaccess 0.10
+- libXinerama 1.0.3
+
+-------------------------------------------------------------------
+Thu Mar 6 08:07:27 CET 2008 - sndirsch@suse.de
+
+- libXfont 1.3.2
+ * obsoletes bug348296-pcf_font_parser-libXfont.diff
+
+-------------------------------------------------------------------
Old:
----
bug348296-pcf_font_parser-libXfont.diff
libpciaccess-0.9.1.tar.bz2
libXfont-1.3.1.tar.bz2
libXinerama-1.0.2.tar.bz2
New:
----
libpciaccess-0.10.tar.bz2
libXfont-1.3.2.tar.bz2
libXinerama-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.nH3183/_old 2008-03-07 23:32:04.000000000 +0100
+++ /var/tmp/diff_new_pack.nH3183/_new 2008-03-07 23:32:04.000000000 +0100
@@ -20,7 +20,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 38
+Release: 40
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -35,11 +35,11 @@
Source7: libXcursor-1.1.9.tar.bz2
Source8: libXdamage-1.1.1.tar.bz2
Source9: libXevie-1.0.2.tar.bz2
-Source10: libXfont-1.3.1.tar.bz2
+Source10: libXfont-1.3.2.tar.bz2
Source11: libXfontcache-1.0.4.tar.bz2
Source12: libXft-2.1.12.tar.bz2
Source13: libXi-1.1.3.tar.bz2
-Source14: libXinerama-1.0.2.tar.bz2
+Source14: libXinerama-1.0.3.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
Source16: libXrandr-1.2.2.tar.bz2
Source17: libXtst-1.0.3.tar.bz2
@@ -58,14 +58,13 @@
Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.2.tar.bz2
Source32: pixman-0.9.6.tar.bz2
-Source33: libpciaccess-0.9.1.tar.bz2
+Source33: libpciaccess-0.10.tar.bz2
Patch: libXrandr.diff
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch3: p_xft_cjk.diff
Patch4: p_xft_register.diff
Patch5: libxkbui.diff
Patch10: libXxf86misc-xcb.diff
-Patch348296: bug348296-pcf_font_parser-libXfont.diff
%description
This package contains the remaining X.Org libraries.
@@ -150,7 +149,6 @@
pushd libXxf86misc-*
%patch10 -p0
popd
-patch -d libXfont-* -p0 -s -i %PATCH348296
%build
for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -222,6 +220,12 @@
%{_mandir}/man3/*
%changelog
+* Thu Mar 06 2008 sndirsch@suse.de
+- libpciaccess 0.10
+- libXinerama 1.0.3
+* Thu Mar 06 2008 sndirsch@suse.de
+- libXfont 1.3.2
+ * obsoletes bug348296-pcf_font_parser-libXfont.diff
* Fri Feb 29 2008 dmueller@suse.de
- add missing %%postun call to ldconfig
* Fri Jan 18 2008 sndirsch@suse.de
++++++ libpciaccess-0.9.1.tar.bz2 -> libpciaccess-0.10.tar.bz2 ++++++
++++ 21209 lines of diff (skipped)
++++++ libXfont-1.3.1.tar.bz2 -> libXfont-1.3.2.tar.bz2 ++++++
++++ 20190 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/libXfont-1.3.1/ChangeLog new/libXfont-1.3.2/ChangeLog
--- old/libXfont-1.3.1/ChangeLog 2007-09-05 18:53:44.000000000 +0200
+++ new/libXfont-1.3.2/ChangeLog 2008-03-06 04:01:17.000000000 +0100
@@ -1,3 +1,52 @@
+commit b76df66d2c507898472bba0f9986ef5700029a36
+Author: Matthieu Herrb
+Date: Thu Jan 17 15:30:37 2008 +0100
+
+ Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
+
+commit 2297c6390a1609fe810c2cd5b3443f3722610944
+Author: Matthieu Herrb
+Date: Thu Oct 18 21:46:49 2007 +0200
+
+ ftsystem.c is not needed anymore.
+
+commit 5bf703700ee4a5d6eae20da07cb7a29369667aef
+Author: Matthieu Herrb
+Date: Fri Sep 28 08:17:57 2007 +0200
+
+ catalogue.c: prevent a one character overflow
+
+ this occurs if readlink writes a result that's exactly the
+ size of the buffer that's passed to it. Reported by
+ Joerg Sonnenberger.
+
+ Re
+
+commit fd8a03fbbd74f5cbaa740e5d50fccdf5c1f78b5b
+Author: Jens Granseuer
+Date: Thu Sep 27 23:12:00 2007 +0200
+
+ fix build with gcc 2.95.
+
+ In addition to fixing the C89 issue, the patch also flags a few functions as
+ static to avoid "no previous prototype" warnings.
+
+commit 268f1bb1859e97944e8b63a5bb12677e874ed144
+Author: Tilman Sauerbeck
+Date: Thu Sep 13 20:40:26 2007 +0200
+
+ Replaced one instance of bcopy() with memcpy().
+
+ f->buffer cannot overlap with io->file->bits, so it's safe to
+ use memcpy() rather than memmove().
+ Compile-tested only.
+
+commit f2725a5c9da771fb610d503ebfda3b4d1553bac4
+Author: Eric Anholt
+Date: Wed Sep 5 13:10:43 2007 -0700
+
+ Bump version to 1.3.1.
+
commit aca95d12a8b35de7ae914632fc9e8a723d58a860
Author: Matthieu Herrb
Date: Sat Aug 25 23:32:54 2007 +0200
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/libXfont-1.3.1/configure.ac new/libXfont-1.3.2/configure.ac
--- old/libXfont-1.3.1/configure.ac 2007-09-05 18:50:57.000000000 +0200
+++ new/libXfont-1.3.2/configure.ac 2008-03-06 03:58:43.000000000 +0100
@@ -1,6 +1,3 @@
-dnl
-dnl $Id$
-dnl
dnl Copyright © 2003 Keith Packard
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,7 +23,7 @@
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.3.1,
+ 1.3.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
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/libXfont-1.3.1/src/bitmap/pcfread.c new/libXfont-1.3.2/src/bitmap/pcfread.c
--- old/libXfont-1.3.1/src/bitmap/pcfread.c 2007-09-05 02:18:23.000000000 +0200
+++ new/libXfont-1.3.2/src/bitmap/pcfread.c 2008-03-06 03:58:28.000000000 +0100
@@ -588,6 +588,9 @@
pFont->info.lastRow = pcfGetINT16(file, format);
pFont->info.defaultCh = pcfGetINT16(file, format);
if (IS_EOF(file)) goto Bail;
+ if (pFont->info.firstCol > pFont->info.lastCol ||
+ pFont->info.firstRow > pFont->info.lastRow ||
+ pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail;
nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) *
(pFont->info.lastRow - pFont->info.firstRow + 1);
@@ -726,6 +729,9 @@
pFontInfo->lastRow = pcfGetINT16(file, format);
pFontInfo->defaultCh = pcfGetINT16(file, format);
if (IS_EOF(file)) goto Bail;
+ if (pFontInfo->firstCol > pFontInfo->lastCol ||
+ pFontInfo->firstRow > pFontInfo->lastRow ||
+ pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail;
nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) *
(pFontInfo->lastRow - pFontInfo->firstRow + 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/libXfont-1.3.1/src/builtins/dir.c new/libXfont-1.3.2/src/builtins/dir.c
--- old/libXfont-1.3.1/src/builtins/dir.c 2007-09-05 02:18:23.000000000 +0200
+++ new/libXfont-1.3.2/src/builtins/dir.c 2008-03-06 03:58:28.000000000 +0100
@@ -29,7 +29,7 @@
#endif
#include "builtin.h"
-BuiltinDirPtr
+static BuiltinDirPtr
BuiltinDirsDup (const BuiltinDirPtr a_dirs,
int a_dirs_len)
{
@@ -60,7 +60,7 @@
* @param a_saved the saved instance of BuiltinDir to copy into a_cur
* @return 0 if went okay, 1 otherwise.
*/
-int
+static int
BuiltinDirRestore (BuiltinDirPtr a_cur,
const BuiltinDirPtr a_saved)
{
@@ -75,7 +75,7 @@
}
-int
+static int
BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
const BuiltinDirPtr a_saved_tab,
int a_tab_len)
@@ -94,7 +94,7 @@
return 0 ;
}
-BuiltinAliasPtr
+static BuiltinAliasPtr
BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
int a_aliases_len)
{
@@ -122,7 +122,7 @@
* @param a_saved the saved instance of BuiltinAlias to copy into a_cur
* @return 0 if went okay, 1 otherwise.
*/
-int
+static int
BuiltinAliasRestore (BuiltinAliasPtr a_cur,
const BuiltinAliasPtr a_save)
{
@@ -137,7 +137,7 @@
return 0 ;
}
-int
+static int
BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
const BuiltinAliasPtr a_saved_tab,
int a_tab_len)
@@ -162,10 +162,10 @@
FontDirectoryPtr dir;
int i;
- dir = FontFileMakeDir ("", builtin_dir_count);
- static BuiltinDirPtr saved_builtin_dir ;
- static BuiltinAliasPtr saved_builtin_alias ;
+ static BuiltinDirPtr saved_builtin_dir;
+ static BuiltinAliasPtr saved_builtin_alias;
+ dir = FontFileMakeDir ("", builtin_dir_count);
if (saved_builtin_dir)
{
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/libXfont-1.3.1/src/builtins/file.c new/libXfont-1.3.2/src/builtins/file.c
--- old/libXfont-1.3.1/src/builtins/file.c 2007-09-05 02:18:23.000000000 +0200
+++ new/libXfont-1.3.2/src/builtins/file.c 2008-03-06 03:58:28.000000000 +0100
@@ -27,6 +27,7 @@
#ifdef HAVE_CONFIG_H
#include
#endif
+#include
#include "builtin.h"
typedef struct _BuiltinIO {
@@ -49,7 +50,7 @@
len = BUFFILESIZE;
if (len > left)
len = left;
- bcopy (io->file->bits + io->offset, f->buffer, len);
+ memcpy (f->buffer, io->file->bits + io->offset, len);
io->offset += len;
f->left = len - 1;
f->bufp = f->buffer + 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/libXfont-1.3.1/src/fontfile/catalogue.c new/libXfont-1.3.2/src/fontfile/catalogue.c
--- old/libXfont-1.3.1/src/fontfile/catalogue.c 2007-09-05 02:18:23.000000000 +0200
+++ new/libXfont-1.3.2/src/fontfile/catalogue.c 2008-03-06 03:58:28.000000000 +0100
@@ -156,7 +156,7 @@
while (entry = readdir(dir), entry != NULL)
{
snprintf(link, sizeof link, "%s/%s", path, entry->d_name);
- len = readlink(link, dest, sizeof dest);
+ len = readlink(link, dest, sizeof dest - 1);
if (len < 0)
continue;
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/libXfont-1.3.1/src/FreeType/ftsystem.c new/libXfont-1.3.2/src/FreeType/ftsystem.c
--- old/libXfont-1.3.1/src/FreeType/ftsystem.c 2007-09-05 02:18:22.000000000 +0200
+++ new/libXfont-1.3.2/src/FreeType/ftsystem.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,331 +0,0 @@
-/***************************************************************************/
-/* */
-/* ftsystem.c */
-/* */
-/* ANSI-specific FreeType low-level system interface (body). */
-/* */
-/* Copyright 1996-2001, 2002 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* Modified for XFree86. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-/* Modified for XFree86 */
-/* $XFree86$ */
-
- /*************************************************************************/
- /* */
- /* This file contains the default interface used by FreeType to access */
- /* low-level, i.e. memory management, i/o access as well as thread */
- /* synchronisation. It can be replaced by user-specific routines if */
- /* necessary. */
- /* */
- /*************************************************************************/
-
-
-#ifdef HAVE_CONFIG_H
-#include
-#endif
-#include
-#include FT_CONFIG_CONFIG_H
-#include FT_SYSTEM_H
-#include FT_ERRORS_H
-#include FT_TYPES_H
-
-#ifndef FONTMODULE
-#include
-#include
-#else
-#include "Xmd.h"
-#define _XTYPEDEF_BOOL
-#include "Xdefs.h"
-#define DONT_DEFINE_WRAPPERS
-#include "xf86_ansic.h"
-#undef DONT_DEFINE_WRAPPERS
-#define malloc(x) xf86malloc(x)
-#define realloc(x, y) xf86realloc(x, y)
-#define free(x) xf86free(x)
-#define FILE XF86FILE
-#define fopen(x, y) xf86fopen(x, y)
-#define fclose(x) xf86fclose(x)
-#define fseek(x, y, z) xf86fseek(x, y, z)
-#define ftell(x) xf86ftell(x)
-#define SEEK_SET XF86_SEEK_SET
-#define SEEK_END XF86_SEEK_END
-#define fread(x, y, z, t) xf86fread(x, y, z, t)
-#endif
-
-
- /*************************************************************************/
- /* */
- /* MEMORY MANAGEMENT INTERFACE */
- /* */
- /*************************************************************************/
-
- /*************************************************************************/
- /* */
- /* It is not necessary to do any error checking for the */
- /* allocation-related functions. This will be done by the higher level */
- /* routines like FT_Alloc() or FT_Realloc(). */
- /* */
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ft_alloc */
- /* */
- /* <Description> */
- /* The memory allocation function. */
- /* */
- /* <Input> */
- /* memory :: A pointer to the memory object. */
- /* */
- /* size :: The requested size in bytes. */
- /* */
- /* <Return> */
- /* The address of newly allocated block. */
- /* */
- FT_CALLBACK_DEF( void* )
- ft_alloc( FT_Memory memory,
- long size )
- {
- FT_UNUSED( memory );
-
- return malloc( size );
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ft_realloc */
- /* */
- /* <Description> */
- /* The memory reallocation function. */
- /* */
- /* <Input> */
- /* memory :: A pointer to the memory object. */
- /* */
- /* cur_size :: The current size of the allocated memory block. */
- /* */
- /* new_size :: The newly requested size in bytes. */
- /* */
- /* block :: The current address of the block in memory. */
- /* */
- /* <Return> */
- /* The address of the reallocated memory block. */
- /* */
- FT_CALLBACK_DEF( void* )
- ft_realloc( FT_Memory memory,
- long cur_size,
- long new_size,
- void* block )
- {
- FT_UNUSED( memory );
- FT_UNUSED( cur_size );
-
- return realloc( block, new_size );
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ft_free */
- /* */
- /* <Description> */
- /* The memory release function. */
- /* */
- /* <Input> */
- /* memory :: A pointer to the memory object. */
- /* */
- /* block :: The address of block in memory to be freed. */
- /* */
- FT_CALLBACK_DEF( void )
- ft_free( FT_Memory memory,
- void* block )
- {
- FT_UNUSED( memory );
-
- free( block );
- }
-
-
- /*************************************************************************/
- /* */
- /* RESOURCE MANAGEMENT INTERFACE */
- /* */
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* The macro FT_COMPONENT is used in trace mode. It is an implicit */
- /* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
- /* messages during execution. */
- /* */
-#undef FT_COMPONENT
-#define FT_COMPONENT trace_io
-
- /* We use the macro STREAM_FILE for convenience to extract the */
- /* system-specific stream handle from a given FreeType stream object */
-#define STREAM_FILE( stream ) ( (FILE*)stream->descriptor.pointer )
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ft_ansi_stream_close */
- /* */
- /* <Description> */
- /* The function to close a stream. */
- /* */
- /* <Input> */
- /* stream :: A pointer to the stream object. */
- /* */
- FT_CALLBACK_DEF( void )
- ft_ansi_stream_close( FT_Stream stream )
- {
- fclose( STREAM_FILE( stream ) );
-
- stream->descriptor.pointer = NULL;
- stream->size = 0;
- stream->base = 0;
- }
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* ft_ansi_stream_io */
- /* */
- /* <Description> */
- /* The function to open a stream. */
- /* */
- /* <Input> */
- /* stream :: A pointer to the stream object. */
- /* */
- /* offset :: The position in the data stream to start reading. */
- /* */
- /* buffer :: The address of buffer to store the read data. */
- /* */
- /* count :: The number of bytes to read from the stream. */
- /* */
- /* <Return> */
- /* The number of bytes actually read. */
- /* */
- FT_CALLBACK_DEF( unsigned long )
- ft_ansi_stream_io( FT_Stream stream,
- unsigned long offset,
- unsigned char* buffer,
- unsigned long count )
- {
- FILE* file;
-
-
- file = STREAM_FILE( stream );
-
- fseek( file, offset, SEEK_SET );
-
- return (unsigned long)fread( buffer, 1, count, file );
- }
-
-
- /* documentation is in ftobjs.h */
-
- FT_EXPORT_DEF( FT_Error )
- FT_Stream_Open( FT_Stream stream,
- const char* filepathname )
- {
- FILE* file;
-
-
- if ( !stream )
- return FT_Err_Invalid_Stream_Handle;
-
- file = fopen( filepathname, "rb" );
- if ( !file )
- {
- FT_ERROR(( "FT_Stream_Open:" ));
- FT_ERROR(( " could not open `%s'\n", filepathname ));
-
- return FT_Err_Cannot_Open_Resource;
- }
-
- fseek( file, 0, SEEK_END );
- stream->size = ftell( file );
- fseek( file, 0, SEEK_SET );
-
- stream->descriptor.pointer = file;
- stream->pathname.pointer = (char*)filepathname;
- stream->pos = 0;
-
- stream->read = ft_ansi_stream_io;
- stream->close = ft_ansi_stream_close;
-
- FT_TRACE1(( "FT_Stream_Open:" ));
- FT_TRACE1(( " opened `%s' (%d bytes) successfully\n",
- filepathname, stream->size ));
-
- return FT_Err_Ok;
- }
-
-
-#ifdef FT_DEBUG_MEMORY
-
- extern FT_Int
- ft_mem_debug_init( FT_Memory memory );
-
- extern void
- ft_mem_debug_done( FT_Memory memory );
-
-#endif
-
-
- /* documentation is in ftobjs.h */
-
- FT_EXPORT_DEF( FT_Memory )
- FT_New_Memory( void )
- {
- FT_Memory memory;
-
-
- memory = (FT_Memory)malloc( sizeof ( *memory ) );
- if ( memory )
- {
- memory->user = 0;
- memory->alloc = ft_alloc;
- memory->realloc = ft_realloc;
- memory->free = ft_free;
-#ifdef FT_DEBUG_MEMORY
- ft_mem_debug_init( memory );
-#endif
- }
-
- return memory;
- }
-
-
- /* documentation is in ftobjs.h */
-
- FT_EXPORT_DEF( void )
- FT_Done_Memory( FT_Memory memory )
- {
-#ifdef FT_DEBUG_MEMORY
- ft_mem_debug_done( memory );
-#endif
-#undef free
- memory->free( memory, memory );
- }
-
-
-/* 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/libXfont-1.3.1/src/FreeType/Makefile.am new/libXfont-1.3.2/src/FreeType/Makefile.am
--- old/libXfont-1.3.1/src/FreeType/Makefile.am 2007-09-05 02:18:22.000000000 +0200
+++ new/libXfont-1.3.2/src/FreeType/Makefile.am 2008-03-06 03:58:28.000000000 +0100
@@ -13,5 +13,3 @@
ftfuncs.c \
fttools.c \
xttcap.c
-
-EXTRA_DIST = ftsystem.c
++++++ libXinerama-1.0.2.tar.bz2 -> libXinerama-1.0.3.tar.bz2 ++++++
++++ 23128 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/libXinerama-1.0.2/ChangeLog new/libXinerama-1.0.3/ChangeLog
--- old/libXinerama-1.0.2/ChangeLog 2007-03-17 00:25:08.000000000 +0100
+++ new/libXinerama-1.0.3/ChangeLog 2008-03-06 21:42:23.000000000 +0100
@@ -1,3 +1,32 @@
+commit 7c169beed2d8324c95385d248777f21c721b332e
+Author: Adam Jackson
+Date: Sun Feb 24 20:30:03 2008 -0500
+
+ Bug #13660: XineramaQueryScreens() always modifies the 'number' outparameter.
+
+ This makes the code match the man page.
+
+commit 52040eaaba626dd998f7a5421a923de0b0e06ad2
+Author: James Cloos
+Date: Thu Dec 6 15:51:17 2007 -0500
+
+ Add missing PHONY line for automatic ChangeLog generation
+
+commit 5362a27db8fddfb03ade3b2c622a2256d91de9eb
+Author: Brice Goglin
+Date: Wed Jul 25 21:41:28 2007 +0200
+
+ Fix typo in Xinerama.man
+
+ Reported by Emanuele Rocca in
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432256
+
+commit 583d26d583bb0034ff91119ceefc08df64fbbc46
+Author: Alan Coopersmith
+Date: Fri Mar 16 16:26:41 2007 -0700
+
+ Version bump: 1.0.2
+
commit 96c081ed52e3437ede0062eb7ccfb520879cbc0e
Author: Alan Coopersmith
Date: Fri Mar 16 16:22:21 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/libXinerama-1.0.2/configure.ac new/libXinerama-1.0.3/configure.ac
--- old/libXinerama-1.0.2/configure.ac 2007-03-17 00:22:48.000000000 +0100
+++ new/libXinerama-1.0.3/configure.ac 2008-03-06 21:41:50.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ([2.57])
-AC_INIT(libXinerama, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
+AC_INIT(libXinerama, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
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/libXinerama-1.0.2/Makefile.am new/libXinerama-1.0.3/Makefile.am
--- old/libXinerama-1.0.2/Makefile.am 2007-03-17 00:21:54.000000000 +0100
+++ new/libXinerama-1.0.3/Makefile.am 2008-02-25 02:28:59.000000000 +0100
@@ -27,6 +27,8 @@
EXTRA_DIST = xinerama.pc.in autogen.sh ChangeLog
MAINTAINERCLEANFILES = ChangeLog
+.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)
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/libXinerama-1.0.2/man/Xinerama.man new/libXinerama-1.0.3/man/Xinerama.man
--- old/libXinerama-1.0.2/man/Xinerama.man 2007-03-02 01:55:36.000000000 +0100
+++ new/libXinerama-1.0.3/man/Xinerama.man 2008-02-25 02:28:59.000000000 +0100
@@ -103,7 +103,7 @@
.SS \fBXineramaIsActive()\fR
.LP
-The XineramaActive function returns a Boolean operator used to determine if
+The XineramaIsActive function returns a Boolean operator used to determine if
Xinerama is activated on the screen. Returns True for active and False for
not active.
.sp
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/libXinerama-1.0.2/missing new/libXinerama-1.0.3/missing
--- old/libXinerama-1.0.2/missing 2007-03-17 00:14:36.000000000 +0100
+++ new/libXinerama-1.0.3/missing 2008-03-06 21:42:11.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,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 +46,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 +79,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
@@ -106,7 +109,7 @@
# 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
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,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";;
@@ -192,8 +195,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
@@ -214,25 +217,25 @@
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
;;
@@ -244,18 +247,18 @@
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
;;
@@ -267,11 +270,9 @@
\`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
@@ -289,11 +290,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
@@ -317,13 +324,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
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/libXinerama-1.0.2/src/Xinerama.c new/libXinerama-1.0.3/src/Xinerama.c
--- old/libXinerama-1.0.2/src/Xinerama.c 2007-03-07 23:47:50.000000000 +0100
+++ new/libXinerama-1.0.3/src/Xinerama.c 2008-02-25 02:29:54.000000000 +0100
@@ -307,12 +307,11 @@
*number = rep.number;
} else
_XEatData(dpy, rep.length << 2);
+ } else {
+ *number = 0;
}
UnlockDisplay (dpy);
SyncHandle ();
return scrnInfo;
}
-
-
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org