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, master has been updated via bbd4767fcf3086800e96aa449c6fa526ad662288 (commit) via 4eb6ba2bd56029a8756d75b2a34c9fbe68650740 (commit) via 691a83f2374d85f834c24d3d82525bc554ad4f25 (commit) via 0f3b6da86d3e239badea7c46aca05189a940b469 (commit) 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 bbd4767fcf3086800e96aa449c6fa526ad662288 Author: Peter Müller peter.mueller@ipfire.org Date: Mon May 16 07:12:23 2022 +0000

Core Update 168: Ship liburcu

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 4eb6ba2bd56029a8756d75b2a34c9fbe68650740 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri May 13 23:26:34 2022 +0200

poppler: Fix rootfile.

libpoppler.so.120.0.0 contains all the functions and symbols which are required by the tools linked against it.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org

commit 691a83f2374d85f834c24d3d82525bc554ad4f25 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri May 13 23:20:44 2022 +0200

libinih: Fix rootfile.

Some tools of the xfsprogs are linked against libinih and therefore we need to ship those libs.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org

commit 0f3b6da86d3e239badea7c46aca05189a940b469 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri May 13 23:17:48 2022 +0200

liburcu: Fix rootfile.

At least the xfsprogs is linked agains the urcu libraries and therefore requires them to run and deal with xfs filesystems.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Reviewed-by: Adolf Belka adolf.belka@ipfire.org

commit e2f4f99e498a89157e85e8e4b983e61568956e9e Author: Stefan Schantl stefan.schantl@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@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit ceb8b07b2cfedc5ec84576dd85db80bd83ce7ab1 Author: Stefan Schantl stefan.schantl@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@ipfire.org

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

Summary of changes: config/rootfiles/common/libinih | 4 +-- config/rootfiles/common/liburcu | 32 +++++++++++----------- config/rootfiles/common/pango | 4 +-- config/rootfiles/common/poppler | 2 +- .../{oldcore/163 => core/168}/filelists/liburcu | 0 src/scripts/update-ids-ruleset | 4 +-- 6 files changed, 23 insertions(+), 23 deletions(-) copy config/rootfiles/{oldcore/163 => core/168}/filelists/liburcu (100%)

Difference in files: diff --git a/config/rootfiles/common/libinih b/config/rootfiles/common/libinih index c8a467edc..af22932dc 100644 --- a/config/rootfiles/common/libinih +++ b/config/rootfiles/common/libinih @@ -1,8 +1,8 @@ #usr/include/INIReader.h #usr/include/ini.h #usr/lib/libINIReader.so -#usr/lib/libINIReader.so.0 +usr/lib/libINIReader.so.0 #usr/lib/libinih.so -#usr/lib/libinih.so.0 +usr/lib/libinih.so.0 #usr/lib/pkgconfig/INIReader.pc #usr/lib/pkgconfig/inih.pc diff --git a/config/rootfiles/common/liburcu b/config/rootfiles/common/liburcu index f1de29d87..ab8cb0649 100644 --- a/config/rootfiles/common/liburcu +++ b/config/rootfiles/common/liburcu @@ -101,36 +101,36 @@ #usr/include/urcu/wfstack.h #usr/lib/liburcu-bp.la #usr/lib/liburcu-bp.so -#usr/lib/liburcu-bp.so.8 -#usr/lib/liburcu-bp.so.8.0.0 +usr/lib/liburcu-bp.so.8 +usr/lib/liburcu-bp.so.8.0.0 #usr/lib/liburcu-cds.la #usr/lib/liburcu-cds.so -#usr/lib/liburcu-cds.so.8 -#usr/lib/liburcu-cds.so.8.0.0 +usr/lib/liburcu-cds.so.8 +usr/lib/liburcu-cds.so.8.0.0 #usr/lib/liburcu-common.la #usr/lib/liburcu-common.so -#usr/lib/liburcu-common.so.8 -#usr/lib/liburcu-common.so.8.0.0 +usr/lib/liburcu-common.so.8 +usr/lib/liburcu-common.so.8.0.0 #usr/lib/liburcu-mb.la #usr/lib/liburcu-mb.so -#usr/lib/liburcu-mb.so.8 -#usr/lib/liburcu-mb.so.8.0.0 +usr/lib/liburcu-mb.so.8 +usr/lib/liburcu-mb.so.8.0.0 #usr/lib/liburcu-memb.la #usr/lib/liburcu-memb.so -#usr/lib/liburcu-memb.so.8 -#usr/lib/liburcu-memb.so.8.0.0 +usr/lib/liburcu-memb.so.8 +usr/lib/liburcu-memb.so.8.0.0 #usr/lib/liburcu-qsbr.la #usr/lib/liburcu-qsbr.so -#usr/lib/liburcu-qsbr.so.8 -#usr/lib/liburcu-qsbr.so.8.0.0 +usr/lib/liburcu-qsbr.so.8 +usr/lib/liburcu-qsbr.so.8.0.0 #usr/lib/liburcu-signal.la #usr/lib/liburcu-signal.so -#usr/lib/liburcu-signal.so.8 -#usr/lib/liburcu-signal.so.8.0.0 +usr/lib/liburcu-signal.so.8 +usr/lib/liburcu-signal.so.8.0.0 #usr/lib/liburcu.la #usr/lib/liburcu.so -#usr/lib/liburcu.so.8 -#usr/lib/liburcu.so.8.0.0 +usr/lib/liburcu.so.8 +usr/lib/liburcu.so.8.0.0 #usr/lib/pkgconfig/liburcu-bp.pc #usr/lib/pkgconfig/liburcu-cds.pc #usr/lib/pkgconfig/liburcu-mb.pc 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/config/rootfiles/common/poppler b/config/rootfiles/common/poppler index 0ea058043..5c6f48e00 100644 --- a/config/rootfiles/common/poppler +++ b/config/rootfiles/common/poppler @@ -174,7 +174,7 @@ usr/lib/libpoppler-glib.so.8 usr/lib/libpoppler-glib.so.8.23.0 #usr/lib/libpoppler.so usr/lib/libpoppler.so.120 -#usr/lib/libpoppler.so.120.0.0 +usr/lib/libpoppler.so.120.0.0 #usr/lib/pkgconfig/poppler-cpp.pc #usr/lib/pkgconfig/poppler-glib.pc #usr/lib/pkgconfig/poppler.pc diff --git a/config/rootfiles/core/168/filelists/liburcu b/config/rootfiles/core/168/filelists/liburcu new file mode 120000 index 000000000..d19012e04 --- /dev/null +++ b/config/rootfiles/core/168/filelists/liburcu @@ -0,0 +1 @@ +../../../common/liburcu \ No newline at end of file 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