Browse Source

addrwatch: Update to 1.0.1

Switch to codeload for smaller filesize. We need to run autoreconf anyway

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 7 years ago
parent
commit
f199ca1401
4 changed files with 39 additions and 11 deletions
  1. +6
    -7
      net/addrwatch/Makefile
  2. +7
    -3
      net/addrwatch/patches/001-fix-sys_siglist.patch
  3. +1
    -1
      net/addrwatch/patches/002-fix-uclibc-sysconf.patch
  4. +25
    -0
      net/addrwatch/patches/003-fix-pkt-hash.patch

+ 6
- 7
net/addrwatch/Makefile View File

@ -8,15 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=addrwatch
PKG_VERSION:=0.8
PKG_RELEASE:=2
PKG_VERSION:=1.0.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-master.tar.gz
PKG_SOURCE_URL:=https://github.com/fln/addrwatch/releases/download/$(PKG_VERSION)/
PKG_HASH:=0455bd8d2e18a793e1182712bf4df3e54a5b7575f82f5b79b60deef19ff93df8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fln/addrwatch/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=be70150a357558481de8488665da1d6efdfa5dc37666d9fa68e8e73a8b59ade6
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-master
PKG_FIXUP:=autoreconf
PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone
@ -32,7 +31,7 @@ define Package/addrwatch
endef
define Package/addrwatch/description
This is a tool similar to arpwatch. It main purpose is to monitor network and
This is a tool similar to arpwatch. It main purpose is to monitor network and
log discovered ethernet/ip pairings. Addrwatch is extremely useful in networks
with IPv6 autoconfiguration (RFC4862) enabled. It allows to track IPv6
addresses of hosts using IPv6 privacy extensions (RFC4941).


+ 7
- 3
net/addrwatch/patches/001-fix-sys_siglist.patch View File

@ -1,6 +1,8 @@
diff --git a/configure.ac b/configure.ac
index e70edc2..5d8b716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,9 +56,6 @@ AC_CHECK_HEADERS([arpa/inet.h netinet/in
@@ -58,9 +58,6 @@ AC_CHECK_HEADERS([arpa/inet.h netinet/in.h stdint.h stdlib.h syslog.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_INLINE
AC_TYPE_PID_T
@ -10,9 +12,11 @@
AC_TYPE_UINT32_T
AC_TYPE_UINT16_T
AC_TYPE_UINT8_T
diff --git a/src/addrwatch.c b/src/addrwatch.c
index 7647e02..93e1f61 100644
--- a/src/addrwatch.c
+++ b/src/addrwatch.c
@@ -339,7 +339,7 @@ void reload_cb(evutil_socket_t fd, short
@@ -327,7 +327,7 @@ void reload_cb(evutil_socket_t fd, short events, void *arg)
void reload_cb(int fd, short events, void *arg)
#endif
{
@ -21,7 +25,7 @@
log_msg(LOG_DEBUG, "Reopening output files");
output_flatfile_reload();
@@ -353,7 +353,7 @@ void stop_cb(evutil_socket_t fd, short e
@@ -341,7 +341,7 @@ void stop_cb(evutil_socket_t fd, short events, void *arg)
void stop_cb(int fd, short events, void *arg)
#endif
{


+ 1
- 1
net/addrwatch/patches/002-fix-uclibc-sysconf.patch View File

@ -1,6 +1,6 @@
--- a/src/addrwatch.c
+++ b/src/addrwatch.c
@@ -492,7 +492,7 @@ int main(int argc, char *argv[])
@@ -485,7 +485,7 @@ int main(int argc, char *argv[])
argp_parse(&argp, argc, argv, 0, &optind, 0);
if (!cfg.hostname) {


+ 25
- 0
net/addrwatch/patches/003-fix-pkt-hash.patch View File

@ -0,0 +1,25 @@
From 3852468f402bf9070eb1c9bab16cb1119db52f63 Mon Sep 17 00:00:00 2001
From: Julius Kriukas <julius@kriukas.lt>
Date: Sun, 4 Feb 2018 21:35:52 +0200
Subject: [PATCH] Add experimental meson build support
---
src/storage.c | 2 +-
1 file changed, 1 insertions(+), 1 deletion(-)
diff --git a/src/storage.c b/src/storage.c
index c162496..8b7a77e 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -76,7 +76,7 @@ struct ip_node *blacklist_match(uint8_t *ip_addr, uint8_t addr_len)
return NULL;
}
-inline uint16_t pkt_hash(uint8_t *l2_addr, uint8_t *ip_addr, uint8_t len, uint16_t vlan_tag)
+static inline uint16_t pkt_hash(uint8_t *l2_addr, uint8_t *ip_addr, uint8_t len, uint16_t vlan_tag)
{
int i;
uint16_t sum;
--
2.17.1

Loading…
Cancel
Save