Compare commits

..

No commits in common. "c8" and "imports/c8/arpwatch-2.1a15-42.el8" have entirely different histories.

5 changed files with 3 additions and 63 deletions

2
.arpwatch.metadata Normal file
View File

@ -0,0 +1,2 @@
9dffaec0f132e5bb7aedfc840c5c67068bfbce69 SOURCES/arpwatch-2.1a15.tar.gz
cc6e8ac77f799dd09cd5ff7bf7db235788a0d942 SOURCES/ethercodes-20110707.dat.bz2

View File

@ -1,11 +0,0 @@
--- a/db.c 2000-10-01 01:39:58.000000000 +0200
+++ b/db.c 2024-01-03 10:29:20.367656089 +0100
@@ -62,7 +62,7 @@
/* Ethernet info */
struct einfo {
u_char e[6]; /* ether address */
- char h[34]; /* simple hostname */
+ char h[64]; /* simple hostname */
time_t t; /* timestamp */
};

View File

@ -1,15 +0,0 @@
--- a/db.c 2024-01-03 10:36:30.009600848 +0100
+++ b/db.c 2024-02-21 11:35:04.420115207 +0100
@@ -283,8 +283,10 @@
BCOPY(e, ep->e, 6);
if (h == NULL && !initializing)
h = getsname(a);
- if (h != NULL && !isdigit((int)*h))
- strcpy(ep->h, h);
+ if (h != NULL) {
+ strncpy(ep->h, h, sizeof(ep->h));
+ ep->h[sizeof(ep->h) - 1] = '\0';
+ }
ep->t = t;
return (ep);
}

View File

@ -1,17 +0,0 @@
Originally reported at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=315215.
Resolves: #1368523
--- arpwatch-2.1a13/ec.c 2000-10-13 22:49:16.000000000 +0000
+++ arpwatch-2.1a13/ec.c 2005-06-18 07:12:14.131890648 +0000
@@ -218,7 +218,7 @@
{
static char str[32];
- (void)sprintf(str, "%x:%x:%x:%x:%x:%x",
+ (void)sprintf(str, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
e[0], e[1], e[2], e[3], e[4], e[5]);
return (str);
}

View File

@ -4,7 +4,7 @@
Name: arpwatch Name: arpwatch
Epoch: 14 Epoch: 14
Version: 2.1a15 Version: 2.1a15
Release: 46%{?dist} Release: 42%{?dist}
Summary: Network monitoring tools for tracking IP addresses on a network Summary: Network monitoring tools for tracking IP addresses on a network
Group: Applications/System Group: Applications/System
License: BSD with advertising License: BSD with advertising
@ -40,9 +40,6 @@ Patch16: arpwatch-201301-ethcodes.patch
Patch17: arpwatch-pie.patch Patch17: arpwatch-pie.patch
Patch18: arpwatch-aarch64.patch Patch18: arpwatch-aarch64.patch
Patch19: arpwatch-promisc.patch Patch19: arpwatch-promisc.patch
Patch20: arpwatch-ethernet-address-format.patch
Patch21: arpwatch-2.1a15-hostname-buffer.patch
Patch22: arpwatch-2.1a15-unbounded-hostname-copy.patch
%description %description
The arpwatch package contains arpwatch and arpsnmp. Arpwatch and The arpwatch package contains arpwatch and arpsnmp. Arpwatch and
@ -75,9 +72,6 @@ network.
%patch17 -p1 -b .pie %patch17 -p1 -b .pie
%patch18 -p1 -b .aarch64 %patch18 -p1 -b .aarch64
%patch19 -p1 -b .promisc %patch19 -p1 -b .promisc
%patch20 -p1 -b .ethernet-address
%patch21 -p1 -b .hostname-buffer
%patch22 -p1 -b .hostname-buffer-bound
%build %build
%configure %configure
@ -154,19 +148,6 @@ fi
%attr(0644,-,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat %attr(0644,-,arpwatch) %verify(not md5 size mtime) %config(noreplace) %{_vararpwatch}/ethercodes.dat
%changelog %changelog
* Wed Feb 21 2024 Pavel Simovec <psimovec@redhat.com> - 14:2.1a15-46
- Give a bound to hostname buffer copy
- Resolves: RHEL-5636
* Thu Jan 25 2024 Pavel Simovec <psimovec@redhat.com> - 14:2.1a15-45
- rebuilt
* Wed Jan 03 2024 Pavel Simovec <psimovec@redhat.com> - 14:2.1a15-44
- Increase hostname buffer
* Tue Dec 3 2019 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-43
- MAC addresses are not shown properly (#1778313)
* Mon Mar 5 2018 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-42 * Mon Mar 5 2018 Jan Synáček <jsynacek@redhat.com> - 14:2.1a15-42
- make sure arpwatch starts after network devices are up (#1551431) - make sure arpwatch starts after network devices are up (#1551431)