main/arpwatch: upgrade to 3.4

This commit is contained in:
Francesco Colista 2023-09-06 14:38:21 +02:00
parent 362a5c1940
commit 83510c9b98
2 changed files with 39 additions and 10 deletions

View file

@ -1,8 +1,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=arpwatch
pkgver=3.3
pkgrel=2
pkgver=3.4
pkgrel=0
pkgdesc="Ethernet monitoring program"
url="https://www-nrg.ee.lbl.gov/"
arch="all"
@ -19,17 +19,12 @@ source="https://ee.lbl.gov/downloads/arpwatch/arpwatch-$pkgver.tar.gz
22_alpine_bihourly_script.patch
53_stop-using-_getshort.patch
remove-freebsd-arpwatch.patch
fix-time-h.patch
"
prepare() {
default_prepare
update_config_sub
update_config_guess
}
build() {
export PYTHON=python3
./configure \
--build=$CBUILD \
--host=$CHOST \
@ -55,10 +50,11 @@ package() {
}
sha512sums="
4e3d542917dc9060ae7b35b40f41cb696eb36e68846194a76f025c5ecb1df1e67d5c1c66ba3c7e581e1f915b988d05cb7805f28d410784bd27dc3a448dccdece arpwatch-3.3.tar.gz
0c984ec856e76df4475b367a2e5fb81d0bfdb00fd7730b303c0e1d422f2d2b4f8afef80082bf938d6a6a3b9855f4acfaea23b111430d5d13751271c5b4d70c36 arpwatch-3.4.tar.gz
854f6361bf02586516db4f50afdee729c047cd788985f72f475e592e0e744c24d7d765f0391d733dbf417048c26b6d43c00eb63c58e6798bdb2366b93cbfe03a arpwatch.confd
83fc559aecd82cefd430104df23fc7680ac14d2c27f74d4543585382166e16a65563e00122281e886278993a9ca574daa5b2b2100884369c3a3146a66b68a0f7 arpwatch.initd
b537220b7a19f7f28d1b60cfea6ef2e4d0c852ac83907fdd2515e467c3d16529b0c5a25ee653536e674c63d47a00709fc89fd6085efc5ba4a12f392df5ae5788 22_alpine_bihourly_script.patch
6eae9b143deea1655b3adb45640329d1c6d15c0bf6172a229ed142bb59e6c53b73ad19dc38adc42fe547f0bae1310394b19c9f8efe1af3a7dbf889c3742008c1 53_stop-using-_getshort.patch
68298d7967c281bbda6fe7d64f9af427eb39ac1a0011283b14ea1004396949595acc6947ddcabb385acdc83abe6255bf79ff92e5b8b1c33c67c26830b82ecd64 remove-freebsd-arpwatch.patch
fdc05ac57e2c7007d6313fe1c38b25d999f347f218aeda6e9e59ec50791825549a5b73b70fb975d78803cbc0078341b6365379df3de02445e4af5e92e32685a8 fix-time-h.patch
"

View file

@ -0,0 +1,33 @@
diff --git a/report.c b/report.c
index 9c77755..a4f0db1 100644
--- a/report.c
+++ b/report.c
@@ -37,7 +37,6 @@ static const char rcsid[] __attribute__((unused)) =
#include <sys/param.h>
#include <sys/types.h> /* concession to AIX */
#include <sys/socket.h>
-#include <sys/time.h>
#include <sys/wait.h>
#if __STDC__
@@ -59,9 +58,18 @@ struct rtentry;
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
#endif
+
#include <unistd.h>
#include "gnuc.h"