From b69de2a19ff8fd8771d066c5e8eab9dffb45c0d9721bb3d856a7a40ed6c6e818 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 18 Jun 2019 08:59:54 +0000 Subject: [PATCH] Accepting request 710507 from home:scarabeus_iv:branches:network:ldap - Add patch fixing errors writeout to stdout: * INI-Remove-definiton-of-TRACE_LEVEL.patch OBS-URL: https://build.opensuse.org/request/show/710507 OBS-URL: https://build.opensuse.org/package/show/network:ldap/ding-libs?expand=0&rev=39 --- INI-Remove-definiton-of-TRACE_LEVEL.patch | 34 +++++++++++++++++++++++ ding-libs.changes | 6 ++++ ding-libs.spec | 1 + 3 files changed, 41 insertions(+) create mode 100644 INI-Remove-definiton-of-TRACE_LEVEL.patch diff --git a/INI-Remove-definiton-of-TRACE_LEVEL.patch b/INI-Remove-definiton-of-TRACE_LEVEL.patch new file mode 100644 index 0000000..95289e4 --- /dev/null +++ b/INI-Remove-definiton-of-TRACE_LEVEL.patch @@ -0,0 +1,34 @@ +From 8509cfaa757c0f8cc4d79357613f46d2fd9ee878 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20=C5=BDidek?= +Date: Wed, 15 Nov 2017 18:31:47 +0100 +Subject: [PATCH] INI: Remove definiton of TRACE_LEVEL + +Macros TRACE_LEVEL 7 and TRACE_HOME should only be defined +in testing builds where we want debug messages to be generated. + +The macros are leftovers from the previous patch where they +were improperly added for debug purposes. + +Resolves: +https://pagure.io/SSSD/ding-libs/issue/3182 + +Reviewed-by: Robbie Harwood +(cherry picked from commit a731d8c8c515e7e42a4fb448e0ecb6934d5bf99b) +Signed-off-by: Robbie Harwood +--- + ini/ini_augment.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/ini/ini_augment.c b/ini/ini_augment.c +index 9d83ad9..5a5a173 100644 +--- a/ini/ini_augment.c ++++ b/ini/ini_augment.c +@@ -32,8 +32,6 @@ + #include + #include + #include +-#define TRACE_LEVEL 7 +-#define TRACE_HOME + #include "trace.h" + #include "collection.h" + #include "collection_tools.h" diff --git a/ding-libs.changes b/ding-libs.changes index 60d6143..9d8fc97 100644 --- a/ding-libs.changes +++ b/ding-libs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 18 08:50:40 UTC 2019 - Tomáš Chvátal + +- Add patch fixing errors writeout to stdout: + * INI-Remove-definiton-of-TRACE_LEVEL.patch + ------------------------------------------------------------------- Wed May 22 08:00:10 UTC 2019 - Tomáš Chvátal diff --git a/ding-libs.spec b/ding-libs.spec index 463cf10..8c44910 100644 --- a/ding-libs.spec +++ b/ding-libs.spec @@ -40,6 +40,7 @@ Patch1: 0001-increase-ini-max-value-length.patch Patch2: INI-Fix-detection-of-error-messages.patch Patch3: INI-Silence-ini_augment-match-failures.patch Patch4: TEST-validators_ut_check-Fix-fail-with-new-glibc.patch +Patch5: INI-Remove-definiton-of-TRACE_LEVEL.patch BuildRequires: doxygen BuildRequires: pkgconfig BuildRequires: pkgconfig(check) >= 0.9.5