Hello community, here is the log from the commit of package libXpm for openSUSE:Factory checked in at 2013-09-13 14:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXpm (Old) and /work/SRC/openSUSE:Factory/.libXpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXpm" Changes: -------- --- /work/SRC/openSUSE:Factory/libXpm/libXpm.changes 2013-03-22 11:57:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libXpm.new/libXpm.changes 2013-09-13 14:47:11.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Sep 12 18:38:52 UTC 2013 - [email protected] + +- Update to version 3.5.11: + + Fix typo in COPYING (matches src/amigax.h). + + Add noreturn attributes suggested by gcc. + + Doclifter can't handle more than one dash in a name line. + + Fix libXpm build with NO_ZPIPE. + + Added 'const' attribute to all filename arguments in the API. + + Added 'const' qualifier to the filename argument to internal + functions. + + Close fd if fdopen() or xpmPipeThrough() fails in + OpenWriteFile(). + + autogen.sh: Implement GNOME Build API. + + configure: Remove AM_MAINTAINER_MODE. + + Define NO_ZPIPE when building for MinGW. + +------------------------------------------------------------------- Old: ---- libXpm-3.5.10.tar.bz2 New: ---- libXpm-3.5.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXpm.spec ++++++ --- /var/tmp/diff_new_pack.mG8h1q/_old 2013-09-13 14:47:11.000000000 +0200 +++ /var/tmp/diff_new_pack.mG8h1q/_new 2013-09-13 14:47:11.000000000 +0200 @@ -18,7 +18,7 @@ Name: libXpm %define lname libXpm4 -Version: 3.5.10 +Version: 3.5.11 Release: 0 Summary: X Pixmap image file format library License: MIT @@ -35,7 +35,7 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xextproto) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) %description ++++++ libXpm-3.5.10.tar.bz2 -> libXpm-3.5.11.tar.bz2 ++++++ ++++ 16046 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/libXpm-3.5.10/COPYING new/libXpm-3.5.11/COPYING --- old/libXpm-3.5.10/COPYING 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/COPYING 2013-09-08 06:40:20.000000000 +0200 @@ -44,7 +44,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Arnaud LE HORS. -Copyright (C) 19896 Lorens Younes +Copyright (C) 1996 Lorens Younes Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to 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/libXpm-3.5.10/ChangeLog new/libXpm-3.5.11/ChangeLog --- old/libXpm-3.5.10/ChangeLog 2012-03-08 05:41:57.000000000 +0100 +++ new/libXpm-3.5.11/ChangeLog 2013-09-08 06:43:29.000000000 +0200 @@ -1,3 +1,126 @@ +commit 3425cbb0e6086f74783eafbe23df1121b655e006 +Author: Alan Coopersmith <[email protected]> +Date: Sat Sep 7 21:40:17 2013 -0700 + + libXpm 3.5.11 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4bab3b62a47996ee77b8ddebcd92f0ebe9679c28 +Author: Alan Coopersmith <[email protected]> +Date: Sat Sep 7 21:36:51 2013 -0700 + + Fix typo in COPYING (matches src/amigax.h) + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9e38750da16c6e5bd8bb26b00d74041ddf9be3e8 +Author: Alan Coopersmith <[email protected]> +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 <[email protected]> + +commit 93f900ceac7ac899e00998adc8782ed02b352930 +Author: Eric S. Raymond <[email protected]> +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 <[email protected]> +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 <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e439f6e7163e3259f11f3363fa319e8a29085a92 +Author: Christophe CURIS <[email protected]> +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 <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 01ee6b9c500cd9c67f167e68c8383e8c58db5ddf +Author: Christophe CURIS <[email protected]> +Date: Wed May 1 10:39:37 2013 +0200 + + Added 'const' qualifier to the filename argument to internal functions + + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 980e9f851e47d31eed9635a6399a23d1456548d0 +Author: Alan Coopersmith <[email protected]> +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 <[email protected]> + Reviewed-by: Mark Kettenis <[email protected]> + +commit 81608285e11f2455800001a965dfece878861162 +Author: Colin Walters <[email protected]> +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 <[email protected]> + +commit 4c3e0ff63a7c71daaafdcdaa1d619063e0cf4a63 +Author: Adam Jackson <[email protected]> +Date: Tue Jan 15 14:28:48 2013 -0500 + + configure: Remove AM_MAINTAINER_MODE + + Signed-off-by: Adam Jackson <[email protected]> + +commit 4ca8014afbb66f0b65cdcd8ea12e469f52c8c70c +Author: Jon TURNEY <[email protected]> +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 <[email protected]> + Reviewed-by: Colin Harrison <[email protected]> + Reviewed-by: Yaakov Selkowitz <[email protected]> + Reviewed-by: Ángel González <[email protected]> + commit acaaea96776b36c097d5413040c5ce85d3ae6cb9 Author: Alan Coopersmith <[email protected]> Date: Wed Mar 7 20:39:55 2012 -0800 @@ -847,6 +970,9 @@ Removed inclusion of unnecessary kernel header on Linux. This may fail in an -ansi environment. +Notes: + Fixes CVE-2004-0687 (integer overflows) and CVE-2004-0688 (stack overflows) + commit 2773a7214e282f6f673483f5233b880505947c3f Author: Egbert Eich <[email protected]> Date: Fri Apr 23 18:42:32 2004 +0000 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/libXpm-3.5.10/compile new/libXpm-3.5.11/compile --- old/libXpm-3.5.10/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/libXpm-3.5.11/compile 2013-09-08 06:40:35.000000000 +0200 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + 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'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +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 <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXpm-3.5.10/config.h.in new/libXpm-3.5.11/config.h.in --- old/libXpm-3.5.10/config.h.in 2012-03-08 05:40:17.000000000 +0100 +++ new/libXpm-3.5.11/config.h.in 2013-09-08 06:40:34.000000000 +0200 @@ -40,6 +40,9 @@ */ #undef LT_OBJDIR +/* Define to 1 to disable decompression via pipes */ +#undef NO_ZPIPE + /* Name of package */ #undef PACKAGE 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/libXpm-3.5.10/configure.ac new/libXpm-3.5.11/configure.ac --- old/libXpm-3.5.10/configure.ac 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/configure.ac 2013-09-08 06:40:20.000000000 +0200 @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXpm], [3.5.10], +AC_INIT([libXpm], [3.5.11], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXpm]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -9,7 +9,6 @@ # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL @@ -25,7 +24,8 @@ # Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XPM, xproto x11) -PKG_CHECK_MODULES(SXPM, x11 xt xext xextproto, build_sxpm=true, build_sxpm=false) +PKG_CHECK_MODULES(SXPM, [x11 xt xext xextproto xproto >= 7.0.17], + [build_sxpm=true], [build_sxpm=false]) AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) # Internationalization & localization support @@ -58,6 +58,15 @@ AC_DEFINE(STAT_ZFILE, 1, [Define to 1 to automatically look for files with .Z & .gz extensions]) fi + +case $host_os in + *mingw*) + AC_DEFINE(NO_ZPIPE, 1, [Define to 1 to disable decompression via pipes]) + ;; + *) + ;; +esac + AC_CONFIG_FILES([Makefile doc/Makefile include/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXpm-3.5.10/include/X11/xpm.h new/libXpm-3.5.11/include/X11/xpm.h --- old/libXpm-3.5.10/include/X11/xpm.h 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/include/X11/xpm.h 2013-09-08 06:40:20.000000000 +0200 @@ -304,13 +304,13 @@ FUNC(XpmReadFileToPixmap, int, (Display *display, Drawable d, - char *filename, + const char *filename, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes)); FUNC(XpmWriteFileFromPixmap, int, (Display *display, - char *filename, + const char *filename, Pixmap pixmap, Pixmap shapemask, XpmAttributes *attributes)); @@ -329,13 +329,13 @@ XpmAttributes *attributes)); FUNC(XpmReadFileToImage, int, (Display *display, - char *filename, + const char *filename, XImage **image_return, XImage **shapeimage_return, XpmAttributes *attributes)); FUNC(XpmWriteFileFromImage, int, (Display *display, - char *filename, + const char *filename, XImage *image, XImage *shapeimage, XpmAttributes *attributes)); @@ -365,11 +365,11 @@ Pixmap shapemask, XpmAttributes *attributes)); #endif - FUNC(XpmReadFileToBuffer, int, (char *filename, char **buffer_return)); - FUNC(XpmWriteFileFromBuffer, int, (char *filename, char *buffer)); + FUNC(XpmReadFileToBuffer, int, (const char *filename, char **buffer_return)); + FUNC(XpmWriteFileFromBuffer, int, (const char *filename, char *buffer)); - FUNC(XpmReadFileToData, int, (char *filename, char ***data_return)); - FUNC(XpmWriteFileFromData, int, (char *filename, char **data)); + FUNC(XpmReadFileToData, int, (const char *filename, char ***data_return)); + FUNC(XpmWriteFileFromData, int, (const char *filename, char **data)); FUNC(XpmAttributesSize, int, (void)); FUNC(XpmFreeAttributes, void, (XpmAttributes *attributes)); @@ -382,11 +382,11 @@ FUNC(XpmLibraryVersion, int, (void)); /* XpmImage functions */ - FUNC(XpmReadFileToXpmImage, int, (char *filename, + FUNC(XpmReadFileToXpmImage, int, (const char *filename, XpmImage *image, XpmInfo *info)); - FUNC(XpmWriteFileFromXpmImage, int, (char *filename, + FUNC(XpmWriteFileFromXpmImage, int, (const char *filename, XpmImage *image, XpmInfo *info)); #if !defined(FOR_MSW) && !defined(AMIGA) 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/libXpm-3.5.10/man/cxpm.man new/libXpm-3.5.11/man/cxpm.man --- old/libXpm-3.5.10/man/cxpm.man 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/man/cxpm.man 2013-09-08 06:40:20.000000000 +0200 @@ -26,7 +26,7 @@ .PD .ad b .SH NAME -cxpm \- Check an XPM (X PixMap) file - XPM 1, 2, or 3. +cxpm \- Check an XPM (X PixMap) file, versions XPM 1, 2, or 3. .SH SYNOPSIS \fBcxpm\fR [\|\fIfilename\fP\|] 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/libXpm-3.5.10/missing new/libXpm-3.5.11/missing --- old/libXpm-3.5.10/missing 2012-03-08 05:40:17.000000000 +0100 +++ new/libXpm-3.5.11/missing 2013-09-08 06:40:35.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 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. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -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 - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - 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 - help2man touch the output file - 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] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - 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 - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - 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 $program in - aclocal*) - echo 1>&2 "\ -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." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -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." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -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." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -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." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -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." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - 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 "$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` - # ... 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 - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -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 - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) 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/libXpm-3.5.10/src/RdFToBuf.c new/libXpm-3.5.11/src/RdFToBuf.c --- old/libXpm-3.5.10/src/RdFToBuf.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/RdFToBuf.c 2013-09-08 06:40:20.000000000 +0200 @@ -60,7 +60,7 @@ int XpmReadFileToBuffer( - char *filename, + const char *filename, char **buffer_return) { int fd, fcheck; 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/libXpm-3.5.10/src/RdFToDat.c new/libXpm-3.5.11/src/RdFToDat.c --- old/libXpm-3.5.10/src/RdFToDat.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/RdFToDat.c 2013-09-08 06:40:20.000000000 +0200 @@ -39,7 +39,7 @@ int XpmReadFileToData( - char *filename, + const char *filename, char ***data_return) { XpmImage image; 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/libXpm-3.5.10/src/RdFToI.c new/libXpm-3.5.11/src/RdFToI.c --- old/libXpm-3.5.10/src/RdFToI.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/RdFToI.c 2013-09-08 06:40:20.000000000 +0200 @@ -49,7 +49,7 @@ #endif #endif -LFUNC(OpenReadFile, int, (char *filename, xpmData *mdata)); +LFUNC(OpenReadFile, int, (const char *filename, xpmData *mdata)); LFUNC(xpmDataClose, void, (xpmData *mdata)); FUNC(xpmPipeThrough, FILE*, (int fd, @@ -61,7 +61,7 @@ int XpmReadFileToImage( Display *display, - char *filename, + const char *filename, XImage **image_return, XImage **shapeimage_return, XpmAttributes *attributes) @@ -104,7 +104,7 @@ int XpmReadFileToXpmImage( - char *filename, + const char *filename, XpmImage *image, XpmInfo *info) { @@ -194,7 +194,7 @@ */ static int OpenReadFile( - char *filename, + const char *filename, xpmData *mdata) { if (!filename) { 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/libXpm-3.5.10/src/RdFToP.c new/libXpm-3.5.11/src/RdFToP.c --- old/libXpm-3.5.10/src/RdFToP.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/RdFToP.c 2013-09-08 06:40:20.000000000 +0200 @@ -41,7 +41,7 @@ XpmReadFileToPixmap( Display *display, Drawable d, - char *filename, + const char *filename, Pixmap *pixmap_return, Pixmap *shapemask_return, XpmAttributes *attributes) 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/libXpm-3.5.10/src/WrFFrBuf.c new/libXpm-3.5.11/src/WrFFrBuf.c --- old/libXpm-3.5.10/src/WrFFrBuf.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/WrFFrBuf.c 2013-09-08 06:40:20.000000000 +0200 @@ -41,7 +41,7 @@ int XpmWriteFileFromBuffer( - char *filename, + const char *filename, char *buffer) { int fcheck, len; 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/libXpm-3.5.10/src/WrFFrDat.c new/libXpm-3.5.11/src/WrFFrDat.c --- old/libXpm-3.5.10/src/WrFFrDat.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/WrFFrDat.c 2013-09-08 06:40:20.000000000 +0200 @@ -39,7 +39,7 @@ int XpmWriteFileFromData( - char *filename, + const char *filename, char **data) { XpmImage image; 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/libXpm-3.5.10/src/WrFFrI.c new/libXpm-3.5.11/src/WrFFrI.c --- old/libXpm-3.5.10/src/WrFFrI.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/WrFFrI.c 2013-09-08 06:40:20.000000000 +0200 @@ -45,11 +45,12 @@ #ifndef NO_ZPIPE #include "sys/wait.h" #include "sys/types.h" -#include "fcntl.h" #include "unistd.h" #include "errno.h" #endif +#include "fcntl.h" + /* MS Windows define a function called WriteFile @#%#&!!! */ LFUNC(xpmWriteFile, int, (FILE *file, XpmImage *image, const char *name, XpmInfo *info)); @@ -63,13 +64,13 @@ LFUNC(WriteExtensions, void, (FILE *file, XpmExtension *ext, unsigned int num)); -LFUNC(OpenWriteFile, int, (char *filename, xpmData *mdata)); +LFUNC(OpenWriteFile, int, (const char *filename, xpmData *mdata)); LFUNC(xpmDataClose, void, (xpmData *mdata)); int XpmWriteFileFromImage( Display *display, - char *filename, + const char *filename, XImage *image, XImage *shapeimage, XpmAttributes *attributes) @@ -99,7 +100,7 @@ int XpmWriteFileFromXpmImage( - char *filename, + const char *filename, XpmImage *image, XpmInfo *info) { @@ -319,7 +320,7 @@ */ static int OpenWriteFile( - char *filename, + const char *filename, xpmData *mdata) { if (!filename) { @@ -346,8 +347,10 @@ mdata->stream.file = fdopen(fd, "w"); mdata->type = XPMFILE; } - if (!mdata->stream.file) + if (!mdata->stream.file) { + close(fd); return (XpmOpenFailed); + } } return (XpmSuccess); } 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/libXpm-3.5.10/src/WrFFrP.c new/libXpm-3.5.11/src/WrFFrP.c --- old/libXpm-3.5.10/src/WrFFrP.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/src/WrFFrP.c 2013-09-08 06:40:20.000000000 +0200 @@ -40,7 +40,7 @@ int XpmWriteFileFromPixmap( Display *display, - char *filename, + const char *filename, Pixmap pixmap, Pixmap shapemask, XpmAttributes *attributes) 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/libXpm-3.5.10/sxpm/sxpm.c new/libXpm-3.5.11/sxpm/sxpm.c --- old/libXpm-3.5.10/sxpm/sxpm.c 2012-03-08 05:40:08.000000000 +0100 +++ new/libXpm-3.5.11/sxpm/sxpm.c 2013-09-08 06:40:20.000000000 +0200 @@ -109,9 +109,9 @@ #define xrdb XtDatabase(dpy) static Colormap colormap; -void Usage(void); +void Usage(void) _X_NORETURN; void ErrorMessage(int ErrorStatus, const char *tag); -void Punt(int i); +void Punt(int i) _X_NORETURN; void VersionInfo(void); void kinput(Widget widget, char *tag, XEvent *xe, Boolean *b); void GetNumbers(int num, int *format_return, @@ -569,9 +569,6 @@ XtMainLoop(); } Punt(0); - - /* Muffle gcc */ - return 0; } void -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
