IPFire-SCM October 2016

ipfire-scm@lists.ipfire.org

1 participants
60 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0807ce69eead5a35cdb699b61a48bffdf81ebcc4
by git＠ipfire.org 08 Oct '16

08 Oct '16

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 0807ce69eead5a35cdb699b61a48bffdf81ebcc4 (commit) from 0d7ca700bd2c8eafbedf2261038496d4588bd5b7 (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 0807ce69eead5a35cdb699b61a48bffdf81ebcc4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Oct 8 15:43:54 2016 +0200 setclock: prevent time bacjump by empty rtc batteries This is a work around to prevent not working dns resolution if the time jumps before the DNSSec signing key. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/106/filelists/files | 1 + src/initscripts/init.d/setclock | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 77f73c8..5133da9 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -7,6 +7,7 @@ etc/rc.d/init.d/network etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/ntp +etc/rc.d/init.d/setclock etc/rc.d/init.d/unbound etc/rc.d/rc0.d/K79unbound etc/rc.d/rc3.d/S21unbound diff --git a/src/initscripts/init.d/setclock b/src/initscripts/init.d/setclock index 661e944..19fb891 100644 --- a/src/initscripts/init.d/setclock +++ b/src/initscripts/init.d/setclock @@ -30,16 +30,20 @@ case ${1} in fi hwclock --hctosys ${CLOCKPARAMS} &>/dev/null - if [ ! ${?} == 0 ]; then - if [ -s /var/log/messages ]; then - boot_mesg -n "No RTC found, set time to last log accesstime ... " - DATE=`stat --format "%y" /var/log/messages | cut -d" " -f1` - TIME=`stat --format "%y" /var/log/messages | sed -e "s|\..*||g" | cut -d" " -f2` - date -s $DATE > /dev/null - date -s $TIME + date + + if [ -s /var/log/messages ]; then + LOGTIMESTAMP=`stat --format "%y" /var/log/messages` + LOGTIME=`date +%s -d "$LOGTIMESTAMP"` + SYSTIME=`date +%s` + if [ $SYSTIME -lt $LOGTIME ]; then + boot_mesg "Warning! clock runs later than last log access. Check battery/rtc!" + date -s "$LOGTIMESTAMP" + echo_warning; + else + echo_ok; fi fi - evaluate_retval ;; stop) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0d7ca700bd2c8eafbedf2261038496d4588bd5b7
by git＠ipfire.org 07 Oct '16

07 Oct '16

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 0d7ca700bd2c8eafbedf2261038496d4588bd5b7 (commit) from e22bcd38d6857cd1ee7292cbf634db80d0dd813c (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 0d7ca700bd2c8eafbedf2261038496d4588bd5b7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Oct 7 11:27:33 2016 +0200 unbound: skip green interface if ip was set to 1.1.1.1 this is a reserved marker for unused green ip. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/unbound | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index d324457..3b8beee 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -112,7 +112,7 @@ update_forwarders() { own_hostname() { local hostname=$(hostname -f) - # 1.1.1.1 is reserved for green only, skip this + # 1.1.1.1 is reserved for unused green, skip this if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then unbound-control -q local_data "${hostname} ${LOCAL_TTL} IN A ${GREEN_ADDRESS}" fi @@ -148,7 +148,8 @@ write_interfaces_conf() { ( config_header - if [ -n "${GREEN_ADDRESS}" ]; then + # 1.1.1.1 is reserved for unused green + if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then echo "# GREEN" echo "interface: ${GREEN_ADDRESS}" echo "access-control: $(cidr ${GREEN_NETADDRESS} ${GREEN_NETMASK}) allow" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e22bcd38d6857cd1ee7292cbf634db80d0dd813c
by git＠ipfire.org 06 Oct '16

06 Oct '16

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 e22bcd38d6857cd1ee7292cbf634db80d0dd813c (commit) via 71cf56fe53a1f561a8d11f2f354a0cc91bfe37ba (commit) from eef9b2529c3cab522dac4f4bcfa1a0075376514e (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 e22bcd38d6857cd1ee7292cbf634db80d0dd813c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 6 10:42:49 2016 +0100 unbound: Correctly format PTR records Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 71cf56fe53a1f561a8d11f2f354a0cc91bfe37ba Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Oct 6 10:41:54 2016 +0100 core106: Restart DHCP server to import leases into DNS Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/106/update.sh | 3 +++ config/unbound/unbound-dhcp-leases-bridge | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh index e025cfd..09d183e 100644 --- a/config/rootfiles/core/106/update.sh +++ b/config/rootfiles/core/106/update.sh @@ -81,6 +81,9 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then /etc/init.d/ipsec start fi +# Restart DHCP server to import leases into unbound +/etc/init.d/dhcp restart + # This update need a reboot... touch /var/run/need_reboot diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge index 0ef14e1..c62d233 100644 --- a/config/unbound/unbound-dhcp-leases-bridge +++ b/config/unbound/unbound-dhcp-leases-bridge @@ -49,6 +49,20 @@ def setup_logging(loglevel=logging.INFO): log = logging.getLogger("dhcp") +def ip_address_to_reverse_pointer(address): + parts = address.split(".") + parts.reverse() + + return "%s.in-addr.arpa" % ".".join(parts) + +def reverse_pointer_to_ip_address(rr): + parts = rr.split(".") + + # Only take IP address part + parts = reversed(parts[0:4]) + + return ".".join(parts) + class UnboundDHCPLeasesBridge(object): def __init__(self, dhcp_leases_file, unbound_leases_file): self.leases_file = dhcp_leases_file @@ -301,7 +315,8 @@ class Lease(object): (self.fqdn, "%s" % LOCAL_TTL, "IN A", self.ipaddr), # Reverse record - (self.ipaddr, "%s" % LOCAL_TTL, "IN PTR", self.fqdn), + (ip_address_to_reverse_pointer(self.ipaddr), "%s" % LOCAL_TTL, + "IN PTR", self.fqdn), ] @@ -333,7 +348,7 @@ class UnboundConfigWriter(object): if record_type == "A": ret[hostname] = content elif record_type == "PTR": - ret[content] = hostname + ret[content] = reverse_pointer_to_ip_address(hostname) return ret hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. fdaf9476f6a493fef43d90d6cf3149e4702c9f26
by git＠ipfire.org 05 Oct '16

05 Oct '16

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eef9b2529c3cab522dac4f4bcfa1a0075376514e
by git＠ipfire.org 04 Oct '16

04 Oct '16

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 eef9b2529c3cab522dac4f4bcfa1a0075376514e (commit) via 574ee681d21b394cbc4d4b498bd4dba9a2a8ebf8 (commit) via 350e29c26fe9d6cb8c075f47674db04a81f4ddc7 (commit) via c5f633c91712e4e1f5bb68633f4d55f030aed8a6 (commit) from e3a90a5736be84bd4292a05c006802aa26ffcc0d (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 eef9b2529c3cab522dac4f4bcfa1a0075376514e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 4 22:40:03 2016 +0100 setup: Store passwords in SHA format htpasswd doesn't protect passwords very well. MD5 was used before and now any newly created passwords will use the SHA format. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 574ee681d21b394cbc4d4b498bd4dba9a2a8ebf8 Merge: 350e29c e3a90a5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Oct 4 22:34:23 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 350e29c26fe9d6cb8c075f47674db04a81f4ddc7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Oct 3 12:13:43 2016 +0100 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c5f633c91712e4e1f5bb68633f4d55f030aed8a6 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Sep 23 16:33:04 2016 +0200 guardian 2.0: suggested cosmetic changes I did the following: - Rearranged the fields on 'guardian.cgi' a bit - in a (hopefully) logical manner, so that they don't need so much room. - Added some translation-strings and explanations to (revised) 'guardian.cgi'. - Added missing language string(s), deleted obsolete. - Deleted all guardian entries from standard language files in '/var/ipfire/langs'-directory. - Added (upgraded) addon-specific language files to '/var/ipfire/addon-lang'-directory. I hope, I didn't forget something... Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/guardian/guardian.de.pl | 45 ++++++++++++++++ config/guardian/guardian.en.pl | 45 ++++++++++++++++ config/guardian/guardian.es.pl | 23 ++++++++ config/guardian/guardian.fr.pl | 23 ++++++++ config/guardian/guardian.it.pl | 24 +++++++++ config/guardian/guardian.nl.pl | 23 ++++++++ config/guardian/guardian.pl.pl | 23 ++++++++ config/guardian/guardian.ru.pl | 24 +++++++++ config/guardian/guardian.tr.pl | 24 +++++++++ config/rootfiles/core/106/filelists/files | 1 + doc/language_issues.de | 34 ++++++++++++ doc/language_issues.en | 36 ++++++++++++- doc/language_issues.es | 16 ++++-- doc/language_issues.fr | 16 ++++-- doc/language_issues.it | 17 ++++-- doc/language_issues.nl | 16 ++++-- doc/language_issues.pl | 16 ++++-- doc/language_issues.ru | 16 ++++-- doc/language_issues.tr | 16 ++++-- doc/language_missings | 88 ------------------------------- html/cgi-bin/guardian.cgi | 80 +++++++++++++++------------- langs/de/cgi-bin/de.pl | 24 --------- langs/en/cgi-bin/en.pl | 26 --------- langs/es/cgi-bin/es.pl | 6 --- langs/fr/cgi-bin/fr.pl | 6 --- langs/it/cgi-bin/it.pl | 7 --- langs/nl/cgi-bin/nl.pl | 6 --- langs/pl/cgi-bin/pl.pl | 6 --- langs/ru/cgi-bin/ru.pl | 6 --- langs/tr/cgi-bin/tr.pl | 6 --- lfs/guardian | 9 ++-- src/setup/passwords.c | 2 +- 32 files changed, 459 insertions(+), 251 deletions(-) create mode 100644 config/guardian/guardian.de.pl create mode 100644 config/guardian/guardian.en.pl create mode 100644 config/guardian/guardian.es.pl create mode 100644 config/guardian/guardian.fr.pl create mode 100644 config/guardian/guardian.it.pl create mode 100644 config/guardian/guardian.nl.pl create mode 100644 config/guardian/guardian.pl.pl create mode 100644 config/guardian/guardian.ru.pl create mode 100644 config/guardian/guardian.tr.pl Difference in files: diff --git a/config/guardian/guardian.de.pl b/config/guardian/guardian.de.pl new file mode 100644 index 0000000..344d045 --- /dev/null +++ b/config/guardian/guardian.de.pl @@ -0,0 +1,45 @@ +%tr = ( +%tr, + +'guardian' => 'Guardian', +'guardian block a host' => 'Host blocken', +'guardian block httpd brute-force' => 'httpd-Brute-Force-Erkennung', +'guardian block owncloud brute-force' => 'Owncloud-Brute-Force-Erkennung', +'guardian block ssh brute-force' => 'SSH-Brute-Force-Erkennung', +'guardian blockcount' => 'Trefferschwelle (Snort)', +'guardian blocked hosts' => 'Aktuell geblockte Hosts', +'guardian blocking of this address is not allowed' => 'Diese Addresse darf nicht geblockt werden.', +'guardian blocktime' => 'Blockzeit (Sekunden)', +'guardian common settings' => 'Allgemeine Einstellungen', +'guardian configuration' => 'Guardian-Konfiguration', +'guardian daemon' => 'Daemon', +'guardian empty input' => 'Fehlende Angabe: Bitte geben Sie einen gültigen Host oder ein gültiges Netzwerk an.', +'guardian enabled' => 'Guardian aktivieren', +'guardian firewallaction' => 'Firewall-Aktion', +'guardian ignored hosts' => 'Ignorierte Hosts', +'guardian invalid address or subnet' => 'Ungültige Host-Addresse oder Netzwerk.', +'guardian invalid blockcount' => 'Ungültige Anzahl: Bitte verwenden Sie eine natürliche Zahl größer als Null.', +'guardian invalid blocktime' => 'Ungültige Blockzeit: Bitte verwenden Sie eine natürliche Zahl größer als Null.', +'guardian invalid logfile' => 'Der angegebene Pfad zum "Ignore file" ist ungültig.', +'guardian logfacility' => 'Logziel', +'guardian logfile' => 'Logdatei', +'guardian loglevel' => 'Loglevel', +'guardian loglevel_off' => 'Aus', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'Datei', +'guardian logtarget_console' => 'Konsole', +'guardian no entries' => 'Keine Einträge vorhanden.', +'guardian not running no hosts can be blocked' => 'Guardian läuft nicht. Es werden keine Hosts geblockt.', +'guardian priolevel_high' => '1 - Hoch', +'guardian priolevel_medium' => '2 - Mittel', +'guardian priolevel_low' => '3 - Niedrig', +'guardian priolevel_very_low' => '4 - Sehr niedrig', +'guardian priority level' => 'Prioritätslevel (Snort)', +'guardian service' => 'Guardian-Dienst', +'guardian watch snort alertfile' => 'Snort-Alarme auswerten', + +); + +#EOF diff --git a/config/guardian/guardian.en.pl b/config/guardian/guardian.en.pl new file mode 100644 index 0000000..f6be865 --- /dev/null +++ b/config/guardian/guardian.en.pl @@ -0,0 +1,45 @@ +%tr = ( +%tr, + +'guardian' => 'Guardian', +'guardian block a host' => 'Block host', +'guardian block httpd brute-force' => 'httpd Brute Force Detection', +'guardian block owncloud brute-force' => 'Owncloud Brute Force detection', +'guardian block ssh brute-force' => 'SSH Brute Force Detection', +'guardian blockcount' => 'Strike Threshold (Snort)', +'guardian blocked hosts' => 'Currently blocked hosts', +'guardian blocking of this address is not allowed' => 'Blocking of the given address is not allowed.', +'guardian blocktime' => 'Block Time (seconds)', +'guardian common settings' => 'Common Settings', +'guardian configuration' => 'Guardian Configuration', +'guardian daemon' => 'Daemon', +'guardian empty input' => 'Empty input: Please enter a valid host address or subnet.', +'guardian enabled' => 'Enable Guardian', +'guardian firewallaction' => 'Firewall Action', +'guardian ignored hosts' => 'Ignored Hosts', +'guardian invalid address or subnet' => 'Invalid host address or subnet.', +'guardian invalid blockcount' => 'Invalid BlockCount: Please provide a natural number higher than zero.', +'guardian invalid blocktime' => 'Invalid BlockTime: Please provide a natural number higher than zero.', +'guardian invalid logfile' => 'The provided path for the logfile is not valid.', +'guardian logfacility' => 'Log Facility', +'guardian logfile' => 'Log File', +'guardian loglevel' => 'Log Level', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian no entries' => 'No entries at the moment.', +'guardian not running no hosts can be blocked' => 'Guardian is not running. No hosts will be blocked.', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian priority level' => 'Priority Level (Snort)', +'guardian service' => 'Guardian Service', +'guardian watch snort alertfile' => 'Monitor Snort Alert File', + +); + +#EOF diff --git a/config/guardian/guardian.es.pl b/config/guardian/guardian.es.pl new file mode 100644 index 0000000..89ffb52 --- /dev/null +++ b/config/guardian/guardian.es.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Archivo de alerta', +'guardian configuration' => 'Configuración de Guardian', +'guardian ignorefile' => 'Archivo Ignorefile', +'guardian interface' => 'Interfaz', +'guardian logfile' => 'Archivo de registro', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Límite de tiempo', + +); + +#EOF diff --git a/config/guardian/guardian.fr.pl b/config/guardian/guardian.fr.pl new file mode 100644 index 0000000..82e5736 --- /dev/null +++ b/config/guardian/guardian.fr.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Fichier d\'alerte', +'guardian configuration' => 'Configuration du gardien', +'guardian ignorefile' => 'Fichier d\'ignorés', +'guardian interface' => 'Interface', +'guardian logfile' => 'Fichier log', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Délai maximum', + +); + +#EOF diff --git a/config/guardian/guardian.it.pl b/config/guardian/guardian.it.pl new file mode 100644 index 0000000..9b89a52 --- /dev/null +++ b/config/guardian/guardian.it.pl @@ -0,0 +1,24 @@ +%tr = ( +%tr, + +'guaranteed bandwith' => 'Guaranteed bandwith', +'guardian alertfile' => 'Alertfile', +'guardian configuration' => 'Guardian Configuration', +'guardian ignorefile' => 'Ignorefile', +'guardian interface' => 'Interface', +'guardian logfile' => 'Logfile', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Timelimit', + +); + +#EOF diff --git a/config/guardian/guardian.nl.pl b/config/guardian/guardian.nl.pl new file mode 100644 index 0000000..d71a91f --- /dev/null +++ b/config/guardian/guardian.nl.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Meldingenbestand', +'guardian configuration' => 'Guardian configuratie', +'guardian ignorefile' => 'Negeerbestand', +'guardian interface' => 'Interface', +'guardian logfile' => 'Logbestand', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Tijdlimiet', + +); + +#EOF diff --git a/config/guardian/guardian.pl.pl b/config/guardian/guardian.pl.pl new file mode 100644 index 0000000..18cb396 --- /dev/null +++ b/config/guardian/guardian.pl.pl @@ -0,0 +1,23 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Plik alertów', +'guardian configuration' => 'Konfiguracja Guardian\'a', +'guardian ignorefile' => 'Plik ignorowanych', +'guardian interface' => 'Interfejs', +'guardian logfile' => 'Plik Log', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Ograniczenie czasowe', + +); + +#EOF diff --git a/config/guardian/guardian.ru.pl b/config/guardian/guardian.ru.pl new file mode 100644 index 0000000..34b8928 --- /dev/null +++ b/config/guardian/guardian.ru.pl @@ -0,0 +1,24 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Alertfile', +'guardian configuration' => 'Настройки защиты', +'guardian ignorefile' => 'Ignorefile', +'guardian interface' => 'Интерфейс', +'guardian logfile' => 'Logfile', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Ограничение времени', + +); + +#EOF + diff --git a/config/guardian/guardian.tr.pl b/config/guardian/guardian.tr.pl new file mode 100644 index 0000000..701dc15 --- /dev/null +++ b/config/guardian/guardian.tr.pl @@ -0,0 +1,24 @@ +%tr = ( +%tr, + +'guardian alertfile' => 'Uyarı dosyası', +'guardian configuration' => 'Koruyucu Yapılandırması', +'guardian ignorefile' => 'Yoksayılan dosya', +'guardian interface' => 'Ara birim', +'guardian logfile' => 'Günlük dosyası', +'guardian loglevel_off' => 'Off', +'guardian loglevel_info' => 'Info', +'guardian loglevel_debug' => 'Debug', +'guardian logtarget_syslog' => 'Systemlog', +'guardian logtarget_file' => 'File', +'guardian logtarget_console' => 'Console', +'guardian priolevel_high' => '1 - High', +'guardian priolevel_medium' => '2 - Medium', +'guardian priolevel_low' => '3 - Low', +'guardian priolevel_very_low' => '4 - Very low', +'guardian timelimit' => 'Zaman sınırlaması', + +); + +#EOF + diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 3468c58..77f73c8 100644 --- a/config/rootfiles/core/106/filelists/files +++ b/config/rootfiles/core/106/filelists/files @@ -19,3 +19,4 @@ srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/services.cgi +usr/sbin/setup diff --git a/doc/language_issues.de b/doc/language_issues.de index 26069ce..101411e 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -672,9 +672,43 @@ WARNING: untranslated string: dead peer detection WARNING: untranslated string: emerging rules WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: guardian +WARNING: untranslated string: guardian block a host +WARNING: untranslated string: guardian block httpd brute-force +WARNING: untranslated string: guardian block owncloud brute-force +WARNING: untranslated string: guardian block ssh brute-force +WARNING: untranslated string: guardian blockcount +WARNING: untranslated string: guardian blocked hosts +WARNING: untranslated string: guardian blocking of this address is not allowed +WARNING: untranslated string: guardian blocktime +WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration +WARNING: untranslated string: guardian daemon +WARNING: untranslated string: guardian empty input +WARNING: untranslated string: guardian enabled +WARNING: untranslated string: guardian firewallaction +WARNING: untranslated string: guardian ignored hosts +WARNING: untranslated string: guardian invalid address or subnet WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile +WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile +WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog +WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low +WARNING: untranslated string: guardian priority level +WARNING: untranslated string: guardian service +WARNING: untranslated string: guardian watch snort alertfile WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: info messages WARNING: untranslated string: no data diff --git a/doc/language_issues.en b/doc/language_issues.en index e1bf78b..596cf71 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -299,8 +299,6 @@ WARNING: translation string unused: geoipblock country code WARNING: translation string unused: geoipblock country name WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface -WARNING: translation string unused: guardian not running no hosts can be blocked -WARNING: translation string unused: guardian snort alertfile WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -706,9 +704,43 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: guardian +WARNING: untranslated string: guardian block a host +WARNING: untranslated string: guardian block httpd brute-force +WARNING: untranslated string: guardian block owncloud brute-force +WARNING: untranslated string: guardian block ssh brute-force +WARNING: untranslated string: guardian blockcount +WARNING: untranslated string: guardian blocked hosts +WARNING: untranslated string: guardian blocking of this address is not allowed +WARNING: untranslated string: guardian blocktime +WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration +WARNING: untranslated string: guardian daemon +WARNING: untranslated string: guardian empty input +WARNING: untranslated string: guardian enabled +WARNING: untranslated string: guardian firewallaction +WARNING: untranslated string: guardian ignored hosts +WARNING: untranslated string: guardian invalid address or subnet WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile +WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile +WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog +WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low +WARNING: untranslated string: guardian priority level +WARNING: untranslated string: guardian service +WARNING: untranslated string: guardian watch snort alertfile WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: info messages WARNING: untranslated string: no data diff --git a/doc/language_issues.es b/doc/language_issues.es index e0b420d..ad64380 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -244,10 +244,6 @@ WARNING: translation string unused: geoipblock country code WARNING: translation string unused: geoipblock country name WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface -WARNING: translation string unused: guardian alertfile -WARNING: translation string unused: guardian ignorefile -WARNING: translation string unused: guardian interface -WARNING: translation string unused: guardian timelimit WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -939,6 +935,7 @@ WARNING: untranslated string: guardian blocked hosts WARNING: untranslated string: guardian blocking of this address is not allowed WARNING: untranslated string: guardian blocktime WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration WARNING: untranslated string: guardian daemon WARNING: untranslated string: guardian empty input WARNING: untranslated string: guardian enabled @@ -949,8 +946,19 @@ WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low WARNING: untranslated string: guardian priority level WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c0edce6..28e80c9 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -241,10 +241,6 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface -WARNING: translation string unused: guardian alertfile -WARNING: translation string unused: guardian ignorefile -WARNING: translation string unused: guardian interface -WARNING: translation string unused: guardian timelimit WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -954,6 +950,7 @@ WARNING: untranslated string: guardian blocked hosts WARNING: untranslated string: guardian blocking of this address is not allowed WARNING: untranslated string: guardian blocktime WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration WARNING: untranslated string: guardian daemon WARNING: untranslated string: guardian empty input WARNING: untranslated string: guardian enabled @@ -964,8 +961,19 @@ WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low WARNING: untranslated string: guardian priority level WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile diff --git a/doc/language_issues.it b/doc/language_issues.it index 0358b2c..d221534 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -291,10 +291,6 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface -WARNING: translation string unused: guardian alertfile -WARNING: translation string unused: guardian ignorefile -WARNING: translation string unused: guardian interface -WARNING: translation string unused: guardian timelimit WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -750,6 +746,7 @@ WARNING: untranslated string: geoipblock configuration WARNING: untranslated string: geoipblock country is allowed WARNING: untranslated string: geoipblock country is blocked WARNING: untranslated string: geoipblock enable feature +WARNING: untranslated string: guaranteed bandwith WARNING: untranslated string: guardian WARNING: untranslated string: guardian block a host WARNING: untranslated string: guardian block httpd brute-force @@ -760,6 +757,7 @@ WARNING: untranslated string: guardian blocked hosts WARNING: untranslated string: guardian blocking of this address is not allowed WARNING: untranslated string: guardian blocktime WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration WARNING: untranslated string: guardian daemon WARNING: untranslated string: guardian empty input WARNING: untranslated string: guardian enabled @@ -770,8 +768,19 @@ WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low WARNING: untranslated string: guardian priority level WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c8cd0d8..1dfc968 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -290,10 +290,6 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface -WARNING: translation string unused: guardian alertfile -WARNING: translation string unused: guardian ignorefile -WARNING: translation string unused: guardian interface -WARNING: translation string unused: guardian timelimit WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -775,6 +771,7 @@ WARNING: untranslated string: guardian blocked hosts WARNING: untranslated string: guardian blocking of this address is not allowed WARNING: untranslated string: guardian blocktime WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration WARNING: untranslated string: guardian daemon WARNING: untranslated string: guardian empty input WARNING: untranslated string: guardian enabled @@ -785,8 +782,19 @@ WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low WARNING: untranslated string: guardian priority level WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile diff --git a/doc/language_issues.pl b/doc/language_issues.pl index e0b420d..ad64380 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -244,10 +244,6 @@ WARNING: translation string unused: geoipblock country code WARNING: translation string unused: geoipblock country name WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface -WARNING: translation string unused: guardian alertfile -WARNING: translation string unused: guardian ignorefile -WARNING: translation string unused: guardian interface -WARNING: translation string unused: guardian timelimit WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -939,6 +935,7 @@ WARNING: untranslated string: guardian blocked hosts WARNING: untranslated string: guardian blocking of this address is not allowed WARNING: untranslated string: guardian blocktime WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration WARNING: untranslated string: guardian daemon WARNING: untranslated string: guardian empty input WARNING: untranslated string: guardian enabled @@ -949,8 +946,19 @@ WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low WARNING: untranslated string: guardian priority level WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 9daa20f..31855fa 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -237,10 +237,6 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface -WARNING: translation string unused: guardian alertfile -WARNING: translation string unused: guardian ignorefile -WARNING: translation string unused: guardian interface -WARNING: translation string unused: guardian timelimit WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -938,6 +934,7 @@ WARNING: untranslated string: guardian blocked hosts WARNING: untranslated string: guardian blocking of this address is not allowed WARNING: untranslated string: guardian blocktime WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration WARNING: untranslated string: guardian daemon WARNING: untranslated string: guardian empty input WARNING: untranslated string: guardian enabled @@ -948,8 +945,19 @@ WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low WARNING: untranslated string: guardian priority level WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8f060dc..6629cd6 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -299,10 +299,6 @@ WARNING: translation string unused: geoipblock country code WARNING: translation string unused: geoipblock country name WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface -WARNING: translation string unused: guardian alertfile -WARNING: translation string unused: guardian ignorefile -WARNING: translation string unused: guardian interface -WARNING: translation string unused: guardian timelimit WARNING: translation string unused: gz with key WARNING: translation string unused: hint WARNING: translation string unused: host @@ -719,6 +715,7 @@ WARNING: untranslated string: guardian blocked hosts WARNING: untranslated string: guardian blocking of this address is not allowed WARNING: untranslated string: guardian blocktime WARNING: untranslated string: guardian common settings +WARNING: untranslated string: guardian configuration WARNING: untranslated string: guardian daemon WARNING: untranslated string: guardian empty input WARNING: untranslated string: guardian enabled @@ -729,8 +726,19 @@ WARNING: untranslated string: guardian invalid blockcount WARNING: untranslated string: guardian invalid blocktime WARNING: untranslated string: guardian invalid logfile WARNING: untranslated string: guardian logfacility +WARNING: untranslated string: guardian logfile WARNING: untranslated string: guardian loglevel +WARNING: untranslated string: guardian loglevel_debug +WARNING: untranslated string: guardian loglevel_info +WARNING: untranslated string: guardian loglevel_off +WARNING: untranslated string: guardian logtarget_console +WARNING: untranslated string: guardian logtarget_file +WARNING: untranslated string: guardian logtarget_syslog WARNING: untranslated string: guardian no entries +WARNING: untranslated string: guardian priolevel_high +WARNING: untranslated string: guardian priolevel_low +WARNING: untranslated string: guardian priolevel_medium +WARNING: untranslated string: guardian priolevel_very_low WARNING: untranslated string: guardian priority level WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile diff --git a/doc/language_missings b/doc/language_missings index 8afdfe8..32e1e48 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -372,28 +372,6 @@ < geoipblock enable feature < geoipblock flag < grouptype -< guardian -< guardian block a host -< guardian blockcount -< guardian blocked hosts -< guardian block httpd brute-force -< guardian blocking of this address is not allowed -< guardian block owncloud brute-force -< guardian block ssh brute-force -< guardian blocktime -< guardian common settings -< guardian daemon -< guardian empty input -< guardian enabled -< guardian firewallaction -< guardian ignored hosts -< guardian invalid address or subnet -< guardian logfacility -< guardian loglevel -< guardian no entries -< guardian priority level -< guardian service -< guardian watch snort alertfile < hardware support < imei < imsi @@ -995,28 +973,6 @@ < gen dh < generate dh key < grouptype -< guardian -< guardian block a host -< guardian blockcount -< guardian blocked hosts -< guardian block httpd brute-force -< guardian blocking of this address is not allowed -< guardian block owncloud brute-force -< guardian block ssh brute-force -< guardian blocktime -< guardian common settings -< guardian daemon -< guardian empty input -< guardian enabled -< guardian firewallaction -< guardian ignored hosts -< guardian invalid address or subnet -< guardian logfacility -< guardian loglevel -< guardian no entries -< guardian priority level -< guardian service -< guardian watch snort alertfile < hardware support < imei < imsi @@ -1612,28 +1568,6 @@ < geoipblock enable feature < geoipblock flag < grouptype -< guardian -< guardian block a host -< guardian blockcount -< guardian blocked hosts -< guardian block httpd brute-force -< guardian blocking of this address is not allowed -< guardian block owncloud brute-force -< guardian block ssh brute-force -< guardian blocktime -< guardian common settings -< guardian daemon -< guardian empty input -< guardian enabled -< guardian firewallaction -< guardian ignored hosts -< guardian invalid address or subnet -< guardian logfacility -< guardian loglevel -< guardian no entries -< guardian priority level -< guardian service -< guardian watch snort alertfile < hardware support < imei < imsi @@ -2218,28 +2152,6 @@ < geoipblock enable feature < geoipblock flag < grouptype -< guardian -< guardian block a host -< guardian blockcount -< guardian blocked hosts -< guardian block httpd brute-force -< guardian blocking of this address is not allowed -< guardian block owncloud brute-force -< guardian block ssh brute-force -< guardian blocktime -< guardian common settings -< guardian daemon -< guardian empty input -< guardian enabled -< guardian firewallaction -< guardian ignored hosts -< guardian invalid address or subnet -< guardian logfacility -< guardian loglevel -< guardian no entries -< guardian priority level -< guardian service -< guardian watch snort alertfile < hardware support < hour-graph < imei diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi index 9d044fe..963a564 100644 --- a/html/cgi-bin/guardian.cgi +++ b/html/cgi-bin/guardian.cgi @@ -534,33 +534,39 @@ END <tr> <td colspan='2' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'guardian common settings'}</b></td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian enabled'}:</td> + <td width='25%' class='base'>$Lang::tr{'guardian enabled'}:</td> <td><input type='checkbox' name='GUARDIAN_ENABLED' $checked{'GUARDIAN_ENABLED'}{'on'} /></td> </tr> + <tr> <td colspan='2'><br></td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian watch snort alertfile'}</td> + <td width='25%' class='base'>$Lang::tr{'guardian watch snort alertfile'}</td> <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_SNORT' value='on' $checked{'GUARDIAN_MONITOR_SNORT'}{'on'} /> / <input type='radio' name='GUARDIAN_MONITOR_SNORT' value='off' $checked{'GUARDIAN_MONITOR_SNORT'}{'off'} /> off</td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian block ssh brute-force'}</td> + <td width='25%' class='base'>$Lang::tr{'guardian block ssh brute-force'}</td> <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_SSH' value='on' $checked{'GUARDIAN_MONITOR_SSH'}{'on'} /> / <input type='radio' name='GUARDIAN_MONITOR_SSH' value='off' $checked{'GUARDIAN_MONITOR_SSH'}{'off'} /> off</td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian block httpd brute-force'}</td> + <td width='25%' class='base'>$Lang::tr{'guardian block httpd brute-force'}</td> <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='on' $checked{'GUARDIAN_MONITOR_HTTPD'}{'on'} /> / <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='off' $checked{'GUARDIAN_MONITOR_HTTPD'}{'off'} /> off</td> </tr> END + # Display owncloud checkbox when the addon is installed. if ( -e "$owncloud_meta" ) { print"<tr>\n"; - print"<td width='20%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n"; + print"<td width='25%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n"; print"<td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='on' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'on'} /> /\n"; print"<input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='off' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'off'} /> off</td>\n"; print"</tr>\n"; @@ -569,62 +575,64 @@ END <tr> <td colspan='2'><br></td> </tr> + <tr> <td align='left' width='20%'>$Lang::tr{'guardian logfacility'}:</td> - <td><select id='GUARDIAN_LOG_FACILITY' name='GUARDIAN_LOG_FACILITY'> - <option id='logfacility_syslog' value='syslog' $selected{'GUARDIAN_LOG_FACILITY'}{'syslog'}>syslog</option> - <option id='logfacility_file' value='file' $selected{'GUARDIAN_LOG_FACILITY'}{'file'}>file</option> - <option id='logfacility_console' value='console' $selected{'GUARDIAN_LOG_FACILITY'}{'console'}>console</option> + <td width='25%'><select id='GUARDIAN_LOG_FACILITY' name='GUARDIAN_LOG_FACILITY'> + <option id='logfacility_syslog' value='syslog' $selected{'GUARDIAN_LOG_FACILITY'}{'syslog'}>$Lang::tr{'guardian logtarget_syslog'}</option> + <option id='logfacility_file' value='file' $selected{'GUARDIAN_LOG_FACILITY'}{'file'}>$Lang::tr{'guardian logtarget_file'}</option> + <option id='logfacility_console' value='console' $selected{'GUARDIAN_LOG_FACILITY'}{'console'}>$Lang::tr{'guardian logtarget_console'}</option> + </select></td> + + <td align='left' width='20%'>$Lang::tr{'guardian loglevel'}:</td> + <td width='25%'><select id='GUARDIAN_LOGLEVEL' name='GUARDIAN_LOGLEVEL'> + <option id='loglevel_off' value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>$Lang::tr{'guardian loglevel_off'}</option> + <option id='loglevel_info' value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>$Lang::tr{'guardian loglevel_info'}</option> + <option id='loglevel_debug' value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>$Lang::tr{'guardian loglevel_debug'}</option> </select></td> </tr> - <tr> + + <tr class="GUARDIAN_LOGFILE"> <td colspan='2'><br></td> </tr> - <tr> - <td align='left' width='20%'>$Lang::tr{'guardian loglevel'}:</td> - <td><select id='GUARDIAN_LOGLEVEL' name='GUARDIAN_LOGLEVEL'> - <option id='loglevel_off' value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>off</option> - <option id='loglevel_info' value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>info</option> - <option id='loglevel_debug' value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>debug</option> - </select></td> + + <tr class="GUARDIAN_LOGFILE"> + <td width='25%' class='base'>$Lang::tr{'guardian logfile'}:</td> + <td><input type='text' name='GUARDIAN_LOGFILE' value='$settings{'GUARDIAN_LOGFILE'}' size='30' /></td> </tr> + <tr class="GUARDIAN_SNORT_PRIORITY_LEVEL"> <td colspan='2'><br></td> </tr> + <tr class="GUARDIAN_SNORT_PRIORITY_LEVEL"> <td align='left' width='20%'>$Lang::tr{'guardian priority level'}:</td> <td><select name='GUARDIAN_SNORT_PRIORITY_LEVEL'> - <option value='1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>1</option> - <option value='2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>2</option> - <option value='3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>3</option> - <option value='4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>4</option> + <option value='1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>$Lang::tr{'guardian priolevel_high'}</option> + <option value='2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>$Lang::tr{'guardian priolevel_medium'}</option> + <option value='3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>$Lang::tr{'guardian priolevel_low'}</option> + <option value='4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>$Lang::tr{'guardian priolevel_very_low'}</option> </select></td> + + <td width='25%' class='base'>$Lang::tr{'guardian blockcount'}:</td> + <td><input type='text' name='GUARDIAN_BLOCKCOUNT' value='$settings{'GUARDIAN_BLOCKCOUNT'}' size='5' /></td> </tr> + <tr> <td colspan='2'><br></td> </tr> + <tr> - <td width='20%' class='base'>$Lang::tr{'guardian firewallaction'}:</td> + <td width='25%' class='base'>$Lang::tr{'guardian firewallaction'}:</td> <td><select name='GUARDIAN_FIREWALL_ACTION'> <option value='DROP' $selected{'GUARDIAN_FIREWALL_ACTION'}{'DROP'}>Drop</option> <option value='REJECT' $selected{'GUARDIAN_FIREWALL_ACTION'}{'REJECT'}>Reject</option> </select></td> - </tr> - <tr> - <td colspan='2'><br></td> - </tr> - <tr> - <td width='20%' class='base'>$Lang::tr{'guardian blockcount'}:</td> - <td><input type='text' name='GUARDIAN_BLOCKCOUNT' value='$settings{'GUARDIAN_BLOCKCOUNT'}' size='5' /></td> - </tr> - <tr> - <td width='20%' class='base'>$Lang::tr{'guardian blocktime'}:</td> + + <td width='25%' class='base'>$Lang::tr{'guardian blocktime'}:</td> <td><input type='text' name='GUARDIAN_BLOCKTIME' value='$settings{'GUARDIAN_BLOCKTIME'}' size='10' /></td> </tr> - <tr class="GUARDIAN_LOGFILE"> - <td width='20%' class='base'>$Lang::tr{'guardian logfile'}:</td> - <td><input type='text' name='GUARDIAN_LOGFILE' value='$settings{'GUARDIAN_LOGFILE'}' size='30' /></td> - </tr> + </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 400c2fe..261b92f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1217,30 +1217,6 @@ 'green interface' => 'Grünes Interface', 'grouptype' => 'Gruppentyp:', 'guaranteed bandwith' => 'Garantierte Bandbreite', -'guardian' => 'Guardian', -'guardian block a host' => 'Host blocken', -'guardian block httpd brute-force' => 'httpd-Brute-Force-Erkennung', -'guardian block owncloud brute-force' => 'Owncloud-Brute-Force-Erkennung', -'guardian block ssh brute-force' => 'SSH-Brute-Force-Erkennung', -'guardian blockcount' => 'Trefferschwelle', -'guardian blocked hosts' => 'Aktuell geblockte Hosts', -'guardian blocking of this address is not allowed' => 'Diese Addresse darf nicht gelockt werden.', -'guardian blocktime' => 'Blockzeit', -'guardian common settings' => 'Allgemeine Einstellungen', -'guardian configuration' => 'Guardian-Konfiguration', -'guardian daemon' => 'Daemon', -'guardian empty input' => 'Fehlende Angabe: Bitte eine gültige IP-Addresse oder Netzwerk angeben.', -'guardian enabled' => 'Guardian aktivieren', -'guardian firewallaction' => 'Firewall-Aktion', -'guardian ignored hosts' => 'Ignorierte Hosts', -'guardian invalid address or subnet' => 'Ungültige Host-Addresse oder Netzwerk.', -'guardian logfacility' => 'Logziel', -'guardian logfile' => 'Logdatei', -'guardian loglevel' => 'Loglevel', -'guardian no entries' => 'Keine Einträge vorhanden.', -'guardian priority level' => 'Prioritätslevel', -'guardian service' => 'Guardian-Dienst', -'guardian watch snort alertfile' => 'Snort-Alarme auswerten', 'guest ok' => 'Gastzugang gewähren', 'gui settings' => 'Benutzeroberfläche', 'gz with key' => 'Nur ein verschlüsseltes Archiv kann auf dieser Maschine wiederhergestellt werden.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7a7c104..0e5b46d 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1246,32 +1246,6 @@ 'green interface' => 'Green Interface', 'grouptype' => 'Grouptype:', 'guaranteed bandwith' => 'Guaranteed bandwith', -'guardian' => 'Guardian', -'guardian block a host' => 'Block host', -'guardian block httpd brute-force' => 'httpd Brute Force Detection', -'guardian block owncloud brute-force' => 'Owncloud Brute Force detection', -'guardian block ssh brute-force' => 'SSH Brute Force Detection', -'guardian blockcount' => 'Strike Threshold', -'guardian blocked hosts' => 'Currently blocked hosts', -'guardian blocking of this address is not allowed' => 'Blocking of the given address is not allowed.', -'guardian blocktime' => 'Block Time', -'guardian common settings' => 'Common Settings', -'guardian configuration' => 'Guardian Configuration', -'guardian daemon' => 'Daemon', -'guardian empty input' => 'Empty input: Please perform a valid host address or subnet.', -'guardian enabled' => 'Enable Guardian', -'guardian firewallaction' => 'Firewall Action', -'guardian ignored hosts' => 'Ignored Hosts', -'guardian invalid address or subnet' => 'Invalid host address or subnet.', -'guardian logfacility' => 'Log Facility', -'guardian logfile' => 'Log File', -'guardian loglevel' => 'Log Level', -'guardian no entries' => 'No entries at the moment.', -'guardian not running no hosts can be blocked' => 'Guardian is not running. No hosts will be blocked.', -'guardian priority level' => 'Priority Level', -'guardian service' => 'Guardian Service', -'guardian snort alertfile' => 'Snort Alert File', -'guardian watch snort alertfile' => 'Monitor Snort Alert File', 'guest ok' => 'allow guests to access', 'gui settings' => 'GUI Settings', 'gz with key' => 'Only an encrypted archive can be restored on this machine.', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 7ac5d11..ede7b66 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -886,12 +886,6 @@ 'green' => 'Green', 'green interface' => 'Interfaz Green', 'guaranteed bandwith' => 'Ancho de banda garantizado', -'guardian alertfile' => 'Archivo de alerta', -'guardian configuration' => 'Configuración de Guardian', -'guardian ignorefile' => 'Archivo Ignorefile', -'guardian interface' => 'Interfaz', -'guardian logfile' => 'Archivo de registro', -'guardian timelimit' => 'Límite de tiempo', 'guest ok' => 'permitir acceso de invitado', 'gui settings' => 'Configuraciones de GUI', 'gz with key' => 'Esta máquina sólo se puede restaurar desde archivos encriptados', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 61c514d..e896c9b 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -877,12 +877,6 @@ 'green' => 'VERT', 'green interface' => 'Interface VERTE', 'guaranteed bandwith' => 'Bande passante garantie', -'guardian alertfile' => 'Fichier d\'alerte', -'guardian configuration' => 'Configuration du gardien', -'guardian ignorefile' => 'Fichier d\'ignorés', -'guardian interface' => 'Interface', -'guardian logfile' => 'Fichier log', -'guardian timelimit' => 'Délai maximum', 'guest ok' => 'autoriser l\'accès aux invités', 'gui settings' => 'Réglage GUI', 'gz with key' => 'Seulement les archives chiffrées peuvent être restaurées sur cette machine.', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 2ed22f2..b039cdb 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1187,13 +1187,6 @@ 'green' => 'Verde', 'green interface' => 'Interface Verde', 'grouptype' => 'Grouptype:', -'guaranteed bandwith' => 'Guaranteed bandwith', -'guardian alertfile' => 'Alertfile', -'guardian configuration' => 'Guardian Configuration', -'guardian ignorefile' => 'Ignorefile', -'guardian interface' => 'Interface', -'guardian logfile' => 'Logfile', -'guardian timelimit' => 'Timelimit', 'guest ok' => 'allow guests to access', 'gui settings' => 'Settaggio GUI', 'gz with key' => 'Only an encrypted archive can be restored on this machine.', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 2469ff2..49c0cce 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1168,12 +1168,6 @@ 'green interface' => 'Groene Interface', 'grouptype' => 'Groeptype:', 'guaranteed bandwith' => 'Gegarandeerde bandbreedte', -'guardian alertfile' => 'Meldingenbestand', -'guardian configuration' => 'Guardian configuratie', -'guardian ignorefile' => 'Negeerbestand', -'guardian interface' => 'Interface', -'guardian logfile' => 'Logbestand', -'guardian timelimit' => 'Tijdlimiet', 'guest ok' => 'verleen gasten toegang', 'gui settings' => 'Gebruikersinterface', 'gz with key' => 'Alleen gecodeerde archieven kunnen worden teruggezet op deze machine.', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 9214205..e2f9da5 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -885,12 +885,6 @@ 'green' => 'Green', 'green interface' => 'Interfejs Green', 'guaranteed bandwith' => 'Gwarantowane pasmo', -'guardian alertfile' => 'Plik alertów', -'guardian configuration' => 'Konfiguracja Guardian\'a', -'guardian ignorefile' => 'Plik ignorowanych', -'guardian interface' => 'Interfejs', -'guardian logfile' => 'Plik Log', -'guardian timelimit' => 'Ograniczenie czasowe', 'guest ok' => 'zezwól na dostęp dla gości', 'gui settings' => 'Ustawienia GUI', 'gz with key' => 'Tylko zaszyfrowane archiwum może być odtworzone na tej maszynie.', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 6a45f7f..4b0edb5 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -880,12 +880,6 @@ 'green' => 'Green', 'green interface' => 'Green Интерфейс', 'guaranteed bandwith' => 'Гарантированная пропускная способность', -'guardian alertfile' => 'Alertfile', -'guardian configuration' => 'Настройки защиты', -'guardian ignorefile' => 'Ignorefile', -'guardian interface' => 'Интерфейс', -'guardian logfile' => 'Logfile', -'guardian timelimit' => 'Ограничение времени', 'guest ok' => 'Разрешить гостевой доступ', 'gui settings' => 'Внешний вид', 'gz with key' => 'Только зашифрованный архив может быть восстановлен на этой машине.', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 3af2339..9eb3000 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1245,12 +1245,6 @@ 'green interface' => 'Yeşil Arabirim', 'grouptype' => 'Grup türü:', 'guaranteed bandwith' => 'Garantili bant genişliği', -'guardian alertfile' => 'Uyarı dosyası', -'guardian configuration' => 'Koruyucu Yapılandırması', -'guardian ignorefile' => 'Yoksayılan dosya', -'guardian interface' => 'Ara birim', -'guardian logfile' => 'Günlük dosyası', -'guardian timelimit' => 'Zaman sınırlaması', 'guest ok' => 'istemcilere erişim izni', 'gui settings' => 'GUI Ayarları', 'gz with key' => 'Sadece şifreli bir arşiv bu makinede geri yüklenebilir.', diff --git a/lfs/guardian b/lfs/guardian index b02ec54..c016f04 100644 --- a/lfs/guardian +++ b/lfs/guardian @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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 # @@ -33,11 +33,10 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = guardian -PAK_VER = 10 +PAK_VER = 11 DEPS = "perl-inotify2 perl-Net-IP" - ############################################################################### # Top-level Rules ############################################################################### @@ -108,5 +107,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_SRC)/config/guardian/guardian.logrotate \ /etc/logrotate.d/guardian + # Install addon-specific language-files. + install -v -m 004 $(DIR_SRC)/config/guardian/guardian.*.pl \ + /var/ipfire/addon-lang/ + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/setup/passwords.c b/src/setup/passwords.c index e7b4b52..50ee38e 100644 --- a/src/setup/passwords.c +++ b/src/setup/passwords.c @@ -56,7 +56,7 @@ int handleadminpassword(void) return 0; snprintf(commandstring, STRING_SIZE, - "/usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", password); + "/usr/sbin/htpasswd -c -s -b " CONFIG_ROOT "/auth/users admin '%s'", password); sprintf(message, _("Setting %s 'admin' user password..."), NAME); if (runhiddencommandwithstatus(commandstring, _("Setting password"), message, NULL)) { sprintf(message, _("Problem setting %s 'admin' user password."), NAME); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c9dd9f9b7c0c197c042f10bfd818ad13ac1c331c
by git＠ipfire.org 04 Oct '16

04 Oct '16

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 3.x development tree". The branch, master has been updated via c9dd9f9b7c0c197c042f10bfd818ad13ac1c331c (commit) via 5dff150e67db7a4b04b6f064e5d67970f8dd21a6 (commit) from f65e814e82f11cfbe7f98e96f52c22dc2f3310e8 (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 c9dd9f9b7c0c197c042f10bfd818ad13ac1c331c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Oct 4 21:23:58 2016 +0200 systemd: Update to 231. This is an major update to the latest stable version of systemd. * Enable testsuite during buildtime. * Dropp support for SELinux. Fixes #10962. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5dff150e67db7a4b04b6f064e5d67970f8dd21a6 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Sep 3 10:47:01 2016 +0200 perl-Net-SSLeay: Update to 1.78. This is an update to the latest stable version. Add dependencies information to cover perl ABI version and missing perl dependencies. Fixes #11175. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Tested-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: perl-Net-SSLeay/perl-Net-SSLeay.nm | 8 ++- .../patches/systemd-231-ipfire-disable-tests.patch | 58 ++++++++++++++++++++++ systemd/systemd.nm | 31 +++++++++--- 3 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 systemd/patches/systemd-231-ipfire-disable-tests.patch Difference in files: diff --git a/perl-Net-SSLeay/perl-Net-SSLeay.nm b/perl-Net-SSLeay/perl-Net-SSLeay.nm index 5a6e166..8485c2d 100644 --- a/perl-Net-SSLeay/perl-Net-SSLeay.nm +++ b/perl-Net-SSLeay/perl-Net-SSLeay.nm @@ -4,7 +4,7 @@ ############################################################################### name = perl-Net-SSLeay -version = 1.69 +version = 1.78 release = 1 thisapp = Net-SSLeay-%{version} @@ -40,6 +40,12 @@ end packages package %{name} + requires + perl(:MODULE_COMPAT_%{perl_version}) + perl(MIME::Base64) + perl(XSLoader) + end + end package %{name}-debuginfo template DEBUGINFO diff --git a/systemd/patches/systemd-231-ipfire-disable-tests.patch b/systemd/patches/systemd-231-ipfire-disable-tests.patch new file mode 100644 index 0000000..cd4bbe9 --- /dev/null +++ b/systemd/patches/systemd-231-ipfire-disable-tests.patch @@ -0,0 +1,58 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2016-07-25 21:49:47.000000000 +0200 ++++ b/Makefile.am 2016-09-23 08:34:47.924257243 +0200 +@@ -1480,9 +1480,7 @@ + test-job-type \ + test-env-util \ + test-strbuf \ +- test-strv \ + test-path \ +- test-path-util \ + test-strxcpyx \ + test-siphash24 \ + test-unit-name \ +@@ -1541,7 +1539,6 @@ + test-capability \ + test-async \ + test-ratelimit \ +- test-condition \ + test-uid-range \ + test-locale-util \ + test-execute \ +@@ -3586,11 +3583,9 @@ + + tests += \ + test-dhcp-option \ +- test-dhcp-client \ + test-dhcp-server \ + test-ipv4ll \ + test-ndisc-rs \ +- test-dhcp6-client \ + test-lldp + + # ------------------------------------------------------------------------------ +@@ -4298,16 +4293,11 @@ + catalog-remove-hook + + tests += \ +- test-journal \ + test-journal-enum \ + test-journal-send \ + test-journal-syslog \ + test-journal-match \ +- test-journal-stream \ + test-journal-init \ +- test-journal-verify \ +- test-journal-interleaving \ +- test-journal-flush \ + test-mmap-cache \ + test-catalog \ + test-audit-type +@@ -6518,7 +6508,6 @@ + test-libudev-sym.c + + tests += \ +- test-libsystemd-sym \ + test-libudev-sym + + .PHONY: cppcheck diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 585916b..9c2d937 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ############################################################################### name = systemd -version = 221 -release = 5 +version = 231 +release = 1 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -18,13 +18,20 @@ description SysV and LSB init scripts. end -source_dl = http://www.freedesktop.org/software/systemd/ -sources = %{thisapp}.tar.xz +source_dl = https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/ build unitdir = %{prefix}/lib/systemd/system requires + # Testsuite + /usr/bin/getfacl + /usr/bin/mount + /usr/bin/tree + /usr/bin/umount + + autoconf + automake attr-devel audit-devel cryptsetup-luks-devel >= 1.4.2 @@ -37,14 +44,14 @@ build gobject-introspection-devel >= 1.31 gperf hwdata - intltool + intltool >= 0.51.0 kmod-devel >= 15 libacl-devel libblkid-devel libcap-devel libgcrypt-devel libmount-devel - libselinux-devel + libtool libuuid-devel m4 pam-devel @@ -57,6 +64,8 @@ build zlib-devel end + export LD_LIBRARY_PATH = %{DIR_APP}/.libs + configure_options += \ PYTHON=%{python3} \ --with-sysvinit-path= \ @@ -82,6 +91,16 @@ build prepare_cmds %{create_groups} + + ./autogen.sh + end + + test + # Create dummy machine-id file, which is required for some tests. + touch %{sysconfdir}/machine-id + + # Run the testsuite. + make check end install_cmds hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e3a90a5736be84bd4292a05c006802aa26ffcc0d
by git＠ipfire.org 04 Oct '16

04 Oct '16

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 e3a90a5736be84bd4292a05c006802aa26ffcc0d (commit) from a48a2034f5320baf32c10ec877d0c3c53cf4c699 (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 e3a90a5736be84bd4292a05c006802aa26ffcc0d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 4 22:05:26 2016 +0200 Revert "core106: Add DNS root key to exclude list" This reverts commit f58002a83f279246cdd58bfb5e9dfbf9d5aa99c7. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/106/exclude | 1 - 1 file changed, 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/106/exclude b/config/rootfiles/core/106/exclude index 1d8d74e..7ddeae0 100644 --- a/config/rootfiles/core/106/exclude +++ b/config/rootfiles/core/106/exclude @@ -23,7 +23,6 @@ var/ipfire/dma var/ipfire/time var/ipfire/ovpn var/lib/alternatives -var/lib/unbound/root.key var/log/cache var/state/dhcp/dhcpd.leases var/updatecache hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a48a2034f5320baf32c10ec877d0c3c53cf4c699
by git＠ipfire.org 04 Oct '16

04 Oct '16

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 a48a2034f5320baf32c10ec877d0c3c53cf4c699 (commit) from 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d (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 a48a2034f5320baf32c10ec877d0c3c53cf4c699 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Oct 4 19:24:26 2016 +0200 unbound: fix update forwarders if unbound was not running psgrep has no "-q" switch so i use pidof. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../init.d/networking/red.up/05-update-dns-forwarders | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders b/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders index be8879c..4ff2e58 100644 --- a/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders +++ b/src/initscripts/init.d/networking/red.up/05-update-dns-forwarders @@ -3,10 +3,11 @@ # If network has not fully been brought up here, we start unbound # so that all following scripts can rely on DNS resolution -# Update DNS forwarders if unbound is running -if pgrep -q unbound; then - exec /etc/init.d/unbound update-forwarders +pidof unbound > /dev/null +if [ "${?}" = "0" ]; then + # unbound is run so update the forwarders + /etc/init.d/unbound update-forwarders +else + # Start unbound if it is not running, yet + /etc/init.d/unbound start fi - -# Start unbound if it is not running, yet -exec /etc/init.d/unbound start hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f65e814e82f11cfbe7f98e96f52c22dc2f3310e8
by git＠ipfire.org 04 Oct '16

04 Oct '16

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 3.x development tree". The branch, master has been updated via f65e814e82f11cfbe7f98e96f52c22dc2f3310e8 (commit) via 08c532e264a808baa8294ac3c9289aaa5b2e2abb (commit) from 9ec021753659babcc03d08084c6652c230afd6c3 (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 f65e814e82f11cfbe7f98e96f52c22dc2f3310e8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Oct 4 11:34:12 2016 +0200 libsepol: Update to 2.5. This is a major update to the latest stable version of libsepol. * New build dependency: flex. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 08c532e264a808baa8294ac3c9289aaa5b2e2abb Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Oct 4 07:50:04 2016 +0200 openjade: Fix FTBFS. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: libsepol/libsepol.nm | 14 ++++++++------ openjade/openjade.nm | 2 +- openjade/patches/openjade-getoptperl.patch | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 openjade/patches/openjade-getoptperl.patch Difference in files: diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm index ac64781..951f76e 100644 --- a/libsepol/libsepol.nm +++ b/libsepol/libsepol.nm @@ -4,7 +4,7 @@ ############################################################################### name = libsepol -version = 2.1.5 +version = 2.5 release = 1 groups = System/Libraries @@ -17,16 +17,21 @@ description policies. end -sources = %{thisapp}.tgz +source_dl = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/release… +sources = %{thisapp}.tar.gz build # Keep static libsepol.a for some selinux tools, that needs to link # against it. We will put it into an own package. keep_libraries = %{libdir}/libsepol.a + requires + flex + end + build make clean - make CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS} + make CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" %{PARALLELISMFLAGS} end # Install libraries to correct place. @@ -40,9 +45,6 @@ build # Remove manpages for binaries rm -rf %{BUILDROOT}/usr/share/man/man8 - - # Fix bad symlink. - ln -svf libsepol.so.1 %{BUILDROOT}%{libdir}/libsepol.so end end diff --git a/openjade/openjade.nm b/openjade/openjade.nm index 1e4fb16..d78fb31 100644 --- a/openjade/openjade.nm +++ b/openjade/openjade.nm @@ -5,7 +5,7 @@ name = openjade version = 1.3.2 -release = 3 +release = 4 groups = Application/Text url = http://openjade.sourceforge.net/ diff --git a/openjade/patches/openjade-getoptperl.patch b/openjade/patches/openjade-getoptperl.patch new file mode 100644 index 0000000..0d835ea --- /dev/null +++ b/openjade/patches/openjade-getoptperl.patch @@ -0,0 +1,21 @@ +diff -urNp openjade-1.3.2-orig/msggen.pl openjade-1.3.2/msggen.pl +--- openjade-1.3.2-orig/msggen.pl 2002-10-20 23:47:23.000000000 +0200 ++++ openjade-1.3.2/msggen.pl 2012-08-10 10:38:28.019081661 +0200 +@@ -4,6 +4,7 @@ + # See the file COPYING for copying permission. + + use POSIX; ++use Getopt::Std; + + # Package and version. + $package = 'openjade'; +@@ -18,8 +19,7 @@ $gen_c = 0; + undef $opt_l; + undef $opt_p; + undef $opt_t; +-do 'getopts.pl'; +-&Getopts('l:p:t:'); ++getopts('l:p:t:'); + $module = $opt_l; + $pot_file = $opt_p; + hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d
by git＠ipfire.org 03 Oct '16

03 Oct '16

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 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d (commit) via f75c279b97552118ee06ae660230465d0a469bc8 (commit) from 52587edac4f6e3fba0923cb808740de6c5cbd61e (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 9aa7b0469da00d4ba745b682f0c5874ffa8ac92d Merge: f75c279 52587ed Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 3 17:55:42 2016 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit f75c279b97552118ee06ae660230465d0a469bc8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Oct 3 17:53:13 2016 +0200 unbound: fix reverse lockup of webif defined hosts and make the own host resolveable. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/unbound | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) Difference in files: diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound index dd5c85c..d324457 100644 --- a/src/initscripts/init.d/unbound +++ b/src/initscripts/init.d/unbound @@ -44,6 +44,15 @@ function cidr() { echo "${cidr}/${nbits}" } +ip_address_revptr() { + local addr=${1} + + local a1 a2 a3 a4 + IFS=. read -r a1 a2 a3 a4 <<< ${addr} + + echo "${a4}.${a3}.${a2}.${a1}.in-addr.arpa" +} + read_name_servers() { local i for i in 1 2; do @@ -101,6 +110,23 @@ update_forwarders() { unbound-control -q forward off } +own_hostname() { + local hostname=$(hostname -f) + # 1.1.1.1 is reserved for green only, skip this + if [ -n "${GREEN_ADDRESS}" -a "${GREEN_ADDRESS}" != "1.1.1.1" ]; then + unbound-control -q local_data "${hostname} ${LOCAL_TTL} IN A ${GREEN_ADDRESS}" + fi + + local address + for address in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do + [ -n "${address}" ] || continue + [ "${address}" = "1.1.1.1" ] && continue + + address=$(ip_address_revptr ${address}) + unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${hostname}" + done +} + update_hosts() { local enabled address hostname domainname @@ -111,6 +137,10 @@ update_hosts() { local fqdn="${hostname}.${domainname}" unbound-control -q local_data "${fqdn} ${LOCAL_TTL} IN A ${address}" + + # Add RDNS + address=$(ip_address_revptr ${address}) + unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${fqdn}" done < /var/ipfire/main/hosts } @@ -307,6 +337,9 @@ case "$1" in boot_mesg "Starting Unbound DNS Proxy..." loadproc /usr/sbin/unbound || exit $? + # Make own hostname resolveable + own_hostname + # Update any known forwarding name servers update_forwarders hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM October 2016