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 a7c5d12bbd16ce98080ab344e2829b9c1fea1163 (commit) via 950d00b2c2b930921a1b7d52a2c149592ac9f5f4 (commit) via c003727a4beba0e07dc9ad45a4df1f153f3b168e (commit) via bcdeb1461f6a712eca4769fba64d39ab1c570476 (commit) via 8251f301c477226e85f49a4d5bc4aa9706ee20ce (commit) via 96000482b7e58a6006ec344f0403344f61f15466 (commit) via 65fe7161c807864e7f5c8ab8df0988d4e7790180 (commit) via bda851172f1b924a0cb4c1d22ab95ccdf79dcd2b (commit) via 35e8a57e34c9857946c840d1ae4abdd703cacacf (commit) from a702353e262542fd5becc930e42b2a47caca2a00 (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 a7c5d12bbd16ce98080ab344e2829b9c1fea1163 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jul 19 07:54:00 2022 +0000

Run "./make.sh lang"

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 950d00b2c2b930921a1b7d52a2c149592ac9f5f4 Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Mon Jul 18 18:48:54 2022 +0200

pakfire/functions.pl: Adjust log level

The informative pakfire message "No new upgrades available. You are on release ..." does not mean that an error has happened. This patch adjusts the log level prefix to "info" accordingly.

Reported-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit c003727a4beba0e07dc9ad45a4df1f153f3b168e Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jul 15 14:45:43 2022 +0200

ipblocklist: Fixed typo in 'sources'

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit bcdeb1461f6a712eca4769fba64d39ab1c570476 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jul 15 14:28:27 2022 +0200

ipblocklist: Removed another unused(?) message string

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 8251f301c477226e85f49a4d5bc4aa9706ee20ce Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jul 15 14:26:58 2022 +0200

ipblocklist: Suggested german translation

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 96000482b7e58a6006ec344f0403344f61f15466 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jul 15 14:21:45 2022 +0200

ipblocklist: Suggestions for 'en.pl'

- Removed unused translation strings - Tuned some messages for better readability

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 65fe7161c807864e7f5c8ab8df0988d4e7790180 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jul 15 14:10:07 2022 +0200

ipblocklist: Fixed typo in 'en.pl'

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit bda851172f1b924a0cb4c1d22ab95ccdf79dcd2b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Jul 15 14:04:45 2022 +0200

ipblocklist.cgi: Theme fix

Themes have been dropped - 'ipblocklist.cgi' refused to start.

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Acked-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 35e8a57e34c9857946c840d1ae4abdd703cacacf Author: Peter Müller peter.mueller@ipfire.org Date: Thu Jul 14 10:27:59 2022 +0000

krb5: Update to 1.20

Please refer to https://web.mit.edu/kerberos/krb5-1.20/ for the release notes of this version. No rootfile changes were necessary.

Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/ipblocklist/sources | 4 +- doc/language_issues.de | 10 ++ doc/language_issues.en | 19 ++- doc/language_issues.es | 19 ++- doc/language_issues.fr | 19 +++ doc/language_issues.it | 19 +++ doc/language_issues.nl | 19 +++ doc/language_issues.pl | 19 ++- doc/language_issues.ru | 19 ++- doc/language_issues.tr | 19 +++ doc/language_missings | 169 +++++++++++++++++++++ html/cgi-bin/ipblocklist.cgi | 2 +- langs/de/cgi-bin/de.pl | 23 +++ langs/en/cgi-bin/en.pl | 14 +- lfs/krb5 | 9 +- src/pakfire/lib/functions.pl | 2 +- .../krb5-1.18.3_prevent_spurious_text.patch | 18 --- 17 files changed, 362 insertions(+), 41 deletions(-) delete mode 100644 src/patches/krb5-1.18.3_prevent_spurious_text.patch

Difference in files: diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index 4d42ad974..c750dcd58 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -42,7 +42,7 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list', 'rate' => '1h', 'category' => 'composite', - 'disable' => ['FEODO_RECOMMENDED', 'FEODO_IP', 'FEODO_AGGRESIVE', 'SPAMHAUS_DROP', 'DSHIELD'] }, + 'disable' => ['FEODO_RECOMMENDED', 'FEODO_IP', 'FEODO_AGGRESSIVE', 'SPAMHAUS_DROP', 'DSHIELD'] }, 'EMERGING_COMPROMISED' => { 'name' => 'Emerging Threats Compromised IPs', 'url' => 'https://rules.emergingthreats.net/blockrules/compromised-ips.txt', 'info' => 'https://doc.emergingthreats.net/bin/view/Main/CompromisedHost', @@ -80,7 +80,7 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'rate' => '5m', 'category' => 'c and c', 'disable' => 'FEODO_RECOMMENDED' }, - 'FEODO_AGGRESIVE' => { 'name' => 'Feodo Trojan IP Blocklist (Aggresive)', + 'FEODO_AGGRESSIVE' => { 'name' => 'Feodo Trojan IP Blocklist (Aggressive)', 'url' => 'https://feodotracker.abuse.ch/downloads/ipblocklist_aggressive.txt', 'info' => 'https://feodotracker.abuse.ch/blocklist', 'parser' => 'ip-or-net-list', diff --git a/doc/language_issues.de b/doc/language_issues.de index 15db223fe..6a0354451 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -273,6 +273,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -417,6 +418,13 @@ WARNING: translation string unused: invalid upstream proxy username or password WARNING: translation string unused: invalid users WARNING: translation string unused: invert WARNING: translation string unused: ip address in use +WARNING: translation string unused: ipblocklist category application +WARNING: translation string unused: ipblocklist category attacker +WARNING: translation string unused: ipblocklist category c and c +WARNING: translation string unused: ipblocklist category composite +WARNING: translation string unused: ipblocklist category invalid +WARNING: translation string unused: ipblocklist category reputation +WARNING: translation string unused: ipblocklist category scanner WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules @@ -863,6 +871,7 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes) WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes) WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes) @@ -882,6 +891,7 @@ WARNING: untranslated string: desired = Desired WARNING: untranslated string: disable = Disable WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: enable = Enable +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index 56ad0af4f..420b5df75 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -309,6 +309,7 @@ WARNING: untranslated string: aktiv = Active WARNING: untranslated string: album = Album WARNING: untranslated string: alias ip = Alias IP WARNING: untranslated string: aliases = Aliases +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: aliases not active = Aliases will not be active unless your RED interface is STATIC WARNING: untranslated string: all = All WARNING: untranslated string: all services = All Services @@ -733,9 +734,9 @@ WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: end address = End address: WARNING: untranslated string: enter data = Enter your settings <br /> and then press <i>Save</i>. WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error messages = Error messages WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: esp keylife should be between 1 and 24 hours = ESP keylife should be between 1 and 24 hours. @@ -1170,6 +1171,22 @@ WARNING: untranslated string: ip alias removed = External IP alias removed WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info = IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipfire has now rebooted = IPFire is rebooting now. WARNING: untranslated string: ipfire has now shutdown = IPFire is shutting down now. WARNING: untranslated string: ipfire side is invalid = IPFire side is invalid. diff --git a/doc/language_issues.es b/doc/language_issues.es index 09e7c0ad6..f248f2298 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -828,6 +828,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION @@ -985,9 +986,9 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: fifteen minutes = 15 Minutes @@ -1273,6 +1274,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 114837a4d..b0f231184 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -301,6 +301,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -905,7 +906,9 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error WARNING: translation string unused: zoneconf val vlan tag range error WARNING: translation string unused: zoneconf val zoneslave amount error +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: enable otp = Enable OTP +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth @@ -938,6 +941,22 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: mmio stale data = MMIO Stale Data WARNING: untranslated string: otp qrcode = OTP QRCode WARNING: untranslated string: pakfire ago = ago. diff --git a/doc/language_issues.it b/doc/language_issues.it index d87ef8b1f..2e4407c69 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -267,6 +267,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -913,6 +914,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: autonomous system = Autonomous System WARNING: untranslated string: available = available @@ -997,6 +999,7 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: fifteen minutes = 15 Minutes @@ -1111,6 +1114,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec interface mode gre = GRE diff --git a/doc/language_issues.nl b/doc/language_issues.nl index a3a70b621..5268d47dc 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -265,6 +265,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -911,6 +912,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: autonomous system = Autonomous System @@ -1007,6 +1009,7 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: fifteen minutes = 15 Minutes @@ -1125,6 +1128,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec interface mode gre = GRE diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 9bf42e649..247e06a59 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -840,6 +840,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION @@ -996,9 +997,9 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount @@ -1274,6 +1275,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 62dd92044..eb2ceb954 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -836,6 +836,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File WARNING: untranslated string: age second = second +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: atm device = Device: WARNING: untranslated string: attention = ATTENTION @@ -993,9 +994,9 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: encryption = Encryption: WARNING: untranslated string: entropy = Entropy -WARNING: untranslated string: entropy graphs = Entropy Graphs WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount @@ -1272,6 +1273,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec = IPsec WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) diff --git a/doc/language_issues.tr b/doc/language_issues.tr index da549f52b..080e3abfe 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -294,6 +294,7 @@ WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabledtitle WARNING: translation string unused: encrypted WARNING: translation string unused: enter ack class +WARNING: translation string unused: entropy graphs WARNING: translation string unused: err bk 1 WARNING: translation string unused: err bk 10 password WARNING: translation string unused: err bk 2 key @@ -901,6 +902,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>. WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC) WARNING: untranslated string: advproxy wpad view pac = Open PAC File +WARNING: untranslated string: aliases default interface = - Default Interface - WARNING: untranslated string: asn lookup failed = AS lookup failed WARNING: untranslated string: autonomous system = Autonomous System WARNING: untranslated string: available = available @@ -960,6 +962,7 @@ WARNING: untranslated string: enable otp = Enable OTP WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT) WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk. WARNING: untranslated string: error = Error +WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL WARNING: untranslated string: force enable = Forced @@ -1048,6 +1051,22 @@ WARNING: untranslated string: invalid input for subscription code = Invalid inpu WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname WARNING: untranslated string: ip basic info = Basic IP information WARNING: untranslated string: ip info for = IP information for +WARNING: untranslated string: ipblocklist = IP Address Blocklists +WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings +WARNING: untranslated string: ipblocklist category = Category +WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist +WARNING: untranslated string: ipblocklist download error = A download error occured. +WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received. +WARNING: untranslated string: ipblocklist enable = Enable +WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for +WARNING: untranslated string: ipblocklist id = Blocklist +WARNING: untranslated string: ipblocklist input = Packets dropped (IN) +WARNING: untranslated string: ipblocklist log = Log dropped packets +WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist) +WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs +WARNING: untranslated string: ipblocklist name = Name +WARNING: untranslated string: ipblocklist output = Packets dropped (OUT) +WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists WARNING: untranslated string: ipsec connection = IPsec Connection WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es) WARNING: untranslated string: ipsec interface mode gre = GRE diff --git a/doc/language_missings b/doc/language_missings index b8c6665f3..b49ddcbaa 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -2,6 +2,7 @@ # Checking cgi-bin translations for language: de # ############################################################################ < advproxy update information +< aliases default interface < ansi t1.483 < backup archive < backup clear archive @@ -130,6 +131,7 @@ < age shour < age sminute < age ssecond +< aliases default interface < asn lookup failed < Async logging enabled < atm device @@ -609,6 +611,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec < ipsec connection @@ -1001,6 +1026,7 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< aliases default interface < ansi t1.483 < bewan adsl pci st < bewan adsl usb @@ -1008,6 +1034,29 @@ < g.dtm < g.lite < guaranteed bandwidth +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < mmio stale data < otp qrcode < random number generator daemon @@ -1041,6 +1090,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< aliases default interface < asn lookup failed < autonomous system < available @@ -1272,6 +1322,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec connection < ipsec dns server address is invalid @@ -1504,6 +1577,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< aliases default interface < asn lookup failed < atm device < autonomous system @@ -1754,6 +1828,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec connection < ipsec dns server address is invalid @@ -2031,6 +2128,7 @@ < age shour < age sminute < age ssecond +< aliases default interface < asn lookup failed < atm device < attention @@ -2555,6 +2653,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec < ipsec connection @@ -2983,6 +3104,7 @@ < age shour < age sminute < age ssecond +< aliases default interface < asn lookup failed < atm device < attention @@ -3513,6 +3635,29 @@ < invalid ip or hostname < invalid logserver protocol < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec < ipsec connection @@ -3920,6 +4065,7 @@ < advproxy wpad notice < advproxy wpad title < advproxy wpad view pac +< aliases default interface < asn lookup failed < autonomous system < available @@ -4041,6 +4187,29 @@ < invalid input for subscription code < invalid ip or hostname < ip basic info +< ipblocklist +< ipblocklist blocklist settings +< ipblocklist category +< ipblocklist category application +< ipblocklist category attacker +< ipblocklist category c and c +< ipblocklist category composite +< ipblocklist category invalid +< ipblocklist category reputation +< ipblocklist category scanner +< ipblocklist could not download blocklist +< ipblocklist download error +< ipblocklist empty blocklist received +< ipblocklist enable +< ipblocklist hits +< ipblocklist id +< ipblocklist input +< ipblocklist log +< ipblocklist log list +< ipblocklist logs +< ipblocklist name +< ipblocklist output +< ipblocklist use ipblocklists < ip info for < ipsec connection < ipsec dns server address is invalid diff --git a/html/cgi-bin/ipblocklist.cgi b/html/cgi-bin/ipblocklist.cgi index 431ff1a37..bb438129c 100644 --- a/html/cgi-bin/ipblocklist.cgi +++ b/html/cgi-bin/ipblocklist.cgi @@ -62,7 +62,7 @@ my %settings = ( # Read all parameters &Header::getcgihash( %cgiparams); &General::readhash( "${General::swroot}/main/settings", %mainsettings ); -&General::readhash( "/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", %color ); +&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", %color);

# Get list of supported blocklists. my @blocklists = &IPblocklist::get_blocklists(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3285f1bfa..49c582a1e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1539,6 +1539,29 @@ 'ip basic info' => 'Grundlegende IP-Informationen', 'ip info' => 'IP-Informationen', 'ip info for' => 'IP-Informationen für', +'ipblocklist' => 'IP-Address-Blocklisten', +'ipblocklist blocklist settings' => 'Blocklist-Einstellungen', +'ipblocklist category' => 'Kategorie', +'ipblocklist category application' => 'Application', +'ipblocklist category attacker' => 'Attacker', +'ipblocklist category c and c' => 'Malware C&amp;C', +'ipblocklist category composite' => 'Composite', +'ipblocklist category invalid' => 'Invalid Address', +'ipblocklist category reputation' => 'Reputation', +'ipblocklist category scanner' => 'Scanner', +'ipblocklist could not download blocklist' => 'Konnte Blockliste nicht herunterladen', +'ipblocklist download error' => 'Es ist ein Fehler beim Download aufgetreten.', +'ipblocklist empty blocklist received' => 'Es wurde eine leere Blockliste heruntergeladen.', +'ipblocklist enable' => 'Aktivieren', +'ipblocklist hits' => 'Gesamtanzahl der Blocklist-Treffer für', +'ipblocklist id' => 'Blocklist', +'ipblocklist input' => 'Verworfene Pakete (IN)', +'ipblocklist log' => 'Verworfene Pakete protokollieren', +'ipblocklist log list' => 'Firewallprotokoll (Blocklisten)', +'ipblocklist logs' => 'IP-Address-Blocklisten-Protokolle', +'ipblocklist name' => 'Name', +'ipblocklist output' => 'Verworfene Pakete (OUT)', +'ipblocklist use ipblocklists' => 'Aktiviere IP-Blocklisten', 'ipfire has now rebooted' => 'IPFire wird neu gestartet.', 'ipfire has now shutdown' => 'IPFire wird heruntergefahren.', 'ipfire side' => 'IPFire Seite:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 87cc679a5..ae233de8e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1596,21 +1596,17 @@ 'ipblocklist category reputation' => 'Reputation', 'ipblocklist category scanner' => 'Scanner', 'ipblocklist could not download blocklist' => 'Could not download blocklist', -'ipblocklist disable mid' => 'because it is included in', -'ipblocklist disable post' => '', -'ipblocklist disable pre' => 'Disabling', -'ipblocklist download error' => 'A download error occurs.', -'ipblocklist empyt blocklist received' => 'An empty blocklist has been received.', +'ipblocklist download error' => 'A download error occured.', +'ipblocklist empty blocklist received' => 'An empty blocklist has been received.', 'ipblocklist enable' => 'Enable', -'ipblocklist entries' => 'Entries', 'ipblocklist hits' => 'Total number of blocklist hits for', 'ipblocklist id' => 'Blocklist', -'ipblocklist input' => 'Packets Dropped In', -'ipblocklist log list' => 'Firewall log (blocklist)', +'ipblocklist input' => 'Packets dropped (IN)', 'ipblocklist log' => 'Log dropped packets', +'ipblocklist log list' => 'Firewall log (blocklist)', 'ipblocklist logs' => 'IP Address Blocklist Logs', 'ipblocklist name' => 'Name', -'ipblocklist output' => 'Packets Dropped Out', +'ipblocklist output' => 'Packets dropped (OUT)', 'ipblocklist use ipblocklists' => 'Enable IP Blocklists', 'ipfire has now rebooted' => 'IPFire is rebooting now.', 'ipfire has now shutdown' => 'IPFire is shutting down now.', diff --git a/lfs/krb5 b/lfs/krb5 index e08948005..ce7d52d11 100644 --- a/lfs/krb5 +++ b/lfs/krb5 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2022 IPFire Team info@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 # @@ -26,7 +26,7 @@ include Config

SUMMARY = Kerberos

-VER = 1.19.2 +VER = 1.20

THISAPP = krb5-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 +$(DL_FILE)_BLAKE2 = fdaaab6c16dbe073c4308f312e321536b582b75fad10e5450be66b6b828825c8c775e56f5287d4a7df819d20889e5c0d9cc1d179d861c9caba185332c0db7387

install : $(TARGET)

@@ -77,10 +77,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/$(THISAPP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_prevent_spurious_text.patch cd $(DIR_APP) && patch -Np2 -i $(DIR_SRC)/src/patches/krb5-1.18.3_remove_known_failed_test.patch - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 24c55fd4a..505988af9 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -797,7 +797,7 @@ sub upgradecore { system("echo $core_release > $Conf::coredir/mine");

} else { - message("CORE ERROR: No new upgrades available. You are on release $Conf::core_mine."); + message("CORE INFO: No new upgrades available. You are on release $Conf::core_mine."); } }

diff --git a/src/patches/krb5-1.18.3_prevent_spurious_text.patch b/src/patches/krb5-1.18.3_prevent_spurious_text.patch deleted file mode 100644 index 0e3015379..000000000 --- a/src/patches/krb5-1.18.3_prevent_spurious_text.patch +++ /dev/null @@ -1,18 +0,0 @@ -Submitted By: linuxfromscratch DOT org -Date: 2020-11-19 -Initial Package Version: 1.18.3 -Origin: http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mitkrb.html -Description: Patch increases the width of the virtual terminal used for some tests to prevent some spurious text in the output which is taken as a failure. - -diff --color -Nur krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp krb5-1.18.3/src/tests/dejagnu/config/default.exp ---- krb5-1.18.3.orig/src/tests/dejagnu/config/default.exp 2020-12-07 04:51:12.997708618 +0100 -+++ krb5-1.18.3/src/tests/dejagnu/config/default.exp 2020-12-07 04:56:29.805839425 +0100 -@@ -12,7 +12,7 @@ - # realm name, defaulting to KRBTEST.COM. - - set timeout 100 --set stty_init {erase ^h kill ^u} -+set stty_init {erase ^h kill ^u cols 300} - set env(TERM) dumb - - set des3_krbtgt 0

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