Hello community, here is the log from the commit of package iceauth for openSUSE:Factory checked in at 2013-08-04 16:49:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iceauth (Old) and /work/SRC/openSUSE:Factory/.iceauth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iceauth" Changes: -------- --- /work/SRC/openSUSE:Factory/iceauth/iceauth.changes 2012-05-08 11:57:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iceauth.new/iceauth.changes 2013-08-04 16:49:50.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Aug 1 19:00:30 UTC 2013 - [email protected] + +- Update to version 1.0.6: + + Constify some more string pointers to fix gcc warnings. + + Use void * instead of char * for generic pointer arg to DoFunc + functions. + + Mark unused arguments in callback functions to quiet clang + warnings. + + Fix some sign/size conversion warnings from clang. + + Add _X_NORETURN attributes suggested by gcc. + + Assume signal handlers return void, as C89 requires. + +------------------------------------------------------------------- Old: ---- iceauth-1.0.5.tar.bz2 New: ---- iceauth-1.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iceauth.spec ++++++ --- /var/tmp/diff_new_pack.15XlWJ/_old 2013-08-04 16:49:51.000000000 +0200 +++ /var/tmp/diff_new_pack.15XlWJ/_new 2013-08-04 16:49:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iceauth # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: iceauth -Version: 1.0.5 -Release: 1 -License: MIT +Version: 1.0.6 +Release: 0 Summary: Utility to edit and display the ICE authorization information -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xproto) +BuildRequires: pkgconfig(xproto) >= 7.0.22 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ iceauth-1.0.5.tar.bz2 -> iceauth-1.0.6.tar.bz2 ++++++ ++++ 13321 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iceauth-1.0.5/ChangeLog new/iceauth-1.0.6/ChangeLog --- old/iceauth-1.0.5/ChangeLog 2011-05-24 04:42:53.000000000 +0200 +++ new/iceauth-1.0.6/ChangeLog 2013-07-24 08:28:46.000000000 +0200 @@ -1,3 +1,101 @@ +commit c07d443d43e53cfe21b53a9a0eafcd6189432867 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jul 23 23:15:01 2013 -0700 + + iceauth 1.0.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 3e9250a5bc0c5e525c231eca1f241c545ac412ac +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 17 22:34:37 2013 -0700 + + Constify some more string pointers to fix gcc warnings + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit aa38bef15c15c90e6ec831a202e6e147b889b6a6 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 17 22:27:28 2013 -0700 + + Use void * instead of char * for generic pointer arg to DoFunc functions + + Quiets clang warnings of: + process.c:754:29: warning: cast from 'char *' to 'struct _list_data *' + increases required alignment from 1 to 8 [-Wcast-align] + struct _list_data *ld = (struct _list_data *) data; + ^~~~~~~~~~~~~~~~~~~~~~~~~~ + process.c:787:32: warning: cast from 'char *' to 'struct _extract_data *' + increases required alignment from 1 to 8 [-Wcast-align] + struct _extract_data *ed = (struct _extract_data *) data; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + process.c:988:22: warning: cast from 'char *' to 'int *' + increases required alignment from 1 to 4 [-Wcast-align] + int *nremovedp = (int *) data; + ^~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a79de96226321f79f471574830d64080559a1557 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 17 22:22:15 2013 -0700 + + Mark unused arguments in callback functions to quiet clang warnings + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9c2e2d401d32ed3f6a4e4e775581321eada9c734 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 17 22:17:11 2013 -0700 + + Fix some sign/size conversion warnings from clang + + process.c:410:22: warning: implicit conversion changes signedness: + 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + retval = malloc (len); + ~~~~~~ ^~~ + process.c:454:30: warning: implicit conversion changes signedness: + 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + strncmp (cmd, ct->name, n) == 0) { + ~~~~~~~ ^ + process.c:450:9: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + n = strlen (cmd); + ~ ^~~~~~~~~~~~ + process.c:1028:34: warning: implicit conversion changes signedness: + 'int' to 'size_t' (aka 'unsigned long') [-Wsign-conversion] + if (strncmp (cmd, ct->name, len) == 0) { + ~~~~~~~ ^~~ + process.c:1026:12: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + int len = strlen (cmd); + ~~~ ^~~~~~~~~~~~ + process.c:1560:8: warning: implicit conversion loses integer precision: + 'size_t' (aka 'unsigned long') to 'int' [-Wshorten-64-to-32] + len = strlen (buf); + ~ ^~~~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 21e6ddc42acc7864fb260c101060dee5cebf07c1 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 10:07:03 2013 -0800 + + Add _X_NORETURN attributes suggested by gcc + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ef04ccaac0e501612367c098410129f89e1d109a +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 23 10:02:50 2013 -0800 + + Assume signal handlers return void, as C89 requires + + Drops use of autoconf's obsolete AC_TYPE_SIGNAL and Imake's even more + obsolete SIGNALRETURNSINT. + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 27846ea3e133dbb45a4e67500eba15bf5d6c796c Author: Jeremy Huddleston <[email protected]> Date: Mon May 23 19:39:04 2011 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iceauth-1.0.5/compile new/iceauth-1.0.6/compile --- old/iceauth-1.0.5/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/iceauth-1.0.6/compile 2013-07-24 08:15:26.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/iceauth-1.0.5/config.h.in new/iceauth-1.0.6/config.h.in --- old/iceauth-1.0.5/config.h.in 2011-05-24 04:42:48.000000000 +0200 +++ new/iceauth-1.0.6/config.h.in 2013-07-24 08:15:25.000000000 +0200 @@ -57,9 +57,6 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iceauth-1.0.5/configure.ac new/iceauth-1.0.6/configure.ac --- old/iceauth-1.0.5/configure.ac 2011-05-24 04:40:53.000000000 +0200 +++ new/iceauth-1.0.6/configure.ac 2013-07-24 08:15:21.000000000 +0200 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT([iceauth], [1.0.5], +AC_INIT([iceauth], [1.0.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [iceauth]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -33,14 +33,10 @@ m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) - - -AC_TYPE_SIGNAL - XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(ICEAUTH, xproto ice) +PKG_CHECK_MODULES(ICEAUTH, [xproto >= 7.0.22 ice]) XORG_WITH_LINT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iceauth-1.0.5/iceauth.c new/iceauth-1.0.6/iceauth.c --- old/iceauth-1.0.5/iceauth.c 2011-04-28 09:49:20.000000000 +0200 +++ new/iceauth-1.0.6/iceauth.c 2013-07-24 08:15:21.000000000 +0200 @@ -52,7 +52,8 @@ /* * utility routines */ -static void usage (void) +static void _X_NORETURN +usage (void) { static const char prefixmsg[] = "\n" @@ -92,10 +93,10 @@ ProgramName = argv[0]; for (i = 1; i < argc; i++) { - char *arg = argv[i]; + const char *arg = argv[i]; if (arg[0] == '-') { - char *flag; + const char *flag; for (flag = (arg + 1); *flag; flag++) { switch (*flag) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iceauth-1.0.5/missing new/iceauth-1.0.6/missing --- old/iceauth-1.0.5/missing 2011-05-24 04:42:49.000000000 +0200 +++ new/iceauth-1.0.6/missing 2013-07-24 08:15:26.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/iceauth-1.0.5/process.c new/iceauth-1.0.6/process.c --- old/iceauth-1.0.5/process.c 2011-05-24 04:40:53.000000000 +0200 +++ new/iceauth-1.0.6/process.c 2013-07-24 08:15:21.000000000 +0200 @@ -48,22 +48,22 @@ #define add_to_list(h,t,e) {if (t) (t)->next = (e); else (h) = (e); (t) = (e);} typedef int (*ProcessFunc)(const char *, int, int, char **); -typedef int (*DoFunc)(const char *, int, IceAuthFileEntry *, char *); +typedef int (*DoFunc)(const char *, int, IceAuthFileEntry *, void *); typedef struct _CommandTable { /* commands that are understood */ - char *name; /* full name */ - int minlen; /* unique prefix */ - int maxlen; /* strlen(name) */ + const char *name; /* full name */ + unsigned int minlen; /* unique prefix */ + unsigned int maxlen; /* strlen(name) */ ProcessFunc processfunc; /* handler */ - char *helptext; /* what to print for help */ + const char *helptext; /* what to print for help */ } CommandTable; struct _extract_data { /* for iterating */ FILE *fp; /* input source */ - char *filename; /* name of input */ + const char *filename; /* name of input */ Bool used_stdout; /* whether or not need to close */ int nwritten; /* number of entries written */ - char *cmd; /* for error messages */ + const char *cmd; /* for error messages */ }; struct _list_data { /* for iterating */ @@ -74,8 +74,8 @@ /* * private data */ -static char *stdin_filename = "(stdin)"; /* for messages */ -static char *stdout_filename = "(stdout)"; /* for messages */ +static const char *stdin_filename = "(stdin)"; /* for messages */ +static const char *stdout_filename = "(stdout)"; /* for messages */ static const char *Yes = "yes"; /* for messages */ static const char *No = "no"; /* for messages */ @@ -85,21 +85,21 @@ static char *skip_space ( char *s ); static char *skip_nonspace ( char *s ); static char **split_into_words ( char *src, int *argcp ); -static FILE *open_file ( char **filenamep, const char *mode, Bool *usedstdp, const char *srcfn, int srcln, const char *cmd ); +static FILE *open_file ( const char **filenamep, const char *mode, Bool *usedstdp, const char *srcfn, int srcln, const char *cmd ); static int read_auth_entries ( FILE *fp, AuthList **headp, AuthList **tailp ); -static int cvthexkey ( char *hexstr, char **ptrp ); +static int cvthexkey ( const char *hexstr, char **ptrp ); static int dispatch_command ( const char *inputfilename, int lineno, int argc, char **argv, const CommandTable *tab, int *statusp ); -static void die ( int sig ); -static void catchsig ( int sig ); +static void die ( int sig ) _X_NORETURN; +static void catchsig ( int sig ) _X_NORETURN; static void register_signals ( void ); static int write_auth_file ( char *tmp_nam, size_t tmp_nam_len ); static void fprintfhex ( FILE *fp, unsigned int len, const char *cp ); -static int dump_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data ); -static int extract_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data ); +static int dump_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, void *data ); +static int extract_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, void *data ); static int match_auth ( IceAuthFileEntry *a, IceAuthFileEntry *b, int *authDataSame ); static int merge_entries ( AuthList **firstp, AuthList *second, int *nnewp, int *nreplp, int *ndupp ); -static int search_and_do ( const char *inputfilename, int lineno, int start, int argc, char *argv[], DoFunc do_func, char *data ); -static int remove_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data ); +static int search_and_do ( const char *inputfilename, int lineno, int start, int argc, char *argv[], DoFunc do_func, void *data ); +static int remove_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, void *data ); static int do_help ( const char *inputfilename, int lineno, int argc, char **argv ); static int do_questionmark ( const char *inputfilename, int lineno, int argc, char **argv ); static int do_list ( const char *inputfilename, int lineno, int argc, char **argv ); @@ -313,7 +313,7 @@ static FILE *open_file ( - char **filenamep, + const char **filenamep, const char *mode, Bool *usedstdp, const char *srcfn, @@ -383,12 +383,13 @@ static int cvthexkey ( /* turn hex key string into octets */ - char *hexstr, + const char *hexstr, char **ptrp) { - int i; - int len = 0; - char *retval, *s; + unsigned int i; + unsigned int len = 0; + char *retval; + const char *s; unsigned char *us; char c; char savec = '\0'; @@ -431,7 +432,7 @@ } } *ptrp = retval; - return len; + return (int) len; } static int dispatch_command ( @@ -443,8 +444,8 @@ int *statusp) { const CommandTable *ct; - char *cmd; - int n; + const char *cmd; + size_t n; /* scan table for command */ cmd = argv[0]; n = strlen (cmd); @@ -469,31 +470,18 @@ static char *iceauth_filename = NULL; static volatile Bool dieing = False; -#ifdef RETSIGTYPE /* autoconf AC_TYPE_SIGNAL */ -# define _signal_t RETSIGTYPE -#else /* Imake */ -#ifdef SIGNALRETURNSINT -#define _signal_t int -#else -#define _signal_t void -#endif -#endif /* RETSIGTYPE */ - /* poor man's puts(), for under signal handlers */ #define WRITES(fd, S) (void)write((fd), (S), strlen((S))) /* ARGSUSED */ -static _signal_t die (int sig) +static void die (_X_UNUSED int sig) { dieing = True; _exit (auth_finalize ()); /* NOTREACHED */ -#ifdef SIGNALRETURNSINT - return -1; /* for picky compilers */ -#endif } -static _signal_t catchsig (int sig) +static void catchsig (int sig) { #ifdef SYSV if (sig > 0) signal (sig, die); /* re-establish signal handler */ @@ -509,9 +497,6 @@ #endif die (sig); /* NOTREACHED */ -#ifdef SIGNALRETURNSINT - return -1; /* for picky compilers */ -#endif } static void register_signals (void) @@ -570,7 +555,7 @@ ICEAUTH_DEFAULT_TIMEOUT, (break_locks ? 0L : ICEAUTH_DEFAULT_DEADTIME)); if (n != IceAuthLockSuccess) { - char *reason = "unknown error"; + const char *reason = "unknown error"; switch (n) { case IceAuthLockError: reason = "error"; @@ -762,10 +747,10 @@ /* ARGSUSED */ static int dump_entry ( - const char *inputfilename, - int lineno, + const char *inputfilename _X_UNUSED, + int lineno _X_UNUSED, IceAuthFileEntry *auth, - char *data) + void *data) { struct _list_data *ld = (struct _list_data *) data; FILE *fp = ld->fp; @@ -798,7 +783,7 @@ const char *inputfilename, int lineno, IceAuthFileEntry *auth, - char *data) + void *data) { struct _extract_data *ed = (struct _extract_data *) data; @@ -937,7 +922,7 @@ int argc, char *argv[], DoFunc do_func, - char *data) + void *data) { int i; int status = 0; @@ -996,10 +981,10 @@ /* ARGSUSED */ static int remove_entry ( - const char *inputfilename, - int lineno, + const char *inputfilename _X_UNUSED, + int lineno _X_UNUSED, IceAuthFileEntry *auth, - char *data) + void *data) { int *nremovedp = (int *) data; AuthList **listp = &iceauth_head; @@ -1039,7 +1024,7 @@ n++; } } else { - int len = strlen (cmd); + size_t len = strlen (cmd); for (ct = command_table; ct->name; ct++) { if (strncmp (cmd, ct->name, len) == 0) { fprintf (fp, "%s\n\n", ct->helptext); @@ -1086,15 +1071,15 @@ */ /* ARGSUSED */ static int do_questionmark ( - const char *inputfilename, - int lineno, - int argc, - char **argv) + const char *inputfilename _X_UNUSED, + int lineno _X_UNUSED, + int argc _X_UNUSED, + char **argv _X_UNUSED) { const CommandTable *ct; - int i; + unsigned int i; #define WIDEST_COLUMN 72 - int col = WIDEST_COLUMN; + unsigned int col = WIDEST_COLUMN; printf ("Commands:\n"); for (ct = command_table; ct->name; ct++) { @@ -1138,7 +1123,7 @@ if (iceauth_head) { for (l = iceauth_head; l; l = l->next) { - dump_entry (inputfilename, lineno, l->auth, (char *) &ld); + dump_entry (inputfilename, lineno, l->auth, &ld); } } return 0; @@ -1146,7 +1131,7 @@ else { return (search_and_do (inputfilename, lineno, 1, argc, argv, - dump_entry, (char *) &ld)); + dump_entry, &ld)); } } @@ -1173,7 +1158,7 @@ listhead = listtail = NULL; for (i = 1; i < argc; i++) { - char *filename = argv[i]; + const char *filename = argv[i]; FILE *fp; Bool used_stdin = False; @@ -1238,7 +1223,7 @@ ed.cmd = argv[0]; errors = search_and_do (inputfilename, lineno, 2, argc, argv, - extract_entry, (char *) &ed); + extract_entry, &ed); if (!ed.fp) { fprintf (stderr, @@ -1459,7 +1444,7 @@ } errors = search_and_do (inputfilename, lineno, 1, argc, argv, - remove_entry, (char *) &nremoved); + remove_entry, &nremoved); if (verbose) printf ("%d entries removed\n", nremoved); return errors; } @@ -1503,10 +1488,10 @@ /* ARGSUSED */ static int do_exit ( - const char *inputfilename, - int lineno, - int argc, - char **argv) + const char *inputfilename _X_UNUSED, + int lineno _X_UNUSED, + int argc _X_UNUSED, + char **argv _X_UNUSED) { /* allow bogus stuff */ alldone = True; @@ -1518,10 +1503,10 @@ */ /* ARGSUSED */ static int do_quit ( - const char *inputfilename, - int lineno, - int argc, - char **argv) + const char *inputfilename _X_UNUSED, + int lineno _X_UNUSED, + int argc _X_UNUSED, + char **argv _X_UNUSED) { /* allow bogus stuff */ die (0); @@ -1539,11 +1524,11 @@ int argc, char **argv) { - char *script; + const char *script; char buf[BUFSIZ]; FILE *fp; Bool used_stdin = False; - int len; + size_t len; int errors = 0, status; int sublineno = 0; char **subargv; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
