From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 910a82917aa9a9e5a6f569c304541babeb724699
Date: Thu, 14 Mar 2024 19:17:21 +0000 [thread overview]
Message-ID: <4TwcZn2YFlz2xjS@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 18848 bytes --]
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 910a82917aa9a9e5a6f569c304541babeb724699 (commit)
via 16492046bc7f50e2c63e2908a7ace13d1548e764 (commit)
via f561899b54d6abd81430dd26a83679d49bc3fae7 (commit)
via 6e5fa2dae179f8a2e70a008f0fc6aaea6af7c9cd (commit)
from c39b2e00be1202a0824b72f28cdc7cfa653ce0a6 (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 910a82917aa9a9e5a6f569c304541babeb724699
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 14 19:17:04 2024 +0000
core185: Ship time.cgi
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 16492046bc7f50e2c63e2908a7ace13d1548e764
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 14 18:49:51 2024 +0000
time.cgi: Add German translation
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f561899b54d6abd81430dd26a83679d49bc3fae7
Author: Jon Murphy <jon.murphy(a)ipfire.org>
Date: Mon Mar 11 18:45:00 2024 -0500
time.cgi: add current date-time to this WebGUI page
- added words and date-time format to english (en.pl)
- other languages are needed
- seconds included since time is accurate to < .1s
https://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=2234e8aacac2e0d0b06dac4513585c15c2b3b440
Code-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
Signed-off-by: Jon Murphy <jon.murphy(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6e5fa2dae179f8a2e70a008f0fc6aaea6af7c9cd
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Thu Mar 14 17:52:08 2024 +0100
expat: Update to version 2.6.2
- Update from version 2.6.1 to 2.6.2
- Update of rootfile
- Changelog
2.6.2
Security fixes:
#839 #842 CVE-2024-28757 -- Prevent billion laughs attacks with
isolated use of external parsers. Please see the commit
message of commit 1d50b80cf31de87750103656f6eb693746854aa8
for details.
Bug fixes:
#839 #841 Reject direct parameter entity recursion
and avoid the related undefined behavior
Other changes:
#847 Autotools: Fix build for DOCBOOK_TO_MAN containing spaces
#837 Add missing #821 and #824 to 2.6.1 change log
#838 #843 Version info bumped from 10:1:9 (libexpat*.so.1.9.1)
to 10:2:9 (libexpat*.so.1.9.2); see https://verbump.de/
for what these numbers do
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/expat | 20 ++++++++++----------
config/rootfiles/core/185/filelists/files | 1 +
doc/language_issues.en | 2 ++
doc/language_issues.es | 2 ++
doc/language_issues.fr | 2 ++
doc/language_issues.it | 2 ++
doc/language_issues.nl | 2 ++
doc/language_issues.pl | 2 ++
doc/language_issues.ru | 2 ++
doc/language_issues.tr | 2 ++
doc/language_missings | 14 ++++++++++++++
html/cgi-bin/time.cgi | 4 ++++
langs/de/cgi-bin/de.pl | 2 ++
langs/en/cgi-bin/en.pl | 2 ++
lfs/expat | 4 ++--
15 files changed, 51 insertions(+), 12 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat
index bb4db5687c..2ab49e910e 100644
--- a/config/rootfiles/common/expat
+++ b/config/rootfiles/common/expat
@@ -3,21 +3,21 @@
#usr/include/expat_config.h
#usr/include/expat_external.h
#usr/lib/cmake
-#usr/lib/cmake/expat-2.6.1
-#usr/lib/cmake/expat-2.6.1/expat-config-version.cmake
-#usr/lib/cmake/expat-2.6.1/expat-config.cmake
-#usr/lib/cmake/expat-2.6.1/expat-noconfig.cmake
-#usr/lib/cmake/expat-2.6.1/expat.cmake
+#usr/lib/cmake/expat-2.6.2
+#usr/lib/cmake/expat-2.6.2/expat-config-version.cmake
+#usr/lib/cmake/expat-2.6.2/expat-config.cmake
+#usr/lib/cmake/expat-2.6.2/expat-noconfig.cmake
+#usr/lib/cmake/expat-2.6.2/expat.cmake
#usr/lib/libexpat.la
#usr/lib/libexpat.so
usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.9.1
+usr/lib/libexpat.so.1.9.2
#usr/lib/pkgconfig/expat.pc
#usr/share/doc/expat
-#usr/share/doc/expat-2.6.1
-#usr/share/doc/expat-2.6.1/ok.min.css
-#usr/share/doc/expat-2.6.1/reference.html
-#usr/share/doc/expat-2.6.1/style.css
+#usr/share/doc/expat-2.6.2
+#usr/share/doc/expat-2.6.2/ok.min.css
+#usr/share/doc/expat-2.6.2/reference.html
+#usr/share/doc/expat-2.6.2/style.css
#usr/share/doc/expat/AUTHORS
#usr/share/doc/expat/changelog
#usr/share/man/man1/xmlwf.1
diff --git a/config/rootfiles/core/185/filelists/files b/config/rootfiles/core/185/filelists/files
index 7dd82b01df..750a006418 100644
--- a/config/rootfiles/core/185/filelists/files
+++ b/config/rootfiles/core/185/filelists/files
@@ -48,6 +48,7 @@ srv/web/ipfire/cgi-bin/dhcp.cgi
srv/web/ipfire/cgi-bin/dns.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/time.cgi
var/ipfire/backup/bin/backup.pl
var/ipfire/main/manualpages
var/ipfire/ovpn/openssl/ovpn.cnf
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 40f85a748f..2eca62e606 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1743,6 +1743,7 @@ WARNING: untranslated string: system = System
WARNING: untranslated string: system information = System Information
WARNING: untranslated string: system is offline = The system is offline.
WARNING: untranslated string: system logs = System Logs
+WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: ta key = TLS-Authentification-Key
WARNING: untranslated string: taa zombieload2 = TSX Async Abort/ZombieLoad v2
WARNING: untranslated string: tcp more reliable = TCP (more reliable)
@@ -1756,6 +1757,7 @@ WARNING: untranslated string: thirty minutes = 30 Minutes
WARNING: untranslated string: thursday = Thursday
WARNING: untranslated string: time = Time
WARNING: untranslated string: time server = Time Server
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: timeout must be a number = Timeout must be a number.
WARNING: untranslated string: title = Title
WARNING: untranslated string: to = To
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 30e20ae87d..ff5434e05d 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1010,6 +1010,8 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: routing table = unknown string
WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
WARNING: untranslated string: spec rstack overflow = Speculative Return Stack Overflow
+WARNING: untranslated string: system time = System Time (as of last page load)
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
WARNING: untranslated string: wio = unknown string
WARNING: untranslated string: wio checked = unknown string
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 1714a6edf8..395afd9982 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -947,6 +947,8 @@ WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: pakfire ago = ago.
WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: system time = System Time (as of last page load)
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: wio = unknown string
WARNING: untranslated string: wio checked = unknown string
WARNING: untranslated string: wio cron = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 1aca878ff5..d9bad7f14c 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1260,10 +1260,12 @@ WARNING: untranslated string: strict = Strict
WARNING: untranslated string: subnet mask = Subnet Mask
WARNING: untranslated string: subscription code = Subscription code
WARNING: untranslated string: system is offline = The system is offline.
+WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: taa zombieload2 = TSX Async Abort/ZombieLoad v2
WARNING: untranslated string: tcp more reliable = TCP (more reliable)
WARNING: untranslated string: ten minutes = 10 Minutes
WARNING: untranslated string: thirty minutes = 30 Minutes
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: token = Token:
WARNING: untranslated string: token not set = No Token has been given.
WARNING: untranslated string: tor guard country any = Any country
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index fde14ead1a..b93cc1cd19 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1283,11 +1283,13 @@ WARNING: untranslated string: strict = Strict
WARNING: untranslated string: subnet mask = Subnet Mask
WARNING: untranslated string: subscription code = Subscription code
WARNING: untranslated string: system is offline = The system is offline.
+WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: ta key = TLS-Authentification-Key
WARNING: untranslated string: taa zombieload2 = TSX Async Abort/ZombieLoad v2
WARNING: untranslated string: tcp more reliable = TCP (more reliable)
WARNING: untranslated string: ten minutes = 10 Minutes
WARNING: untranslated string: thirty minutes = 30 Minutes
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: token = Token:
WARNING: untranslated string: token not set = No Token has been given.
WARNING: untranslated string: tor guard country any = Any country
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 454e3fcf3a..ab220103f5 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1471,11 +1471,13 @@ WARNING: untranslated string: subnet mask = Subnet Mask
WARNING: untranslated string: subscription code = Subscription code
WARNING: untranslated string: support donation = Support the IPFire project with your donation
WARNING: untranslated string: system is offline = The system is offline.
+WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: ta key = TLS-Authentification-Key
WARNING: untranslated string: taa zombieload2 = TSX Async Abort/ZombieLoad v2
WARNING: untranslated string: tcp more reliable = TCP (more reliable)
WARNING: untranslated string: ten minutes = 10 Minutes
WARNING: untranslated string: thirty minutes = 30 Minutes
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: token = Token:
WARNING: untranslated string: token not set = No Token has been given.
WARNING: untranslated string: tor = Tor
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 0cb2765489..533b21a0dc 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1466,11 +1466,13 @@ WARNING: untranslated string: subnet mask = Subnet Mask
WARNING: untranslated string: subscription code = Subscription code
WARNING: untranslated string: support donation = Support the IPFire project with your donation
WARNING: untranslated string: system is offline = The system is offline.
+WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: ta key = TLS-Authentification-Key
WARNING: untranslated string: taa zombieload2 = TSX Async Abort/ZombieLoad v2
WARNING: untranslated string: tcp more reliable = TCP (more reliable)
WARNING: untranslated string: ten minutes = 10 Minutes
WARNING: untranslated string: thirty minutes = 30 Minutes
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: token = Token:
WARNING: untranslated string: token not set = No Token has been given.
WARNING: untranslated string: tor = Tor
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index aeda8127a4..d9caa290e4 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1166,7 +1166,9 @@ WARNING: untranslated string: strict = Strict
WARNING: untranslated string: subnet mask = Subnet Mask
WARNING: untranslated string: subscription code = Subscription code
WARNING: untranslated string: system is offline = The system is offline.
+WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: taa zombieload2 = TSX Async Abort/ZombieLoad v2
+WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: token = Token:
WARNING: untranslated string: token not set = No Token has been given.
WARNING: untranslated string: tor guard country any = Any country
diff --git a/doc/language_missings b/doc/language_missings
index 7a7d757507..65d69daee3 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -133,6 +133,8 @@
< reiserfs warning2
< service boot setting unavailable
< spec rstack overflow
+< system time
+< timeformat
< transport mode does not support vti
< wlanap
< wlan client configuration
@@ -146,6 +148,8 @@
< g.dtm
< g.lite
< hostile networks total
+< system time
+< timeformat
< upload fcdsl.o
############################################################################
# Checking cgi-bin translations for language: it #
@@ -570,10 +574,12 @@
< subnet mask
< subscription code
< system is offline
+< system time
< taa zombieload2
< tcp more reliable
< ten minutes
< thirty minutes
+< timeformat
< token
< token not set
< tor guard country
@@ -1116,12 +1122,14 @@
< subnet mask
< subscription code
< system is offline
+< system time
< taa zombieload2
< ta key
< tcp more reliable
< ten minutes
< teovpn_fragment
< thirty minutes
+< timeformat
< token
< token not set
< tor guard country
@@ -2008,12 +2016,14 @@
< subscription code
< support donation
< system is offline
+< system time
< taa zombieload2
< ta key
< tcp more reliable
< ten minutes
< teovpn_fragment
< thirty minutes
+< timeformat
< token
< token not set
< tor
@@ -3004,12 +3014,14 @@
< subscription code
< support donation
< system is offline
+< system time
< taa zombieload2
< ta key
< tcp more reliable
< ten minutes
< teovpn_fragment
< thirty minutes
+< timeformat
< token
< token not set
< tor
@@ -3468,7 +3480,9 @@
< subnet mask
< subscription code
< system is offline
+< system time
< taa zombieload2
+< timeformat
< token
< token not set
< tor guard country
diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index 57a02a4b63..04c1e771f7 100644
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -287,6 +287,10 @@ print <<END
</table>
END
;
+
+my $now = strftime($Lang::tr{'timeformat'}, localtime);
+print "<hr>$Lang::tr{'system time'}: $now";
+
&Header::closebox();
&Header::openbox('100%',1,$Lang::tr{'ntp sync'});
print <<END
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 49018f6a57..f13bddf4bc 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2391,6 +2391,7 @@
'system log viewer' => 'Betrachter der Systemprotokolldateien',
'system logs' => 'Systemprotokolldateien',
'system status information' => 'System-Statusinformationen',
+'system time' => 'Systemzeit (zur Zeit des Ladens der Seite)',
'ta key' => 'TLS-Authentifizierungsschlüssel',
'taa zombieload2' => 'TSX Async Abort/ZombieLoad v2',
'tcp more reliable' => 'TCP (zuverlässiger)',
@@ -2418,6 +2419,7 @@
'time' => 'Uhrzeit',
'time date manually reset' => 'Datum/Zeit wurden manuell zurückgesetzt.',
'time server' => 'Zeitserver',
+'timeformat' => '%d.%m.%Y um %H:%M:%S %Z',
'timeout must be a number' => 'Wartezeit muss eine Zahl sein.',
'title' => 'Titel',
'to' => 'Bis',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 667fb5d7ee..0113f8811f 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2462,6 +2462,7 @@
'system log viewer' => 'System Log Viewer',
'system logs' => 'System Logs',
'system status information' => 'System Status Information',
+'system time' => 'System Time (as of last page load)',
'ta key' => 'TLS-Authentification-Key',
'taa zombieload2' => 'TSX Async Abort/ZombieLoad v2',
'tcp more reliable' => 'TCP (more reliable)',
@@ -2490,6 +2491,7 @@
'time' => 'Time',
'time date manually reset' => 'Time/Date manually reset.',
'time server' => 'Time Server',
+'timeformat' => '%Y-%m-%d at %H:%M:%S %Z',
'timeout must be a number' => 'Timeout must be a number.',
'title' => 'Title',
'to' => 'To',
diff --git a/lfs/expat b/lfs/expat
index 484e27125c..3a37bf2d2a 100644
--- a/lfs/expat
+++ b/lfs/expat
@@ -24,7 +24,7 @@
include Config
-VER = 2.6.1
+VER = 2.6.2
THISAPP = expat-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 21a177ae8d70ca1bf41cae75c299a3021a9fc1b9d5eb01eb2945b16d7b24dcbeabad855379bdd8a14de804e1a1648105ce03b505f68c2beb4096a81020e35848
+$(DL_FILE)_BLAKE2 = aae019270e1ab233fe8480b7eaa77f648f23ef3383dc772dc946cb13163067431716dc5446862eb502315fd089f2f52f3d476589b74a97e462575cd54df44db4
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2024-03-14 19:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4TwcZn2YFlz2xjS@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox