Development December 2020

development@lists.ipfire.org

18 participants
89 discussions

[PATCH] iperf: Update to 2.0.14a
by Adolf Belka 27 Dec '20

27 Dec '20

- Update from version 2.0.13 to 2.0.14a - No change in rootfiles - Release notes for change:- o scaling improvements for -P, i.e. improved support for large numbers of traffic threads o major code refactoring (see doc/DESIGN_NOTES) for maintainability, extensibilty, performance, scaling, memory usage o support for full duplex traffic using --full-duplex o support for reverse traffic using --reverse o support for role-reversal character of asterisk in the transfer id o transfer id now an incrementing integer and no longer the socket id o support for TCP connect only tests with --connect-only o isochronous support compiled in by default, must use config to disable o support --isochronous for both UDP or TCP traffic to simulate video streams o use of clock_nanosleep when supported to schedule isochronous burst starts, otherwise use nanosleep delay o support for --trip-times indicating the client and server clocks are synchronized to an accuracy sufficient, note: consider the use of precision time protocol as well as ask your data center to provide access to a GPS disciplined reference time source o support for --trip-times with -d and -r bidirectional tests o output TCP connect times (3WHS) in connect reports o support for application level tcp connect retries via --connect-retries n o rate-limited options of -b and --fq-rate supported for unidirectional, full duplex and reverse traffic o reporter thread designed to automatically cause packet reports to aggregate - mitigating and hopefully removing thread thrashing o support for frame or burst based reporting or sampling vs time based via -i [f|F] (experimental) o support for UDP traffic only from client to server with --no-udp-fin o support for write to read latencies (UDP and TCP) with --trip-times o support for sum only outputs with --sum-only o support for little's law calculations in --trip-time outputs o support for --txstart-time <epoch-time> to schedule client traffic start, timestamp support microseconds, e.g. unix $(expr $(date +%s) + 1).$(date +%N) o support for --txdelay-time to insert delay between TCP three way handshake (3WHS) and data transfer o support for --no-connect-sync which disables transmit traffic start synchronization when -P is used, defaults to synchronized o option of --full-duplex implementation uses a barrier on the client side to synchronize full duplex traffic o no limits to group sum reports, i.e. all clients will get its own sum report per a server o improved report timestamps, e.g. end to end or client and server based timestamps with --trip-times o improved settings messaging o improved messaging for --tcp-congestion or -Z o re-implemented -U for single UDP server with minimal threading interactions o re-implemented -1 or --singleclient where server will serialize traffic runs o warning message if the test were likely CPU bound instead of network i/o bound o fix the case when -P <value> is set on the server such that summing output is displayed o multicast listener will autoset -U (single server), e.g -P > 1 not supported for multicast o multicast listener no longer busy drops multicast packets during traffic test, i.e. only server thread receives them o immediate bail out on mutually exclusive command line options o fix -o or --output using freopen to redirect stdout and stderr to a file o man page updates with examples o tested with 1000's of traffic streams, WiFi, 10G and 100G Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> --- lfs/iperf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/iperf b/lfs/iperf index 4614fba3e..3cc7733b8 100644 --- a/lfs/iperf +++ b/lfs/iperf @@ -24,7 +24,7 @@ include Config -VER = 2.0.13 +VER = 2.0.14a THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 31ea1c6d5cbf80b16ff3abe4288dad5e +$(DL_FILE)_MD5 = 323a68e3668bc3e4afcc90adefeb238f install : $(TARGET) -- 2.29.2

1 0

[PATCH 1/2] optionsfw.cgi: Forcing DNS and NTP requests to use only local servers on GREEN/BLUE
by Matthias Fischer 27 Dec '20

27 Dec '20

Originally triggered by: https://community.ipfire.org/t/forcing-all-dns-traffic-from-the-lan-to-the-… Current discussion: https://community.ipfire.org/t/testing-dns-redirect-code-snippet/3888 Screenshots: => https://community.ipfire.org/t/testing-dns-redirect-code-snippet/3888/38 Summary and functionality: These new firewall-options add [DNS/NTP]_FORCED_ON_[INTERFACE] options to '/var/ipfire/optionsfw/settings'. They activate/deactivate appropriate REDIRECT rules in '/etc/rc.d/init.d/firewall'. Default of the new rules is OFF. If set to ON, they try to REDIRECT all DNS and NTP requests (TCP/UDP) to the DNS and NTP servers specified in IPFire. Changed visibility (GUI): The corresponding interface options are only visible if the respective interface does actually exist. If BLUE interface doesn't exist, there are no ON/OFF switches for 'DNS/NTP on BLUE' or BLUE logging options available. No reboot required: Rules can be switched ON/OFF without rebooting IPFire by choosing a new 'Save And Restart'-button. Restarting is done with the help of a new binary: 'optionsfwctrl', which can also be used in a console session to restart/reload all firewall rules. For 'optionsfwctrl.c', see other patch #2. I used 'unboundctrl.c' as template. Changes to '/etc/rc.d/init.d/firewall': I used REDIRECT rules and placed them just behind the CAPTIVE_PORTAL_CHAIN, as Michael mentioned on the list. All rules are tested for former existence to avoid setting multiple REDIRECTS. I used code like 'if ! iptables -t nat -C...' or 'if iptables -t nat -C...' ("Check for the existence of a rule") for these queries. Testing was ok - if just *one* rule is manually deleted, only the *missing* rule will be created through the next 'Save And Restart' - I found no duplicates. ON/OFF switches worked as expected. Testing with DNSSEC was also successful. Other changes: Language strings, 'lfs/configroot' and 'update.sh' for Core update were altered accordingly. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/core/154/update.sh | 10 +++ html/cgi-bin/optionsfw.cgi | 101 ++++++++++++++++++++++++---- langs/de/cgi-bin/de.pl | 6 ++ langs/en/cgi-bin/en.pl | 6 ++ lfs/configroot | 4 ++ src/initscripts/system/firewall | 71 +++++++++++++++++++ 6 files changed, 184 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/core/154/update.sh b/config/rootfiles/core/154/update.sh index 37348e0df..62bee565c 100644 --- a/config/rootfiles/core/154/update.sh +++ b/config/rootfiles/core/154/update.sh @@ -31,6 +31,16 @@ for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done +# Add default lines for new firewall options +optionsfw_file="/var/ipfire/optionsfw/settings" + + echo "FORCE_DNS_ON_GREEN=off" >> ${optionsfw_file} + echo "FORCE_DNS_ON_BLUE=off" >> ${optionsfw_file} + echo "FORCE_NTP_ON_GREEN=off" >> ${optionsfw_file} + echo "FORCE_NTP_ON_BLUE=off" >> ${optionsfw_file} + +unset optionsfw_file + # Remove files # Stop services diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 47aba59cb..8771a85ba 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -69,6 +69,31 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { &General::readhash($filename, \%settings); # Load good settings } +if ($settings{'ACTION'} eq $Lang::tr{'fw settings save and restart'}) { + if ($settings{'defpol'} ne '1'){ + &General::writehash($filename, \%settings); # Save good settings + system("/usr/local/bin/firewallctrl"); + system("/usr/local/bin/optionsfwctrl restart >/dev/null 2>&1"); + }else{ + if ($settings{'POLICY'} ne ''){ + $fwdfwsettings{'POLICY'} = $settings{'POLICY'}; + } + if ($settings{'POLICY1'} ne ''){ + $fwdfwsettings{'POLICY1'} = $settings{'POLICY1'}; + } + my $MODE = $fwdfwsettings{'POLICY'}; + my $MODE1 = $fwdfwsettings{'POLICY1'}; + %fwdfwsettings = (); + $fwdfwsettings{'POLICY'} = "$MODE"; + $fwdfwsettings{'POLICY1'} = "$MODE1"; + &General::writehash("${General::swroot}/firewall/settings", \%fwdfwsettings); + &General::readhash("${General::swroot}/firewall/settings", \%fwdfwsettings); + system("/usr/local/bin/firewallctrl"); + system("/usr/local/bin/optionsfwctrl restart >/dev/null 2>&1"); + } + &General::readhash($filename, \%settings); # Load good settings +} + &Header::openpage($Lang::tr{'options fw'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); &General::readhash($filename, \%settings); @@ -158,6 +183,18 @@ $selected{'MASQUERADE_ORANGE'}{$settings{'MASQUERADE_ORANGE'}} = 'selected="sele $selected{'MASQUERADE_BLUE'}{'off'} = ''; $selected{'MASQUERADE_BLUE'}{'on'} = ''; $selected{'MASQUERADE_BLUE'}{$settings{'MASQUERADE_BLUE'}} = 'selected="selected"'; +$checked{'DNS_FORCE_ON_GREEN'}{'off'} = ''; +$checked{'DNS_FORCE_ON_GREEN'}{'on'} = ''; +$checked{'DNS_FORCE_ON_GREEN'}{$settings{'DNS_FORCE_ON_GREEN'}} = "checked='checked'"; +$checked{'DNS_FORCE_ON_BLUE'}{'off'} = ''; +$checked{'DNS_FORCE_ON_BLUE'}{'on'} = ''; +$checked{'DNS_FORCE_ON_BLUE'}{$settings{'DNS_FORCE_ON_BLUE'}} = "checked='checked'"; +$checked{'NTP_FORCE_ON_GREEN'}{'off'} = ''; +$checked{'NTP_FORCE_ON_GREEN'}{'on'} = ''; +$checked{'NTP_FORCE_ON_GREEN'}{$settings{'NTP_FORCE_ON_GREEN'}} = "checked='checked'"; +$checked{'NTP_FORCE_ON_BLUE'}{'off'} = ''; +$checked{'NTP_FORCE_ON_BLUE'}{'on'} = ''; +$checked{'NTP_FORCE_ON_BLUE'}{$settings{'NTP_FORCE_ON_BLUE'}} = "checked='checked'"; &Header::openbox('100%', 'center',); print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>"; @@ -207,7 +244,38 @@ END END } - print <<END +print <<END; + <table width='95%' cellspacing='0'> + <tr bgcolor='$color{'color20'}'></tr> + <tr> </tr> + <td colspan='2' align='left'><b>$Lang::tr{'fw green'}</b></td> + </tr> + <tr><td align='left' width='60%'>$Lang::tr{'dns force on green'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DNS_FORCE_ON_GREEN' value='on' $checked{'DNS_FORCE_ON_GREEN'}{'on'} />/ + <input type='radio' name='DNS_FORCE_ON_GREEN' value='off' $checked{'DNS_FORCE_ON_GREEN'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'ntp force on green'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='NTP_FORCE_ON_GREEN' value='on' $checked{'NTP_FORCE_ON_GREEN'}{'on'} />/ + <input type='radio' name='NTP_FORCE_ON_GREEN' value='off' $checked{'NTP_FORCE_ON_GREEN'}{'off'} /> $Lang::tr{'off'}</td></tr> +END + + if (&Header::blue_used()) { + print <<END; + <table width='95%' cellspacing='0'> + <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> + <tr> </tr> + <tr> + <tr><td align='left' width='60%'>$Lang::tr{'dns force on blue'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DNS_FORCE_ON_BLUE' value='on' $checked{'DNS_FORCE_ON_BLUE'}{'on'} />/ + <input type='radio' name='DNS_FORCE_ON_BLUE' value='off' $checked{'DNS_FORCE_ON_BLUE'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'ntp force on blue'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='NTP_FORCE_ON_BLUE' value='on' $checked{'NTP_FORCE_ON_BLUE'}{'on'} />/ + <input type='radio' name='NTP_FORCE_ON_BLUE' value='off' $checked{'NTP_FORCE_ON_BLUE'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ + <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> + <tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ + <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> + </td> + </tr> +END + } + + print <<END; </table> <br> @@ -224,21 +292,25 @@ END <input type='radio' name='DROPOUTGOING' value='off' $checked{'DROPOUTGOING'}{'off'} /> $Lang::tr{'off'}</td></tr> <tr><td align='left' width='60%'>$Lang::tr{'drop portscan'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPORTSCAN' value='on' $checked{'DROPPORTSCAN'}{'on'} />/ <input type='radio' name='DROPPORTSCAN' value='off' $checked{'DROPPORTSCAN'}{'off'} /> $Lang::tr{'off'}</td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop wirelessinput'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSINPUT' value='on' $checked{'DROPWIRELESSINPUT'}{'on'} />/ +END + + if (&Header::blue_used()) { + print <<END; + <table width='95%' cellspacing='0'> + <tr> + <tr><td align='left' width='60%'>$Lang::tr{'drop wirelessinput'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSINPUT' value='on' $checked{'DROPWIRELESSINPUT'}{'on'} />/ <input type='radio' name='DROPWIRELESSINPUT' value='off' $checked{'DROPWIRELESSINPUT'}{'off'} /> $Lang::tr{'off'}</td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop wirelessforward'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSFORWARD' value='on' $checked{'DROPWIRELESSFORWARD'}{'on'} />/ + <tr><td align='left' width='60%'>$Lang::tr{'drop wirelessforward'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPWIRELESSFORWARD' value='on' $checked{'DROPWIRELESSFORWARD'}{'on'} />/ <input type='radio' name='DROPWIRELESSFORWARD' value='off' $checked{'DROPWIRELESSFORWARD'}{'off'} /> $Lang::tr{'off'}</td></tr> -</table> -<br/> + </tr> +END + } + + print <<END; + </table> + + <br/> -<table width='95%' cellspacing='0'> -<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw blue'}</b></td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop proxy'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPPROXY' value='on' $checked{'DROPPROXY'}{'on'} />/ - <input type='radio' name='DROPPROXY' value='off' $checked{'DROPPROXY'}{'off'} /> $Lang::tr{'off'}</td></tr> -<tr><td align='left' width='60%'>$Lang::tr{'drop samba'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='DROPSAMBA' value='on' $checked{'DROPSAMBA'}{'on'} />/ - <input type='radio' name='DROPSAMBA' value='off' $checked{'DROPSAMBA'}{'off'} /> $Lang::tr{'off'}</td></tr> -</table> -<br> <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw settings'}</b></td></tr> <tr><td align='left' width='60%'>$Lang::tr{'fw settings color'}</td><td align='left'>$Lang::tr{'on'} <input type='radio' name='SHOWCOLORS' value='on' $checked{'SHOWCOLORS'}{'on'} />/ @@ -323,7 +395,8 @@ END <br /> <table width='100%' cellspacing='0'> <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'> -<input type='submit' name='ACTION' value=$Lang::tr{'save'} /> +<input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> +<input type='submit' name='ACTION' value='$Lang::tr{'fw settings save and restart'}' /> </form></td></tr> </table> </form> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 87181c184..74f8d0f41 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -836,6 +836,8 @@ 'dns error 0' => 'Die IP Adresse vom <strong>primären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>sekundären</strong> DNS Server Adresse ist jedoch gültig.<br />', 'dns error 01' => 'Die eingegebene IP Adresse des <strong>primären</strong> wie auch des <strong>sekundären</strong> DNS-Servers sind nicht gültig, bitte überprüfen Sie Ihre Eingaben!', 'dns error 1' => 'Die IP Adresse vom <strong>sekundären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>primäre</strong> DNS Server Adresse ist jedoch gültig.', +'dns force on blue' => 'Erzwinge lokale DNS-Server auf BLAU', +'dns force on green' => 'Erzwinge lokale DNS-Server auf GRÜN', 'dns forward disable dnssec' => 'DNSSEC deaktivieren (nicht empfohlen)', 'dns forwarding dnssec disabled notice' => '(DNSSEC deaktiviert)', 'dns header' => 'DNS Server Adressen zuweisen nur mit DHCP an red0', @@ -1104,12 +1106,14 @@ 'from warn email bad' => 'Von E-Mail-Adresse ist nicht gültig', 'fw blue' => 'Firewalloptionen für das Blaue Interface', 'fw default drop' => 'Firewallrichtlinie', +'fw green' => 'Firewalloptionen für das Grüne Interface', 'fw logging' => 'Firewallprotokollierung', 'fw settings' => 'Firewalleinstellungen', 'fw settings color' => 'Farben in Regeltabelle anzeigen', 'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen', 'fw settings remark' => 'Anmerkungen in Regeltabelle anzeigen', 'fw settings ruletable' => 'Leere Regeltabellen anzeigen', +'fw settings save and restart' => 'Speichern und Neustart', 'fwdfw ACCEPT' => 'Akzeptieren (ACCEPT)', 'fwdfw DROP' => 'Verwerfen (DROP)', 'fwdfw MODE1' => 'Alle Pakete verwerfen', @@ -1814,6 +1818,8 @@ 'november' => 'November', 'ntp common settings' => 'Allgemeine Einstellungen', 'ntp configuration' => 'Zeitserverkonfiguration', +'ntp force on blue' => 'Erzwinge lokale NTP-Server auf BLAU', +'ntp force on green' => 'Erzwinge lokale NTP-Server auf GRÜN', 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muss NTP vorher aktiviert sein.', 'ntp server' => 'NTP-Server', 'ntp sync' => 'Synchronisation', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 625c6899f..252af7536 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -859,6 +859,8 @@ 'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.', 'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!', 'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.', +'dns force on green' => 'Force DNS to use local DNS servers on GREEN', +'dns force on blue' => 'Force DNS to use local DNS servers on BLUE', 'dns forward disable dnssec' => 'Disable DNSSEC (dangerous)', 'dns forwarding dnssec disabled notice' => '(DNSSEC disabled)', 'dns header' => 'Assign DNS server addresses only for DHCP on red0', @@ -1130,12 +1132,14 @@ 'from warn email bad' => 'From e-mail address is not valid', 'fw blue' => 'Firewall options for BLUE interface', 'fw default drop' => 'Firewall policy', +'fw green' => 'Firewall options for GREEN interface', 'fw logging' => 'Firewall logging', 'fw settings' => 'Firewall settings', 'fw settings color' => 'Show colors in ruletable', 'fw settings dropdown' => 'Show all networks on rulecreation site', 'fw settings remark' => 'Show remarks in ruletable', 'fw settings ruletable' => 'Show empty ruletables', +'fw settings save and restart' => 'Save and Restart', 'fwdfw ACCEPT' => 'ACCEPT', 'fwdfw DROP' => 'DROP', 'fwdfw MODE1' => 'Drop all packets', @@ -1844,6 +1848,8 @@ 'november' => 'November', 'ntp common settings' => 'Common settings', 'ntp configuration' => 'NTP Configuration', +'ntp force on green' => 'Force NTP to use local NTP servers on GREEN', +'ntp force on blue' => 'Force NTP to use local NTP servers on BLUE', 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.', 'ntp server' => 'NTP Server', 'ntp sync' => 'Synchronization', diff --git a/lfs/configroot b/lfs/configroot index a37c2c401..2d8a5de46 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -129,6 +129,10 @@ $(TARGET) : echo "SHOWDROPDOWN=off" >> $(CONFIG_ROOT)/optionsfw/settings echo "DROPWIRELESSINPUT=on" >> $(CONFIG_ROOT)/optionsfw/settings echo "DROPWIRELESSFORWARD=on" >> $(CONFIG_ROOT)/optionsfw/settings + echo "FORCE_DNS_ON_GREEN=off" >> $(CONFIG_ROOT)/optionsfw/settings + echo "FORCE_DNS_ON_BLUE=off" >> $(CONFIG_ROOT)/optionsfw/settings + echo "FORCE_NTP_ON_GREEN=off" >> $(CONFIG_ROOT)/optionsfw/settings + echo "FORCE_NTP_ON_BLUE=off" >> $(CONFIG_ROOT)/optionsfw/settings echo "POLICY=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "POLICY1=MODE2" >> $(CONFIG_ROOT)/firewall/settings echo "USE_ISP_NAMESERVERS=on" >> $(CONFIG_ROOT)/dns/settings diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 65f1c979b..4e02bd3d9 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -246,6 +246,77 @@ iptables_init() { iptables -A ${i} -j CAPTIVE_PORTAL done +# Force DNS REDIRECT on GREEN (udp, tcp, 53) +if [ "$DNS_FORCE_ON_GREEN" == "on" ]; then + if ! iptables -t nat -C CUSTOMPREROUTING -i green0 -p udp -m udp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -A CUSTOMPREROUTING -i green0 -p udp -m udp --dport 53 -j REDIRECT + fi + + if ! iptables -t nat -C CUSTOMPREROUTING -i green0 -p tcp -m tcp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -A CUSTOMPREROUTING -i green0 -p tcp -m tcp --dport 53 -j REDIRECT + fi + +else + + if iptables -t nat -C CUSTOMPREROUTING -i green0 -p udp -m udp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -D CUSTOMPREROUTING -i green0 -p udp -m udp --dport 53 -j REDIRECT >/dev/null 2>&1 + fi + + if iptables -t nat -C CUSTOMPREROUTING -i green0 -p tcp -m tcp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -D CUSTOMPREROUTING -i green0 -p tcp -m tcp --dport 53 -j REDIRECT >/dev/null 2>&1 + fi +fi + +# Force DNS REDIRECT on BLUE (udp, tcp, 53) +if [ "$DNS_FORCE_ON_BLUE" == "on" ]; then + if ! iptables -t nat -C CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -A CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 53 -j REDIRECT + fi + + if ! iptables -t nat -C CUSTOMPREROUTING -i blue0 -p tcp -m tcp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -A CUSTOMPREROUTING -i blue0 -p tcp -m tcp --dport 53 -j REDIRECT + fi + +else + + if iptables -t nat -C CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -D CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 53 -j REDIRECT >/dev/null 2>&1 + fi + + if iptables -t nat -C CUSTOMPREROUTING -i blue0 -p tcp -m tcp --dport 53 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -D CUSTOMPREROUTING -i blue0 -p tcp -m tcp --dport 53 -j REDIRECT >/dev/null 2>&1 + fi + +fi + +# Force NTP REDIRECT on GREEN (udp, 123) +if [ "$NTP_FORCE_ON_GREEN" == "on" ]; then + if ! iptables -t nat -C CUSTOMPREROUTING -i green0 -p udp -m udp --dport 123 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -A CUSTOMPREROUTING -i green0 -p udp -m udp --dport 123 -j REDIRECT + fi + +else + + if iptables -t nat -C CUSTOMPREROUTING -i green0 -p udp -m udp --dport 123 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -D CUSTOMPREROUTING -i green0 -p udp -m udp --dport 123 -j REDIRECT >/dev/null 2>&1 + fi + +fi + +# Force DNS REDIRECT on BLUE (udp, 123) +if [ "$NTP_FORCE_ON_BLUE" == "on" ]; then + if ! iptables -t nat -C CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 123 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -A CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 123 -j REDIRECT + fi + +else + + if iptables -t nat -C CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 123 -j REDIRECT >/dev/null 2>&1; then + iptables -t nat -D CUSTOMPREROUTING -i blue0 -p udp -m udp --dport 123 -j REDIRECT >/dev/null 2>&1 + fi + +fi + # Accept everything connected for i in INPUT FORWARD OUTPUT; do iptables -A ${i} -j CONNTRACK -- 2.18.0

1 1

[PATCH 1/3] ninja: New package
by Stefan Schantl 27 Dec '20

27 Dec '20

This tool required to build more and more packages. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- config/rootfiles/common/ninja | 1 + lfs/ninja | 84 +++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 config/rootfiles/common/ninja create mode 100644 lfs/ninja diff --git a/config/rootfiles/common/ninja b/config/rootfiles/common/ninja new file mode 100644 index 000000000..f402add1b --- /dev/null +++ b/config/rootfiles/common/ninja @@ -0,0 +1 @@ +#usr/bin/ninja diff --git a/lfs/ninja b/lfs/ninja new file mode 100644 index 000000000..c968345f4 --- /dev/null +++ b/lfs/ninja @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.10.2 + +THISAPP = ninja-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 639f75bc2e3b19ab893eaf2c810d4eb4 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + # Configure and bootstrap the build environment + cd $(DIR_APP) && python3 configure.py --bootstrap --verbose + + # Build ninja + cd $(DIR_APP) && ./ninja -v all + + # Install ninja. + cd $(DIR_APP) && install -vm755 ninja /usr/bin/ + + @rm -rf $(DIR_APP) + @$(POSTBUILD) -- 2.20.1

3 6

[PATCH] bacula: Update to 9.6.7
by Adolf Belka 27 Dec '20

27 Dec '20

- Update bacula from 9.6.6 to 9.6.7 This is a minor bug release See https://sourceforge.net/projects/bacula/files/bacula/9.6.7/ReleaseNotes/ - This is the last of the version 9 series. The next update will be the version 11 series. - Update of lfs and rootfiles Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> --- config/rootfiles/packages/bacula | 6 +++--- lfs/bacula | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula index 51869b47e..e9313d083 100644 --- a/config/rootfiles/packages/bacula +++ b/config/rootfiles/packages/bacula @@ -21,13 +21,13 @@ etc/rc.d/init.d/bacula #opt/bacula #opt/bacula/log #usr/lib/bpipe-fd.so -usr/lib/libbac-9.6.6.so +usr/lib/libbac-9.6.7.so #usr/lib/libbac.la usr/lib/libbac.so -usr/lib/libbaccfg-9.6.6.so +usr/lib/libbaccfg-9.6.7.so #usr/lib/libbaccfg.la usr/lib/libbaccfg.so -usr/lib/libbacfind-9.6.6.so +usr/lib/libbacfind-9.6.7.so #usr/lib/libbacfind.la usr/lib/libbacfind.so #usr/sbin/bacula diff --git a/lfs/bacula b/lfs/bacula index 5268b46d6..5b9f119ff 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -24,7 +24,7 @@ include Config -VER = 9.6.6 +VER = 9.6.7 THISAPP = bacula-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bacula -PAK_VER = 8 +PAK_VER = 9 DEPS = @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ba9e2a2d979cbe9b5d76187f98418ac +$(DL_FILE)_MD5 = 2fa01ba7b0bb171535f6510b96ffd22b install : $(TARGET) -- 2.29.2

1 0

[PATCH 1/2] ninja: Allow to limit the parallel build processes.
by Stefan Schantl 26 Dec '20

26 Dec '20

When run, ninja normally runs a maximum number of processes in parallel. By default this is the number of cores on the system plus two. In some cases this can overheat a CPU or run a system out of memory. If run from the command line, passing a -jN parameter will limit the number of parallel processes, but some packages embed the execution of ninja and do not pass a -j parameter. Using this optional procedure allows us to limit the number of parallel processes via an environment variable, NINJAJOBS. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lfs/ninja | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lfs/ninja b/lfs/ninja index c968345f4..ed9f8b778 100644 --- a/lfs/ninja +++ b/lfs/ninja @@ -71,6 +71,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + # Allow to limit the paralell build processes ninja will do. + cd $(DIR_APP) && sed -i '/int Guess/a \ + int j = 0;\ + char* jobs = getenv( "NINJAJOBS" );\ + if ( jobs != NULL ) j = atoi( jobs );\ + if ( j > 0 ) return j;\ + ' src/ninja.cc + # Configure and bootstrap the build environment cd $(DIR_APP) && python3 configure.py --bootstrap --verbose -- 2.20.1

1 1

[PATCH] procps: Update to 3.3.16
by Adolf Belka 26 Dec '20

26 Dec '20

- update from 3.2.8 to 3.3.16 This is also an update from procps to procps-ng The previous version was no longer being maintained. - Added autogen.sh into lfs as ity is needed to create the config script. - Added libdir=/lib line into configure command as default is /usr/lib - Added mv commands for kill, ps & sysctl to place them into the same locations as the previous version of procps - Moved lfsmake2 procps line to after pkg-config in make.sh The autogen line requires autoconf, libtool, gettext and pkg-config to be available so procps moved to after them. - procps-3.2.8-fix_unknown_HZ_value.patch no longer required with new version so removed. - rootfile updated. - libprocps library being maintained by the same people now maitaining this version of procps. - information on the releases from 3.3.13 to 3.3.16 available on https://gitlab.com/procps-ng/procps/-/releases Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com> --- config/rootfiles/common/procps | 45 ++++++++++++++++--- lfs/procps | 16 +++++-- make.sh | 2 +- .../procps-3.2.8-fix_unknown_HZ_value.patch | 35 --------------- 4 files changed, 51 insertions(+), 47 deletions(-) delete mode 100644 src/patches/procps-3.2.8-fix_unknown_HZ_value.patch diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps index 1f32be94a..fc7d9326e 100644 --- a/config/rootfiles/common/procps +++ b/config/rootfiles/common/procps @@ -1,36 +1,67 @@ bin/kill bin/ps -lib/libproc-3.2.8.so +#lib/libprocps.a +#lib/libprocps.la +#lib/libprocps.so +lib/libprocps.so.8 +lib/libprocps.so.8.0.2 +#lib/pkgconfig +#lib/pkgconfig/libprocps.pc sbin/sysctl usr/bin/free usr/bin/pgrep +usr/bin/pidof #usr/bin/pkill #usr/bin/pmap #usr/bin/pwdx -#usr/bin/skill #usr/bin/slabtop -#usr/bin/snice #usr/bin/tload usr/bin/top -usr/bin/uptime usr/bin/vmstat usr/bin/w usr/bin/watch +#usr/include/proc +#usr/include/proc/alloc.h +#usr/include/proc/devname.h +#usr/include/proc/escape.h +#usr/include/proc/numa.h +#usr/include/proc/procps.h +#usr/include/proc/pwcache.h +#usr/include/proc/readproc.h +#usr/include/proc/sig.h +#usr/include/proc/slab.h +#usr/include/proc/sysinfo.h +#usr/include/proc/version.h +#usr/include/proc/wchan.h +#usr/include/proc/whattime.h +#usr/share/doc/procps-ng +#usr/share/doc/procps-ng/FAQ +#usr/share/doc/procps-ng/bugs.md +#usr/share/locale/de/LC_MESSAGES/procps-ng.mo +#usr/share/locale/fr/LC_MESSAGES/procps-ng.mo +#usr/share/locale/pl/LC_MESSAGES/procps-ng.mo +#usr/share/locale/pt_BR/LC_MESSAGES/procps-ng.mo +#usr/share/locale/sv/LC_MESSAGES/procps-ng.mo +#usr/share/locale/uk/LC_MESSAGES/procps-ng.mo +#usr/share/locale/vi/LC_MESSAGES/procps-ng.mo +#usr/share/locale/zh_CN/LC_MESSAGES/procps-ng.mo #usr/share/man/man1/free.1 #usr/share/man/man1/kill.1 #usr/share/man/man1/pgrep.1 +#usr/share/man/man1/pidof.1 #usr/share/man/man1/pkill.1 #usr/share/man/man1/pmap.1 +#usr/share/man/man1/procps.1 #usr/share/man/man1/ps.1 #usr/share/man/man1/pwdx.1 -#usr/share/man/man1/skill.1 #usr/share/man/man1/slabtop.1 -#usr/share/man/man1/snice.1 #usr/share/man/man1/tload.1 #usr/share/man/man1/top.1 -#usr/share/man/man1/uptime.1 #usr/share/man/man1/w.1 #usr/share/man/man1/watch.1 +#usr/share/man/man3/openproc.3 +#usr/share/man/man3/readproc.3 +#usr/share/man/man3/readproctab.3 #usr/share/man/man5/sysctl.conf.5 #usr/share/man/man8/sysctl.8 #usr/share/man/man8/vmstat.8 diff --git a/lfs/procps b/lfs/procps index 4807f5210..4667917c8 100644 --- a/lfs/procps +++ b/lfs/procps @@ -24,7 +24,7 @@ include Config -VER = 3.2.8 +VER = v3.3.16 THISAPP = procps-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0 +$(DL_FILE)_MD5 = 2af440d54f94a3b44020bf0ea1bf9de8 install : $(TARGET) @@ -70,9 +70,17 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_unknown_HZ_value.patch - cd $(DIR_APP) && make $(MAKETUNING) LIBPROC=proc/libproc-$(VER).so + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --libdir=/lib + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc + + # Move some tools to /bin & /sbin + mv -v /usr/bin/{kill,ps} /bin + mv -v /usr/sbin/sysctl /sbin + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index f9b2ee6ba..7ef48e92a 100755 --- a/make.sh +++ b/make.sh @@ -1093,7 +1093,6 @@ buildbase() { lfsmake2 m4 lfsmake2 bison lfsmake2 ncurses - lfsmake2 procps lfsmake2 libtool lfsmake2 perl lfsmake2 readline @@ -1121,6 +1120,7 @@ buildbase() { lfsmake2 kbd lfsmake2 less lfsmake2 pkg-config + lfsmake2 procps lfsmake2 make lfsmake2 man lfsmake2 net-tools diff --git a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch deleted file mode 100644 index 08edaa6cc..000000000 --- a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c ---- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100 -+++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200 -@@ -212,6 +212,7 @@ - static void init_libproc(void) __attribute__((constructor)); - static void init_libproc(void){ - have_privs = check_for_privs(); -+ init_Linux_version(); - // ought to count CPUs in /proc/stat instead of relying - // on glibc, which foolishly tries to parse /proc/cpuinfo - // -diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c ---- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100 -+++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200 -@@ -33,8 +33,7 @@ - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); --static void init_Linux_version(void) { -+void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ - -diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h ---- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100 -+++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200 -@@ -14,6 +14,7 @@ - - EXTERN_C_BEGIN - -+extern void init_Linux_version(void); - extern void display_version(void); /* display suite version */ - extern const char procps_version[]; /* global buf for suite version */ - -- 2.29.2

1 0

Forcing all DNS traffic from the LAN to the firewall
by Matthias Fischer 25 Dec '20

25 Dec '20

Hi, there have been several discussions with several solution attempts in both IPFire forums (old/new), generally starting with (e.g.) "...I am trying to redirect all of my DNS traffic to go thru the IPFire DNS instead of directly to an outside DNS server...". Current discussion => https://community.ipfire.org/t/forcing-all-dns-traffic-from-the-lan-to-the-… But not only in the forums - the oldest Wiki article is dated "May 22, 2015". Long time, but still editing scripts manually... Hoping that there is a chance for a (final) integrated solution which doesn't include editing code, but having a checkbox to switch this functionality ON/OFF on a standardized and more secure base, I would like to open a discussion on the list. For a start and to test how this could probably be done - and to find out if I can do it - I customized '/srv/web/ipfire/cgi-bin/optionsfw.cgi'. Screenshots of the result can be found in the forum thread cited above: => https://community.ipfire.org/t/forcing-all-dns-traffic-from-the-lan-to-the-… But some points are IMHO still unclear and need clarification. And I think I'm not the one to decide where to go... My thoughts until now: - Do we need this? [Hm. ;-) As I heard, some folks do.] - Is the 'optionsfwcgi' the right place for this? [In my opinion: yes. It was easy to add and sits beside other interface "options"] - Do we really want this for all installations? [For someone, who doesn't want or doesn't need it: it can be switched OFF] - Is this function usable under ALL circumstances? [If not: it can be switched OFF] - Where (E.g: firewall init script, rules.pl, wirelessctrl.c, ...) should the necessary iptables rules be processed? [Some ideas how this could be done, but no "breakthrough". Current option-settings are processed in several scripts. Which one to use!?] Before going on and investing more time in this (on the forum), I'd like to know how the developers think about this and would like to collect ideas and suggestions here. Any hints are welcome... Best, Matthias

5 19

[PATCH] logwatch: Fix unmatched entries from clamav
by Matthias Fischer 25 Dec '20

25 Dec '20

This - cosmetic - patch fixes the unnecessary unmatched "Activating the newly loaded database..."-entries introduced with 'clamav 0.103.0'. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/logwatch | 1 + .../logwatch-7.5.4-clamav_fix_unmatch_entries.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch diff --git a/lfs/logwatch b/lfs/logwatch index 7aa145121..0ad9a83f5 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch/logwatch-7.3.6-date_manip6.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-dhcpd_reuse_lease_entries.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-disable_iptables.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch @cd $(DIR_APP) && chmod 755 install_logwatch.sh cd $(DIR_APP) && yes "" | ./install_logwatch.sh diff --git a/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch b/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch new file mode 100644 index 000000000..10fb8afcf --- /dev/null +++ b/src/patches/logwatch/logwatch-7.5.4-clamav_fix_unmatch_entries.patch @@ -0,0 +1,11 @@ +diff -U 3 a/scripts/services/clamav b/scripts/services/clamav +--- a/scripts/services/clamav Fri Sep 21 00:46:14 2020 ++++ b/scripts/services/clamav Mon Dec 25 09:26:26 2020 +@@ -77,6 +77,7 @@ + ( $ThisLine =~ /Bytecode: Security mode set to /) or + ( $ThisLine =~ /^No stats for Database check/ ) or + ( $ThisLine =~ /^Received \d+ file descriptor$s$ from systemd\.$/) or ++ ( $ThisLine =~ /^Activating the newly loaded database.../ ) or + 0 # This line prevents blame shifting as lines are added above + ) { + # We do not care about these. -- 2.18.0

1 0

[PATCH] country.cgi: Cosmetic fix for 'Back'-button'
by Matthias Fischer 24 Dec '20

24 Dec '20

While testing Peter's patch for Bug #12560 I noticed that the standard 'back'-button at the end of the page - like in 'ipinfo.cgi' - was implemented as a text string. I just took the code segment with the 'back'-*image* from 'ipinfo.cgi' to make this link looking similar to the other pages. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/country.cgi | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index b1c72bb22..7504a7601 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -96,10 +96,17 @@ foreach my $country (@countries) { print "</table>"; &Header::closebox(); -&Header::closebigbox(); +print <<END +<div align='center'> +<table width='80%'> +<tr> +<-><td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> +</tr> +</table> +</div> +END +; -print "<div style='text-align:center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></div>\n"; +&Header::closebigbox(); &Header::closepage(); - - -- 2.18.0

1 0

[PATCH] country.cgi: fix location function call
by Peter Müller 24 Dec '20

24 Dec '20

Fixes: #12560 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- html/cgi-bin/country.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index b1c72bb22..35fa93113 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -53,7 +53,7 @@ print<<END; END # Get a list of all supported country codes. -my @countries = &Location::database_countries(); +my @countries = &Location::Functions::get_locations(); # Loop through whole country list. foreach my $country (@countries) { -- 2.26.2

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development December 2020