Accepting request 79348 from Base:System
- Update to 5.8.4 [V5-stable] - bugfix: potential misadressing in property replacer - bugfix: memcpy overflow can occur in allowed sender checkig if a name is resolved to IPv4-mapped-on-IPv6 address Found by Ismail Dönmez at suse - bugfix: potential misadressing in property replacer - bugfix: MSGID corruption in RFC5424 parser under some circumstances closes: http://bugzilla.adiscon.com/show_bug.cgi?id=275 - remove rsyslog-5.8.0-memcpy.patch: applied upstream - fix build for older distros: only buildrequire systemd-devel for newer than 11.4, use systemd for the others (forwarded request 79342 from darix) OBS-URL: https://build.opensuse.org/request/show/79348 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=41
This commit is contained in:
commit
07bd87c2e0
@ -1,11 +0,0 @@
|
|||||||
--- runtime/net.c 2011-03-22 12:27:49.000000000 +0100
|
|
||||||
+++ runtime/net.c 2011-04-29 13:30:47.249997266 +0200
|
|
||||||
@@ -721,7 +721,7 @@
|
|
||||||
SIN(allowIP.addr.NetAddr)->sin_port = 0;
|
|
||||||
memcpy(&(SIN(allowIP.addr.NetAddr)->sin_addr.s_addr),
|
|
||||||
&(SIN6(res->ai_addr)->sin6_addr.s6_addr32[3]),
|
|
||||||
- sizeof (struct sockaddr_in));
|
|
||||||
+ sizeof (in_addr_t));
|
|
||||||
|
|
||||||
if((iRet = AddAllowedSenderEntry(ppRoot, ppLast, &allowIP,
|
|
||||||
iSignificantBits))
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5f2839d6f75e266247278376697b0e61758e08ac5a4a7c47e8a9e2b647b5e01a
|
|
||||||
size 1920450
|
|
3
rsyslog-5.8.4.tar.bz2
Normal file
3
rsyslog-5.8.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:699c719723c9d3f227b6550df5502429bac7669efd84c3ec7c53699c1eff3e87
|
||||||
|
size 1906929
|
@ -1,3 +1,26 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 19 13:04:45 UTC 2011 - mrueckert@suse.com
|
||||||
|
|
||||||
|
- Update to 5.8.4 [V5-stable]
|
||||||
|
- bugfix: potential misadressing in property replacer
|
||||||
|
- bugfix: memcpy overflow can occur in allowed sender checkig if
|
||||||
|
a name is resolved to IPv4-mapped-on-IPv6 address Found by
|
||||||
|
Ismail Dönmez at suse
|
||||||
|
- bugfix: potential misadressing in property replacer
|
||||||
|
- bugfix: MSGID corruption in RFC5424 parser under some
|
||||||
|
circumstances closes:
|
||||||
|
http://bugzilla.adiscon.com/show_bug.cgi?id=275
|
||||||
|
- remove rsyslog-5.8.0-memcpy.patch:
|
||||||
|
applied upstream
|
||||||
|
- fix build for older distros:
|
||||||
|
only buildrequire systemd-devel for newer than 11.4, use systemd
|
||||||
|
for the others
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Aug 19 04:54:03 UTC 2011 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- Fix build with new gnutls
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Aug 2 07:35:13 UTC 2011 - aj@suse.de
|
Tue Aug 2 07:35:13 UTC 2011 - aj@suse.de
|
||||||
|
|
||||||
|
10
rsyslog.spec
10
rsyslog.spec
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
Name: rsyslog
|
Name: rsyslog
|
||||||
Summary: The enhanced syslogd for Linux and Unix
|
Summary: The enhanced syslogd for Linux and Unix
|
||||||
Version: 5.8.3
|
Version: 5.8.4
|
||||||
Release: 2
|
Release: 2
|
||||||
# for setting those bcond_with* configs see
|
# for setting those bcond_with* configs see
|
||||||
# http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/
|
# http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/
|
||||||
@ -78,6 +78,7 @@ BuildRequires: postgresql-devel
|
|||||||
%endif
|
%endif
|
||||||
%if %{with gnutls}
|
%if %{with gnutls}
|
||||||
BuildRequires: libgnutls-devel
|
BuildRequires: libgnutls-devel
|
||||||
|
BuildRequires: libgcrypt-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{with dbi}
|
%if %{with dbi}
|
||||||
BuildRequires: libdbi-devel
|
BuildRequires: libdbi-devel
|
||||||
@ -96,7 +97,11 @@ BuildRequires: libnet
|
|||||||
# The systemd package provides
|
# The systemd package provides
|
||||||
# /usr/share/doc/packages/systemd/sd-daemon.[ch]
|
# /usr/share/doc/packages/systemd/sd-daemon.[ch]
|
||||||
# files instead of a lib ... See also bug 656259.
|
# files instead of a lib ... See also bug 656259.
|
||||||
|
%if 0%{?suse_version} > 1140
|
||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: systemd
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
#Source0: http://download.rsyslog.com/rsyslog/rsyslog-<upstream_version>.tar.gz
|
#Source0: http://download.rsyslog.com/rsyslog/rsyslog-<upstream_version>.tar.gz
|
||||||
@ -105,8 +110,6 @@ Source1: rsyslog.sysconfig
|
|||||||
Source2: rsyslog.conf.in
|
Source2: rsyslog.conf.in
|
||||||
Source3: rsyslog.early.conf.in
|
Source3: rsyslog.early.conf.in
|
||||||
Source4: rsyslog.d.remote.conf.in
|
Source4: rsyslog.d.remote.conf.in
|
||||||
# PATCH-FIX-UPSTREAM rsyslog-5.6.5-memcpy.patch idoenmez@suse.de -- Fix overflowing memcpy call
|
|
||||||
Patch1: rsyslog-5.8.0-memcpy.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
|
Rsyslog is an enhanced multi-threaded syslogd supporting, among others,
|
||||||
@ -267,7 +270,6 @@ This module provides a UDP forwarder that allows changing the sender address.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{upstream_version}
|
%setup -q -n %{name}-%{upstream_version}
|
||||||
%patch1
|
|
||||||
%if %{with systemd}
|
%if %{with systemd}
|
||||||
# Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259
|
# Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259
|
||||||
# install the files systemd provides rather than what we provide.
|
# install the files systemd provides rather than what we provide.
|
||||||
|
Loading…
Reference in New Issue
Block a user