Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arping2 for openSUSE:Factory checked in at 2021-07-17 23:36:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arping2 (Old) and /work/SRC/openSUSE:Factory/.arping2.new.2632 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arping2" Sat Jul 17 23:36:46 2021 rev:21 rq:906793 version:2.22 Changes: -------- --- /work/SRC/openSUSE:Factory/arping2/arping2.changes 2020-08-02 12:21:10.243413031 +0200 +++ /work/SRC/openSUSE:Factory/.arping2.new.2632/arping2.changes 2021-07-17 23:37:24.653612576 +0200 @@ -1,0 +2,7 @@ +Sat Jul 10 08:03:31 UTC 2021 - Jan Engelhardt <[email protected]> + +- Update to release 2.22 + * Build system updates only; no user-related changes. +- Drop arping-setgroups.diff (merged) + +------------------------------------------------------------------- Old: ---- arping-2.21.tar.gz arping-2.21.tar.gz.asc arping-setgroups.diff New: ---- arping-2.22.tar.gz arping-2.22.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arping2.spec ++++++ --- /var/tmp/diff_new_pack.1yQMJ8/_old 2021-07-17 23:37:25.053609492 +0200 +++ /var/tmp/diff_new_pack.1yQMJ8/_new 2021-07-17 23:37:25.057609461 +0200 @@ -1,7 +1,7 @@ # # spec file for package arping2 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,16 @@ Name: arping2 -Version: 2.21 +Version: 2.22 Release: 0 Summary: Layer-2 Ethernet pinger License: GPL-2.0-or-later Group: Productivity/Networking/Diagnostic URL: http://www.habets.pp.se/synscan/programs.php?prog=arping #Git-Clone: git://github.com/ThomasHabets/arping -Source0: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz -Source1: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz.asc -Source2: %name.keyring -Patch1: arping-setgroups.diff +Source: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz +Source2: http://www.habets.pp.se/synscan/files/arping-%version.tar.gz.asc +Source3: %name.keyring BuildRequires: libnet-devel BuildRequires: libpcap-devel @@ -37,7 +36,7 @@ unrouted networks and with ICMP-blocking hosts. %prep -%autosetup -n arping-%version -p1 +%autosetup -n arping-%version %build %configure ++++++ arping-2.21.tar.gz -> arping-2.22.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/.gitignore new/arping-2.22/.gitignore --- old/arping-2.21/.gitignore 2020-03-08 15:23:37.000000000 +0100 +++ new/arping-2.22/.gitignore 2021-06-27 23:28:21.000000000 +0200 @@ -1,2 +1,27 @@ *~ *.o +Makefile +Makefile.in +aclocal.m4 +autom4te.cache/ +compile +compile_commands.json +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +doc/Makefile +doc/Makefile.in +install-sh +missing +src/.deps/ +src/Makefile +src/Makefile.in +src/arping +src/fuzz_pingip +stamp-h1 +test-driver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/Makefile.am new/arping-2.22/Makefile.am --- old/arping-2.21/Makefile.am 2020-03-08 15:23:37.000000000 +0100 +++ new/arping-2.22/Makefile.am 2021-06-27 23:28:21.000000000 +0200 @@ -4,6 +4,9 @@ SUBDIRS=src doc +lsp: + ~/.local/bin/intercept-build make + tarball: ./extra/mktarball latest @@ -11,3 +14,5 @@ rm -f aclocal.m4 configure.scan depcomp missing install-sh config.h.in rm -f Makefile.in configure autoscan*.log config.guess config.sub rm -f ltmain.sh configure.in src/Makefile.in doc/Makefile.in + rm -f compile_commands.json test-driver compile + rm -fr .cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/Makefile.in new/arping-2.22/Makefile.in --- old/arping-2.21/Makefile.in 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/Makefile.in 2021-06-27 23:28:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -136,8 +136,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -555,6 +555,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -597,6 +601,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -774,7 +780,7 @@ am--refresh check check-am clean clean-cscope clean-generic \ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-zstd distcheck distclean distclean-generic distclean-hdr \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ @@ -789,6 +795,9 @@ .PRECIOUS: Makefile +lsp: + ~/.local/bin/intercept-build make + tarball: ./extra/mktarball latest @@ -796,6 +805,8 @@ rm -f aclocal.m4 configure.scan depcomp missing install-sh config.h.in rm -f Makefile.in configure autoscan*.log config.guess config.sub rm -f ltmain.sh configure.in src/Makefile.in doc/Makefile.in + rm -f compile_commands.json test-driver compile + rm -fr .cache # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/aclocal.m4 new/arping-2.22/aclocal.m4 --- old/arping-2.21/aclocal.m4 2020-03-08 15:23:38.000000000 +0100 +++ new/arping-2.22/aclocal.m4 2021-06-27 23:28:22.000000000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ [am__api_version='1.16' 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.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # 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.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -371,7 +371,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -398,7 +400,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -595,7 +597,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -616,7 +618,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -638,7 +640,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -673,7 +675,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -716,7 +718,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -755,7 +757,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -784,7 +786,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -831,7 +833,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -850,7 +852,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -931,7 +933,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -991,7 +993,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1019,7 +1021,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1038,7 +1040,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/compile new/arping-2.22/compile --- old/arping-2.21/compile 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/compile 2021-06-27 23:28:23.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/configure new/arping-2.22/configure --- old/arping-2.21/configure 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/configure 2021-06-27 23:28:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for arping 2.21. +# Generated by GNU Autoconf 2.69 for arping 2.22. # # Report bugs to <[email protected]>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='arping' PACKAGE_TARNAME='arping' -PACKAGE_VERSION='2.21' -PACKAGE_STRING='arping 2.21' +PACKAGE_VERSION='2.22' +PACKAGE_STRING='arping 2.22' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1297,7 +1297,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 arping 2.21 to adapt to many kinds of systems. +\`configure' configures arping 2.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1369,7 +1369,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of arping 2.21:";; + short | recursive ) echo "Configuration of arping 2.22:";; esac cat <<\_ACEOF @@ -1465,7 +1465,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -arping configure 2.21 +arping configure 2.22 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1934,7 +1934,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by arping $as_me 2.21, which was +It was created by arping $as_me 2.22, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2909,7 +2909,7 @@ # Define the identity of the package. PACKAGE='arping' - VERSION='2.21' + VERSION='2.22' cat >>confdefs.h <<_ACEOF @@ -6038,7 +6038,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by arping $as_me 2.21, which was +This file was extended by arping $as_me 2.22, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6104,7 +6104,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -arping config.status 2.21 +arping config.status 2.22 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -6915,7 +6915,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/configure.ac new/arping-2.22/configure.ac --- old/arping-2.21/configure.ac 2020-03-08 15:23:37.000000000 +0100 +++ new/arping-2.22/configure.ac 2021-06-27 23:28:21.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(arping, 2.21, [email protected]) +AC_INIT(arping, 2.22, [email protected]) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([src/arping.c]) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/depcomp new/arping-2.22/depcomp --- old/arping-2.21/depcomp 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/depcomp 2021-06-27 23:28:23.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/doc/Makefile.in new/arping-2.22/doc/Makefile.in --- old/arping-2.21/doc/Makefile.in 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/doc/Makefile.in 2021-06-27 23:28:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/install-sh new/arping-2.22/install-sh --- old/arping-2.21/install-sh 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/install-sh 2021-06-27 23:28:23.000000000 +0200 @@ -451,7 +451,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/missing new/arping-2.22/missing --- old/arping-2.21/missing 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/missing 2021-06-27 23:28:23.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/src/Makefile.in new/arping-2.22/src/Makefile.in --- old/arping-2.21/src/Makefile.in 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/src/Makefile.in 2021-06-27 23:28:23.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/src/arping.c new/arping-2.22/src/arping.c --- old/arping-2.21/src/arping.c 2020-03-08 15:23:37.000000000 +0100 +++ new/arping-2.22/src/arping.c 2021-06-27 23:28:21.000000000 +0200 @@ -35,8 +35,10 @@ #include "config.h" #endif +#include <errno.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <limits.h> #include <math.h> #include <poll.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/src/arping_test.c new/arping-2.22/src/arping_test.c --- old/arping-2.21/src/arping_test.c 2020-03-08 15:23:37.000000000 +0100 +++ new/arping-2.22/src/arping_test.c 2021-06-27 23:28:21.000000000 +0200 @@ -40,35 +40,10 @@ extern int mock_libnet_lo_ok; extern int mock_libnet_null_ok; -struct registered_test { - void* fn; - const char* name; -}; - -static int numtests = 0; -static struct registered_test test_registry[1024]; - -static int num_exit_tests = 0; -static struct registered_test test_exit_registry[1024]; - int get_mac_addr(const char *in, char *out); void strip_newline(char* s); -#define MYTEST(a) static void a(int);__attribute__((constructor)) \ -static void cons_##a() { \ - test_registry[numtests].fn = a; \ - test_registry[numtests].name = #a; \ - numtests++; \ -} START_TEST(a) - -#define MY_EXIT_TEST(a) static void a(int);__attribute__((constructor)) \ -static void cons_##a() { \ - test_exit_registry[num_exit_tests].fn = a; \ - test_exit_registry[num_exit_tests].name = #a; \ - num_exit_tests++; \ -} START_TEST(a) - /** * */ @@ -236,7 +211,7 @@ fprintf(stderr, "\n"); } -MYTEST(test_mkpacket) +START_TEST(test_mkpacket) { uint8_t correct_packet[] = { 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, @@ -261,7 +236,7 @@ // Received uninteresting packet, should not record anything. -MYTEST(pingip_uninteresting_packet) +START_TEST(pingip_uninteresting_packet) { struct pcap_pkthdr pkthdr; uint8_t* packet; @@ -389,7 +364,7 @@ } END_TEST // Received reply that actually matches. Things should happen. -MYTEST(pingip_interesting_packet) +START_TEST(pingip_interesting_packet) { struct pcap_pkthdr pkthdr; extern uint8_t srcmac[ETH_ALEN]; @@ -449,7 +424,7 @@ "numrecvd not incremented second time"); } END_TEST -MYTEST(strip_newline_test) +START_TEST(strip_newline_test) { const char *tests[][2] = { {"", ""}, @@ -469,7 +444,7 @@ } } END_TEST -MYTEST(get_mac_addr_success) +START_TEST(get_mac_addr_success) { const char *tests[][2] = { // Null. @@ -501,7 +476,7 @@ } } END_TEST -MYTEST(get_mac_addr_fail) +START_TEST(get_mac_addr_fail) { const char *tests[] = { "", @@ -517,7 +492,7 @@ } } END_TEST -MY_EXIT_TEST(libnet_init_bad_nolo) +START_TEST(libnet_init_bad_nolo) { // It'll only try lo if named interface fails. // So by accepting lo, we make sure it doesn't try lo. @@ -525,27 +500,28 @@ do_libnet_init("bad", 0); } END_TEST -MY_EXIT_TEST(libnet_init_null_nolo_nonull) +START_TEST(libnet_init_null_nolo_nonull) { mock_libnet_lo_ok = 0; mock_libnet_null_ok = 0; do_libnet_init(NULL, 0); } END_TEST -MYTEST(libnet_init_good) +START_TEST(libnet_init_good) { mock_libnet_lo_ok = 0; // Don't even try falling back to lo. do_libnet_init("good", 0); fail_if(libnet == NULL); } END_TEST -MYTEST(libnet_init_null_nolo) +START_TEST(libnet_init_null_nolo) { mock_libnet_lo_ok = 0; mock_libnet_null_ok = 1; do_libnet_init(NULL, 0); fail_if(libnet == NULL); -} END_TEST +} +END_TEST static Suite* arping_suite(void) @@ -553,17 +529,34 @@ int c; Suite* s = suite_create("Arping"); - //tcase_add_checked_fixture (tc_core, setup, teardown); - for (c = 0; c < numtests; c++) { - TCase *tc_core = tcase_create(test_registry[c].name); - tcase_add_test(tc_core, test_registry[c].fn); - suite_add_tcase(s, tc_core); - } - for (c = 0; c < num_exit_tests; c++) { - TCase *tc_core = tcase_create(test_exit_registry[c].name); - tcase_add_exit_test(tc_core, test_exit_registry[c].fn, 1); - suite_add_tcase(s, tc_core); - } + + TCase *tc_core; + + // libcheck broke test registries, so have to resort to code duplication. :-( + // https://github.com/libcheck/check/pull/158/files +#define SIGH_LIBCHECK(tn) \ + tc_core = tcase_create(#tn); \ + tcase_add_test(tc_core, tn); \ + suite_add_tcase(s, tc_core); + + SIGH_LIBCHECK(libnet_init_null_nolo); + SIGH_LIBCHECK(test_mkpacket); + SIGH_LIBCHECK(pingip_uninteresting_packet); + SIGH_LIBCHECK(pingip_interesting_packet); + SIGH_LIBCHECK(strip_newline_test); + SIGH_LIBCHECK(get_mac_addr_success); + SIGH_LIBCHECK(get_mac_addr_fail); + SIGH_LIBCHECK(libnet_init_good); + + +#define SIGH_LIBCHECK_EXIT(tn) \ + tc_core = tcase_create(#tn); \ + tcase_add_exit_test(tc_core, tn, 1); \ + suite_add_tcase(s, tc_core); + + SIGH_LIBCHECK_EXIT(libnet_init_bad_nolo); + SIGH_LIBCHECK_EXIT(libnet_init_null_nolo_nonull); + return s; } @@ -577,6 +570,7 @@ number_failed = srunner_ntests_failed (sr); srunner_free (sr); return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; + return 0; } /* ---- Emacs Variables ---- * Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arping-2.21/test-driver new/arping-2.22/test-driver --- old/arping-2.21/test-driver 2020-03-08 15:23:39.000000000 +0100 +++ new/arping-2.22/test-driver 2021-06-27 23:28:23.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 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
