Hello community, here is the log from the commit of package addrwatch for openSUSE:Factory checked in at 2019-08-05 10:40:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/addrwatch (Old) and /work/SRC/openSUSE:Factory/.addrwatch.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "addrwatch" Mon Aug 5 10:40:40 2019 rev:4 rq:720631 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/addrwatch/addrwatch.changes 2017-05-18 20:51:20.301703438 +0200 +++ /work/SRC/openSUSE:Factory/.addrwatch.new.4126/addrwatch.changes 2019-08-05 10:41:09.575300366 +0200 @@ -1,0 +2,24 @@ +Fri Aug 2 12:41:58 UTC 2019 - Karol Babioch <[email protected]> + +- Using %autosetup macro. + +------------------------------------------------------------------- +Thu Aug 1 22:52:24 UTC 2019 - Karol Babioch <[email protected]> + +- Removed subpackage due to unneeded complexity. + +------------------------------------------------------------------- +Thu Aug 1 22:42:18 UTC 2019 - Karol Babioch <[email protected]> + +- Split off addrwatch_mysql into subpackage (addrwatch-mysql). + +------------------------------------------------------------------- +Thu Aug 1 22:11:01 UTC 2019 - Karol Babioch <[email protected]> + +- Added fix-db-reconnect-issue.patch: Addresses an compilation + issue: https://github.com/fln/addrwatch/issues/11 +- Enabled MySQL support +- Applied spec-cleaner +- Removed no longer needed rpmlintrc file + +------------------------------------------------------------------- Old: ---- addrwatch-rpmlintrc New: ---- fix-db-reconnect-issue.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ addrwatch.spec ++++++ --- /var/tmp/diff_new_pack.wbDlbP/_old 2019-08-05 10:41:10.471300263 +0200 +++ /var/tmp/diff_new_pack.wbDlbP/_new 2019-08-05 10:41:10.475300262 +0200 @@ -1,7 +1,7 @@ # # spec file for package addrwatch # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,17 +20,17 @@ Version: 1.0.1 Release: 0 Summary: A tool for IPv4/IPv6 and Ethernet address pairing monitoring -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Networking/Diagnostic -Url: https://github.com/fln/addrwatch +URL: https://github.com/fln/addrwatch Source0: https://github.com/fln/addrwatch/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: %{name}-rpmlintrc +Patch0: fix-db-reconnect-issue.patch BuildRequires: autoconf >= 2.68 BuildRequires: automake BuildRequires: libevent-devel +BuildRequires: libmysqlclient-devel BuildRequires: libpcap-devel BuildRequires: sqlite3-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is a tool similar to arpwatch. It main purpose is to monitor @@ -50,23 +50,24 @@ instead logs all the events that allow pairing discovery. %prep -%setup -q +%autosetup -p1 %build autoreconf -fi -%configure --enable-sqlite3 --bindir=%{_sbindir} +%configure --enable-mysql --enable-sqlite3 --bindir=%{_sbindir} make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +%make_install chmod -x scripts/dump2pcap.pl %files -%defattr(-,root,root,-) -%doc COPYING NEWS README.md scripts/dump2pcap.pl +%license COPYING +%doc NEWS README.md scripts/dump2pcap.pl %{_sbindir}/addrwatch +%{_sbindir}/addrwatch_mysql %{_sbindir}/addrwatch_stdout %{_sbindir}/addrwatch_syslog -%{_mandir}/man8/addrwatch.8.gz +%{_mandir}/man8/addrwatch.8%{?ext_man} %changelog ++++++ fix-db-reconnect-issue.patch ++++++ >From 3ac9f4e421e4471b08875f8e82c8d367fa9dc243 Mon Sep 17 00:00:00 2001 From: Julius Kriukas <[email protected]> Date: Wed, 28 Mar 2018 21:29:56 +0300 Subject: [PATCH] Mark db_reconnect as static inline, fixes GH-11 --- src/addrwatch_mysql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addrwatch_mysql.c b/src/addrwatch_mysql.c index 389153f..b4ed760 100644 --- a/src/addrwatch_mysql.c +++ b/src/addrwatch_mysql.c @@ -232,7 +232,7 @@ void db_disconnect(struct ctx_s *data) data->dbh = NULL; } -inline void db_reconnect(struct ctx_s *data) { +static inline void db_reconnect(struct ctx_s *data) { while (1) { if (data->dbh) db_disconnect(data);
