From ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Fri, 13 May 2022 18:55:48 +0200 Subject: [PATCH 1/2] pango: Fix rootfile. The main libraries libpangocairo and libpangosoft2 accidently have been marked to be not shipped or part of the system. They are required by collecty and various other libraries or binaries. Signed-off-by: Stefan Schantl --- config/rootfiles/common/pango | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/pango b/config/rootfiles/common/pango index fe3164613..1ca33d42b 100644 --- a/config/rootfiles/common/pango +++ b/config/rootfiles/common/pango @@ -44,10 +44,10 @@ usr/lib/libpango-1.0.so.0 usr/lib/libpango-1.0.so.0.5000.6 #usr/lib/libpangocairo-1.0.so usr/lib/libpangocairo-1.0.so.0 -#usr/lib/libpangocairo-1.0.so.0.5000.6 +usr/lib/libpangocairo-1.0.so.0.5000.6 #usr/lib/libpangoft2-1.0.so usr/lib/libpangoft2-1.0.so.0 -#usr/lib/libpangoft2-1.0.so.0.5000.6 +usr/lib/libpangoft2-1.0.so.0.5000.6 #usr/lib/pkgconfig/pango.pc #usr/lib/pkgconfig/pangocairo.pc #usr/lib/pkgconfig/pangofc.pc From e2f4f99e498a89157e85e8e4b983e61568956e9e Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Fri, 13 May 2022 19:10:44 +0200 Subject: [PATCH 2/2] update-ids-ruleset: Silent script if no providers settings file exists. Only try to read-in the providers settings file, in case it exists. Otherwise the script produces an error message, about the missing file, each time it gets executed. Because of the fcron job this would be twice a day in most cases. Signed-off-by: Stefan Schantl Reviewed-by: Michael Tremer --- src/scripts/update-ids-ruleset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/update-ids-ruleset b/src/scripts/update-ids-ruleset index e9a082e62..553c1a1e1 100644 --- a/src/scripts/update-ids-ruleset +++ b/src/scripts/update-ids-ruleset @@ -95,8 +95,8 @@ if ($return) { # The script has requested a lock, so set locket to "1". $locked = "1"; -# Grab the configured providers. -&General::readhasharray("$IDS::providers_settings_file", \%providers); +# Grab the configured providers, if the providers settings file exists. +&General::readhasharray("$IDS::providers_settings_file", \%providers) if (-f "$IDS::providers_settings_file"); # Loop through the array of available providers. foreach my $id (keys %providers) {