Compare commits

..

18 commits

Author SHA1 Message Date
Benjamin A. Beasley
acc2822ccb Fix a trivial typo in the spec file 2024-10-31 20:50:51 -04:00
Benjamin A. Beasley
978fc80b2d Generate ethercodes.dat from latest oui.csv 2024-10-31 14:34:17 -04:00
Benjamin A. Beasley
542ff4a5ed Update to 3.7 (close RHBZ#2316380) 2024-10-04 08:08:51 -04:00
Benjamin A. Beasley
e1b708a1f7 Generate ethercodes.dat from latest oui.csv 2024-09-14 12:33:25 -04:00
Benjamin A. Beasley
59d0c1bf4b Generate ethercodes.dat from latest oui.csv 2024-07-02 14:35:07 -04:00
Benjamin A. Beasley
a532a32f3b Generate ethercodes.dat from latest oui.csv 2024-05-17 13:17:32 -04:00
Benjamin A. Beasley
3986572b51 Generate ethercodes.dat from latest oui.csv 2024-03-28 09:35:42 -04:00
Benjamin A. Beasley
eef2e2bb6c Update to 3.6 (close RHBZ#2259459) 2024-01-22 08:42:42 -05:00
Benjamin A. Beasley
907bada553 Generate ethercodes.dat from latest oui.csv 2024-01-21 21:46:33 -05:00
Benjamin A. Beasley
06db5d5fed Generate ethercodes.dat from latest oui.csv 2024-01-02 12:47:39 -05:00
Benjamin A. Beasley
dc790c3128 Switch to dynamically-allocated service user/group ID’s 2023-12-04 12:53:22 -05:00
Benjamin A. Beasley
39853e8a2c Update to 3.5 (close RHBZ#2252673) 2023-12-03 20:28:50 -05:00
Benjamin A. Beasley
20668574b3 Generate ethercodes.dat from latest oui.csv 2023-12-03 20:12:19 -05:00
Benjamin A. Beasley
20c9f98b11 Generate ethercodes.dat from latest oui.csv 2023-11-10 13:21:31 -05:00
Benjamin A. Beasley
ee3d67baab Generate ethercodes.dat from latest oui.csv 2023-10-04 10:40:51 -04:00
Benjamin A. Beasley
b14be0a356 Update to 3.4 (close RHBZ#2237532) 2023-09-06 11:15:00 -04:00
Benjamin A. Beasley
80fac7b9d9 Generate ethercodes.dat from latest oui.csv 2023-09-06 08:06:15 -04:00
Benjamin A. Beasley
f1bf8d9972 Generate ethercodes.dat from latest oui.csv 2023-08-21 13:34:30 -04:00
7 changed files with 11510 additions and 13694 deletions

2
.gitignore vendored
View file

@ -7,5 +7,3 @@
/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

View file

@ -0,0 +1,40 @@
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

View file

@ -1,40 +0,0 @@
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

View file

@ -1,10 +1,9 @@
# 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-?')
# This is beyond what we want to rewrite downstream, and is not necessarily a
# serious problem.
addFilter(r' binary-or-shlib-calls-gethostbyname ')
addFilter(r'zero-length /var/lib/arpwatch/arp.dat-?')
# Ghost file
addFilter(r'non-readable /var/lib/arpwatch/arp.dat.new 600')

View file

@ -1,38 +1,28 @@
%bcond autoreconf 1
Name: arpwatch
Epoch: 14
Version: 3.9
Version: 3.7
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 FSFUL
# - configure is FSFULL
# - install-sh is X11
# - mkdep is BSD-4.3RENO
SourceLicense: %{shrink:
%{license} AND
BSD-4.3RENO AND
FSFUL AND
GPL-3.0-or-later AND
X11
}
# - mkdep is ??? (NTP-like)
License: BSD-3-Clause
URL: https://ee.lbl.gov/
Requires(pre): shadow-utils
Requires: /usr/sbin/sendmail
Requires: python3
BuildRequires: gcc
BuildRequires: make
%if %{with autoreconf}
BuildRequires: autoconf
%endif
BuildRequires: /usr/sbin/sendmail
BuildRequires: systemd-rpm-macros
%{?sysuser_requires_compat}
@ -48,7 +38,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 2025-12-11T07:07:44+00:00.
# File oui.csv last fetched 2024-10-31T18:34:17+00:00.
Source1: oui.csv
Source2: arpwatch.service
Source3: arpwatch.sysconfig
@ -71,7 +61,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.9-no-usr-local-path.patch
Patch: arpwatch-3.2-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.
@ -130,11 +120,7 @@ awk '/^ \* / { print substr($0, 4); } /^ \*\// { exit }' arpwatch.c |
tee LICENSE
%conf
%if %{with autoreconf}
autoreconf --force --install --verbose
%endif
%build
# Prior to version 3.4, this was handled by the configure script. If it is not
# 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
@ -143,8 +129,6 @@ export CPPFLAGS="${CPPFLAGS-} -DTIME_WITH_SYS_TIME=1"
%configure --with-sendmail=/usr/sbin/sendmail PYTHON=%{python3}
%build
%make_build ARPDIR=%{pkgstatedir}
@ -164,10 +148,6 @@ 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
@ -214,6 +194,10 @@ fi
%systemd_post arpwatch.service
%pre
%sysusers_create_compat %{SOURCE6}
%postun
%systemd_postun_with_restart arpwatch.service
@ -228,8 +212,9 @@ fi
%doc CHANGES
%doc arpfetch
%{_sbindir}/arpwatch
%{_sbindir}/arpsnmp
# make install uses mode 0555, which is unconventional
%attr(0755,-,-) %{_sbindir}/arpwatch
%attr(0755,-,-) %{_sbindir}/arpsnmp
# manually-installed scripts
%{_sbindir}/arp2ethers
%{_sbindir}/massagevendor

25060
oui.csv

File diff suppressed because it is too large Load diff

View file

@ -1 +1 @@
SHA512 (arpwatch-3.9.tar.gz) = b6fdda79caf6c79d78d629b28987d381981d8ac9150dd95c44ba0ed634d905446a8b64d73cdacca89d42a77965e0710d0a60184010440fed19168dae4e3dd4bd
SHA512 (arpwatch-3.7.tar.gz) = 8bdda7fc94241813ee57c91683ce5c6a8e4d5e66255bf2cc302d69763086e29c6548b009805660274437edca7a5b8bbf24566846357afe1f96015bd26db89624