Merge branch 'master' into next

This commit is contained in:
Michael Tremer
2024-02-14 19:03:52 +00:00
14 changed files with 182 additions and 92 deletions

View File

@@ -271,24 +271,24 @@ usr/bin/nsupdate
#usr/include/pk11/site.h
#usr/include/pkcs11
#usr/include/pkcs11/pkcs11.h
usr/lib/libbind9-9.16.45.so
usr/lib/libbind9-9.16.48.so
#usr/lib/libbind9.la
#usr/lib/libbind9.so
usr/lib/libdns-9.16.45.so
usr/lib/libdns-9.16.48.so
#usr/lib/libdns.la
#usr/lib/libdns.so
usr/lib/libirs-9.16.45.so
usr/lib/libirs-9.16.48.so
#usr/lib/libirs.la
#usr/lib/libirs.so
usr/lib/libisc-9.16.45.so
usr/lib/libisc-9.16.48.so
#usr/lib/libisc.la
#usr/lib/libisc.so
usr/lib/libisccc-9.16.45.so
usr/lib/libisccc-9.16.48.so
#usr/lib/libisccc.la
#usr/lib/libisccc.so
usr/lib/libisccfg-9.16.45.so
usr/lib/libisccfg-9.16.48.so
#usr/lib/libisccfg.la
#usr/lib/libisccfg.so
usr/lib/libns-9.16.45.so
usr/lib/libns-9.16.48.so
#usr/lib/libns.la
#usr/lib/libns.so

View File

@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.8
usr/lib/libunbound.so.8.1.23
usr/lib/libunbound.so.8.1.24
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor

View File

@@ -0,0 +1 @@
../../../../common/aarch64/glibc

View File

@@ -0,0 +1 @@
../../../common/libhtp

View File

@@ -0,0 +1 @@
../../../../common/riscv64/glibc

View File

@@ -0,0 +1 @@
../../../common/suricata

View File

@@ -0,0 +1 @@
../../../../common/x86_64/glibc

View File

@@ -113,6 +113,9 @@ ldconfig
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
# Relaunch init
telinit u
# Apply local configuration to sshd_config
/usr/local/bin/sshctrl
@@ -143,7 +146,7 @@ fi
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
/etc/rc.d/init.d/ipsec start
fi
/etc/init.d/suricata restart
# Rebuild initial ramdisks
dracut --regenerate-all --force

View File

@@ -0,0 +1 @@
../../../common/bind

View File

@@ -0,0 +1 @@
../../../common/unbound

View File

@@ -81,6 +81,7 @@ telinit u
/etc/init.d/vnstat start
/etc/init.d/collectd restart
/etc/init.d/suricata restart
/etc/init.d/unbound restart
if [ -f /var/ipfire/proxy/enable ]; then
/etc/init.d/squid start
fi