Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at 2019-01-21 10:48:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslog-ng (Old) and /work/SRC/openSUSE:Factory/.syslog-ng.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslog-ng" Mon Jan 21 10:48:16 2019 rev:99 rq:664014 version:3.19.1 Changes: -------- --- /work/SRC/openSUSE:Factory/syslog-ng/syslog-ng.changes 2018-12-07 14:40:11.878714525 +0100 +++ /work/SRC/openSUSE:Factory/.syslog-ng.new.28833/syslog-ng.changes 2019-01-21 10:48:56.508122721 +0100 @@ -1,0 +2,18 @@ +Tue Jan 8 15:34:51 UTC 2019 - pe...@czanik.hu + +- added 2482.patch to resolve GPL-2.0 vs. BSD-4-Clause + compatibility problem. + +------------------------------------------------------------------- +Fri Dec 21 20:22:25 UTC 2018 - sch...@suse.de + +- Allow building with java 1.8.0. +- Use %license + +------------------------------------------------------------------- +Mon Dec 17 11:02:46 UTC 2018 - pe...@czanik.hu + +- updated to 3.19.1 +- changed summary again + +------------------------------------------------------------------- Old: ---- syslog-ng-3.18.1.tar.gz New: ---- 2482.patch syslog-ng-3.19.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.GRfe2e/_old 2019-01-21 10:48:57.840121095 +0100 +++ /var/tmp/diff_new_pack.GRfe2e/_new 2019-01-21 10:48:57.844121089 +0100 @@ -1,7 +1,7 @@ # # spec file for package syslog-ng # -# Copyright (c) 2018 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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -30,9 +30,9 @@ %endif %define syslog_ng_sockets_cfg %{syslog_ng_rundir}/additional-log-sockets.conf -Version: 3.18.1 +Version: 3.19.1 Release: 0 -Summary: A syslog implementation with content-based filtering and networking +Summary: Enhanced system logging daemon License: GPL-2.0-only Group: System/Daemons Url: http://syslog-ng.org/ @@ -41,6 +41,7 @@ Source2: syslog-ng.conf.default Source3: syslog-ng.service Source4: syslog-ng-service-prepare +Patch0: 2482.patch %if 0%{?suse_version} >= 1500 %global py_ver 3.6 @@ -121,7 +122,7 @@ %endif %if %{with java} -BuildRequires: java-devel <= 1.8 +BuildRequires: java-devel < 1.9 %endif %if %{with python} @@ -136,7 +137,7 @@ Requires(pre): group(news) %endif -Requires: libevtlog-3_18-0 +Requires: libevtlog-3_19-0 Obsoletes: syslog-ng-json @@ -160,11 +161,11 @@ * hand on messages for further processing using message queues (like AMQP), files or databases (like PostgreSQL or MongoDB). -%package -n libevtlog-3_18-0 +%package -n libevtlog-3_19-0 Summary: Syslog-ng event logger library runtime Group: System/Libraries -%description -n libevtlog-3_18-0 +%description -n libevtlog-3_19-0 The EventLog library provides an alternative to the simple syslog() API provided on UNIX systems. Compared to syslog, EventLog adds structured messages. @@ -248,6 +249,7 @@ %prep %setup -q -n syslog-ng-%{version} +%patch0 -p1 # fill out placeholders in the config, # systemd service and prepare script. for file in \ @@ -471,16 +473,17 @@ # %{service_del_postun syslog-ng.service} -%post -n libevtlog-3_18-0 -p /sbin/ldconfig +%post -n libevtlog-3_19-0 -p /sbin/ldconfig -%postun -n libevtlog-3_18-0 -p /sbin/ldconfig +%postun -n libevtlog-3_19-0 -p /sbin/ldconfig %files ## ## file list ################################################ ## %defattr(-,root,root) -%doc COPYING AUTHORS NEWS.md +%license COPYING +%doc AUTHORS NEWS.md %doc syslog-ng.conf.default /sbin/syslog-ng %attr(755,root,root) %{_sbindir}/syslog-ng @@ -526,6 +529,7 @@ %dir %{_datadir}/syslog-ng/include/scl/sudo/ %dir %{_datadir}/syslog-ng/include/scl/graylog2/ %dir %{_datadir}/syslog-ng/include/scl/linux-audit/ +%dir %{_datadir}/syslog-ng/include/scl/slack/ %dir %{_datadir}/syslog-ng/xsd %dir %{_sysconfdir}/syslog-ng %dir %{_sysconfdir}/syslog-ng/conf.d @@ -612,9 +616,10 @@ %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/sudo/sudo.conf %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/graylog2/plugin.conf %attr(644,root,root) %{_datadir}/syslog-ng/include/scl/linux-audit/linux-audit.conf +%attr(644,root,root) %{_datadir}/syslog-ng/include/scl/slack/slack.conf %attr(644,root,root) %{_datadir}/syslog-ng/xsd/* -%files -n libevtlog-3_18-0 +%files -n libevtlog-3_19-0 %{_libdir}/libevtlog-*.so.* %if %{with curl} ++++++ 2482.patch ++++++ >From a240d0f48202c41eaac6102a2f32f3d5ff561038 Mon Sep 17 00:00:00 2001 From: Balazs Scheidler <balazs.scheid...@oneidentity.com> Date: Mon, 7 Jan 2019 16:16:48 +0100 Subject: [PATCH] lib/compat: replace strcasestr() implementation This patch removes the old strcasestr() implementation and replaces it with the one in NetBSD, which uses the 3 clause BSD license. Signed-off-by: Balazs Scheidler <balazs.scheid...@oneidentity.com> --- lib/compat/strcasestr.c | 59 +++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/lib/compat/strcasestr.c b/lib/compat/strcasestr.c index bf3b46b9fc..a06d6460dc 100644 --- a/lib/compat/strcasestr.c +++ b/lib/compat/strcasestr.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2002-2013 Balabit - * Copyright (c) 1998-2011 Balázs Scheidler + * Copyright (c) 2002-2019 Balabit + * Copyright (c) 1998-2019 Balázs Scheidler * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,17 @@ * OpenSSL libraries as published by the OpenSSL project. See the file * COPYING for details. * - */ + * + * This code has been copied from NetBSD libc implementation with a + * permissive license with this CVSID, from + * + * https://github.com/NetBSD/src/blob/trunk/lib/libc/string/strcasestr.c + * + * $NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $ */ /*- * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Chris Torek. @@ -37,11 +43,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -66,29 +68,28 @@ #include <string.h> #include <strings.h> + +/* + * Find the first occurrence of find in s, ignore case. + */ char * -strcasestr(const char *haystack, const char *needle) +strcasestr(const char *s, const char *find) { - char c; - size_t len; - - if ((c = *needle++) != 0) - { - c = tolower((unsigned char) c); - len = strlen(needle); + char c, sc; + size_t len; - do - { - for (; *haystack && tolower((unsigned char) *haystack) != c; haystack++) - ; - if (!(*haystack)) - return NULL; - haystack++; - } - while (strncasecmp(haystack, needle, len) != 0); - haystack--; - } - return (char *) haystack; + if ((c = *find++) != 0) { + c = tolower((unsigned char)c); + len = strlen(find); + do { + do { + if ((sc = *s++) == 0) + return (NULL); + } while ((char)tolower((unsigned char)sc) != c); + } while (strncasecmp(s, find, len) != 0); + s--; + } + return (char *) s; } #endif ++++++ syslog-ng-3.18.1.tar.gz -> syslog-ng-3.19.1.tar.gz ++++++ ++++ 68443 lines of diff (skipped)
