cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

addrwatch: update to 1.0.2

Browse Source 
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>
This commit is contained in:
Rosen Penev
2020-02-26 20:54:28 -08:00
parent 513513c4d0
commit f1a7d509b5
5 changed files with 13 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/addrwatch/patches/001-fix-sys_siglist.patch
-36
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
net/addrwatch/patches/002-fix-uclibc-sysconf.patch
+1 -1
View File
@@ -1,6 +1,6 @@
--- a/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);
if (!cfg.hostname) {
net/addrwatch/patches/003-fix-pkt-hash.patch
-25
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
net/addrwatch/patches/010-limits.patch
-10
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>