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 7350feee58b0e190c9a07b1b65580e730053878e (commit) via 2e92bfc047ed3ee68f77b8d7a06985bb6663e565 (commit) via 7c0241405ebba6d91e88ee615c0d19c3a0412750 (commit) via cacfaa1c890b024302ba9a861bc98b0ac365e405 (commit) via 3638d37c0d5e2c1ffa4fd4e884c11b9da3676e31 (commit) via 3c904d268b3ff516c5453e60c710a81e93d96d5d (commit) from d6dc07a1a8696b8fae84357859f5521079105c52 (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 7350feee58b0e190c9a07b1b65580e730053878e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Nov 5 08:57:59 2024 +0100
core190: ship files with fixed chown syntax
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 2e92bfc047ed3ee68f77b8d7a06985bb6663e565 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 17 14:54:16 2024 +0000
chown: Replace . with : on all shipped scripts
I don't like this messy bootup screen that we have with all sorts of warnings that actually don't cause any problems, but make the boot messy and send the wrong message to users.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7c0241405ebba6d91e88ee615c0d19c3a0412750 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Nov 5 08:50:01 2024 +0100
core190: ship network-hotplug-bridges
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit cacfaa1c890b024302ba9a861bc98b0ac365e405 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 17 14:54:15 2024 +0000
udev: network-hotplug-bridges: Silence a warning when interfaces have gone away
It can happen that udev has an event for an interface in the queue that has already gone away - or even just being renamed.
Then reading the MAC address fails. Because the shell expands the "$(<...)" statement before running the whole line, the read check is useless.
Because the code would get too complicated otherwise, I decided to use cat. Not cool, but this does the job.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 3638d37c0d5e2c1ffa4fd4e884c11b9da3676e31 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 17 14:54:14 2024 +0000
wlanap.cgi: Use the correct array to fetch the current interface
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 3c904d268b3ff516c5453e60c710a81e93d96d5d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 17 14:54:13 2024 +0000
hostapd: Enable logging to syslog
Signed-off-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/hostapd/config | 2 +- config/rootfiles/core/190/filelists/files | 10 ++++++++++ config/udev/network-hotplug-bridges | 2 +- html/cgi-bin/wlanap.cgi | 3 +-- lfs/frr | 2 +- lfs/hostapd | 2 +- lfs/zabbix_agentd | 2 +- src/initscripts/helper/aws-setup | 4 ++-- src/initscripts/helper/azure-setup | 4 ++-- src/initscripts/helper/exoscale-setup | 4 ++-- src/initscripts/helper/gcp-setup | 4 ++-- src/initscripts/helper/oci-setup | 4 ++-- src/initscripts/packages/frr | 4 ++-- src/initscripts/packages/hostapd | 2 +- src/initscripts/packages/zabbix_agentd | 2 +- src/initscripts/system/cleanfs | 2 +- src/initscripts/system/squid | 2 +- src/misc-progs/openvpnctrl.c | 2 +- src/misc-progs/sshctrl.c | 2 +- 19 files changed, 34 insertions(+), 25 deletions(-)
Difference in files: diff --git a/config/hostapd/config b/config/hostapd/config index a5b4f09be8..b590309004 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -171,7 +171,7 @@ CONFIG_IEEE80211AX=y #CONFIG_DEBUG_FILE=y
# Send debug messages to syslog instead of stdout -#CONFIG_DEBUG_SYSLOG=y +CONFIG_DEBUG_SYSLOG=y
# Add support for sending all debug messages (regardless of debug verbosity) # to the Linux kernel tracing facility. This helps debug the entire stack by diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/core/190/filelists/files index 2ee32fa748..4b65efd1d7 100644 --- a/config/rootfiles/core/190/filelists/files +++ b/config/rootfiles/core/190/filelists/files @@ -1,11 +1,19 @@ etc/collectd.conf etc/collectd.d etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/rc.d/helper/aws-setup +etc/rc.d/helper/azure-setup +etc/rc.d/helper/exoscale-setup +etc/rc.d/helper/gcp-setup +etc/rc.d/helper/oci-setup etc/rc.d/init.d/apache +etc/rc.d/init.d/cleanfs etc/rc.d/init.d/collectd etc/rc.d/init.d/firewall etc/rc.d/init.d/networking/functions.network +etc/rc.d/init.d/squid etc/rc.d/init.d/suricata +lib/udev/network-hotplug-bridges srv/web/ipfire/cgi-bin/getrrdimage.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi @@ -15,6 +23,8 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/suricata-watcher usr/lib/firewall/rules.pl usr/lib/perl5/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress/Raw/Zlib.pm +usr/local/bin/openvpnctrl +usr/local/bin/sshctrl var/ipfire/backup/include var/ipfire/graphs.pl var/ipfire/network-functions.pl diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplug-bridges index 9fded1fd03..39faeb5a9e 100644 --- a/config/udev/network-hotplug-bridges +++ b/config/udev/network-hotplug-bridges @@ -42,7 +42,7 @@ detect_zone() { local slave for slave in $(get_value "${zone}_SLAVES"); do # Compare if the mac address matches or if the name matches - if [ -r "/sys/class/net/${INTERFACE}/address" -a "$(</sys/class/net/${INTERFACE}/address)" = "${slave}" ] || [ "${INTERFACE}" = "${slave}" ]; then + if [ "$(cat /sys/class/net/${INTERFACE}/address 2>/dev/null)" = "${slave}" ] || [ "${INTERFACE}" = "${slave}" ]; then echo "${zone}" return 0 fi diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 83849d3243..a5d4d8d808 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -61,7 +61,7 @@ my %cgiparams = (); &Header::getcgihash(%cgiparams);
# Find the selected interface -my $INTF = &Network::get_intf_by_address($cgiparams{'INTERFACE'}); +my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
delete $wlanapsettings{'__CGI__'}; delete $wlanapsettings{'x'}; @@ -376,7 +376,6 @@ END &Header::closebox();
if ($INTF) { - &Header::opensection();
my @status = `iw dev $INTF info`; diff --git a/lfs/frr b/lfs/frr index 577698cd68..95fbdf0f19 100644 --- a/lfs/frr +++ b/lfs/frr @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = frr -PAK_VER = 10 +PAK_VER = 11
DEPS =
diff --git a/lfs/hostapd b/lfs/hostapd index 306b32641d..543cc34e20 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 66 +PAK_VER = 67
DEPS =
diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index dd593ecf1b..e33d9db2d2 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 14 +PAK_VER = 15
DEPS = fping
diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index f14f4eb578..7b3371ac3a 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -110,11 +110,11 @@ import_aws_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh"
echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi done
diff --git a/src/initscripts/helper/azure-setup b/src/initscripts/helper/azure-setup index 7a4422a353..1a1c2a9fe4 100644 --- a/src/initscripts/helper/azure-setup +++ b/src/initscripts/helper/azure-setup @@ -132,12 +132,12 @@ import_azure_configuration() { # Install directory mkdir -p "${dir}" chmod 700 "${dir}" - chown "${user}.nobody" "${dir}" + chown "${user}:nobody" "${dir}"
# Install the key echo "${key}" >> "${path}" chmod 600 "${path}" - chown "${user}.nobody" "${path}" + chown "${user}:nobody" "${path}" fi done
diff --git a/src/initscripts/helper/exoscale-setup b/src/initscripts/helper/exoscale-setup index 02fdda2a35..a0475c2bb3 100644 --- a/src/initscripts/helper/exoscale-setup +++ b/src/initscripts/helper/exoscale-setup @@ -76,11 +76,11 @@ import_exoscale_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh"
echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi
# Import any previous settings for the local interfaces diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup index 4f5148c3e2..132ee9bb88 100644 --- a/src/initscripts/helper/gcp-setup +++ b/src/initscripts/helper/gcp-setup @@ -110,11 +110,11 @@ import_gcp_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh"
echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi done <<<"$(get instance/attributes/ssh-keys)"
diff --git a/src/initscripts/helper/oci-setup b/src/initscripts/helper/oci-setup index 312014b74c..8ea465e509 100644 --- a/src/initscripts/helper/oci-setup +++ b/src/initscripts/helper/oci-setup @@ -139,11 +139,11 @@ import_oci_configuration() { if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then mkdir -p "/home/setup/.ssh" chmod 700 "/home/setup/.ssh" - chown setup.nobody "/home/setup/.ssh" + chown setup:nobody "/home/setup/.ssh"
echo "${key}" >> "/home/setup/.ssh/authorized_keys" chmod 600 "/home/setup/.ssh/authorized_keys" - chown setup.nobody "/home/setup/.ssh/authorized_keys" + chown setup:nobody "/home/setup/.ssh/authorized_keys" fi done <<<"$(get instance/metadata/ssh_authorized_keys)"
diff --git a/src/initscripts/packages/frr b/src/initscripts/packages/frr index 22cf2f7aaf..54cf4d3e71 100644 --- a/src/initscripts/packages/frr +++ b/src/initscripts/packages/frr @@ -28,14 +28,14 @@ case "${1}" in start) # Fix permissions of configuration directory if [ -d "/etc/frr" ]; then - chown root.frr /etc/frr + chown root:frr /etc/frr chmod 775 /etc/frr fi
for daemon in ${DAEMONS}; do if [ -f "/etc/frr/${daemon}.conf" ]; then # Set permissions - chown frr.frr "/etc/frr/${daemon}.conf" + chown frr:frr "/etc/frr/${daemon}.conf"
boot_mesg "Starting FRRouting ${daemon}..." loadproc "/usr/sbin/${daemon}" --daemon diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/hostapd index cd2aef9b1b..b0a20e7c0c 100644 --- a/src/initscripts/packages/hostapd +++ b/src/initscripts/packages/hostapd @@ -54,7 +54,7 @@ case "${1}" in fi
boot_mesg "Starting hostapd... " - loadproc /usr/bin/hostapd -B /etc/hostapd.conf -i "${interface}" + loadproc /usr/bin/hostapd -s -B /etc/hostapd.conf -i "${interface}" ;;
stop) diff --git a/src/initscripts/packages/zabbix_agentd b/src/initscripts/packages/zabbix_agentd index 055968ef0c..224cc4fe41 100644 --- a/src/initscripts/packages/zabbix_agentd +++ b/src/initscripts/packages/zabbix_agentd @@ -26,7 +26,7 @@ case "${1}" in start) if [ ! -d "/var/run/zabbix" ]; then mkdir -p /var/run/zabbix - chown zabbix.zabbix /var/run/zabbix + chown zabbix:zabbix /var/run/zabbix fi
boot_mesg "Starting Zabbix Agent..." diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs index d1cbb2547e..af9332c495 100644 --- a/src/initscripts/system/cleanfs +++ b/src/initscripts/system/cleanfs @@ -92,7 +92,7 @@ case "${1}" in fi if [ ! -e /var/lock/time ]; then mkdir -p /var/lock/time - chown nobody.root /var/lock/time + chown nobody:root /var/lock/time fi if [ ! -e /var/run/clamav ]; then mkdir -p /var/run/clamav diff --git a/src/initscripts/system/squid b/src/initscripts/system/squid index b7cb30b7c9..d457343342 100644 --- a/src/initscripts/system/squid +++ b/src/initscripts/system/squid @@ -185,7 +185,7 @@ case "$1" in ;;
setperms) - chown -R nobody.squid /var/updatecache/ + chown -R nobody:squid /var/updatecache/ ;;
*) diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c index 8de6eec5cb..fb32146e43 100644 --- a/src/misc-progs/openvpnctrl.c +++ b/src/misc-progs/openvpnctrl.c @@ -504,7 +504,7 @@ void startDaemon(void) { executeCommand(command); snprintf(command, STRING_SIZE-1, "/usr/sbin/openvpn --config /var/ipfire/ovpn/server.conf"); executeCommand(command); - snprintf(command, STRING_SIZE-1, "/bin/chown root.nobody /var/run/ovpnserver.log"); + snprintf(command, STRING_SIZE-1, "/bin/chown root:nobody /var/run/ovpnserver.log"); executeCommand(command); snprintf(command, STRING_SIZE-1, "/bin/chmod 644 /var/run/ovpnserver.log"); executeCommand(command); diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index f1d0338c23..31f59b140a 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -142,7 +142,7 @@ int main(int argc, char *argv[]) sleep(5); unlink("/var/ipfire/remote/enablessh"); safe_system("cat /var/ipfire/remote/settings | sed 's/ENABLE_SSH=on/ENABLE_SSH=off/' > /var/ipfire/remote/settings2 && mv /var/ipfire/remote/settings2 /var/ipfire/remote/settings"); - safe_system("chown nobody.nobody /var/ipfire/remote/settings"); + safe_system("chown nobody:nobody /var/ipfire/remote/settings"); snprintf(command, BUFFER_SIZE-1, "sleep %s && /usr/local/bin/sshctrl &", argv[2]); safe_system(command); }
hooks/post-receive -- IPFire 2.x development tree