Hello community,
here is the log from the commit of package syslog-ng for openSUSE:Factory
checked in at Tue Jun 28 11:10:27 CEST 2011.
--------
--- syslog-ng/syslog-ng.changes 2011-05-27 09:54:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2011-06-06 15:01:07.000000000 +0200
@@ -1,0 +2,34 @@
+Mon Jun 6 12:55:40 UTC 2011 - mt@suse.de
+
+- Updated to syslog-ng-3.2.4, maintenance release fixing several
+ issues -- a digest of the changes:
+ * A bug was found in the pcre implementation for subst(). If the
+ "global" flag is specified and pcre returns an error, an infinite
+ loop is created, consuming memory in the process. It is triggered
+ by PCRE 8.12, but could potentially affect older versions too.
+ (bnc#697374, CVE-2011-1951)
+ * Fixed a potential use of uninitialized memory in the configuration
+ file parser, no bug was triggered but gcc 4.6 reported it via a
+ warning.
+ * Fixed a possible security issue on Debian/kFreeBSD and on platforms
+ where mode_t is an unsigned 16 bit value (FreeBSD,HP-UX).
+ (CVE-2011-0343)
+ * Fixes an y2k38 problem that causes syslog-ng to use 100% CPU time
+ in case mark messages are enabled and the UNIX timestamps overflows
+ a signed 32 bit counter, which happens in 19th, January 2038.
+ * Fixed file() destination to work on device nodes (e.g. files in
+ /dev). Without this change, syslog-ng started using 100% CPU time
+ if given devices as destinations that couldn't always consume data.
+ * Don't attempt to remember the current file position for source
+ files that are read with follow-freq(0), e.g. /dev/klog and /proc/kmsg.
+ * Added systemd socket activation support.
+ For complete list, please read NEWS file provided in the package.
+- Removed obsolete systemd integration patch, added to install syslog-ng
+ service file as forced in bnc#696963 even feature 311316 is not yet
+ implemented, that is, log rotation files do not work, chroot socket
+ config file is never generated when running under systemd.
+- Enabled to read kernel messages directly (/proc/kmsg) for 12.x
+- Added generation of dummy additional-log-sockets.conf in post install
+- Adopted less static patch to build on 11.3.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
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
New:
----
_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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _service:format_spec_file:syslog-ng.spec ++++++
#
# spec file for package syslog-ng
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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/
#
# norootforbuild
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
Release: 8
License: GPLv2
Group: System/Daemons
Summary: The new-generation syslog-daemon
Url: http://www.balabit.com/products/syslog_ng/
Requires(pre): %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog
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
Source1: syslog-ng.rc-script
Source2: syslog-ng.sysconfig
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
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
%else
BuildRequires: libnet
%endif
%if 0%{?with_systemd}
# 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
%endif
%if 0%{?with_sql}
BuildRequires: libdbi-devel
%endif
BuildRequires: libevtlog-devel pcre-devel
BuildRequires: libopenssl-devel
# only while preparing dist from git
# BuildRequires: git
%description
syslog-ng is a "new-generation" syslogd (replacement) for Unix and
Unix-like systems. It tries to fill the gaps in the original syslogd:
* powerful configurability
* filtering based on message content
* portability
* better network forwarding
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 0%{?with_sql}
%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
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}
sed -i -e 's/\([ \t]*\)\(file.*kmsg.*\)/\1#\2/g' syslog-ng.conf.default
%endif
%if 0%{?with_systemd}
cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] modules/afsocket/
%endif
%build
##
## build ####################################################
##
export CFLAGS="$RPM_OPT_FLAGS"
# export SUSE_ASNEEDED=0
#
# - update configure scripts & tools:
#
%{?suse_update_config:%{suse_update_config -f}}
#aclocal --force
#libtoolize -f
#automake --foreign --add-missing --copy --force-missing
#autoheader
#
autoreconf -fiv
#
# - configure syslog-ng using static eventlog library (default)
#
%configure \
--bindir=/usr/bin \
--sbindir=/sbin \
--enable-ipv6 \
--enable-tcp-wrapper \
--enable-spoof-source \
--with-pidfile-dir=/var/run \
--sysconfdir=/etc/syslog-ng \
--localstatedir=/var/lib/syslog-ng \
--with-module-dir="/%_lib/syslog-ng" \
--datadir=/usr/share/syslog-ng \
--prefix=/ \
--exec-prefix=/ \
%if 0%{suse_version} < 1130
--disable-ssl \
--disable-pcre \
%else
--enable-ssl \
--enable-pcre \
%endif
%if 0%{?with_systemd}
--enable-systemd \
%endif
%if 0%{?with_sql}
--enable-sql \
%endif
%if 0%{suse_version} > 1130
--enable-dynamic-linking
%else
--enable-mixed-linking
%endif
#
# - build syslog-ng
#
make %_smp_mflags
#%check
##
## check ####################################################
##
#make check
%install
##
## install ##################################################
##
export RPM_BUILD_ROOT
for dir in sbin/conf.d \
etc/syslog-ng \
var/lib/syslog-ng \
var/adm/fillup-templates ;
do
test -d $RPM_BUILD_ROOT/$dir || \
install -d -m755 $RPM_BUILD_ROOT/$dir
done
#
install -m644 syslog-ng.conf.default \
$RPM_BUILD_ROOT/etc/syslog-ng/syslog-ng.conf
install -m644 $RPM_SOURCE_DIR/syslog-ng.sysconfig \
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog-ng
#
make DESTDIR=${RPM_BUILD_ROOT} install
#
#tar -C doc/reference -xf doc/reference/syslog-ng.html.tar.gz
#mv doc/reference/syslog-ng.html doc/reference/html
#mv doc/reference/html/index.html doc/reference/syslog-ng.html
mkdir %{buildroot}/usr/sbin/
%{__mv} -v %{buildroot}/sbin/syslog-ng-ctl %{buildroot}/usr/sbin/
mkdir -p %{buildroot}/var/run/syslog-ng/
# don't package update-patterndb now
rm %{buildroot}/usr/bin/update-patterndb
# move libsyslogng by hand, until a fix is found
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
%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
%clean
##
## clean build root #########################################
##
rm -rf $RPM_BUILD_ROOT
%post
##
## post install #############################################
##
#
# remove old SYSLOG_NG_* variables from etc/sysconfig/syslog-ng
# and the file itself as well.
# this may cause, that syslog-ng will be disabled, but because
# it is IMHO not possible to check if the syslog-ng init script
# was active _and_ SYSLOG_NG_REPLACE was "yes" _before_ the old
# syslog-ng package was uninstalled... it's IMHO acceptable.
#
%{remove_and_set -n syslog-ng SYSLOG_NG_REPLACE SYSLOG_NG_PARAMS}
if [ -f etc/sysconfig/syslog-ng ] ; then
# be sure it' away now :-)
rm -f etc/sysconfig/syslog-ng
fi
#
# add syslog variables provided by klogd if needed
#
%{remove_and_set -n syslog SYSLOG_NG_CREATE_CONFIG}
if test "$SYSLOG_NG_CREATE_CONFIG" == "yes" ; then
cat <$additional_sockets < 1140
%attr(644,root,root) /lib/systemd/system/syslog-ng.service
%endif
%changelog
++++++ syslog-ng.spec ++++++
--- /var/tmp/diff_new_pack.KEPF6W/_old 2011-06-28 11:06:30.000000000 +0200
+++ /var/tmp/diff_new_pack.KEPF6W/_new 2011-06-28 11:06:30.000000000 +0200
@@ -21,8 +21,10 @@
Name: syslog-ng
%define eventlog_version 0.2.7
%define with_sql %suse_version > 1130
-Version: 3.2.2
-Release: 8
+%define with_systemd %suse_version > 1130
+%define with_klogd %suse_version <= 1140
+Version: 3.2.4
+Release: 1
License: GPLv2
Group: System/Daemons
Summary: The new-generation syslog-daemon
@@ -34,24 +36,25 @@
Source1: syslog-ng.rc-script
Source2: syslog-ng.sysconfig
Source3: syslog-ng.conf.default
-Patch0: syslog-ng-%{version}-less-static.dif
+Patch0: syslog-ng-%{version}-less-static.diff
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
+Patch2: 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
+%else
+BuildRequires: libnet
+%endif
+%if 0%{?with_systemd}
# 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
@@ -106,11 +109,8 @@
%patch0 -p0
%endif
%patch1 -p0
-%if %suse_version > 1130
-%patch2 -p1
-%endif
%if 0%{?with_sql}
-%patch3 -p1
+%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
@@ -120,8 +120,11 @@
%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/
+%if 0%{?with_klogd}
+ sed -i -e 's/\([ \t]*\)\(file.*kmsg.*\)/\1#\2/g' syslog-ng.conf.default
+%endif
+%if 0%{?with_systemd}
+ cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] modules/afsocket/
%endif
%build
@@ -149,13 +152,6 @@
--enable-ipv6 \
--enable-tcp-wrapper \
--enable-spoof-source \
-%if 0%{?sles_version}
- --disable-pcre \
-%else
-%if 0%{?suse_version}
- --enable-pcre \
-%endif
-%endif
--with-pidfile-dir=/var/run \
--sysconfdir=/etc/syslog-ng \
--localstatedir=/var/lib/syslog-ng \
@@ -163,10 +159,19 @@
--datadir=/usr/share/syslog-ng \
--prefix=/ \
--exec-prefix=/ \
+ %if 0%{suse_version} < 1130
+ --disable-ssl \
+ --disable-pcre \
+ %else
--enable-ssl \
-%if 0%{?with_sql}
+ --enable-pcre \
+ %endif
+ %if 0%{?with_systemd}
+ --enable-systemd \
+ %endif
+ %if 0%{?with_sql}
--enable-sql \
-%endif
+ %endif
%if 0%{suse_version} > 1130
--enable-dynamic-linking
%else
@@ -231,6 +236,11 @@
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
+
%clean
##
## clean build root #########################################
@@ -314,6 +324,15 @@
# run ldconfig
ldconfig
+# generate empty additional-log-sockets.conf file
+# see also syslog-ng.conf.default in pkg src dir.
+additional_sockets="/var/run/syslog-ng/additional-log-sockets.conf"
+install -d -m750 ${additional_sockets%/*}
+cat >$additional_sockets < 1140
+%attr(644,root,root) /lib/systemd/system/syslog-ng.service
+%endif
%changelog
++++++ syslog-ng-3.2.4-less-static.diff ++++++
--- configure.in
+++ configure.in 2011/06/06 09:57:01
@@ -768,7 +768,7 @@ if test "x$linking_mode" = "xdynamic"; t
# 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 $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS "
+ SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $EVTLOG_LIBS $PCRE_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $REGEX_LIBS -Wl,--no-whole-archive $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 $DL_LIBS"
CORE_DEPS_LIBS=""
++++++ syslog-ng-3.2.2-module-path.diff -> syslog-ng-3.2.4-module-path.diff ++++++
++++++ syslog-ng-3.2.2-no-datetime.diff -> syslog-ng-3.2.4-no-datetime.diff ++++++
++++++ syslog-ng.conf.default ++++++
--- /var/tmp/diff_new_pack.KEPF6W/_old 2011-06-28 11:06:30.000000000 +0200
+++ /var/tmp/diff_new_pack.KEPF6W/_new 2011-06-28 11:06:30.000000000 +0200
@@ -33,6 +33,12 @@
internal();
#
+ # read kernel messages directly (12.x) or
+ # does klogd forward them via /dev/log?
+ #
+ file ("/proc/kmsg" program_override("kernel"));
+
+ #
# the default log socket for local logging:
#
unix-dgram("/dev/log");
++++++ syslog-ng_3.2.2.tar.bz2 -> syslog-ng_3.2.4.tar.bz2 ++++++
++++ 14669 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