Update License field to SPDX

- Additionally, the license is corrected; it should have been “BSD”
  rather than “BSD with advertising” under the old system.

.gitignore

@@ -2,3 +2,4 @@
 /ethercodes-20110707.dat.bz2
 /arpwatch-3.1.tar.gz
 /arpwatch-3.2.tar.gz
+/arpwatch-3.3.tar.gz

arpwatch.service

@@ -21,7 +21,7 @@ ProtectKernelModules=true
 ProtectControlGroups=true
 RestrictSUIDSGID=true
 SystemCallFilter=@system-service
-SystemCallFilter=~@aio @chown @clock @ipc @keyring @memlock @resources @sync
+SystemCallFilter=~@aio @chown @clock @ipc @keyring @memlock @resources
 SystemCallArchitectures=native
 
 [Install]

arpwatch.spec

@@ -1,10 +1,19 @@
 Name:           arpwatch
 Epoch:          14
-Version:        3.2
+Version:        3.3
 Release:        %autorelease
 Summary:        Network monitoring tools for tracking IP addresses on a network
 
-License:        BSD with advertising
+# SPDX matching with BSD-3-Clause confirmed at
+# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/49
+#
+# 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
+#   - install-sh is X11
+#   - mkdep is ??? (NTP-like)
+License:        BSD-3-Clause
 URL:            https://ee.lbl.gov/
 
 Requires(pre):  shadow-utils
@@ -23,12 +32,12 @@ BuildRequires:  libpcap-devel
 # directory listing at https://ee.lbl.gov/downloads/arpwatch/ shows all
 # available versions.
 Source0:        https://ee.lbl.gov/downloads/arpwatch/arpwatch-%{version}.tar.gz
-# This file comes from http://standards-oui.ieee.org/oui/oui.csv; it is used to
-# generate ethercodes.dat. Because it is unversioned (and frequently updated),
-# we store the file directly in the repository with the spec file; see the
-# update-oui-csv script.
+# This file comes from https://standards-oui.ieee.org/oui/oui.csv; it is used
+# to generate ethercodes.dat. Because it is unversioned (and frequently
+# updated), we store the file directly in the repository with the spec file;
+# see the update-oui-csv script.
 #
-# File oui.csv last fetched 2021-12-16T13:09:24+00:00.
+# File oui.csv last fetched 2022-08-03T18:59:47+00:00.
 Source1:        oui.csv
 Source2:        arpwatch.service
 Source3:        arpwatch.sysconfig
@@ -102,6 +111,11 @@ sed -r -i 's|/usr/local/arpwatch|%{pkgstatedir}|g' *.8.in *.sh.in *.sh
 # Fix Python interpreter path (but note that this script is not installed)
 sed -r -i 's|/usr/local/bin/python|%{python3}|g' update-ethercodes.sh.in
 
+# Emailed upstream requesting a separate LICENSE/COPYING file 2022-07-30.
+# For now, we extract it from the main source file’s “header” comment.
+awk '/^ \* / { print substr($0, 4); } /^ \*\// { exit }' arpwatch.c |
+  tee LICENSE
+
 
 %build
 %configure --with-sendmail=/usr/sbin/sendmail PYTHON=%{python3}
@@ -196,6 +210,7 @@ exit 0
 
 
 %files
+%license LICENSE
 %doc README
 %doc CHANGES
 %doc arpfetch

massagevendor.8

@@ -77,7 +77,7 @@ file containing the list of ethernet vendor codes
 .Sh NOTES
 The ethernet vendor codes as assigned by the IEEE can be found at:
 .Pp
-.Dl Ar http://standards-oui.ieee.org/oui/oui.csv
+.Dl Ar https://standards-oui.ieee.org/oui/oui.csv
 .Sh AUTHORS
 .An Craig Leres
 of the Lawrence Berkeley National Laboratory Network Research Group,

sources

@@ -1 +1 @@
-SHA512 (arpwatch-3.2.tar.gz) = 0a028e770e73f8ff2e926da5ab58e067c05908924a60cfc52c5fb7d57a0f36d3087f6cedb4a8b39b66ce85a4f6a12a594e7e74fd044331e5f346bcc9add99585
+SHA512 (arpwatch-3.3.tar.gz) = 4e3d542917dc9060ae7b35b40f41cb696eb36e68846194a76f025c5ecb1df1e67d5c1c66ba3c7e581e1f915b988d05cb7805f28d410784bd27dc3a448dccdece

update-oui-csv

@@ -2,7 +2,7 @@
 set -o errexit
 set -o nounset
 
-URL='http://standards-oui.ieee.org/oui/oui.csv'
+URL='https://standards-oui.ieee.org/oui/oui.csv'
 DATA='oui.csv'
 SPEC='arpwatch.spec'