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 9384df59642df2ffcb7b67a62b064148961d7a98 (commit) via 312a06cbb5397d4ae144c6c9df9e10160a8e5650 (commit) via 277721c2b7d373ab232645ea7e8699592a084054 (commit) via d3e88e3485f057dfc4721689912ec48f48b153da (commit) via b57d9769b573770473bcd80addd856273fe948f4 (commit) via 4522b5f6b005a3b4094aca6b3d6eed4c6343fc52 (commit) via 05ca47a0a712d65c55d0c8a0d093bb2446aad49b (commit) via 97f68af983562e35a420459e849e1ff78e8787e4 (commit) via bf6c700798271cb9df71369132a45a398b86c772 (commit) from 84722d8f249af76babead88d36c119b99b5c1512 (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 9384df59642df2ffcb7b67a62b064148961d7a98 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 24 17:43:10 2020 +0000

Revert "core151: Ship libloc"

This reverts commit 6cfa52d99e19dfcba47c7aca25ce0a38ec4ab25d.

libloc is now being updated in Core Update 150.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 312a06cbb5397d4ae144c6c9df9e10160a8e5650 Merge: 84722d8f2 277721c2b Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Sep 24 17:42:41 2020 +0000

Merge branch 'master' into next

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

Summary of changes: config/rootfiles/core/151/filelists/libloc | 1 - config/rootfiles/core/151/update.sh | 5 ----- config/rootfiles/oldcore/150/update.sh | 5 +++++ 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 120000 config/rootfiles/core/151/filelists/libloc

Difference in files: diff --git a/config/rootfiles/core/151/filelists/libloc b/config/rootfiles/core/151/filelists/libloc deleted file mode 120000 index ff4a92429..000000000 --- a/config/rootfiles/core/151/filelists/libloc +++ /dev/null @@ -1 +0,0 @@ -../../../common/libloc \ No newline at end of file diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh index 4b8fefabc..bf151ef48 100644 --- a/config/rootfiles/core/151/update.sh +++ b/config/rootfiles/core/151/update.sh @@ -56,11 +56,6 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then fi /etc/init.d/collectd restart

-# Fix invalid cronjob syntax -sed -e "s/^%hourly,random * * */%hourly,random */g" \ - -i /var/spool/cron/root.orig -fcrontab -z - # This update needs a reboot... #touch /var/run/need_reboot

diff --git a/config/rootfiles/oldcore/150/update.sh b/config/rootfiles/oldcore/150/update.sh index c125c058c..cb8d53261 100644 --- a/config/rootfiles/oldcore/150/update.sh +++ b/config/rootfiles/oldcore/150/update.sh @@ -103,6 +103,11 @@ ldconfig # Filesytem cleanup /usr/local/bin/filesystem-cleanup

+# Fix invalid cronjob syntax +sed -e "s/^%hourly,random * * */%hourly,random */g" \ + -i /var/spool/cron/root.orig +fcrontab -z + # Start services /etc/init.d/collectd start

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