IPFire-SCM September 2022

ipfire-scm@lists.ipfire.org

1 participants
31 discussions

[git.ipfire.org] IPFire 2.x development tree tag, v2.27-core170, created. 9125d3671f6f4e60c2f5dadb07db34d804f613d0
by Michael Tremer 13 Sep '22

13 Sep '22

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 tag, v2.27-core170 has been created at 9125d3671f6f4e60c2f5dadb07db34d804f613d0 (commit) - Log ----------------------------------------------------------------- commit 9125d3671f6f4e60c2f5dadb07db34d804f613d0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 13 10:20:43 2022 +0000 Run "./make.sh lang" Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core170, created. 9125d3671f6f4e60c2f5dadb07db34d804f613d0
by Michael Tremer 13 Sep '22

13 Sep '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9125d3671f6f4e60c2f5dadb07db34d804f613d0
by Michael Tremer 13 Sep '22

13 Sep '22

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, master has been updated via 9125d3671f6f4e60c2f5dadb07db34d804f613d0 (commit) from af5a2d94fb41173a31bbb398653b5eef64f834e6 (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 9125d3671f6f4e60c2f5dadb07db34d804f613d0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 13 10:20:43 2022 +0000 Run "./make.sh lang" Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 3 --- doc/language_issues.en | 13 ++++++++++++ doc/language_issues.es | 13 +++++++++--- doc/language_issues.fr | 7 ++++--- doc/language_issues.it | 13 +++++++++--- doc/language_issues.nl | 6 +++--- doc/language_issues.pl | 13 +++++++++--- doc/language_issues.ru | 13 +++++++++--- doc/language_issues.tr | 13 +++++++++--- doc/language_missings | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- 14 files changed, 130 insertions(+), 28 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 6a0354451..67a20fa3a 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -160,9 +160,6 @@ WARNING: translation string unused: community rules WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not create directory diff --git a/doc/language_issues.en b/doc/language_issues.en index 420b5df75..8770ad755 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -210,6 +210,7 @@ WARNING: untranslated string: advproxy errmsg invalid mac = Invalid MAC address WARNING: untranslated string: advproxy errmsg invalid proxy port = Invalid proxy port WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname WARNING: untranslated string: advproxy errmsg invalid upstream proxy username or password setting = Invalid upstream proxy username or password setting +WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: advproxy errmsg ldap base dn = LDAP base DN required WARNING: untranslated string: advproxy errmsg ldap bind dn = LDAP bind DN username and password required WARNING: untranslated string: advproxy errmsg ldap port = Invalid LDAP port number @@ -501,6 +502,10 @@ WARNING: untranslated string: connection type is invalid = Connection type is in WARNING: untranslated string: connections = Connections WARNING: untranslated string: connections are associated with this ca. deleting the ca will delete these connections as well. = connections are associated with this CA. Deleting the CA will delete these connections as well. WARNING: untranslated string: connscheduler = Connection Scheduler +WARNING: untranslated string: core notice 1 = Notice: There is a core-update from +WARNING: untranslated string: core notice 2 = to +WARNING: untranslated string: core notice 3 = available. +WARNING: untranslated string: core update = Core-Update WARNING: untranslated string: could not be opened = could not be opened. WARNING: untranslated string: could not download latest updates = Could not download latest updates. WARNING: untranslated string: could not retrieve common name from certificate = Could not retrieve common name from certificate. @@ -715,6 +720,7 @@ WARNING: untranslated string: email mailport = Mail Server Port WARNING: untranslated string: email mailrcpt = Mail Recipient WARNING: untranslated string: email mailsender = Mail Sender WARNING: untranslated string: email mailuser = Username +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email settings = Mail Service WARNING: untranslated string: email testmail = Send test mail WARNING: untranslated string: email tls = TLS mode @@ -1469,6 +1475,7 @@ WARNING: untranslated string: ovpn subnet overlap = OpenVPN Subnet overlaps with WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. Please update to the latest IPFire version and generate as soon as possible a new root and host certificate. All OpenVPN clients needs then to be renewed! WARNING: untranslated string: pagerefresh = Page is beeing refreshed, please wait. +WARNING: untranslated string: pak update = Update WARNING: untranslated string: pakfire accept all = Do you want to install all packages? WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later. @@ -1572,6 +1579,7 @@ WARNING: untranslated string: red1 = RED WARNING: untranslated string: references = References WARNING: untranslated string: refresh = Refresh WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected +WARNING: untranslated string: release = Release WARNING: untranslated string: remark = Remark WARNING: untranslated string: remark title = Remark: WARNING: untranslated string: remote access = Remote access @@ -1594,6 +1602,7 @@ WARNING: untranslated string: restart = Restart WARNING: untranslated string: restart ovpn server = Restart OpenVPN server WARNING: untranslated string: restore = Restore WARNING: untranslated string: restore defaults = Restore defaults +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: reverse sort = Sort in reverse chronological order WARNING: untranslated string: root certificate = Root Certificate WARNING: untranslated string: route config changed = unknown string @@ -1803,6 +1812,9 @@ WARNING: untranslated string: tor use guard nodes = Use only these guard nodes ( WARNING: untranslated string: total connection time = Total Connection Time WARNING: untranslated string: total hits for log section = Total hits for log section WARNING: untranslated string: traffic on = Traffic on +WARNING: untranslated string: traffic stat in = In +WARNING: untranslated string: traffic stat out = Out +WARNING: untranslated string: traffic stat title = RED Traffic WARNING: untranslated string: traffics = Utilization-overview WARNING: untranslated string: transfers = Transfers WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode @@ -2108,6 +2120,7 @@ WARNING: untranslated string: valid root certificate already exists = A valid ro WARNING: untranslated string: valid till = Valid till WARNING: untranslated string: vci number = VCI number: WARNING: untranslated string: vendor = Vendor +WARNING: untranslated string: version = Version WARNING: untranslated string: virtual address = Virtual Address WARNING: untranslated string: virtual private networking = Virtual Private Networking WARNING: untranslated string: visit us at = Visit us at diff --git a/doc/language_issues.es b/doc/language_issues.es index f248f2298..d603891d9 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -168,9 +168,6 @@ WARNING: translation string unused: community rules WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not connect to www ipfire org @@ -809,6 +806,7 @@ WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic a WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Generation WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size: WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname +WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal. WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups @@ -892,6 +890,7 @@ WARNING: untranslated string: ccd routes = Routing: WARNING: untranslated string: ccd subnet = Subnet WARNING: untranslated string: ccd used = Used addresses WARNING: untranslated string: check all = Check all +WARNING: untranslated string: core update = Core-Update WARNING: untranslated string: count = Count WARNING: untranslated string: countries = Countries WARNING: untranslated string: country codes and flags = Country Codes and Flags: @@ -975,6 +974,7 @@ WARNING: untranslated string: email mailport = Mail Server Port WARNING: untranslated string: email mailrcpt = Mail Recipient WARNING: untranslated string: email mailsender = Mail Sender WARNING: untranslated string: email mailuser = Username +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email settings = Mail Service WARNING: untranslated string: email testmail = Send test mail WARNING: untranslated string: email tls = TLS mode @@ -1390,6 +1390,7 @@ WARNING: untranslated string: ovpn routes push options = Route push options WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. Please update to the latest IPFire version and generate as soon as possible a new root and host certificate. All OpenVPN clients needs then to be renewed! +WARNING: untranslated string: pak update = Update WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later. WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning... @@ -1417,8 +1418,10 @@ WARNING: untranslated string: reboot fsck = Reboot & check filesystem WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string @@ -1518,6 +1521,9 @@ WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reac WARNING: untranslated string: tor traffic read written = Total traffic (read/written) WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line) WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) +WARNING: untranslated string: traffic stat in = In +WARNING: untranslated string: traffic stat out = Out +WARNING: untranslated string: traffic stat title = RED Traffic WARNING: untranslated string: transfers = Transfers WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours @@ -1535,6 +1541,7 @@ WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template WARNING: untranslated string: user management = User Management WARNING: untranslated string: vendor = Vendor +WARNING: untranslated string: version = Version WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING diff --git a/doc/language_issues.fr b/doc/language_issues.fr index eac59397c..6c0ed5f1a 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -181,9 +181,6 @@ WARNING: translation string unused: community rules WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not connect to www ipfire org @@ -914,6 +911,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: advproxy errmsg invalid url = Invalid URL +WARNING: untranslated string: core notice 3 = available. +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: error message = unknown string WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string @@ -948,6 +948,7 @@ 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: pakfire ago = ago. +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index 2e4407c69..4963dfe79 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -154,9 +154,6 @@ WARNING: translation string unused: community rules WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not connect to www ipfire org @@ -898,6 +895,7 @@ WARNING: untranslated string: administrator username = Administrator username WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication +WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups WARNING: untranslated string: advproxy fastflux detection threshold = Threshold @@ -937,6 +935,7 @@ WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: check all = Check all +WARNING: untranslated string: core update = Core-Update WARNING: untranslated string: cpu frequency = CPU frequency WARNING: untranslated string: crypto error = Cryptographic error WARNING: untranslated string: crypto warning = Cryptographic warning @@ -988,6 +987,7 @@ WARNING: untranslated string: email mailport = Mail Server Port WARNING: untranslated string: email mailrcpt = Mail Recipient WARNING: untranslated string: email mailsender = Mail Sender WARNING: untranslated string: email mailuser = Username +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email settings = Mail Service WARNING: untranslated string: email testmail = Send test mail WARNING: untranslated string: email tls = TLS mode @@ -1186,6 +1186,7 @@ WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. Please update to the latest IPFire version and generate as soon as possible a new root and host certificate. All OpenVPN clients needs then to be renewed! +WARNING: untranslated string: pak update = Update WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later. WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning... WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding. @@ -1205,8 +1206,10 @@ WARNING: untranslated string: rdns = rDNS WARNING: untranslated string: reboot fsck = Reboot & check filesystem WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string @@ -1247,6 +1250,9 @@ WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor guard country any = Any country WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) +WARNING: untranslated string: traffic stat in = In +WARNING: untranslated string: traffic stat out = Out +WARNING: untranslated string: traffic stat title = RED Traffic WARNING: untranslated string: transfers = Transfers WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours @@ -1259,6 +1265,7 @@ WARNING: untranslated string: unlimited = Unlimited WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode WARNING: untranslated string: uplink bit rate = Uplink Bit Rate WARNING: untranslated string: user management = User Management +WARNING: untranslated string: version = Version WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING WARNING: untranslated string: vpn force mobike = Force using MOBIKE (only IKEv2) diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 5268d47dc..0a441bbff 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -153,9 +153,6 @@ WARNING: translation string unused: community rules WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not connect to www ipfire org @@ -896,6 +893,7 @@ WARNING: untranslated string: administrator username = Administrator username WARNING: untranslated string: advproxy AUTH method ntlm auth = Windows Active Directory WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic authentication +WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups WARNING: untranslated string: advproxy fastflux detection threshold = Threshold @@ -998,6 +996,7 @@ WARNING: untranslated string: email mailport = Mail Server Port WARNING: untranslated string: email mailrcpt = Mail Recipient WARNING: untranslated string: email mailsender = Mail Sender WARNING: untranslated string: email mailuser = Username +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email settings = Mail Service WARNING: untranslated string: email testmail = Send test mail WARNING: untranslated string: email tls = TLS mode @@ -1244,6 +1243,7 @@ WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing WARNING: untranslated string: received = Received WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 247e06a59..218254965 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -146,9 +146,6 @@ WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not connect to www ipfire org @@ -821,6 +818,7 @@ WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic a WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Generation WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size: WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname +WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal. WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups @@ -904,6 +902,7 @@ WARNING: untranslated string: ccd routes = Routing: WARNING: untranslated string: ccd subnet = Subnet WARNING: untranslated string: ccd used = Used addresses WARNING: untranslated string: check all = Check all +WARNING: untranslated string: core update = Core-Update WARNING: untranslated string: count = Count WARNING: untranslated string: countries = Countries WARNING: untranslated string: country codes and flags = Country Codes and Flags: @@ -986,6 +985,7 @@ WARNING: untranslated string: email mailport = Mail Server Port WARNING: untranslated string: email mailrcpt = Mail Recipient WARNING: untranslated string: email mailsender = Mail Sender WARNING: untranslated string: email mailuser = Username +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email settings = Mail Service WARNING: untranslated string: email testmail = Send test mail WARNING: untranslated string: email tls = TLS mode @@ -1398,6 +1398,7 @@ WARNING: untranslated string: ovpn routes push options = Route push options WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. Please update to the latest IPFire version and generate as soon as possible a new root and host certificate. All OpenVPN clients needs then to be renewed! +WARNING: untranslated string: pak update = Update WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later. WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning... WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding. @@ -1424,8 +1425,10 @@ WARNING: untranslated string: reboot fsck = Reboot & check filesystem WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string @@ -1524,6 +1527,9 @@ WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reac WARNING: untranslated string: tor traffic read written = Total traffic (read/written) WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line) WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) +WARNING: untranslated string: traffic stat in = In +WARNING: untranslated string: traffic stat out = Out +WARNING: untranslated string: traffic stat title = RED Traffic WARNING: untranslated string: transfers = Transfers WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours @@ -1541,6 +1547,7 @@ WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template WARNING: untranslated string: user management = User Management WARNING: untranslated string: vendor = Vendor +WARNING: untranslated string: version = Version WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING diff --git a/doc/language_issues.ru b/doc/language_issues.ru index eb2ceb954..76a2e8150 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -146,9 +146,6 @@ WARNING: translation string unused: comment WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not connect to www ipfire org @@ -817,6 +814,7 @@ WARNING: untranslated string: advproxy basic authentication = Allow HTTP Basic a WARNING: untranslated string: advproxy cache-digest = Enable Cache-Digest Generation WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size: WARNING: untranslated string: advproxy errmsg invalid upstream proxy = Invalid upstream proxy IP/hostname +WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: advproxy errmsg proxy ports equal = The proxy port and the transparent port cannot be equal. WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups @@ -900,6 +898,7 @@ WARNING: untranslated string: ccd routes = Routing: WARNING: untranslated string: ccd subnet = Subnet WARNING: untranslated string: ccd used = Used addresses WARNING: untranslated string: check all = Check all +WARNING: untranslated string: core update = Core-Update WARNING: untranslated string: count = Count WARNING: untranslated string: countries = Countries WARNING: untranslated string: country codes and flags = Country Codes and Flags: @@ -983,6 +982,7 @@ WARNING: untranslated string: email mailport = Mail Server Port WARNING: untranslated string: email mailrcpt = Mail Recipient WARNING: untranslated string: email mailsender = Mail Sender WARNING: untranslated string: email mailuser = Username +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email settings = Mail Service WARNING: untranslated string: email testmail = Send test mail WARNING: untranslated string: email tls = TLS mode @@ -1393,6 +1393,7 @@ WARNING: untranslated string: ovpn port in root range = A port number of 1024 or WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. Please update to the latest IPFire version and generate as soon as possible a new root and host certificate. All OpenVPN clients needs then to be renewed! +WARNING: untranslated string: pak update = Update WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later. WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning... WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding. @@ -1419,8 +1420,10 @@ WARNING: untranslated string: reboot fsck = Reboot & check filesystem WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received WARNING: untranslated string: red1 = RED +WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required WARNING: untranslated string: required field = Required field +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string @@ -1519,6 +1522,9 @@ WARNING: untranslated string: tor traffic limit soft = Traffic limit almost reac WARNING: untranslated string: tor traffic read written = Total traffic (read/written) WARNING: untranslated string: tor use exit nodes = Use only these exit nodes (one fingerprint per line) WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) +WARNING: untranslated string: traffic stat in = In +WARNING: untranslated string: traffic stat out = Out +WARNING: untranslated string: traffic stat title = RED Traffic WARNING: untranslated string: transfers = Transfers WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: twelve hours = 12 Hours @@ -1536,6 +1542,7 @@ WARNING: untranslated string: uptime load average = Load average WARNING: untranslated string: urlfilter redirect template = Redirect page template WARNING: untranslated string: user management = User Management WARNING: untranslated string: vendor = Vendor +WARNING: untranslated string: version = Version WARNING: untranslated string: visit us at = Visit us at WARNING: untranslated string: vpn broken = Broken WARNING: untranslated string: vpn connecting = CONNECTING diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 080e3abfe..a3fd3fbe0 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -176,9 +176,6 @@ WARNING: translation string unused: community rules WARNING: translation string unused: compression WARNING: translation string unused: connect WARNING: translation string unused: connect the modem -WARNING: translation string unused: core notice 1 -WARNING: translation string unused: core notice 2 -WARNING: translation string unused: core notice 3 WARNING: translation string unused: could not connect to WARNING: translation string unused: could not connect to www ipcop org WARNING: translation string unused: could not connect to www ipfire org @@ -888,6 +885,7 @@ WARNING: untranslated string: Captive delete logo = Delete Logo WARNING: untranslated string: Scan for Songs = unknown string WARNING: untranslated string: acpitemp = ACPI - Temperatures WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information +WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet WARNING: untranslated string: advproxy fastflux detection = Deny access to destinations hosted on fast flux setups WARNING: untranslated string: advproxy fastflux detection threshold = Threshold @@ -923,6 +921,7 @@ WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40 WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) +WARNING: untranslated string: core update = Core-Update WARNING: untranslated string: cpu frequency = CPU frequency WARNING: untranslated string: crypto error = Cryptographic error WARNING: untranslated string: crypto warning = Cryptographic warning @@ -955,6 +954,7 @@ WARNING: untranslated string: download apple profile = Download Apple Configurat WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.) WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians WARNING: untranslated string: duration = Duration +WARNING: untranslated string: email recipient invalid = Invalid email recipient WARNING: untranslated string: email tls explicit = explicit (STARTTLS) WARNING: untranslated string: email tls implicit = implicit (TLS) WARNING: untranslated string: enable = Enable @@ -1100,6 +1100,7 @@ WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log WARNING: untranslated string: ovpn tls auth = TLS Channel Protection: WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. Please update to the latest IPFire version and generate as soon as possible a new root and host certificate. All OpenVPN clients needs then to be renewed! +WARNING: untranslated string: pak update = Update WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later. WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning... WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding. @@ -1115,7 +1116,9 @@ WARNING: untranslated string: ptr = PTR WARNING: untranslated string: reboot fsck = Reboot & check filesystem WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check WARNING: untranslated string: received = Received +WARNING: untranslated string: release = Release WARNING: untranslated string: required = Required +WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string @@ -1150,10 +1153,14 @@ WARNING: untranslated string: token not set = No Token has been given. WARNING: untranslated string: tor guard country any = Any country WARNING: untranslated string: tor guard nodes = Guard Nodes WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line) +WARNING: untranslated string: traffic stat in = In +WARNING: untranslated string: traffic stat out = Out +WARNING: untranslated string: traffic stat title = RED Traffic WARNING: untranslated string: transfers = Transfers WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode WARNING: untranslated string: user management = User Management +WARNING: untranslated string: version = Version WARNING: untranslated string: vpn start action add = Wait for connection initiation WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy. WARNING: untranslated string: vpn wait = WAITING diff --git a/doc/language_missings b/doc/language_missings index 57bb3e848..aa549a132 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -108,6 +108,7 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< advproxy errmsg invalid url < advproxy errmsg proxy ports equal < advproxy errmsg wpad invalid ip or mask < advproxy fastflux detection @@ -201,6 +202,7 @@ < ConnSched hangup < ConnSched reboot < ConnSched shutdown +< core update < count < countries < countrycode @@ -295,6 +297,7 @@ < email mailrcpt < email mailsender < email mailuser +< email recipient invalid < email settings < email subject < email success @@ -774,6 +777,7 @@ < pakfire tree stable < pakfire tree testing < pakfire tree unstable +< pak update < please reboot to apply your changes < pptp netconfig < pptp peer @@ -792,8 +796,10 @@ < rebooting ipfire fsck < received < red1 +< release < required < required field +< retbleed < runmode < samba join a domain < samba join domain @@ -900,6 +906,9 @@ < tor traffic read written < tor use exit nodes < tor use guard nodes +< traffic stat in +< traffic stat out +< traffic stat title < transfers < transport mode does not support vti < twelve hours @@ -922,6 +931,7 @@ < urlfilter redirect template < user management < vendor +< version < visit us at < vpn broken < vpn connecting @@ -1026,12 +1036,15 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< advproxy errmsg invalid url < ansi t1.483 < bewan adsl pci st < bewan adsl usb +< email recipient invalid < g.dtm < g.lite < guaranteed bandwidth +< retbleed < upload fcdsl.o ############################################################################ # Checking cgi-bin translations for language: it # @@ -1044,6 +1057,7 @@ < advproxy asbased anomaly detection < advproxy AUTH method ntlm auth < advproxy basic authentication +< advproxy errmsg invalid url < advproxy errmsg wpad invalid ip or mask < advproxy fastflux detection < advproxy fastflux detection threshold @@ -1136,6 +1150,7 @@ < Captive WiFi coupon < Captive wrong ext < check all +< core update < cpu frequency < crypto error < cryptographic settings @@ -1193,6 +1208,7 @@ < email mailrcpt < email mailsender < email mailuser +< email recipient invalid < email settings < email subject < email success @@ -1387,6 +1403,7 @@ < pakfire tree stable < pakfire tree testing < pakfire tree unstable +< pak update < please reboot to apply your changes < pptp netconfig < pptp peer @@ -1398,8 +1415,10 @@ < reboot fsck < rebooting ipfire fsck < received +< release < required < required field +< retbleed < runmode < samba join a domain < samba join domain @@ -1438,6 +1457,9 @@ < tor guard country any < tor guard nodes < tor use guard nodes +< traffic stat in +< traffic stat out +< traffic stat title < transfers < transport mode does not support vti < twelve hours @@ -1451,6 +1473,7 @@ < updxlrtr passive mode < uplink bit rate < user management +< version < vpn broken < vpn connecting < vpn force mobike @@ -1531,6 +1554,7 @@ < advproxy AUTH method ntlm < advproxy AUTH method ntlm auth < advproxy basic authentication +< advproxy errmsg invalid url < advproxy errmsg wpad invalid ip or mask < advproxy fastflux detection < advproxy fastflux detection threshold @@ -1695,6 +1719,7 @@ < email mailrcpt < email mailsender < email mailuser +< email recipient invalid < email settings < email subject < email success @@ -1932,6 +1957,7 @@ < received < required < required field +< retbleed < runmode < samba join a domain < samba join domain @@ -2075,6 +2101,7 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< advproxy errmsg invalid url < advproxy errmsg proxy ports equal < advproxy errmsg wpad invalid ip or mask < advproxy fastflux detection @@ -2222,6 +2249,7 @@ < ConnSched hangup < ConnSched reboot < ConnSched shutdown +< core update < count < countries < countrycode @@ -2315,6 +2343,7 @@ < email mailrcpt < email mailsender < email mailuser +< email recipient invalid < email settings < email subject < email success @@ -2787,6 +2816,7 @@ < pakfire tree stable < pakfire tree testing < pakfire tree unstable +< pak update < please reboot to apply your changes < pptp netconfig < pptp peer @@ -2805,8 +2835,10 @@ < rebooting ipfire fsck < received < red1 +< release < required < required field +< retbleed < runmode < samba join a domain < samba join domain @@ -2911,6 +2943,9 @@ < tor traffic read written < tor use exit nodes < tor use guard nodes +< traffic stat in +< traffic stat out +< traffic stat title < transfers < transport mode does not support vti < twelve hours @@ -2933,6 +2968,7 @@ < urlfilter redirect template < user management < vendor +< version < visit us at < vpn broken < vpn connecting @@ -3051,6 +3087,7 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< advproxy errmsg invalid url < advproxy errmsg proxy ports equal < advproxy errmsg wpad invalid ip or mask < advproxy fastflux detection @@ -3198,6 +3235,7 @@ < ConnSched hangup < ConnSched reboot < ConnSched shutdown +< core update < count < countries < countrycode @@ -3294,6 +3332,7 @@ < email mailrcpt < email mailsender < email mailuser +< email recipient invalid < email settings < email subject < email success @@ -3767,6 +3806,7 @@ < pakfire tree stable < pakfire tree testing < pakfire tree unstable +< pak update < please reboot to apply your changes < pptp netconfig < pptp peer @@ -3785,8 +3825,10 @@ < rebooting ipfire fsck < received < red1 +< release < required < required field +< retbleed < runmode < samba join a domain < samba join domain @@ -3891,6 +3933,9 @@ < tor traffic read written < tor use exit nodes < tor use guard nodes +< traffic stat in +< traffic stat out +< traffic stat title < transfers < transport mode does not support vti < twelve hours @@ -3913,6 +3958,7 @@ < urlfilter redirect template < user management < vendor +< version < visit us at < vpn broken < vpn connecting @@ -4021,6 +4067,7 @@ ############################################################################ < acpitemp < advproxy asbased anomaly detection +< advproxy errmsg invalid url < advproxy errmsg wpad invalid ip or mask < advproxy fastflux detection < advproxy fastflux detection threshold @@ -4056,6 +4103,7 @@ < cake profile pppoe-vcmux 32 < cake profile raw 0 < Captive delete logo +< core update < cpu frequency < crypto error < cryptographic settings @@ -4092,6 +4140,7 @@ < drop hostile < drop spoofed martians < duration +< email recipient invalid < email tls explicit < email tls implicit < emerging pro rules @@ -4224,6 +4273,7 @@ < pakfire tree stable < pakfire tree testing < pakfire tree unstable +< pak update < please reboot to apply your changes < processor vulnerability mitigations < ptr @@ -4231,7 +4281,9 @@ < reboot fsck < rebooting ipfire fsck < received +< release < required +< retbleed < runmode < samba server role member < samba server role standalone @@ -4264,11 +4316,15 @@ < tor guard country any < tor guard nodes < tor use guard nodes +< traffic stat in +< traffic stat out +< traffic stat title < transfers < transport mode does not support vti < update ruleset < updxlrtr passive mode < user management +< version < vpn start action add < vpn subjectaltname missing < vpn wait diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index cf31b9171..74eae3e50 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2506,9 +2506,9 @@ 'traffic on' => 'Verkehr auf', 'traffic shaping' => 'Traffic Shaping', 'traffic shaping settings' => 'Einstellungen der Datenflußkontrolle', -'traffic stat title' => 'ROTER Traffic', 'traffic stat in' => 'Ein', 'traffic stat out' => 'Aus', +'traffic stat title' => 'ROTER Traffic', 'traffic warn level bad' => 'Warnlevel ist nicht gültig', 'trafficblue' => 'WLAN', 'trafficdate' => 'Datum', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 11ba10f8f..f770e7cd9 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2570,9 +2570,9 @@ 'traffic on' => 'Traffic on', 'traffic shaping' => 'Traffic Shaping', 'traffic shaping settings' => 'Traffic Shaping Settings', -'traffic stat title' => 'RED Traffic', 'traffic stat in' => 'In', 'traffic stat out' => 'Out', +'traffic stat title' => 'RED Traffic', 'traffic warn level bad' => 'Warnlevel is not correct', 'trafficblue' => 'WLAN', 'trafficdate' => 'Date', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 9e0bd3449..a1643557e 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -2579,9 +2579,9 @@ 'traffic on' => 'Trafic en cours', 'traffic shaping' => 'Arrangement du trafic', 'traffic shaping settings' => 'Réglages de l\'arrangement du trafic', -'traffic stat title' => 'Trafic ROUGE', 'traffic stat in' => 'Entrée', 'traffic stat out' => 'Sortie', +'traffic stat title' => 'Trafic ROUGE', 'traffic warn level bad' => 'Le niveau d\'alerte n\'est pas correct', 'trafficblue' => 'WLAN', 'trafficdate' => 'Date', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 7229a86ae..49dabec99 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -2131,9 +2131,9 @@ 'traffic on' => 'Verkeer op', 'traffic shaping' => 'Verkeersregeling', 'traffic shaping settings' => 'Verkeersregeling instellingen', -'traffic stat title' => 'ROOD Verkeer', 'traffic stat in' => 'In', 'traffic stat out' => 'Uit', +'traffic stat title' => 'ROOD Verkeer', 'traffic warn level bad' => 'Waarschuwingsniveau is onjuist', 'trafficblue' => 'WLAN', 'trafficdate' => 'Datum', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. af5a2d94fb41173a31bbb398653b5eef64f834e6
by Michael Tremer 13 Sep '22

13 Sep '22

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, master has been updated via af5a2d94fb41173a31bbb398653b5eef64f834e6 (commit) via 2e6def380e739e6d81327bdbb9496a3f2b96a7a2 (commit) via d1c8c9ef6071383b434872bfbc63d0e5ca3c3edf (commit) from b5f3c54b19bf756a8e5e560ec8372c2b9cc48221 (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 af5a2d94fb41173a31bbb398653b5eef64f834e6 Merge: b5f3c54b1 2e6def380 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 13 10:20:19 2022 +0000 Merge remote-tracking branch 'origin/next' ----------------------------------------------------------------------- Summary of changes: lfs/cups | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/cups b/lfs/cups index e500ac2e7..b8037d8f8 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@ include Config -VER = 2.4.2 +VER = 2.4.1 SUMMARY = The Common UNIX Printing System THISAPP = cups-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 29 +PAK_VER = 30 DEPS = avahi cups-filters dbus ghostscript @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 +$(DL_FILE)_BLAKE2 = 690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2e6def380e739e6d81327bdbb9496a3f2b96a7a2
by Peter Müller 12 Sep '22

12 Sep '22

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 2e6def380e739e6d81327bdbb9496a3f2b96a7a2 (commit) via d1c8c9ef6071383b434872bfbc63d0e5ca3c3edf (commit) from a981a365a078f5840b32a76c4ad9aa75111a60f8 (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 2e6def380e739e6d81327bdbb9496a3f2b96a7a2 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Sep 12 19:46:59 2022 +0000 CUPS: Bump package number after revert Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit d1c8c9ef6071383b434872bfbc63d0e5ca3c3edf Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Mon Sep 12 19:46:18 2022 +0000 Revert "CUPS: Update to 2.4.2" This reverts commit ffce292e7a864e547de575d3b0b8be1a2b91cd5f. See: #12924 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/cups | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/cups b/lfs/cups index e500ac2e7..b8037d8f8 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@ include Config -VER = 2.4.2 +VER = 2.4.1 SUMMARY = The Common UNIX Printing System THISAPP = cups-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 29 +PAK_VER = 30 DEPS = avahi cups-filters dbus ghostscript @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 +$(DL_FILE)_BLAKE2 = 690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b5f3c54b19bf756a8e5e560ec8372c2b9cc48221
by Michael Tremer 11 Sep '22

11 Sep '22

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, master has been updated via b5f3c54b19bf756a8e5e560ec8372c2b9cc48221 (commit) via a981a365a078f5840b32a76c4ad9aa75111a60f8 (commit) via ba4f53c56573d51be5e804f70965e82e5b271fd5 (commit) via 7cb63527d96c4610171feb580c9fcd27c3af26b6 (commit) via cc826e8628141abce615699a8c10592233dc467c (commit) from 48a19ee575b2268ce9e3e6b623d48c880fb6fede (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 b5f3c54b19bf756a8e5e560ec8372c2b9cc48221 Merge: 48a19ee57 a981a365a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 11 09:42:17 2022 +0000 Merge remote-tracking branch 'origin/next' ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 11 +++++++++++ config/rootfiles/core/170/filelists/files | 3 +++ html/cgi-bin/mail.cgi | 4 ++++ html/cgi-bin/proxy.cgi | 2 ++ langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ src/misc-progs/setaliases.c | 8 +++----- 7 files changed, 27 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 16a05cecf..98bedb4b9 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -756,6 +756,17 @@ sub validdomainname return 1; } +sub validwildcarddomainname($) { + my $domainname = shift; + + # Ignore any leading dots + if ($domainname =~ m/^\*\.(.*)/) { + $domainname = $1; + } + + return &validdomainname($domainname); +} + sub validfqdn { # Checks a fully qualified domain name against RFC1035 and RFC2181 diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files index df8020847..d31e49ad3 100644 --- a/config/rootfiles/core/170/filelists/files +++ b/config/rootfiles/core/170/filelists/files @@ -4,7 +4,9 @@ opt/pakfire/pakfire srv/web/ipfire/cgi-bin/aliases.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/ipblocklist.cgi +srv/web/ipfire/cgi-bin/mail.cgi srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vulnerabilities.cgi @@ -22,6 +24,7 @@ usr/share/terminfo/t/tmux-256color usr/share/terminfo/t/tmux-direct var/ipfire/backup/bin/backup.pl var/ipfire/backup/include +var/ipfire/general-functions.pl var/ipfire/ipblocklist-functions.pl var/ipfire/menu.d/50-firewall.menu var/ipfire/menu.d/70-log.menu diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 4ebc6b033..34f52ae01 100644 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -283,6 +283,10 @@ sub checkmailsettings { $errormessage .= "$Lang::tr{'email invalid'} $Lang::tr{'email mailsender'} "; } } + # Check for a valid recipient + if (!&General::validemail($cgiparams{'txt_recipient'})) { + $errormessage .= $Lang::tr{'email recipient invalid'} . " "; + } return $errormessage; } diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 0111a240b..577d37b93 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2506,6 +2506,7 @@ sub check_acls if ($_) { if (/^\./) { $_ = '*'.$_; } + unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); } $proxysettings{'DST_NOCACHE'} .= $_."\n"; } } @@ -2604,6 +2605,7 @@ sub check_acls if ($_) { if (/^\./) { $_ = '*'.$_; } + unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); } $proxysettings{'DST_NOPROXY_URL'} .= $_."\n"; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d3b4c8687..cf31b9171 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -301,6 +301,7 @@ 'advproxy errmsg invalid proxy port' => 'Ungültiger Proxyport', 'advproxy errmsg invalid upstream proxy' => 'Ungültige IP/Hostname für vorgelagerten Proxy', 'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für vorgelagerten Proxy', +'advproxy errmsg invalid url' => 'Ungültige URL', 'advproxy errmsg invalid user' => 'Benutzername existiert nicht', 'advproxy errmsg ldap base dn' => 'LDAP Base DN erforderlich', 'advproxy errmsg ldap bind dn' => 'LDAP Bind DN Benutzername und Passwort erforderlich', @@ -963,6 +964,7 @@ 'email mailrcpt' => 'E-Mail-Empfänger', 'email mailsender' => 'E-Mail-Absender', 'email mailuser' => 'Benutzername', +'email recipient invalid' => 'Ungültiger Emailempfänger', 'email server can not be empty' => 'E-Mail-Server darf nicht leer sein', 'email settings' => 'Mailversand', 'email subject' => 'IPFire Test-E-Mail', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 36f97de38..11ba10f8f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -298,6 +298,7 @@ 'advproxy errmsg invalid proxy port' => 'Invalid proxy port', 'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP/hostname', 'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', +'advproxy errmsg invalid url' => 'Invalid URL', 'advproxy errmsg invalid user' => 'Username does not exist', 'advproxy errmsg ldap base dn' => 'LDAP base DN required', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required', @@ -1004,6 +1005,7 @@ 'email mailrcpt' => 'Mail Recipient', 'email mailsender' => 'Mail Sender', 'email mailuser' => 'Username', +'email recipient invalid' => 'Invalid email recipient', 'email server can not be empty' => 'E-mail server can not be empty', 'email settings' => 'Mail Service', 'email subject' => 'IPFire Test Mail', diff --git a/src/misc-progs/setaliases.c b/src/misc-progs/setaliases.c index a541a4fd2..4b18ba325 100644 --- a/src/misc-progs/setaliases.c +++ b/src/misc-progs/setaliases.c @@ -28,8 +28,6 @@ struct keyvalue *kv = NULL; FILE *file = NULL; -#define SCOPE 128 - void exithandler(void) { if (kv) freekeyvalues(kv); @@ -125,7 +123,7 @@ int main(void) alias = 0; do { snprintf(command, STRING_SIZE - 1, - "ip addr flush dev red%d scope %d 2>/dev/null", alias++, SCOPE); + "ip addr flush secondary dev red%d 2>/dev/null", alias++); } while (safe_system(command) == 0); /* Now set up the new aliases from the config file */ @@ -184,8 +182,8 @@ int main(void) if (!intf) intf = red_dev; - snprintf(command, STRING_SIZE - 1, "ip addr add %s/%s dev %s scope %d", - aliasip, red_netmask, intf, SCOPE); + snprintf(command, STRING_SIZE - 1, "ip addr add %s/%s secondary dev %s 2>/dev/null", + aliasip, red_netmask, intf); safe_system(command); alias++; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a981a365a078f5840b32a76c4ad9aa75111a60f8
by Peter Müller 11 Sep '22

11 Sep '22

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 a981a365a078f5840b32a76c4ad9aa75111a60f8 (commit) via ba4f53c56573d51be5e804f70965e82e5b271fd5 (commit) via 7cb63527d96c4610171feb580c9fcd27c3af26b6 (commit) from cc826e8628141abce615699a8c10592233dc467c (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 a981a365a078f5840b32a76c4ad9aa75111a60f8 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sun Sep 11 08:13:27 2022 +0000 Core Update 170: Ship files related to #12925 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit ba4f53c56573d51be5e804f70965e82e5b271fd5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 6 14:15:54 2022 +0200 proxy.cgi: Correctly validate domain lists Fixes: #12925 - JVN#15411362 Inquiry on vulnerability found in IPFire Reported-by: Noriko Totsuka <vuls(a)jpcert.or.jp> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7cb63527d96c4610171feb580c9fcd27c3af26b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 6 13:58:22 2022 +0200 mail.cgi: Validate email recipient The email recipient was not correctly validated which allowed for some stored cross-site scripting vulnerability. Fixes: #12925 - JVN#15411362 Inquiry on vulnerability found in IPFire Reported-by: Noriko Totsuka <vuls(a)jpcert.or.jp> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 11 +++++++++++ config/rootfiles/core/170/filelists/files | 3 +++ html/cgi-bin/mail.cgi | 4 ++++ html/cgi-bin/proxy.cgi | 2 ++ langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 6 files changed, 24 insertions(+) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 16a05cecf..98bedb4b9 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -756,6 +756,17 @@ sub validdomainname return 1; } +sub validwildcarddomainname($) { + my $domainname = shift; + + # Ignore any leading dots + if ($domainname =~ m/^\*\.(.*)/) { + $domainname = $1; + } + + return &validdomainname($domainname); +} + sub validfqdn { # Checks a fully qualified domain name against RFC1035 and RFC2181 diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files index df8020847..d31e49ad3 100644 --- a/config/rootfiles/core/170/filelists/files +++ b/config/rootfiles/core/170/filelists/files @@ -4,7 +4,9 @@ opt/pakfire/pakfire srv/web/ipfire/cgi-bin/aliases.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/ipblocklist.cgi +srv/web/ipfire/cgi-bin/mail.cgi srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vulnerabilities.cgi @@ -22,6 +24,7 @@ usr/share/terminfo/t/tmux-256color usr/share/terminfo/t/tmux-direct var/ipfire/backup/bin/backup.pl var/ipfire/backup/include +var/ipfire/general-functions.pl var/ipfire/ipblocklist-functions.pl var/ipfire/menu.d/50-firewall.menu var/ipfire/menu.d/70-log.menu diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 4ebc6b033..34f52ae01 100644 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -283,6 +283,10 @@ sub checkmailsettings { $errormessage .= "$Lang::tr{'email invalid'} $Lang::tr{'email mailsender'} "; } } + # Check for a valid recipient + if (!&General::validemail($cgiparams{'txt_recipient'})) { + $errormessage .= $Lang::tr{'email recipient invalid'} . " "; + } return $errormessage; } diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 0111a240b..577d37b93 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2506,6 +2506,7 @@ sub check_acls if ($_) { if (/^\./) { $_ = '*'.$_; } + unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); } $proxysettings{'DST_NOCACHE'} .= $_."\n"; } } @@ -2604,6 +2605,7 @@ sub check_acls if ($_) { if (/^\./) { $_ = '*'.$_; } + unless (&General::validwildcarddomainname($_)) { $errormessage = $Lang::tr{'advproxy errmsg invalid url'} . ": " . &Header::escape($_); } $proxysettings{'DST_NOPROXY_URL'} .= $_."\n"; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index d3b4c8687..cf31b9171 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -301,6 +301,7 @@ 'advproxy errmsg invalid proxy port' => 'Ungültiger Proxyport', 'advproxy errmsg invalid upstream proxy' => 'Ungültige IP/Hostname für vorgelagerten Proxy', 'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für vorgelagerten Proxy', +'advproxy errmsg invalid url' => 'Ungültige URL', 'advproxy errmsg invalid user' => 'Benutzername existiert nicht', 'advproxy errmsg ldap base dn' => 'LDAP Base DN erforderlich', 'advproxy errmsg ldap bind dn' => 'LDAP Bind DN Benutzername und Passwort erforderlich', @@ -963,6 +964,7 @@ 'email mailrcpt' => 'E-Mail-Empfänger', 'email mailsender' => 'E-Mail-Absender', 'email mailuser' => 'Benutzername', +'email recipient invalid' => 'Ungültiger Emailempfänger', 'email server can not be empty' => 'E-Mail-Server darf nicht leer sein', 'email settings' => 'Mailversand', 'email subject' => 'IPFire Test-E-Mail', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 36f97de38..11ba10f8f 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -298,6 +298,7 @@ 'advproxy errmsg invalid proxy port' => 'Invalid proxy port', 'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP/hostname', 'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', +'advproxy errmsg invalid url' => 'Invalid URL', 'advproxy errmsg invalid user' => 'Username does not exist', 'advproxy errmsg ldap base dn' => 'LDAP base DN required', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required', @@ -1004,6 +1005,7 @@ 'email mailrcpt' => 'Mail Recipient', 'email mailsender' => 'Mail Sender', 'email mailuser' => 'Username', +'email recipient invalid' => 'Invalid email recipient', 'email server can not be empty' => 'E-mail server can not be empty', 'email settings' => 'Mail Service', 'email subject' => 'IPFire Test Mail', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc826e8628141abce615699a8c10592233dc467c
by Peter Müller 11 Sep '22

11 Sep '22

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 48a19ee575b2268ce9e3e6b623d48c880fb6fede
by Michael Tremer 05 Sep '22

05 Sep '22

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, master has been updated via 48a19ee575b2268ce9e3e6b623d48c880fb6fede (commit) via 763efaf672a27297e274fbe526a3c49ea96904ee (commit) via 336a2a2e25340b038a79eb7699875875ccb18692 (commit) via 532c31c52933035e3fdacf668efdc2892e8715ca (commit) via 11c6186102c3b1f604d2fe9ea308fc69183e97a5 (commit) via 04aed06489bc9f1ebc30059ab0f6353063b7c856 (commit) via 0e8a17b2d1a7e61ebb1e25b384526c44acc1f7a0 (commit) via 694b0f05280bc452f3ea00f473d598a05f82024b (commit) via 85bfecc0bae35ffe176d7c20dde7188594477787 (commit) via 149d8e83e5f547241a450ea0a68d8afac1e107fa (commit) from ef7d41ef9ea09efd48b934319deb9742e7e41ea1 (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 48a19ee575b2268ce9e3e6b623d48c880fb6fede Merge: ef7d41ef9 763efaf67 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 5 10:07:45 2022 +0000 Merge remote-tracking branch 'origin/next' ----------------------------------------------------------------------- Summary of changes: config/ipblocklist/sources | 4 ++-- config/rootfiles/common/configroot | 1 + config/rootfiles/core/170/filelists/files | 1 + config/rootfiles/core/170/update.sh | 4 ++++ lfs/configroot | 6 +++--- lfs/dbus | 4 ++-- lfs/netatalk | 6 +++--- lfs/qemu | 4 ++-- src/initscripts/packages/messagebus | 2 +- src/misc-progs/getipstat.c | 2 +- 10 files changed, 20 insertions(+), 14 deletions(-) Difference in files: diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index c750dcd58..a6f82354c 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -93,14 +93,14 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'ip-or-net-list', 'rate' => '15m', 'category' => 'reputation' }, - 'TOR_ALL' => { 'name' => 'Known TOR Nodes', + 'TOR_ALL' => { 'name' => 'Known Tor Nodes', 'url' => 'https://www.dan.me.uk/torlist', 'info' => 'https://www.dan.me.uk/tornodes', 'parser' => 'ip-or-net-list', 'rate' => '1h', 'category' => 'application', 'disable' => 'TOR_EXIT' }, - 'TOR_EXIT' => { 'name' => 'Known TOR Exit Nodes', + 'TOR_EXIT' => { 'name' => 'Known Tor Exit Nodes', 'url' => 'https://www.dan.me.uk/torlist/?exit', 'info' => 'https://www.dan.me.uk/tornodes', 'parser' => 'ip-or-net-list',, diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 088e87f5b..4d631cea5 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -83,6 +83,7 @@ var/ipfire/location-functions.pl var/ipfire/ids-functions.pl var/ipfire/ipblocklist-functions.pl var/ipfire/ipblocklist +#var/ipfire/ipblocklist/modified #var/ipfire/ipblocklist/settings var/ipfire/isdn #var/ipfire/isdn/settings diff --git a/config/rootfiles/core/170/filelists/files b/config/rootfiles/core/170/filelists/files index 01b02c2ab..df8020847 100644 --- a/config/rootfiles/core/170/filelists/files +++ b/config/rootfiles/core/170/filelists/files @@ -14,6 +14,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromblocklist.dat srv/web/ipfire/html/themes/ipfire/include/functions.pl usr/lib/firewall/rules.pl +usr/local/bin/getipstat usr/local/bin/setaliases usr/local/bin/update-ipblocklists usr/share/terminfo/t/tmux diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh index b6b66f3f1..9d16f4a32 100644 --- a/config/rootfiles/core/170/update.sh +++ b/config/rootfiles/core/170/update.sh @@ -164,6 +164,10 @@ ldconfig mkdir -pv /var/lib/ipblocklist chown nobody:nobody /var/lib/ipblocklist +# Create necessary files for IPBlocklist and set their ownership accordingly (#12917) +touch /var/ipfire/ipblocklist/{settings,modified} +chown nobody:nobody /var/ipfire/ipblocklist/{settings,modified} + # Rebuild fcrontab from scratch /usr/bin/fcrontab -z diff --git a/lfs/configroot b/lfs/configroot index 5565bd344..31b9a9463 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -65,8 +65,8 @@ $(TARGET) : captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \ - fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/settings \ - isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ + fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \ + ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \ diff --git a/lfs/dbus b/lfs/dbus index c816b2c07..fdb2e2f21 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = dbus -PAK_VER = 5 +PAK_VER = 6 DEPS = diff --git a/lfs/netatalk b/lfs/netatalk index 7a91fa948..e93dede98 100644 --- a/lfs/netatalk +++ b/lfs/netatalk @@ -26,7 +26,7 @@ include Config SUMMARY = AppleShare file server -VER = 3.1.13 +VER = 3.1.12 THISAPP = netatalk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netatalk -PAK_VER = 4 +PAK_VER = 5 DEPS = avahi dbus @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 2849e2a5b436f9965e0dd2aedf5078c560c78f45c1c86fbdea39228266b8fbcc096a3a62a08bd626b8b700fde4dd65d99f71f04478e129f6ec61c2ed7184780d +$(DL_FILE)_BLAKE2 = 912bb85045952202becc42899f87ada33427ded987de6c7a6b56c061c1eb6d1a96d95a1700522bfe2119c6db8bbec94eeb4c64c480f59ff7d406542390705efc install : $(TARGET) diff --git a/lfs/qemu b/lfs/qemu index 1edab05d1..cf31c4622 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -35,9 +35,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 33 +PAK_VER = 34 -DEPS = libusbredir spice libseccomp +DEPS = alsa libusbredir spice libseccomp SERVICES = diff --git a/src/initscripts/packages/messagebus b/src/initscripts/packages/messagebus index 399b4c041..c6dec8dd3 100644 --- a/src/initscripts/packages/messagebus +++ b/src/initscripts/packages/messagebus @@ -50,7 +50,7 @@ case "$1" in ;; status) - statusproc -p $pidfile /usr/bin/dbus-daemon + statusproc /usr/bin/dbus-daemon ;; *) diff --git a/src/misc-progs/getipstat.c b/src/misc-progs/getipstat.c index 66d5b5a92..c4c7faf75 100644 --- a/src/misc-progs/getipstat.c +++ b/src/misc-progs/getipstat.c @@ -29,7 +29,7 @@ int main(int argc, char** argv) // argument. char *args[] = {"--list", "--verbose", "--numeric", "--wait", "5", NULL, NULL, NULL, NULL}; char *usage = "getipstat [-x][-f|-n|-m]"; - unsigned int pcount = 6; + unsigned int pcount = 5; unsigned int table_set = 0; int opt; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 763efaf672a27297e274fbe526a3c49ea96904ee
by Peter Müller 02 Sep '22

02 Sep '22

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 763efaf672a27297e274fbe526a3c49ea96904ee (commit) from 336a2a2e25340b038a79eb7699875875ccb18692 (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 763efaf672a27297e274fbe526a3c49ea96904ee Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Thu Sep 1 20:30:18 2022 +0000 configroot: Create "settings" and "modify" files for ipblocklist The third version of this patch conducts the necessary changes in configroot. Previously, they took place in ipblocklist itself, which would have caused user settings to be overwritten, should ipblocklist be shipped in future Core Updates. Fixes: #12917 Cc: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Acked-by: Stefan Schantl <stefan.schantl(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 1 + config/rootfiles/core/170/update.sh | 4 ++++ lfs/configroot | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 088e87f5b..4d631cea5 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -83,6 +83,7 @@ var/ipfire/location-functions.pl var/ipfire/ids-functions.pl var/ipfire/ipblocklist-functions.pl var/ipfire/ipblocklist +#var/ipfire/ipblocklist/modified #var/ipfire/ipblocklist/settings var/ipfire/isdn #var/ipfire/isdn/settings diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh index b6b66f3f1..9d16f4a32 100644 --- a/config/rootfiles/core/170/update.sh +++ b/config/rootfiles/core/170/update.sh @@ -164,6 +164,10 @@ ldconfig mkdir -pv /var/lib/ipblocklist chown nobody:nobody /var/lib/ipblocklist +# Create necessary files for IPBlocklist and set their ownership accordingly (#12917) +touch /var/ipfire/ipblocklist/{settings,modified} +chown nobody:nobody /var/ipfire/ipblocklist/{settings,modified} + # Rebuild fcrontab from scratch /usr/bin/fcrontab -z diff --git a/lfs/configroot b/lfs/configroot index 5565bd344..31b9a9463 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2022 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 # @@ -65,8 +65,8 @@ $(TARGET) : captive/settings captive/agb.txt captive/clients captive/voucher_out certs/index.txt certs/index.txt.attr ddns/config ddns/settings ddns/ipcache dhcp/settings \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dns/servers dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/locationblock firewall/input firewall/outgoing \ - fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/settings \ - isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ + fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customlocationgrp fwlogs/ipsettings fwlogs/portsettings ipblocklist/modified \ + ipblocklist/settings isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \ 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 September 2022