Update to 3.9 (close RHBZ#2406123)

- Works around an issue extracting debuginfo

.gitignore

@@ -6,3 +6,6 @@
 /arpwatch-3.4.tar.gz
 /arpwatch-3.5.tar.gz
 /arpwatch-3.6.tar.gz
+/arpwatch-3.7.tar.gz
+/arpwatch-3.8.tar.gz
+/arpwatch-3.9.tar.gz

arpwatch-3.2-no-usr-local-path.patch

@@ -1,40 +0,0 @@
-Do not add /usr/local/bin or /usr/local/sbin to the PATH in any scripts.
-
-diff -Naur arpwatch-3.2-original/arpfetch arpwatch-3.2/arpfetch
---- arpwatch-3.2-original/arpfetch	2013-02-16 03:10:28.000000000 -0500
-+++ arpwatch-3.2/arpfetch	2021-12-16 08:26:26.931846139 -0500
-@@ -4,8 +4,6 @@
- # arpfetch - collect arp data from a cisco using net-snmp
- #
- 
--export PATH="/usr/local/bin:${PATH}"
--
- prog=`basename $0`
- 
- if [ $# -ne 2 ]; then
-diff -Naur arpwatch-3.2-original/bihourly.sh arpwatch-3.2/bihourly.sh
---- arpwatch-3.2-original/bihourly.sh	2016-09-16 22:40:54.000000000 -0400
-+++ arpwatch-3.2/bihourly.sh	2021-12-16 08:26:35.671910709 -0500
-@@ -3,9 +3,6 @@
- #
- #  bihourly arpwatch job
- #
--PATH=${PATH}:/usr/local/sbin
--export PATH
--#
- cd /usr/local/arpwatch
- #
- list="`cat list`"
-diff -Naur arpwatch-3.2-original/update-ethercodes.sh.in arpwatch-3.2/update-ethercodes.sh.in
---- arpwatch-3.2-original/update-ethercodes.sh.in	2021-12-14 19:47:54.000000000 -0500
-+++ arpwatch-3.2/update-ethercodes.sh.in	2021-12-16 08:26:16.309767665 -0500
-@@ -6,9 +6,6 @@
- 
- 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

arpwatch-3.9-no-usr-local-path.patch

@@ -0,0 +1,40 @@
+Do not add /usr/local/bin or /usr/local/sbin to the PATH in any scripts.
+
+diff -Naur arpwatch-3.9-original/arpfetch arpwatch-3.9/arpfetch
+--- arpwatch-3.9-original/arpfetch	2013-02-16 08:10:28.000000000 +0000
++++ arpwatch-3.9/arpfetch	2025-10-23 23:27:24.285711332 +0100
+@@ -4,8 +4,6 @@
+ # arpfetch - collect arp data from a cisco using net-snmp
+ #
+ 
+-export PATH="/usr/local/bin:${PATH}"
+-
+ prog=`basename $0`
+ 
+ if [ $# -ne 2 ]; then
+diff -Naur arpwatch-3.9-original/bihourly.sh arpwatch-3.9/bihourly.sh
+--- arpwatch-3.9-original/bihourly.sh	2016-09-17 03:40:54.000000000 +0100
++++ arpwatch-3.9/bihourly.sh	2025-10-23 23:27:24.285849999 +0100
+@@ -3,9 +3,6 @@
+ #
+ #  bihourly arpwatch job
+ #
+-PATH=${PATH}:/usr/local/sbin
+-export PATH
+-#
+ cd /usr/local/arpwatch
+ #
+ list="`cat list`"
+diff -Naur arpwatch-3.9-original/update-ethercodes.sh.in arpwatch-3.9/update-ethercodes.sh.in
+--- arpwatch-3.9-original/update-ethercodes.sh.in	2025-10-23 20:32:08.000000000 +0100
++++ arpwatch-3.9/update-ethercodes.sh.in	2025-10-23 23:27:50.579194300 +0100
+@@ -6,9 +6,6 @@
+ 
+ prog="`basename $0`"
+ 
+-PATH=/usr/local/bin:${PATH}
+-export PATH
+-
+ t1=`mktemp /tmp/${prog}.1.XXXXXX`
+ 
+ trap 'rm -f ${t1}; exit 1' 1 2 3 15 EXIT

arpwatch.rpmlintrc

@@ -1,9 +1,10 @@
 # These are not real spelling errors...
-addFilter(r'spelling-error .* en_US (arpsnmp) ')
+addFilter(r' spelling-error .* en_US (arpsnmp) ')
 # The sticky bit on this directory protects root-owned files from unlinking or
 # renaming by members of the arpwatch group.
-addFilter(r'non-standard-dir-perm /var/lib/arpwatch 1775')
+addFilter(r' non-standard-dir-perm /var/lib/arpwatch 1775')
 # Known zero-length files
-addFilter(r'zero-length /var/lib/arpwatch/arp.dat-?')
-# Ghost file
-addFilter(r'non-readable /var/lib/arpwatch/arp.dat.new 600')
+addFilter(r' zero-length /var/lib/arpwatch/arp.dat-?')
+# This is beyond what we want to rewrite downstream, and is not necessarily a
+# serious problem.
+addFilter(r' binary-or-shlib-calls-gethostbyname ')

arpwatch.spec

@@ -1,19 +1,27 @@
+%bcond autoreconf 1
+
 Name:           arpwatch
 Epoch:          14
-Version:        3.6
+Version:        3.9
 Release:        %autorelease
 Summary:        Network monitoring tools for tracking IP addresses on a network
 
 # SPDX matching with BSD-3-Clause confirmed at
 # https://gitlab.com/fedora/legal/fedora-license-data/-/issues/49
-#
+License:        BSD-3-Clause
 # Any files under different licenses are part of the build system and do not
 # contribute to the license of the binary RPM:
 #   - config.guess and config.sub are GPL-3.0-or-later
-#   - configure is FSFULL
+#   - configure is FSFUL
 #   - install-sh is X11
-#   - mkdep is ??? (NTP-like)
-License:        BSD-3-Clause
+#   - mkdep is BSD-4.3RENO
+SourceLicense:  %{shrink:
+                %{license} AND
+                BSD-4.3RENO AND
+                FSFUL AND
+                GPL-3.0-or-later AND
+                X11
+                }
 URL:            https://ee.lbl.gov/
 
 Requires(pre):  shadow-utils
@@ -23,6 +31,10 @@ Requires:       python3
 
 BuildRequires:  gcc
 BuildRequires:  make
+%if %{with autoreconf}
+BuildRequires:  autoconf
+%endif
+
 BuildRequires:  /usr/sbin/sendmail
 BuildRequires:  systemd-rpm-macros
 %{?sysuser_requires_compat}
@@ -38,7 +50,7 @@ Source0:        https://ee.lbl.gov/downloads/arpwatch/arpwatch-%{version}.tar.gz
 # updated), we store the file directly in the repository with the spec file;
 # see the update-oui-csv script.
 #
-# File oui.csv last fetched 2024-07-02T18:34:53+00:00.
+# File oui.csv last fetched 2025-10-23T22:22:02+00:00.
 Source1:        oui.csv
 Source2:        arpwatch.service
 Source3:        arpwatch.sysconfig
@@ -61,7 +73,7 @@ Patch:          arpwatch-3.1-arp2ethers-sort-invocation.patch
 # Fix stray rm (of an undefined variable) in example arpfetch script.
 Patch:          arpwatch-3.1-arpfetch-stray-rm.patch
 # Do not add /usr/local/bin or /usr/local/sbin to the PATH in any scripts
-Patch:          arpwatch-3.2-no-usr-local-path.patch
+Patch:          arpwatch-3.9-no-usr-local-path.patch
 # Do not attempt to search for local libpcap libraries lying around in the
 # parent of the build directory, or anywhere else random. This is not expected
 # to succeed anyway, but it is better to be sure.
@@ -120,15 +132,21 @@ awk '/^ \* / { print substr($0, 4); } /^ \*\// { exit }' arpwatch.c |
   tee LICENSE
 
 
-%build
-%set_build_flags
+%conf
+%if %{with autoreconf}
+autoreconf --force --install --verbose
+%endif
+
 # Prior to version 3.4, this was handled by the configure script. If it is not
-# defined, the build failes because time.h is not included in report.c. This
+# defined, the build fails because time.h is not included in report.c. This
 # regregression was reported upstream by email to arpwatch@ee.lbl.gov on
 # 2023-09-06.
 export CPPFLAGS="${CPPFLAGS-} -DTIME_WITH_SYS_TIME=1"
 
 %configure --with-sendmail=/usr/sbin/sendmail PYTHON=%{python3}
+
+
+%build
 %make_build ARPDIR=%{pkgstatedir}
 
 
@@ -148,6 +166,10 @@ install -d %{buildroot}%{_mandir}/man8 \
 
 %make_install
 
+# Make install uses mode 0555, which is unconventional, and which can interfere
+# with debuginfo generation since the file is not writable by its owner.
+chmod -v 0755 %{buildroot}%{_sbindir}/arpwatch %{buildroot}%{_sbindir}/arpsnmp
+
 install -p -t %{buildroot}%{_datadir}/arpwatch -m 0644 *.awk
 install -p -t %{buildroot}%{_sbindir} arp2ethers
 install -p massagevendor.py %{buildroot}%{_sbindir}/massagevendor
@@ -212,9 +234,8 @@ fi
 %doc CHANGES
 %doc arpfetch
 
-# make install uses mode 0555, which is unconventional
-%attr(0755,-,-) %{_sbindir}/arpwatch
-%attr(0755,-,-) %{_sbindir}/arpsnmp
+%{_sbindir}/arpwatch
+%{_sbindir}/arpsnmp
 # manually-installed scripts
 %{_sbindir}/arp2ethers
 %{_sbindir}/massagevendor

sources

@@ -1 +1 @@
-SHA512 (arpwatch-3.6.tar.gz) = 5ba47b15f294396f79efa4b72743169b9eb36747d675144e8f456a23d3987dc0d719d9b97704e7eeec0795f03ee7ef7e8fe8a4ba1ee35d19ab8ec6b077d345e8
+SHA512 (arpwatch-3.9.tar.gz) = b6fdda79caf6c79d78d629b28987d381981d8ac9150dd95c44ba0ed634d905446a8b64d73cdacca89d42a77965e0710d0a60184010440fed19168dae4e3dd4bd