Hello community,

here is the log from the commit of package rsyslog for openSUSE:Factory checked 
in at 2020-02-07 15:51:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rsyslog (Old)
 and      /work/SRC/openSUSE:Factory/.rsyslog.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rsyslog"

Fri Feb  7 15:51:16 2020 rev:146 rq:769955 version:8.39.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes  2019-08-23 
11:03:16.630516544 +0200
+++ /work/SRC/openSUSE:Factory/.rsyslog.new.26092/rsyslog.changes       
2020-02-07 15:52:02.759433187 +0100
@@ -1,0 +2,6 @@
+Thu Jan  9 08:44:32 UTC 2020 - Thomas Blume <[email protected]>
+
+- avoid build error with gcc flag -fno-common (bsc#1160414)
+  * add 0001-satisfy-gcc-flag-fno-common.patch
+
+-------------------------------------------------------------------

New:
----
  0001-satisfy-gcc-flag-fno-common.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rsyslog.spec ++++++
--- /var/tmp/diff_new_pack.aj8dLO/_old  2020-02-07 15:52:05.035434431 +0100
+++ /var/tmp/diff_new_pack.aj8dLO/_new  2020-02-07 15:52:05.039434433 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package rsyslog
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -238,6 +238,7 @@
 # PATCH-FIX-OPENSUSE rsyslog-unit.patch [email protected] Customize 
upstream systemd unit for openSUSE needs.
 Patch0:         rsyslog-unit.patch
 Patch1:         rsyslog-pgsql-pkg-config.patch
+Patch2:         0001-satisfy-gcc-flag-fno-common.patch
 
 # this is a dirty hack since % dir does only work for the specified directory 
and nothing above
 # but I want to be able to switch this to /etc/apparmor.d once the profiles 
received more testing
@@ -570,6 +571,7 @@
 %setup -q -a 14
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 #
 %if %{with systemd}
 for file in rsyslog-service-prepare; do

++++++ 0001-satisfy-gcc-flag-fno-common.patch ++++++
>From 4cacfc34e8f90d40313897a3ef66f0547895cbe6 Mon Sep 17 00:00:00 2001
From: Thomas Blume <[email protected]>
Date: Thu, 9 Jan 2020 09:37:54 +0100
Subject: [PATCH] satisfy-gcc-flag-fno-common

Porting advice for gcc 10:

A common mistake in C is omitting <code>extern</code> when declaring a global
variable in a header file.  If the header is included by several files it
results in multiple definitions of the same variable.  In previous GCC versions
this error is ignored.  GCC 10 defaults to <code>-fno-common</code>, which
means a linker error will now be reported. To fix this, use <code>extern</code>
in header files when declaring global variables, and ensure each global is
defined in exactly one C file. As a workaround, legacy C code can be compiled
with -fcommon.
---
 tools/omfile.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/omfile.h b/tools/omfile.h
index ee55de3d9..dc7298d28 100644
--- a/tools/omfile.h
+++ b/tools/omfile.h
@@ -32,7 +32,7 @@ rsRetVal modInitFile(int iIFVersRequested 
__attribute__((unused)), int *ipIFVers
  * other way to have the functionality (well, one way would be to go through 
the
  * globals, but that seems not yet justified. -- rgerhards, 2010-03-01
  */
-uchar  *pszFileDfltTplName;
+extern uchar   *pszFileDfltTplName;
 #endif /* #ifndef OMFILE_H_INCLUDED */
 /* vi:set ai:
  */
-- 
2.16.4


Reply via email to