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 71d9948c3b6de1c635aece7f8b01b031e2504c5f (commit) via 5972f8bcb30db12826f9b4bdcb10f308513c4030 (commit) via b14dab303387f47ef91719b20656a3eedd1ac13c (commit) via 9bd18e8a020a4aabf231f99c17bf9d446c7e9643 (commit) via fd02fb29d829fc35ea65fb2cab201bf25bcfedae (commit) via 6a47b385b7f27b3d6142e98c6458e24eafef7217 (commit) via 7ee745204240aac07dc265849e4345c77d6e69ed (commit) via 9f3c37ab0c751dc39844549d425e4dfb026d805a (commit) from 1ab0b00940d0249d07cf895ee4e19a348979505b (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 71d9948c3b6de1c635aece7f8b01b031e2504c5f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 14 16:57:44 2024 +0000
core188: Ship SQLite
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5972f8bcb30db12826f9b4bdcb10f308513c4030 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Aug 14 18:22:44 2024 +0200
sqlite: Update to version 3460100
- Update from version 3460000 to 3460100 - Update of rootfile not required - Changelog 3460100 Improved robustness while parsing the tokenize= arguments in FTS5. Forum post 171bcc2bcd. Enhancements to covering index prediction in the query planner. Add early detection of over-prediction of covering indexes so that sqlite3_prepare() will return an error rather than just generate bad bytecode. Forum post e60e4c295d22f8ce. Do not let the number of terms on a VALUES clause be limited by SQLITE_LIMIT_COMPOUND_SELECT, even if the VALUES clause contains elements that appear to be variables due to double-quoted string literals. Fix the window function version of group_concat() so that it returns an empty string if it has one or more empty string inputs. In FTS5 secure-delete mode, fix false-positive integrity-check reports about corrupt indexes. Syntax errors in ALTER TABLE should always return SQLITE_ERROR. In some cases, they were formerly returning SQLITE_INTERNAL. JavaScript/WASM: Fix a corruption-causing bug in the JavaScript "opfs" VFS. Work around a couple of browser-specific OPFS quirks. Other minor fixes.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b14dab303387f47ef91719b20656a3eedd1ac13c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 14 16:57:13 2024 +0000
core188: Ship intel-microcode
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9bd18e8a020a4aabf231f99c17bf9d446c7e9643 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Aug 14 18:22:43 2024 +0200
intel-microcode: Update to version 20240813
- Update from version 20240531 to 20240813 - Update of rootfile not required - Changelog 20240813 Security updates for INTEL-SA-01083 Security updates for INTEL-SA-01118 Security updates for INTEL-SA-01100 Security updates for INTEL-SA-01038 Security updates for INTEL-SA-01046 Update for functional issues. Refer to Intel® Core™ Ultra Processor for details. Update for functional issues. Refer to 3rd Generation Intel® Xeon® Processor Scalable Family Specification Update for details. Update for functional issues. Refer to 3rd Generation Intel® Xeon® Scalable Processors Specification Update for details. Update for functional issues. Refer to 2nd Generation Intel® Xeon® Processor Scalable Family Specification Update for details Update for functional issues. Refer to Intel® Xeon® D-2700 Processor Specification Update for details. Update for functional issues. Refer to Intel® Xeon® E-2300 Processor Specification Update for details. Update for functional issues. Refer to 13th Generation Intel® Core™ Processor Specification Update for details. Update for functional issues. Refer to 12th Generation Intel® Core™ Processor Family for details. Update for functional issues. Refer to 11th Gen Intel® Core™ Processor Specification Update for details. Update for functional issues. Refer to 10th Gen Intel® Core™ Processor Families Specification Update for details. Update for functional issues. Refer to 10th Generation Intel® Core™ Processor Specification Update for details. Update for functional issues. Refer to 8th and 9th Generation Intel® Core™ Processor Family Spec Update for details. Update for functional issues. Refer to 8th Generation Intel® Core™ Processor Families Specification Update for details. Update for functional issues. Refer to 7th and 8th Generation Intel® Core™ Processor Specification Update for details. Update for functional issues. Refer to Intel® Processors and Intel® Core™ i3 N-Series for details. Update for functional issues. Refer to Intel® Atom® x6000E Series, and Intel® Pentium® and Celeron® N and J Series Processors for Internet of Things (IoT) Applications for details. For Updated Platforms see the changelog https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases...
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fd02fb29d829fc35ea65fb2cab201bf25bcfedae Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 14 18:17:36 2024 +0200
CSS: Decrease the size of h6 headlines
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6a47b385b7f27b3d6142e98c6458e24eafef7217 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 14 18:10:09 2024 +0200
CSS: Make form input elements use the entire width again
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7ee745204240aac07dc265849e4345c77d6e69ed Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 14 18:06:38 2024 +0200
CSS: Add class to automatically style forms
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9f3c37ab0c751dc39844549d425e4dfb026d805a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 10 14:26:43 2024 +0200
ovpnmain.cgi: Unify the error message box
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/header.pl | 24 +++++++++- .../{oldcore/125 => core/188}/filelists/sqlite | 0 .../188}/filelists/x86_64/intel-microcode | 0 config/rootfiles/core/188/update.sh | 12 ++++- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 1 + doc/language_missings | 8 ++++ html/cgi-bin/ovpnmain.cgi | 31 +++++-------- html/html/themes/ipfire/include/css/style.css | 52 +++++++++++++++++++++- langs/en/cgi-bin/en.pl | 1 + lfs/intel-microcode | 4 +- lfs/sqlite | 4 +- 19 files changed, 119 insertions(+), 26 deletions(-) copy config/rootfiles/{oldcore/125 => core/188}/filelists/sqlite (100%) copy config/rootfiles/{oldcore/121 => core/188}/filelists/x86_64/intel-microcode (100%)
Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 1d1146978..4b7672efb 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -368,7 +368,9 @@ sub openbox {
my $title = shift;
- print "<section class="section is-box">\n"; + my @classes = ("section", "is-box", @_); + + print "<section class="@classes">\n";
# Show the title if ($title) { @@ -383,6 +385,26 @@ sub closebox { print "</section>"; }
+sub errorbox($) { + my @errors = grep { $_ ne "" } @_; + + # Do nothing if there are no errors + return unless (@errors); + + # Open a new box + &openbox('100%', 'left', $Lang::tr{'oops something went wrong'}, "is-error"); + + # Print all error messages + print "<ul>\n"; + foreach my $error (@errors) { + print "<li>$error</li>\n"; + } + print "</ul>\n"; + + # Close the box again + &closebox(); +} + sub graph($) { my $title = shift;
diff --git a/config/rootfiles/core/188/filelists/sqlite b/config/rootfiles/core/188/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/188/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/config/rootfiles/core/188/filelists/x86_64/intel-microcode b/config/rootfiles/core/188/filelists/x86_64/intel-microcode new file mode 120000 index 000000000..d5ac074e2 --- /dev/null +++ b/config/rootfiles/core/188/filelists/x86_64/intel-microcode @@ -0,0 +1 @@ +../../../../common/x86_64/intel-microcode \ No newline at end of file diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh index ff92380d0..704450f89 100644 --- a/config/rootfiles/core/188/update.sh +++ b/config/rootfiles/core/188/update.sh @@ -68,8 +68,18 @@ ldconfig # Start services /etc/init.d/apache restart
+# Build initial ramdisks (for intel-microcode) +dracut --regenerate-all --force +KVER="xxxKVERxxx" +case "$(uname -m)" in + aarch64) + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + # dont remove initramfs because grub need this to boot. + ;; +esac + # This update needs a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot
# Finish /etc/init.d/fireinfo start diff --git a/doc/language_issues.de b/doc/language_issues.de index 9227a02fc..a10102a03 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -964,6 +964,7 @@ WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hos WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon WARNING: untranslated string: no entries = No entries at the moment. +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: optional = Optional WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server WARNING: untranslated string: pakfire invalid tree = Invalid repository selected diff --git a/doc/language_issues.en b/doc/language_issues.en index 7cd36aff3..7ae1a19bb 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1407,6 +1407,7 @@ WARNING: untranslated string: online help en = Online help (in english) WARNING: untranslated string: only digits allowed in holdoff field = Only digits allowed in holdoff field WARNING: untranslated string: only digits allowed in max retries field = Only digits allowed in max retries field. WARNING: untranslated string: only digits allowed in the idle timeout = Only digits allowed in the idle timeout. +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: open connections = Open Connections WARNING: untranslated string: openssl produced an error = OpenSSL produced an error WARNING: untranslated string: openvpn cert expires soon = Expires Soon diff --git a/doc/language_issues.es b/doc/language_issues.es index 4b04f49a1..259c3a9c3 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1023,6 +1023,7 @@ WARNING: untranslated string: load average = Load Average WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks WARNING: untranslated string: no data = unknown string +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b9c7c429e..41e39f18b 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -971,6 +971,7 @@ WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: hostile networks total = Total Hostile Networks WARNING: untranslated string: ids provider eol = (EOL) WARNING: untranslated string: load average = Load Average +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server WARNING: untranslated string: pakfire ago = ago. WARNING: untranslated string: processors = Processors diff --git a/doc/language_issues.it b/doc/language_issues.it index 6a6acf00b..f900bced1 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1209,6 +1209,7 @@ WARNING: untranslated string: one hour = One Hour WARNING: untranslated string: one month = One Month WARNING: untranslated string: one week = One Week WARNING: untranslated string: one year = One Year +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: open connections = Open Connections WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 5d15b7f58..dadcbaea2 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1233,6 +1233,7 @@ WARNING: untranslated string: one hour = One Hour WARNING: untranslated string: one month = One Month WARNING: untranslated string: one week = One Week WARNING: untranslated string: one year = One Year +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: open connections = Open Connections WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired diff --git a/doc/language_issues.pl b/doc/language_issues.pl index b4fc5df68..2f8d0e501 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1387,6 +1387,7 @@ WARNING: untranslated string: one hour = One Hour WARNING: untranslated string: one month = One Month WARNING: untranslated string: one week = One Week WARNING: untranslated string: one year = One Year +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: open connections = Open Connections WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 9cb5e2a15..e57d2199c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1383,6 +1383,7 @@ WARNING: untranslated string: one hour = One Hour WARNING: untranslated string: one month = One Month WARNING: untranslated string: one week = One Week WARNING: untranslated string: one year = One Year +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: open connections = Open Connections WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 4f9792a1a..b5197e108 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1126,6 +1126,7 @@ WARNING: untranslated string: no data = unknown string WARNING: untranslated string: no entries = No entries at the moment. WARNING: untranslated string: not affected = Not Affected WARNING: untranslated string: not validating = Not validating +WARNING: untranslated string: oops something went wrong = Oops, something went wrong... WARNING: untranslated string: open connections = Open Connections WARNING: untranslated string: openvpn cert expires soon = Expires Soon WARNING: untranslated string: openvpn cert has expired = Expired diff --git a/doc/language_missings b/doc/language_missings index 4f166b440..ef5c58ff1 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -78,6 +78,7 @@ < no entries < notes < okay +< oops something went wrong < optional < ovpn roadwarrior server < quick control @@ -137,6 +138,7 @@ < load average < log drop hostile in < log drop hostile out +< oops something went wrong < openvpn cert expires soon < openvpn cert has expired < ovpn roadwarrior server @@ -168,6 +170,7 @@ < ids provider eol < ids unsupported provider < load average +< oops something went wrong < ovpn roadwarrior server < processors < reg_file_data_sampling @@ -531,6 +534,7 @@ < one month < one week < one year +< oops something went wrong < open connections < openvpn cert expires soon < openvpn cert has expired @@ -1084,6 +1088,7 @@ < one month < one week < one year +< oops something went wrong < open connections < openvpn cert expires soon < openvpn cert has expired @@ -1943,6 +1948,7 @@ < one month < one week < one year +< oops something went wrong < open connections < openvpn cert expires soon < openvpn cert has expired @@ -2953,6 +2959,7 @@ < one month < one week < one year +< oops something went wrong < open connections < openvpn cert expires soon < openvpn cert has expired @@ -3484,6 +3491,7 @@ < not affected < not validating < okay +< oops something went wrong < open connections < openvpn cert expires soon < openvpn cert has expired diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b89fe432d..72695f892 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -1931,12 +1931,10 @@ END &Header::showhttpheaders(); &Header::openpage($Lang::tr{'ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', ''); - if ($errormessage) { - &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); - print "<class name='base'>$errormessage"; - print " </class>"; - &Header::closebox(); - } + + # Show any errors + &Header::errorbox($errormessage); + &Header::openbox('100%', 'LEFT', "$Lang::tr{'generate root/host certificates'}:"); print <<END; <form method='post' enctype='multipart/form-data'> @@ -2699,13 +2697,12 @@ ADV_ERROR: &Header::showhttpheaders(); &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage); - if ($errormessage) { - &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); - print "<class name='base'>$errormessage\n"; - print " </class>\n"; - &Header::closebox(); - } - &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'}); + + # Show any errors + &Header::errorbox($errormessage); + + &Header::opensection(); + print <<END; <form method='post' enctype='multipart/form-data'> <table width='100%' border=0> @@ -5205,12 +5202,8 @@ END &Header::openpage($Lang::tr{'status ovpn'}, 1, ''); &Header::openbigbox('100%', 'LEFT', '', $errormessage);
- if ($errormessage) { - &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'}); - print "<class name='base'>$errormessage\n"; - print " </class>\n"; - &Header::closebox(); - } + # Show any errors and warnings + &Header::errorbox($errormessage);
if ($cryptoerror) { &Header::openbox('100%', 'LEFT', $Lang::tr{'crypto error'}); diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css index c935f2ff4..18dfe347a 100644 --- a/html/html/themes/ipfire/include/css/style.css +++ b/html/html/themes/ipfire/include/css/style.css @@ -96,10 +96,14 @@ body { color: #363636; }
-h1, h2, h3, h4, h5, h6 { +h1, h2, h3, h4, h5 { font-size: 20px; }
+h6 { + font-size: 1em; +} + br.clear { clear: both; } @@ -194,6 +198,15 @@ section.is-box { border: 1px solid var(--color-grey); }
+section.is-error { + color: var(--color-red); + border: 1px solid var(--color-red); +} + +section.is-error ul { + margin-bottom: 0 !important; +} + section .title { margin-bottom: 1rem; border-bottom: 1px solid var(--color-grey); @@ -311,6 +324,43 @@ table { border-spacing: 0; }
+/* + Form Tables +*/ +table.form { + width: 100%; + + margin-top: 1rem; + margin-bottom: 1rem; +} + +table.form:last-child { + margin-bottom: 0; +} + +table.form tr td:first-child { + width: 25%; +} + +table.form tr td input[type=text], +table.form tr td input[type=number], +table.form tr td select, +table.form tr td textarea { + width: 100%; +} + +table.form tr.header td { + font-weight: bold; + + margin-top: 1rem; +} + +table.form tr.action td { + padding-top: 1rem; + + text-align: right; +} + .tbl { width: 100%; } diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 26c11b2f6..89bef62f0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1953,6 +1953,7 @@ 'only digits allowed in max retries field' => 'Only digits allowed in max retries field.', 'only digits allowed in the idle timeout' => 'Only digits allowed in the idle timeout.', 'only red' => 'Only RED', +'oops something went wrong' => 'Oops, something went wrong...', 'open connections' => 'Open Connections', 'open to all' => 'Override external access to ALL', 'openssl produced an error' => 'OpenSSL produced an error', diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 44e57a5df..0773c8fc6 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,7 +24,7 @@
include Config
-VER = 20240531 +VER = 20240813
THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 6a2c5ee6b6f3543b28f3753b30812e360bad50776b4f81e32a832e2169f38c11f8d5108ce0a81ddcdf1ecf7557baf1fd62c053a365f39a33ded5fd5018580b1f +$(DL_FILE)_BLAKE2 = 39fefb8fba7c204a5e62ea2147aaf6152a01e2be02b18b9da73a2379633fa8536be2508b97ac0b6d7aad998d060cee733224250c9c4a8ca283e9f28fd011831e
install : $(TARGET)
diff --git a/lfs/sqlite b/lfs/sqlite index d001a5f49..6998ae087 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@
include Config
-VER = 3460000 +VER = 3460100
THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2f484823b84ab758e21960ac6b730cefa62c26f7ccf5344299a26e6f559d0e02cfd4cff5f5921effdee6e2e49d2ab36b1f91cffdd8599bc2189efab44bf4b197 +$(DL_FILE)_BLAKE2 = b84bc7f6cbe2f1a4894b725d68ebdc58eebc312581fd27e74a75086e834b2b2f4ff09b907e193d8eaf78d9829149de8d9ea587cf650849fe4d3fc84db64ddfad
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree