Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package arpwatch for openSUSE:Factory
checked in at 2023-10-17 20:24:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arpwatch (Old)
and /work/SRC/openSUSE:Factory/.arpwatch.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arpwatch"
Tue Oct 17 20:24:48 2023 rev:41 rq:1118205 version:3.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes 2022-12-12
17:42:28.582055070 +0100
+++ /work/SRC/openSUSE:Factory/.arpwatch.new.20540/arpwatch.changes
2023-10-17 20:25:00.371298491 +0200
@@ -1,0 +2,7 @@
+Sun Oct 15 18:42:22 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de>
+
+- update to 3.4:
+ * build system maintenance (upgrade to autoconf 2.71)
+ * add arpwatch-3.4-include-time.patch to fix build broken by it
+
+-------------------------------------------------------------------
Old:
----
arpwatch-3.3.tar.gz
New:
----
arpwatch-3.4-include-time.patch
arpwatch-3.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arpwatch.spec ++++++
--- /var/tmp/diff_new_pack.bdZgNB/_old 2023-10-17 20:25:01.475337140 +0200
+++ /var/tmp/diff_new_pack.bdZgNB/_new 2023-10-17 20:25:01.479337280 +0200
@@ -1,7 +1,7 @@
#
# spec file for package arpwatch
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: arpwatch
-Version: 3.3
+Version: 3.4
Release: 0
Summary: Tool to keep track of Ethernet<->IP address pairings
License: BSD-3-Clause
@@ -41,6 +41,7 @@
Patch11: report-iface.patch
Patch13: arpwatch-exit.patch
Patch14: arp2ethers.patch
+Patch15: arpwatch-3.4-include-time.patch
BuildRequires: libpcap-devel
BuildRequires: postfix
BuildRequires: systemd-rpm-macros
++++++ arpwatch-3.4-include-time.patch ++++++
Index: arpwatch-3.4/report.c
===================================================================
--- arpwatch-3.4.orig/report.c
+++ arpwatch-3.4/report.c
@@ -59,9 +59,7 @@ struct rtentry;
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#ifdef TIME_WITH_SYS_TIME
#include <time.h>
-#endif
#include <unistd.h>
#include "gnuc.h"
++++++ arpwatch-3.3.tar.gz -> arpwatch-3.4.tar.gz ++++++
++++ 12736 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/arpwatch-3.3/CHANGES new/arpwatch-3.4/CHANGES
--- old/arpwatch-3.3/CHANGES 2022-03-26 21:23:50.000000000 +0100
+++ new/arpwatch-3.4/CHANGES 2023-09-05 19:50:56.000000000 +0200
@@ -1,4 +1,10 @@
-@(#) $Id: CHANGES 1534 2022-03-26 20:23:50Z leres $ (LBL)
+@(#) $Id: CHANGES 1537 2023-09-05 17:50:56Z leres $ (LBL)
+
+v3.4 Tue Sep 5 09:41:59 PDT 2023
+
+- Switch from http to https for standards-oui.ieee.org/oui/oui.csv
+
+- Upgrade to autoconf 2.71
v3.3 Sat Mar 26 13:23:28 PDT 2022
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/arpwatch-3.3/README new/arpwatch-3.4/README
--- old/arpwatch-3.3/README 2019-12-01 20:01:07.000000000 +0100
+++ new/arpwatch-3.4/README 2023-09-05 18:44:51.000000000 +0200
@@ -1,4 +1,4 @@
-@(#) $Id: README 1508 2019-12-01 19:01:07Z leres $ (LBL)
+@(#) $Id: README 1535 2023-09-05 16:44:51Z leres $ (LBL)
ARPWATCH 3.0
Lawrence Berkeley National Laboratory
@@ -25,7 +25,7 @@
a script, arpfetch, that uses snmpwalk from the Net-SNMP package,
originally from CMU. This package is available here:
- http://net-snmp.sourceforge.net/
+ https://net-snmp.sourceforge.io/
It should be trivial to adapt the output of any snmp query program
for use with arpsnmp.
@@ -34,7 +34,7 @@
time the last arpwatch release was assembled. The data it contains
come from the IEEE's website:
- http://standards-oui.ieee.org/oui/oui.csv
+ https://standards-oui.ieee.org/oui/oui.csv
This is the IEEE's public Organizationally Unique Identifier (OUI)
listing. If you run across an OUI that isn't in ethercodes.dat (or
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/arpwatch-3.3/VERSION new/arpwatch-3.4/VERSION
--- old/arpwatch-3.3/VERSION 2022-03-26 21:23:33.000000000 +0100
+++ new/arpwatch-3.4/VERSION 2023-09-05 18:51:15.000000000 +0200
@@ -1 +1 @@
-3.3
+3.4
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/arpwatch-3.3/arpsnmp.c new/arpwatch-3.4/arpsnmp.c
--- old/arpwatch-3.3/arpsnmp.c 2019-11-30 19:35:23.000000000 +0100
+++ new/arpwatch-3.4/arpsnmp.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 1997, 1999, 2004, 2009, 2010, 2012, 2013, 2019
+ * Copyright (c) 1996, 1997, 1999, 2004, 2009, 2010, 2012, 2013, 2019, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,11 +26,11 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char copyright[] =
- "Copyright (c) 1996, 1997, 1999, 2004, 2009, 2010, 2012, 2013, 2019\n\
+static const char copyright[] __attribute__((unused)) =
+ "Copyright (c) 1996, 1997, 1999, 2004, 2009, 2010, 2012, 2013, 2019,
2023\n\
The Regents of the University of California. All rights reserved.\n";
-static const char rcsid[] =
- "@(#) $Id: arpsnmp.c 1505 2019-11-30 18:35:23Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: arpsnmp.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
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/arpwatch-3.3/arpwatch.c new/arpwatch-3.4/arpwatch.c
--- old/arpwatch-3.3/arpwatch.c 2022-01-08 02:26:27.000000000 +0100
+++ new/arpwatch-3.4/arpwatch.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2009,
2010, 2011, 2012, 2013, 2016, 2019, 2022
+ * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2009,
2010, 2011, 2012, 2013, 2016, 2019, 2022, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,11 +26,11 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char copyright[] =
- "Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2009,
2010, 2011, 2012, 2013, 2016, 2019, 2022\n\
+static const char copyright[] __attribute__((unused)) =
+ "Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2009,
2010, 2011, 2012, 2013, 2016, 2019, 2022, 2023\n\
The Regents of the University of California. All rights reserved.\n";
-static const char rcsid[] =
- "@(#) $Id: arpwatch.c 1533 2022-01-08 01:26:27Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: arpwatch.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
@@ -157,8 +157,8 @@
/* Forwards */
int addnet(enum action action, const char *);
-RETSIGTYPE checkpoint(int);
-RETSIGTYPE die(int);
+void checkpoint(int);
+void die(int);
int isbogon(u_int32_t);
int main(int, char **);
void process_ether(u_char *, const struct pcap_pkthdr *, const u_char *);
@@ -886,7 +886,7 @@
return (1);
}
-RETSIGTYPE
+void
die(int signo)
{
@@ -895,7 +895,7 @@
exit(1);
}
-RETSIGTYPE
+void
checkpoint(int signo)
{
@@ -906,7 +906,6 @@
(void)dump();
(void)alarm(CHECKPOINT);
}
- return RETSIGVAL;
}
void
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/arpwatch-3.3/configure.in new/arpwatch-3.4/configure.in
--- old/arpwatch-3.3/configure.in 2021-12-15 23:11:07.000000000 +0100
+++ new/arpwatch-3.4/configure.in 2023-09-05 19:50:56.000000000 +0200
@@ -1,11 +1,12 @@
-AC_REVISION([@(#) $Id: configure.in 1532 2021-12-15 22:11:07Z leres $ (LBL)])
+AC_REVISION([@(#) $Id: configure.in 1537 2023-09-05 17:50:56Z leres $ (LBL)])
dnl
-AC_COPYRIGHT([Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009,
2010, 2011, 2013, 2016, 2017, 2019, 2020, 2021
+AC_COPYRIGHT([Copyright (c) 1994, 1995, 1996, 1997, 1998, 2000, 2006, 2009,
2010, 2011, 2013, 2016, 2017, 2019, 2020, 2021, 2023
The Regents of the University of California. All rights reserved.])
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
+AC_PREREQ([2.71])
AC_INIT
AC_CONFIG_SRCDIR(arpwatch.c)
@@ -21,7 +22,6 @@
AC_PROG_INSTALL
AC_CHECK_HEADERS(fcntl.h memory.h)
-AC_HEADER_TIME
dnl
dnl Install rc.d script on FreeBSD
@@ -70,9 +70,8 @@
fi
dnl The following generates a warning from autoconf...
-AC_C_BIGENDIAN
+dnl AC_C_BIGENDIAN
-AC_LBL_TYPE_SIGNAL
AC_LBL_UNION_WAIT
AC_CHECK_LIB(resolv, res_query)
@@ -111,7 +110,7 @@
AC_CACHE_VAL(ac_cv_ether_header_has_ea,
LBL_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $V_INCLS"
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
# include <sys/types.h>
# if __STDC__
/* osf3 has REALLY good prototyes */
@@ -123,10 +122,10 @@
# include <netinet/in.h>
# include <netinet/if_ether.h>],
[u_int i =
- sizeof(((struct ether_header *)0)->ether_dhost.ether_addr_octet)],
+ sizeof(((struct ether_header *)0)->ether_dhost.ether_addr_octet)])],
ac_cv_ether_header_has_ea=yes,
- ac_cv_ether_header_has_ea=no)
- CFLAGS="$LBL_SAVE_CFLAGS")
+ ac_cv_ether_header_has_ea=no))
+ CFLAGS="$LBL_SAVE_CFLAGS"
AC_MSG_RESULT($ac_cv_ether_header_has_ea)
if test $ac_cv_ether_header_has_ea = yes ; then
AC_DEFINE(ETHER_HEADER_HAS_EA)
@@ -136,7 +135,7 @@
AC_CACHE_VAL(ac_cv_ether_arp_has_ea,
LBL_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $V_INCLS"
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
# include <sys/types.h>
# if __STDC__
/* osf3 has REALLY good prototyes */
@@ -148,10 +147,10 @@
# include <netinet/in.h>
# include <netinet/if_ether.h>],
[u_int i =
- sizeof(((struct ether_arp *)0)->arp_sha.ether_addr_octet)],
+ sizeof(((struct ether_arp *)0)->arp_sha.ether_addr_octet)])],
ac_cv_ether_arp_has_ea=yes,
- ac_cv_ether_arp_has_ea=no)
- CFLAGS="$LBL_SAVE_CFLAGS")
+ ac_cv_ether_arp_has_ea=no))
+ CFLAGS="$LBL_SAVE_CFLAGS"
AC_MSG_RESULT($ac_cv_ether_arp_has_ea)
if test $ac_cv_ether_arp_has_ea = yes ; then
AC_DEFINE(ETHER_ARP_HAS_EA)
@@ -161,7 +160,7 @@
AC_CACHE_VAL(ac_cv_struct_ether_arp_x,
LBL_SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $V_INCLS"
- AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
# include <sys/types.h>
# include <sys/socket.h>
# if __STDC__
@@ -172,10 +171,10 @@
# include <net/if.h>
# include <netinet/in.h>
# include <netinet/if_ether.h>],
- [u_int i = sizeof( ((struct ether_arp *)0)->arp_xsha)],
+ [u_int i = sizeof(((struct ether_arp *)0)->arp_xsha)])],
ac_cv_struct_ether_arp_x=yes,
- ac_cv_struct_ether_arp_x=no)
- CFLAGS="$LBL_SAVE_CFLAGS")
+ ac_cv_struct_ether_arp_x=no))
+ CFLAGS="$LBL_SAVE_CFLAGS"
AC_MSG_RESULT($ac_cv_struct_ether_arp_x)
if test $ac_cv_struct_ether_arp_x = yes ; then
AC_DEFINE(ETHER_ARP_HAS_X)
@@ -186,12 +185,12 @@
dnl
AC_MSG_CHECKING(for dn_skipname)
AC_CACHE_VAL(ac_cv_have_dn_skipname,
- AC_TRY_LINK([
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([
# include <sys/types.h>
# include <netinet/in.h>
# include <arpa/nameser.h>
# include <resolv.h>],
- [(void)dn_skipname(0, 0);],
+ [(void)dn_skipname(0, 0);])],
ac_cv_have_dn_skipname=yes,
ac_cv_have_dn_skipname=no))
AC_MSG_RESULT($ac_cv_have_dn_skipname)
@@ -257,7 +256,7 @@
arpwatch.8
"
-AC_OUTPUT_COMMANDS([chmod -w ${files} ; chmod +x ${scripts}],
+AC_CONFIG_COMMANDS([executable], [chmod -w ${files} ; chmod +x ${scripts}],
[files="${files}" ; scripts="${scripts}"])
AC_CONFIG_FILES([Makefile ${files} ${scripts}])
AC_OUTPUT
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/arpwatch-3.3/db.c new/arpwatch-3.4/db.c
--- old/arpwatch-3.3/db.c 2019-06-27 23:45:35.000000000 +0200
+++ new/arpwatch-3.4/db.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2009, 2010, 2012, 2013
+ * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2009, 2010, 2012, 2013, 2019, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: db.c 1486 2019-06-27 21:45:35Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: db.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
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/arpwatch-3.3/dns.c new/arpwatch-3.4/dns.c
--- old/arpwatch-3.3/dns.c 2019-11-30 19:35:23.000000000 +0100
+++ new/arpwatch-3.4/dns.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2009, 2013, 2016
+ * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2009, 2013, 2016,
2019, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: dns.c 1505 2019-11-30 18:35:23Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: dns.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
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/arpwatch-3.3/ec.c new/arpwatch-3.4/ec.c
--- old/arpwatch-3.3/ec.c 2019-11-30 19:39:08.000000000 +0100
+++ new/arpwatch-3.4/ec.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2009,
2010, 2013, 2016, 2019
+ * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2009,
2010, 2013, 2016, 2019, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: ec.c 1506 2019-11-30 18:39:08Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: ec.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
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/arpwatch-3.3/file.c new/arpwatch-3.4/file.c
--- old/arpwatch-3.3/file.c 2019-06-28 19:15:44.000000000 +0200
+++ new/arpwatch-3.4/file.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2009, 2010, 2013
+ * Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2009, 2010, 2013, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: file.c 1244 2013-11-18 05:39:46Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: file.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
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/arpwatch-3.3/machdep.c new/arpwatch-3.4/machdep.c
--- old/arpwatch-3.3/machdep.c 2013-11-18 06:29:04.000000000 +0100
+++ new/arpwatch-3.4/machdep.c 2023-09-05 19:47:30.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2010, 2013
+ * Copyright (c) 2009, 2010, 2013, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
*/
#ifndef lint
-static const char rcsid[] =
+static const char rcsid[] __attribute__((unused)) =
"@(#) $Header: machdep.c,v 1.4 97/09/30 15:03:53 leres Exp $ (LBL)";
#endif
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/arpwatch-3.3/massagevendor.py.in new/arpwatch-3.4/massagevendor.py.in
--- old/arpwatch-3.3/massagevendor.py.in 2019-12-26 23:28:17.000000000
+0100
+++ new/arpwatch-3.4/massagevendor.py.in 2023-09-05 18:44:51.000000000
+0200
@@ -1,6 +1,6 @@
#!@PYTHON@
"""massagevendor - convert IEEE oui.csv to ethercodes.dat format"""
-# @(#) $Id: massagevendor.py.in 1516 2019-12-26 22:28:17Z leres $ (LBL)
+# @(#) $Id: massagevendor.py.in 1535 2023-09-05 16:44:51Z leres $ (LBL)
#
# Copyright (c) 2000, 2004, 2009, 2010, 2013, 2015, 2016, 2019
# The Regents of the University of California. All rights reserved.
@@ -30,7 +30,7 @@
#
# Massage:
#
-# http://standards-oui.ieee.org/oui/oui.csv
+# https://standards-oui.ieee.org/oui/oui.csv
#
# into ethercodes.dat format.
#
@@ -93,7 +93,7 @@
# os.environ[pathstr] = '%s:%s' % (localsbin, os.environ[pathstr])
PROG = os.path.basename(argv[0])
- version = '$Revision: 1516 $'.strip('$').rstrip()
+ version = '$Revision: 1535 $'.strip('$').rstrip()
parser = argparse.ArgumentParser(
formatter_class=argparse.RawTextHelpFormatter)
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/arpwatch-3.3/report.c new/arpwatch-3.4/report.c
--- old/arpwatch-3.3/report.c 2021-12-15 23:11:07.000000000 +0100
+++ new/arpwatch-3.4/report.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
2009, 2010, 2012, 2013, 2016, 2019
+ * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
2009, 2010, 2012, 2013, 2016, 2019, 2021, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: report.c 1532 2021-12-15 22:11:07Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: report.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
@@ -82,7 +82,7 @@
static char *fmtdate(time_t);
static char *fmtdelta(time_t);
-RETSIGTYPE reaper(int);
+void reaper(int);
static int32_t gmt2local(void);
static char *
@@ -214,7 +214,7 @@
return (dt);
}
-RETSIGTYPE
+void
reaper(int signo)
{
pid_t pid;
@@ -239,7 +239,6 @@
lg(LOG_DEBUG, "reaper: pid %d, exit status %d",
pid, WEXITSTATUS(status));
}
- return RETSIGVAL;
}
void
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/arpwatch-3.3/setsignal.c new/arpwatch-3.4/setsignal.c
--- old/arpwatch-3.3/setsignal.c 2013-11-18 06:29:05.000000000 +0100
+++ new/arpwatch-3.4/setsignal.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,36 +1,26 @@
/*
- * Copyright (c) 2009, 2013
- * The Regents of the University of California. All rights reserved.
+ * @(#) $Id: setsignal.c 1537 2023-09-05 17:50:56Z leres $ (XSE)
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * Copyright (c) 2008, 2009, 2015
+ * The Regents of the University of California. All rights reserved.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: setsignal.c,v 1.4 97/06/15 13:20:29 leres Exp $ (LBL)";
-#endif
-
#include <sys/types.h>
#ifdef HAVE_MEMORY_H
@@ -59,8 +49,8 @@
*
* Did I mention that signals suck?
*/
-RETSIGTYPE
-(*setsignal (int sig, RETSIGTYPE (*func)(int)))(int)
+void
+(*setsignal (int sig, void (*func)(int)))(int)
{
#ifdef HAVE_SIGACTION
struct sigaction old, new;
@@ -82,4 +72,3 @@
#endif
#endif
}
-
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/arpwatch-3.3/setsignal.h new/arpwatch-3.4/setsignal.h
--- old/arpwatch-3.3/setsignal.h 2013-11-18 06:29:05.000000000 +0100
+++ new/arpwatch-3.4/setsignal.h 2023-09-05 19:35:13.000000000 +0200
@@ -1,34 +1,27 @@
/*
- * Copyright (c) 2009, 2013
- * The Regents of the University of California. All rights reserved.
+ * Copyright (c) 1997
+ * The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * modification, are permitted provided that: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
+ * the University nor the names of its contributors may be used to endorse
+ * or promote products derived from this software without specific prior
+ * written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
* @(#) $Header: setsignal.h,v 1.2 97/06/13 13:10:44 leres Exp $ (LBL)
*/
#ifndef setsignal_h
#define setsignal_h
-RETSIGTYPE (*setsignal(int, RETSIGTYPE (*)(int)))(int);
+void (*setsignal(int, void (*)(int)))(int);
#endif
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/arpwatch-3.3/update-ethercodes.sh.in
new/arpwatch-3.4/update-ethercodes.sh.in
--- old/arpwatch-3.3/update-ethercodes.sh.in 2021-12-15 01:47:54.000000000
+0100
+++ new/arpwatch-3.4/update-ethercodes.sh.in 2023-09-05 18:44:51.000000000
+0200
@@ -1,5 +1,5 @@
#!/bin/sh
-# @(#) $Id: update-ethercodes.sh.in 1529 2021-12-15 00:47:54Z leres $ (LBL)
+# @(#) $Id: update-ethercodes.sh.in 1535 2023-09-05 16:44:51Z leres $ (LBL)
#
# Generate ethercodes.dat
#
@@ -18,7 +18,7 @@
fi
fn=ethercodes.dat
-url=http://standards-oui.ieee.org/oui/oui.csv
+url=https://standards-oui.ieee.org/oui/oui.csv
if [ -x /usr/bin/fetch ]; then
cmd1="fetch -q -o - ${url}"
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/arpwatch-3.3/util.c new/arpwatch-3.4/util.c
--- old/arpwatch-3.3/util.c 2019-11-30 19:35:23.000000000 +0100
+++ new/arpwatch-3.4/util.c 2023-09-05 19:50:56.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 1997, 1999, 2000, 2004, 2009, 2010, 2012, 2013, 2016,
2019
+ * Copyright (c) 1996, 1997, 1999, 2000, 2004, 2009, 2010, 2012, 2013, 2016,
2019, 2023
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
#ifndef lint
-static const char rcsid[] =
- "@(#) $Id: util.c 1505 2019-11-30 18:35:23Z leres $ (LBL)";
+static const char rcsid[] __attribute__((unused)) =
+ "@(#) $Id: util.c 1537 2023-09-05 17:50:56Z leres $ (LBL)";
#endif
/*
++++++ arpwatch-exit.patch ++++++
--- /var/tmp/diff_new_pack.bdZgNB/_old 2023-10-17 20:25:01.683344422 +0200
+++ /var/tmp/diff_new_pack.bdZgNB/_new 2023-10-17 20:25:01.683344422 +0200
@@ -1,8 +1,8 @@
-Index: arpwatch-3.1/arpwatch.c
+Index: arpwatch-3.4/arpwatch.c
===================================================================
---- arpwatch-3.1.orig/arpwatch.c
-+++ arpwatch-3.1/arpwatch.c
-@@ -985,7 +985,7 @@ die(int signo)
+--- arpwatch-3.4.orig/arpwatch.c
++++ arpwatch-3.4/arpwatch.c
+@@ -989,7 +989,7 @@ die(int signo)
lg(LOG_DEBUG, "exiting");
checkpoint(0);
@@ -10,5 +10,5 @@
+ exit(0);
}
- RETSIGTYPE
+ void
