Hello community,
here is the log from the commit of package syslog-ng for openSUSE:Factory
checked in at Thu Feb 3 01:31:47 CET 2011.
--------
--- syslog-ng/syslog-ng.changes 2010-12-05 23:03:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2011-02-02 14:39:33.000000000 +0100
@@ -1,0 +2,54 @@
+Wed Feb 2 13:37:40 UTC 2011 - mt@suse.de
+
+- Moved sql support lib into separate syslog-ng-sql package,
+ adopted the module-path patch and disabled loading of the
+ sql module in scl/modules.conf config file by default.
+ Adopted spec file to use with_sql for conditional build.
+
+-------------------------------------------------------------------
+Wed Feb 2 10:04:30 CET 2011 - czanik@balabit.hu
+
+- added module-path patch to be able to load modules
+ also from /usr and removes an ugly warning message
+
+-------------------------------------------------------------------
+Tue Feb 1 16:50:31 UTC 2011 - mt@suse.de
+
+- Merged all the systemd integration steps patches into one.
+
+-------------------------------------------------------------------
+Tue Feb 1 15:19:46 CET 2011 - czanik@balabit.hu
+
+- added systemd patches from algernon@balabit.hu
+
+-------------------------------------------------------------------
+Fri Jan 28 12:11:33 CET 2011 - czanik@balabit.hu
+
+- add database (libdbi) support for 11.4 and up
+- use systemd patches only on 11.4 and up
+
+-------------------------------------------------------------------
+Tue Jan 18 16:26:33 UTC 2011 - mt@suse.de
+
+- Updated systemd support to the patch set sent upstream and
+ additional workaround to not break the syslog-ng.ctl sock.
+ Current limitation is, that *all* unix sockets have to be
+ set up same way, that is either systemd activated or not,
+ because the systemd patch disables unlink&bind functions.
+
+-------------------------------------------------------------------
+Tue Jan 18 11:40:47 CET 2011 - czanik@balabit.hu
+
+- temporarily disabled systemd support
+- update to 3.2.2 bugfix release
+
+-------------------------------------------------------------------
+Fri Dec 10 17:13:21 UTC 2010 - mt@suse.de
+
+- Implemented a first version of systemd socket activation support
+- Enabled suppress config option to catch log message dupplicates
+ in case a program runs amok until disk is full (bnc#656197).
+- Disabled build date/time in binary to avoid rebuild (rpmlint).
+- Do not install /lib*/libsyslog-ng.so devel file (rpmlint).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
syslog-ng-3.2.1-less-static.dif
syslog-ng_3.2.1.tar.bz2
New:
----
syslog-ng-3.2.2-less-static.dif
syslog-ng-3.2.2-module-path.diff
syslog-ng-3.2.2-no-datetime.diff
syslog-ng-3.2.2-systemd-integration.bnc656104.diff
syslog-ng_3.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslog-ng.spec ++++++
--- /var/tmp/diff_new_pack.AHvmi5/_old 2011-02-03 01:27:00.000000000 +0100
+++ /var/tmp/diff_new_pack.AHvmi5/_new 2011-02-03 01:27:00.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package syslog-ng (Version 3.2.1)
+# spec file for package syslog-ng
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,8 @@
Name: syslog-ng
%define eventlog_version 0.2.7
-Version: 3.2.1
+%define with_sql %suse_version > 1130
+Version: 3.2.2
Release: 1
License: GPLv2
Group: System/Daemons
@@ -34,17 +35,29 @@
Source2: syslog-ng.sysconfig
Source3: syslog-ng.conf.default
Patch0: syslog-ng-%{version}-less-static.dif
+Patch1: syslog-ng-%{version}-no-datetime.diff
+Patch2: syslog-ng-%{version}-systemd-integration.bnc656104.diff
+%if 0%{?with_sql}
+Patch3: syslog-ng-%{version}-module-path.diff
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison flex gcc-c++ glib2-devel pkgconfig
BuildRequires: klogd python tcpd-devel
%if %suse_version > 1130
BuildRequires: libnet-devel
+# The systemd package provides
+# /usr/share/doc/packages/systemd/sd-daemon.[ch]
+# (http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.[ch])
+# files we need for socket activation, see bnc#656259.
+BuildRequires: systemd
%else
BuildRequires: libnet
%endif
+%if 0%{?with_sql}
+BuildRequires: libdbi-devel
+%endif
BuildRequires: libevtlog-devel pcre-devel
BuildRequires: libopenssl-devel
-#BuildRequires: libdbi-devel
# only while preparing dist from git
# BuildRequires: git
@@ -61,23 +74,55 @@
The official home page of syslog-ng is:
http://www.balabit.com/network-security/syslog-ng/
+Authors:
+--------
+ Balázs Scheidler
+ BalaBit IT Ltd.
+
+
+%if 0%{?with_sql}
+%package sql
+License: GPLv2
+Group: System/Daemons
+Summary: SQL support using DBI
+Requires: %{name} = %{version}
+
+%description sql
+This package provides the libafsql module providing support for
+logging into a SQL database using DBI. To enable it, comment
+out the library in %_sysconfdir/syslog-ng/scl/modules.conf
Authors:
--------
Balázs Scheidler
BalaBit IT Ltd.
+%endif
+
%prep
%setup -q -n syslog-ng-%{version}
%if 0%{suse_version} <= 1130
%patch0 -p0
%endif
+%patch1 -p0
+%if %suse_version > 1130
+%patch2 -p1
+%endif
+%if 0%{?with_sql}
+%patch3 -p1
+# change module-path to be arch specific & enable it
+sed -i -e 's|#@define module-path .*|@define module-path "/%_lib/syslog-ng:%_libdir/syslog-ng|g' \
+ scl/modules.conf
+%endif
cp -a $RPM_SOURCE_DIR/syslog-ng.rc-script .
cp -a $RPM_SOURCE_DIR/syslog-ng.conf.default .
%ifarch s390 s390x
sed -i -e 's/tty10/console/g' syslog-ng.conf.default
%endif
+%if %suse_version > 1130
+cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] modules/afsocket/
+%endif
%build
##
@@ -94,7 +139,7 @@
#automake --foreign --add-missing --copy --force-missing
#autoheader
#
-#autoreconf -fiv
+autoreconf -fiv
#
# - configure syslog-ng using static eventlog library (default)
#
@@ -104,11 +149,12 @@
--enable-ipv6 \
--enable-tcp-wrapper \
--enable-spoof-source \
+%if 0%{?sles_version}
+ --disable-pcre \
+%else
%if 0%{?suse_version}
--enable-pcre \
%endif
-%if 0%{?sles_version}
- --disable-pcre \
%endif
--with-pidfile-dir=/var/run \
--sysconfdir=/etc/syslog-ng \
@@ -118,14 +164,15 @@
--prefix=/ \
--exec-prefix=/ \
--enable-ssl \
+%if 0%{?with_sql}
+ --enable-sql \
+%endif
%if 0%{suse_version} > 1130
--enable-dynamic-linking
%else
--enable-mixed-linking
%endif
-# SQL needs adding --enable-sql
-
#
# - build syslog-ng
#
@@ -173,13 +220,16 @@
mkdir -p %{buildroot}/%_lib
%{__mv} -v %{buildroot}/usr/%_lib/* %{buildroot}/%_lib
+%if 0%{?with_sql}
# move libafsql to /usr, as it has dependencies there
-#mkdir -p %{buildroot}/usr/%_lib/syslog-ng
-#mv %{buildroot}/%_lib/syslog-ng/libafsql.so %{buildroot}/usr/%_lib/syslog-ng
+mkdir -p %{buildroot}/usr/%_lib/syslog-ng
+mv %{buildroot}/%_lib/syslog-ng/libafsql.so %{buildroot}/usr/%_lib/syslog-ng
+%endif
-# remove .a and .la files
+# remove devel files
rm %{buildroot}/%_lib/syslog-ng/*.la
rm %{buildroot}/%_lib/*.la
+rm %{buildroot}/%_lib/*.so
%clean
##
@@ -309,7 +359,9 @@
%{_mandir}/man1/syslog-ng-ctl.1*
%dir /etc/syslog-ng
%dir /%_lib/syslog-ng
-#%dir /usr/%_lib/syslog-ng
+%if 0%{?with_sql}
+%dir %_libdir/syslog-ng
+%endif
%dir /usr/share/syslog-ng
%dir /usr/share/syslog-ng/include
%dir /usr/share/syslog-ng/include/scl
@@ -323,9 +375,9 @@
%dir /var/lib/syslog-ng
%attr(755,root,root) %ghost %dir /var/run/syslog-ng
/var/adm/fillup-templates/sysconfig.syslog-ng
-%attr(755,root,root) /%_lib/libsyslog-ng*
+%attr(755,root,root) /%_lib/libsyslog-ng.so.*
%attr(755,root,root) /%_lib/syslog-ng/*
-#%attr(755,root,root) /usr/%_lib/syslog-ng/*
+%attr(755,root,root) /%_lib/libsyslog-ng-patterndb.so.*
%attr(644,root,root) /usr/share/syslog-ng/include/scl/pacct/plugin.conf
%attr(755,root,root) /usr/share/syslog-ng/include/scl/system/generate-system-source.sh
%attr(644,root,root) /usr/share/syslog-ng/include/scl/system/plugin.conf
@@ -336,4 +388,12 @@
%attr(644,root,root) /usr/share/syslog-ng/xsd/patterndb-2.xsd
%attr(644,root,root) /usr/share/syslog-ng/xsd/patterndb-3.xsd
+%if 0%{?with_sql}
+
+%files sql
+%defattr(-,root,root)
+%dir %_libdir/syslog-ng
+%attr(755,root,root) %_libdir/syslog-ng/libafsql.so
+%endif
+
%changelog
++++++ syslog-ng-3.2.1-less-static.dif -> syslog-ng-3.2.2-less-static.dif ++++++
++++++ syslog-ng-3.2.2-module-path.diff ++++++
--- a/scl/modules.conf 2010-11-20 09:47:33.000000000 +0100
+++ b/scl/modules.conf 2011-02-02 10:00:23.134862483 +0100
@@ -16,6 +16,7 @@
# over the modules loaded, simply don't include this file.
@define autoload-compiled-modules 0
+#@define module-path "/lib/syslog-ng:/usr/lib/syslog-ng:/lib64/syslog-ng:/usr/lib64/syslog-ng"
@module syslogformat
@module basicfuncs
@module afsocket
--- a/lib/cfg.c 2011-01-04 12:57:06.000000000 +0100
+++ b/lib/cfg.c 2011-02-02 11:33:15.601789792 +0100
@@ -285,9 +285,6 @@
plugin_load_module("afuser", self, NULL);
plugin_load_module("dbparser", self, NULL);
plugin_load_module("csvparser", self, NULL);
-#if ENABLE_SQL_MODULE
- plugin_load_module("afsql", self, NULL);
-#endif
#if ENABLE_SUN_STREAMS_MODULE
plugin_load_module("afstreams", self, NULL);
#endif
++++++ syslog-ng-3.2.2-no-datetime.diff ++++++
--- syslog-ng/main.c
+++ syslog-ng/main.c 2010/12/06 17:06:01
@@ -333,7 +333,9 @@
printf(PACKAGE " " VERSION "\n"
"Installer-Version: %s\n"
"Revision: " SOURCE_REVISION "\n"
+#if 0
"Compile-Date: " __DATE__ " " __TIME__ "\n"
+#endif
"Enable-Threads: %s\n"
"Enable-Debug: %s\n"
"Enable-GProf: %s\n"
++++++ syslog-ng-3.2.2-systemd-integration.bnc656104.diff ++++++
++++ 1224 lines (skipped)
++++++ syslog-ng.conf.default ++++++
--- /var/tmp/diff_new_pack.AHvmi5/_old 2011-02-03 01:27:00.000000000 +0100
+++ /var/tmp/diff_new_pack.AHvmi5/_new 2011-02-03 01:27:00.000000000 +0100
@@ -99,10 +99,10 @@
#
# Most warning and errors on tty10 and on the xconsole pipe:
#
-destination console { file("/dev/tty10" owner(-1) group(-1) perm(-1)); };
+destination console { file("/dev/tty10" suppress(30) owner(-1) group(-1) perm(-1)); };
log { source(src); source(chroots); filter(f_console); destination(console); };
-destination xconsole { pipe("/dev/xconsole" owner(-1) group(-1) perm(-1)); };
+destination xconsole { pipe("/dev/xconsole" suppress(30) owner(-1) group(-1) perm(-1)); };
log { source(src); source(chroots); filter(f_console); destination(xconsole); };
# Enable this, if you want that root is informed immediately,
@@ -116,15 +116,15 @@
# News-messages in separate files:
#
destination newscrit { file("/var/log/news/news.crit"
- owner(news) group(news)); };
+ suppress(30) owner(news) group(news)); };
log { source(src); source(chroots); filter(f_newscrit); destination(newscrit); };
destination newserr { file("/var/log/news/news.err"
- owner(news) group(news)); };
+ suppress(30) owner(news) group(news)); };
log { source(src); source(chroots); filter(f_newserr); destination(newserr); };
destination newsnotice { file("/var/log/news/news.notice"
- owner(news) group(news)); };
+ suppress(30) owner(news) group(news)); };
log { source(src); source(chroots); filter(f_newsnotice); destination(newsnotice); };
#
@@ -138,26 +138,26 @@
#
# Mail-messages in separate files:
#
-destination mailinfo { file("/var/log/mail.info"); };
+destination mailinfo { file("/var/log/mail.info" suppress(30)); };
log { source(src); source(chroots); filter(f_mailinfo); destination(mailinfo); };
-destination mailwarn { file("/var/log/mail.warn"); };
+destination mailwarn { file("/var/log/mail.warn" suppress(30)); };
log { source(src); source(chroots); filter(f_mailwarn); destination(mailwarn); };
-destination mailerr { file("/var/log/mail.err" fsync(yes)); };
+destination mailerr { file("/var/log/mail.err" suppress(30) fsync(yes)); };
log { source(src); source(chroots); filter(f_mailerr); destination(mailerr); };
#
# and also all in one file:
#
-destination mail { file("/var/log/mail"); };
+destination mail { file("/var/log/mail" suppress(30)); };
log { source(src); source(chroots); filter(f_mail); destination(mail); };
#
# acpid messages in one file:
#
-destination acpid { file("/var/log/acpid"); };
+destination acpid { file("/var/log/acpid" suppress(30)); };
destination devnull { };
log { source(src); source(chroots); filter(f_acpid); destination(acpid); flags(final); };
#
@@ -173,7 +173,7 @@
#
# NetworkManager messages in one file:
#
-destination netmgm { file("/var/log/NetworkManager"); };
+destination netmgm { file("/var/log/NetworkManager" suppress(30)); };
log { source(src); source(chroots); filter(f_netmgm); destination(netmgm); flags(final); };
@@ -181,35 +181,35 @@
# Cron-messages in one file:
# (don't forget to provide logrotation config)
#
-#destination cron { file("/var/log/cron"); };
+#destination cron { file("/var/log/cron" suppress(30)); };
#log { source(src); source(chroots); filter(f_cron); destination(cron); };
#
# Some boot scripts use/require local[1-7]:
#
-destination localmessages { file("/var/log/localmessages"); };
+destination localmessages { file("/var/log/localmessages" suppress(30)); };
log { source(src); source(chroots); filter(f_local); destination(localmessages); };
#
# All messages except iptables and the facilities news and mail:
#
-destination messages { file("/var/log/messages" owner(-1) group(-1) perm(-1)); };
+destination messages { file("/var/log/messages" suppress(30) owner(-1) group(-1) perm(-1)); };
log { source(src); source(chroots); filter(f_messages); destination(messages); };
#
# Firewall (iptables) messages in one file:
#
-destination firewall { file("/var/log/firewall"); };
+destination firewall { file("/var/log/firewall" suppress(30)); };
log { source(src); source(chroots); filter(f_iptables); destination(firewall); };
#
# Warnings (except iptables) in one file:
#
-destination warn { file("/var/log/warn" fsync(yes)); };
+destination warn { file("/var/log/warn" suppress(30) fsync(yes)); };
log { source(src); source(chroots); filter(f_warn); destination(warn); };
++++++ syslog-ng_3.2.1.tar.bz2 -> syslog-ng_3.2.2.tar.bz2 ++++++
++++ 17549 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org