Accepting request 69430 from Base:System
Fix gcc 4.6 compilation OBS-URL: https://build.opensuse.org/request/show/69430 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=28
This commit is contained in:
parent
ae0e7dce27
commit
4a6639e8ea
11
rsyslog-5.8.0-memcpy.patch
Normal file
11
rsyslog-5.8.0-memcpy.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- 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 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 29 11:38:40 UTC 2011 - idoenmez@novell.com
|
||||||
|
|
||||||
|
- Add rsyslog-5.6.5-memcpy.patch: fix overflowing memcpy call in
|
||||||
|
runtime/net.c
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 27 16:19:31 UTC 2011 - mrueckert@suse.de
|
Wed Apr 27 16:19:31 UTC 2011 - mrueckert@suse.de
|
||||||
|
|
||||||
|
@ -105,6 +105,8 @@ 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,
|
||||||
@ -265,6 +267,7 @@ 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