One Hat Cyber Team

Edit File: ChangeLog

commit 1fab5e81fd761f628fb68d22934615536dbd0220
Author: Matthieu Herrb <matthieu@herrb.eu>
Date:   Mon Dec 12 23:09:52 2016 +0100

libXpm 3.5.12
    
    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>

commit 8b3024e6871ce50b34bf2dff924774bd654703bc
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date:   Sun Dec 11 13:50:05 2016 +0100

Handle size_t in file/buffer length
    
    The values of file sizes and buffer sizes can exceed current limits.
    Therefore, use proper variable types for these operations.
    
    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
    Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>

commit d1167418f0fd02a27f617ec5afd6db053afbe185
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date:   Thu Dec 8 17:07:55 2016 +0100

Avoid OOB write when handling malicious XPM files.
    
    libXpm uses unsigned int to store sizes, which fits size_t on 32 bit
    systems, but leads to issues on 64 bit systems.
    
    On 64 bit systems, it is possible to overflow 32 bit integers while
    parsing XPM extensions in a file.
    
    At first, it looks like a rather unimportant detail, because nobody
    will seriously open a 4 GB file. But unfortunately XPM has support for
    gzip compression out of the box. An attacker can therefore craft a
    compressed file which is merely 4 MB in size, which makes an attack
    much for feasable.
    
    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
    Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>

commit 1ec33006a9e4214b390045b820464e24297dc6c0
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date:   Tue Dec 6 22:34:33 2016 +0100

Gracefully handle EOF while parsing files.
    
    libXpm does not properly handle EOF conditions when xpmGetC is called
    multiple times in a row to construct a string. Instead of checking
    its return value for EOF, the result is automatically casted into a
    char and attached to a string.
    
    By carefully crafting the color table in an XPM file, it is possible to
    send a libXpm program like gimp into a very long lasting loop and
    massive memory allocations.
    
    Otherwise no memory issues arise, therefore this is just a purely
    functional patch to dismiss invalid input.
    
    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
    Reviewed-by: Matthieu Herrb <Matthieu@herrb.eu>

commit c46dedeba15edf7216d62633ed6daf40cd1f5bfd
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
Date:   Tue Dec 6 22:31:53 2016 +0100

Fix out out boundary read on unknown colors
    
    libXpm is vulnerable to an out of boundary read if an XPM file contains
    a color with a symbolic name but without any default color value.
    
    A caller must set XpmColorSymbols and a color with a NULL name in
    the supplied XpmAttributes to XpmReadFileToImage (or other functions of
    this type) in order to trigger this issue.
    
    Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
    Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>

commit 42ca8d956276bc00bec09e410d76daf053ae35f9
Author: Jörg Sonnenberger <joerg@NetBSD.org>
Date:   Wed Mar 19 09:26:37 2014 +0100

Fix abs() usage.
    
    For long arguments, use labs().
    
    Reviewed-by: Matt Turner <mattst88@gmail.com>
    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>

commit 3425cbb0e6086f74783eafbe23df1121b655e006
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Sat Sep 7 21:40:17 2013 -0700

libXpm 3.5.11
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 4bab3b62a47996ee77b8ddebcd92f0ebe9679c28
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Sat Sep 7 21:36:51 2013 -0700

Fix typo in COPYING (matches src/amigax.h)
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 9e38750da16c6e5bd8bb26b00d74041ddf9be3e8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Fri Aug 2 22:22:09 2013 -0700

Add noreturn attributes suggested by gcc
    
    Remove extra bogus return added to avoid warnings when calling Punt()
    since gcc didn't know it would never return.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 93f900ceac7ac899e00998adc8782ed02b352930
Author: Eric S. Raymond <esr@thyrsus.com>
Date:   Wed Jun 19 06:19:18 2013 -0400

doclifter can't handle more than one dash in a name line.

commit 22734e4439b3609a6b621d8e7ef8465f0a2ac0d5
Author: Claudio Bley <cbley@av-test.de>
Date:   Mon May 27 09:32:05 2013 +0200

Fix libXpm build with NO_ZPIPE
    
    When NO_ZPIPE is defined, fcntl.h is not included in WrFFrI.c
    although OpenWriteFile uses open, O_WRONLY, O_CREAT and O_TRUNC.
    
        * src/WrFFrI.c: unconditionally include fcntl.h regardless
         of NO_ZPIPE being defined or not.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit e439f6e7163e3259f11f3363fa319e8a29085a92
Author: Christophe CURIS <christophe.curis@free.fr>
Date:   Wed May 1 10:39:38 2013 +0200

Added 'const' attribute to all filename arguments in the API
    
    The filename is always a read-only argument, so it is a good idea
    to let the caller now about it.
    
    This patch does not change active code; the place where the attribute
    is added will not break source-level compatibility because it adds
    no restriction on caller side, just adds information; because the
    lib code behaved the same way it will not break the binary interface
    either.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 01ee6b9c500cd9c67f167e68c8383e8c58db5ddf
Author: Christophe CURIS <christophe.curis@free.fr>
Date:   Wed May 1 10:39:37 2013 +0200

Added 'const' qualifier to the filename argument to internal functions
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 980e9f851e47d31eed9635a6399a23d1456548d0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Mon Apr 22 13:23:09 2013 -0700

Close fd if fdopen() or xpmPipeThrough() fails in OpenWriteFile()
    
    Fixes leak found by parfait 1.1 bug checking tool:
       File Descriptor Leak: Leaked File Descriptor fd
            at line 350 of lib/libXpm/src/WrFFrI.c in function 'OpenWriteFile'.
              fd initialized at line 332 with open
              fd leaks when strcmp(".Z", (filename + (len - 2))) != 0 at line 337
                  and strcmp(".gz", (filename + (len - 3))) != 0 at line 340.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    Reviewed-by: Mark Kettenis <kettenis@openbsd.org>

commit 81608285e11f2455800001a965dfece878861162
Author: Colin Walters <walters@verbum.org>
Date:   Wed Jan 4 17:37:06 2012 -0500

autogen.sh: Implement GNOME Build API
    
    http://people.gnome.org/~walters/docs/build-api.txt
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>

commit 4c3e0ff63a7c71daaafdcdaa1d619063e0cf4a63
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jan 15 14:28:48 2013 -0500

configure: Remove AM_MAINTAINER_MODE
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>

commit 4ca8014afbb66f0b65cdcd8ea12e469f52c8c70c
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date:   Mon Jan 2 22:45:53 2012 +0000

Define NO_ZPIPE when building for MinGW
    
    Define NO_ZPIPE when building for MinGW, decompressing via a pipe isn't implemented.
    (since xpmPipeThrough() is only written in terms of fork() currently...)
    
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
    Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
    Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
    Reviewed-by: Ángel González <ingenit@zoho.com>

commit acaaea96776b36c097d5413040c5ce85d3ae6cb9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Wed Mar 7 20:39:55 2012 -0800

libXpm 3.5.10
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 1450186652cb9d2efe55c8da7cb64996eddd34c7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Fri Nov 18 23:25:16 2011 -0800

closeness_cmp: maintain constness when casting pointers
    
    create.c: In function 'closeness_cmp':
    create.c:224:5: warning: cast discards qualifiers from pointer target type
    create.c:224:5: warning: cast discards qualifiers from pointer target type
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 7aa7b34491de534da56d637552ee86f94f038cc3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Fri Nov 18 23:22:12 2011 -0800

sxpm: make ErrorMessage take const char * arg to fix -Wwrite-strings warnings
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 4cedf181bcfe13e5d206554c51edb82cb17e7ad5
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date:   Fri Nov 11 10:17:11 2011 -0800

Include missing headers
    
    This fixes implicit declarations for strdup and strcasecmp.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>

commit 933b5d1f1fe9273d1a984707687b36ec61c4c5af
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Thu Nov 10 21:32:15 2011 -0800

Fix gcc -Wwrite-strings warnings that don't require public API changes
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 696be14bcb4daef5280b425e297223c6ae530cb5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Thu Nov 10 21:03:44 2011 -0800

Assume C89 and just use const, not local Const macro
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 29972ebbb2409bcba87637069a7ad9a958b3325d
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Sep 24 19:18:56 2011 +0200

Link sxpm against -lX11
    
    It calls various Xlib functions so should link with -lX11 directly.
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>

commit 3ea70059805b3ebc795f797b5880b90b6b3a9235
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Fri Sep 16 22:48:53 2011 -0700

Strip trailing whitespace
    
    Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
    git diff -w & git diff -b show no diffs from this change
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit 0c9e200c3975917f5d78eac67b1f4cedefd73079
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Sat Mar 5 20:39:03 2011 -0500

man: add missing title header (.TH) __xorgversion__
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 0f8f24302bb0e35eaab16f16358bf9c44f9f3af1
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Sat Mar 5 15:35:17 2011 -0500

config: move man pages into their own directory
    
    As per X.Org guidelines.
    Fix whitespace issues.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 9c622c5fc82f2a19ae41e75398fee4ff1de52a1d
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Wed Feb 2 11:43:44 2011 -0500

config: minor layout change in configure.ac
    
    Group statements per section as per Autoconf standard layout
    Quote statements where appropriate.
    No functional configuration changes
    
    This helps automated maintenance and release activities.
    Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 22a434d061af224536baee6c6110b603c5c96b2c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Fri Oct 29 17:29:25 2010 -0700

libXpm 3.5.9
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit c11f1bd18303139f070e1873382632ee80cd9878
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Wed Oct 20 08:30:56 2010 -0400

config: remove obsolete FILES file from the Imakefile days
    
    It lists the files contained in the original
    BULL Research Koala Project.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 0ea6c432a068fc4edf90c614e68a4f4be94edd14
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Sun Oct 17 12:51:15 2010 -0400

doc: move doc files to the newly created doc dir.
    
    As per guidelines for all xorg modules.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 7a3e69cfb079c7345f3d9b1217f373a706ba544c
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Fri Oct 15 17:14:39 2010 -0400

config: provide a Makefile for the include directory
    
    Reduce some complexity in the src makefile as it should not
    handle sibling directories.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit e50f645f4cc5bb1db0e025fc6e39c6e84a894c13
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Fri Oct 15 14:56:32 2010 -0400

libXpm make: remove redundant -I.
    
    It is always included by Automake
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 8dee37ff3bb908d597d53f2b335fc2111643cce7
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Sun Oct 24 19:39:54 2010 -0400

sxpm make: no need to use a per target LDADD
    
    There is only one program in this makefile.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 34abbaaacddf1018d1805bc4890226ab200a50fb
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Fri Oct 15 11:45:58 2010 -0400

sxpm make: remove redundant $(XMP_LIBS) linker flags
    
    SXPM_LIBS contains the complete list of dependencies.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit b818f5cf7f7d8240db2a94ebcc28603730760e48
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Fri Oct 15 10:21:08 2010 -0400

src make: remove -I$(top_builddir)/include
    
    This directory does not exist, only object code is created
    in "builddir".
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 78bca7e85b930593fefe85cc51b5e24f98de31d0
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 21:56:21 2010 -0400

config: fix warnings, m4 quoting and layout
    
    Fix some m4 quoting
    Fix some autoconf warnings
    Regroup statements per section
    Add comments
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 8e47c819490331c01959332e067f06a382d9a14a
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:35:47 2010 -0400

config: AC_OUTPUT with parms is deprecated, use AC_CONFIG_FILES
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit c6915d034fa3f72a9724816d2e3f5e8432ef9321
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:33:40 2010 -0400

config: AC_HELP_STRING is deprecated, use AS_HELP_STRING
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit e2fdf80a7f9feedacf67e46a8e577b2e6d415a5f
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:29:42 2010 -0400

config: remove unrequired AC_SUBST(XPM_CFLAGS)
    
    This macro is called by PKG_CHECK_MODULES
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 937d8c8cf82bd57e82152af3768bdbfc5de4316a
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:28:43 2010 -0400

config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
    
    XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
    AC_PROG_C_C99. This sets gcc with -std=gnu99.
    If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 0ed9cb4546d0c65f08a9511736400c0f7fba982f
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:28:08 2010 -0400

config: remove unrequired AC_HEADER_STDC
    
    Autoconf says:
    "This macro is obsolescent, as current systems have conforming
    header files. New programs need not use this macro".
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit e99bce47294eab031fc733d695e3c9589b52aff8
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:25:00 2010 -0400

config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
    
    Regroup AC statements at the top.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 0b5e15c685d295262bf2307d65bee3a0b28e74f5
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:15:08 2010 -0400

sxpm: use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
    The value of MAN_SUBST is the same for all X.Org packages.
    
    Use the appropriate platform version of sed
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 262bb7e9426150f6c7b553d184c51d3884d04adf
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:11:43 2010 -0400

cxpm: use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
    The value of MAN_SUBST is the same for all X.Org packages.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit acd4856aac05a884376736196154842959803aa6
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:03:13 2010 -0400

config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONS
    
    It depends on util-macros 1.8
    The LT_AC_PROG_SED macro was never released by libtool.
    Neither man makefile actually used $SED anyway.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit d1bd1fbc6d7f7b4817aca4fecd8ccfe80a1c2f03
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 14 20:02:30 2010 -0400

config: upgrade to util-macros 1.8 for additional man page support
    
    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
    The value of MAN_SUBST is the same for all X.Org packages.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 3b20344bf3c5ae7a8291041d4887dc8f23644d40
Author: Colin Harrison <colin.harrison@virgin.net>
Date:   Thu Oct 7 13:49:17 2010 +0200

Missing end comment in libXpm/src/parse.c
    
    CVS tag removal chopped too much out in this case...
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>

commit f8f0a68247b920052df0796a39ebcdc2e4161d05
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date:   Tue Sep 28 13:30:03 2010 -0700

Purge cvs tags.
    
    Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

commit d026662cce0808cf402e0d50932d90984a2ea1bb
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Apr 1 21:11:35 2010 -0400

config: update AC_PREREQ statement to 2.60
    
    Unrelated to the previous patches, the new value simply reflects
    the reality that the minimum level for autoconf to configure
    all x.org modules is 2.60 dated June 2006.
    
    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit d4a7b15b3ed9e7cf94dbf64f929ae954bada9f60
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Apr 1 21:07:54 2010 -0400

config: update and relocate AX_DEFINE_DIR macro
    
    Remove deprecated acinclude.m4 macro container file
    Use separate macro files as per autoconf recommendation
    Use the latest version of the macro from GNU
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit e0920779d1227338e61aaab16458b9daad508c36
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Mon Mar 29 14:53:49 2010 -0400

config: remove the pkgconfig pc.in file from EXTRA_DIST
    
    Automake always includes it in the tarball.
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit 34ebac912c6f1223a274ab2e4f0c12928d357ddd
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Jan 14 09:36:38 2010 -0500

COPYING: add missing copyright notices
    
    Refer to: amigax.c, cxpm.c
    Copyright (C) 1998 Arnaud LE HORS
    Copyright (C) 19896 Lorens Younes
    
    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

commit dca7a9ccbdd4c85d84668c3a4bc14b0049f0c893
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Fri Nov 27 20:56:04 2009 -0500

Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
    
    Now that the INSTALL file is generated.
    Allows running make maintainer-clean.

commit af0d92b686c65f7ffb5556b74fd937b01719c535
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Wed Oct 28 14:09:10 2009 -0400

INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    
    Add missing INSTALL file. Use standard GNU file on building tarball
    README may have been updated
    Remove AUTHORS file as it is empty and no content available yet.
    Remove NEWS file as it is empty and no content available yet.

commit 8bda9cdb6344c6cdf87237cb84c16c54a3ae84d8
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Tue Oct 27 15:07:25 2009 -0400

Deploy the new XORG_DEFAULT_OPTIONS #24242
    
    This macro aggregate a number of existing macros that sets commmon
    X.Org components configuration options. It shields the configuration file from
    future changes.

commit 089237b624722b141a9ba6888584ebcc5247b227
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Mon Oct 26 22:08:43 2009 -0400

Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
    
    ChangeLog filename is known to Automake and requires no further
    coding in the makefile.

commit 37e75b28f4d30a66e16cfe192a0612a335aa8d46
Author: Gaetan Nadon <memsize@videotron.ca>
Date:   Thu Oct 22 12:34:19 2009 -0400

.gitignore: use common defaults with custom section # 24239
    
    Using common defaults will reduce errors and maintenance.
    Only the very small or inexistent custom section need periodic maintenance
    when the structure of the component changes. Do not edit defaults.

commit 68ae0e442ad57534c25566284ad049299a982d00
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date:   Wed Oct 21 12:47:25 2009 -0700

This is not a GNU project, so declare it foreign.
    
    On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
    > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
    > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
    > > was quite annoying to work around since 'autoreconf -fvi' replaces
    > > it and git wants to commit it.  Should these files even be in git?
    > > Can I nuke them for the betterment of humanity and since they get
    > > created by autoreconf anyways?
    >
    > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
    
    As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
    AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
    of the INSTALL file. It is also part of the 24206 solution.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>

commit 130b2fb0ea716143c63ba30856eecb351bc2af2a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Fri Oct 9 10:32:08 2009 -0700

libXpm 3.5.8
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

commit a195bd6d375c311b9bf6d7cce477f1d131425757
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Oct 8 21:29:45 2009 -0700

Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

commit f4c43f70dff3cb9702fd62bc388353d02589e618
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Oct 8 20:27:49 2009 -0700

Replace AC_DEFINE_DIR with AX_DEFINE_DIR from Autoconf Archive

commit d846316822ba8eb545d41140007ef98a7de9274e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Tue May 19 01:34:19 2009 -0700

Update AC_DEFINE_DIR to latest version from Autoconf Archive

commit 53f8b42f89214b85804ae9e64c49d1a9c2a7553d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Feb 2 20:34:35 2009 -0800

Add README with pointers to mailing list, bugzilla & git repos
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

commit 6697e31fbb616656b7f34515a79454af394b500a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Fri Jan 30 15:45:20 2009 -0200

Janitor: ansification, make distcheck, .gitignore
    
      The ansification code is minor edit of the patch (by me) at
    https://bugs.freedesktop.org/show_bug.cgi?id=14727
    as it would not apply cleanly anymore.

commit 41e4e2de4d73d098d332ece0410e9f8fda4fe10d
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date:   Mon Oct 20 19:36:52 2008 -0700

X.Org Bug 17944: avoid gcc warning for libXpm
    
    <http://bugs.freedesktop.org/show_bug.cgi?id=17944>
    
    Avoid the gcc warning
    cxpm/cxpm.c:102: warning: no previous prototype for 'ErrorMessage'

commit 64323668c07b4768c57649f5ec7e2888265d1aeb
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Mar 9 08:57:47 2008 +0100

nuke RCS Ids

commit 6ef45c37160079a9aa551adcd841abdb55eabae3
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date:   Thu Jan 31 14:42:41 2008 +1030

Use libtools SED check rather than autoconf's SED check.
    AC_PROG_SED required autoconf 2.60, libtool's should work
    regardless. This keeps us supporting 2.57 of autoconf
    
    Found by: Tinderbox (1.4.1 compile)

commit 3f7624048aa6064c69e2320a70fb7fc89e0bb7ef
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Jan 24 14:26:34 2008 -0800

Bug 14171: sxpm/Makefile.am:21: SED was already defined
    
    <http://bugs.freedesktop.org/show_bug.cgi?id=14171>

commit 503843fd3066031adbd4a362c686acc721787b7d
Author: James Cloos <cloos@jhcloos.com>
Date:   Thu Dec 6 16:38:36 2007 -0500

Replace static ChangeLog with dist-hook to generate from git log

commit 3e37dd39b6169af9928d5b959c40ba79a07450ee
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Aug 22 13:23:30 2007 -0700

Version bump: 3.5.7

commit d82244497b54889f91c78585374d1ad6a0cef2cf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Aug 22 13:08:42 2007 -0700

Replace strcpy with strncpy to match previous code block

commit 47c974872b51b8c1d6965eff4599f8ce739bcedc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Aug 6 14:22:48 2007 -0700

Use srcdir in paths passed to xgettext when making .po files

commit 6e003fd5f174a8e312d799d7f8812c2a5b87e433
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Aug 6 12:59:04 2007 -0700

Replace index/rindex with C89 standard strchr/strrchr

commit 43dfc6be8128139888426d8c709aa78efc207953
Author: Jason Rumney <jasonr@gnu.org>
Date:   Mon Aug 6 12:52:52 2007 -0700

X.Org Bug #11863: Build libXpm on MS Windows (with MinGW)
    
        * src/XpmI.h [FOR_MSW]: Include simx.h instead of real X headers.
    
        * src/simx.h (_XFUNCPROTOBEGIN, _XFUNCPROTOEND, NO_ZPIPE): Define.
        (XAllocColor): Fix arg list in prototype.
        (bzero, close, fdopen, index, rindex, open, strdup, O_RDONLY):
        Map to W32 equivalents.
    
        * src/RdFToI.c [FOR_MSW]: Include fcntl.h.

commit 290f0b9115428dab0cbf2880d154468c557b3e7e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Jul 25 17:45:15 2007 -0700

Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4

commit d4bc7dc0dea218cea380aba972f10f60dc1e86ac
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Wed Jun 27 13:54:07 2007 -0700

Use AM_CFLAGS & AM_CPPFLAGS to replace per-program and obsolete macros
    
    Clears some warnings from automake-1.10

commit 85a87de3c03ca8be526dedc0a2973f9426518c39
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Tue Nov 21 17:12:18 2006 -0800

Sun bug 4486226: Xpm is not internationalized
    
    <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4486226>
    Use gettext() to allow translated messages in sxpm & cxpm
    (cherry picked from bcda4f17ab3fa9f0572f876dbeb09b45fbc23f3d commit)

commit 3c881daddcc251d6e806715d267e4e55934abd1a
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Tue Nov 21 15:13:44 2006 -0800

Add *~ to .gitignore to skip over emacs/patch droppings

commit 60817dd28774540622ea404f650db8389c66da54
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date:   Fri Oct 13 16:23:49 2006 -0400

Bump to 3.5.6

commit 12dc4dc15234ae818a21c20ebf7b2d053b7a94be
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Thu Jul 13 14:59:03 2006 -0700

renamed: .cvsignore -> .gitignore

commit 4daea919c3aa104b6caf8c0f42f49ae755545986
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Sat Jun 3 06:11:30 2006 +0000

Always initialize atomTable to NULL, so xpmHashTableFree() doesn't try to
        free a random value from the stack if xpmHashTableInit returns an
        error.

commit 19855d6e09aa36db7686ad6f538179bf87e9c6ea
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Fri Jun 2 19:48:01 2006 +0000

Coverity #1432: Returned without freeing storage "hints_cmt" (in error case
        when xpmHashTableInit failed)

commit 000abcd371d0c4b1d0a5380023d74bf5bfc47685
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Fri Jun 2 19:33:29 2006 +0000

Coverity #1415: Returned without freeing storage "hints_cmt" (in error case
        when xpmHashTableInit failed)

commit 5c70c99833d4040aaf595d0005b861e0a930ee66
Author: Adam Jackson <ajax@nwnk.net>
Date:   Thu Apr 27 00:19:37 2006 +0000

Bump to 3.5.5

commit 2dcc187c92c1a579e6e9f0bad999a3b4e47228c3
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sat Mar 18 15:18:56 2006 +0000

doublecheck that a pointer is not NULL before dereferencing it. (Coverity
        CID 121).

commit 93421a53ccf159ff39bc9f8ff72c57246f9cb90c
Author: Kevin E Martin <kem@kem.org>
Date:   Thu Dec 15 00:24:31 2005 +0000

Update package version number for final X11R7 release candidate.

commit 2b229ddcb52a3bf9bef32e764f93cc57c1351420
Author: Kevin E Martin <kem@kem.org>
Date:   Tue Dec 6 22:48:44 2005 +0000

Change *man_SOURCES ==> *man_PRE to fix autotools warnings.

commit 50214deb692a9af760088f8e7a51955c7d3f1707
Author: Kevin E Martin <kem@kem.org>
Date:   Sat Dec 3 05:49:44 2005 +0000

Update package version number for X11R7 RC3 release.

commit 19881d3c88ff0713ef550382fd0dfb03123dabed
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Mon Nov 28 22:03:06 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 a6fbdb403efd3bf7e1179660959fd0e66a301ce0
Author: Kevin E Martin <kem@kem.org>
Date:   Sat Nov 19 07:15:42 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 82513d04a8381da8d2281d7581f6b0d65901aede
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Sun Nov 13 02:08:07 2005 +0000

Use sed to substitute variables in man pages

commit d1b430289b2ddb6c1f3383c5288aa125b058508a
Author: Kevin E Martin <kem@kem.org>
Date:   Wed Nov 9 21:19:13 2005 +0000

Update package version number for X11R7 RC2 release.

commit e2c9276ccc1ef619dcfbdeb414ef0dec5113c1ee
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Sat Oct 29 02:26:49 2005 +0000

Add --enable-stat-zfile (on by default) to replace Imake's ZFILEDEF =
        -DSTAT_ZFILE to enable automatically searching for file.xpm.Z &
        file.xpm.gz when file.xpm is requested.

commit 2f57ab95012d9221cca1af6c0a1ccea5d308c66f
Author: Kevin E Martin <kem@kem.org>
Date:   Wed Oct 19 02:48:11 2005 +0000

Update package version number for RC1 release.

commit 72bf88ed120fb888c57ed3223faa316403031b36
Author: Kevin E Martin <kem@kem.org>
Date:   Wed Oct 5 20:24:14 2005 +0000

Add missing files to EXTRA_DIST
    Fix man page installation

commit 08c43c5f1f851c1acad360a28767670dc62d8a66
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Mon Oct 3 19:53:58 2005 +0000

Last argument of variable parameter list needs to be casted to a pointer
        type.

commit 5ecad7c12c3104d653972385f548e3f86532cbe3
Author: Kevin E Martin <kem@kem.org>
Date:   Fri Jul 29 21:22:52 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 703207d3b3718223d4b2711fb77fc96a4f3909ef
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sun Jul 17 10:32:57 2005 +0000

fix build outside of $(srcdir)

commit 5a0177d4474787951c0cae56e285bb075ab405f3
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Sat Jul 16 21:11:25 2005 +0000

Accept autoconf HAVE_STRLCPY as alias for HAS_STRLCAT

commit fd38ee667976855150d3c1231a1acc2cf1a89330
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date:   Sat Jul 16 21:10:44 2005 +0000

Check for strlcat() for use in parse.c

commit 9b3eed6e4f7ee542149ecec0d017a3a460f7c084
Author: Daniel Stone <daniel@fooishbar.org>
Date:   Sat Jul 16 07:23:39 2005 +0000

Set soversion to 4.11.0 with -version-number.

commit a705a1cd9dc4c4ba1940c9b59d2107ba59360e39
Author: Keith Packard <keithp@keithp.com>
Date:   Sat Jul 9 06:45:44 2005 +0000

Add .cvsignore files

commit b1d84a9fc9b15232c09b6ce5d96c097fdd4f0a15
Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date:   Thu Jun 9 13:42:36 2005 +0000

Use $(top_srcdir)/src instead of $(top_builddir)/src in INCLUDES

commit 769751fba3e32f49272d19799929e1ad5a3d2cd0
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date:   Thu May 19 17:09:13 2005 +0000

Add $(top_builddir)/include to INCLUDES

commit 2cc1896c61eef5739bb6a8ffa89e58ba5c175a05
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date:   Thu May 19 15:02:48 2005 +0000

- Add build system for lib/Xpm
    - Add Xpm to symlink.sh
    - Conditionally include config.h in xc/extras/Xpm

commit cf0d69c7ace679f27f105c582760b9be14923aba
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date:   Thu May 19 14:37:53 2005 +0000

Thu May 19 10:36:54 2005 Søren Sandmann <sandmann@redhat.com>
    Add "../lib" to INCLUDES.
    Replace #include "../lib/foo" with #include "foo".

commit 639b3598cd0e7214010248efb62b75ef85a8e5c5
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Mon Feb 21 20:52:32 2005 +0000

Avoid inifite loops. From Chris Gilbert in bug #1920.

commit f1908d7ee5e2d2d44db2116b3c88213da9dfb854
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sat Dec 11 16:14:05 2004 +0000

Fix incomplete merge.

commit b041980732f6a6002001cfe079fdfb982937d4a8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sat Dec 11 16:08:59 2004 +0000

more s_open() cleanup.

commit 90d0638a42553786f54df333f0da4d008e9a0573
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Sat Dec 11 16:04:34 2004 +0000

Replace s_popen() by a more specific function that allows only one command
        in the pipe. Remove extraneous tests on file names that broke some
        applications. From Alex Reisen in Bugzilla #1920.

commit 2c23dbf2cafaad72b1f45da915eb87a8f792fdb0
Author: Roland Mainz <roland.mainz@nrubsig.org>
Date:   Wed Dec 8 01:16:48 2004 +0000

//bugs.freedesktop.org/show_bug.cgi?id=830): Fix libXpm header (xpm.h) to
        use the X11 function begin/end marker macros (_XFUNCPROTOBEGIN,
        _XFUNCPROTOEND) instead of homegrown (native) C++ code. Patch by Kevin
        DeKorte <kdekorte@yahoo.com>.

commit 50986a34f231fbc7a4b62466bd89bd4ae4027d2e
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date:   Thu Nov 25 21:19:11 2004 +0000

Fixes for CAN-2004-0914 (Thomas Biege).

commit a983dafac59dcb425666a5a5556da4734e50c6c5
Author: Egbert Eich <eich@suse.de>
Date:   Tue Sep 21 17:57:35 2004 +0000

Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and
        Alan Coopersmith from release 6.8.1.
    Fail during initialization with error if font/fontset is not set for
        widget. This prevents a sig11 later when the non-existent font/fontset
        structs are referenced.
    Check if xf86Info.kbdProc pointer is really set before calling it on abort
        as this pointer won't be set if the new modular keyboard driver is used
        (Matthias Hopf).
    Added new libs to the bindist control files.
    Removed inclusion of unnecessary kernel header on Linux. This may fail in
        an -ansi environment.

commit 2773a7214e282f6f673483f5233b880505947c3f
Author: Egbert Eich <eich@suse.de>
Date:   Fri Apr 23 18:42:32 2004 +0000

Merging XORG-CURRENT into trunk

commit 65c64a2eaa8698434f1869dcdcb5d9ccb21c6932
Author: Egbert Eich <eich@suse.de>
Date:   Sun Mar 14 08:28:26 2004 +0000

Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004

commit 0b313707a677523fed9ac485445e8b09d2a85c13
Author: Egbert Eich <eich@suse.de>
Date:   Wed Mar 3 12:09:53 2004 +0000

Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004

commit 658f8e9a9094ba5d18743694cad7275be53c7a25
Author: Egbert Eich <eich@suse.de>
Date:   Thu Feb 26 13:34:33 2004 +0000

readding XFree86's cvs IDs

commit 9971f91864e8f722b42c58f2ff19025715f33b98
Author: Egbert Eich <eich@suse.de>
Date:   Thu Feb 26 09:21:31 2004 +0000

Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004

commit fbfe965054d8144946651b19085684af7f6715b9
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date:   Tue Nov 25 19:27:16 2003 +0000

XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

commit c037348b5df0ac94ad4daba59f8bc9acf12ef623
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date:   Fri Nov 14 16:48:24 2003 +0000

XFree86 4.3.0.1

commit aafaabc4a0bfab6544e085ee504ad69de4a5ddb1
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date:   Fri Nov 14 16:48:24 2003 +0000

Initial revision