[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e2f4f99e498a89157e85e8e4b983e61568956e9e

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3386 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  e2f4f99e498a89157e85e8e4b983e61568956e9e (commit)
       via  ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1 (commit)
      from  9f42266a5957dd9da1f6eb68a8602429a3e993da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e2f4f99e498a89157e85e8e4b983e61568956e9e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri May 13 19:10:44 2022 +0200

    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 <stefan.schantl(a)ipfire.org>
    Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Fri May 13 18:55:48 2022 +0200

    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 <stefan.schantl(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/pango  | 4 ++--
 src/scripts/update-ids-ruleset | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Difference in files:
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
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) {


hooks/post-receive
--
IPFire 2.x development tree