From aa4dcdcd9309cd2c8a478417632d1917336eeaa0 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 23 Oct 2025 23:25:13 +0100
Subject: [PATCH] Update to 3.9 (close RHBZ#2406123)

---
 .gitignore                           |  1 +
 arpwatch-3.2-no-usr-local-path.patch | 40 ----------------------------
 arpwatch-3.9-no-usr-local-path.patch | 40 ++++++++++++++++++++++++++++
 arpwatch.spec                        |  4 +--
 sources                              |  2 +-
 5 files changed, 44 insertions(+), 43 deletions(-)
 delete mode 100644 arpwatch-3.2-no-usr-local-path.patch
 create mode 100644 arpwatch-3.9-no-usr-local-path.patch

diff --git a/.gitignore b/.gitignore
index 17a69ab..5da6ea9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /arpwatch-3.6.tar.gz
 /arpwatch-3.7.tar.gz
 /arpwatch-3.8.tar.gz
+/arpwatch-3.9.tar.gz
diff --git a/arpwatch-3.2-no-usr-local-path.patch b/arpwatch-3.2-no-usr-local-path.patch
deleted file mode 100644
index a92adba..0000000
--- a/arpwatch-3.2-no-usr-local-path.patch
+++ /dev/null
@@ -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
diff --git a/arpwatch-3.9-no-usr-local-path.patch b/arpwatch-3.9-no-usr-local-path.patch
new file mode 100644
index 0000000..f8d3ab4
--- /dev/null
+++ b/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
diff --git a/arpwatch.spec b/arpwatch.spec
index 8bc95fd..8aba959 100644
--- a/arpwatch.spec
+++ b/arpwatch.spec
@@ -2,7 +2,7 @@
 
 Name:           arpwatch
 Epoch:          14
-Version:        3.8
+Version:        3.9
 Release:        %autorelease
 Summary:        Network monitoring tools for tracking IP addresses on a network
 
@@ -71,7 +71,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.
diff --git a/sources b/sources
index f7923d1..a022f1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (arpwatch-3.8.tar.gz) = 9147da89f187adaaa26bc2cef0f04a69baa9a5ff96844f6a7e32ee269a3e1c4fed75b186ca3eb6b97f3579b648f63a7590e0534f545e7480d7ec14d9c7c18f89
+SHA512 (arpwatch-3.9.tar.gz) = b6fdda79caf6c79d78d629b28987d381981d8ac9150dd95c44ba0ed634d905446a8b64d73cdacca89d42a77965e0710d0a60184010440fed19168dae4e3dd4bd