Accepting request 769955 from Base:System

OBS-URL: https://build.opensuse.org/request/show/769955
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsyslog?expand=0&rev=146

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

@@ -0,0 +1,35 @@
+From 4cacfc34e8f90d40313897a3ef66f0547895cbe6 Mon Sep 17 00:00:00 2001
+From: Thomas Blume <Thomas.Blume@suse.com>
+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
+

rsyslog.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan  9 08:44:32 UTC 2020 - Thomas Blume <thomas.blume@suse.com>
+
+- avoid build error with gcc flag -fno-common (bsc#1160414)
+  * add 0001-satisfy-gcc-flag-fno-common.patch
+
 -------------------------------------------------------------------
 Thu Jul 25 13:20:58 UTC 2019 - matthias.gerstner@suse.com
 

rsyslog.spec

@@ -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 @@ Source19:       NetworkManager.frule
 # PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org 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 @@ This module provides an output module for TCL.
 %setup -q -a 14
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 #
 %if %{with systemd}
 for file in rsyslog-service-prepare; do