Development November 2023

development@lists.ipfire.org

11 participants
45 discussions

[PATCH] lua: Update to version 5.4.6
by Adolf Belka 24 Nov '23

24 Nov '23

- Update from version 5.4.4 to 5.4.6 - Update of rootfile - Updated version number in shared library patch - Changelog 5.4.6 read overflow in 'l_strcmp'. Reported by Xmilia Hermit on 09 Jun 2023. existed since 5.0 (at least). fixed in github. Call hook may be called twice when count hook yields. Reported by G.k Ray on 20 Jul 2023. existed since 5.4.0 (at least). fixed in github. Wrong line number for function calls. Reported by Thadeu de Paula on 20 Aug 2023. existed since 5.2. fixed in github. 5.4.5 Changing the signature of 'lua_resetthread' broke ABI. Reported by Andrew Gierth on 29 Apr 2023. fixed in 5.4.6. fixed in github Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/lua | 2 +- lfs/lua | 10 +++++----- ...ibrary-1.patch => lua-5.4.6-shared_library-1.patch} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename src/patches/{lua-5.4.3-shared_library-1.patch => lua-5.4.6-shared_library-1.patch} (100%) diff --git a/config/rootfiles/common/lua b/config/rootfiles/common/lua index ac844ac03..6b69167ef 100644 --- a/config/rootfiles/common/lua +++ b/config/rootfiles/common/lua @@ -7,7 +7,7 @@ usr/bin/luac #usr/include/lualib.h #usr/lib/liblua.so usr/lib/liblua.so.5.4 -usr/lib/liblua.so.5.4.4 +usr/lib/liblua.so.5.4.6 #usr/lib/lua #usr/lib/lua/5.4 #usr/lib/pkgconfig/lua.pc diff --git a/lfs/lua b/lfs/lua index b61936c49..96be2090a 100644 --- a/lfs/lua +++ b/lfs/lua @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 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 # @@ -24,7 +24,7 @@ include Config -VER = 5.4.4 +VER = 5.4.6 THISAPP = lua-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8747ef5c83bd4c54b73eeaad6991ab5fccc54ee000973afd9cf3367b8945f03c54e843ec88c48043003cd9d3b42281c593cb485b7165add2744cfea06d8b7668 +$(DL_FILE)_BLAKE2 = b5d8dbc4b3ec1708b715be438c1a1f48d4f5f226885992af147c1aa6a8823bed318f77ef7cc92b265dadd26cf6088f0f39784fbfd2f9887c35de8e9def2c0558 install : $(TARGET) @@ -70,7 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.3-shared_library-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.6-shared_library-1.patch # install lua pkgconfig file install -v -m 644 ${DIR_SRC}/config/lua/lua.pc \ /usr/lib/pkgconfig/lua.pc @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make INSTALL_TOP=/usr \ INSTALL_DATA="cp -d" \ INSTALL_MAN=/usr/share/man/man1 \ - TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.4" \ + TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.6" \ install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/lua-5.4.3-shared_library-1.patch b/src/patches/lua-5.4.6-shared_library-1.patch similarity index 100% rename from src/patches/lua-5.4.3-shared_library-1.patch rename to src/patches/lua-5.4.6-shared_library-1.patch -- 2.42.1

2 9

[PATCH] dhcp.cgi: Add column with resolved hostname by IP address
by Sebastien GISLAIN 24 Nov '23

24 Nov '23

In web interface, on page DHCP Server, in table Current fixed leases, add column with resolved hostname by IP address --- html/cgi-bin/dhcp.cgi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index f45703f0b..b87da6907 100755 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -21,6 +21,7 @@ use strict; use experimental 'smartmatch'; +use IO::Socket; # enable only the following on debugging purpose #use warnings; @@ -1007,8 +1008,9 @@ END print <<END <table width='100%' class='tbl'> <tr> - <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'>$Lang::tr{'mac address'}</a></th> - <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'>$Lang::tr{'ip address'}</a></th> + <th width='15%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'>$Lang::tr{'mac address'}</a></th> + <th width='10%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'>$Lang::tr{'ip address'}</a></th> + <th width='15%' align='center'>$Lang::tr{'hostname'}</th> <th width='15%' align='center'>$Lang::tr{'remark'}</th> <th width='15%' class='boldbase' align='center'>next-server</th> <th width='15%' class='boldbase' align='center'>filename</th> @@ -1106,9 +1108,14 @@ foreach my $line (@current2) { $TAG4 = "class='red'" if ($dhcpsettings{'KEY2'} ne $key); } + # resolved name (if exists) + my $iaddr = inet_aton($temp[1]); + my $rname = gethostbyaddr($iaddr, AF_INET); + if (!$rname || $rname eq "") { $rname = $Lang::tr{'ptr lookup failed'}; } print <<END <td align='center' $col>$TAG2$temp[0]$TAG3</td> <td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td> +<td align='center' $col>$rname </td> <td align='center' $col>$temp[6] </td> <td align='center' $col>$temp[3] </td> <td align='center' $col>$temp[4] </td> -- 2.39.2

2 1

[PATCH] connections.cgi: Fix Expires time Heading in Connections cgi page
by Adolf Belka 24 Nov '23

24 Nov '23

- The Expires time heading for the Connections WUI page has seconds listed. However the code is converting the seconds to hours:minutes:seconds. - This patch is changing the heading to H:M:S in English and the equivalent in the other languages. I have basewd this on the initial letter for Hours, Minutes & Seconds in each of the languages. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- doc/language_issues.en | 4 ++-- 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 | 15 ++++++++------- html/cgi-bin/connections.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 4 ++-- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- 19 files changed, 29 insertions(+), 28 deletions(-) diff --git a/doc/language_issues.en b/doc/language_issues.en index c9d1117ef..b4327cb78 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -752,7 +752,7 @@ WARNING: untranslated string: exclude logfiles = Exclude logfiles WARNING: untranslated string: expires = Expires WARNING: untranslated string: export = Export WARNING: untranslated string: external aliases configuration = External aliases configuration -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount WARNING: untranslated string: extrahd detected drives = detected drives @@ -1047,6 +1047,7 @@ WARNING: untranslated string: hosts config added = Hosts config added WARNING: untranslated string: hosts config changed = Hosts config changed WARNING: untranslated string: hour = Hour WARNING: untranslated string: hours = Hours +WARNING: untranslated string: hours:minutes:seconds = H:M:S WARNING: untranslated string: idle = Idle WARNING: untranslated string: idle timeout = Idle timeout (mins; 0 to disable): WARNING: untranslated string: idle timeout not set = Idle timeout not set. @@ -1624,7 +1625,6 @@ WARNING: untranslated string: search = Search WARNING: untranslated string: secondary dns = Secondary DNS: WARNING: untranslated string: secondary ntp server = Secondary NTP server WARNING: untranslated string: secondary wins server address = Secondary WINS server address -WARNING: untranslated string: seconds = Secs WARNING: untranslated string: secret = Secret WARNING: untranslated string: section = Section WARNING: untranslated string: secure shell server = Secure Shell Server diff --git a/doc/language_issues.es b/doc/language_issues.es index 8bb0b56fb..45ffdf5d7 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -952,7 +952,7 @@ WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Da WARNING: untranslated string: enable disable client = unknown string WARNING: untranslated string: enable disable dyndns = unknown string WARNING: untranslated string: error message = unknown string -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6805c1eb9..cacfb1ec6 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -911,7 +911,7 @@ WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Da WARNING: untranslated string: enable disable client = unknown string WARNING: untranslated string: enable disable dyndns = unknown string WARNING: untranslated string: error message = unknown string -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.it b/doc/language_issues.it index bb1d5db96..68ff12c86 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1004,7 +1004,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.nl b/doc/language_issues.nl index b85619977..d1a637215 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1009,7 +1009,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.pl b/doc/language_issues.pl index d88e3fb8e..893f73211 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -997,7 +997,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount WARNING: untranslated string: extrahd install or load driver = If your device isn't listed here, you need to install or load the driver. If you can see your device but no partitions you have to create them first. diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 22e06460c..64c9b5095 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -994,7 +994,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount WARNING: untranslated string: extrahd install or load driver = If your device isn't listed here, you need to install or load the driver. If you can see your device but no partitions you have to create them first. diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 0d9514083..eadbd33c7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -967,7 +967,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_missings b/doc/language_missings index 4d8f4a2a9..28ae29c2b 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -55,6 +55,7 @@ < download apple profile < enable < error the to date has to be later than the from date +< extrahd because it it outside the allowed mount path < g.dtm < g.lite < ids automatic rules update @@ -107,7 +108,7 @@ < dhcp fixed ip address in dynamic range < dns servers < downfall gather data sampling -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -130,7 +131,7 @@ < bewan adsl pci st < bewan adsl usb < downfall gather data sampling -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -326,7 +327,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -845,7 +846,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -1472,7 +1473,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -2462,7 +2463,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -3267,7 +3268,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 771728d88..a4cf7a7cf 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -352,7 +352,7 @@ if ($SORT_FIELD and $SORT_ORDER) { $Lang::tr{'destination port'}, $Lang::tr{'protocol'}, $Lang::tr{'connection'}.' '.$Lang::tr{'status'}, - $Lang::tr{'expires'}.' ('.$Lang::tr{'seconds'}.')', + $Lang::tr{'expires'}.' ('.$Lang::tr{'hours:minutes:seconds'}.')', $Lang::tr{'download'}, $Lang::tr{'upload'} ); @@ -435,7 +435,7 @@ print <<END; $Lang::tr{'connection'} $Lang::tr{'status'} </th> <th style='text-align:center'> - $Lang::tr{'expires'} ($Lang::tr{'seconds'}) + $Lang::tr{'expires'} ($Lang::tr{'hours:minutes:seconds'}) </th> </tr> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 140806130..49018f6a5 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1372,6 +1372,7 @@ 'hour-graph' => 'Stunde', 'hours' => 'Stunden', 'hours2' => 'Stunden', +'hours:minutes:seconds' => 'S:M:S', 'icmp selected but no type' => 'ICMP wurde zwar als Protokoll gewählt, es wurde aber kein ICMP-Typ angegeben.', 'icmp type' => 'ICMP-Typ', 'id' => 'ID', @@ -2219,7 +2220,6 @@ 'secondary dns' => 'Sekundärer DNS-Server:', 'secondary ntp server' => 'Sekundärer NTP-Server', 'secondary wins server address' => 'Sekundärer WINS-Server', -'seconds' => 'Sek.', 'secret' => 'Geheimnis', 'section' => 'Abschnitt', 'secure shell server' => 'Secure Shell Server', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 02cf1bf4b..16a3061b4 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1073,7 +1073,7 @@ 'external access rule removed' => ' External access rule removed; restarting access controller', 'external aliases configuration' => 'External aliases configuration', 'extrahd' => 'ExtraHD', -'extrahd because it is outside the allowed mount path' => ', because it is outside the allowed mount path', +'extrahd because it it outside the allowed mount path' => ', because it is outside the allowed mount path', 'extrahd because there is already a device mounted' => ', because there is already a device mounted', 'extrahd cant umount' => 'Can\'t umount', 'extrahd detected drives' => 'detected drives', @@ -1420,6 +1420,7 @@ 'hour-graph' => 'Hour', 'hours' => 'Hours', 'hours2' => 'Hours', +'hours:minutes:seconds' => 'H:M:S', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -2279,7 +2280,6 @@ 'secondary dns' => 'Secondary DNS:', 'secondary ntp server' => 'Secondary NTP server', 'secondary wins server address' => 'Secondary WINS server address', -'seconds' => 'Secs', 'secret' => 'Secret', 'section' => 'Section', 'secure shell server' => 'Secure Shell Server', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 2e85a5b27..04549ba83 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1419,6 +1419,7 @@ 'hour-graph' => 'Hora', 'hours' => 'horas', 'hours2' => 'Horas', +'hours:minutes:seconds' => 'H:M:S', 'icmp selected but no type' => 'ICMP seleccionado como protocolo, pero no se ha seleccionado tipo de ICMP.', 'icmp type' => 'Tipo de ICMP', 'id' => 'ID', @@ -2291,7 +2292,6 @@ 'secondary dns' => 'DNS Secundario:', 'secondary ntp server' => 'Servidor NTP Secundario', 'secondary wins server address' => 'Dirección de servidor WINS Secundario', -'seconds' => 'Segs', 'secret' => 'Secreto', 'section' => 'Sección', 'secure shell server' => 'Servidor Secure Shell', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0e746736e..87ec52e8b 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1417,6 +1417,7 @@ 'hour-graph' => 'Heure', 'hours' => 'heure(s)', 'hours2' => 'Heures', +'hours:minutes:seconds' => 'H:M:S', 'icmp selected but no type' => 'ICMP est le protocole sélectionné, mais il n\'y a aucun type ICMP spécifié.', 'icmp type' => 'Type ICMP', 'id' => 'ID', @@ -2282,7 +2283,6 @@ 'secondary dns' => 'DNS secondaire :', 'secondary ntp server' => 'Serveur NTP secondaire ', 'secondary wins server address' => 'Serveur WINS secondaire ', -'seconds' => 'Secondes', 'secret' => 'Secret', 'section' => 'Section ', 'secure shell server' => 'Serveur Shell Sécurisé', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 7526d67ad..6e3508803 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1204,6 +1204,7 @@ 'hour-graph' => 'Ora', 'hours' => 'Ore', 'hours2' => 'Ore', +'hours:minutes:seconds' => 'O:M:S', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1899,7 +1900,6 @@ 'secondary dns' => 'DNS Secondario:', 'secondary ntp server' => 'NTP server secondario', 'secondary wins server address' => 'WINS server secondario', -'seconds' => 'Secondi', 'section' => 'Sezione', 'secure shell server' => 'Secure Shell Server', 'security' => 'Sicurezza', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 898d42d28..a397680ce 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1201,6 +1201,7 @@ 'hour-graph' => 'Uur', 'hours' => 'uren', 'hours2' => 'Uren', +'hours:minutes:seconds' => 'U:M:S', 'icmp selected but no type' => 'ICMP als protocol geselecteerd, maar er is geen ICMP type gespecificeerd.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1877,7 +1878,6 @@ 'secondary dns' => 'Secondaire DNS:', 'secondary ntp server' => 'Secondaire NTP server', 'secondary wins server address' => 'Secondaire WINS serveradres', -'seconds' => 'Sec.', 'section' => 'Sectie', 'secure shell server' => 'Secure Shell Server', 'security' => 'Beveiliging', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 6ff2dab7b..86364a0a2 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -912,6 +912,7 @@ 'hour-graph' => 'Godzina', 'hours' => 'Godziny', 'hours2' => 'Godziny', +'hours:minutes:seconds' => 'G:M:S', 'icmp selected but no type' => 'Wybrano protokół ICMP, ale nie określono typu ICMP.', 'icmp type' => 'Typ ICMP', 'id' => 'ID', @@ -1533,7 +1534,6 @@ 'secondary dns' => 'Zapasowy DNS:', 'secondary ntp server' => 'Zapasowy serwer NTP', 'secondary wins server address' => 'Adres zapasowego serwera WINS', -'seconds' => 'Sek', 'section' => 'Sekcja', 'secure shell server' => 'Secure Shell Server', 'security' => 'Bezpieczeństwo', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 78a43c7d6..32f0f2425 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -906,6 +906,7 @@ 'hour' => 'Час', 'hours' => 'Часы', 'hours2' => 'Часы', +'hours:minutes:seconds' => 'Ч:М:С', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1528,7 +1529,6 @@ 'secondary dns' => 'Второй DNS:', 'secondary ntp server' => 'Второй NTP сервер', 'secondary wins server address' => 'Второй WINS сервер', -'seconds' => 'сек.', 'section' => 'Раздел', 'secure shell server' => 'Secure Shell Server', 'security' => 'Безопасность', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 45fc16144..d279309af 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1317,6 +1317,7 @@ 'hour-graph' => 'saat', 'hours' => 'saat', 'hours2' => 'saat', +'hours:minutes:seconds' => 'S:D:S', 'icmp selected but no type' => 'ICMP kuralı için seçildi ancak ICMP türü belirtildi.', 'icmp type' => 'ICMP Türü', 'id' => 'Kimlik Numarası (ID)', @@ -2052,7 +2053,6 @@ 'secondary dns' => 'İkincil DNS:', 'secondary ntp server' => 'İkincil NTP sunucusu', 'secondary wins server address' => 'İkincil WINS sunucu adresi', -'seconds' => 'Saniye', 'section' => 'Bölüm', 'secure shell server' => 'Güvenli Kabuk Sunucusu (SSH)', 'security' => 'Güvenlik', -- 2.42.1

2 1

[PATCH] dhcpcd: Update to version 10.0.4
by Adolf Belka 24 Nov '23

24 Nov '23

- Update from version 10.0.2 to 10.0.4 - Update of rootfile not required - Two patches removed as the fixes have been included in the source tarball - Changelog 10.0.4 privsep: allow __NR_mmap2 call by @olegartys in #253 privsep: allow __NR_clock_gettime32 syscall by @olegartys in #254 compat/arc4random.c: use memset instead of explicit_bzero by @ffontaine in #252 privsep: avoid SIGPIPE errors when scripts write to stderr/stdout after dhcpcd is daemonised 10.0.3 Do not crash on dhcpcd test run by @pemensik in #231 Add automated CI builds for Ubuntu, OpenBSD, FreeBSD and NetBSD by @tobhe in #229 dhcpcd: Fix off-by-one overflow when read() writes full BUFSIZ by @tobhe in #236 privsep: fix strlcpy overflow in psp_ifname by @tobhe in #239 ci: execute tests after successful build by @tobhe in #243 compat: update arc4random() to newer chacha20 based version from OpenBSD by @tobhe in #227 Support libcrypto for hmac and sha256 by @tobhe in #223 Use a local variable instead of the optind by @gotthardp in #86 Send correct amount of used buffer for prefix exclude option by @ctomahogh in #250 compat: use OpenSSL RAND_priv_bytes() for entropy by @tobhe in #248 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/dhcpcd | 6 ++-- ....2-fix-off-by-one-overflow-when-read.patch | 26 ----------------- ...p-fix-strlcpy-overflow-in-psp-ifname.patch | 28 ------------------- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch delete mode 100644 src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 2323b6104..da832046a 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@ include Config -VER = 10.0.2 +VER = 10.0.4 THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 999033b4c0bc46943332b0b7ed3f1869ad54e2c37346523a15fbd3d9f29db1e01c1ddd0a300826021d3e20493ea06358ef47ac6a02c50331ca0d90e31a123b85 +$(DL_FILE)_BLAKE2 = 770ee398eccff20cd4a37f89b841f8d580d9a42b456d93673ab3bf6ddf1ed0e49feda47ea8c1206a8a8582bccde80f45c3efbf2e1d0e493b06f04e2c6df876af install : $(TARGET) @@ -71,8 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.2-Allow-free-selection-of-MTU-by-the-user.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch cd $(DIR_APP) && ./configure \ --prefix="" \ --sysconfdir=/var/ipfire/dhcpc \ diff --git a/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch b/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch deleted file mode 100644 index 9e9cf3695..000000000 --- a/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f798bf23af8e5a0eae38931912e2b67e1d45aca4 Mon Sep 17 00:00:00 2001 -From: Tobias Heider <tobhe(a)users.noreply.github.com> -Date: Sat, 12 Aug 2023 21:59:21 +0200 -Subject: [PATCH] dhcpcd: Fix off-by-one overflow when read() writes full - BUFSIZ (#236) - ---- - src/dhcpcd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dhcpcd.c b/src/dhcpcd.c -index e06733d3..688a3a6d 100644 ---- a/src/dhcpcd.c -+++ b/src/dhcpcd.c -@@ -1822,7 +1822,7 @@ dhcpcd_stderr_cb(void *arg, unsigned short events) - if (!(events & ELE_READ)) - return; - -- len = read(ctx->stderr_fd, log, sizeof(log)); -+ len = read(ctx->stderr_fd, log, sizeof(log) - 1); - if (len == -1) { - if (errno != ECONNRESET) - logerr(__func__); --- -2.39.2 - diff --git a/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch b/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch deleted file mode 100644 index 07c87017e..000000000 --- a/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1bd8fc7d4b34f752a32709d277a897e5ad202d97 Mon Sep 17 00:00:00 2001 -From: Tobias Heider <tobhe(a)users.noreply.github.com> -Date: Tue, 15 Aug 2023 18:06:48 +0200 -Subject: [PATCH] privsep: fix strlcpy overflow in psp_ifname (#239) - -When running our Ubuntu tests with libc6 and strlcpy overflow checks -enabled we found that the wrong size is passed to strlcpy resulting -in a crash because of an overflow. ---- - src/privsep.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/privsep.c b/src/privsep.c -index b11c0351..cfe54742 100644 ---- a/src/privsep.c -+++ b/src/privsep.c -@@ -1200,7 +1200,7 @@ ps_newprocess(struct dhcpcd_ctx *ctx, struct ps_id *psid) - #endif - - if (!(ctx->options & DHCPCD_MANAGER)) -- strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_name)); -+ strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_ifname)); - TAILQ_INSERT_TAIL(&ctx->ps_processes, psp, next); - return psp; - } --- -2.39.2 - -- 2.42.1

3 17

[PATCH] intel-microcode: Update to version 20231114
by Adolf Belka 24 Nov '23

24 Nov '23

- Update from version 20230808 to 20231114 - Update of rootfile - Changelog details can be found in the releasenote.md file from the source tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/x86_64/intel-microcode | 3 --- lfs/intel-microcode | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode index 3241092f3..7f9632973 100644 --- a/config/rootfiles/common/x86_64/intel-microcode +++ b/config/rootfiles/common/x86_64/intel-microcode @@ -119,11 +119,8 @@ lib/firmware/intel-ucode/06-a6-01 lib/firmware/intel-ucode/06-a7-01 lib/firmware/intel-ucode/06-b7-01 lib/firmware/intel-ucode/06-ba-02 -lib/firmware/intel-ucode/06-ba-02_DUPLICATE lib/firmware/intel-ucode/06-ba-03 -lib/firmware/intel-ucode/06-ba-03_DUPLICATE lib/firmware/intel-ucode/06-be-00 -lib/firmware/intel-ucode/06-be-00_DUPLICATE lib/firmware/intel-ucode/06-bf-02 lib/firmware/intel-ucode/06-bf-05 lib/firmware/intel-ucode/0f-00-07 diff --git a/lfs/intel-microcode b/lfs/intel-microcode index 4bb322ac5..5e262dda3 100644 --- a/lfs/intel-microcode +++ b/lfs/intel-microcode @@ -24,7 +24,7 @@ include Config -VER = 20230808 +VER = 20231114 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 = 400ba9b91a7048c780377d49ff6cb00458c60a9d53c2e5cef1eb99170ca8f0cad66336841d14869bd42d182f7d8df27a2fa9cb982b0df0c5fc9f62325b6acb69 +$(DL_FILE)_BLAKE2 = e6084c92e9c3cc627af25a7f2f7fb26230b6ed117ddc197d19991df2816334132af92925f23af829bad005c32d0bd3afc362055ef223a599799d846216cf7612 install : $(TARGET) -- 2.42.1

2 1

Fwd: [intel/Intel-Linux-Processor-Microcode-Data-Files] Release microcode-20231114 - microcode-20231114 Release
by Michael Tremer 24 Nov '23

24 Nov '23

Who is up for this one? Potentially this could go into Core 182. > Begin forwarded message: > > From: MCU Administrator <notifications(a)github.com> > Subject: [intel/Intel-Linux-Processor-Microcode-Data-Files] Release microcode-20231114 - microcode-20231114 Release > Date: 14 November 2023 at 16:30:45 GMT > To: intel/Intel-Linux-Processor-Microcode-Data-Files <Intel-Linux-Processor-Microcode-Data-Files(a)noreply.github.com> > Cc: Subscribed <subscribed(a)noreply.github.com> > Reply-To: intel/Intel-Linux-Processor-Microcode-Data-Files <noreply(a)github.com> > > > microcode-20231114 Release <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/release…> > Repository: intel/Intel-Linux-Processor-Microcode-Data-Files <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files> · Tag: microcode-20231114 <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/tree/mi…> · Commit: ece0d29 <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/commit/…> · Released by: mcu-administrator <https://github.com/mcu-administrator> > Release Notes > > microcode-20231114 <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/release…> > Purpose > > Security updates for INTEL-SA-00950 <https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-0…> > Update for functional issues. Refer to 13th Generation Intel® Core™ Processor Specification Update <https://cdrdv2.intel.com/v1/dl/getContent/740518> for details. > > Update for functional issues. Refer to 12th Generation Intel® Core™ Processor Family <https://cdrdv2.intel.com/v1/dl/getContent/682436> for details. > > Update for functional issues. Refer to 11th Gen Intel® Core™ Processor Specification Update <https://cdrdv2.intel.com/v1/dl/getContent/631123> for details. > > Update for functional issues. Refer to 10th Gen Intel® Core™ Processor Families Specification Update <https://cdrdv2.intel.com/v1/dl/getContent/341079> for details. > > Update for functional issues. Refer to 4th Gen Intel® Xeon® Scalable Processors Specification Update <https://cdrdv2.intel.com/v1/dl/getContent/772415> for details. > > Update for functional issues. Refer to 3rd Generation Intel® Xeon® Scalable Processors Specification Update <https://cdrdv2.intel.com/v1/dl/getContent/634897> for details. > > Update for functional issues. Refer to Intel® Processors and Intel® Core™ i3 N-Series <https://cdrdv2.intel.com/v1/dl/getContent/764616> for details. > > Update for functional issues. Refer to Intel® Xeon® D-2700 Processor Specification Update <https://cdrdv2.intel.com/v1/dl/getContent/714071> for details. > > Update for functional issues. Refer to Intel® Xeon® E-2300 Processor Specification Update <https://cdrdv2.intel.com/v1/dl/getContent/709192>for details. > > New Platforms > > Processor Stepping F-M-S/PI Old Ver New Ver Products > Updated Platforms > > Processor Stepping F-M-S/PI Old Ver New Ver Products > ADL C0 06-97-02/07 0000002e 00000032 Core Gen12 > ADL H0 06-97-05/07 0000002e 00000032 Core Gen12 > ADL L0 06-9a-03/80 0000042c 00000430 Core Gen12 > ADL R0 06-9a-04/80 0000042c 00000430 Core Gen12 > ADL-N N0 06-be-00/11 00000011 00000012 Core i3-N305/N300, N50/N97/N100/N200, Atom x7211E/x7213E/x7425E > AZB A0 06-9a-04/40 00000004 00000005 Intel(R) Atom(R) C1100 > AZB R0 06-9a-04/40 00000004 00000005 Intel(R) Atom(R) C1100 > ICL-D B0 06-6c-01/10 01000230 01000268 Xeon D-17xx, D-27xx > ICX-SP Dx/M1 06-6a-06/87 0d0003a5 0d0003b9 Xeon Scalable Gen3 > ICL-U/Y D1 06-7e-05/80 000000bc 000000c2 Core Gen10 Mobile > RPL-H/P/PX 6+8 J0 06-ba-02/e0 00004119 0000411c Core Gen13 > RPL-S B0 06-b7-01/32 00000119 0000011d Core Gen13 > RKL-S B0 06-a7-01/02 00000059 0000005d Core Gen11 > RPL-S H0 06-bf-05/07 0000002e 00000032 Core Gen12 > RPL-S/HX C0 06-bf-02/07 0000002e 00000032 Core Gen12 > RPL-U 2+8 Q0 06-ba-03/e0 00004119 0000411c Core Gen13 > SPR-SP E5/S3 06-8f-08/87 2b0004b1 2b0004d0 Xeon Scalable Gen4 > SPR-SP E4/S2 06-8f-07/87 2b0004b1 2b0004d0 Xeon Scalable Gen4 > SPR-SP E3 06-8f-06/87 2b0004b1 2b0004d0 Xeon Scalable Gen4 > SPR-SP E2 06-8f-05/87 2b0004b1 2b0004d0 Xeon Scalable Gen4 > SPR-SP E0 06-8f-04/87 2b0004b1 2b0004d0 Xeon Scalable Gen4 > SPR-HBM Bx 06-8f-08/10 2c000271 2c000290 Xeon Max > TGL B0/B1 06-8c-01/80 000000ac 000000b4 Core Gen11 Mobile > TGL-H R0 06-8d-01/c2 00000046 0000004e Core Gen11 Mobile > TGL-R C0 06-8c-02/c2 0000002c 00000034 Core Gen11 Mobile > — > This release has 2 assets: > > Source code (zip) > Source code (tar.gz) > Visit the release page <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/release…> to download them. > > — > You are receiving this because you are watching this repository. > View it on GitHub <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/release…> or unsubscribe <https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/unsubsc…> from all notifications for this repository. >

2 2

[PATCH] grub: update to 2.12-rc1
by Arne Fitzenreiter 23 Nov '23

23 Nov '23

this is the first version that support booting linux kernel on riscv. The release of the final version was delayed again and again so i have bootstrapped the rc1 from the git and fixed the path in 25_bli. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- config/flash-images/grub/11_linux_scon | 139 ++++++++++++------ config/rootfiles/common/aarch64/grub | 64 +------- config/rootfiles/common/riscv64/grub | 64 +------- config/rootfiles/common/x86_64/grub | 70 ++------- lfs/grub | 8 +- .../grub-2.12-rc1-fix_bli_bin_sh_path.patch | 9 ++ .../grub-Handle-R_RISCV_CALL_PLT-reloc.patch | 48 ------ .../grub/grub-Use-zifencei-on-riscv.patch | 47 ------ 8 files changed, 136 insertions(+), 313 deletions(-) create mode 100644 src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch delete mode 100644 src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch delete mode 100644 src/patches/grub/grub-Use-zifencei-on-riscv.patch diff --git a/config/flash-images/grub/11_linux_scon b/config/flash-images/grub/11_linux_scon index 68f554386..e49c857a3 100755 --- a/config/flash-images/grub/11_linux_scon +++ b/config/flash-images/grub/11_linux_scon @@ -18,10 +18,10 @@ set -e # along with GRUB. If not, see <http://www.gnu.org/licenses/>. prefix="/usr" -exec_prefix="${prefix}" -datarootdir="${prefix}/share" +exec_prefix="/usr" +datarootdir="/usr/share" -. "${datarootdir}/grub/grub-mkconfig_lib" +. "$pkgdatadir/grub-mkconfig_lib" export TEXTDOMAIN=grub export TEXTDOMAINDIR="${datarootdir}/locale" @@ -32,7 +32,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else OS="${GRUB_DISTRIBUTOR} GNU/Linux" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi # loop-AES arranges things so that /dev/loop/X can be our root device, but @@ -43,21 +43,29 @@ case ${GRUB_DEVICE} in ;; esac -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ - || uses_abstraction "${GRUB_DEVICE}" lvm; then +: ${GRUB_CMDLINE_LINUX_RECOVERY:=single} + +# Default to disabling partition uuid support to maintian compatibility with +# older kernels. +: ${GRUB_DISABLE_LINUX_PARTUUID=true} + +# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter +# and mounting btrfs requires user space scanning, so force UUID in this case. +if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \ + || ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + && [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \ + || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + && ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \ + || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then LINUX_ROOT_DEVICE=${GRUB_DEVICE} +elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then + LINUX_ROOT_DEVICE=PARTUUID=${GRUB_DEVICE_PARTUUID} else LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} fi -GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" - -if [ x"$GRUBFS" = x ]; then - GRUBFS="$(stat -f --printf=%T / || true)" -fi - -case x"$GRUBFS" in +case x"$GRUB_FS" in xbtrfs) rootsubvol="`make_system_path_relative_to_its_root /`" rootsubvol="${rootsubvol#/}" @@ -67,7 +75,7 @@ case x"$GRUBFS" in xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" - LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}" ;; esac @@ -101,7 +109,7 @@ linux_entry () echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi if [ x$type != xrecovery ] ; then - save_default_entry | sed -e "s/^/\t/" + save_default_entry | grub_add_tab fi # Use ELILO's generic "efifb" when it's known to be available. @@ -123,26 +131,30 @@ linux_entry () if [ x$dirname = x/ ]; then if [ -z "${prepare_root_cache}" ]; then - prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")" + prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)" fi printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/" else if [ -z "${prepare_boot_cache}" ]; then - prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" + prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)" fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" fi message="$(gettext_printf "Loading Linux %s ..." ${version})" sed "s/^/$submenu_indentation/" << EOF - echo '$message' + echo '$(echo "$message" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} EOF if test -n "${initrd}" ; then # TRANSLATORS: ramdisk isn't identifier. Should be translated. message="$(gettext_printf "Loading initial ramdisk ...")" + initrd_path= + for i in ${initrd}; do + initrd_path="${initrd_path} ${rel_dirname}/${i}" + done sed "s/^/$submenu_indentation/" << EOF - echo '$message' - initrd ${rel_dirname}/${initrd} + echo '$(echo "$message" | grub_quote)' + initrd $(echo $initrd_path) EOF fi sed "s/^/$submenu_indentation/" << EOF @@ -153,13 +165,15 @@ EOF machine=`uname -m` case "x$machine" in xi?86 | xx86_64) - list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; + list= + for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi + done ;; *) - list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; + list= + for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi + done ;; esac case "$machine" in @@ -179,9 +193,19 @@ title_correction_code= # yet, so it's empty. In a submenu it will be equal to '\t' (one tab). submenu_indentation="" -is_first_entry=true -while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` +# Perform a reverse version sort on the entire list. +# Temporarily replace the '.old' suffix by ' 1' and append ' 2' for all +# other files to order the '.old' files after their non-old counterpart +# in reverse-sorted order. + +reverse_sorted_list=$(echo $list | tr ' ' '\n' | sed -e 's/\.old$/ 1/; / 1$/! s/$/ 2/' | version_sort -r | sed -e 's/ 1$/.old/; s/ 2$//') + +if [ "x$GRUB_TOP_LEVEL" != x ]; then + reverse_sorted_list=$(grub_move_to_front "$GRUB_TOP_LEVEL" ${reverse_sorted_list}) +fi + +is_top_level=true +for linux in ${reverse_sorted_list}; do gettext_printf "Found linux image: %s\n" "$linux" >&2 basename=`basename $linux` dirname=`dirname $linux` @@ -190,9 +214,19 @@ while [ "x$list" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - initrd= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ + initrd_early= + for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \ + ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do + if test -e "${dirname}/${i}" ; then + initrd_early="${initrd_early} ${i}" + fi + done + + initrd_real= + for i in "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${alt_version}.img.old" "initrd-${version}.gz" \ + "initrd-${alt_version}.gz.old" "initrd-${version}" \ + "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ "initramfs-genkernel-${version}" \ @@ -200,11 +234,22 @@ while [ "x$list" != "x" ] ; do "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do if test -e "${dirname}/${i}" ; then - initrd="$i" + initrd_real="${i}" break fi done + initrd= + if test -n "${initrd_early}" || test -n "${initrd_real}"; then + initrd="${initrd_early} ${initrd_real}" + + initrd_display= + for i in ${initrd}; do + initrd_display="${initrd_display} ${dirname}/${i}" + done + gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2 + fi + config= for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do if test -e "${i}" ; then @@ -218,26 +263,36 @@ while [ "x$list" != "x" ] ; do initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"` fi - if test -n "${initrd}" ; then - gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 - elif test -z "${initramfs}" ; then + if test -z "${initramfs}" && test -z "${initrd_real}" ; then # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's # no initrd or builtin initramfs, it can't work here. - linux_root_device_thisversion=${GRUB_DEVICE} + if [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ]; then + + linux_root_device_thisversion=${GRUB_DEVICE} + else + linux_root_device_thisversion=PARTUUID=${GRUB_DEVICE_PARTUUID} + fi fi - if [ "x$is_first_entry" = xtrue ]; then + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', + # 'yes' or 'true'. This was fixed but all of these values must be supported now. + if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then + GRUB_DISABLE_SUBMENU="true" + fi + + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then linux_entry "Serial Console: ${OS}" "${version}" serial \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} console=ttyS0,115200n8" - submenu_indentation="\t" + submenu_indentation="$grub_tab" if [ -z "$boot_device_id" ]; then boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" fi fi - - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` done echo "$title_correction_code" diff --git a/config/rootfiles/common/aarch64/grub b/config/rootfiles/common/aarch64/grub index af297b774..ddacba511 100644 --- a/config/rootfiles/common/aarch64/grub +++ b/config/rootfiles/common/aarch64/grub @@ -9,6 +9,7 @@ etc/grub.d/00_cloud etc/grub.d/00_header etc/grub.d/10_linux etc/grub.d/20_linux_xen +etc/grub.d/25_bli etc/grub.d/30_os-prober etc/grub.d/30_uefi-firmware etc/grub.d/40_custom @@ -53,6 +54,8 @@ usr/lib/grub/arm64-efi/bitmap.mod usr/lib/grub/arm64-efi/bitmap.module usr/lib/grub/arm64-efi/bitmap_scale.mod usr/lib/grub/arm64-efi/bitmap_scale.module +usr/lib/grub/arm64-efi/bli.mod +usr/lib/grub/arm64-efi/bli.module usr/lib/grub/arm64-efi/blocklist.mod usr/lib/grub/arm64-efi/blocklist.module usr/lib/grub/arm64-efi/boot.mod @@ -116,6 +119,8 @@ usr/lib/grub/arm64-efi/efifwsetup.mod usr/lib/grub/arm64-efi/efifwsetup.module usr/lib/grub/arm64-efi/efinet.mod usr/lib/grub/arm64-efi/efinet.module +usr/lib/grub/arm64-efi/efitextmode.mod +usr/lib/grub/arm64-efi/efitextmode.module usr/lib/grub/arm64-efi/elf.mod usr/lib/grub/arm64-efi/elf.module usr/lib/grub/arm64-efi/eval.mod @@ -189,6 +194,7 @@ usr/lib/grub/arm64-efi/gcry_twofish.module usr/lib/grub/arm64-efi/gcry_whirlpool.mod usr/lib/grub/arm64-efi/gcry_whirlpool.module usr/lib/grub/arm64-efi/gdb_grub +usr/lib/grub/arm64-efi/gdb_helper.py usr/lib/grub/arm64-efi/geli.mod usr/lib/grub/arm64-efi/geli.module usr/lib/grub/arm64-efi/gettext.mod @@ -201,7 +207,6 @@ usr/lib/grub/arm64-efi/gfxterm_background.mod usr/lib/grub/arm64-efi/gfxterm_background.module usr/lib/grub/arm64-efi/gfxterm_menu.mod usr/lib/grub/arm64-efi/gfxterm_menu.module -usr/lib/grub/arm64-efi/gmodule.pl usr/lib/grub/arm64-efi/gptsync.mod usr/lib/grub/arm64-efi/gptsync.module usr/lib/grub/arm64-efi/gzio.mod @@ -356,6 +361,8 @@ usr/lib/grub/arm64-efi/pbkdf2_test.mod usr/lib/grub/arm64-efi/pbkdf2_test.module usr/lib/grub/arm64-efi/pgp.mod usr/lib/grub/arm64-efi/pgp.module +usr/lib/grub/arm64-efi/plainmount.mod +usr/lib/grub/arm64-efi/plainmount.module usr/lib/grub/arm64-efi/png.mod usr/lib/grub/arm64-efi/png.module usr/lib/grub/arm64-efi/priority_queue.mod @@ -502,61 +509,6 @@ usr/share/grub/unicode.pf2 #usr/share/info/grub.info #usr/share/info/grub.info-1 #usr/share/info/grub.info-2 -#usr/share/locale/ast/LC_MESSAGES/grub.mo -#usr/share/locale/ca/LC_MESSAGES/grub.mo -#usr/share/locale/da/LC_MESSAGES/grub.mo -#usr/share/locale/de/LC_MESSAGES/grub.mo -#usr/share/locale/de@hebrew -#usr/share/locale/de@hebrew/LC_MESSAGES -#usr/share/locale/de(a)hebrew/LC_MESSAGES/grub.mo -#usr/share/locale/de_CH -#usr/share/locale/de_CH/LC_MESSAGES -#usr/share/locale/de_CH/LC_MESSAGES/grub.mo -#usr/share/locale/en@arabic -#usr/share/locale/en@arabic/LC_MESSAGES -#usr/share/locale/en(a)arabic/LC_MESSAGES/grub.mo -#usr/share/locale/en@cyrillic -#usr/share/locale/en@cyrillic/LC_MESSAGES -#usr/share/locale/en(a)cyrillic/LC_MESSAGES/grub.mo -#usr/share/locale/en@greek -#usr/share/locale/en@greek/LC_MESSAGES -#usr/share/locale/en(a)greek/LC_MESSAGES/grub.mo -#usr/share/locale/en@hebrew -#usr/share/locale/en@hebrew/LC_MESSAGES -#usr/share/locale/en(a)hebrew/LC_MESSAGES/grub.mo -#usr/share/locale/en@piglatin -#usr/share/locale/en@piglatin/LC_MESSAGES -#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo -#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo -#usr/share/locale/eo/LC_MESSAGES/grub.mo -#usr/share/locale/es/LC_MESSAGES/grub.mo -#usr/share/locale/fi/LC_MESSAGES/grub.mo -#usr/share/locale/fr/LC_MESSAGES/grub.mo -#usr/share/locale/gl/LC_MESSAGES/grub.mo -#usr/share/locale/hr/LC_MESSAGES/grub.mo -#usr/share/locale/hu/LC_MESSAGES/grub.mo -#usr/share/locale/id/LC_MESSAGES/grub.mo -#usr/share/locale/it/LC_MESSAGES/grub.mo -#usr/share/locale/ja/LC_MESSAGES/grub.mo -#usr/share/locale/ko/LC_MESSAGES/grub.mo -#usr/share/locale/lg/LC_MESSAGES/grub.mo -#usr/share/locale/lt/LC_MESSAGES/grub.mo -#usr/share/locale/nb/LC_MESSAGES/grub.mo -#usr/share/locale/nl/LC_MESSAGES/grub.mo -#usr/share/locale/pa/LC_MESSAGES/grub.mo -#usr/share/locale/pl/LC_MESSAGES/grub.mo -#usr/share/locale/pt/LC_MESSAGES/grub.mo -#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo -#usr/share/locale/ro/LC_MESSAGES/grub.mo -#usr/share/locale/ru/LC_MESSAGES/grub.mo -#usr/share/locale/sl/LC_MESSAGES/grub.mo -#usr/share/locale/sr/LC_MESSAGES/grub.mo -#usr/share/locale/sv/LC_MESSAGES/grub.mo -#usr/share/locale/tr/LC_MESSAGES/grub.mo -#usr/share/locale/uk/LC_MESSAGES/grub.mo -#usr/share/locale/vi/LC_MESSAGES/grub.mo -#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo -#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo #usr/share/man/man1/grub-editenv.1 #usr/share/man/man1/grub-file.1 #usr/share/man/man1/grub-fstest.1 diff --git a/config/rootfiles/common/riscv64/grub b/config/rootfiles/common/riscv64/grub index be2fed0a5..ca262f7d0 100644 --- a/config/rootfiles/common/riscv64/grub +++ b/config/rootfiles/common/riscv64/grub @@ -9,6 +9,7 @@ etc/grub.d/00_cloud etc/grub.d/00_header etc/grub.d/10_linux etc/grub.d/20_linux_xen +etc/grub.d/25_bli etc/grub.d/30_os-prober etc/grub.d/30_uefi-firmware etc/grub.d/40_custom @@ -53,6 +54,8 @@ usr/lib/grub/riscv64-efi/bitmap.mod usr/lib/grub/riscv64-efi/bitmap.module usr/lib/grub/riscv64-efi/bitmap_scale.mod usr/lib/grub/riscv64-efi/bitmap_scale.module +usr/lib/grub/riscv64-efi/bli.mod +usr/lib/grub/riscv64-efi/bli.module usr/lib/grub/riscv64-efi/blocklist.mod usr/lib/grub/riscv64-efi/blocklist.module usr/lib/grub/riscv64-efi/boot.mod @@ -116,6 +119,8 @@ usr/lib/grub/riscv64-efi/efifwsetup.mod usr/lib/grub/riscv64-efi/efifwsetup.module usr/lib/grub/riscv64-efi/efinet.mod usr/lib/grub/riscv64-efi/efinet.module +usr/lib/grub/riscv64-efi/efitextmode.mod +usr/lib/grub/riscv64-efi/efitextmode.module usr/lib/grub/riscv64-efi/elf.mod usr/lib/grub/riscv64-efi/elf.module usr/lib/grub/riscv64-efi/eval.mod @@ -189,6 +194,7 @@ usr/lib/grub/riscv64-efi/gcry_twofish.module usr/lib/grub/riscv64-efi/gcry_whirlpool.mod usr/lib/grub/riscv64-efi/gcry_whirlpool.module usr/lib/grub/riscv64-efi/gdb_grub +usr/lib/grub/riscv64-efi/gdb_helper.py usr/lib/grub/riscv64-efi/geli.mod usr/lib/grub/riscv64-efi/geli.module usr/lib/grub/riscv64-efi/gettext.mod @@ -201,7 +207,6 @@ usr/lib/grub/riscv64-efi/gfxterm_background.mod usr/lib/grub/riscv64-efi/gfxterm_background.module usr/lib/grub/riscv64-efi/gfxterm_menu.mod usr/lib/grub/riscv64-efi/gfxterm_menu.module -usr/lib/grub/riscv64-efi/gmodule.pl usr/lib/grub/riscv64-efi/gptsync.mod usr/lib/grub/riscv64-efi/gptsync.module usr/lib/grub/riscv64-efi/gzio.mod @@ -356,6 +361,8 @@ usr/lib/grub/riscv64-efi/pbkdf2_test.mod usr/lib/grub/riscv64-efi/pbkdf2_test.module usr/lib/grub/riscv64-efi/pgp.mod usr/lib/grub/riscv64-efi/pgp.module +usr/lib/grub/riscv64-efi/plainmount.mod +usr/lib/grub/riscv64-efi/plainmount.module usr/lib/grub/riscv64-efi/png.mod usr/lib/grub/riscv64-efi/png.module usr/lib/grub/riscv64-efi/priority_queue.mod @@ -500,61 +507,6 @@ usr/share/grub/unicode.pf2 #usr/share/info/grub.info #usr/share/info/grub.info-1 #usr/share/info/grub.info-2 -#usr/share/locale/ast/LC_MESSAGES/grub.mo -#usr/share/locale/ca/LC_MESSAGES/grub.mo -#usr/share/locale/da/LC_MESSAGES/grub.mo -#usr/share/locale/de/LC_MESSAGES/grub.mo -#usr/share/locale/de@hebrew -#usr/share/locale/de@hebrew/LC_MESSAGES -#usr/share/locale/de(a)hebrew/LC_MESSAGES/grub.mo -#usr/share/locale/de_CH -#usr/share/locale/de_CH/LC_MESSAGES -#usr/share/locale/de_CH/LC_MESSAGES/grub.mo -#usr/share/locale/en@arabic -#usr/share/locale/en@arabic/LC_MESSAGES -#usr/share/locale/en(a)arabic/LC_MESSAGES/grub.mo -#usr/share/locale/en@cyrillic -#usr/share/locale/en@cyrillic/LC_MESSAGES -#usr/share/locale/en(a)cyrillic/LC_MESSAGES/grub.mo -#usr/share/locale/en@greek -#usr/share/locale/en@greek/LC_MESSAGES -#usr/share/locale/en(a)greek/LC_MESSAGES/grub.mo -#usr/share/locale/en@hebrew -#usr/share/locale/en@hebrew/LC_MESSAGES -#usr/share/locale/en(a)hebrew/LC_MESSAGES/grub.mo -#usr/share/locale/en@piglatin -#usr/share/locale/en@piglatin/LC_MESSAGES -#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo -#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo -#usr/share/locale/eo/LC_MESSAGES/grub.mo -#usr/share/locale/es/LC_MESSAGES/grub.mo -#usr/share/locale/fi/LC_MESSAGES/grub.mo -#usr/share/locale/fr/LC_MESSAGES/grub.mo -#usr/share/locale/gl/LC_MESSAGES/grub.mo -#usr/share/locale/hr/LC_MESSAGES/grub.mo -#usr/share/locale/hu/LC_MESSAGES/grub.mo -#usr/share/locale/id/LC_MESSAGES/grub.mo -#usr/share/locale/it/LC_MESSAGES/grub.mo -#usr/share/locale/ja/LC_MESSAGES/grub.mo -#usr/share/locale/ko/LC_MESSAGES/grub.mo -#usr/share/locale/lg/LC_MESSAGES/grub.mo -#usr/share/locale/lt/LC_MESSAGES/grub.mo -#usr/share/locale/nb/LC_MESSAGES/grub.mo -#usr/share/locale/nl/LC_MESSAGES/grub.mo -#usr/share/locale/pa/LC_MESSAGES/grub.mo -#usr/share/locale/pl/LC_MESSAGES/grub.mo -#usr/share/locale/pt/LC_MESSAGES/grub.mo -#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo -#usr/share/locale/ro/LC_MESSAGES/grub.mo -#usr/share/locale/ru/LC_MESSAGES/grub.mo -#usr/share/locale/sl/LC_MESSAGES/grub.mo -#usr/share/locale/sr/LC_MESSAGES/grub.mo -#usr/share/locale/sv/LC_MESSAGES/grub.mo -#usr/share/locale/tr/LC_MESSAGES/grub.mo -#usr/share/locale/uk/LC_MESSAGES/grub.mo -#usr/share/locale/vi/LC_MESSAGES/grub.mo -#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo -#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo #usr/share/man/man1/grub-editenv.1 #usr/share/man/man1/grub-file.1 #usr/share/man/man1/grub-fstest.1 diff --git a/config/rootfiles/common/x86_64/grub b/config/rootfiles/common/x86_64/grub index 737fa8ccb..665c0e223 100644 --- a/config/rootfiles/common/x86_64/grub +++ b/config/rootfiles/common/x86_64/grub @@ -10,6 +10,7 @@ etc/grub.d/00_cloud etc/grub.d/00_header etc/grub.d/10_linux etc/grub.d/20_linux_xen +etc/grub.d/25_bli etc/grub.d/30_os-prober etc/grub.d/30_uefi-firmware etc/grub.d/40_custom @@ -230,6 +231,7 @@ usr/lib/grub/i386-pc/gcry_whirlpool.module usr/lib/grub/i386-pc/gdb.mod usr/lib/grub/i386-pc/gdb.module usr/lib/grub/i386-pc/gdb_grub +usr/lib/grub/i386-pc/gdb_helper.py usr/lib/grub/i386-pc/geli.mod usr/lib/grub/i386-pc/geli.module usr/lib/grub/i386-pc/gettext.mod @@ -242,7 +244,6 @@ usr/lib/grub/i386-pc/gfxterm_background.mod usr/lib/grub/i386-pc/gfxterm_background.module usr/lib/grub/i386-pc/gfxterm_menu.mod usr/lib/grub/i386-pc/gfxterm_menu.module -usr/lib/grub/i386-pc/gmodule.pl usr/lib/grub/i386-pc/gptsync.mod usr/lib/grub/i386-pc/gptsync.module usr/lib/grub/i386-pc/gzio.mod @@ -429,6 +430,8 @@ usr/lib/grub/i386-pc/pcidump.mod usr/lib/grub/i386-pc/pcidump.module usr/lib/grub/i386-pc/pgp.mod usr/lib/grub/i386-pc/pgp.module +usr/lib/grub/i386-pc/plainmount.mod +usr/lib/grub/i386-pc/plainmount.module usr/lib/grub/i386-pc/plan9.mod usr/lib/grub/i386-pc/plan9.module usr/lib/grub/i386-pc/play.mod @@ -640,6 +643,8 @@ usr/lib/grub/x86_64-efi/bitmap.mod usr/lib/grub/x86_64-efi/bitmap.module usr/lib/grub/x86_64-efi/bitmap_scale.mod usr/lib/grub/x86_64-efi/bitmap_scale.module +usr/lib/grub/x86_64-efi/bli.mod +usr/lib/grub/x86_64-efi/bli.module usr/lib/grub/x86_64-efi/blocklist.mod usr/lib/grub/x86_64-efi/blocklist.module usr/lib/grub/x86_64-efi/boot.mod @@ -719,6 +724,8 @@ usr/lib/grub/x86_64-efi/efifwsetup.mod usr/lib/grub/x86_64-efi/efifwsetup.module usr/lib/grub/x86_64-efi/efinet.mod usr/lib/grub/x86_64-efi/efinet.module +usr/lib/grub/x86_64-efi/efitextmode.mod +usr/lib/grub/x86_64-efi/efitextmode.module usr/lib/grub/x86_64-efi/ehci.mod usr/lib/grub/x86_64-efi/ehci.module usr/lib/grub/x86_64-efi/elf.mod @@ -794,6 +801,7 @@ usr/lib/grub/x86_64-efi/gcry_twofish.module usr/lib/grub/x86_64-efi/gcry_whirlpool.mod usr/lib/grub/x86_64-efi/gcry_whirlpool.module usr/lib/grub/x86_64-efi/gdb_grub +usr/lib/grub/x86_64-efi/gdb_helper.py usr/lib/grub/x86_64-efi/geli.mod usr/lib/grub/x86_64-efi/geli.module usr/lib/grub/x86_64-efi/gettext.mod @@ -806,7 +814,6 @@ usr/lib/grub/x86_64-efi/gfxterm_background.mod usr/lib/grub/x86_64-efi/gfxterm_background.module usr/lib/grub/x86_64-efi/gfxterm_menu.mod usr/lib/grub/x86_64-efi/gfxterm_menu.module -usr/lib/grub/x86_64-efi/gmodule.pl usr/lib/grub/x86_64-efi/gptsync.mod usr/lib/grub/x86_64-efi/gptsync.module usr/lib/grub/x86_64-efi/gzio.mod @@ -991,6 +998,8 @@ usr/lib/grub/x86_64-efi/pcidump.mod usr/lib/grub/x86_64-efi/pcidump.module usr/lib/grub/x86_64-efi/pgp.mod usr/lib/grub/x86_64-efi/pgp.module +usr/lib/grub/x86_64-efi/plainmount.mod +usr/lib/grub/x86_64-efi/plainmount.module usr/lib/grub/x86_64-efi/play.mod usr/lib/grub/x86_64-efi/play.module usr/lib/grub/x86_64-efi/png.mod @@ -1173,63 +1182,6 @@ usr/share/grub/unicode.pf2 #usr/share/info/grub.info #usr/share/info/grub.info-1 #usr/share/info/grub.info-2 -#usr/share/locale/ast/LC_MESSAGES/grub.mo -#usr/share/locale/ca/LC_MESSAGES/grub.mo -#usr/share/locale/da/LC_MESSAGES/grub.mo -#usr/share/locale/de/LC_MESSAGES/grub.mo -#usr/share/locale/de@hebrew -#usr/share/locale/de@hebrew/LC_MESSAGES -#usr/share/locale/de(a)hebrew/LC_MESSAGES/grub.mo -#usr/share/locale/de_CH -#usr/share/locale/de_CH/LC_MESSAGES -#usr/share/locale/de_CH/LC_MESSAGES/grub.mo -#usr/share/locale/en@arabic -#usr/share/locale/en@arabic/LC_MESSAGES -#usr/share/locale/en(a)arabic/LC_MESSAGES/grub.mo -#usr/share/locale/en@cyrillic -#usr/share/locale/en@cyrillic/LC_MESSAGES -#usr/share/locale/en(a)cyrillic/LC_MESSAGES/grub.mo -#usr/share/locale/en@greek -#usr/share/locale/en@greek/LC_MESSAGES -#usr/share/locale/en(a)greek/LC_MESSAGES/grub.mo -#usr/share/locale/en@hebrew -#usr/share/locale/en@hebrew/LC_MESSAGES -#usr/share/locale/en(a)hebrew/LC_MESSAGES/grub.mo -#usr/share/locale/en@piglatin -#usr/share/locale/en@piglatin/LC_MESSAGES -#usr/share/locale/en(a)piglatin/LC_MESSAGES/grub.mo -#usr/share/locale/en(a)quot/LC_MESSAGES/grub.mo -#usr/share/locale/eo/LC_MESSAGES/grub.mo -#usr/share/locale/es/LC_MESSAGES/grub.mo -#usr/share/locale/fi/LC_MESSAGES/grub.mo -#usr/share/locale/fr/LC_MESSAGES/grub.mo -#usr/share/locale/gl/LC_MESSAGES/grub.mo -#usr/share/locale/hr/LC_MESSAGES/grub.mo -#usr/share/locale/hu/LC_MESSAGES/grub.mo -#usr/share/locale/id/LC_MESSAGES/grub.mo -#usr/share/locale/it/LC_MESSAGES/grub.mo -#usr/share/locale/ja/LC_MESSAGES/grub.mo -#usr/share/locale/ko/LC_MESSAGES/grub.mo -#usr/share/locale/lg/LC_MESSAGES/grub.mo -#usr/share/locale/lt/LC_MESSAGES/grub.mo -#usr/share/locale/nb/LC_MESSAGES/grub.mo -#usr/share/locale/nl/LC_MESSAGES/grub.mo -#usr/share/locale/pa -#usr/share/locale/pa/LC_MESSAGES -#usr/share/locale/pa/LC_MESSAGES/grub.mo -#usr/share/locale/pl/LC_MESSAGES/grub.mo -#usr/share/locale/pt/LC_MESSAGES/grub.mo -#usr/share/locale/pt_BR/LC_MESSAGES/grub.mo -#usr/share/locale/ro/LC_MESSAGES/grub.mo -#usr/share/locale/ru/LC_MESSAGES/grub.mo -#usr/share/locale/sl/LC_MESSAGES/grub.mo -#usr/share/locale/sr/LC_MESSAGES/grub.mo -#usr/share/locale/sv/LC_MESSAGES/grub.mo -#usr/share/locale/tr/LC_MESSAGES/grub.mo -#usr/share/locale/uk/LC_MESSAGES/grub.mo -#usr/share/locale/vi/LC_MESSAGES/grub.mo -#usr/share/locale/zh_CN/LC_MESSAGES/grub.mo -#usr/share/locale/zh_TW/LC_MESSAGES/grub.mo #usr/share/man/man1/grub-editenv.1 #usr/share/man/man1/grub-file.1 #usr/share/man/man1/grub-fstest.1 diff --git a/lfs/grub b/lfs/grub index e4cd35d78..2db76c627 100644 --- a/lfs/grub +++ b/lfs/grub @@ -24,7 +24,7 @@ include Config -VER = 2.06 +VER = 2.12-rc1 THISAPP = grub-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -61,7 +61,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) unifont-7.0.03.pcf.gz = $(DL_FROM)/unifont-7.0.03.pcf.gz -$(DL_FILE)_BLAKE2 = 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 +$(DL_FILE)_BLAKE2 = 3ada3d51b8cbae260b8ddeb249d8529f273ca578e5361a24988e6e1bf5ef405e507831862dfcefd35ee1c26068cbdc38eda7a04fe1cec378e945e08c5b00d891 unifont-7.0.03.pcf.gz_BLAKE2 = fb96c1786fcc8c77796c90ce30a2b7d544013bd62cedbf7b027e1894fe75cdbd2044717796cb0e3150db1457fcb58076491d9c0b855621b652fb9a52c0793469 install : $(TARGET) @@ -92,11 +92,9 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) $(DIR_APP_EFI) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-Use-zifencei-on-riscv.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch cd $(DIR_APP) && autoreconf -vfi # Install unifont diff --git a/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch b/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch new file mode 100644 index 000000000..f933f5922 --- /dev/null +++ b/src/patches/grub/grub-2.12-rc1-fix_bli_bin_sh_path.patch @@ -0,0 +1,9 @@ +diff -Naur grub-2.12-rc1.org/util/grub.d/25_bli.in grub-2.12-rc1/util/grub.d/25_bli.in +--- grub-2.12-rc1.org/util/grub.d/25_bli.in 2023-07-10 17:43:48.000000000 +0200 ++++ grub-2.12-rc1/util/grub.d/25_bli.in 2023-11-17 07:07:30.743519612 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#!/bin/sh + set -e + + # grub-mkconfig helper script. diff --git a/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch b/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch deleted file mode 100644 index f3f12b6f0..000000000 --- a/src/patches/grub/grub-Handle-R_RISCV_CALL_PLT-reloc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 64be669638e198bc0c7c1a344547265dfacd2470 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem(a)gmail.com> -Date: Mon, 23 Jan 2023 15:29:02 -0800 -Subject: [PATCH] risc-v: Handle R_RISCV_CALL_PLT reloc - -GNU assembler starting 2.40 release always generates R_RISCV_CALL_PLT -reloc for call in assembler [1], similarly llvm does not make -distinction between R_RISCV_CALL_PLT and R_RISCV_CALL [2] - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/grub-devel/2023-02/msg00143.html] - -[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=70f35d72ef04cd237… -[2] https://reviews.llvm.org/D132530 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem(a)gmail.com> ---- - grub-core/kern/riscv/dl.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/grub-core/kern/riscv/dl.c -+++ b/grub-core/kern/riscv/dl.c -@@ -188,6 +188,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t - break; - - case R_RISCV_CALL: -+ case R_RISCV_CALL_PLT: - { - grub_uint32_t *abs_place = place; - grub_ssize_t off = sym_addr - (grub_addr_t) place; ---- a/util/grub-mkimagexx.c -+++ b/util/grub-mkimagexx.c -@@ -1294,6 +1294,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, st - } - break; - case R_RISCV_CALL: -+ case R_RISCV_CALL_PLT: - { - grub_uint32_t hi20, lo12; - -@@ -1725,6 +1726,7 @@ translate_relocation_pe (struct translat - case R_RISCV_BRANCH: - case R_RISCV_JAL: - case R_RISCV_CALL: -+ case R_RISCV_CALL_PLT: - case R_RISCV_PCREL_HI20: - case R_RISCV_PCREL_LO12_I: - case R_RISCV_PCREL_LO12_S: diff --git a/src/patches/grub/grub-Use-zifencei-on-riscv.patch b/src/patches/grub/grub-Use-zifencei-on-riscv.patch deleted file mode 100644 index c575a3116..000000000 --- a/src/patches/grub/grub-Use-zifencei-on-riscv.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f1217c803cec90813eb834dde7829f4961b2a2e4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem(a)gmail.com> -Date: Thu, 17 Feb 2022 15:07:02 -0800 -Subject: [PATCH] configure.ac: Use _zicsr_zifencei extentions on riscv - -From version 2.38, binutils defaults to ISA spec version 20191213. This -means that the csr read/write (csrr*/csrw*) instructions and fence.i -instruction has separated from the `I` extension, become two standalone -extensions: Zicsr and Zifencei. - -The fix is to specify those extensions explicitely in -march. Since we -are now using binutils 2.38+ in OE this is ok, a more upstreamable fix for -grub will be to detect these extentions, however thats not easy to -implement - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Khem Raj <raj.khem(a)gmail.com> ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c7fc55a..072f2c9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -849,14 +849,14 @@ if test x"$platform" != xemu ; then - [grub_cv_target_cc_soft_float="-mgeneral-regs-only"], []) - fi - if test "x$target_cpu" = xriscv32; then -- CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror" -+ CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32 -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], -- [grub_cv_target_cc_soft_float="-march=rv32imac -mabi=ilp32"], []) -+ [grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], []) - fi - if test "x$target_cpu" = xriscv64; then -- CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror" -+ CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64 -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], -- [grub_cv_target_cc_soft_float="-march=rv64imac -mabi=lp64"], []) -+ [grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], []) - fi - if test "x$target_cpu" = xia64; then - CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt -Werror" --- -2.35.1 - -- 2.39.2

2 1

[PATCH] sqlite: Update to version 3440100
by Adolf Belka 23 Nov '23

23 Nov '23

- Update from version 340000 to 340100 - Update of rootfile not required - Changelog 3.44.1 Change the CLI so that it uses UTF-16 for console I/O on Windows. This enables proper display of unicode text on old Windows7 machines. Other obscure bug fixes. - more details on these can be found from the list of commits https://www.sqlite.org/src/timeline?n=100&y=ci Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/sqlite | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/sqlite b/lfs/sqlite index 4d44d6fda..a03731a10 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@ include Config -VER = 3440000 +VER = 3440100 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 = adadcf5b17aec2d6727536d9c388b76ceacfb73d51c905ed906cc09a48806091624f9bb688de8b995e09b7cad97a21deb1ac91a17c4e60f658870d4ae85d5358 +$(DL_FILE)_BLAKE2 = 8b0aa4b2fd36099e68502705d0187cf30b8755f61577942e9b8709d3ca3e56dfd64cf256d0b70a75e987f2894076cb32c170dd52cd278579a646b06b90140e9d install : $(TARGET) -- 2.42.1

2 1

[PATCH] OpenSSH: Update to 9.5p1
by Peter Müller 22 Nov '23

22 Nov '23

Please refer to https://www.openssh.com/releasenotes.html#9.5p1 for the changelog of this version. The patch for fixing zlib version check has now been amended upstream and can therefore be deleted from IPFire 2.x's codebase. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/openssh | 5 ++-- ...ion_check_for_1.3_and_future_version.patch | 25 ------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch diff --git a/lfs/openssh b/lfs/openssh index d5d67dd0e..b81c2c3b1 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@ include Config -VER = 9.4p1 +VER = 9.5p1 THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 +$(DL_FILE)_BLAKE2 = 55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796 install : $(TARGET) @@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch cd $(DIR_APP) && autoconf cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure cd $(DIR_APP) && ./configure \ diff --git a/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch b/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch deleted file mode 100644 index ef3ff4dca..000000000 --- a/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001 -From: Darren Tucker <dtucker(a)dtucker.net> -Date: Sat, 19 Aug 2023 07:39:08 +1000 -Subject: [PATCH] Fix zlib version check for 1.3 and future version. - -bz#3604. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 07893e87065..e3128dfcbb4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1464,7 +1464,7 @@ else - [[ - int a=0, b=0, c=0, d=0, n, v; - n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d); -- if (n != 3 && n != 4) -+ if (n < 1) - exit(1); - v = a*1000000 + b*10000 + c*100 + d; - fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v); - - -- 2.35.3

2 1

[PATCH] Tor: Update to 0.4.8.9
by Peter Müller 22 Nov '23

22 Nov '23

Changes in version 0.4.8.9 - 2023-11-09 This is another security release fixing a high severity bug affecting onion services which is tracked by TROVE-2023-006. We are also releasing a guard major bugfix as well. If you are an onion service operator, we strongly recommend to update as soon as possible. o Major bugfixes (guard usage): - When Tor excluded a guard due to temporary circuit restrictions, it considered *additional* primary guards for potential usage by that circuit. This could result in more than the specified number of guards (currently 2) being used, long-term, by the tor client. This could happen when a Guard was also selected as an Exit node, but it was exacerbated by the Conflux guard restrictions. Both instances have been fixed. Fixes bug 40876; bugfix on 0.3.0.1-alpha. o Major bugfixes (onion service, TROVE-2023-006): - Fix a possible hard assert on a NULL pointer when recording a failed rendezvous circuit on the service side for the MetricsPort. Fixes bug 40883; bugfix on 0.4.8.1-alpha o Minor features (fallbackdir): - Regenerate fallback directories generated on November 09, 2023. o Minor features (geoip data): - Update the geoip files to match the IPFire Location Database, as retrieved on 2023/11/09. Changes in version 0.4.8.8 - 2023-11-03 We are releasing today a fix for a high security issue, TROVE-2023-004, that is affecting relays. Also a few minor bugfixes detailed below. Please upgrade as soon as posssible. o Major bugfixes (TROVE-2023-004, relay): - Mitigate an issue when Tor compiled with OpenSSL can crash during handshake with a remote relay. Fixes bug 40874; bugfix on 0.2.7.2-alpha. o Minor features (fallbackdir): - Regenerate fallback directories generated on November 03, 2023. o Minor features (geoip data): - Update the geoip files to match the IPFire Location Database, as retrieved on 2023/11/03. o Minor bugfixes (directory authority): - Look at the network parameter "maxunmeasuredbw" with the correct spelling. Fixes bug 40869; bugfix on 0.4.6.1-alpha. o Minor bugfixes (vanguards addon support): - Count the conflux linked cell as valid when it is successfully processed. This will quiet a spurious warn in the vanguards addon. Fixes bug 40878; bugfix on 0.4.8.1-alpha. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- lfs/tor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/tor b/lfs/tor index 7a9ca4128..cf0ccaf9e 100644 --- a/lfs/tor +++ b/lfs/tor @@ -26,7 +26,7 @@ include Config SUMMARY = Anonymizing overlay network for TCP (The onion router) -VER = 0.4.8.7 +VER = 0.4.8.9 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 81 +PAK_VER = 82 DEPS = libseccomp @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 4d0cde752a729c64e380663e4438398fe768a8657e9aa3246bdf0ec9a4b4e01e277cb594ae0cb44cc66ea8c6080f2e58c6daf1bf01dc51b678d228e8e38fc971 +$(DL_FILE)_BLAKE2 = a2d8cc8e60f162930d64d191af1893cb4060a8d98c16560c9ba30e0a9a0fd9cce2132573ca4db7b8b6e002f127f06b53fc5aea5fb6e8795c10f73671d14d9190 install : $(TARGET) -- 2.35.3

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development November 2023