Hello community,
here is the log from the commit of package rsyslog for openSUSE:Factory
checked in at Mon May 2 16:57:01 CEST 2011.
--------
--- rsyslog/rsyslog.changes 2011-04-08 15:27:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/rsyslog/rsyslog.changes 2011-04-27 18:48:49.000000000 +0200
@@ -1,0 +2,41 @@
+Wed Apr 27 16:19:31 UTC 2011 - mrueckert@suse.de
+
+- move most of the additional requirements and subpackages into
+ conditionals so we can switch them on and off by more easily.
+
+-------------------------------------------------------------------
+Tue Apr 26 12:30:17 UTC 2011 - mt@suse.de
+
+- Dropped obsolete rsyslog-systemd-integration.bnc656104.diff
+
+-------------------------------------------------------------------
+Tue Apr 26 12:20:16 UTC 2011 - mrueckert@suse.de
+
+- dont ship the systemd service file for now.
+
+-------------------------------------------------------------------
+Sun Apr 24 01:32:17 UTC 2011 - mrueckert@suse.de
+
+- update to 5.8.0 (v5-tsable)
+ This is the new v5-stable branch, importing all feature from the
+ 5.7.x versions. To see what has changed in regard to the previous
+ v5-stable, check the entries for 5.7.x in
+ /usr/share/doc/packages/rsyslog/ChangeLog.
+
+ - bugfix: race condition in deferred name resolution
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=238
+ Special thanks to Marcin for his persistence in helping to solve this
+ bug.
+ - bugfix: DA queue was never shutdown once it was started
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=241
+- dropped patch rsyslog-deferred-dns-query-race.diff
+ included in the release
+- refreshed rsyslog-systemd-integration.bnc656104.diff:
+ most of the patch went upstream just a small chunk left
+- fixed the with_dbi conditional, it was using the build_with_relp.
+- added a new conditional with_systemd and moved all the systemd
+ specific things from suse_version >= 1140 to the with_systemd
+ conditional. the patch line in the preamble should be
+ unconditional.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
rsyslog-5.6.5.tar.bz2
rsyslog-deferred-dns-query-race.diff
rsyslog-systemd-integration.bnc656104.diff
New:
----
rsyslog-5.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rsyslog.spec ++++++
--- /var/tmp/diff_new_pack.zYktgp/_old 2011-05-02 16:52:16.000000000 +0200
+++ /var/tmp/diff_new_pack.zYktgp/_new 2011-05-02 16:52:16.000000000 +0200
@@ -20,11 +20,31 @@
Name: rsyslog
Summary: The enhanced syslogd for Linux and Unix
-Version: 5.6.5
-Release: 2
-%define upstream_version 5.6.5
-%define with_dbi 0%{?suse_version} >= 1140 || 0%{?build_with_relp:1}
-%define with_relp 0%{?suse_version} >= 1130 || 0%{?build_with_relp:1}
+Version: 5.8.0
+Release: 1
+# for setting those bcond_with* configs see
+# http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/
+%if 0%{?suse_version} >= 1140
+%bcond_without dbi
+%else
+%bcond_with dbi
+%endif
+%if 0%{?suse_version} >= 1140
+%bcond_without systemd
+%else
+%bcond_with systemd
+%endif
+%if 0%{?suse_version} >= 1130
+%bcond_without relp
+%else
+%bcond_with relp
+%endif
+%bcond_without gssapi
+%bcond_without gnutls
+%bcond_without mysql
+%bcond_without pgsql
+%bcond_without snmp
+%define upstream_version 5.8.0
%define _sbindir /sbin
%define rsyslogdocdir %{_docdir}/%{name}
%define additional_sockets %{_localstatedir}/run/rsyslog/additional-log-sockets.conf
@@ -38,25 +58,45 @@
Provides: syslog
PreReq: %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog /sbin/checkproc
BuildRequires: klogd
-BuildRequires: dos2unix openssl-devel pcre-devel pkgconfig zlib-devel
-BuildRequires: krb5-devel mysql-devel net-snmp-devel postgresql-devel
+BuildRequires: dos2unix
+BuildRequires: openssl-devel
+BuildRequires: pcre-devel
+BuildRequires: pkgconfig
+BuildRequires: zlib-devel
+#
+%if %{with gssapi}
+BuildRequires: krb5-devel
+%endif
+%if %{with mysql}
+BuildRequires: mysql-devel
+%endif
+%if %{with snmp}
+BuildRequires: net-snmp-devel
+%endif
+%if %{with pgsql}
+BuildRequires: postgresql-devel
+%endif
+%if %{with gnutls}
BuildRequires: libgnutls-devel
-%if 0%{?with_dbi}
+%endif
+%if %{with dbi}
BuildRequires: libdbi-devel
%endif
-%if 0%{?with_relp}
+%if %{with relp}
# RELP support
BuildRequires: librelp-devel
%endif
# UDP spoof support
%if 0%{?suse_version} >= 1140
BuildRequires: libnet-devel
+%else
+BuildRequires: libnet
+%endif
+%if %{with systemd}
# The systemd package provides
# /usr/share/doc/packages/systemd/sd-daemon.[ch]
-# files instead of a lib ...
+# files instead of a lib ... See also bug 656259.
BuildRequires: systemd
-%else
-BuildRequires: libnet
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#Source0: http://download.rsyslog.com/rsyslog/rsyslog-.tar.gz
@@ -65,10 +105,6 @@
Source2: rsyslog.conf.in
Source3: rsyslog.early.conf.in
Source4: rsyslog.d.remote.conf.in
-%if 0%{?suse_version} >= 1140
-Patch1: rsyslog-systemd-integration.bnc656104.diff
-%endif
-Patch2: rsyslog-deferred-dns-query-race.diff
%description
Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
@@ -104,6 +140,8 @@
This package provides additional diagnostic tools (small helpers,
usually not needed).
+%if %{with gssapi}
+
%package module-gssapi
License: GPLv3+
Group: System/Daemons
@@ -116,6 +154,9 @@
This module provides the support to receive syslog messages from the
network protected via Kerberos 5 encryption and authentication.
+%endif
+
+%if %{with mysql}
%package module-mysql
License: GPLv3+
@@ -129,6 +170,9 @@
This package provides a module with the support for logging into MySQL
databases.
+%endif
+
+%if %{with pgsql}
%package module-pgsql
License: GPLv3+
@@ -141,8 +185,9 @@
package.
This module provides the support for logging into PostgreSQL databases.
+%endif
-%if 0%{?with_dbi}
+%if %{with dbi}
%package module-dbi
License: GPLv3+
@@ -158,6 +203,8 @@
supported databases.
%endif
+%if %{with snmp}
+
%package module-snmp
License: GPLv3+
Group: System/Daemons
@@ -170,6 +217,9 @@
This module provides the ability to send syslog messages as an SNMPv1 &
v2c traps.
+%endif
+
+%if %{with gnutls}
%package module-gtls
License: GPLv3+
@@ -183,8 +233,9 @@
This module provides the ability for TLS encrypted TCP logging (based
on current syslog-transport-tls internet drafts).
+%endif
-%if 0%{?with_relp}
+%if %{with relp}
%package module-relp
License: GPLv3+
@@ -214,9 +265,8 @@
%prep
%setup -q -n %{name}-%{upstream_version}
-%if 0%{?suse_version} >= 1140
-%patch1 -p1
-%patch2 -p1
+%if %{with systemd}
+# Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259
# install the files systemd provides rather than what we provide.
cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] runtime/
%endif
@@ -240,18 +290,28 @@
--enable-zlib \
--enable-klog \
--enable-inet \
+%if %{with gnutls}
--enable-gnutls \
+%endif
--enable-rsyslogd \
+%if %{with gssapi}
--enable-gssapi-krb5 \
+%endif
+%if %{with mysql}
--enable-mysql \
+%endif
+%if %{with pgsql}
--enable-pgsql \
-%if 0%{?with_dbi}
+%endif
+%if %{with dbi}
--enable-libdbi \
%endif
-%if 0%{?with_relp}
+%if %{with relp}
--enable-relp \
%endif
+%if %{with snmp}
--enable-snmp \
+%endif
--enable-mail \
--enable-imfile \
--enable-imptcp \
@@ -275,14 +335,28 @@
# move all modules linking libraries in /usr to /usr/lib[64]
# the user has to specify them with full path then...
install -d -m0755 %{buildroot}%{rsyslog_module_dir_withdeps}
-for mod in omgssapi.so imgssapi.so lmgssutil.so ommysql.so \
- ompgsql.so omsnmp.so lmnsd_gtls.so \
-%if 0%{?with_dbi}
+for mod in \
+%if %{with gssapi}
+ omgssapi.so imgssapi.so lmgssutil.so \
+%endif
+%if %{with mysql}
+ ommysql.so \
+%endif
+%if %{with pgsql}
+ ompgsql.so \
+%endif
+%if %{with snmp}
+ omsnmp.so \
+%endif
+%if %{with dbi}
omlibdbi.so \
%endif
-%if 0%{?with_relp}
+%if %{with relp}
imrelp.so omrelp.so \
%endif
+%if %{with gnutls}
+ lmnsd_gtls.so \
+%endif
; do
mv -f %{buildroot}%{rsyslog_module_dir_nodeps}/$mod \
%{buildroot}%{rsyslog_module_dir_withdeps}
@@ -323,11 +397,19 @@
find ChangeLog README AUTHORS COPYING COPYING.LESSER rsyslog.conf doc \
\( -type d -exec install -m755 -d %{buildroot}%{rsyslogdocdir}/\{\} \; \) \
-o \( -type f -exec install -m644 \{\} %{buildroot}%{rsyslogdocdir}/\{\} \; \)
+%if %{with mysql}
install -m644 plugins/ommysql/createDB.sql \
%{buildroot}%{rsyslogdocdir}/mysql-createDB.sql
+%endif
+%if %{with pgsql}
install -m644 plugins/ompgsql/createDB.sql \
%{buildroot}%{rsyslogdocdir}/pgsql-createDB.sql
+%endif
#
+%if %{with systemd}
+# TODO: https://features.opensuse.org/311316
+rm -v %{buildroot}/lib/systemd/system/rsyslog.service
+%endif
%clean
if [ -n "%{buildroot}" ] && [ "%{buildroot}" != "/" ] ; then
@@ -484,38 +566,53 @@
%{_sbindir}/rsyslog_diag_hostname
%{_sbindir}/zpipe
+%if %{with gssapi}
+
%files module-gssapi
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/omgssapi.so
%{rsyslog_module_dir_withdeps}/imgssapi.so
%{rsyslog_module_dir_withdeps}/lmgssutil.so
+%endif
+
+%if %{with mysql}
%files module-mysql
%defattr(-,root,root)
%doc %{rsyslogdocdir}/mysql-createDB.sql
%{rsyslog_module_dir_withdeps}/ommysql.so
+%endif
+
+%if %{with pgsql}
%files module-pgsql
%defattr(-,root,root)
%doc %{rsyslogdocdir}/pgsql-createDB.sql
%{rsyslog_module_dir_withdeps}/ompgsql.so
+%endif
-%if 0%{?with_dbi}
+%if %{with dbi}
%files module-dbi
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/omlibdbi.so
%endif
+%if %{with snmp}
+
%files module-snmp
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/omsnmp.so
+%endif
+
+%if %{with gnutls}
%files module-gtls
%defattr(-,root,root)
%{rsyslog_module_dir_withdeps}/lmnsd_gtls.so
+%endif
-%if 0%{?with_relp}
+%if %{with relp}
%files module-relp
%defattr(-,root,root)
++++++ rsyslog-5.6.5.tar.bz2 -> rsyslog-5.8.0.tar.bz2 ++++++
++++ 17018 lines of diff (skipped)
++++++ rsyslog.conf.in ++++++
--- /var/tmp/diff_new_pack.zYktgp/_old 2011-05-02 16:52:17.000000000 +0200
+++ /var/tmp/diff_new_pack.zYktgp/_new 2011-05-02 16:52:17.000000000 +0200
@@ -43,12 +43,12 @@
# using the SYSLOGD_ADDITIONAL_SOCKET* variables in the
# /etc/sysconfig/syslog file.
#
-$IncludeConfig /var/run/rsyslog/additional-log-sockets.conf
+$IncludeConfig ADDITIONAL_SOCKETS
#
# Include config files, that the admin provided? :
#
-$IncludeConfig /etc/rsyslog.d/*.conf
+$IncludeConfig ETC_RSYSLOG_D_GLOB
###
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org