Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2022-03-22 19:39:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arpwatch" Tue Mar 22 19:39:57 2022 rev:38 rq:963843 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes 2022-01-11 21:24:12.629167343 +0100 +++ /work/SRC/openSUSE:Factory/.arpwatch.new.25692/arpwatch.changes 2022-03-22 19:40:00.499077833 +0100 @@ -1,0 +2,8 @@ +Mon Mar 21 07:52:56 UTC 2022 - Dirk M??ller <[email protected]> + +- update to 3.2: + - Change update-ethercodes to not clobber ethercodes.dat on failure. + - Add a configure option to specify the path to sendmail +- use https, its 2022 after all + +------------------------------------------------------------------- Old: ---- arpwatch-3.1.tar.gz New: ---- arpwatch-3.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch.spec ++++++ --- /var/tmp/diff_new_pack.XnUMXv/_old 2022-03-22 19:40:00.975078332 +0100 +++ /var/tmp/diff_new_pack.XnUMXv/_new 2022-03-22 19:40:00.979078336 +0100 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,13 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: arpwatch -Version: 3.1 +Version: 3.2 Release: 0 Summary: Tool to keep track of Ethernet<->IP address pairings License: BSD-3-Clause Group: Productivity/Networking/Diagnostic -URL: http://www-nrg.ee.lbl.gov/nrg.html -Source: %{name}-%{version}.tar.gz +URL: https://ee.lbl.gov/nrg.html +Source: https://ee.lbl.gov/downloads/arpwatch/%{name}-%{version}.tar.gz Source10: [email protected] Source11: sysconfig.arpwatch Source12: arpwatch.service ++++++ arpwatch-3.1.tar.gz -> arpwatch-3.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arpwatch-3.1/CHANGES new/arpwatch-3.2/CHANGES --- old/arpwatch-3.1/CHANGES 2020-04-06 02:35:37.000000000 +0200 +++ new/arpwatch-3.2/CHANGES 2021-12-15 23:11:07.000000000 +0100 @@ -1,9 +1,15 @@ -@(#) $Id: CHANGES 1526 2020-04-06 00:35:37Z leres $ (LBL) +@(#) $Id: CHANGES 1532 2021-12-15 22:11:07Z leres $ (LBL) + +v3.2 Wed Dec 15 14:08:29 PST 2021 + +- Change update-ethercodes to not clobber ethercodes.dat on failure. + +- Add a configure option to specify the path to sendmail v3.1 Sun Apr 5 16:57:02 PDT 2020 - Fix the FreeBSD rc.d script to handle interface names with . in - them. Reported by Daniel Duerr. + them. Reported by Daniel Duerr. - Add python 2 compatibility to massagevendor (for pfsense <= 2.4.4). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arpwatch-3.1/VERSION new/arpwatch-3.2/VERSION --- old/arpwatch-3.1/VERSION 2020-04-06 02:32:04.000000000 +0200 +++ new/arpwatch-3.2/VERSION 2021-12-15 22:52:17.000000000 +0100 @@ -1 +1 @@ -3.1 +3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arpwatch-3.1/arpwatch.8.in new/arpwatch-3.2/arpwatch.8.in --- old/arpwatch-3.1/arpwatch.8.in 2019-12-01 20:01:07.000000000 +0100 +++ new/arpwatch-3.2/arpwatch.8.in 2021-12-15 01:47:54.000000000 +0100 @@ -1,6 +1,6 @@ -.\" @(#) $Id: arpwatch.8.in 1508 2019-12-01 19:01:07Z leres $ (LBL) +.\" @(#) $Id: arpwatch.8.in 1529 2021-12-15 00:47:54Z leres $ (LBL) .\" -.\" Copyright (c) 1992, 1994, 1996, 1997, 2000, 2009, 2012, 2013, 2016, 2019 +.\" Copyright (c) 1992, 1994, 1996, 1997, 2000, 2009, 2012, 2013, 2016, 2019, 2020 .\" The Regents of the University of California. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd 1 December 2019 +.Dd 26 October 2021 .Dt ARPWATCH 8 .Sh NAME .Nm arpwatch @@ -52,6 +52,15 @@ .Xr pcap 3 to listen for arp packets on a local ethernet interface. .Pp +.Ar arp.dat +contains three or four fields. First is the ethernet mac address, +second is the IPv4 address, and third is the time expressed in +seconds since midnight, January 1, 1970. The optional forth field +is the short hostname derrived from PTR record of the ip address +when a mac/ip pair is first seen; it is never updated and was +intended to be a breadcrumb to determine the origin of a mac/ip +pair. +.Pp The .Fl C flag@MANCFLAG@ uses compact padded ethernet addresses in @@ -137,7 +146,7 @@ The .Fl v flag disables the reporting of VRRP/CARP ethernet prefixes as -described in RFC5798 (00:00:5e:00:01:xx). +described in RFC5798 (@MACZERO@0:@MACZERO@0:5e:@MACZERO@0:@MACZERO@1:xx). .Pp The .Fl w diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arpwatch-3.1/configure new/arpwatch-3.2/configure --- old/arpwatch-3.1/configure 2020-04-06 02:22:04.000000000 +0200 +++ new/arpwatch-3.2/configure 2021-12-15 23:09:53.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh -# From configure.in @(#) Id: configure.in 1510 2019-12-01 22:34:03Z leres (LBL). +# From configure.in @(#) Id: configure.in 1530 2021-12-15 00:50:13Z leres (LBL). # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # -# Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009, 2010, 2011, 2013, 2016, 2017, 2019, 2020 +# Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009, 2010, 2011, 2013, 2016, 2017, 2019, 2020, 2021 # The Regents of the University of California. All rights reserved. # # @@ -632,6 +632,7 @@ V_CCOPT MANZFLAG MANCFLAG +MACZERO LBL_LIBS HAVE_FREEBSD_TRUE HAVE_FREEBSD_FALSE @@ -709,6 +710,7 @@ with_gcc enable_largefile enable_zeropad +with_sendmail enable_debug with_watcher with_watchee @@ -1343,6 +1345,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-gcc don't use gcc + --with-sendmail=path path to sendmail --with-watcher=email email address to send reports to --with-watchee=email email address reports come from @@ -1429,7 +1432,7 @@ This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009, 2010, 2011, 2013, 2016, 2017, 2019, 2020 +Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009, 2010, 2011, 2013, 2016, 2017, 2019, 2020, 2021 The Regents of the University of California. All rights reserved. _ACEOF exit @@ -4680,13 +4683,16 @@ $as_echo "#define ZEROPAD 1" >>confdefs.h MANZFLAG=" (default)" + MACZERO=0 ZEROPAD=1 else $as_echo "#define MANCFLAG (default)" >>confdefs.h $as_echo "#define ZEROPAD 0" >>confdefs.h - MANCFLAG=" (default)" + $as_echo "#define MACZERO 0" >>confdefs.h + + MACZERO= ZEROPAD=0 fi @@ -5573,7 +5579,18 @@ done -# Extract the first word of "sendmail", so it can be a program name with args. + +# Check whether --with-sendmail was given. +if test "${with_sendmail+set}" = set; then : + withval=$with_sendmail; +fi + +if test -n "${with_sendmail}"; then + V_SENDMAIL=${with_sendmail} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: sendmail hardwired to ${V_SENDMAIL}" >&5 +$as_echo "sendmail hardwired to ${V_SENDMAIL}" >&6; } +else + # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -5615,8 +5632,9 @@ -if test -z "${V_SENDMAIL}" ; then - as_fn_error $? "Can't find sendmail" "$LINENO" 5 + if test -z "${V_SENDMAIL}" ; then + as_fn_error $? "Can't find sendmail" "$LINENO" 5 + fi fi @@ -5944,6 +5962,7 @@ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arpwatch-3.1/configure.in new/arpwatch-3.2/configure.in --- old/arpwatch-3.1/configure.in 2020-04-06 02:35:37.000000000 +0200 +++ new/arpwatch-3.2/configure.in 2021-12-15 23:11:07.000000000 +0100 @@ -1,6 +1,6 @@ -AC_REVISION([@(#) $Id: configure.in 1526 2020-04-06 00:35:37Z leres $ (LBL)]) +AC_REVISION([@(#) $Id: configure.in 1532 2021-12-15 22:11:07Z leres $ (LBL)]) dnl -AC_COPYRIGHT([Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009, 2010, 2011, 2013, 2016, 2017, 2019, 2020 +AC_COPYRIGHT([Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009, 2010, 2011, 2013, 2016, 2017, 2019, 2020, 2021 The Regents of the University of California. All rights reserved.]) dnl dnl Process this file with autoconf to produce a configure script. @@ -59,11 +59,13 @@ AC_DEFINE(MANZFLAG,[ (default)]) AC_DEFINE(ZEROPAD) MANZFLAG=" (default)" + MACZERO=0 ZEROPAD=1 else AC_DEFINE(MANCFLAG,[ (default)]) AC_DEFINE(ZEROPAD,0) - MANCFLAG=" (default)" + AC_DEFINE(MACZERO,0) + MACZERO= ZEROPAD=0 fi @@ -76,11 +78,19 @@ AC_CHECK_LIB(resolv, res_query) AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) -AC_PATH_PROG(V_SENDMAIL, sendmail,, - $PATH:/usr/sbin:/usr/lib:/usr/bin:/usr/ucblib:/usr/local/etc) +AC_ARG_WITH(sendmail, + AS_HELP_STRING([--with-sendmail=path], + [path to sendmail])) +if test -n "${with_sendmail}"; then + V_SENDMAIL=${with_sendmail} + AC_MSG_RESULT(sendmail hardwired to ${V_SENDMAIL}) +else + AC_PATH_PROG(V_SENDMAIL, sendmail,, + $PATH:/usr/sbin:/usr/lib:/usr/bin:/usr/ucblib:/usr/local/etc) -if test -z "${V_SENDMAIL}" ; then - AC_MSG_ERROR([Can't find sendmail]) + if test -z "${V_SENDMAIL}" ; then + AC_MSG_ERROR([Can't find sendmail]) + fi fi dnl AC_LBL_CHECK_TYPE(int32_t, int) @@ -226,6 +236,7 @@ AC_SUBST([HAVE_FREEBSD_TRUE]) AC_SUBST([LBL_LIBS]) AC_SUBST([LDFLAGS]) +AC_SUBST([MACZERO]) AC_SUBST([MANCFLAG]) AC_SUBST([MANZFLAG]) AC_SUBST([V_CCOPT]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arpwatch-3.1/report.c new/arpwatch-3.2/report.c --- old/arpwatch-3.1/report.c 2019-11-30 19:39:08.000000000 +0100 +++ new/arpwatch-3.2/report.c 2021-12-15 23:11:07.000000000 +0100 @@ -27,7 +27,7 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Id: report.c 1506 2019-11-30 18:39:08Z leres $ (LBL)"; + "@(#) $Id: report.c 1532 2021-12-15 22:11:07Z leres $ (LBL)"; #endif /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arpwatch-3.1/update-ethercodes.sh.in new/arpwatch-3.2/update-ethercodes.sh.in --- old/arpwatch-3.1/update-ethercodes.sh.in 2020-04-06 02:35:37.000000000 +0200 +++ new/arpwatch-3.2/update-ethercodes.sh.in 2021-12-15 01:47:54.000000000 +0100 @@ -1,12 +1,18 @@ #!/bin/sh -# @(#) $Id: update-ethercodes.sh.in 1526 2020-04-06 00:35:37Z leres $ (LBL) +# @(#) $Id: update-ethercodes.sh.in 1529 2021-12-15 00:47:54Z leres $ (LBL) # # Generate ethercodes.dat # +prog="`basename $0`" + PATH=/usr/local/bin:${PATH} export PATH +t1=/tmp/${prog}.1.$$ + +trap 'rm -f ${t1}; exit 1' 1 2 3 15 EXIT + if [ ! -f arp.dat ]; then cd /usr/local/arpwatch || exit 1 fi @@ -22,14 +28,17 @@ fn2=massagevendor.py if [ -x ${fn2} ]; then - cmd2="@PYTHON@ ${fn2}" + # XXX + ## cmd2="@PYTHON@ ${fn2}" + cmd2="/usr/local/bin/python ${fn2}" else cmd2=./massagevendor fi # Emit exit status of first command in pipe # https://unix.stackexchange.com/a/70675 -((((${cmd1}; echo $? >&3) | ${cmd2} >&4) 3>&1) | (read xs; exit ${xs})) 4> ${fn} +((((${cmd1}; echo $? >&3) | ${cmd2} >&4) 3>&1) | (read xs; exit ${xs})) 4> ${t1} if [ $? -ne 0 ]; then - rm -f ${fn} + rm -f ${t1} fi +mv ${t1} ${fn}
