Browse Source

addrwatch: update to 1.0.2

Switch to standard tarball to avoid autoreconfig.

Fix license information.

Add PKG_BUILD_PARALLEL for faster compilation.

Add PKG_INSTALL for consistency with other packages.

Removed upstreamed patches. Refresh remaining one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 5 years ago
parent
commit
f1a7d509b5
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
5 changed files with 13 additions and 81 deletions
  1. +12
    -9
      net/addrwatch/Makefile
  2. +0
    -36
      net/addrwatch/patches/001-fix-sys_siglist.patch
  3. +1
    -1
      net/addrwatch/patches/002-fix-uclibc-sysconf.patch
  4. +0
    -25
      net/addrwatch/patches/003-fix-pkt-hash.patch
  5. +0
    -10
      net/addrwatch/patches/010-limits.patch

+ 12
- 9
net/addrwatch/Makefile View File

@ -8,15 +8,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=addrwatch PKG_NAME:=addrwatch
PKG_VERSION:=1.0.1
PKG_RELEASE:=3
PKG_VERSION:=1.0.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 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_SOURCE_URL:=https://github.com/fln/addrwatch/releases/download/v$(PKG_VERSION)
PKG_HASH:=f04e143da881cd63c299125b592cfb85e4812abbd146f419a1894c00f2ae6208
PKG_MAINTAINER:=Ondrej Caletka <ondrej@caletka.cz>
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -27,7 +31,6 @@ define Package/addrwatch
DEPENDS:=+libpcap +libevent2 DEPENDS:=+libpcap +libevent2
TITLE:=IPv4/IPv6 and ethernet address pairing tool TITLE:=IPv4/IPv6 and ethernet address pairing tool
URL:=https://github.com/fln/addrwatch URL:=https://github.com/fln/addrwatch
MAINTAINER:=Ondrej Caletka <ondrej@caletka.cz>
endef endef
define Package/addrwatch/description define Package/addrwatch/description
@ -42,8 +45,8 @@ define Package/addrwatch/conffiles
endef endef
define Package/addrwatch/install define Package/addrwatch/install
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/addrwatch $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/config $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/addrwatch $(1)/usr/bin/
$(INSTALL_BIN) ./files/addrwatch.init $(1)/etc/init.d/addrwatch $(INSTALL_BIN) ./files/addrwatch.init $(1)/etc/init.d/addrwatch
$(INSTALL_CONF) ./files/addrwatch.config $(1)/etc/config/addrwatch $(INSTALL_CONF) ./files/addrwatch.config $(1)/etc/config/addrwatch
endef endef


+ 0
- 36
net/addrwatch/patches/001-fix-sys_siglist.patch View File

@ -1,36 +0,0 @@
diff --git a/configure.ac b/configure.ac
index e70edc2..5d8b716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
-AC_CHECK_DECLS([sys_siglist], [], [
- AC_MSG_ERROR([Unable to find sys_siglist declaration.])
-], [[#include <signal.h>]])
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
@@ -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
{
- log_msg(LOG_DEBUG, "Received signal (%d), %s", fd, sys_siglist[fd]);
+ log_msg(LOG_DEBUG, "Received signal (%d), %s", fd, strsignal(fd));
log_msg(LOG_DEBUG, "Reopening output files");
output_flatfile_reload();
@@ -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
{
- log_msg(LOG_DEBUG, "Received signal (%d), %s", fd, sys_siglist[fd]);
+ log_msg(LOG_DEBUG, "Received signal (%d), %s", fd, strsignal(fd));
#if HAVE_LIBEVENT2
event_base_loopbreak(cfg.eb);
#else

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

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


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

@ -1,25 +0,0 @@
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

+ 0
- 10
net/addrwatch/patches/010-limits.patch View File

@ -1,10 +0,0 @@
--- a/src/addrwatch.c
+++ b/src/addrwatch.c
@@ -4,6 +4,7 @@
#include <signal.h>
#include <strings.h>
#include <unistd.h>
+#include <limits.h>
#include <pwd.h>
#include <grp.h>
#include <argp.h>

Loading…
Cancel
Save