[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2db2b593247967a76f5492a235b8ffd93d97c8ba

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2db2b593247967a76f5492a235b8ffd93d97c8ba

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3190 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, master has been updated
       via  2db2b593247967a76f5492a235b8ffd93d97c8ba (commit)
       via  14df78791b554b1947174ac3e34949e3839abafb (commit)
       via  9758b336639adfa849bfbffcec396304448283f1 (commit)
       via  5d747ddb70e74c9f5503618cc8aaa79b8f728cb3 (commit)
      from  103950e0a58090a6eaf58195407deb570cefb256 (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 2db2b593247967a76f5492a235b8ffd93d97c8ba
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Mar 17 10:19:10 2021 +0100

    core155: apply local ssh config
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 14df78791b554b1947174ac3e34949e3839abafb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Mar 17 10:14:39 2021 +0100

    core155: remove old libcrypt
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 9758b336639adfa849bfbffcec396304448283f1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Mar 17 10:11:01 2021 +0100

    core155: need a reboot
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 5d747ddb70e74c9f5503618cc8aaa79b8f728cb3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Mar 17 10:09:24 2021 +0100

    core155: fix reboot after update
    
    new init has moved the path of the initctl pipe from /dev to /run
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/155/update.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh
index 1434ce666..90647b253 100644
--- a/config/rootfiles/core/155/update.sh
+++ b/config/rootfiles/core/155/update.sh
@@ -33,6 +33,8 @@ done
 
 # Remove files
 rm -vrf \
+	/lib/libcrypt.so.1 \
+	/lib/libcrypt-2.32.so \
 	/lib/libhistory.so.6 \
 	/lib/libhistory.so.6.3 \
 	/lib/libreadline.so.6 \
@@ -60,10 +62,16 @@ extract_files
 # update linker config
 ldconfig
 
+# Create a symlink from /run/initctl to /dev/initctl
+ln -s /dev/initctl /run/initctl
+
 # Disable all connection tracking helper
 sed -E -e "s/^CONNTRACK_(.*?)=on/CONNTRACK_\1=off/g" \
 	-i /var/ipfire/optionsfw/settings
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
@@ -79,7 +87,7 @@ sed -E -e "s/^CONNTRACK_(.*?)=on/CONNTRACK_\1=off/g" \
 /etc/init.d/suricata restart
 
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start


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