Hello community, here is the log from the commit of package tnef for openSUSE:Factory checked in at 2014-05-13 20:48:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tnef (Old) and /work/SRC/openSUSE:Factory/.tnef.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tnef" Changes: -------- --- /work/SRC/openSUSE:Factory/tnef/tnef.changes 2012-03-13 00:46:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tnef.new/tnef.changes 2014-05-13 20:48:45.000000000 +0200 @@ -1,0 +2,7 @@ +Sun May 4 23:08:07 UTC 2014 - asterios.dra...@gmail.com + +- Update to 1.4.10: + * Incorporating documentation patch from bentley. + * Fixing small problems from new versions of automake/gcc. + +------------------------------------------------------------------- Old: ---- tnef-1.4.9.tar.gz New: ---- tnef-1.4.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tnef.spec ++++++ --- /var/tmp/diff_new_pack.W8lTgM/_old 2014-05-13 20:48:46.000000000 +0200 +++ /var/tmp/diff_new_pack.W8lTgM/_new 2014-05-13 20:48:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tnef # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,7 +17,7 @@ Name: tnef -Version: 1.4.9 +Version: 1.4.10 Release: 0 Summary: Uncompress MS-TNEF Archives License: GPL-2.0+ @@ -39,7 +39,7 @@ make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %files %defattr(-,root,root,-) ++++++ tnef-1.4.9.tar.gz -> tnef-1.4.10.tar.gz ++++++ ++++ 7532 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/tnef-1.4.9/ChangeLog new/tnef-1.4.10/ChangeLog --- old/tnef-1.4.9/ChangeLog 2012-03-01 02:09:55.000000000 +0100 +++ new/tnef-1.4.10/ChangeLog 2013-11-05 05:17:34.000000000 +0100 @@ -1,3 +1,21 @@ +2013-11-04 verdammelt <verdamm...@gmail.com> + * src/tnef.c: + free_bodies needs to be defined bofore use - C99 + * .gitignore: + new testing script from automake generates *.log and *.trs files + which need to be ignored. + * compile, test-driver: + adding these missing automake files. + +2013-10-22 Anthony J. Bently <anth...@cathet.us> + * doc/tnef.1.in: + - Remove some redundant macros (empty paragraphs, etc) + - Properly format the title + - Correct the "-*- nroff -*-" line (was a mistyped comment) + - Fix formatting issues with .IR + - Start new sentences on a new line. (This is a standard so that + troff formats inter-sentences properly.) + 2012-02-29 Engelke Eschner <te...@gmx.li> * src/file.c, src/main.c, src/mapi_attr.c, src/tnef.c Free more memory 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/tnef-1.4.9/NEWS new/tnef-1.4.10/NEWS --- old/tnef-1.4.9/NEWS 2012-03-01 02:13:40.000000000 +0100 +++ new/tnef-1.4.10/NEWS 2013-11-05 05:13:00.000000000 +0100 @@ -1,7 +1,10 @@ TNEF NEWS -- history of user-visible changes. 18 April 2011 Copyright (C) 2000-2011 by Mark Simpson -2012-02-29 Engelke Eschner <te...@gmx.li> +* 1.4.10 [4 November 2013] +** Incorporating documentation patch from bentley (github) +** Fixing small problems from new versions of automake/gcc + * 1.4.9 [29 February 2012] ** Incorporating patches from Engelke Eschner <te...@gmx.li> *** (from github: https://github.com/verdammelt/tnef/pull/1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tnef-1.4.9/compile new/tnef-1.4.10/compile --- old/tnef-1.4.9/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/tnef-1.4.10/compile 2013-11-05 05:17:55.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 <tro...@cygnus.com>. +# +# 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 <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +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 <bug-autom...@gnu.org>. +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/tnef-1.4.9/configure.in new/tnef-1.4.10/configure.in --- old/tnef-1.4.9/configure.in 2012-03-01 02:14:13.000000000 +0100 +++ new/tnef-1.4.10/configure.in 2013-11-05 05:20:43.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([tnef],[1.4.9],[verdamm...@users.sourceforge.net]) +AC_INIT([tnef],[1.4.10],[verdamm...@users.sourceforge.net]) AC_CONFIG_SRCDIR([src/tnef.c]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER([src/config.h]) 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/tnef-1.4.9/doc/tnef.1.in new/tnef-1.4.10/doc/tnef.1.in --- old/tnef-1.4.9/doc/tnef.1.in 2011-04-19 03:24:23.000000000 +0200 +++ new/tnef-1.4.10/doc/tnef.1.in 2013-11-05 05:04:53.000000000 +0100 @@ -1,4 +1,5 @@ -.TH TNEF 1 "TNEF MIME Decoder" "Filter" \" -*- nroff -*- +.\" -*- nroff -*- +.TH TNEF 1 .SH NAME .nf \" fill off tnef \- decode Microsoft's Transport Neutral Encapsulation Format @@ -17,16 +18,16 @@ Encapsulation Format (hereafter, TNEF), which "wraps" Microsoft e-mail attachments. .PP -.IR Unfortunately "," these "wrapped" attachments are inaccessible to +Unfortunately, these "wrapped" attachments are inaccessible to any e-mail client that does not understand TNEF. -.IR Fortunately "," -the +Fortunately, the .B tnef filter can be used by any MIME-aware client to unpack these attachments. .SH OPTIONS .TP \fB\-f\fP FILE, \fB\-\-file\fP=FILE -use FILE as input ('-' denotes stdin). When this option is omitted, +use FILE as input ('-' denotes stdin). +When this option is omitted, .B tnef reads data from stdin. .TP @@ -55,27 +56,34 @@ ignored by default. .TP \fB\-\-save\-body FILE\fP -Save message body data found in the TNEF data. There can be up to +Save message body data found in the TNEF data. +There can be up to three message bodies in the file, plain text, HTML encoded, and RTF -encoded. Which are saved is specified by the \-\-body-pref option. +encoded. +Which are saved is specified by the \-\-body-pref option. By default the message bodies are written to a file named message with an extension based upon the type (txt, html, rtf). .TP \fB\-\-body\-pref PREF\fP Specifies which of the possibly three message body formats will be -saved. PREF can be up to three characters long and each character -must be one of 'r', 'h', or 't' specifying RTF, HTML or text. The +saved. +PREF can be up to three characters long and each character +must be one of 'r', 'h', or 't' specifying RTF, HTML or text. +The order is the order that the data will be checked, the first type found -will be saved. If PREF is the special value of 'all' then any and all -message body data found will be saved. The default is 'rht'. +will be saved. +If PREF is the special value of 'all' then any and all +message body data found will be saved. +The default is 'rht'. .TP \fB\-\-save-rtf FILE\fP -DEPRECATED. Equivalent to \-\-save-body=FILE \-\-body-pref=r +DEPRECATED. +Equivalent to \-\-save-body=FILE \-\-body-pref=r .TP -\fB\-h, \-\-help\fP +\fB\-h, \-\-help\fP show usage message. .TP -\fB\-V, \-\-version\fP +\fB\-V, \-\-version\fP display version and copyright. .TP \fB\-v, \-\-verbose\fP @@ -88,12 +96,12 @@ .B tnef usage with a popular Unix mail client called "mutt". .nf -.SS "Step 1 \-\- Configure ~/.mailcap" -.fi +.SS "Step 1 \(em Configure ~/.mailcap" Mutt can't use .B tnef for its intended purpose until an appropriate content type definition -exists in ~/.mailcap . Here's a sample definition: +exists in ~/.mailcap . +Here's a sample definition: .PP .RS application/ms\-tnef; tnef \-w %s @@ -105,7 +113,7 @@ application/ms\-tnef .RE .PP -is encountered, use this command to decode it: +is encountered, use this command to decode it: .PP .RS tnef \-w %s @@ -116,16 +124,15 @@ specifying both the \fB\-w\fP option and the attachment (created as a temporary file) as command line arguments. .nf -.SS "Step 2 \-\- Add The Filter To $PATH" -.fi +.SS "Step 2 \(em Add The Filter To $PATH" Mutt can't invoke .B tnef if the filter isn't accessible via $PATH. .nf -.SS "Step 3 \-\- Test Mutt" -.fi -Use mutt to read a message that includes a TNEF attachment. Mutt will +.SS "Step 3 \(em Test Mutt" +Use mutt to read a message that includes a TNEF attachment. +Mutt will note that an attachment of type "application/ms\-tnef is unsupported". .PP Press the "v" key to open mutt's "view attachment" menu. @@ -140,20 +147,19 @@ then decodes all file(s) included in the TNEF attachment, prompting for confirmation prior to creating an individual file (refer to .B \-w -option above). +option above). .B \-w is useful here because it gives the end user a chance to view the filename(s) included in the mail message. .PP Note that Mutt's attachment menu also supports a pipe option, which permits -the user to pipe attachments to an external filter (how convenient). +the user to pipe attachments to an external filter (how convenient). So, to list the contents of a TNEF attachment prior to decoding it, press the "|" key and enter this command: .PP .RS tnef \-t .RE -.PP .SH "SEE ALSO" .BR metamail (1), .BR mailcap (4), @@ -162,7 +168,7 @@ .SH "AUTHOR" Mark Simpson. .SH "REPORTING BUGS" -Report bugs to +Report bugs to .nh \"no hyphenation Mark Simpson <@PACKAGE_BUGREPORT@> .hy 1 \"enable hyphenation @@ -176,8 +182,4 @@ .fi .PP describes how to configure Microsoft email clients so that the TNEF format -is disabled when sending messages -to non-TNEF-compatible clients. - - - +is disabled when sending messages to non-TNEF-compatible clients. 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/tnef-1.4.9/src/tnef.c new/tnef-1.4.10/src/tnef.c --- old/tnef-1.4.9/src/tnef.c 2012-03-01 00:46:07.000000000 +0100 +++ new/tnef-1.4.10/src/tnef.c 2013-11-05 05:10:13.000000000 +0100 @@ -74,6 +74,16 @@ return attr; } +static void +free_bodies(VarLenData **bodies, int len) +{ + while (len--) + { + XFREE(bodies[len]->data); + XFREE(bodies[len]); + } +} + static File** get_body_files (const char* filename, const char pref, @@ -386,11 +396,3 @@ return 0; } -void free_bodies(VarLenData **bodies, int len) -{ - while (len--) - { - XFREE(bodies[len]->data); - XFREE(bodies[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/tnef-1.4.9/test-driver new/tnef-1.4.10/test-driver --- old/tnef-1.4.9/test-driver 1970-01-01 01:00:00.000000000 +0100 +++ new/tnef-1.4.10/test-driver 2013-11-05 05:17:56.000000000 +0100 @@ -0,0 +1,127 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2012-06-27.10; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# 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 <bug-autom...@gnu.org> or send patches to +# <automake-patc...@gnu.org>. + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <<END +Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT +The '--test-name', '--log-file' and '--trs-file' options are mandatory. +END +} + +# TODO: better error handling in option parsing (in particular, ensure +# TODO: $log_file, $trs_file and $test_name are defined). +test_name= # Used for reporting. +log_file= # Where to save the output of the test script. +trs_file= # Where to save the metadata of the test run. +expect_failure=no +color_tests=no +enable_hard_errors=yes +while test $# -gt 0; do + case $1 in + --help) print_usage; exit $?;; + --version) echo "test-driver $scriptversion"; exit $?;; + --test-name) test_name=$2; shift;; + --log-file) log_file=$2; shift;; + --trs-file) trs_file=$2; shift;; + --color-tests) color_tests=$2; shift;; + --expect-failure) expect_failure=$2; shift;; + --enable-hard-errors) enable_hard_errors=$2; shift;; + --) shift; break;; + -*) usage_error "invalid option: '$1'";; + esac + shift +done + +if test $color_tests = yes; then + # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + red='[0;31m' # Red. + grn='[0;32m' # Green. + lgn='[1;32m' # Light green. + blu='[1;34m' # Blue. + mgn='[0;35m' # Magenta. + std='[m' # No color. +else + red= grn= lgn= blu= mgn= std= +fi + +do_exit='rm -f $log_file $trs_file; (exit $st); exit $st' +trap "st=129; $do_exit" 1 +trap "st=130; $do_exit" 2 +trap "st=141; $do_exit" 13 +trap "st=143; $do_exit" 15 + +# Test script is run here. +"$@" >$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# 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/tnef-1.4.9/tests/cmdline/version.baseline new/tnef-1.4.10/tests/cmdline/version.baseline --- old/tnef-1.4.9/tests/cmdline/version.baseline 2012-03-01 02:18:05.000000000 +0100 +++ new/tnef-1.4.10/tests/cmdline/version.baseline 2013-11-05 05:21:41.000000000 +0100 @@ -1,5 +1,5 @@ ./../../src/tnef --version -tnef 1.4.9 +tnef 1.4.10 Copyright (C) 1999-2011 by Mark Simpson Copyright (C) 1997 by Thomas Boll (original code) tnef comes with ABSOLUTELY NO WARRANTY. @@ -8,7 +8,7 @@ named COPYING. ./../../src/tnef -V -tnef 1.4.9 +tnef 1.4.10 Copyright (C) 1999-2011 by Mark Simpson Copyright (C) 1997 by Thomas Boll (original code) tnef comes with ABSOLUTELY NO WARRANTY. -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org