diff --git a/.gitignore b/.gitignore index 47f8b1c..ae99072 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /addrwatch-1.0.1.tar.gz results_addrwatch addrwatch-*.rpm -/addrwatch-1.0.2.tar.gz diff --git a/addrwatch-strsignal.patch b/addrwatch-strsignal.patch deleted file mode 100644 index e729c90..0000000 --- a/addrwatch-strsignal.patch +++ /dev/null @@ -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 ]]) - 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 60e0fe0..56426f2 100644 --- a/addrwatch.spec +++ b/addrwatch.spec @@ -1,20 +1,21 @@ %global _hardened_build 1 Name: addrwatch -Version: 1.0.2 -Release: 15%{?dist} +Version: 1.0.1 +Release: 5%{?dist} Summary: Monitoring IPv4/IPv6 and Ethernet address pairings -License: GPL-3.0-only +License: GPLv3 URL: https://github.com/fln/addrwatch -Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/fln/addrwatch/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.sysconfig +# https://github.com/fln/addrwatch/issues/11 +Patch0: addrwatch-fix-dbreconnect.patch %{?systemd_requires} -BuildRequires: libpcap-devel, libevent-devel, systemd, mariadb-connector-c-devel, sqlite-devel, gcc -BuildRequires: autoconf automake -BuildRequires: make +BuildRequires: libpcap-devel, libevent-devel, systemd, mariadb-devel, sqlite-devel, gcc +Requires(pre): shadow-utils %description @@ -34,14 +35,10 @@ extensions (RFC4941). %prep %autosetup -p1 - -# Create a sysusers.d config file -cat >addrwatch.sysusers.conf </dev/null || groupadd -r %{name} +getent passwd %{name} >/dev/null || \ + useradd -r -g %{name} -d /var/lib/%{name} -s /sbin/nologin \ + -c "network neighborhoud watch" %{name} +exit 0 %post %systemd_post %{name}.service @@ -78,69 +78,6 @@ install -m0644 -D addrwatch.sysusers.conf %{buildroot}%{_sysusersdir}/addrwatch. %systemd_postun_with_restart %{name}.service %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 1.0.2-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 1.0.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.0.2-13 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Thu Jan 16 2025 Fedora Release Engineering - 1.0.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.0.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.0.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.0.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Oct 06 2023 Jens Kuehnel - 1.0.2-8 -- switch to correct mariadb buildReq as requested by Michal Schorm - -* Wed Jul 19 2023 Fedora Release Engineering - 1.0.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.0.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.0.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.0.2-2 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Mon Jan 25 2021 Fedora Release Engineering - 1.0.2-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Sep 28 2020 Jens Kuehnel - 1.0.1-0 -- update to 1.0.2 - -* Mon Sep 28 2020 Jens Kuehnel - 1.0.1-9 -- rebuilt for new libevent side tag 'f34-build-side-30069' - -* Fri Jul 31 2020 Fedora Release Engineering - 1.0.1-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.0.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* 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 diff --git a/sources b/sources index c59e727..f97875f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (addrwatch-1.0.2.tar.gz) = b26738e1d90cb8d3b845cf13fa5e6246226281850d144899984f33ee6119338bb640edb9e8ed9c29b574e35e9b7056ea2a8fbf4eab2ef3969ca4b37ed827d8b9 +SHA512 (addrwatch-1.0.1.tar.gz) = bc6f9193bc5dec3b2716ba220d274409fc0a220f5441dcdae5b1fef5e2e1d405898023944fe45263d2869861bb4dec3691d0de04a36eb89cb835e118341a0c8d