Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at Wed Aug 24 16:21:54 CEST 2011.
-------- --- syslog-ng/syslog-ng.changes 2011-06-06 15:01:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2011-08-24 11:31:13.000000000 +0200 @@ -1,0 +2,22 @@ +Wed Aug 24 08:41:22 UTC 2011 - [email protected] + +- Adopted to require new syslog-service package on 12.x, that + provides the /etc/init.d/syslog LSB init script and systemd + syslog.service service file. Removed syslog-ng.service file + installation from spec file. (fate#311316). + +------------------------------------------------------------------- +Thu Aug 18 15:58:26 CEST 2011 - [email protected] + +- updated to syslog-ng-3.3.0beta2, a new major release with many + new features: + * full multi threading + * mongodb and json output support + * new default port numbers for syslog() + For complete list, please read NEWS file provided in the package. +- removed some unnecessary docs (INSTALL, etc.) +- updated config and enabled multi threading by default +- added json subpackage +- keep only libafsocket.so (the notls version is not used) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:format_spec_file:syslog-ng.spec syslog-ng-3.2.4-less-static.diff syslog-ng-3.2.4-module-path.diff syslog-ng-3.2.4-no-datetime.diff syslog-ng_3.2.4.tar.bz2 New: ---- syslog-ng-3.3.0beta2-cryptoso.diff syslog-ng-3.3.0beta2-fsf.diff syslog-ng-3.3.0beta2-less-static.diff syslog-ng-3.3.0beta2-mongostat.diff syslog-ng-3.3.0beta2-no-datetime.diff syslog-ng_3.3.0beta2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.EZld7a/_old 2011-08-24 16:20:07.000000000 +0200 +++ /var/tmp/diff_new_pack.EZld7a/_new 2011-08-24 16:20:07.000000000 +0200 @@ -19,17 +19,21 @@ Name: syslog-ng -%define eventlog_version 0.2.7 %define with_sql %suse_version > 1130 %define with_systemd %suse_version > 1130 -%define with_klogd %suse_version <= 1140 -Version: 3.2.4 +%define with_syslogservice %suse_version > 1140 +%define with_json %suse_version > 1140 +Version: 3.3.0beta2 Release: 1 License: GPLv2 Group: System/Daemons Summary: The new-generation syslog-daemon Url: http://www.balabit.com/products/syslog_ng/ +%if 0%{?with_syslogservice} +Requires(pre): %insserv_prereq %fillup_prereq syslog-service +%else Requires(pre): %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog +%endif Provides: syslog #Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/%%{version}/source/syslog-ng_%%{version}.tar.gz Source0: syslog-ng_%{version}.tar.bz2 @@ -38,12 +42,20 @@ Source3: syslog-ng.conf.default Patch0: syslog-ng-%{version}-less-static.diff Patch1: syslog-ng-%{version}-no-datetime.diff -%if 0%{?with_sql} -Patch2: syslog-ng-%{version}-module-path.diff -%endif + +#tmp patches, until new release is out +Patch2: syslog-ng-3.3.0beta2-fsf.diff +Patch3: syslog-ng-3.3.0beta2-cryptoso.diff +Patch4: syslog-ng-3.3.0beta2-mongostat.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex gcc-c++ glib2-devel pkgconfig -BuildRequires: klogd python tcpd-devel +BuildRequires: python tcpd-devel +%if 0%{?with_syslogservice} +BuildRequires: syslog-service +%else +BuildRequires: klogd +%endif %if %suse_version > 1130 BuildRequires: libnet-devel %else @@ -54,14 +66,21 @@ # /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. +# +# Note: On 11.4 we do not ship any systemd service file. +# On 12.x, the syslog.service file is provided by +# the syslog-service package. +# BuildRequires: systemd %endif %if 0%{?with_sql} BuildRequires: libdbi-devel %endif +%if 0%{?with_json} +BuildRequires: json-glib-devel +%endif BuildRequires: libevtlog-devel pcre-devel BuildRequires: libopenssl-devel - # only while preparing dist from git # BuildRequires: git @@ -103,24 +122,45 @@ %endif +%if 0%{?with_json} + +%package json +License: GPLv2 +Group: System/Daemons +Summary: JSON output support +Requires: %{name} = %{version} + +%description json +This package provides the tfjson module providing support for +logging in JSON format. To enable it, comment out the library +in %_sysconfdir/syslog-ng/scl/modules.conf + +Authors: +-------- + Balázs Scheidler <[email protected]> + BalaBit IT Ltd. <[email protected]> + +%endif + %prep %setup -q -n syslog-ng-%{version} %if 0%{suse_version} <= 1130 %patch0 -p0 %endif %patch1 -p0 -%if 0%{?with_sql} + +#tmp patches, until there is a new release %patch2 -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 +%patch3 -p1 +%patch4 -p1 + 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 0%{?with_klogd} +%if 0%{?with_syslogservice} +%else sed -i -e 's/\([ \t]*\)\(file.*kmsg.*\)/\1#\2/g' syslog-ng.conf.default %endif %if 0%{?with_systemd} @@ -142,7 +182,7 @@ #automake --foreign --add-missing --copy --force-missing #autoheader # -autoreconf -fiv +# autoreconf -fiv # # - configure syslog-ng using static eventlog library (default) # @@ -156,6 +196,7 @@ --sysconfdir=/etc/syslog-ng \ --localstatedir=/var/lib/syslog-ng \ --with-module-dir="/%_lib/syslog-ng" \ + --with-module-path="/%_lib/syslog-ng:/usr/%_lib/syslog-ng" \ --datadir=/usr/share/syslog-ng \ --prefix=/ \ --exec-prefix=/ \ @@ -172,6 +213,9 @@ %if 0%{?with_sql} --enable-sql \ %endif + %if 0%{?with_json} + --enable-json \ + %endif %if 0%{suse_version} > 1130 --enable-dynamic-linking %else @@ -183,7 +227,7 @@ # make %_smp_mflags -#%check +%check ## ## check #################################################### ## @@ -231,15 +275,24 @@ mv %{buildroot}/%_lib/syslog-ng/libafsql.so %{buildroot}/usr/%_lib/syslog-ng %endif +# move libtfjson to /usr, as it has dependencies there +%if 0%{?with_json} +mv %{buildroot}/%_lib/syslog-ng/libtfjson.so %{buildroot}/usr/%_lib/syslog-ng +%endif + # remove devel files rm %{buildroot}/%_lib/syslog-ng/*.la rm %{buildroot}/%_lib/*.la rm %{buildroot}/%_lib/*.so -%if 0%{?with_systemd} && %suse_version > 1140 -install -d -m755 %{buildroot}/lib/systemd/system -install -m644 doc/examples/syslog-ng.service %{buildroot}/lib/systemd/system/ -%endif +rm %{buildroot}/%_lib/pkgconfig/syslog-ng.pc +rm -fr %{buildroot}/usr/include/syslog-ng +rm -fr %{buildroot}/usr/share/syslog-ng/tools + +# keep only libafsocket-tsl.so +rm %{buildroot}/%_lib/syslog-ng/libafsocket.so +rm %{buildroot}/%_lib/syslog-ng/libafsocket-notls.so +mv %{buildroot}/%_lib/syslog-ng/libafsocket-tls.so %{buildroot}/%_lib/syslog-ng/libafsocket.so %clean ## @@ -362,10 +415,8 @@ ## file list ################################################ ## %defattr(-,root,root) -%doc COPYING AUTHORS README ChangeLog INSTALL NEWS +%doc COPYING AUTHORS ChangeLog NEWS %doc syslog-ng.rc-script syslog-ng.conf.default -%doc doc/examples -# doc/reference/syslog-ng.txt doc/reference/syslog-ng.html %attr(755,root,root) /usr/bin/loggen %attr(755,root,root) /sbin/syslog-ng %attr(755,root,root) /usr/bin/pdbtool @@ -412,8 +463,13 @@ %dir %_libdir/syslog-ng %attr(755,root,root) %_libdir/syslog-ng/libafsql.so %endif -%if 0%{?with_systemd} && 0%suse_version > 1140 -%attr(644,root,root) /lib/systemd/system/syslog-ng.service + +%if 0%{?with_json} + +%files json +%defattr(-,root,root) +%dir %_libdir/syslog-ng +%attr(755,root,root) %_libdir/syslog-ng/libtfjson.so %endif %changelog ++++++ syslog-ng-3.3.0beta2-cryptoso.diff ++++++ From: Balazs Scheidler <[email protected]> Date: Sat, 20 Aug 2011 16:32:21 +0000 (+0200) Subject: lib/Makefile.am: fixed typo in the name of the -avoid-version libtool parameter X-Git-Url: http://git.balabit.hu/?p=bazsi%2Fsyslog-ng-3.3.git;a=commitdiff_plain;h=8a7f6854d26a7ea8fa8c1ff57554046481eb0786 lib/Makefile.am: fixed typo in the name of the -avoid-version libtool parameter Reported-By: Peter Czanik <[email protected]> Signed-off-by: Balazs Scheidler <[email protected]> --- diff --git a/lib/Makefile.am b/lib/Makefile.am index 26c9461..d941a8d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -13,7 +13,7 @@ libsyslog_ng_la_LDFLAGS = -no-undefined module_LTLIBRARIES = libsyslog-ng-crypto.la libsyslog_ng_crypto_la_LIBADD = @CORE_DEPS_LIBS@ libsyslog-ng.la -libsyslog_ng_crypto_la_LDFLAGS = -no-undefined -avoid-versions +libsyslog_ng_crypto_la_LDFLAGS = -no-undefined -avoid-version # this is intentionally formatted so conflicts are less likely to arise. one name in every line. pkginclude_HEADERS = \ ++++++ syslog-ng-3.3.0beta2-fsf.diff ++++++ From: Balazs Scheidler <[email protected]> Date: Mon, 22 Aug 2011 14:35:46 +0000 (+0200) Subject: Copyright fixups X-Git-Url: http://git.balabit.hu/?p=bazsi%2Fsyslog-ng-3.3.git;a=commitdiff_plain;h=1c2a299f966fbeaf3951ddb38d6da4e1a6f01667 Copyright fixups * relicense SCL under GPLv2+ * fixed debian/copyright * fixed FSF addresses --- diff --git a/debian/copyright b/debian/copyright index 6ec1daa..28df6d3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,8 @@ on Sat, 03 Mar 2007 16:07:59 +0100 The original source can always be found at: http://www.balabit.hu/downloads/files/syslog-ng -Copyright (C) 2002-2008 BalaBit IT Security Ltd +Copyright (C) 2002-2011 BalaBit IT Security Ltd +Copyright (C) 1998-2011 Balazs Scheidler * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,4 +19,4 @@ Copyright (C) 2002-2008 BalaBit IT Security Ltd * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/modules/dbparser/patternize.h b/modules/dbparser/patternize.h index 7e4062c..c072d24 100644 --- a/modules/dbparser/patternize.h +++ b/modules/dbparser/patternize.h @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef PATTERNIZE_H_INCLUDED diff --git a/scl/pacct/plugin.conf b/scl/pacct/plugin.conf index bae85d2..2801517 100644 --- a/scl/pacct/plugin.conf +++ b/scl/pacct/plugin.conf @@ -3,9 +3,7 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published -# by the Free Software Foundation. -# -# Note that this permission is granted for only version 2 of the GPL. +# by the Free Software Foundation, or (at your option) any later version. # # As an additional exemption you are allowed to compile & link against the # OpenSSL libraries as published by the OpenSSL project. See the file @@ -18,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################# diff --git a/scl/scl.conf b/scl/scl.conf index faff7d8..ac176bc 100644 --- a/scl/scl.conf +++ b/scl/scl.conf @@ -3,9 +3,7 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published -# by the Free Software Foundation. -# -# Note that this permission is granted for only version 2 of the GPL. +# by the Free Software Foundation, or (at your option) any later version. # # As an additional exemption you are allowed to compile & link against the # OpenSSL libraries as published by the OpenSSL project. See the file @@ -18,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################# # diff --git a/scl/syslogconf/plugin.conf b/scl/syslogconf/plugin.conf index b22fbd3..3503e0b 100644 --- a/scl/syslogconf/plugin.conf +++ b/scl/syslogconf/plugin.conf @@ -3,9 +3,7 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published -# by the Free Software Foundation. -# -# Note that this permission is granted for only version 2 of the GPL. +# by the Free Software Foundation, or (at your option) any later version. # # As an additional exemption you are allowed to compile & link against the # OpenSSL libraries as published by the OpenSSL project. See the file @@ -18,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################# diff --git a/scl/system/generate-system-source.sh b/scl/system/generate-system-source.sh index fab7135..71345f9 100755 --- a/scl/system/generate-system-source.sh +++ b/scl/system/generate-system-source.sh @@ -4,9 +4,7 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published -# by the Free Software Foundation. -# -# Note that this permission is granted for only version 2 of the GPL. +# by the Free Software Foundation, or (at your option) any later version. # # As an additional exemption you are allowed to compile & link against the # OpenSSL libraries as published by the OpenSSL project. See the file @@ -19,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################# diff --git a/scl/system/plugin.conf b/scl/system/plugin.conf index 0490fa7..5ba652e 100644 --- a/scl/system/plugin.conf +++ b/scl/system/plugin.conf @@ -3,9 +3,7 @@ # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published -# by the Free Software Foundation. -# -# Note that this permission is granted for only version 2 of the GPL. +# by the Free Software Foundation, or (at your option) any later version. # # As an additional exemption you are allowed to compile & link against the # OpenSSL libraries as published by the OpenSSL project. See the file @@ -18,7 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # ############################################################################# ++++++ syslog-ng-3.3.0beta2-less-static.diff ++++++ --- syslog-ng/Makefile.am +++ syslog-ng/Makefile.am @@ -14,7 +14,7 @@ syslog_ng_SOURCES = main.c # libtool, because in mixed mode libtool is not used for the final linking # phase. See the comment in the configure script for details. -syslog_ng_LDADD = -L../lib/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@ +syslog_ng_LDADD = -L../lib/.libs -L../lib/ivykis/lib/.libs -L../lib/ivykis/modules/.libs -lsyslog-ng @SYSLOGNG_DEPS_LIBS@ syslog_ng_LINK = @SYSLOGNG_LINK@ syslog_ng_wrapper_SOURCES = wrapper.c --- configure.in.orig 2011-05-24 17:36:41.453000079 +0200 +++ configure.in 2011-05-24 17:41:52.944000081 +0200 @@ -938,7 +938,7 @@ # syslog-ng binary is linked with the default link command (e.g. libtool) SYSLOGNG_LINK='$(LINK)' else - SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS " + SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS -Wl,--no-whole-archive $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS " TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS" CORE_DEPS_LIBS="" ++++++ syslog-ng-3.3.0beta2-mongostat.diff ++++++ X-Git-Url: http://git.balabit.hu/?p=bazsi%2Fsyslog-ng-3.3.git;a=blobdiff_plain;f=modules%2Fafmongodb%2Fafmongodb.c;fp=modules%2Fafmongodb%2Fafmongodb.c;h=9e155ed5086ab2e33d734f7151c4be039b55dadb;hp=f82f10e12e0ed52e354d10333c2ee3b07a6ae073;hb=524395318d704dbce48f5e260902212ece69cfaa;hpb=207bb135eecf74981bda130a38c741b7700d3f10 diff --git a/modules/afmongodb/afmongodb.c b/modules/afmongodb/afmongodb.c index f82f10e..9e155ed 100644 --- a/modules/afmongodb/afmongodb.c +++ b/modules/afmongodb/afmongodb.c @@ -439,12 +439,14 @@ afmongodb_dd_init(LogPipe *s) self->queue = log_dest_driver_acquire_queue(&self->super, afmongodb_dd_format_persist_name(self)); + stats_lock(); stats_register_counter(0, SCS_MONGODB | SCS_DESTINATION, self->super.super.id, afmongodb_dd_format_stats_instance(self), SC_TYPE_STORED, &self->stored_messages); stats_register_counter(0, SCS_MONGODB | SCS_DESTINATION, self->super.super.id, afmongodb_dd_format_stats_instance(self), SC_TYPE_DROPPED, &self->dropped_messages); + stats_unlock(); log_queue_set_counters(self->queue, self->stored_messages, self->dropped_messages); afmongodb_dd_start_thread(self); ++++++ syslog-ng-3.3.0beta2-no-datetime.diff ++++++ --- syslog-ng/main.c.orig 2011-05-24 17:32:35.696000107 +0200 +++ syslog-ng/main.c 2011-05-24 17:33:04.886000067 +0200 @@ -128,7 +128,9 @@ printf(PACKAGE " " VERSION "\n" "Installer-Version: %s\n" "Revision: " SOURCE_REVISION "\n" +#if 0 "Compile-Date: " __DATE__ " " __TIME__ "\n" +#endif "Default-Modules: %s\n" "Available-Modules: ", installer_version, ++++++ syslog-ng.conf.default ++++++ --- /var/tmp/diff_new_pack.EZld7a/_old 2011-08-24 16:20:07.000000000 +0200 +++ /var/tmp/diff_new_pack.EZld7a/_new 2011-08-24 16:20:07.000000000 +0200 @@ -1,4 +1,4 @@ -@version:3.2 +@version:3.3 @include "scl.conf" # @@ -16,7 +16,7 @@ # # Global options. # -options { long_hostnames(off); flush_lines(0); perm(0640); stats_freq(3600); }; +options { chain_hostnames(off); flush_lines(0); perm(0640); stats_freq(3600); threaded(yes); }; # # 'src' is our main source definition. you can add ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
