diff --git a/addrwatch-strsignal.patch b/addrwatch-strsignal.patch new file mode 100644 index 0000000..e729c90 --- /dev/null +++ b/addrwatch-strsignal.patch @@ -0,0 +1,36 @@ +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 ]]) + AC_TYPE_UINT32_T + AC_TYPE_UINT16_T + AC_TYPE_UINT8_T +diff --git a/src/addrwatch.c b/src/addrwatch.c +index 139dd3b..d208fad 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 diff --git a/addrwatch.spec b/addrwatch.spec index 56426f2..fd5ffa7 100644 --- a/addrwatch.spec +++ b/addrwatch.spec @@ -2,7 +2,7 @@ Name: addrwatch Version: 1.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Monitoring IPv4/IPv6 and Ethernet address pairings License: GPLv3 @@ -12,9 +12,11 @@ Source1: %{name}.service Source2: %{name}.sysconfig # https://github.com/fln/addrwatch/issues/11 Patch0: addrwatch-fix-dbreconnect.patch +Patch1: addrwatch-strsignal.patch %{?systemd_requires} BuildRequires: libpcap-devel, libevent-devel, systemd, mariadb-devel, sqlite-devel, gcc +BuildRequires: autoconf automake Requires(pre): shadow-utils @@ -39,6 +41,7 @@ extensions (RFC4941). #%patch0 -p1 %build +autoreconf -fiv %configure --enable-sqlite3 --enable-mysql LDFLAGS="-I/usr/include/mysql -L/usr/lib64/mysql" %make_build @@ -78,6 +81,10 @@ exit 0 %systemd_postun_with_restart %{name}.service %changelog +* Thu Jul 23 2020 Jeff Law - 1.0.1-6 +- Use strsignal, not sys_siglist. Corresponding configure.ac changes +- Run autoreconf to generate new configure file. Depend on autoconf/automake + * Tue Jan 28 2020 Fedora Release Engineering - 1.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild