Hello community, here is the log from the commit of package hmaccalc for openSUSE:Factory checked in at 2015-01-24 22:20:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hmaccalc (Old) and /work/SRC/openSUSE:Factory/.hmaccalc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hmaccalc" Changes: -------- --- /work/SRC/openSUSE:Factory/hmaccalc/hmaccalc.changes 2014-05-10 07:49:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hmaccalc.new/hmaccalc.changes 2015-01-24 22:20:18.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 18 18:33:15 UTC 2015 - [email protected] + +- Update to version 0.9.14 + * No changelog available + +------------------------------------------------------------------- Old: ---- hmaccalc-0.9.13.tar.gz hmaccalc-0.9.13.tar.gz.sig New: ---- hmaccalc-0.9.14.tar.gz hmaccalc-0.9.14.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hmaccalc.spec ++++++ --- /var/tmp/diff_new_pack.uQRI4V/_old 2015-01-24 22:20:19.000000000 +0100 +++ /var/tmp/diff_new_pack.uQRI4V/_new 2015-01-24 22:20:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package hmaccalc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -28,7 +28,7 @@ %{nil} Name: hmaccalc -Version: 0.9.13 +Version: 0.9.14 Release: 0 Summary: Tools for computing and checking HMAC values for files License: BSD-3-Clause @@ -57,7 +57,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %check ++++++ hmaccalc-0.9.13.tar.gz -> hmaccalc-0.9.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/Makefile.in new/hmaccalc-0.9.14/Makefile.in --- old/hmaccalc-0.9.13/Makefile.in 2013-10-14 20:35:43.000000000 +0200 +++ new/hmaccalc-0.9.14/Makefile.in 2014-11-11 20:16:27.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -77,7 +77,7 @@ POST_UNINSTALL = : subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) README \ + $(top_srcdir)/configure $(am__configure_deps) README compile \ install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -515,10 +515,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -560,9 +566,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/aclocal.m4 new/hmaccalc-0.9.14/aclocal.m4 --- old/hmaccalc-0.9.13/aclocal.m4 2013-10-14 20:35:42.000000000 +0200 +++ new/hmaccalc-0.9.14/aclocal.m4 2014-11-11 20:16:26.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -247,10 +247,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,7 +266,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -633,6 +633,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -741,7 +747,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell [email protected] about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -749,7 +796,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -931,6 +977,70 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/compile new/hmaccalc-0.9.14/compile --- old/hmaccalc-0.9.13/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/hmaccalc-0.9.14/compile 2014-11-11 20:16:27.000000000 +0100 @@ -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' old/hmaccalc-0.9.13/configure new/hmaccalc-0.9.14/configure --- old/hmaccalc-0.9.13/configure 2013-10-14 20:35:42.000000000 +0200 +++ new/hmaccalc-0.9.14/configure 2014-11-11 20:16:26.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for hmaccalc 0.9.13. +# Generated by GNU Autoconf 2.69 for hmaccalc 0.9.14. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ # Identity of this package. PACKAGE_NAME='hmaccalc' PACKAGE_TARNAME='hmaccalc' -PACKAGE_VERSION='0.9.13' -PACKAGE_STRING='hmaccalc 0.9.13' +PACKAGE_VERSION='0.9.14' +PACKAGE_STRING='hmaccalc 0.9.14' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1245,7 +1245,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hmaccalc 0.9.13 to adapt to many kinds of systems. +\`configure' configures hmaccalc 0.9.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1311,7 +1311,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hmaccalc 0.9.13:";; + short | recursive ) echo "Configuration of hmaccalc 0.9.14:";; esac cat <<\_ACEOF @@ -1415,7 +1415,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hmaccalc configure 0.9.13 +hmaccalc configure 0.9.14 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1470,7 +1470,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hmaccalc $as_me 0.9.13, which was +It was created by hmaccalc $as_me 0.9.14, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1818,7 +1818,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2333,7 +2333,7 @@ # Define the identity of the package. PACKAGE='hmaccalc' - VERSION='0.9.13' + VERSION='0.9.14' cat >>confdefs.h <<_ACEOF @@ -2384,6 +2384,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell [email protected] about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3172,6 +3213,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4272,7 +4372,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hmaccalc $as_me 0.9.13, which was +This file was extended by hmaccalc $as_me 0.9.14, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4338,7 +4438,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -hmaccalc config.status 0.9.13 +hmaccalc config.status 0.9.14 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/configure.ac new/hmaccalc-0.9.14/configure.ac --- old/hmaccalc-0.9.13/configure.ac 2013-10-14 20:35:40.000000000 +0200 +++ new/hmaccalc-0.9.14/configure.ac 2014-11-11 20:16:24.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(hmaccalc,0.9.13) +AC_INIT(hmaccalc,0.9.14) AM_INIT_AUTOMAKE(foreign) AC_PROG_CC PKG_CHECK_MODULES(NSS,nss) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/hmaccalc.spec new/hmaccalc-0.9.14/hmaccalc.spec --- old/hmaccalc-0.9.13/hmaccalc.spec 2013-10-14 20:35:40.000000000 +0200 +++ new/hmaccalc-0.9.14/hmaccalc.spec 2014-11-11 20:16:24.000000000 +0100 @@ -12,7 +12,7 @@ %{nil} Name: hmaccalc -Version: 0.9.13 +Version: 0.9.14 Release: 1%{?dist} Summary: Tools for computing and checking HMAC values for files @@ -20,9 +20,14 @@ License: BSD URL: https://fedorahosted.org/hmaccalc/ Source0: https://fedorahosted.org/released/hmaccalc/hmaccalc-%{version}.tar.gz +#Source1: https://fedorahosted.org/released/hmaccalc/hmaccalc-%{version}.tar.gz.sig BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%ifarch %{ix86} x86_64 ppc ppc64 s390 s390x BuildRequires: nss-devel, prelink +%else +BuildRequires: nss-devel +%endif %description The hmaccalc package contains tools which can calculate HMAC (hash-based @@ -61,6 +66,20 @@ %{_mandir}/*/* %changelog +* Tue Nov 11 2014 Nalin Dahyabhai <[email protected]> - 0.9.14-1 +- improve error reporting (part of #1162135) + +* Sat Aug 16 2014 Fedora Release Engineering <[email protected]> - 0.9.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering <[email protected]> - 0.9.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Feb 10 2014 Nalin Dahyabhai <[email protected]> - 0.9.13-2 +- only BuildRequire: prelink on the arches on which we know it runs (currently + %%{ix86}, x86_64, ppc, ppc64, s390, s390x), so that it can be built on the + rest (#1061889) + * Mon Oct 14 2013 Nalin Dahyabhai <[email protected]> - 0.9.13-1 - treat unexpected command-line arguments as an error to avoid setting incorrect expectations, and warn when a check file doesn't appear to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/missing new/hmaccalc-0.9.14/missing --- old/hmaccalc-0.9.13/missing 2013-10-14 20:35:43.000000000 +0200 +++ new/hmaccalc-0.9.14/missing 2014-11-11 20:16:27.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/src/Makefile.in new/hmaccalc-0.9.14/src/Makefile.in --- old/hmaccalc-0.9.13/src/Makefile.in 2013-10-14 20:35:44.000000000 +0200 +++ new/hmaccalc-0.9.14/src/Makefile.in 2014-11-11 20:16:27.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -377,8 +377,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -490,14 +490,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` install-man8: $(man_MANS) @$(NORMAL_INSTALL) @list1=''; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/src/hmac.c new/hmaccalc-0.9.14/src/hmac.c --- old/hmaccalc-0.9.13/src/hmac.c 2013-10-14 20:35:40.000000000 +0200 +++ new/hmaccalc-0.9.14/src/hmac.c 2014-11-11 20:16:24.000000000 +0100 @@ -42,6 +42,7 @@ #include <nss.h> #include <pk11pub.h> +#include <prerror.h> #include <secmod.h> #define IPAD 0x36 @@ -164,8 +165,8 @@ } status = PK11_DigestFinal(ctx, key, &length, size); if (status != SECSuccess) { - fprintf(stderr, "Error computing digest of \"%s\".\n", - keyopt); + fprintf(stderr, "Error computing digest of \"%s\": %s.\n", + keyopt, PR_ErrorToName(PORT_GetError())); fclose(fp); return status; } @@ -293,7 +294,8 @@ /* Create the inner context (or the only one, if we're unkeyed). */ ctx = PK11_CreateDigestContext(algorithm->tag); if (ctx == NULL) { - fprintf(stderr, "Error starting up digest.\n"); + fprintf(stderr, "Error starting up digest: %s.\n", + PR_ErrorToName(PORT_GetError())); fclose(fp); if (strcmp(tempfile, filename) != 0) { unlink(tempfile); @@ -305,7 +307,8 @@ if (ikeyval != NULL) { status = PK11_DigestOp(ctx, ikeyval, algorithm->blocksize); if (status != SECSuccess) { - fprintf(stderr, "Error digesting HMAC key.\n"); + fprintf(stderr, "Error digesting HMAC key: %s.\n", + PR_ErrorToName(PORT_GetError())); PK11_DestroyContext(ctx, PR_TRUE); fclose(fp); if (strcmp(tempfile, filename) != 0) { @@ -319,7 +322,8 @@ while ((n = fread(buf, 1, sizeof(buf), fp)) > 0) { status = PK11_DigestOp(ctx, buf, n); if (status != SECSuccess) { - fprintf(stderr, "Error digesting.\n"); + fprintf(stderr, "Error digesting: %s.\n", + PR_ErrorToName(PORT_GetError())); PK11_DestroyContext(ctx, PR_TRUE); fclose(fp); if (strcmp(tempfile, filename) != 0) { @@ -335,7 +339,8 @@ /* Recover the output of the inner context. */ status = PK11_DigestFinal(ctx, result, &len, algorithm->digestsize); if (status != SECSuccess) { - fprintf(stderr, "Error recovering result.\n"); + fprintf(stderr, "Error recovering result: %s.\n", + PR_ErrorToName(PORT_GetError())); PK11_DestroyContext(ctx, PR_TRUE); if (strcmp(tempfile, filename) != 0) { unlink(tempfile); @@ -349,7 +354,8 @@ /* Create a context. */ ctx = PK11_CreateDigestContext(algorithm->tag); if (ctx == NULL) { - fprintf(stderr, "Error starting up HMAC.\n"); + fprintf(stderr, "Error starting up HMAC: %s.\n", + PR_ErrorToName(PORT_GetError())); PK11_DestroyContext(ctx, PR_TRUE); if (strcmp(tempfile, filename) != 0) { unlink(tempfile); @@ -359,7 +365,8 @@ /* Hash the outer key. */ status = PK11_DigestOp(ctx, okeyval, algorithm->blocksize); if (status != SECSuccess) { - fprintf(stderr, "Error digesting HMAC key.\n"); + fprintf(stderr, "Error digesting HMAC key: %s.\n", + PR_ErrorToName(PORT_GetError())); PK11_DestroyContext(ctx, PR_TRUE); if (strcmp(tempfile, filename) != 0) { unlink(tempfile); @@ -369,7 +376,8 @@ /* Hash the inner digest. */ status = PK11_DigestOp(ctx, result, len); if (status != SECSuccess) { - fprintf(stderr, "Error digesting inner digest.\n"); + fprintf(stderr, "Error digesting inner digest: %s.\n", + PR_ErrorToName(PORT_GetError())); PK11_DestroyContext(ctx, PR_TRUE); if (strcmp(tempfile, filename) != 0) { unlink(tempfile); @@ -380,7 +388,8 @@ status = PK11_DigestFinal(ctx, result, &len, algorithm->digestsize); if (status != SECSuccess) { - fprintf(stderr, "Error recovering result.\n"); + fprintf(stderr, "Error recovering result: %s.\n", + PR_ErrorToName(PORT_GetError())); PK11_DestroyContext(ctx, PR_TRUE); if (strcmp(tempfile, filename) != 0) { unlink(tempfile); @@ -528,9 +537,9 @@ { SECStatus status; FILE *fp; - int i, c, ret, Pflag, qflag, sflag, bflag, truncate, checked; + int i, c, ret, Pflag, qflag, sflag, bflag, checked, bits; size_t n; - unsigned int u; + unsigned int u, truncate; struct hashinfo *algorithm, *default_algorithm; const char *configdir, *copt, *kopt, *Kopt, *default_key; unsigned char *ikeyval, *okeyval, *sikeyval, *sokeyval, *result; @@ -581,11 +590,11 @@ u < sizeof(known_algorithms) / sizeof(known_algorithms[0]); u++) { - c = strlen(known_algorithms[u].hash); - if (strlen(cmd) > c) { + n = strlen(known_algorithms[u].hash); + if (strlen(cmd) > n) { const char *p; if (strcasecmp(known_algorithms[u].hash, - cmd + strlen(cmd) - c) == 0) { + cmd + strlen(cmd) - n) == 0) { default_algorithm = &known_algorithms[u]; algorithm = default_algorithm; break; @@ -594,7 +603,7 @@ if (p != NULL) { p++; if (strncasecmp(known_algorithms[u].hash, - p, c) == 0) { + p, n) == 0) { default_algorithm = &known_algorithms[u]; algorithm = default_algorithm; break; @@ -742,13 +751,15 @@ /* Initialize NSS. */ status = NSS_NoDB_Init(configdir); if (status != SECSuccess) { - fprintf(stderr, "Error initializing NSS.\n"); + fprintf(stderr, "Error initializing NSS: %s.\n", + PR_ErrorToName(PORT_GetError())); exit(status); } #ifndef NON_FIPS status = enable_fips(); if (status != SECSuccess) { - fprintf(stderr, "Error ensuring FIPS mode.\n"); + fprintf(stderr, "Error ensuring FIPS mode: %s.\n", + PR_ErrorToName(PORT_GetError())); NSS_Shutdown(); exit(status); } @@ -815,7 +826,8 @@ status = prepare_key(default_key, default_algorithm->tag, sikeyval, default_algorithm->blocksize); if (status != SECSuccess) { - fprintf(stderr, "Error processing default HMAC key.\n"); + fprintf(stderr, "Error processing default HMAC key: %s.\n", + PR_ErrorToName(PORT_GetError())); NSS_Shutdown(); exit(status); } @@ -988,22 +1000,20 @@ } /* Isolate the expected value and the path. */ filename = expected + strcspn(expected, " \t"); - if ((filename - expected) != - (truncate ? - howmany(truncate, 4) : - (algorithm->digestsize * 2))) { + bits = truncate ? + howmany(truncate, 4) : + (algorithm->digestsize * 2); + if ((filename - expected) != bits) { /* Not a value we'd produce. */ filename += strspn(filename, " \t"); filename[strcspn(filename, "\r\n")] = '\0'; fprintf(stderr, "%s: FAILED\n" " value to be checked was the" - " wrong size (read %d chars," + " wrong size (read %lu chars," " expected %d chars)\n", filename, - strcspn(expected, " \t"), - truncate ? - howmany(truncate, 4) : - (algorithm->digestsize * 2)); + (unsigned long) strcspn(expected, " \t"), + bits); ret = -1; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hmaccalc-0.9.13/test/Makefile.in new/hmaccalc-0.9.14/test/Makefile.in --- old/hmaccalc-0.9.13/test/Makefile.in 2013-10-14 20:35:44.000000000 +0200 +++ new/hmaccalc-0.9.14/test/Makefile.in 2014-11-11 20:16:27.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -346,14 +346,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
