IPFire-SCM March 2023

ipfire-scm@lists.ipfire.org

1 participants
33 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3fca7d6c76772dfdce6385653cbbe14a4f0b5ace
by Peter Müller 04 Mar '23

04 Mar '23

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 3fca7d6c76772dfdce6385653cbbe14a4f0b5ace (commit) via 14b2f93fbfe4f78c56c01b73c0d76c3e74718a4b (commit) via 7902b83cca725eb8252ed9225a7baf27e1c49687 (commit) via cabd9441e854a36632640e2a3bb0b6181f97370d (commit) via 9a86a1b89e7b22469126c953b99c788a31504933 (commit) via c151ca241bfea1ea84b92269cd824971aabea732 (commit) via 670981e64870b43981617560ce96b41db3a462fb (commit) via d8827c30ee1a28c41f0b7d9d4b066f31307352be (commit) via 0407daeeb628ef4d415fb94e370c494fba627608 (commit) via 8818834d0f38b6a2b45e833888b0cf7da489fc9c (commit) via 284ebca0577fe41ee914e70c72865794be705c01 (commit) via 3ceda453ca320b31f281062e114b67ac14ac7abc (commit) via 66a5ad1e88836fcfead7745eedbd8e0f753a22ee (commit) via 1b6047b3eed9446347f94d43e7e3f9e84826c717 (commit) via 2a9688211ea8930d0a3b9f7ac5ef7a18dbabe296 (commit) via e2bdd79782eb26fc0e0b8d7ec7039afc3e94b223 (commit) via f4b849cb3fb839d8eec6fb8a682f85cabd2f7d71 (commit) via 4b8fef1371ea21ff3768486b27cb1243158dcdf3 (commit) via 5a58f29fe95de72282bc99ae7d36c8dc26c1194e (commit) via 7d4ff74e352cc21acc6d348431b262d0673d5b0c (commit) via fa56777218a44df865502adc3f926ced618fe37e (commit) via b5185d54fdbcb357843b81bec391f5981b62b9a3 (commit) via b52a84ddc77f9db7e4ad7b129f21fbf528c6f990 (commit) via de4dea96aa9a45785e7bb64aadf14f97cfc1a359 (commit) via fb7fed2a6dae7465475497ae8d212b8f07a3d38e (commit) via ab04951428b4a3d4818072f23e806300f73de3ed (commit) from 313403043c5f0f5f053f8fe179b1ec7089cb31a1 (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 3fca7d6c76772dfdce6385653cbbe14a4f0b5ace Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 6 17:20:43 2023 +0100 epson-inkjet-printer-escpr: Update to version 1.7.23 - Update from version 1.6.12 to 1.7.23 - Update of rootfile - Changelog Most changes are related to additional printers except for 1.7.10 * Fixed the problem that epson-escpr-wrapper filter would crash when cupsRasterReadHeader failed. 1.7.7.2 * Supported new model. * Fixed an issue of filter crash when FIFO I/O was closed. 1.7.0 * Supported new models. * Applied Privacy Statement. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 14b2f93fbfe4f78c56c01b73c0d76c3e74718a4b Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 6 17:20:44 2023 +0100 fetchmail: Update to version 6.4.36 - Update from version 6.4.34 to 6.4.36 - Update of rootfile nor required - Changelog fetchmail-6.4.36 (released 2023-01-28, 31710 LoC): (in alphabetical order of language codes): * cs: Petr Pisar [Czech] * es: Cristian Othón Martínez Vera [Spanish] * fr: Frédéric Marchal [French] * ja: Takeshi Hamasaki [Japanese] * pl: Jakub Bogusz [Polish] * ro: Remus-Gabriel Chelu [Romanian] * sq: Besnik Bleta [Albanian] * sv: Göran Uddeborg [Swedish] fetchmail-6.4.35 (released 2023-01-04, 31707 LoC): * Fetchmail now warns about OpenSSL before 1.1.1s or 3.0.7, and rejects wolfSSL older than 5.5.1. (in reverse alphabetical order of language codes so as not to prefer people): * sv: Göran Uddeborg [Swedish] * eo: Keith Bowes [Esperanto] Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 7902b83cca725eb8252ed9225a7baf27e1c49687 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 14:07:29 2023 +0000 Core Update 174: Ship tzdata Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit cabd9441e854a36632640e2a3bb0b6181f97370d Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 6 17:20:46 2023 +0100 tzdata: Update to version 2022g - Update from version 2022e to 2022g - Update of rootfile - Changelog is too large to include here. See the NEWS file in the source tarball. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 9a86a1b89e7b22469126c953b99c788a31504933 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 14:06:14 2023 +0000 Core Update 174: Ship mail.cgi Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit c151ca241bfea1ea84b92269cd824971aabea732 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 20 17:30:02 2023 +0100 wio-lib.pl: Fixes bug#13040 - Change multipart/mixed to multipart/alternative - Thunderbird and Roundcube mail clients presume that any mail with Content Type of multipart/mixed has an attachment included rather than actually checking for disposition attachment. This means that any mail with multipart/mixed gets the attachment icon marked up even though there is no attachment. - Although this is a problem of the clients involved, in this case the simplest solution is to change multipart/mixed to multipart/alternative as WIO Mail only sends text without any attachment or other part to indicate that a client is active or inactive. - Confirmed on my vm testbed Fixes: Bug#13040 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 670981e64870b43981617560ce96b41db3a462fb Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Mon Feb 20 17:30:01 2023 +0100 mail.cgi: Fixes bug#13040 - Change multipart/mixed to multipart/alternative - Thunderbird and Roundcube mail clients presume that any mail with Content Type of multipart/mixed has an attachment included rather than actually checking for disposition attachment. This means that any mail with multipart/mixed gets the attachment icon marked up even though there is no attachment. - Although this is a problem of the clients involved, in this case the simplest solution is to change multipart/mixed to multipart/alternative as the Mail Service test mail only sends text without any attachment or other part. - Confirmed on my vm testbed Fixes: Bug#13040 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit d8827c30ee1a28c41f0b7d9d4b066f31307352be Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 14:05:00 2023 +0000 wio: Bump package version Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 0407daeeb628ef4d415fb94e370c494fba627608 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 21 13:50:11 2023 +0100 wio.cgi: Fixes bug#13039 - Input boxes extend outside of WUI boundary with some browsers - Original poster found this effect with using Vivaldi at 100% zoom. - I tested it with Vivaldi and Firefox on Arch Linux and was not able to show the effect but running SeaMonkey and changing the zoom from 100% to lower or higher caused the input boxes to go outside of the WUI boundary as described by the bug reporter. - It looks like the effect is dependent on the browser, the zoom setting and the OS Distribution. - In all cases the similar three input boxes in a row in the dhcp.cgi code for entering a fixed lease stayed fixed in ratrio to the WUI page whatever zoom or browser was used. - This patch changes the wio code for those three input boxes to use the approach from the dhcp.cgi code. - Tested on my vm testbed and change confirmed to fix the size of the input boxes irrespective of the browser or zoom setting. Fixes: Bug#13039 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> commit 8818834d0f38b6a2b45e833888b0cf7da489fc9c Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 14:04:05 2023 +0000 Core Update 174: Ship log.dat Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 284ebca0577fe41ee914e70c72865794be705c01 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Tue Feb 21 14:55:17 2023 +0100 log.dat: Fixes bug#12950 - adding apcupsd to system logs list - Patch tested out on my production system that has apcupsd running on it. APCUPS was in the list of options in the system logs and entries from apcupsd were extracted correctly in the wui. Fixes: Bug#12950 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3ceda453ca320b31f281062e114b67ac14ac7abc Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 14:03:06 2023 +0000 Core Update 174: Ship efivar Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 66a5ad1e88836fcfead7745eedbd8e0f753a22ee Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 28 19:45:15 2023 +0100 efivar: fix build for correct cpu the makefile add --march=native which optimize the code to the cpu of the buildhost which can result in unsupported instructions on other machines. commit 1b6047b3eed9446347f94d43e7e3f9e84826c717 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 28 19:55:17 2023 +0100 riscv64: enable EFI support and tools for riscv64 grub is still buggy! grub-install fails with an error: Relocation 0x13 is not implented! Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2a9688211ea8930d0a3b9f7ac5ef7a18dbabe296 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 28 19:55:16 2023 +0100 checkrootfiles: add riscv64 checks commit e2bdd79782eb26fc0e0b8d7ec7039afc3e94b223 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 5 19:06:27 2023 +0100 initscripts: Remove rngd from the core package initscripts - rngd removed from initscripts lfs and rootfiles due to change of rng-tools to addon Fixes: Bug#12900 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit f4b849cb3fb839d8eec6fb8a682f85cabd2f7d71 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Sun Feb 5 19:06:26 2023 +0100 rng-tools: Move from core package to addon - fixes bug 12900 - This patch is to move the rng-tools package from a core package to an addon. With the kernel changes from 5.6 rngd is no longer needed to create the required kernel entropy. - The results from HRNG's via rngd are used with an XOR after the entropy is collected by the kernel. So the HWRNG output is used to dilute the kernel random number data, which is already merged from several sources. - Based on the above and @Paul's request in the bug report to have rng-tools kept as an addon this patch set is submitted for consideration to keep rng-tools but as an addon. - move rng-tools rootfile from common to packages - Modify rng-tools lfs from core package to addon package - Create rng-tools pak to install and uninstall - creating rc.d links for start & stop. - Move rngd initscript from system to packages directory. - Installed into my vm testbed and confirmed that it works. No rngd daemon installed from iso install. After addon install rngd is present and running. Added various files to be able to test the services wui page. rngd shows up and can be turned off and on Fixes: Bug#12900 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit 4b8fef1371ea21ff3768486b27cb1243158dcdf3 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Mon Jan 30 20:47:49 2023 +0100 rust: Update to 1.67.0 For details see: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1670-2023… Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> commit 5a58f29fe95de72282bc99ae7d36c8dc26c1194e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 13:54:15 2023 +0000 Core Update 174: Ship lsof Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit 7d4ff74e352cc21acc6d348431b262d0673d5b0c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Feb 5 12:27:06 2023 +0100 lsof: Update to 4.98.0 For details see: https://github.com/lsof-org/lsof/blob/master/00DIST#L5471 "4.98.0 January 22, 2023 Fix two potential null pointer access bug when gethostbyname2() returns an empty address list Add support for older automake versions (on e.g. CentOS 7) Migrate testing scripts and programs to autotools Extend CI to build on more Linux distros [linux] Fix handling of empty command name, closing #246. Add test from #246, where lsof returns stale command name when the command name is empty. If getting command name failed, return NULL instead of empty string Add --with/without-libtirpc option to autotools-based build system and automatically detect libtirpc by default Add -H switch to print human readable size, e.g. 123.4K (#260) [linux] Fix implicit declaration error when HASPTYEPT is undefined Add support for musl libc-based Linux distros Add --enable-security argument to configure to allow only the root user to list all open files Add --enable-no-sock-security argument to configure to allow anyone to list anyone else's socket files when combined with --enable-security [linux] Always enable 64 bit off_t in configure.ac [netbsd] Import patches from pkgsrc and port autotools-based build system to NetBSD [netbsd] Fix lock status reading" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit fa56777218a44df865502adc3f926ced618fe37e Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Feb 5 08:21:07 2023 +0100 htop: Update to 3.2.2 For details see: https://github.com/htop-dev/htop/blob/main/ChangeLog "What's new in version 3.2.2 * CPUMeter now can show frequency in text mode * Add option to render distribution path prefixes shadowed * DiskIOMeter converts to bytes per second (not per interval) * DiskIOMeter uses complete units, including missing "iB/s" * DiskIOMeter indicates read and write in meter mode * NetworkIOMeter converts to packets per second, shows packet rate * Allow continued process following when changing display settings * Update the panel header when changing to another tab * Drop margin around the header if there are no meters * Use Unicode replacement character for non-printable characters * Default color preset uses bold blue for better visibility * Update the Panel header on sort order inversions ('I') * Toggle the header meters with pound key * Fix ScreenPanel to handle quitting the panel while renaming * Add fallback for HOME environment variable using passwd database * Replace meaningless ID column with FD column in lock screen * Use device format in the lock screen matching the files screen * On Linux, improvements to file-descriptor lock detection * On Linux, further distinguish systemd states in the SystemdMeter * On Linux, improvements to cgroup and container identification * On Linux, support openat(2) without readlinkat(2) platforms * On Darwin, fix current process buffer handling for busy systems * On DragonFly BSD, fix incorrect processor time of processes * On FreeBSD, fix an issue with the memory graph not showing correctly * On FreeBSD, add support for displaying shared memory usage * On PCP, use pmLookupDescs(3) if available for efficiency * On PCP, normalize generic columns values for consistent display * On PCP, changes preparing for configurable, dynamic screens * Handle invalid process columns from the configuration file * Avoid undefined behaviour with deeply nested processes * Fix crash when removing the currently active screen * Prevent possible crash on a very early error path * Include automake for Debian/Ubuntu * Restore non-mouse support * Reject unsupported command line arguments * Document idle process state * Clarify M_TRS/M_DRS columns" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Adolf Belka <adolf.belka(a)ipfire.org> commit b5185d54fdbcb357843b81bec391f5981b62b9a3 Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 13:43:19 2023 +0000 Core Update 174: Ship all changes related to bug #10629 Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit b52a84ddc77f9db7e4ad7b129f21fbf528c6f990 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Mar 2 15:11:23 2023 +0100 dhcp.cgi: Fix bug#10629 - Highlight fixed IP's in dynamic range in red - This v2 patch has moved the extraHead variable into header.pl - This patch marks all IP's that are in the Fixed list but are also in the dynamic range that has been defined, in red. - Additional function created to check if an ip address is in a defined range. - Added an additional key item under the Fixed Leases table for Fixed IP in dynamic range - Added line to English Language file for this key item. - ./make lang run before commit. - Tested in vm testbed and confirmed that any ip address in the Fixed Leases table that is in the defined dynamic range is highlighted in red - This uses the css background-color appoach from the first patch in this set. - This patch only highlights those IP's that overlap in red but does nothing more. So a user can still create new ones if they want but they will all show up in red. - This patch flags up if people are doing things that they shouldn't be doing but allows them to continue doing so without changing anything if they don't want to and so will not break existing setups. Fixes: Bug#10629 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit de4dea96aa9a45785e7bb64aadf14f97cfc1a359 Author: Adolf Belka <adolf.belka(a)ipfire.org> Date: Thu Mar 2 15:11:22 2023 +0100 dhcp.cgi: Fix for bug#10629 - update bgcolor to css - This v2 version moves the extraHead variable to header.pl as many of the css values will be used in many other WUI cgi pages so makes sense to not define anew in every location using the bgcolor or other colour variables. - I will submit patches to follow the same approach in all other WUI cgi pages once this has been submitted into next - bgcolor was deprecated in HTML 4.01 and is not supported by HTML 5 - The orange colour for IP's that are outside the IPFire green and blue subnets does not work on any browser I am using. - I used the CSS approach that @Leo used in the Zone Configuration cgi page - This patch changes all existing bgcolor entries to the css based background-color - Tested on my vm testbed and confirmed to work. The Orange colour for IP's outside of the subnet now shows up. Fixes: Bug#10629 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> Reviewed-by: Bernhard Bitsch <bbitsch(a)ipfire.org> Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org> commit fb7fed2a6dae7465475497ae8d212b8f07a3d38e Author: Peter Müller <peter.mueller(a)ipfire.org> Date: Sat Mar 4 13:40:45 2023 +0000 Core Update 174: Ship and restart Squid Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> commit ab04951428b4a3d4818072f23e806300f73de3ed Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Mar 4 13:37:23 2023 +0100 squid: Update to 5.8 For details see: https://github.com/squid-cache/squid/commits/v5 Please note: Updating 'squid' to 5.8 required some lfs adjustments, as the translations are no longer included in the source code. I had to integrate the 'squid-langpack' file. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 20 + config/cfgroot/network-functions.pl | 24 + config/rootfiles/common/aarch64/initscripts | 2 - config/rootfiles/common/riscv64/dmidecode | 13 - config/rootfiles/common/riscv64/grub | 1597 ++++++-------------- config/rootfiles/common/riscv64/hyperscan | 18 - config/rootfiles/common/riscv64/initscripts | 2 - config/rootfiles/common/riscv64/intel-microcode | 139 -- config/rootfiles/common/riscv64/ipfire-netboot | 3 - config/rootfiles/common/riscv64/lm_sensors | 2 - config/rootfiles/common/riscv64/syslinux | 351 ----- config/rootfiles/common/tzdata | 3 + config/rootfiles/common/x86_64/initscripts | 2 - config/rootfiles/common/x86_64/rust | 65 +- .../124 => core/174}/filelists/aarch64/efivar | 0 config/rootfiles/core/174/filelists/files | 5 + .../{oldcore/170 => core/174}/filelists/lsof | 0 .../{oldcore/100 => core/174}/filelists/squid | 0 .../{oldcore/100 => core/174}/filelists/tzdata | 0 .../124 => core/174}/filelists/x86_64/efivar | 0 config/rootfiles/core/174/update.sh | 6 +- .../rootfiles/packages/epson-inkjet-printer-escpr | 100 +- config/rootfiles/{common => packages}/rng-tools | 2 + doc/language_issues.de | 2 +- doc/language_issues.en | 2 +- doc/language_issues.es | 2 + doc/language_issues.fr | 15 +- 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/dhcp.cgi | 50 +- html/cgi-bin/logs.cgi/log.dat | 2 + html/cgi-bin/mail.cgi | 11 +- langs/en/cgi-bin/en.pl | 1 + lfs/Config | 10 +- lfs/efibootmgr | 3 +- lfs/efivar | 4 +- lfs/epson-inkjet-printer-escpr | 8 +- lfs/fetchmail | 8 +- lfs/grub | 5 +- lfs/htop | 8 +- lfs/initscripts | 1 - lfs/lsof | 12 +- lfs/rng-tools | 14 +- lfs/rust | 12 +- lfs/squid | 15 +- lfs/tzdata | 8 +- lfs/wio | 4 +- src/initscripts/{system => packages}/rngd | 0 src/paks/{apcupsd => rng-tools}/install.sh | 8 +- src/paks/{borgbackup => rng-tools}/uninstall.sh | 7 +- src/paks/{nqptp => rng-tools}/update.sh | 2 +- src/patches/efivar-38_remove_march=native.patch | 18 + src/patches/grub/grub-Use-zifencei-on-riscv.patch | 47 + src/wio/wio-lib.pl | 2 +- src/wio/wio.cgi | 12 +- tools/checkrootfiles | 10 +- 60 files changed, 881 insertions(+), 1801 deletions(-) delete mode 100644 config/rootfiles/common/riscv64/dmidecode delete mode 100644 config/rootfiles/common/riscv64/hyperscan delete mode 100644 config/rootfiles/common/riscv64/intel-microcode delete mode 100644 config/rootfiles/common/riscv64/ipfire-netboot delete mode 100644 config/rootfiles/common/riscv64/syslinux copy config/rootfiles/{oldcore/124 => core/174}/filelists/aarch64/efivar (100%) copy config/rootfiles/{oldcore/170 => core/174}/filelists/lsof (100%) copy config/rootfiles/{oldcore/100 => core/174}/filelists/squid (100%) copy config/rootfiles/{oldcore/100 => core/174}/filelists/tzdata (100%) copy config/rootfiles/{oldcore/124 => core/174}/filelists/x86_64/efivar (100%) rename config/rootfiles/{common => packages}/rng-tools (69%) rename src/initscripts/{system => packages}/rngd (100%) copy src/paks/{apcupsd => rng-tools}/install.sh (85%) copy src/paks/{borgbackup => rng-tools}/uninstall.sh (91%) copy src/paks/{nqptp => rng-tools}/update.sh (96%) create mode 100644 src/patches/efivar-38_remove_march=native.patch create mode 100644 src/patches/grub/grub-Use-zifencei-on-riscv.patch Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 3956d80a1..cd56e574f 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -41,6 +41,26 @@ $Header::colourvpn = '#990099'; $Header::colourerr = '#FF0000'; $Header::viewsize = 150; $Header::errormessage = ''; +$Header::extraHead = <<END +<style> + .row-color20 { + background-color: $color{'color20'}; + } + .row-color22 { + background-color: $color{'color22'}; + } + .row-colouryellow { + background-color: $Header::colouryellow; + } + .cell-orange { + background-color: orange; + } + .cell-red { + background-color: red; + } +</style> +END +; my %menuhash = (); my $menu = \%menuhash; %settings = (); diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index 4ac6d8670..7b38cfac7 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -307,6 +307,24 @@ sub ip_address_in_network($$) { return (($address_bin >= $network_bin) && ($address_bin <= $broadcast_bin)); } +# Returns True if $ipaddress is within $ipstart and $ipend range. +sub ip_address_in_range($$) { + my $ipaddress = shift; + my $ipstart = shift; + my $ipend = shift; + + my $ipaddress_bin = &ip2bin($ipaddress); + return undef unless (defined $ipaddress_bin); + + my $ipstart_bin = &ip2bin($ipstart); + return undef unless (defined $ipstart_bin); + + my $ipend_bin = &ip2bin($ipend); + return undef unless (defined $ipend_bin); + + return (($ipaddress_bin >= $ipstart_bin) && ($ipaddress_bin <= $ipend_bin)); +} + sub setup_upstream_proxy() { my %proxysettings = (); &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); @@ -666,6 +684,12 @@ sub testsuite() { $result = &ip_address_in_network("192.168.30.11", "0.0.0.0/8"); assert('ip_address_in_network("192.168.30.11", "0.0.0.0/8")', !$result); + $result = &ip_address_in_range("192.168.30.11", "192.168.30.10", "192.168.30.20"); + assert('ip_address_in_range("192.168.30.11", "192.168.30.10", "192.168.30.20")', $result); + + $result = &ip_address_in_range("192.168.30.21", "192.168.30.10", "192.168.30.20"); + assert('ip_address_in_range("192.168.30.21", "192.168.30.10", "192.168.30.20")', !$result); + print "Testsuite completed successfully!\n"; return 0; diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index d0c01c006..dc6c0fd24 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire etc/rc.d/init.d/partresize etc/rc.d/init.d/rc etc/rc.d/init.d/reboot -etc/rc.d/init.d/rngd etc/rc.d/init.d/sendsignals etc/rc.d/init.d/setclock etc/rc.d/init.d/smartenabler @@ -185,7 +184,6 @@ etc/rc.d/rcsysinit.d/S44smt etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock -etc/rc.d/rcsysinit.d/S65rngd etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S71pakfire etc/rc.d/rcsysinit.d/S73swconfig diff --git a/config/rootfiles/common/riscv64/dmidecode b/config/rootfiles/common/riscv64/dmidecode deleted file mode 100644 index 5b2ba45ed..000000000 --- a/config/rootfiles/common/riscv64/dmidecode +++ /dev/null @@ -1,13 +0,0 @@ -usr/sbin/biosdecode -usr/sbin/dmidecode -usr/sbin/ownership -usr/sbin/vpddecode -#usr/share/doc/dmidecode -#usr/share/doc/dmidecode/AUTHORS -#usr/share/doc/dmidecode/CHANGELOG -#usr/share/doc/dmidecode/NEWS -#usr/share/doc/dmidecode/README -#usr/share/man/man8/biosdecode.8 -#usr/share/man/man8/dmidecode.8 -#usr/share/man/man8/ownership.8 -#usr/share/man/man8/vpddecode.8 diff --git a/config/rootfiles/common/riscv64/grub b/config/rootfiles/common/riscv64/grub index 35a026391..be2fed0a5 100644 --- a/config/rootfiles/common/riscv64/grub +++ b/config/rootfiles/common/riscv64/grub @@ -1,5 +1,4 @@ #boot/grub -boot/grub/grub.cfg boot/grub/splash.png #etc/bash_completion.d #etc/bash_completion.d/grub @@ -33,1126 +32,454 @@ usr/bin/grub-render-label usr/bin/grub-script-check usr/bin/grub-syslinux2cfg #usr/lib/grub -#usr/lib/grub/i386-pc -usr/lib/grub/i386-pc/acpi.mod -usr/lib/grub/i386-pc/acpi.module -usr/lib/grub/i386-pc/adler32.mod -usr/lib/grub/i386-pc/adler32.module -usr/lib/grub/i386-pc/affs.mod -usr/lib/grub/i386-pc/affs.module -usr/lib/grub/i386-pc/afs.mod -usr/lib/grub/i386-pc/afs.module -usr/lib/grub/i386-pc/afsplitter.mod -usr/lib/grub/i386-pc/afsplitter.module -usr/lib/grub/i386-pc/ahci.mod -usr/lib/grub/i386-pc/ahci.module -usr/lib/grub/i386-pc/all_video.mod -usr/lib/grub/i386-pc/all_video.module -usr/lib/grub/i386-pc/aout.mod -usr/lib/grub/i386-pc/aout.module -usr/lib/grub/i386-pc/archelp.mod -usr/lib/grub/i386-pc/archelp.module -usr/lib/grub/i386-pc/at_keyboard.mod -usr/lib/grub/i386-pc/at_keyboard.module -usr/lib/grub/i386-pc/ata.mod -usr/lib/grub/i386-pc/ata.module -usr/lib/grub/i386-pc/backtrace.mod -usr/lib/grub/i386-pc/backtrace.module -usr/lib/grub/i386-pc/bfs.mod -usr/lib/grub/i386-pc/bfs.module -usr/lib/grub/i386-pc/biosdisk.mod -usr/lib/grub/i386-pc/biosdisk.module -usr/lib/grub/i386-pc/bitmap.mod -usr/lib/grub/i386-pc/bitmap.module -usr/lib/grub/i386-pc/bitmap_scale.mod -usr/lib/grub/i386-pc/bitmap_scale.module -usr/lib/grub/i386-pc/blocklist.mod -usr/lib/grub/i386-pc/blocklist.module -usr/lib/grub/i386-pc/boot.image -usr/lib/grub/i386-pc/boot.img -usr/lib/grub/i386-pc/boot.mod -usr/lib/grub/i386-pc/boot.module -usr/lib/grub/i386-pc/boot_hybrid.image -usr/lib/grub/i386-pc/boot_hybrid.img -usr/lib/grub/i386-pc/bsd.mod -usr/lib/grub/i386-pc/bsd.module -usr/lib/grub/i386-pc/bswap_test.mod -usr/lib/grub/i386-pc/bswap_test.module -usr/lib/grub/i386-pc/btrfs.mod -usr/lib/grub/i386-pc/btrfs.module -usr/lib/grub/i386-pc/bufio.mod -usr/lib/grub/i386-pc/bufio.module -usr/lib/grub/i386-pc/cat.mod -usr/lib/grub/i386-pc/cat.module -usr/lib/grub/i386-pc/cbfs.mod -usr/lib/grub/i386-pc/cbfs.module -usr/lib/grub/i386-pc/cbls.mod -usr/lib/grub/i386-pc/cbls.module -usr/lib/grub/i386-pc/cbmemc.mod -usr/lib/grub/i386-pc/cbmemc.module -usr/lib/grub/i386-pc/cbtable.mod -usr/lib/grub/i386-pc/cbtable.module -usr/lib/grub/i386-pc/cbtime.mod -usr/lib/grub/i386-pc/cbtime.module -usr/lib/grub/i386-pc/cdboot.image -usr/lib/grub/i386-pc/cdboot.img -usr/lib/grub/i386-pc/chain.mod -usr/lib/grub/i386-pc/chain.module -usr/lib/grub/i386-pc/cmdline_cat_test.mod -usr/lib/grub/i386-pc/cmdline_cat_test.module -usr/lib/grub/i386-pc/cmosdump.mod -usr/lib/grub/i386-pc/cmosdump.module -usr/lib/grub/i386-pc/cmostest.mod -usr/lib/grub/i386-pc/cmostest.module -usr/lib/grub/i386-pc/cmp.mod -usr/lib/grub/i386-pc/cmp.module -usr/lib/grub/i386-pc/cmp_test.mod -usr/lib/grub/i386-pc/cmp_test.module -usr/lib/grub/i386-pc/command.lst -usr/lib/grub/i386-pc/config.h -usr/lib/grub/i386-pc/configfile.mod -usr/lib/grub/i386-pc/configfile.module -usr/lib/grub/i386-pc/cpio.mod -usr/lib/grub/i386-pc/cpio.module -usr/lib/grub/i386-pc/cpio_be.mod -usr/lib/grub/i386-pc/cpio_be.module -usr/lib/grub/i386-pc/cpuid.mod -usr/lib/grub/i386-pc/cpuid.module -usr/lib/grub/i386-pc/crc64.mod -usr/lib/grub/i386-pc/crc64.module -usr/lib/grub/i386-pc/crypto.lst -usr/lib/grub/i386-pc/crypto.mod -usr/lib/grub/i386-pc/crypto.module -usr/lib/grub/i386-pc/cryptodisk.mod -usr/lib/grub/i386-pc/cryptodisk.module -usr/lib/grub/i386-pc/cs5536.mod -usr/lib/grub/i386-pc/cs5536.module -usr/lib/grub/i386-pc/ctz_test.mod -usr/lib/grub/i386-pc/ctz_test.module -usr/lib/grub/i386-pc/date.mod -usr/lib/grub/i386-pc/date.module -usr/lib/grub/i386-pc/datehook.mod -usr/lib/grub/i386-pc/datehook.module -usr/lib/grub/i386-pc/datetime.mod -usr/lib/grub/i386-pc/datetime.module -usr/lib/grub/i386-pc/disk.mod -usr/lib/grub/i386-pc/disk.module -usr/lib/grub/i386-pc/diskboot.image -usr/lib/grub/i386-pc/diskboot.img -usr/lib/grub/i386-pc/diskfilter.mod -usr/lib/grub/i386-pc/diskfilter.module -usr/lib/grub/i386-pc/div.mod -usr/lib/grub/i386-pc/div.module -usr/lib/grub/i386-pc/div_test.mod -usr/lib/grub/i386-pc/div_test.module -usr/lib/grub/i386-pc/dm_nv.mod -usr/lib/grub/i386-pc/dm_nv.module -usr/lib/grub/i386-pc/drivemap.mod -usr/lib/grub/i386-pc/drivemap.module -usr/lib/grub/i386-pc/echo.mod -usr/lib/grub/i386-pc/echo.module -usr/lib/grub/i386-pc/efiemu.mod -usr/lib/grub/i386-pc/efiemu.module -usr/lib/grub/i386-pc/ehci.mod -usr/lib/grub/i386-pc/ehci.module -usr/lib/grub/i386-pc/elf.mod -usr/lib/grub/i386-pc/elf.module -usr/lib/grub/i386-pc/eval.mod -usr/lib/grub/i386-pc/eval.module -usr/lib/grub/i386-pc/exfat.mod -usr/lib/grub/i386-pc/exfat.module -usr/lib/grub/i386-pc/exfctest.mod -usr/lib/grub/i386-pc/exfctest.module -usr/lib/grub/i386-pc/ext2.mod -usr/lib/grub/i386-pc/ext2.module -usr/lib/grub/i386-pc/extcmd.mod -usr/lib/grub/i386-pc/extcmd.module -usr/lib/grub/i386-pc/f2fs.mod -usr/lib/grub/i386-pc/f2fs.module -usr/lib/grub/i386-pc/fat.mod -usr/lib/grub/i386-pc/fat.module -usr/lib/grub/i386-pc/fdt.lst -usr/lib/grub/i386-pc/file.mod -usr/lib/grub/i386-pc/file.module -usr/lib/grub/i386-pc/font.mod -usr/lib/grub/i386-pc/font.module -usr/lib/grub/i386-pc/freedos.mod -usr/lib/grub/i386-pc/freedos.module -usr/lib/grub/i386-pc/fs.lst -usr/lib/grub/i386-pc/fshelp.mod -usr/lib/grub/i386-pc/fshelp.module -usr/lib/grub/i386-pc/functional_test.mod -usr/lib/grub/i386-pc/functional_test.module -usr/lib/grub/i386-pc/gcry_arcfour.mod -usr/lib/grub/i386-pc/gcry_arcfour.module -usr/lib/grub/i386-pc/gcry_blowfish.mod -usr/lib/grub/i386-pc/gcry_blowfish.module -usr/lib/grub/i386-pc/gcry_camellia.mod -usr/lib/grub/i386-pc/gcry_camellia.module -usr/lib/grub/i386-pc/gcry_cast5.mod -usr/lib/grub/i386-pc/gcry_cast5.module -usr/lib/grub/i386-pc/gcry_crc.mod -usr/lib/grub/i386-pc/gcry_crc.module -usr/lib/grub/i386-pc/gcry_des.mod -usr/lib/grub/i386-pc/gcry_des.module -usr/lib/grub/i386-pc/gcry_dsa.mod -usr/lib/grub/i386-pc/gcry_dsa.module -usr/lib/grub/i386-pc/gcry_idea.mod -usr/lib/grub/i386-pc/gcry_idea.module -usr/lib/grub/i386-pc/gcry_md4.mod -usr/lib/grub/i386-pc/gcry_md4.module -usr/lib/grub/i386-pc/gcry_md5.mod -usr/lib/grub/i386-pc/gcry_md5.module -usr/lib/grub/i386-pc/gcry_rfc2268.mod -usr/lib/grub/i386-pc/gcry_rfc2268.module -usr/lib/grub/i386-pc/gcry_rijndael.mod -usr/lib/grub/i386-pc/gcry_rijndael.module -usr/lib/grub/i386-pc/gcry_rmd160.mod -usr/lib/grub/i386-pc/gcry_rmd160.module -usr/lib/grub/i386-pc/gcry_rsa.mod -usr/lib/grub/i386-pc/gcry_rsa.module -usr/lib/grub/i386-pc/gcry_seed.mod -usr/lib/grub/i386-pc/gcry_seed.module -usr/lib/grub/i386-pc/gcry_serpent.mod -usr/lib/grub/i386-pc/gcry_serpent.module -usr/lib/grub/i386-pc/gcry_sha1.mod -usr/lib/grub/i386-pc/gcry_sha1.module -usr/lib/grub/i386-pc/gcry_sha256.mod -usr/lib/grub/i386-pc/gcry_sha256.module -usr/lib/grub/i386-pc/gcry_sha512.mod -usr/lib/grub/i386-pc/gcry_sha512.module -usr/lib/grub/i386-pc/gcry_tiger.mod -usr/lib/grub/i386-pc/gcry_tiger.module -usr/lib/grub/i386-pc/gcry_twofish.mod -usr/lib/grub/i386-pc/gcry_twofish.module -usr/lib/grub/i386-pc/gcry_whirlpool.mod -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/geli.mod -usr/lib/grub/i386-pc/geli.module -usr/lib/grub/i386-pc/gettext.mod -usr/lib/grub/i386-pc/gettext.module -usr/lib/grub/i386-pc/gfxmenu.mod -usr/lib/grub/i386-pc/gfxmenu.module -usr/lib/grub/i386-pc/gfxterm.mod -usr/lib/grub/i386-pc/gfxterm.module -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 -usr/lib/grub/i386-pc/gzio.module -usr/lib/grub/i386-pc/halt.mod -usr/lib/grub/i386-pc/halt.module -usr/lib/grub/i386-pc/hashsum.mod -usr/lib/grub/i386-pc/hashsum.module -usr/lib/grub/i386-pc/hdparm.mod -usr/lib/grub/i386-pc/hdparm.module -usr/lib/grub/i386-pc/hello.mod -usr/lib/grub/i386-pc/hello.module -usr/lib/grub/i386-pc/help.mod -usr/lib/grub/i386-pc/help.module -usr/lib/grub/i386-pc/hexdump.mod -usr/lib/grub/i386-pc/hexdump.module -usr/lib/grub/i386-pc/hfs.mod -usr/lib/grub/i386-pc/hfs.module -usr/lib/grub/i386-pc/hfsplus.mod -usr/lib/grub/i386-pc/hfsplus.module -usr/lib/grub/i386-pc/hfspluscomp.mod -usr/lib/grub/i386-pc/hfspluscomp.module -usr/lib/grub/i386-pc/http.mod -usr/lib/grub/i386-pc/http.module -usr/lib/grub/i386-pc/iorw.mod -usr/lib/grub/i386-pc/iorw.module -usr/lib/grub/i386-pc/iso9660.mod -usr/lib/grub/i386-pc/iso9660.module -usr/lib/grub/i386-pc/jfs.mod -usr/lib/grub/i386-pc/jfs.module -usr/lib/grub/i386-pc/jpeg.mod -usr/lib/grub/i386-pc/jpeg.module -usr/lib/grub/i386-pc/json.mod -usr/lib/grub/i386-pc/json.module -usr/lib/grub/i386-pc/kernel.exec -usr/lib/grub/i386-pc/kernel.img -usr/lib/grub/i386-pc/keylayouts.mod -usr/lib/grub/i386-pc/keylayouts.module -usr/lib/grub/i386-pc/keystatus.mod -usr/lib/grub/i386-pc/keystatus.module -usr/lib/grub/i386-pc/ldm.mod -usr/lib/grub/i386-pc/ldm.module -usr/lib/grub/i386-pc/legacy_password_test.mod -usr/lib/grub/i386-pc/legacy_password_test.module -usr/lib/grub/i386-pc/legacycfg.mod -usr/lib/grub/i386-pc/legacycfg.module -usr/lib/grub/i386-pc/linux.mod -usr/lib/grub/i386-pc/linux.module -usr/lib/grub/i386-pc/linux16.mod -usr/lib/grub/i386-pc/linux16.module -usr/lib/grub/i386-pc/lnxboot.image -usr/lib/grub/i386-pc/lnxboot.img -usr/lib/grub/i386-pc/loadenv.mod -usr/lib/grub/i386-pc/loadenv.module -usr/lib/grub/i386-pc/loopback.mod -usr/lib/grub/i386-pc/loopback.module -usr/lib/grub/i386-pc/ls.mod -usr/lib/grub/i386-pc/ls.module -usr/lib/grub/i386-pc/lsacpi.mod -usr/lib/grub/i386-pc/lsacpi.module -usr/lib/grub/i386-pc/lsapm.mod -usr/lib/grub/i386-pc/lsapm.module -usr/lib/grub/i386-pc/lsmmap.mod -usr/lib/grub/i386-pc/lsmmap.module -usr/lib/grub/i386-pc/lspci.mod -usr/lib/grub/i386-pc/lspci.module -usr/lib/grub/i386-pc/luks.mod -usr/lib/grub/i386-pc/luks.module -usr/lib/grub/i386-pc/luks2.mod -usr/lib/grub/i386-pc/luks2.module -usr/lib/grub/i386-pc/lvm.mod -usr/lib/grub/i386-pc/lvm.module -usr/lib/grub/i386-pc/lzma_decompress.image -usr/lib/grub/i386-pc/lzma_decompress.img -usr/lib/grub/i386-pc/lzopio.mod -usr/lib/grub/i386-pc/lzopio.module -usr/lib/grub/i386-pc/macbless.mod -usr/lib/grub/i386-pc/macbless.module -usr/lib/grub/i386-pc/macho.mod -usr/lib/grub/i386-pc/macho.module -usr/lib/grub/i386-pc/mda_text.mod -usr/lib/grub/i386-pc/mda_text.module -usr/lib/grub/i386-pc/mdraid09.mod -usr/lib/grub/i386-pc/mdraid09.module -usr/lib/grub/i386-pc/mdraid09_be.mod -usr/lib/grub/i386-pc/mdraid09_be.module -usr/lib/grub/i386-pc/mdraid1x.mod -usr/lib/grub/i386-pc/mdraid1x.module -usr/lib/grub/i386-pc/memdisk.mod -usr/lib/grub/i386-pc/memdisk.module -usr/lib/grub/i386-pc/memrw.mod -usr/lib/grub/i386-pc/memrw.module -usr/lib/grub/i386-pc/minicmd.mod -usr/lib/grub/i386-pc/minicmd.module -usr/lib/grub/i386-pc/minix.mod -usr/lib/grub/i386-pc/minix.module -usr/lib/grub/i386-pc/minix2.mod -usr/lib/grub/i386-pc/minix2.module -usr/lib/grub/i386-pc/minix2_be.mod -usr/lib/grub/i386-pc/minix2_be.module -usr/lib/grub/i386-pc/minix3.mod -usr/lib/grub/i386-pc/minix3.module -usr/lib/grub/i386-pc/minix3_be.mod -usr/lib/grub/i386-pc/minix3_be.module -usr/lib/grub/i386-pc/minix_be.mod -usr/lib/grub/i386-pc/minix_be.module -usr/lib/grub/i386-pc/mmap.mod -usr/lib/grub/i386-pc/mmap.module -usr/lib/grub/i386-pc/moddep.lst -usr/lib/grub/i386-pc/modinfo.sh -usr/lib/grub/i386-pc/morse.mod -usr/lib/grub/i386-pc/morse.module -usr/lib/grub/i386-pc/mpi.mod -usr/lib/grub/i386-pc/mpi.module -usr/lib/grub/i386-pc/msdospart.mod -usr/lib/grub/i386-pc/msdospart.module -usr/lib/grub/i386-pc/mul_test.mod -usr/lib/grub/i386-pc/mul_test.module -usr/lib/grub/i386-pc/multiboot.mod -usr/lib/grub/i386-pc/multiboot.module -usr/lib/grub/i386-pc/multiboot2.mod -usr/lib/grub/i386-pc/multiboot2.module -usr/lib/grub/i386-pc/nativedisk.mod -usr/lib/grub/i386-pc/nativedisk.module -usr/lib/grub/i386-pc/net.mod -usr/lib/grub/i386-pc/net.module -usr/lib/grub/i386-pc/newc.mod -usr/lib/grub/i386-pc/newc.module -usr/lib/grub/i386-pc/nilfs2.mod -usr/lib/grub/i386-pc/nilfs2.module -usr/lib/grub/i386-pc/normal.mod -usr/lib/grub/i386-pc/normal.module -usr/lib/grub/i386-pc/ntfs.mod -usr/lib/grub/i386-pc/ntfs.module -usr/lib/grub/i386-pc/ntfscomp.mod -usr/lib/grub/i386-pc/ntfscomp.module -usr/lib/grub/i386-pc/ntldr.mod -usr/lib/grub/i386-pc/ntldr.module -usr/lib/grub/i386-pc/odc.mod -usr/lib/grub/i386-pc/odc.module -usr/lib/grub/i386-pc/offsetio.mod -usr/lib/grub/i386-pc/offsetio.module -usr/lib/grub/i386-pc/ohci.mod -usr/lib/grub/i386-pc/ohci.module -usr/lib/grub/i386-pc/part_acorn.mod -usr/lib/grub/i386-pc/part_acorn.module -usr/lib/grub/i386-pc/part_amiga.mod -usr/lib/grub/i386-pc/part_amiga.module -usr/lib/grub/i386-pc/part_apple.mod -usr/lib/grub/i386-pc/part_apple.module -usr/lib/grub/i386-pc/part_bsd.mod -usr/lib/grub/i386-pc/part_bsd.module -usr/lib/grub/i386-pc/part_dfly.mod -usr/lib/grub/i386-pc/part_dfly.module -usr/lib/grub/i386-pc/part_dvh.mod -usr/lib/grub/i386-pc/part_dvh.module -usr/lib/grub/i386-pc/part_gpt.mod -usr/lib/grub/i386-pc/part_gpt.module -usr/lib/grub/i386-pc/part_msdos.mod -usr/lib/grub/i386-pc/part_msdos.module -usr/lib/grub/i386-pc/part_plan.mod -usr/lib/grub/i386-pc/part_plan.module -usr/lib/grub/i386-pc/part_sun.mod -usr/lib/grub/i386-pc/part_sun.module -usr/lib/grub/i386-pc/part_sunpc.mod -usr/lib/grub/i386-pc/part_sunpc.module -usr/lib/grub/i386-pc/partmap.lst -usr/lib/grub/i386-pc/parttool.lst -usr/lib/grub/i386-pc/parttool.mod -usr/lib/grub/i386-pc/parttool.module -usr/lib/grub/i386-pc/password.mod -usr/lib/grub/i386-pc/password.module -usr/lib/grub/i386-pc/password_pbkdf2.mod -usr/lib/grub/i386-pc/password_pbkdf2.module -usr/lib/grub/i386-pc/pata.mod -usr/lib/grub/i386-pc/pata.module -usr/lib/grub/i386-pc/pbkdf2.mod -usr/lib/grub/i386-pc/pbkdf2.module -usr/lib/grub/i386-pc/pbkdf2_test.mod -usr/lib/grub/i386-pc/pbkdf2_test.module -usr/lib/grub/i386-pc/pci.mod -usr/lib/grub/i386-pc/pci.module -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/plan9.mod -usr/lib/grub/i386-pc/plan9.module -usr/lib/grub/i386-pc/play.mod -usr/lib/grub/i386-pc/play.module -usr/lib/grub/i386-pc/png.mod -usr/lib/grub/i386-pc/png.module -usr/lib/grub/i386-pc/priority_queue.mod -usr/lib/grub/i386-pc/priority_queue.module -usr/lib/grub/i386-pc/probe.mod -usr/lib/grub/i386-pc/probe.module -usr/lib/grub/i386-pc/procfs.mod -usr/lib/grub/i386-pc/procfs.module -usr/lib/grub/i386-pc/progress.mod -usr/lib/grub/i386-pc/progress.module -usr/lib/grub/i386-pc/pxe.mod -usr/lib/grub/i386-pc/pxe.module -usr/lib/grub/i386-pc/pxeboot.image -usr/lib/grub/i386-pc/pxeboot.img -usr/lib/grub/i386-pc/pxechain.mod -usr/lib/grub/i386-pc/pxechain.module -usr/lib/grub/i386-pc/raid5rec.mod -usr/lib/grub/i386-pc/raid5rec.module -usr/lib/grub/i386-pc/raid6rec.mod -usr/lib/grub/i386-pc/raid6rec.module -usr/lib/grub/i386-pc/random.mod -usr/lib/grub/i386-pc/random.module -usr/lib/grub/i386-pc/rdmsr.mod -usr/lib/grub/i386-pc/rdmsr.module -usr/lib/grub/i386-pc/read.mod -usr/lib/grub/i386-pc/read.module -usr/lib/grub/i386-pc/reboot.mod -usr/lib/grub/i386-pc/reboot.module -usr/lib/grub/i386-pc/regexp.mod -usr/lib/grub/i386-pc/regexp.module -usr/lib/grub/i386-pc/reiserfs.mod -usr/lib/grub/i386-pc/reiserfs.module -usr/lib/grub/i386-pc/relocator.mod -usr/lib/grub/i386-pc/relocator.module -usr/lib/grub/i386-pc/romfs.mod -usr/lib/grub/i386-pc/romfs.module -usr/lib/grub/i386-pc/scsi.mod -usr/lib/grub/i386-pc/scsi.module -usr/lib/grub/i386-pc/search.mod -usr/lib/grub/i386-pc/search.module -usr/lib/grub/i386-pc/search_fs_file.mod -usr/lib/grub/i386-pc/search_fs_file.module -usr/lib/grub/i386-pc/search_fs_uuid.mod -usr/lib/grub/i386-pc/search_fs_uuid.module -usr/lib/grub/i386-pc/search_label.mod -usr/lib/grub/i386-pc/search_label.module -usr/lib/grub/i386-pc/sendkey.mod -usr/lib/grub/i386-pc/sendkey.module -usr/lib/grub/i386-pc/serial.mod -usr/lib/grub/i386-pc/serial.module -usr/lib/grub/i386-pc/setjmp.mod -usr/lib/grub/i386-pc/setjmp.module -usr/lib/grub/i386-pc/setjmp_test.mod -usr/lib/grub/i386-pc/setjmp_test.module -usr/lib/grub/i386-pc/setpci.mod -usr/lib/grub/i386-pc/setpci.module -usr/lib/grub/i386-pc/sfs.mod -usr/lib/grub/i386-pc/sfs.module -usr/lib/grub/i386-pc/shift_test.mod -usr/lib/grub/i386-pc/shift_test.module -usr/lib/grub/i386-pc/signature_test.mod -usr/lib/grub/i386-pc/signature_test.module -usr/lib/grub/i386-pc/sleep.mod -usr/lib/grub/i386-pc/sleep.module -usr/lib/grub/i386-pc/sleep_test.mod -usr/lib/grub/i386-pc/sleep_test.module -usr/lib/grub/i386-pc/smbios.mod -usr/lib/grub/i386-pc/smbios.module -usr/lib/grub/i386-pc/spkmodem.mod -usr/lib/grub/i386-pc/spkmodem.module -usr/lib/grub/i386-pc/squash4.mod -usr/lib/grub/i386-pc/squash4.module -usr/lib/grub/i386-pc/strtoull_test.mod -usr/lib/grub/i386-pc/strtoull_test.module -usr/lib/grub/i386-pc/syslinuxcfg.mod -usr/lib/grub/i386-pc/syslinuxcfg.module -usr/lib/grub/i386-pc/tar.mod -usr/lib/grub/i386-pc/tar.module -usr/lib/grub/i386-pc/terminal.lst -usr/lib/grub/i386-pc/terminal.mod -usr/lib/grub/i386-pc/terminal.module -usr/lib/grub/i386-pc/terminfo.mod -usr/lib/grub/i386-pc/terminfo.module -usr/lib/grub/i386-pc/test.mod -usr/lib/grub/i386-pc/test.module -usr/lib/grub/i386-pc/test_blockarg.mod -usr/lib/grub/i386-pc/test_blockarg.module -usr/lib/grub/i386-pc/testload.mod -usr/lib/grub/i386-pc/testload.module -usr/lib/grub/i386-pc/testspeed.mod -usr/lib/grub/i386-pc/testspeed.module -usr/lib/grub/i386-pc/tftp.mod -usr/lib/grub/i386-pc/tftp.module -usr/lib/grub/i386-pc/tga.mod -usr/lib/grub/i386-pc/tga.module -usr/lib/grub/i386-pc/time.mod -usr/lib/grub/i386-pc/time.module -usr/lib/grub/i386-pc/tr.mod -usr/lib/grub/i386-pc/tr.module -usr/lib/grub/i386-pc/trig.mod -usr/lib/grub/i386-pc/trig.module -usr/lib/grub/i386-pc/true.mod -usr/lib/grub/i386-pc/true.module -usr/lib/grub/i386-pc/truecrypt.mod -usr/lib/grub/i386-pc/truecrypt.module -usr/lib/grub/i386-pc/udf.mod -usr/lib/grub/i386-pc/udf.module -usr/lib/grub/i386-pc/ufs1.mod -usr/lib/grub/i386-pc/ufs1.module -usr/lib/grub/i386-pc/ufs1_be.mod -usr/lib/grub/i386-pc/ufs1_be.module -usr/lib/grub/i386-pc/ufs2.mod -usr/lib/grub/i386-pc/ufs2.module -usr/lib/grub/i386-pc/uhci.mod -usr/lib/grub/i386-pc/uhci.module -usr/lib/grub/i386-pc/usb.mod -usr/lib/grub/i386-pc/usb.module -usr/lib/grub/i386-pc/usb_keyboard.mod -usr/lib/grub/i386-pc/usb_keyboard.module -usr/lib/grub/i386-pc/usbms.mod -usr/lib/grub/i386-pc/usbms.module -usr/lib/grub/i386-pc/usbserial_common.mod -usr/lib/grub/i386-pc/usbserial_common.module -usr/lib/grub/i386-pc/usbserial_ftdi.mod -usr/lib/grub/i386-pc/usbserial_ftdi.module -usr/lib/grub/i386-pc/usbserial_pl2303.mod -usr/lib/grub/i386-pc/usbserial_pl2303.module -usr/lib/grub/i386-pc/usbserial_usbdebug.mod -usr/lib/grub/i386-pc/usbserial_usbdebug.module -usr/lib/grub/i386-pc/usbtest.mod -usr/lib/grub/i386-pc/usbtest.module -usr/lib/grub/i386-pc/vbe.mod -usr/lib/grub/i386-pc/vbe.module -usr/lib/grub/i386-pc/vga.mod -usr/lib/grub/i386-pc/vga.module -usr/lib/grub/i386-pc/vga_text.mod -usr/lib/grub/i386-pc/vga_text.module -usr/lib/grub/i386-pc/video.lst -usr/lib/grub/i386-pc/video.mod -usr/lib/grub/i386-pc/video.module -usr/lib/grub/i386-pc/video_bochs.mod -usr/lib/grub/i386-pc/video_bochs.module -usr/lib/grub/i386-pc/video_cirrus.mod -usr/lib/grub/i386-pc/video_cirrus.module -usr/lib/grub/i386-pc/video_colors.mod -usr/lib/grub/i386-pc/video_colors.module -usr/lib/grub/i386-pc/video_fb.mod -usr/lib/grub/i386-pc/video_fb.module -usr/lib/grub/i386-pc/videoinfo.mod -usr/lib/grub/i386-pc/videoinfo.module -usr/lib/grub/i386-pc/videotest.mod -usr/lib/grub/i386-pc/videotest.module -usr/lib/grub/i386-pc/videotest_checksum.mod -usr/lib/grub/i386-pc/videotest_checksum.module -usr/lib/grub/i386-pc/wrmsr.mod -usr/lib/grub/i386-pc/wrmsr.module -usr/lib/grub/i386-pc/xfs.mod -usr/lib/grub/i386-pc/xfs.module -usr/lib/grub/i386-pc/xnu.mod -usr/lib/grub/i386-pc/xnu.module -usr/lib/grub/i386-pc/xnu_uuid.mod -usr/lib/grub/i386-pc/xnu_uuid.module -usr/lib/grub/i386-pc/xnu_uuid_test.mod -usr/lib/grub/i386-pc/xnu_uuid_test.module -usr/lib/grub/i386-pc/xzio.mod -usr/lib/grub/i386-pc/xzio.module -usr/lib/grub/i386-pc/zfs.mod -usr/lib/grub/i386-pc/zfs.module -usr/lib/grub/i386-pc/zfscrypt.mod -usr/lib/grub/i386-pc/zfscrypt.module -usr/lib/grub/i386-pc/zfsinfo.mod -usr/lib/grub/i386-pc/zfsinfo.module -usr/lib/grub/i386-pc/zstd.mod -usr/lib/grub/i386-pc/zstd.module -#usr/lib/grub/x86_64-efi -usr/lib/grub/x86_64-efi/acpi.mod -usr/lib/grub/x86_64-efi/acpi.module -usr/lib/grub/x86_64-efi/adler32.mod -usr/lib/grub/x86_64-efi/adler32.module -usr/lib/grub/x86_64-efi/affs.mod -usr/lib/grub/x86_64-efi/affs.module -usr/lib/grub/x86_64-efi/afs.mod -usr/lib/grub/x86_64-efi/afs.module -usr/lib/grub/x86_64-efi/afsplitter.mod -usr/lib/grub/x86_64-efi/afsplitter.module -usr/lib/grub/x86_64-efi/ahci.mod -usr/lib/grub/x86_64-efi/ahci.module -usr/lib/grub/x86_64-efi/all_video.mod -usr/lib/grub/x86_64-efi/all_video.module -usr/lib/grub/x86_64-efi/aout.mod -usr/lib/grub/x86_64-efi/aout.module -usr/lib/grub/x86_64-efi/appleldr.mod -usr/lib/grub/x86_64-efi/appleldr.module -usr/lib/grub/x86_64-efi/archelp.mod -usr/lib/grub/x86_64-efi/archelp.module -usr/lib/grub/x86_64-efi/at_keyboard.mod -usr/lib/grub/x86_64-efi/at_keyboard.module -usr/lib/grub/x86_64-efi/ata.mod -usr/lib/grub/x86_64-efi/ata.module -usr/lib/grub/x86_64-efi/backtrace.mod -usr/lib/grub/x86_64-efi/backtrace.module -usr/lib/grub/x86_64-efi/bfs.mod -usr/lib/grub/x86_64-efi/bfs.module -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/blocklist.mod -usr/lib/grub/x86_64-efi/blocklist.module -usr/lib/grub/x86_64-efi/boot.mod -usr/lib/grub/x86_64-efi/boot.module -usr/lib/grub/x86_64-efi/bsd.mod -usr/lib/grub/x86_64-efi/bsd.module -usr/lib/grub/x86_64-efi/bswap_test.mod -usr/lib/grub/x86_64-efi/bswap_test.module -usr/lib/grub/x86_64-efi/btrfs.mod -usr/lib/grub/x86_64-efi/btrfs.module -usr/lib/grub/x86_64-efi/bufio.mod -usr/lib/grub/x86_64-efi/bufio.module -usr/lib/grub/x86_64-efi/cat.mod -usr/lib/grub/x86_64-efi/cat.module -usr/lib/grub/x86_64-efi/cbfs.mod -usr/lib/grub/x86_64-efi/cbfs.module -usr/lib/grub/x86_64-efi/cbls.mod -usr/lib/grub/x86_64-efi/cbls.module -usr/lib/grub/x86_64-efi/cbmemc.mod -usr/lib/grub/x86_64-efi/cbmemc.module -usr/lib/grub/x86_64-efi/cbtable.mod -usr/lib/grub/x86_64-efi/cbtable.module -usr/lib/grub/x86_64-efi/cbtime.mod -usr/lib/grub/x86_64-efi/cbtime.module -usr/lib/grub/x86_64-efi/chain.mod -usr/lib/grub/x86_64-efi/chain.module -usr/lib/grub/x86_64-efi/cmdline_cat_test.mod -usr/lib/grub/x86_64-efi/cmdline_cat_test.module -usr/lib/grub/x86_64-efi/cmp.mod -usr/lib/grub/x86_64-efi/cmp.module -usr/lib/grub/x86_64-efi/cmp_test.mod -usr/lib/grub/x86_64-efi/cmp_test.module -usr/lib/grub/x86_64-efi/command.lst -usr/lib/grub/x86_64-efi/config.h -usr/lib/grub/x86_64-efi/configfile.mod -usr/lib/grub/x86_64-efi/configfile.module -usr/lib/grub/x86_64-efi/cpio.mod -usr/lib/grub/x86_64-efi/cpio.module -usr/lib/grub/x86_64-efi/cpio_be.mod -usr/lib/grub/x86_64-efi/cpio_be.module -usr/lib/grub/x86_64-efi/cpuid.mod -usr/lib/grub/x86_64-efi/cpuid.module -usr/lib/grub/x86_64-efi/crc64.mod -usr/lib/grub/x86_64-efi/crc64.module -usr/lib/grub/x86_64-efi/crypto.lst -usr/lib/grub/x86_64-efi/crypto.mod -usr/lib/grub/x86_64-efi/crypto.module -usr/lib/grub/x86_64-efi/cryptodisk.mod -usr/lib/grub/x86_64-efi/cryptodisk.module -usr/lib/grub/x86_64-efi/cs5536.mod -usr/lib/grub/x86_64-efi/cs5536.module -usr/lib/grub/x86_64-efi/ctz_test.mod -usr/lib/grub/x86_64-efi/ctz_test.module -usr/lib/grub/x86_64-efi/date.mod -usr/lib/grub/x86_64-efi/date.module -usr/lib/grub/x86_64-efi/datehook.mod -usr/lib/grub/x86_64-efi/datehook.module -usr/lib/grub/x86_64-efi/datetime.mod -usr/lib/grub/x86_64-efi/datetime.module -usr/lib/grub/x86_64-efi/disk.mod -usr/lib/grub/x86_64-efi/disk.module -usr/lib/grub/x86_64-efi/diskfilter.mod -usr/lib/grub/x86_64-efi/diskfilter.module -usr/lib/grub/x86_64-efi/div.mod -usr/lib/grub/x86_64-efi/div.module -usr/lib/grub/x86_64-efi/div_test.mod -usr/lib/grub/x86_64-efi/div_test.module -usr/lib/grub/x86_64-efi/dm_nv.mod -usr/lib/grub/x86_64-efi/dm_nv.module -usr/lib/grub/x86_64-efi/echo.mod -usr/lib/grub/x86_64-efi/echo.module -usr/lib/grub/x86_64-efi/efi_gop.mod -usr/lib/grub/x86_64-efi/efi_gop.module -usr/lib/grub/x86_64-efi/efi_uga.mod -usr/lib/grub/x86_64-efi/efi_uga.module -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/ehci.mod -usr/lib/grub/x86_64-efi/ehci.module -usr/lib/grub/x86_64-efi/elf.mod -usr/lib/grub/x86_64-efi/elf.module -usr/lib/grub/x86_64-efi/eval.mod -usr/lib/grub/x86_64-efi/eval.module -usr/lib/grub/x86_64-efi/exfat.mod -usr/lib/grub/x86_64-efi/exfat.module -usr/lib/grub/x86_64-efi/exfctest.mod -usr/lib/grub/x86_64-efi/exfctest.module -usr/lib/grub/x86_64-efi/ext2.mod -usr/lib/grub/x86_64-efi/ext2.module -usr/lib/grub/x86_64-efi/extcmd.mod -usr/lib/grub/x86_64-efi/extcmd.module -usr/lib/grub/x86_64-efi/f2fs.mod -usr/lib/grub/x86_64-efi/f2fs.module -usr/lib/grub/x86_64-efi/fat.mod -usr/lib/grub/x86_64-efi/fat.module -usr/lib/grub/x86_64-efi/fdt.lst -usr/lib/grub/x86_64-efi/file.mod -usr/lib/grub/x86_64-efi/file.module -usr/lib/grub/x86_64-efi/fixvideo.mod -usr/lib/grub/x86_64-efi/fixvideo.module -usr/lib/grub/x86_64-efi/font.mod -usr/lib/grub/x86_64-efi/font.module -usr/lib/grub/x86_64-efi/fs.lst -usr/lib/grub/x86_64-efi/fshelp.mod -usr/lib/grub/x86_64-efi/fshelp.module -usr/lib/grub/x86_64-efi/functional_test.mod -usr/lib/grub/x86_64-efi/functional_test.module -usr/lib/grub/x86_64-efi/gcry_arcfour.mod -usr/lib/grub/x86_64-efi/gcry_arcfour.module -usr/lib/grub/x86_64-efi/gcry_blowfish.mod -usr/lib/grub/x86_64-efi/gcry_blowfish.module -usr/lib/grub/x86_64-efi/gcry_camellia.mod -usr/lib/grub/x86_64-efi/gcry_camellia.module -usr/lib/grub/x86_64-efi/gcry_cast5.mod -usr/lib/grub/x86_64-efi/gcry_cast5.module -usr/lib/grub/x86_64-efi/gcry_crc.mod -usr/lib/grub/x86_64-efi/gcry_crc.module -usr/lib/grub/x86_64-efi/gcry_des.mod -usr/lib/grub/x86_64-efi/gcry_des.module -usr/lib/grub/x86_64-efi/gcry_dsa.mod -usr/lib/grub/x86_64-efi/gcry_dsa.module -usr/lib/grub/x86_64-efi/gcry_idea.mod -usr/lib/grub/x86_64-efi/gcry_idea.module -usr/lib/grub/x86_64-efi/gcry_md4.mod -usr/lib/grub/x86_64-efi/gcry_md4.module -usr/lib/grub/x86_64-efi/gcry_md5.mod -usr/lib/grub/x86_64-efi/gcry_md5.module -usr/lib/grub/x86_64-efi/gcry_rfc2268.mod -usr/lib/grub/x86_64-efi/gcry_rfc2268.module -usr/lib/grub/x86_64-efi/gcry_rijndael.mod -usr/lib/grub/x86_64-efi/gcry_rijndael.module -usr/lib/grub/x86_64-efi/gcry_rmd160.mod -usr/lib/grub/x86_64-efi/gcry_rmd160.module -usr/lib/grub/x86_64-efi/gcry_rsa.mod -usr/lib/grub/x86_64-efi/gcry_rsa.module -usr/lib/grub/x86_64-efi/gcry_seed.mod -usr/lib/grub/x86_64-efi/gcry_seed.module -usr/lib/grub/x86_64-efi/gcry_serpent.mod -usr/lib/grub/x86_64-efi/gcry_serpent.module -usr/lib/grub/x86_64-efi/gcry_sha1.mod -usr/lib/grub/x86_64-efi/gcry_sha1.module -usr/lib/grub/x86_64-efi/gcry_sha256.mod -usr/lib/grub/x86_64-efi/gcry_sha256.module -usr/lib/grub/x86_64-efi/gcry_sha512.mod -usr/lib/grub/x86_64-efi/gcry_sha512.module -usr/lib/grub/x86_64-efi/gcry_tiger.mod -usr/lib/grub/x86_64-efi/gcry_tiger.module -usr/lib/grub/x86_64-efi/gcry_twofish.mod -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/geli.mod -usr/lib/grub/x86_64-efi/geli.module -usr/lib/grub/x86_64-efi/gettext.mod -usr/lib/grub/x86_64-efi/gettext.module -usr/lib/grub/x86_64-efi/gfxmenu.mod -usr/lib/grub/x86_64-efi/gfxmenu.module -usr/lib/grub/x86_64-efi/gfxterm.mod -usr/lib/grub/x86_64-efi/gfxterm.module -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 -usr/lib/grub/x86_64-efi/gzio.module -usr/lib/grub/x86_64-efi/halt.mod -usr/lib/grub/x86_64-efi/halt.module -usr/lib/grub/x86_64-efi/hashsum.mod -usr/lib/grub/x86_64-efi/hashsum.module -usr/lib/grub/x86_64-efi/hdparm.mod -usr/lib/grub/x86_64-efi/hdparm.module -usr/lib/grub/x86_64-efi/hello.mod -usr/lib/grub/x86_64-efi/hello.module -usr/lib/grub/x86_64-efi/help.mod -usr/lib/grub/x86_64-efi/help.module -usr/lib/grub/x86_64-efi/hexdump.mod -usr/lib/grub/x86_64-efi/hexdump.module -usr/lib/grub/x86_64-efi/hfs.mod -usr/lib/grub/x86_64-efi/hfs.module -usr/lib/grub/x86_64-efi/hfsplus.mod -usr/lib/grub/x86_64-efi/hfsplus.module -usr/lib/grub/x86_64-efi/hfspluscomp.mod -usr/lib/grub/x86_64-efi/hfspluscomp.module -usr/lib/grub/x86_64-efi/http.mod -usr/lib/grub/x86_64-efi/http.module -usr/lib/grub/x86_64-efi/iorw.mod -usr/lib/grub/x86_64-efi/iorw.module -usr/lib/grub/x86_64-efi/iso9660.mod -usr/lib/grub/x86_64-efi/iso9660.module -usr/lib/grub/x86_64-efi/jfs.mod -usr/lib/grub/x86_64-efi/jfs.module -usr/lib/grub/x86_64-efi/jpeg.mod -usr/lib/grub/x86_64-efi/jpeg.module -usr/lib/grub/x86_64-efi/json.mod -usr/lib/grub/x86_64-efi/json.module -usr/lib/grub/x86_64-efi/kernel.exec -usr/lib/grub/x86_64-efi/kernel.img -usr/lib/grub/x86_64-efi/keylayouts.mod -usr/lib/grub/x86_64-efi/keylayouts.module -usr/lib/grub/x86_64-efi/keystatus.mod -usr/lib/grub/x86_64-efi/keystatus.module -usr/lib/grub/x86_64-efi/ldm.mod -usr/lib/grub/x86_64-efi/ldm.module -usr/lib/grub/x86_64-efi/legacy_password_test.mod -usr/lib/grub/x86_64-efi/legacy_password_test.module -usr/lib/grub/x86_64-efi/legacycfg.mod -usr/lib/grub/x86_64-efi/legacycfg.module -usr/lib/grub/x86_64-efi/linux.mod -usr/lib/grub/x86_64-efi/linux.module -usr/lib/grub/x86_64-efi/linux16.mod -usr/lib/grub/x86_64-efi/linux16.module -usr/lib/grub/x86_64-efi/loadbios.mod -usr/lib/grub/x86_64-efi/loadbios.module -usr/lib/grub/x86_64-efi/loadenv.mod -usr/lib/grub/x86_64-efi/loadenv.module -usr/lib/grub/x86_64-efi/loopback.mod -usr/lib/grub/x86_64-efi/loopback.module -usr/lib/grub/x86_64-efi/ls.mod -usr/lib/grub/x86_64-efi/ls.module -usr/lib/grub/x86_64-efi/lsacpi.mod -usr/lib/grub/x86_64-efi/lsacpi.module -usr/lib/grub/x86_64-efi/lsefi.mod -usr/lib/grub/x86_64-efi/lsefi.module -usr/lib/grub/x86_64-efi/lsefimmap.mod -usr/lib/grub/x86_64-efi/lsefimmap.module -usr/lib/grub/x86_64-efi/lsefisystab.mod -usr/lib/grub/x86_64-efi/lsefisystab.module -usr/lib/grub/x86_64-efi/lsmmap.mod -usr/lib/grub/x86_64-efi/lsmmap.module -usr/lib/grub/x86_64-efi/lspci.mod -usr/lib/grub/x86_64-efi/lspci.module -usr/lib/grub/x86_64-efi/lssal.mod -usr/lib/grub/x86_64-efi/lssal.module -usr/lib/grub/x86_64-efi/luks.mod -usr/lib/grub/x86_64-efi/luks.module -usr/lib/grub/x86_64-efi/luks2.mod -usr/lib/grub/x86_64-efi/luks2.module -usr/lib/grub/x86_64-efi/lvm.mod -usr/lib/grub/x86_64-efi/lvm.module -usr/lib/grub/x86_64-efi/lzopio.mod -usr/lib/grub/x86_64-efi/lzopio.module -usr/lib/grub/x86_64-efi/macbless.mod -usr/lib/grub/x86_64-efi/macbless.module -usr/lib/grub/x86_64-efi/macho.mod -usr/lib/grub/x86_64-efi/macho.module -usr/lib/grub/x86_64-efi/mdraid09.mod -usr/lib/grub/x86_64-efi/mdraid09.module -usr/lib/grub/x86_64-efi/mdraid09_be.mod -usr/lib/grub/x86_64-efi/mdraid09_be.module -usr/lib/grub/x86_64-efi/mdraid1x.mod -usr/lib/grub/x86_64-efi/mdraid1x.module -usr/lib/grub/x86_64-efi/memdisk.mod -usr/lib/grub/x86_64-efi/memdisk.module -usr/lib/grub/x86_64-efi/memrw.mod -usr/lib/grub/x86_64-efi/memrw.module -usr/lib/grub/x86_64-efi/minicmd.mod -usr/lib/grub/x86_64-efi/minicmd.module -usr/lib/grub/x86_64-efi/minix.mod -usr/lib/grub/x86_64-efi/minix.module -usr/lib/grub/x86_64-efi/minix2.mod -usr/lib/grub/x86_64-efi/minix2.module -usr/lib/grub/x86_64-efi/minix2_be.mod -usr/lib/grub/x86_64-efi/minix2_be.module -usr/lib/grub/x86_64-efi/minix3.mod -usr/lib/grub/x86_64-efi/minix3.module -usr/lib/grub/x86_64-efi/minix3_be.mod -usr/lib/grub/x86_64-efi/minix3_be.module -usr/lib/grub/x86_64-efi/minix_be.mod -usr/lib/grub/x86_64-efi/minix_be.module -usr/lib/grub/x86_64-efi/mmap.mod -usr/lib/grub/x86_64-efi/mmap.module -usr/lib/grub/x86_64-efi/moddep.lst -usr/lib/grub/x86_64-efi/modinfo.sh -usr/lib/grub/x86_64-efi/morse.mod -usr/lib/grub/x86_64-efi/morse.module -usr/lib/grub/x86_64-efi/mpi.mod -usr/lib/grub/x86_64-efi/mpi.module -usr/lib/grub/x86_64-efi/msdospart.mod -usr/lib/grub/x86_64-efi/msdospart.module -usr/lib/grub/x86_64-efi/mul_test.mod -usr/lib/grub/x86_64-efi/mul_test.module -usr/lib/grub/x86_64-efi/multiboot.mod -usr/lib/grub/x86_64-efi/multiboot.module -usr/lib/grub/x86_64-efi/multiboot2.mod -usr/lib/grub/x86_64-efi/multiboot2.module -usr/lib/grub/x86_64-efi/nativedisk.mod -usr/lib/grub/x86_64-efi/nativedisk.module -usr/lib/grub/x86_64-efi/net.mod -usr/lib/grub/x86_64-efi/net.module -usr/lib/grub/x86_64-efi/newc.mod -usr/lib/grub/x86_64-efi/newc.module -usr/lib/grub/x86_64-efi/nilfs2.mod -usr/lib/grub/x86_64-efi/nilfs2.module -usr/lib/grub/x86_64-efi/normal.mod -usr/lib/grub/x86_64-efi/normal.module -usr/lib/grub/x86_64-efi/ntfs.mod -usr/lib/grub/x86_64-efi/ntfs.module -usr/lib/grub/x86_64-efi/ntfscomp.mod -usr/lib/grub/x86_64-efi/ntfscomp.module -usr/lib/grub/x86_64-efi/odc.mod -usr/lib/grub/x86_64-efi/odc.module -usr/lib/grub/x86_64-efi/offsetio.mod -usr/lib/grub/x86_64-efi/offsetio.module -usr/lib/grub/x86_64-efi/ohci.mod -usr/lib/grub/x86_64-efi/ohci.module -usr/lib/grub/x86_64-efi/part_acorn.mod -usr/lib/grub/x86_64-efi/part_acorn.module -usr/lib/grub/x86_64-efi/part_amiga.mod -usr/lib/grub/x86_64-efi/part_amiga.module -usr/lib/grub/x86_64-efi/part_apple.mod -usr/lib/grub/x86_64-efi/part_apple.module -usr/lib/grub/x86_64-efi/part_bsd.mod -usr/lib/grub/x86_64-efi/part_bsd.module -usr/lib/grub/x86_64-efi/part_dfly.mod -usr/lib/grub/x86_64-efi/part_dfly.module -usr/lib/grub/x86_64-efi/part_dvh.mod -usr/lib/grub/x86_64-efi/part_dvh.module -usr/lib/grub/x86_64-efi/part_gpt.mod -usr/lib/grub/x86_64-efi/part_gpt.module -usr/lib/grub/x86_64-efi/part_msdos.mod -usr/lib/grub/x86_64-efi/part_msdos.module -usr/lib/grub/x86_64-efi/part_plan.mod -usr/lib/grub/x86_64-efi/part_plan.module -usr/lib/grub/x86_64-efi/part_sun.mod -usr/lib/grub/x86_64-efi/part_sun.module -usr/lib/grub/x86_64-efi/part_sunpc.mod -usr/lib/grub/x86_64-efi/part_sunpc.module -usr/lib/grub/x86_64-efi/partmap.lst -usr/lib/grub/x86_64-efi/parttool.lst -usr/lib/grub/x86_64-efi/parttool.mod -usr/lib/grub/x86_64-efi/parttool.module -usr/lib/grub/x86_64-efi/password.mod -usr/lib/grub/x86_64-efi/password.module -usr/lib/grub/x86_64-efi/password_pbkdf2.mod -usr/lib/grub/x86_64-efi/password_pbkdf2.module -usr/lib/grub/x86_64-efi/pata.mod -usr/lib/grub/x86_64-efi/pata.module -usr/lib/grub/x86_64-efi/pbkdf2.mod -usr/lib/grub/x86_64-efi/pbkdf2.module -usr/lib/grub/x86_64-efi/pbkdf2_test.mod -usr/lib/grub/x86_64-efi/pbkdf2_test.module -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/play.mod -usr/lib/grub/x86_64-efi/play.module -usr/lib/grub/x86_64-efi/png.mod -usr/lib/grub/x86_64-efi/png.module -usr/lib/grub/x86_64-efi/priority_queue.mod -usr/lib/grub/x86_64-efi/priority_queue.module -usr/lib/grub/x86_64-efi/probe.mod -usr/lib/grub/x86_64-efi/probe.module -usr/lib/grub/x86_64-efi/procfs.mod -usr/lib/grub/x86_64-efi/procfs.module -usr/lib/grub/x86_64-efi/progress.mod -usr/lib/grub/x86_64-efi/progress.module -usr/lib/grub/x86_64-efi/raid5rec.mod -usr/lib/grub/x86_64-efi/raid5rec.module -usr/lib/grub/x86_64-efi/raid6rec.mod -usr/lib/grub/x86_64-efi/raid6rec.module -usr/lib/grub/x86_64-efi/random.mod -usr/lib/grub/x86_64-efi/random.module -usr/lib/grub/x86_64-efi/rdmsr.mod -usr/lib/grub/x86_64-efi/rdmsr.module -usr/lib/grub/x86_64-efi/read.mod -usr/lib/grub/x86_64-efi/read.module -usr/lib/grub/x86_64-efi/reboot.mod -usr/lib/grub/x86_64-efi/reboot.module -usr/lib/grub/x86_64-efi/regexp.mod -usr/lib/grub/x86_64-efi/regexp.module -usr/lib/grub/x86_64-efi/reiserfs.mod -usr/lib/grub/x86_64-efi/reiserfs.module -usr/lib/grub/x86_64-efi/relocator.mod -usr/lib/grub/x86_64-efi/relocator.module -usr/lib/grub/x86_64-efi/romfs.mod -usr/lib/grub/x86_64-efi/romfs.module -usr/lib/grub/x86_64-efi/scsi.mod -usr/lib/grub/x86_64-efi/scsi.module -usr/lib/grub/x86_64-efi/search.mod -usr/lib/grub/x86_64-efi/search.module -usr/lib/grub/x86_64-efi/search_fs_file.mod -usr/lib/grub/x86_64-efi/search_fs_file.module -usr/lib/grub/x86_64-efi/search_fs_uuid.mod -usr/lib/grub/x86_64-efi/search_fs_uuid.module -usr/lib/grub/x86_64-efi/search_label.mod -usr/lib/grub/x86_64-efi/search_label.module -usr/lib/grub/x86_64-efi/serial.mod -usr/lib/grub/x86_64-efi/serial.module -usr/lib/grub/x86_64-efi/setjmp.mod -usr/lib/grub/x86_64-efi/setjmp.module -usr/lib/grub/x86_64-efi/setjmp_test.mod -usr/lib/grub/x86_64-efi/setjmp_test.module -usr/lib/grub/x86_64-efi/setpci.mod -usr/lib/grub/x86_64-efi/setpci.module -usr/lib/grub/x86_64-efi/sfs.mod -usr/lib/grub/x86_64-efi/sfs.module -usr/lib/grub/x86_64-efi/shift_test.mod -usr/lib/grub/x86_64-efi/shift_test.module -usr/lib/grub/x86_64-efi/signature_test.mod -usr/lib/grub/x86_64-efi/signature_test.module -usr/lib/grub/x86_64-efi/sleep.mod -usr/lib/grub/x86_64-efi/sleep.module -usr/lib/grub/x86_64-efi/sleep_test.mod -usr/lib/grub/x86_64-efi/sleep_test.module -usr/lib/grub/x86_64-efi/smbios.mod -usr/lib/grub/x86_64-efi/smbios.module -usr/lib/grub/x86_64-efi/spkmodem.mod -usr/lib/grub/x86_64-efi/spkmodem.module -usr/lib/grub/x86_64-efi/squash4.mod -usr/lib/grub/x86_64-efi/squash4.module -usr/lib/grub/x86_64-efi/strtoull_test.mod -usr/lib/grub/x86_64-efi/strtoull_test.module -usr/lib/grub/x86_64-efi/syslinuxcfg.mod -usr/lib/grub/x86_64-efi/syslinuxcfg.module -usr/lib/grub/x86_64-efi/tar.mod -usr/lib/grub/x86_64-efi/tar.module -usr/lib/grub/x86_64-efi/terminal.lst -usr/lib/grub/x86_64-efi/terminal.mod -usr/lib/grub/x86_64-efi/terminal.module -usr/lib/grub/x86_64-efi/terminfo.mod -usr/lib/grub/x86_64-efi/terminfo.module -usr/lib/grub/x86_64-efi/test.mod -usr/lib/grub/x86_64-efi/test.module -usr/lib/grub/x86_64-efi/test_blockarg.mod -usr/lib/grub/x86_64-efi/test_blockarg.module -usr/lib/grub/x86_64-efi/testload.mod -usr/lib/grub/x86_64-efi/testload.module -usr/lib/grub/x86_64-efi/testspeed.mod -usr/lib/grub/x86_64-efi/testspeed.module -usr/lib/grub/x86_64-efi/tftp.mod -usr/lib/grub/x86_64-efi/tftp.module -usr/lib/grub/x86_64-efi/tga.mod -usr/lib/grub/x86_64-efi/tga.module -usr/lib/grub/x86_64-efi/time.mod -usr/lib/grub/x86_64-efi/time.module -usr/lib/grub/x86_64-efi/tpm.mod -usr/lib/grub/x86_64-efi/tpm.module -usr/lib/grub/x86_64-efi/tr.mod -usr/lib/grub/x86_64-efi/tr.module -usr/lib/grub/x86_64-efi/trig.mod -usr/lib/grub/x86_64-efi/trig.module -usr/lib/grub/x86_64-efi/true.mod -usr/lib/grub/x86_64-efi/true.module -usr/lib/grub/x86_64-efi/udf.mod -usr/lib/grub/x86_64-efi/udf.module -usr/lib/grub/x86_64-efi/ufs1.mod -usr/lib/grub/x86_64-efi/ufs1.module -usr/lib/grub/x86_64-efi/ufs1_be.mod -usr/lib/grub/x86_64-efi/ufs1_be.module -usr/lib/grub/x86_64-efi/ufs2.mod -usr/lib/grub/x86_64-efi/ufs2.module -usr/lib/grub/x86_64-efi/uhci.mod -usr/lib/grub/x86_64-efi/uhci.module -usr/lib/grub/x86_64-efi/usb.mod -usr/lib/grub/x86_64-efi/usb.module -usr/lib/grub/x86_64-efi/usb_keyboard.mod -usr/lib/grub/x86_64-efi/usb_keyboard.module -usr/lib/grub/x86_64-efi/usbms.mod -usr/lib/grub/x86_64-efi/usbms.module -usr/lib/grub/x86_64-efi/usbserial_common.mod -usr/lib/grub/x86_64-efi/usbserial_common.module -usr/lib/grub/x86_64-efi/usbserial_ftdi.mod -usr/lib/grub/x86_64-efi/usbserial_ftdi.module -usr/lib/grub/x86_64-efi/usbserial_pl2303.mod -usr/lib/grub/x86_64-efi/usbserial_pl2303.module -usr/lib/grub/x86_64-efi/usbserial_usbdebug.mod -usr/lib/grub/x86_64-efi/usbserial_usbdebug.module -usr/lib/grub/x86_64-efi/usbtest.mod -usr/lib/grub/x86_64-efi/usbtest.module -usr/lib/grub/x86_64-efi/video.lst -usr/lib/grub/x86_64-efi/video.mod -usr/lib/grub/x86_64-efi/video.module -usr/lib/grub/x86_64-efi/video_bochs.mod -usr/lib/grub/x86_64-efi/video_bochs.module -usr/lib/grub/x86_64-efi/video_cirrus.mod -usr/lib/grub/x86_64-efi/video_cirrus.module -usr/lib/grub/x86_64-efi/video_colors.mod -usr/lib/grub/x86_64-efi/video_colors.module -usr/lib/grub/x86_64-efi/video_fb.mod -usr/lib/grub/x86_64-efi/video_fb.module -usr/lib/grub/x86_64-efi/videoinfo.mod -usr/lib/grub/x86_64-efi/videoinfo.module -usr/lib/grub/x86_64-efi/videotest.mod -usr/lib/grub/x86_64-efi/videotest.module -usr/lib/grub/x86_64-efi/videotest_checksum.mod -usr/lib/grub/x86_64-efi/videotest_checksum.module -usr/lib/grub/x86_64-efi/wrmsr.mod -usr/lib/grub/x86_64-efi/wrmsr.module -usr/lib/grub/x86_64-efi/xfs.mod -usr/lib/grub/x86_64-efi/xfs.module -usr/lib/grub/x86_64-efi/xnu.mod -usr/lib/grub/x86_64-efi/xnu.module -usr/lib/grub/x86_64-efi/xnu_uuid.mod -usr/lib/grub/x86_64-efi/xnu_uuid.module -usr/lib/grub/x86_64-efi/xnu_uuid_test.mod -usr/lib/grub/x86_64-efi/xnu_uuid_test.module -usr/lib/grub/x86_64-efi/xzio.mod -usr/lib/grub/x86_64-efi/xzio.module -usr/lib/grub/x86_64-efi/zfs.mod -usr/lib/grub/x86_64-efi/zfs.module -usr/lib/grub/x86_64-efi/zfscrypt.mod -usr/lib/grub/x86_64-efi/zfscrypt.module -usr/lib/grub/x86_64-efi/zfsinfo.mod -usr/lib/grub/x86_64-efi/zfsinfo.module -usr/lib/grub/x86_64-efi/zstd.mod -usr/lib/grub/x86_64-efi/zstd.module +#usr/lib/grub/riscv64-efi +usr/lib/grub/riscv64-efi/acpi.mod +usr/lib/grub/riscv64-efi/acpi.module +usr/lib/grub/riscv64-efi/adler32.mod +usr/lib/grub/riscv64-efi/adler32.module +usr/lib/grub/riscv64-efi/affs.mod +usr/lib/grub/riscv64-efi/affs.module +usr/lib/grub/riscv64-efi/afs.mod +usr/lib/grub/riscv64-efi/afs.module +usr/lib/grub/riscv64-efi/afsplitter.mod +usr/lib/grub/riscv64-efi/afsplitter.module +usr/lib/grub/riscv64-efi/all_video.mod +usr/lib/grub/riscv64-efi/all_video.module +usr/lib/grub/riscv64-efi/archelp.mod +usr/lib/grub/riscv64-efi/archelp.module +usr/lib/grub/riscv64-efi/bfs.mod +usr/lib/grub/riscv64-efi/bfs.module +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/blocklist.mod +usr/lib/grub/riscv64-efi/blocklist.module +usr/lib/grub/riscv64-efi/boot.mod +usr/lib/grub/riscv64-efi/boot.module +usr/lib/grub/riscv64-efi/bswap_test.mod +usr/lib/grub/riscv64-efi/bswap_test.module +usr/lib/grub/riscv64-efi/btrfs.mod +usr/lib/grub/riscv64-efi/btrfs.module +usr/lib/grub/riscv64-efi/bufio.mod +usr/lib/grub/riscv64-efi/bufio.module +usr/lib/grub/riscv64-efi/cat.mod +usr/lib/grub/riscv64-efi/cat.module +usr/lib/grub/riscv64-efi/cbfs.mod +usr/lib/grub/riscv64-efi/cbfs.module +usr/lib/grub/riscv64-efi/chain.mod +usr/lib/grub/riscv64-efi/chain.module +usr/lib/grub/riscv64-efi/cmdline_cat_test.mod +usr/lib/grub/riscv64-efi/cmdline_cat_test.module +usr/lib/grub/riscv64-efi/cmp.mod +usr/lib/grub/riscv64-efi/cmp.module +usr/lib/grub/riscv64-efi/cmp_test.mod +usr/lib/grub/riscv64-efi/cmp_test.module +usr/lib/grub/riscv64-efi/command.lst +usr/lib/grub/riscv64-efi/config.h +usr/lib/grub/riscv64-efi/configfile.mod +usr/lib/grub/riscv64-efi/configfile.module +usr/lib/grub/riscv64-efi/cpio.mod +usr/lib/grub/riscv64-efi/cpio.module +usr/lib/grub/riscv64-efi/cpio_be.mod +usr/lib/grub/riscv64-efi/cpio_be.module +usr/lib/grub/riscv64-efi/crc64.mod +usr/lib/grub/riscv64-efi/crc64.module +usr/lib/grub/riscv64-efi/crypto.lst +usr/lib/grub/riscv64-efi/crypto.mod +usr/lib/grub/riscv64-efi/crypto.module +usr/lib/grub/riscv64-efi/cryptodisk.mod +usr/lib/grub/riscv64-efi/cryptodisk.module +usr/lib/grub/riscv64-efi/ctz_test.mod +usr/lib/grub/riscv64-efi/ctz_test.module +usr/lib/grub/riscv64-efi/date.mod +usr/lib/grub/riscv64-efi/date.module +usr/lib/grub/riscv64-efi/datehook.mod +usr/lib/grub/riscv64-efi/datehook.module +usr/lib/grub/riscv64-efi/datetime.mod +usr/lib/grub/riscv64-efi/datetime.module +usr/lib/grub/riscv64-efi/disk.mod +usr/lib/grub/riscv64-efi/disk.module +usr/lib/grub/riscv64-efi/diskfilter.mod +usr/lib/grub/riscv64-efi/diskfilter.module +usr/lib/grub/riscv64-efi/div.mod +usr/lib/grub/riscv64-efi/div.module +usr/lib/grub/riscv64-efi/div_test.mod +usr/lib/grub/riscv64-efi/div_test.module +usr/lib/grub/riscv64-efi/dm_nv.mod +usr/lib/grub/riscv64-efi/dm_nv.module +usr/lib/grub/riscv64-efi/echo.mod +usr/lib/grub/riscv64-efi/echo.module +usr/lib/grub/riscv64-efi/efi_gop.mod +usr/lib/grub/riscv64-efi/efi_gop.module +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/elf.mod +usr/lib/grub/riscv64-efi/elf.module +usr/lib/grub/riscv64-efi/eval.mod +usr/lib/grub/riscv64-efi/eval.module +usr/lib/grub/riscv64-efi/exfat.mod +usr/lib/grub/riscv64-efi/exfat.module +usr/lib/grub/riscv64-efi/exfctest.mod +usr/lib/grub/riscv64-efi/exfctest.module +usr/lib/grub/riscv64-efi/ext2.mod +usr/lib/grub/riscv64-efi/ext2.module +usr/lib/grub/riscv64-efi/extcmd.mod +usr/lib/grub/riscv64-efi/extcmd.module +usr/lib/grub/riscv64-efi/f2fs.mod +usr/lib/grub/riscv64-efi/f2fs.module +usr/lib/grub/riscv64-efi/fat.mod +usr/lib/grub/riscv64-efi/fat.module +usr/lib/grub/riscv64-efi/fdt.lst +usr/lib/grub/riscv64-efi/fdt.mod +usr/lib/grub/riscv64-efi/fdt.module +usr/lib/grub/riscv64-efi/file.mod +usr/lib/grub/riscv64-efi/file.module +usr/lib/grub/riscv64-efi/font.mod +usr/lib/grub/riscv64-efi/font.module +usr/lib/grub/riscv64-efi/fs.lst +usr/lib/grub/riscv64-efi/fshelp.mod +usr/lib/grub/riscv64-efi/fshelp.module +usr/lib/grub/riscv64-efi/functional_test.mod +usr/lib/grub/riscv64-efi/functional_test.module +usr/lib/grub/riscv64-efi/gcry_arcfour.mod +usr/lib/grub/riscv64-efi/gcry_arcfour.module +usr/lib/grub/riscv64-efi/gcry_blowfish.mod +usr/lib/grub/riscv64-efi/gcry_blowfish.module +usr/lib/grub/riscv64-efi/gcry_camellia.mod +usr/lib/grub/riscv64-efi/gcry_camellia.module +usr/lib/grub/riscv64-efi/gcry_cast5.mod +usr/lib/grub/riscv64-efi/gcry_cast5.module +usr/lib/grub/riscv64-efi/gcry_crc.mod +usr/lib/grub/riscv64-efi/gcry_crc.module +usr/lib/grub/riscv64-efi/gcry_des.mod +usr/lib/grub/riscv64-efi/gcry_des.module +usr/lib/grub/riscv64-efi/gcry_dsa.mod +usr/lib/grub/riscv64-efi/gcry_dsa.module +usr/lib/grub/riscv64-efi/gcry_idea.mod +usr/lib/grub/riscv64-efi/gcry_idea.module +usr/lib/grub/riscv64-efi/gcry_md4.mod +usr/lib/grub/riscv64-efi/gcry_md4.module +usr/lib/grub/riscv64-efi/gcry_md5.mod +usr/lib/grub/riscv64-efi/gcry_md5.module +usr/lib/grub/riscv64-efi/gcry_rfc2268.mod +usr/lib/grub/riscv64-efi/gcry_rfc2268.module +usr/lib/grub/riscv64-efi/gcry_rijndael.mod +usr/lib/grub/riscv64-efi/gcry_rijndael.module +usr/lib/grub/riscv64-efi/gcry_rmd160.mod +usr/lib/grub/riscv64-efi/gcry_rmd160.module +usr/lib/grub/riscv64-efi/gcry_rsa.mod +usr/lib/grub/riscv64-efi/gcry_rsa.module +usr/lib/grub/riscv64-efi/gcry_seed.mod +usr/lib/grub/riscv64-efi/gcry_seed.module +usr/lib/grub/riscv64-efi/gcry_serpent.mod +usr/lib/grub/riscv64-efi/gcry_serpent.module +usr/lib/grub/riscv64-efi/gcry_sha1.mod +usr/lib/grub/riscv64-efi/gcry_sha1.module +usr/lib/grub/riscv64-efi/gcry_sha256.mod +usr/lib/grub/riscv64-efi/gcry_sha256.module +usr/lib/grub/riscv64-efi/gcry_sha512.mod +usr/lib/grub/riscv64-efi/gcry_sha512.module +usr/lib/grub/riscv64-efi/gcry_tiger.mod +usr/lib/grub/riscv64-efi/gcry_tiger.module +usr/lib/grub/riscv64-efi/gcry_twofish.mod +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/geli.mod +usr/lib/grub/riscv64-efi/geli.module +usr/lib/grub/riscv64-efi/gettext.mod +usr/lib/grub/riscv64-efi/gettext.module +usr/lib/grub/riscv64-efi/gfxmenu.mod +usr/lib/grub/riscv64-efi/gfxmenu.module +usr/lib/grub/riscv64-efi/gfxterm.mod +usr/lib/grub/riscv64-efi/gfxterm.module +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 +usr/lib/grub/riscv64-efi/gzio.module +usr/lib/grub/riscv64-efi/halt.mod +usr/lib/grub/riscv64-efi/halt.module +usr/lib/grub/riscv64-efi/hashsum.mod +usr/lib/grub/riscv64-efi/hashsum.module +usr/lib/grub/riscv64-efi/hello.mod +usr/lib/grub/riscv64-efi/hello.module +usr/lib/grub/riscv64-efi/help.mod +usr/lib/grub/riscv64-efi/help.module +usr/lib/grub/riscv64-efi/hexdump.mod +usr/lib/grub/riscv64-efi/hexdump.module +usr/lib/grub/riscv64-efi/hfs.mod +usr/lib/grub/riscv64-efi/hfs.module +usr/lib/grub/riscv64-efi/hfsplus.mod +usr/lib/grub/riscv64-efi/hfsplus.module +usr/lib/grub/riscv64-efi/hfspluscomp.mod +usr/lib/grub/riscv64-efi/hfspluscomp.module +usr/lib/grub/riscv64-efi/http.mod +usr/lib/grub/riscv64-efi/http.module +usr/lib/grub/riscv64-efi/iso9660.mod +usr/lib/grub/riscv64-efi/iso9660.module +usr/lib/grub/riscv64-efi/jfs.mod +usr/lib/grub/riscv64-efi/jfs.module +usr/lib/grub/riscv64-efi/jpeg.mod +usr/lib/grub/riscv64-efi/jpeg.module +usr/lib/grub/riscv64-efi/json.mod +usr/lib/grub/riscv64-efi/json.module +usr/lib/grub/riscv64-efi/kernel.exec +usr/lib/grub/riscv64-efi/kernel.img +usr/lib/grub/riscv64-efi/keystatus.mod +usr/lib/grub/riscv64-efi/keystatus.module +usr/lib/grub/riscv64-efi/ldm.mod +usr/lib/grub/riscv64-efi/ldm.module +usr/lib/grub/riscv64-efi/linux.mod +usr/lib/grub/riscv64-efi/linux.module +usr/lib/grub/riscv64-efi/loadenv.mod +usr/lib/grub/riscv64-efi/loadenv.module +usr/lib/grub/riscv64-efi/loopback.mod +usr/lib/grub/riscv64-efi/loopback.module +usr/lib/grub/riscv64-efi/ls.mod +usr/lib/grub/riscv64-efi/ls.module +usr/lib/grub/riscv64-efi/lsacpi.mod +usr/lib/grub/riscv64-efi/lsacpi.module +usr/lib/grub/riscv64-efi/lsefi.mod +usr/lib/grub/riscv64-efi/lsefi.module +usr/lib/grub/riscv64-efi/lsefimmap.mod +usr/lib/grub/riscv64-efi/lsefimmap.module +usr/lib/grub/riscv64-efi/lsefisystab.mod +usr/lib/grub/riscv64-efi/lsefisystab.module +usr/lib/grub/riscv64-efi/lsmmap.mod +usr/lib/grub/riscv64-efi/lsmmap.module +usr/lib/grub/riscv64-efi/lssal.mod +usr/lib/grub/riscv64-efi/lssal.module +usr/lib/grub/riscv64-efi/luks.mod +usr/lib/grub/riscv64-efi/luks.module +usr/lib/grub/riscv64-efi/luks2.mod +usr/lib/grub/riscv64-efi/luks2.module +usr/lib/grub/riscv64-efi/lvm.mod +usr/lib/grub/riscv64-efi/lvm.module +usr/lib/grub/riscv64-efi/lzopio.mod +usr/lib/grub/riscv64-efi/lzopio.module +usr/lib/grub/riscv64-efi/macbless.mod +usr/lib/grub/riscv64-efi/macbless.module +usr/lib/grub/riscv64-efi/macho.mod +usr/lib/grub/riscv64-efi/macho.module +usr/lib/grub/riscv64-efi/mdraid09.mod +usr/lib/grub/riscv64-efi/mdraid09.module +usr/lib/grub/riscv64-efi/mdraid09_be.mod +usr/lib/grub/riscv64-efi/mdraid09_be.module +usr/lib/grub/riscv64-efi/mdraid1x.mod +usr/lib/grub/riscv64-efi/mdraid1x.module +usr/lib/grub/riscv64-efi/memdisk.mod +usr/lib/grub/riscv64-efi/memdisk.module +usr/lib/grub/riscv64-efi/memrw.mod +usr/lib/grub/riscv64-efi/memrw.module +usr/lib/grub/riscv64-efi/minicmd.mod +usr/lib/grub/riscv64-efi/minicmd.module +usr/lib/grub/riscv64-efi/minix.mod +usr/lib/grub/riscv64-efi/minix.module +usr/lib/grub/riscv64-efi/minix2.mod +usr/lib/grub/riscv64-efi/minix2.module +usr/lib/grub/riscv64-efi/minix2_be.mod +usr/lib/grub/riscv64-efi/minix2_be.module +usr/lib/grub/riscv64-efi/minix3.mod +usr/lib/grub/riscv64-efi/minix3.module +usr/lib/grub/riscv64-efi/minix3_be.mod +usr/lib/grub/riscv64-efi/minix3_be.module +usr/lib/grub/riscv64-efi/minix_be.mod +usr/lib/grub/riscv64-efi/minix_be.module +usr/lib/grub/riscv64-efi/mmap.mod +usr/lib/grub/riscv64-efi/mmap.module +usr/lib/grub/riscv64-efi/moddep.lst +usr/lib/grub/riscv64-efi/modinfo.sh +usr/lib/grub/riscv64-efi/mpi.mod +usr/lib/grub/riscv64-efi/mpi.module +usr/lib/grub/riscv64-efi/msdospart.mod +usr/lib/grub/riscv64-efi/msdospart.module +usr/lib/grub/riscv64-efi/mul_test.mod +usr/lib/grub/riscv64-efi/mul_test.module +usr/lib/grub/riscv64-efi/net.mod +usr/lib/grub/riscv64-efi/net.module +usr/lib/grub/riscv64-efi/newc.mod +usr/lib/grub/riscv64-efi/newc.module +usr/lib/grub/riscv64-efi/nilfs2.mod +usr/lib/grub/riscv64-efi/nilfs2.module +usr/lib/grub/riscv64-efi/normal.mod +usr/lib/grub/riscv64-efi/normal.module +usr/lib/grub/riscv64-efi/ntfs.mod +usr/lib/grub/riscv64-efi/ntfs.module +usr/lib/grub/riscv64-efi/ntfscomp.mod +usr/lib/grub/riscv64-efi/ntfscomp.module +usr/lib/grub/riscv64-efi/odc.mod +usr/lib/grub/riscv64-efi/odc.module +usr/lib/grub/riscv64-efi/offsetio.mod +usr/lib/grub/riscv64-efi/offsetio.module +usr/lib/grub/riscv64-efi/part_acorn.mod +usr/lib/grub/riscv64-efi/part_acorn.module +usr/lib/grub/riscv64-efi/part_amiga.mod +usr/lib/grub/riscv64-efi/part_amiga.module +usr/lib/grub/riscv64-efi/part_apple.mod +usr/lib/grub/riscv64-efi/part_apple.module +usr/lib/grub/riscv64-efi/part_bsd.mod +usr/lib/grub/riscv64-efi/part_bsd.module +usr/lib/grub/riscv64-efi/part_dfly.mod +usr/lib/grub/riscv64-efi/part_dfly.module +usr/lib/grub/riscv64-efi/part_dvh.mod +usr/lib/grub/riscv64-efi/part_dvh.module +usr/lib/grub/riscv64-efi/part_gpt.mod +usr/lib/grub/riscv64-efi/part_gpt.module +usr/lib/grub/riscv64-efi/part_msdos.mod +usr/lib/grub/riscv64-efi/part_msdos.module +usr/lib/grub/riscv64-efi/part_plan.mod +usr/lib/grub/riscv64-efi/part_plan.module +usr/lib/grub/riscv64-efi/part_sun.mod +usr/lib/grub/riscv64-efi/part_sun.module +usr/lib/grub/riscv64-efi/part_sunpc.mod +usr/lib/grub/riscv64-efi/part_sunpc.module +usr/lib/grub/riscv64-efi/partmap.lst +usr/lib/grub/riscv64-efi/parttool.lst +usr/lib/grub/riscv64-efi/parttool.mod +usr/lib/grub/riscv64-efi/parttool.module +usr/lib/grub/riscv64-efi/password.mod +usr/lib/grub/riscv64-efi/password.module +usr/lib/grub/riscv64-efi/password_pbkdf2.mod +usr/lib/grub/riscv64-efi/password_pbkdf2.module +usr/lib/grub/riscv64-efi/pbkdf2.mod +usr/lib/grub/riscv64-efi/pbkdf2.module +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/png.mod +usr/lib/grub/riscv64-efi/png.module +usr/lib/grub/riscv64-efi/priority_queue.mod +usr/lib/grub/riscv64-efi/priority_queue.module +usr/lib/grub/riscv64-efi/probe.mod +usr/lib/grub/riscv64-efi/probe.module +usr/lib/grub/riscv64-efi/procfs.mod +usr/lib/grub/riscv64-efi/procfs.module +usr/lib/grub/riscv64-efi/progress.mod +usr/lib/grub/riscv64-efi/progress.module +usr/lib/grub/riscv64-efi/raid5rec.mod +usr/lib/grub/riscv64-efi/raid5rec.module +usr/lib/grub/riscv64-efi/raid6rec.mod +usr/lib/grub/riscv64-efi/raid6rec.module +usr/lib/grub/riscv64-efi/read.mod +usr/lib/grub/riscv64-efi/read.module +usr/lib/grub/riscv64-efi/reboot.mod +usr/lib/grub/riscv64-efi/reboot.module +usr/lib/grub/riscv64-efi/regexp.mod +usr/lib/grub/riscv64-efi/regexp.module +usr/lib/grub/riscv64-efi/reiserfs.mod +usr/lib/grub/riscv64-efi/reiserfs.module +usr/lib/grub/riscv64-efi/romfs.mod +usr/lib/grub/riscv64-efi/romfs.module +usr/lib/grub/riscv64-efi/scsi.mod +usr/lib/grub/riscv64-efi/scsi.module +usr/lib/grub/riscv64-efi/search.mod +usr/lib/grub/riscv64-efi/search.module +usr/lib/grub/riscv64-efi/search_fs_file.mod +usr/lib/grub/riscv64-efi/search_fs_file.module +usr/lib/grub/riscv64-efi/search_fs_uuid.mod +usr/lib/grub/riscv64-efi/search_fs_uuid.module +usr/lib/grub/riscv64-efi/search_label.mod +usr/lib/grub/riscv64-efi/search_label.module +usr/lib/grub/riscv64-efi/serial.mod +usr/lib/grub/riscv64-efi/serial.module +usr/lib/grub/riscv64-efi/setjmp.mod +usr/lib/grub/riscv64-efi/setjmp.module +usr/lib/grub/riscv64-efi/setjmp_test.mod +usr/lib/grub/riscv64-efi/setjmp_test.module +usr/lib/grub/riscv64-efi/sfs.mod +usr/lib/grub/riscv64-efi/sfs.module +usr/lib/grub/riscv64-efi/shift_test.mod +usr/lib/grub/riscv64-efi/shift_test.module +usr/lib/grub/riscv64-efi/signature_test.mod +usr/lib/grub/riscv64-efi/signature_test.module +usr/lib/grub/riscv64-efi/sleep.mod +usr/lib/grub/riscv64-efi/sleep.module +usr/lib/grub/riscv64-efi/sleep_test.mod +usr/lib/grub/riscv64-efi/sleep_test.module +usr/lib/grub/riscv64-efi/smbios.mod +usr/lib/grub/riscv64-efi/smbios.module +usr/lib/grub/riscv64-efi/squash4.mod +usr/lib/grub/riscv64-efi/squash4.module +usr/lib/grub/riscv64-efi/strtoull_test.mod +usr/lib/grub/riscv64-efi/strtoull_test.module +usr/lib/grub/riscv64-efi/syslinuxcfg.mod +usr/lib/grub/riscv64-efi/syslinuxcfg.module +usr/lib/grub/riscv64-efi/tar.mod +usr/lib/grub/riscv64-efi/tar.module +usr/lib/grub/riscv64-efi/terminal.lst +usr/lib/grub/riscv64-efi/terminal.mod +usr/lib/grub/riscv64-efi/terminal.module +usr/lib/grub/riscv64-efi/terminfo.mod +usr/lib/grub/riscv64-efi/terminfo.module +usr/lib/grub/riscv64-efi/test.mod +usr/lib/grub/riscv64-efi/test.module +usr/lib/grub/riscv64-efi/test_blockarg.mod +usr/lib/grub/riscv64-efi/test_blockarg.module +usr/lib/grub/riscv64-efi/testload.mod +usr/lib/grub/riscv64-efi/testload.module +usr/lib/grub/riscv64-efi/testspeed.mod +usr/lib/grub/riscv64-efi/testspeed.module +usr/lib/grub/riscv64-efi/tftp.mod +usr/lib/grub/riscv64-efi/tftp.module +usr/lib/grub/riscv64-efi/tga.mod +usr/lib/grub/riscv64-efi/tga.module +usr/lib/grub/riscv64-efi/time.mod +usr/lib/grub/riscv64-efi/time.module +usr/lib/grub/riscv64-efi/tpm.mod +usr/lib/grub/riscv64-efi/tpm.module +usr/lib/grub/riscv64-efi/tr.mod +usr/lib/grub/riscv64-efi/tr.module +usr/lib/grub/riscv64-efi/trig.mod +usr/lib/grub/riscv64-efi/trig.module +usr/lib/grub/riscv64-efi/true.mod +usr/lib/grub/riscv64-efi/true.module +usr/lib/grub/riscv64-efi/udf.mod +usr/lib/grub/riscv64-efi/udf.module +usr/lib/grub/riscv64-efi/ufs1.mod +usr/lib/grub/riscv64-efi/ufs1.module +usr/lib/grub/riscv64-efi/ufs1_be.mod +usr/lib/grub/riscv64-efi/ufs1_be.module +usr/lib/grub/riscv64-efi/ufs2.mod +usr/lib/grub/riscv64-efi/ufs2.module +usr/lib/grub/riscv64-efi/video.lst +usr/lib/grub/riscv64-efi/video.mod +usr/lib/grub/riscv64-efi/video.module +usr/lib/grub/riscv64-efi/video_colors.mod +usr/lib/grub/riscv64-efi/video_colors.module +usr/lib/grub/riscv64-efi/video_fb.mod +usr/lib/grub/riscv64-efi/video_fb.module +usr/lib/grub/riscv64-efi/videoinfo.mod +usr/lib/grub/riscv64-efi/videoinfo.module +usr/lib/grub/riscv64-efi/videotest.mod +usr/lib/grub/riscv64-efi/videotest.module +usr/lib/grub/riscv64-efi/videotest_checksum.mod +usr/lib/grub/riscv64-efi/videotest_checksum.module +usr/lib/grub/riscv64-efi/xfs.mod +usr/lib/grub/riscv64-efi/xfs.module +usr/lib/grub/riscv64-efi/xnu_uuid.mod +usr/lib/grub/riscv64-efi/xnu_uuid.module +usr/lib/grub/riscv64-efi/xnu_uuid_test.mod +usr/lib/grub/riscv64-efi/xnu_uuid_test.module +usr/lib/grub/riscv64-efi/xzio.mod +usr/lib/grub/riscv64-efi/xzio.module +usr/lib/grub/riscv64-efi/zfs.mod +usr/lib/grub/riscv64-efi/zfs.module +usr/lib/grub/riscv64-efi/zfscrypt.mod +usr/lib/grub/riscv64-efi/zfscrypt.module +usr/lib/grub/riscv64-efi/zfsinfo.mod +usr/lib/grub/riscv64-efi/zfsinfo.module +usr/lib/grub/riscv64-efi/zstd.mod +usr/lib/grub/riscv64-efi/zstd.module usr/sbin/grub-bios-setup usr/sbin/grub-install usr/sbin/grub-macbless @@ -1214,8 +541,6 @@ usr/share/grub/unicode.pf2 #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 @@ -1230,3 +555,29 @@ usr/share/grub/unicode.pf2 #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 +#usr/share/man/man1/grub-glue-efi.1 +#usr/share/man/man1/grub-kbdcomp.1 +#usr/share/man/man1/grub-menulst2cfg.1 +#usr/share/man/man1/grub-mkfont.1 +#usr/share/man/man1/grub-mkimage.1 +#usr/share/man/man1/grub-mklayout.1 +#usr/share/man/man1/grub-mknetdir.1 +#usr/share/man/man1/grub-mkpasswd-pbkdf2.1 +#usr/share/man/man1/grub-mkrelpath.1 +#usr/share/man/man1/grub-mkrescue.1 +#usr/share/man/man1/grub-mkstandalone.1 +#usr/share/man/man1/grub-render-label.1 +#usr/share/man/man1/grub-script-check.1 +#usr/share/man/man1/grub-syslinux2cfg.1 +#usr/share/man/man8/grub-bios-setup.8 +#usr/share/man/man8/grub-install.8 +#usr/share/man/man8/grub-macbless.8 +#usr/share/man/man8/grub-mkconfig.8 +#usr/share/man/man8/grub-ofpathname.8 +#usr/share/man/man8/grub-probe.8 +#usr/share/man/man8/grub-reboot.8 +#usr/share/man/man8/grub-set-default.8 +#usr/share/man/man8/grub-sparc64-setup.8 diff --git a/config/rootfiles/common/riscv64/hyperscan b/config/rootfiles/common/riscv64/hyperscan deleted file mode 100644 index 006e0fff9..000000000 --- a/config/rootfiles/common/riscv64/hyperscan +++ /dev/null @@ -1,18 +0,0 @@ -#usr/include/hs -#usr/include/hs/hs.h -#usr/include/hs/hs_common.h -#usr/include/hs/hs_compile.h -#usr/include/hs/hs_runtime.h -#usr/lib/libhs.so -usr/lib/libhs.so.5 -usr/lib/libhs.so.5.4.0 -usr/lib/libhs_runtime.so -usr/lib/libhs_runtime.so.5 -usr/lib/libhs_runtime.so.5.4.0 -#usr/lib/pkgconfig/libhs.pc -#usr/share/doc/hyperscan -#usr/share/doc/hyperscan/examples -#usr/share/doc/hyperscan/examples/README.md -#usr/share/doc/hyperscan/examples/patbench.cc -#usr/share/doc/hyperscan/examples/pcapscan.cc -#usr/share/doc/hyperscan/examples/simplegrep.c diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts index 628b59969..1848f8ebc 100644 --- a/config/rootfiles/common/riscv64/initscripts +++ b/config/rootfiles/common/riscv64/initscripts @@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire etc/rc.d/init.d/partresize etc/rc.d/init.d/rc etc/rc.d/init.d/reboot -etc/rc.d/init.d/rngd etc/rc.d/init.d/sendsignals etc/rc.d/init.d/setclock etc/rc.d/init.d/smartenabler @@ -184,7 +183,6 @@ etc/rc.d/rcsysinit.d/S44smt etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock -etc/rc.d/rcsysinit.d/S65rngd etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S71pakfire etc/rc.d/rcsysinit.d/S74cloud-init diff --git a/config/rootfiles/common/riscv64/intel-microcode b/config/rootfiles/common/riscv64/intel-microcode deleted file mode 100644 index cb45f6558..000000000 --- a/config/rootfiles/common/riscv64/intel-microcode +++ /dev/null @@ -1,139 +0,0 @@ -#lib/firmware/intel-ucode -lib/firmware/intel-ucode/06-03-02 -lib/firmware/intel-ucode/06-05-00 -lib/firmware/intel-ucode/06-05-01 -lib/firmware/intel-ucode/06-05-02 -lib/firmware/intel-ucode/06-05-03 -lib/firmware/intel-ucode/06-06-00 -lib/firmware/intel-ucode/06-06-05 -lib/firmware/intel-ucode/06-06-0a -lib/firmware/intel-ucode/06-06-0d -lib/firmware/intel-ucode/06-07-01 -lib/firmware/intel-ucode/06-07-02 -lib/firmware/intel-ucode/06-07-03 -lib/firmware/intel-ucode/06-08-01 -lib/firmware/intel-ucode/06-08-03 -lib/firmware/intel-ucode/06-08-06 -lib/firmware/intel-ucode/06-08-0a -lib/firmware/intel-ucode/06-09-05 -lib/firmware/intel-ucode/06-0a-00 -lib/firmware/intel-ucode/06-0a-01 -lib/firmware/intel-ucode/06-0b-01 -lib/firmware/intel-ucode/06-0b-04 -lib/firmware/intel-ucode/06-0d-06 -lib/firmware/intel-ucode/06-0e-08 -lib/firmware/intel-ucode/06-0e-0c -lib/firmware/intel-ucode/06-0f-02 -lib/firmware/intel-ucode/06-0f-06 -lib/firmware/intel-ucode/06-0f-07 -lib/firmware/intel-ucode/06-0f-0a -lib/firmware/intel-ucode/06-0f-0b -lib/firmware/intel-ucode/06-0f-0d -lib/firmware/intel-ucode/06-16-01 -lib/firmware/intel-ucode/06-17-06 -lib/firmware/intel-ucode/06-17-07 -lib/firmware/intel-ucode/06-17-0a -lib/firmware/intel-ucode/06-1a-04 -lib/firmware/intel-ucode/06-1a-05 -lib/firmware/intel-ucode/06-1c-02 -lib/firmware/intel-ucode/06-1c-0a -lib/firmware/intel-ucode/06-1d-01 -lib/firmware/intel-ucode/06-1e-05 -lib/firmware/intel-ucode/06-25-02 -lib/firmware/intel-ucode/06-25-05 -lib/firmware/intel-ucode/06-26-01 -lib/firmware/intel-ucode/06-2a-07 -lib/firmware/intel-ucode/06-2c-02 -lib/firmware/intel-ucode/06-2d-06 -lib/firmware/intel-ucode/06-2d-07 -lib/firmware/intel-ucode/06-2e-06 -lib/firmware/intel-ucode/06-2f-02 -lib/firmware/intel-ucode/06-37-08 -lib/firmware/intel-ucode/06-37-09 -lib/firmware/intel-ucode/06-3a-09 -lib/firmware/intel-ucode/06-3c-03 -lib/firmware/intel-ucode/06-3d-04 -lib/firmware/intel-ucode/06-3e-04 -lib/firmware/intel-ucode/06-3e-06 -lib/firmware/intel-ucode/06-3e-07 -lib/firmware/intel-ucode/06-3f-02 -lib/firmware/intel-ucode/06-3f-04 -lib/firmware/intel-ucode/06-45-01 -lib/firmware/intel-ucode/06-46-01 -lib/firmware/intel-ucode/06-47-01 -lib/firmware/intel-ucode/06-4c-03 -lib/firmware/intel-ucode/06-4c-04 -lib/firmware/intel-ucode/06-4d-08 -lib/firmware/intel-ucode/06-4e-03 -lib/firmware/intel-ucode/06-55-03 -lib/firmware/intel-ucode/06-55-04 -lib/firmware/intel-ucode/06-55-05 -lib/firmware/intel-ucode/06-55-06 -lib/firmware/intel-ucode/06-55-07 -lib/firmware/intel-ucode/06-55-0b -lib/firmware/intel-ucode/06-56-02 -lib/firmware/intel-ucode/06-56-03 -lib/firmware/intel-ucode/06-56-04 -lib/firmware/intel-ucode/06-56-05 -lib/firmware/intel-ucode/06-5c-02 -lib/firmware/intel-ucode/06-5c-09 -lib/firmware/intel-ucode/06-5c-0a -lib/firmware/intel-ucode/06-5e-03 -lib/firmware/intel-ucode/06-5f-01 -lib/firmware/intel-ucode/06-66-03 -lib/firmware/intel-ucode/06-6a-05 -lib/firmware/intel-ucode/06-6a-06 -lib/firmware/intel-ucode/06-6c-01 -lib/firmware/intel-ucode/06-7a-01 -lib/firmware/intel-ucode/06-7a-08 -lib/firmware/intel-ucode/06-7e-05 -lib/firmware/intel-ucode/06-8a-01 -lib/firmware/intel-ucode/06-8c-01 -lib/firmware/intel-ucode/06-8c-02 -lib/firmware/intel-ucode/06-8d-01 -lib/firmware/intel-ucode/06-8e-09 -lib/firmware/intel-ucode/06-8e-0a -lib/firmware/intel-ucode/06-8e-0b -lib/firmware/intel-ucode/06-8e-0c -lib/firmware/intel-ucode/06-96-01 -lib/firmware/intel-ucode/06-97-02 -lib/firmware/intel-ucode/06-97-05 -lib/firmware/intel-ucode/06-9a-03 -lib/firmware/intel-ucode/06-9a-04 -lib/firmware/intel-ucode/06-9c-00 -lib/firmware/intel-ucode/06-9e-09 -lib/firmware/intel-ucode/06-9e-0a -lib/firmware/intel-ucode/06-9e-0b -lib/firmware/intel-ucode/06-9e-0c -lib/firmware/intel-ucode/06-9e-0d -lib/firmware/intel-ucode/06-a5-02 -lib/firmware/intel-ucode/06-a5-03 -lib/firmware/intel-ucode/06-a5-05 -lib/firmware/intel-ucode/06-a6-00 -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-bf-02 -lib/firmware/intel-ucode/06-bf-05 -lib/firmware/intel-ucode/0f-00-07 -lib/firmware/intel-ucode/0f-00-0a -lib/firmware/intel-ucode/0f-01-02 -lib/firmware/intel-ucode/0f-02-04 -lib/firmware/intel-ucode/0f-02-05 -lib/firmware/intel-ucode/0f-02-06 -lib/firmware/intel-ucode/0f-02-07 -lib/firmware/intel-ucode/0f-02-09 -lib/firmware/intel-ucode/0f-03-02 -lib/firmware/intel-ucode/0f-03-03 -lib/firmware/intel-ucode/0f-03-04 -lib/firmware/intel-ucode/0f-04-01 -lib/firmware/intel-ucode/0f-04-03 -lib/firmware/intel-ucode/0f-04-04 -lib/firmware/intel-ucode/0f-04-07 -lib/firmware/intel-ucode/0f-04-08 -lib/firmware/intel-ucode/0f-04-09 -lib/firmware/intel-ucode/0f-04-0a -lib/firmware/intel-ucode/0f-06-02 -lib/firmware/intel-ucode/0f-06-04 -lib/firmware/intel-ucode/0f-06-05 -lib/firmware/intel-ucode/0f-06-08 diff --git a/config/rootfiles/common/riscv64/ipfire-netboot b/config/rootfiles/common/riscv64/ipfire-netboot deleted file mode 100644 index 33ec55504..000000000 --- a/config/rootfiles/common/riscv64/ipfire-netboot +++ /dev/null @@ -1,3 +0,0 @@ -#usr/share/ipfire-netboot -#usr/share/ipfire-netboot/ipxe.efi -#usr/share/ipfire-netboot/ipxe.lkrn diff --git a/config/rootfiles/common/riscv64/lm_sensors b/config/rootfiles/common/riscv64/lm_sensors index 0f7461d4c..52514f1ab 100644 --- a/config/rootfiles/common/riscv64/lm_sensors +++ b/config/rootfiles/common/riscv64/lm_sensors @@ -20,7 +20,5 @@ usr/lib/libsensors.so.5.0.0 #usr/man/man8/sensors-conf-convert.8 #usr/man/man8/sensors-detect.8 usr/sbin/fancontrol -usr/sbin/isadump -usr/sbin/isaset usr/sbin/pwmconfig usr/sbin/sensors-detect diff --git a/config/rootfiles/common/riscv64/syslinux b/config/rootfiles/common/riscv64/syslinux deleted file mode 100644 index 8bab25a02..000000000 --- a/config/rootfiles/common/riscv64/syslinux +++ /dev/null @@ -1,351 +0,0 @@ -#sbin/extlinux -#usr/bin/gethostip -usr/bin/isohybrid -#usr/bin/isohybrid.pl -#usr/bin/keytab-lilo -#usr/bin/lss16toppm -#usr/bin/md5pass -#usr/bin/memdiskfind -#usr/bin/mkdiskimage -#usr/bin/ppmtolss16 -#usr/bin/pxelinux-options -#usr/bin/sha1pass -#usr/bin/syslinux -#usr/bin/syslinux2ansi -#usr/man/man1/extlinux.1 -#usr/man/man1/gethostip.1 -#usr/man/man1/isohybrid.1 -#usr/man/man1/lss16toppm.1 -#usr/man/man1/memdiskfind.1 -#usr/man/man1/ppmtolss16.1 -#usr/man/man1/syslinux.1 -#usr/man/man1/syslinux2ansi.1 -#usr/share/syslinux -#usr/share/syslinux/altmbr.bin -#usr/share/syslinux/altmbr_c.bin -#usr/share/syslinux/altmbr_f.bin -#usr/share/syslinux/cat.c32 -#usr/share/syslinux/chain.c32 -#usr/share/syslinux/cmd.c32 -#usr/share/syslinux/cmenu.c32 -#usr/share/syslinux/com32 -#usr/share/syslinux/com32/com32.ld -#usr/share/syslinux/com32/include -#usr/share/syslinux/com32/include/alloca.h -#usr/share/syslinux/com32/include/assert.h -#usr/share/syslinux/com32/include/bitsize -#usr/share/syslinux/com32/include/bitsize/limits.h -#usr/share/syslinux/com32/include/bitsize/stddef.h -#usr/share/syslinux/com32/include/bitsize/stdint.h -#usr/share/syslinux/com32/include/bitsize/stdintconst.h -#usr/share/syslinux/com32/include/bitsize/stdintlimits.h -#usr/share/syslinux/com32/include/bitsize32 -#usr/share/syslinux/com32/include/bitsize32/limits.h -#usr/share/syslinux/com32/include/bitsize32/stddef.h -#usr/share/syslinux/com32/include/bitsize32/stdint.h -#usr/share/syslinux/com32/include/bitsize32/stdintconst.h -#usr/share/syslinux/com32/include/bitsize32/stdintlimits.h -#usr/share/syslinux/com32/include/bitsize64 -#usr/share/syslinux/com32/include/bitsize64/limits.h -#usr/share/syslinux/com32/include/bitsize64/stddef.h -#usr/share/syslinux/com32/include/bitsize64/stdint.h -#usr/share/syslinux/com32/include/bitsize64/stdintconst.h -#usr/share/syslinux/com32/include/bitsize64/stdintlimits.h -#usr/share/syslinux/com32/include/bufprintf.h -#usr/share/syslinux/com32/include/byteswap.h -#usr/share/syslinux/com32/include/cli.h -#usr/share/syslinux/com32/include/colortbl.h -#usr/share/syslinux/com32/include/com32.h -#usr/share/syslinux/com32/include/console.h -#usr/share/syslinux/com32/include/cpufeature.h -#usr/share/syslinux/com32/include/ctime.h -#usr/share/syslinux/com32/include/ctype.h -#usr/share/syslinux/com32/include/dev.h -#usr/share/syslinux/com32/include/dhcp.h -#usr/share/syslinux/com32/include/dirent.h -#usr/share/syslinux/com32/include/dprintf.h -#usr/share/syslinux/com32/include/elf.h -#usr/share/syslinux/com32/include/endian.h -#usr/share/syslinux/com32/include/errno.h -#usr/share/syslinux/com32/include/fcntl.h -#usr/share/syslinux/com32/include/getopt.h -#usr/share/syslinux/com32/include/gplinclude -#usr/share/syslinux/com32/include/gplinclude/README -#usr/share/syslinux/com32/include/gplinclude/acpi -#usr/share/syslinux/com32/include/gplinclude/acpi/acpi.h -#usr/share/syslinux/com32/include/gplinclude/acpi/boot.h -#usr/share/syslinux/com32/include/gplinclude/acpi/dsdt.h -#usr/share/syslinux/com32/include/gplinclude/acpi/ecdt.h -#usr/share/syslinux/com32/include/gplinclude/acpi/facs.h -#usr/share/syslinux/com32/include/gplinclude/acpi/fadt.h -#usr/share/syslinux/com32/include/gplinclude/acpi/hpet.h -#usr/share/syslinux/com32/include/gplinclude/acpi/madt.h -#usr/share/syslinux/com32/include/gplinclude/acpi/mcfg.h -#usr/share/syslinux/com32/include/gplinclude/acpi/rsdp.h -#usr/share/syslinux/com32/include/gplinclude/acpi/rsdt.h -#usr/share/syslinux/com32/include/gplinclude/acpi/sbst.h -#usr/share/syslinux/com32/include/gplinclude/acpi/slic.h -#usr/share/syslinux/com32/include/gplinclude/acpi/ssdt.h -#usr/share/syslinux/com32/include/gplinclude/acpi/structs.h -#usr/share/syslinux/com32/include/gplinclude/acpi/tcpa.h -#usr/share/syslinux/com32/include/gplinclude/acpi/xsdt.h -#usr/share/syslinux/com32/include/gplinclude/cpuid.h -#usr/share/syslinux/com32/include/gplinclude/disk -#usr/share/syslinux/com32/include/gplinclude/disk/bootloaders.h -#usr/share/syslinux/com32/include/gplinclude/disk/common.h -#usr/share/syslinux/com32/include/gplinclude/disk/errno_disk.h -#usr/share/syslinux/com32/include/gplinclude/disk/error.h -#usr/share/syslinux/com32/include/gplinclude/disk/geom.h -#usr/share/syslinux/com32/include/gplinclude/disk/mbrs.h -#usr/share/syslinux/com32/include/gplinclude/disk/msdos.h -#usr/share/syslinux/com32/include/gplinclude/disk/partition.h -#usr/share/syslinux/com32/include/gplinclude/disk/read.h -#usr/share/syslinux/com32/include/gplinclude/disk/swsusp.h -#usr/share/syslinux/com32/include/gplinclude/disk/util.h -#usr/share/syslinux/com32/include/gplinclude/disk/write.h -#usr/share/syslinux/com32/include/gplinclude/dmi -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_base_board.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_battery.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_bios.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_cache.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_chassis.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_ipmi.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_memory.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_processor.h -#usr/share/syslinux/com32/include/gplinclude/dmi/dmi_system.h -#usr/share/syslinux/com32/include/gplinclude/memory.h -#usr/share/syslinux/com32/include/gplinclude/vpd -#usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h -#usr/share/syslinux/com32/include/gplinclude/zzjson -#usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h -#usr/share/syslinux/com32/include/hw -#usr/share/syslinux/com32/include/hw/vga.h -#usr/share/syslinux/com32/include/ilog2.h -#usr/share/syslinux/com32/include/inttypes.h -#usr/share/syslinux/com32/include/klibc -#usr/share/syslinux/com32/include/klibc/archsetjmp.h -#usr/share/syslinux/com32/include/klibc/compiler.h -#usr/share/syslinux/com32/include/klibc/diverr.h -#usr/share/syslinux/com32/include/klibc/endian.h -#usr/share/syslinux/com32/include/klibc/extern.h -#usr/share/syslinux/com32/include/klibc/i386 -#usr/share/syslinux/com32/include/klibc/i386/archsetjmp.h -#usr/share/syslinux/com32/include/klibc/sysconfig.h -#usr/share/syslinux/com32/include/klibc/x86_64 -#usr/share/syslinux/com32/include/klibc/x86_64/archsetjmp.h -#usr/share/syslinux/com32/include/libansi.h -#usr/share/syslinux/com32/include/limits.h -#usr/share/syslinux/com32/include/linux -#usr/share/syslinux/com32/include/linux/list.h -#usr/share/syslinux/com32/include/math.h -#usr/share/syslinux/com32/include/menu.h -#usr/share/syslinux/com32/include/minmax.h -#usr/share/syslinux/com32/include/netinet -#usr/share/syslinux/com32/include/netinet/in.h -#usr/share/syslinux/com32/include/png.h -#usr/share/syslinux/com32/include/pngconf.h -#usr/share/syslinux/com32/include/refstr.h -#usr/share/syslinux/com32/include/serial.h -#usr/share/syslinux/com32/include/setjmp.h -#usr/share/syslinux/com32/include/sort.h -#usr/share/syslinux/com32/include/srecsend.h -#usr/share/syslinux/com32/include/stdarg.h -#usr/share/syslinux/com32/include/stdbool.h -#usr/share/syslinux/com32/include/stddef.h -#usr/share/syslinux/com32/include/stdint.h -#usr/share/syslinux/com32/include/stdio.h -#usr/share/syslinux/com32/include/stdlib.h -#usr/share/syslinux/com32/include/string.h -#usr/share/syslinux/com32/include/suffix_number.h -#usr/share/syslinux/com32/include/sys -#usr/share/syslinux/com32/include/sys/bitops.h -#usr/share/syslinux/com32/include/sys/cpu.h -#usr/share/syslinux/com32/include/sys/dirent.h -#usr/share/syslinux/com32/include/sys/elf32.h -#usr/share/syslinux/com32/include/sys/elf64.h -#usr/share/syslinux/com32/include/sys/elfcommon.h -#usr/share/syslinux/com32/include/sys/exec.h -#usr/share/syslinux/com32/include/sys/fpu.h -#usr/share/syslinux/com32/include/sys/gpxe.h -#usr/share/syslinux/com32/include/sys/i386 -#usr/share/syslinux/com32/include/sys/i386/bitops.h -#usr/share/syslinux/com32/include/sys/i386/cpu.h -#usr/share/syslinux/com32/include/sys/i386/module.h -#usr/share/syslinux/com32/include/sys/io.h -#usr/share/syslinux/com32/include/sys/module.h -#usr/share/syslinux/com32/include/sys/pci.h -#usr/share/syslinux/com32/include/sys/stat.h -#usr/share/syslinux/com32/include/sys/time.h -#usr/share/syslinux/com32/include/sys/times.h -#usr/share/syslinux/com32/include/sys/types.h -#usr/share/syslinux/com32/include/sys/x86_64 -#usr/share/syslinux/com32/include/sys/x86_64/bitops.h -#usr/share/syslinux/com32/include/sys/x86_64/cpu.h -#usr/share/syslinux/com32/include/sys/x86_64/module.h -#usr/share/syslinux/com32/include/syslinux -#usr/share/syslinux/com32/include/syslinux/adv.h -#usr/share/syslinux/com32/include/syslinux/advconst.h -#usr/share/syslinux/com32/include/syslinux/align.h -#usr/share/syslinux/com32/include/syslinux/boot.h -#usr/share/syslinux/com32/include/syslinux/bootpm.h -#usr/share/syslinux/com32/include/syslinux/bootrm.h -#usr/share/syslinux/com32/include/syslinux/config.h -#usr/share/syslinux/com32/include/syslinux/debug.h -#usr/share/syslinux/com32/include/syslinux/disk.h -#usr/share/syslinux/com32/include/syslinux/firmware.h -#usr/share/syslinux/com32/include/syslinux/idle.h -#usr/share/syslinux/com32/include/syslinux/io.h -#usr/share/syslinux/com32/include/syslinux/keyboard.h -#usr/share/syslinux/com32/include/syslinux/linux.h -#usr/share/syslinux/com32/include/syslinux/loadfile.h -#usr/share/syslinux/com32/include/syslinux/memscan.h -#usr/share/syslinux/com32/include/syslinux/movebits.h -#usr/share/syslinux/com32/include/syslinux/pmapi.h -#usr/share/syslinux/com32/include/syslinux/pxe.h -#usr/share/syslinux/com32/include/syslinux/pxe_api.h -#usr/share/syslinux/com32/include/syslinux/reboot.h -#usr/share/syslinux/com32/include/syslinux/resolve.h -#usr/share/syslinux/com32/include/syslinux/sysappend.h -#usr/share/syslinux/com32/include/syslinux/version.h -#usr/share/syslinux/com32/include/syslinux/vesacon.h -#usr/share/syslinux/com32/include/syslinux/video.h -#usr/share/syslinux/com32/include/syslinux/zio.h -#usr/share/syslinux/com32/include/tftp.h -#usr/share/syslinux/com32/include/time.h -#usr/share/syslinux/com32/include/tinyjpeg.h -#usr/share/syslinux/com32/include/unistd.h -#usr/share/syslinux/com32/include/upload_backend.h -#usr/share/syslinux/com32/include/zconf.h -#usr/share/syslinux/com32/include/zlib.h -#usr/share/syslinux/com32/libcom32upload.a -#usr/share/syslinux/com32/libgpl.c32 -#usr/share/syslinux/com32/libutil_lnx.a -#usr/share/syslinux/config.c32 -#usr/share/syslinux/cptime.c32 -#usr/share/syslinux/cpu.c32 -#usr/share/syslinux/cpuid.c32 -#usr/share/syslinux/cpuidtest.c32 -#usr/share/syslinux/debug.c32 -#usr/share/syslinux/dhcp.c32 -#usr/share/syslinux/diag -#usr/share/syslinux/diag/geodsp1s.img.xz -#usr/share/syslinux/diag/geodspms.img.xz -#usr/share/syslinux/diag/handoff.bin -#usr/share/syslinux/dir.c32 -#usr/share/syslinux/disk.c32 -#usr/share/syslinux/dmi.c32 -#usr/share/syslinux/dmitest.c32 -#usr/share/syslinux/dosutil -#usr/share/syslinux/dosutil/copybs.com -#usr/share/syslinux/dosutil/eltorito.sys -#usr/share/syslinux/dosutil/mdiskchk.com -#usr/share/syslinux/efi64 -#usr/share/syslinux/efi64/cat.c32 -#usr/share/syslinux/efi64/chain.c32 -#usr/share/syslinux/efi64/cmd.c32 -#usr/share/syslinux/efi64/cmenu.c32 -#usr/share/syslinux/efi64/config.c32 -#usr/share/syslinux/efi64/cptime.c32 -#usr/share/syslinux/efi64/cpu.c32 -#usr/share/syslinux/efi64/cpuid.c32 -#usr/share/syslinux/efi64/cpuidtest.c32 -#usr/share/syslinux/efi64/debug.c32 -#usr/share/syslinux/efi64/dhcp.c32 -#usr/share/syslinux/efi64/dir.c32 -#usr/share/syslinux/efi64/dmi.c32 -#usr/share/syslinux/efi64/dmitest.c32 -#usr/share/syslinux/efi64/gfxboot.c32 -#usr/share/syslinux/efi64/hdt.c32 -#usr/share/syslinux/efi64/hexdump.c32 -#usr/share/syslinux/efi64/host.c32 -#usr/share/syslinux/efi64/ifcpu.c32 -#usr/share/syslinux/efi64/ifcpu64.c32 -#usr/share/syslinux/efi64/ldlinux.e64 -#usr/share/syslinux/efi64/lfs.c32 -#usr/share/syslinux/efi64/libcom32.c32 -#usr/share/syslinux/efi64/libgpl.c32 -#usr/share/syslinux/efi64/liblua.c32 -#usr/share/syslinux/efi64/libmenu.c32 -#usr/share/syslinux/efi64/libutil.c32 -#usr/share/syslinux/efi64/linux.c32 -#usr/share/syslinux/efi64/ls.c32 -#usr/share/syslinux/efi64/lua.c32 -#usr/share/syslinux/efi64/mboot.c32 -#usr/share/syslinux/efi64/meminfo.c32 -#usr/share/syslinux/efi64/menu.c32 -#usr/share/syslinux/efi64/pci.c32 -#usr/share/syslinux/efi64/pwd.c32 -#usr/share/syslinux/efi64/reboot.c32 -#usr/share/syslinux/efi64/rosh.c32 -#usr/share/syslinux/efi64/sysdump.c32 -#usr/share/syslinux/efi64/syslinux.c32 -#usr/share/syslinux/efi64/syslinux.efi -#usr/share/syslinux/efi64/vesa.c32 -#usr/share/syslinux/efi64/vesamenu.c32 -#usr/share/syslinux/efi64/vpdtest.c32 -#usr/share/syslinux/efi64/whichsys.c32 -#usr/share/syslinux/efi64/zzjson.c32 -#usr/share/syslinux/elf.c32 -#usr/share/syslinux/ethersel.c32 -#usr/share/syslinux/gfxboot.c32 -#usr/share/syslinux/gptmbr.bin -#usr/share/syslinux/gptmbr_c.bin -#usr/share/syslinux/gptmbr_f.bin -#usr/share/syslinux/gpxecmd.c32 -#usr/share/syslinux/hdt.c32 -#usr/share/syslinux/hexdump.c32 -#usr/share/syslinux/host.c32 -#usr/share/syslinux/ifcpu.c32 -#usr/share/syslinux/ifcpu64.c32 -#usr/share/syslinux/ifmemdsk.c32 -#usr/share/syslinux/ifplop.c32 -#usr/share/syslinux/isohdpfx.bin -#usr/share/syslinux/isohdpfx_c.bin -#usr/share/syslinux/isohdpfx_f.bin -#usr/share/syslinux/isohdppx.bin -#usr/share/syslinux/isohdppx_c.bin -#usr/share/syslinux/isohdppx_f.bin -#usr/share/syslinux/isolinux-debug.bin -#usr/share/syslinux/isolinux.bin -#usr/share/syslinux/kbdmap.c32 -#usr/share/syslinux/kontron_wdt.c32 -#usr/share/syslinux/ldlinux.c32 -#usr/share/syslinux/lfs.c32 -#usr/share/syslinux/libcom32.c32 -#usr/share/syslinux/libgpl.c32 -#usr/share/syslinux/liblua.c32 -#usr/share/syslinux/libmenu.c32 -#usr/share/syslinux/libutil.c32 -#usr/share/syslinux/linux.c32 -#usr/share/syslinux/lpxelinux.0 -#usr/share/syslinux/ls.c32 -#usr/share/syslinux/lua.c32 -#usr/share/syslinux/mboot.c32 -#usr/share/syslinux/mbr.bin -#usr/share/syslinux/mbr_c.bin -#usr/share/syslinux/mbr_f.bin -#usr/share/syslinux/memdisk -#usr/share/syslinux/meminfo.c32 -#usr/share/syslinux/menu.c32 -#usr/share/syslinux/pci.c32 -#usr/share/syslinux/pcitest.c32 -#usr/share/syslinux/pmload.c32 -#usr/share/syslinux/poweroff.c32 -#usr/share/syslinux/prdhcp.c32 -#usr/share/syslinux/pwd.c32 -#usr/share/syslinux/pxechn.c32 -#usr/share/syslinux/pxelinux.0 -#usr/share/syslinux/reboot.c32 -#usr/share/syslinux/rosh.c32 -#usr/share/syslinux/sanboot.c32 -#usr/share/syslinux/sdi.c32 -#usr/share/syslinux/sysdump.c32 -#usr/share/syslinux/syslinux.c32 -#usr/share/syslinux/syslinux.com -#usr/share/syslinux/vesa.c32 -#usr/share/syslinux/vesainfo.c32 -#usr/share/syslinux/vesamenu.c32 -#usr/share/syslinux/vpdtest.c32 -#usr/share/syslinux/whichsys.c32 -#usr/share/syslinux/zzjson.c32 diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index b64e19681..75d7c632b 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -98,6 +98,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Cayman #usr/share/zoneinfo/America/Chicago #usr/share/zoneinfo/America/Chihuahua +#usr/share/zoneinfo/America/Ciudad_Juarez #usr/share/zoneinfo/America/Coral_Harbour #usr/share/zoneinfo/America/Cordoba #usr/share/zoneinfo/America/Costa_Rica @@ -716,6 +717,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Cayman #usr/share/zoneinfo/posix/America/Chicago #usr/share/zoneinfo/posix/America/Chihuahua +#usr/share/zoneinfo/posix/America/Ciudad_Juarez #usr/share/zoneinfo/posix/America/Coral_Harbour #usr/share/zoneinfo/posix/America/Cordoba #usr/share/zoneinfo/posix/America/Costa_Rica @@ -1334,6 +1336,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Cayman #usr/share/zoneinfo/right/America/Chicago #usr/share/zoneinfo/right/America/Chihuahua +#usr/share/zoneinfo/right/America/Ciudad_Juarez #usr/share/zoneinfo/right/America/Coral_Harbour #usr/share/zoneinfo/right/America/Cordoba #usr/share/zoneinfo/right/America/Costa_Rica diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 628b59969..1848f8ebc 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -73,7 +73,6 @@ etc/rc.d/init.d/pakfire etc/rc.d/init.d/partresize etc/rc.d/init.d/rc etc/rc.d/init.d/reboot -etc/rc.d/init.d/rngd etc/rc.d/init.d/sendsignals etc/rc.d/init.d/setclock etc/rc.d/init.d/smartenabler @@ -184,7 +183,6 @@ etc/rc.d/rcsysinit.d/S44smt etc/rc.d/rcsysinit.d/S45udev_retry etc/rc.d/rcsysinit.d/S50cleanfs etc/rc.d/rcsysinit.d/S60setclock -etc/rc.d/rcsysinit.d/S65rngd etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S71pakfire etc/rc.d/rcsysinit.d/S74cloud-init diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index 44703b54c..131ae8e28 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -6,10 +6,10 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libLLVM-15-rust-1.65.0-stable.so -#usr/lib/librustc_driver-a21dfa8672cc0cdd.so -#usr/lib/libstd-05737cf45bd30456.so -#usr/lib/libtest-b8b77fa76430964e.so +#usr/lib/libLLVM-15-rust-1.67.0-stable.so +#usr/lib/librustc_driver-2e8cbd5b30733393.so +#usr/lib/libstd-2a15b3cd0948397b.so +#usr/lib/libtest-aa7b246d7b35480c.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc @@ -34,38 +34,38 @@ #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/lld-link #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/wasm-ld #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-f14b73d282b0245e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-f156b880fc73e7f0.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-3fb6d8496dc7d6a6.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-a0d9b33b5161957b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-272ca28f0b8538d5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-a1f7b8b60464cc57.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-04ef34c95006bbea.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-2c5b4433ebc1d822.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-b08a86c6880b47a8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-04cec55a79224c36.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-098633b847612f3b.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-58adeee671f9ba8e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-7f13930fcac1846f.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-92361fe3d1d86e03.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-9f873b61fdec9b03.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-1cece883813579b0.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-3395ed33f8a00dbe.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-5d5a85338b125cfb.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-6c93f515800d4657.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-60668236929c1cf5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-0b6ce813aa5d1704.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-93189d615c3f2d6a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-c888e061ea504c93.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-6095bf995c453e89.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-3cf84ad460df483a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-dac6992ac677a0cb.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f0ffbd64420a69ad.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-431dd9a65eafb1c5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-3cd49acf880d0306.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-e8062a7445a64946.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-008ebe2e17c5f91d.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-8f251cec381c549e.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-bfb4a82e06efc4d7.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-9b09c3cec8a5576d.rlib #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-59591a7b405fe395.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-4458c5022988e1ab.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-7d46c016841a97d4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-4be5790574aecaaa.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-05737cf45bd30456.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-384947c6d5f697ff.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-b8b77fa76430964e.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-1c81e618a18568a4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-02e61e5ec4aa9e8b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-5a049915d61fbb5d.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-8a30445cf40d74de.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-2fb2d4481260f706.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-6352d71bf8e7bd57.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-2a15b3cd0948397b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-2a15b3cd0948397b.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-aabc21fad3549c98.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-aa7b246d7b35480c.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-aa7b246d7b35480c.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-ae66bd5269d6d83c.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-47cbfc4f5b0f6f87.rlib #usr/libexec/cargo-credential-1password #usr/libexec/rust-analyzer-proc-macro-srv #usr/share/cargo @@ -100,6 +100,7 @@ #usr/share/man/man1/cargo-package.1 #usr/share/man/man1/cargo-pkgid.1 #usr/share/man/man1/cargo-publish.1 +#usr/share/man/man1/cargo-remove.1 #usr/share/man/man1/cargo-report.1 #usr/share/man/man1/cargo-run.1 #usr/share/man/man1/cargo-rustc.1 diff --git a/config/rootfiles/core/174/filelists/aarch64/efivar b/config/rootfiles/core/174/filelists/aarch64/efivar new file mode 120000 index 000000000..8a3b708b9 --- /dev/null +++ b/config/rootfiles/core/174/filelists/aarch64/efivar @@ -0,0 +1 @@ +../../../../common/aarch64/efivar \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/files b/config/rootfiles/core/174/filelists/files index e69de29bb..baf9da9a7 100644 --- a/config/rootfiles/core/174/filelists/files +++ b/config/rootfiles/core/174/filelists/files @@ -0,0 +1,5 @@ +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/mail.cgi +var/ipfire/header.pl +var/ipfire/network-functions.pl diff --git a/config/rootfiles/core/174/filelists/lsof b/config/rootfiles/core/174/filelists/lsof new file mode 120000 index 000000000..1353d33e5 --- /dev/null +++ b/config/rootfiles/core/174/filelists/lsof @@ -0,0 +1 @@ +../../../common/lsof \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/squid b/config/rootfiles/core/174/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/174/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/tzdata b/config/rootfiles/core/174/filelists/tzdata new file mode 120000 index 000000000..5a6e3252f --- /dev/null +++ b/config/rootfiles/core/174/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/174/filelists/x86_64/efivar b/config/rootfiles/core/174/filelists/x86_64/efivar new file mode 120000 index 000000000..994ea5e1b --- /dev/null +++ b/config/rootfiles/core/174/filelists/x86_64/efivar @@ -0,0 +1 @@ +../../../../common/x86_64/efivar \ No newline at end of file diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh index 614e914f4..49280a89a 100644 --- a/config/rootfiles/core/174/update.sh +++ b/config/rootfiles/core/174/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2022 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2023 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/rc.d/init.d/squid stop # Extract files extract_files @@ -51,6 +52,9 @@ ldconfig # Start services telinit u +if [ -f /var/ipfire/proxy/enable ]; then + /etc/init.d/squid start +fi # This update needs a reboot... touch /var/run/need_reboot diff --git a/config/rootfiles/packages/epson-inkjet-printer-escpr b/config/rootfiles/packages/epson-inkjet-printer-escpr index 0039203d0..11cab72e3 100644 --- a/config/rootfiles/packages/epson-inkjet-printer-escpr +++ b/config/rootfiles/packages/epson-inkjet-printer-escpr @@ -38,9 +38,11 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-830_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-840_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-E-850_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EC-C110_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-10VA_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-306_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-30VA_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-315_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-4004-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-702A-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-703A-epson-escpr-en.ppd @@ -50,6 +52,12 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-707A_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-708A_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-709A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-710A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-711A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-712A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-713A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-714A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-715A_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-774A-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-775A_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-776A_Series-epson-escpr-en.ppd @@ -62,6 +70,12 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-806A_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-807A_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-808A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-810A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-811A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-812A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-813A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-814A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-815A_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-901A-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-901F-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-902A-epson-escpr-en.ppd @@ -77,39 +91,87 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-977A3_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-978A3_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-979A3_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-M552T_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-M553T_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EP-M570T_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-1110_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-16500_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-1810_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2400_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2500_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2550_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2600_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2610_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2650_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2700_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2710_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2720_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2750_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2760_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2800_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2810_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2820_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-2850_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4500_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4550_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4700_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-4800_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-7700_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-7750_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-M1100_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-M1120_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ET-M2120_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-052A_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M5071FT_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M571T_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M660FT_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M770T_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-EW-M970A3T_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-K200-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-K300-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L1110_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L1455_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3050_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3060_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3070_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3100_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3110_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3150_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3160_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3250_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L3260_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L364_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L375_Series-epson-escpr-en.ppd -#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L380_Series-epson-escpr-en.ppd -#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L382_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L385_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L386_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L395_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L396_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L405_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L4150_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L4160_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L4260_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L455_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L475_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L485_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L486_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L495_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L5190_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L5290_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L565_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L575_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L605_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L655_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L7160_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L7180_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L805_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L810_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-L850_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M1100_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M1120_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M200_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M205_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M2110_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-M2120_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-301_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-303_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ME-400_Series-epson-escpr-en.ppd @@ -200,9 +262,14 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M840FX-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-M860F-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S05_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S06_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S155_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S160T_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S170T_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S170UT_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S350-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S5040-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S505_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050PS-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050X-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PX-S7050_Series-epson-escpr-en.ppd @@ -227,6 +294,8 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_290-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_300-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-PictureMate_PM_310-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ST-2000_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-ST-C2100_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX2800-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX2900-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-Stylus_CX3700-epson-escpr-en.ppd @@ -370,6 +439,7 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX720_Artisan720-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-TX820_Artisan830-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-100_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-110_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2510_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2520_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2530_Series-epson-escpr-en.ppd @@ -379,6 +449,15 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2660_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2750_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2760_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2810_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2820_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2830_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2840_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2850_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2870_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2910_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2930_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-2950_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3010_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3520_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-3530_Series-epson-escpr-en.ppd @@ -392,7 +471,7 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5620_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-5690_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6090_Series-epson-escpr-en.ppd -#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6530-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6530_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-6590_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7110_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-WF-7510_Series-epson-escpr-en.ppd @@ -463,43 +542,58 @@ usr/share/ppd/Epson #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-201_204_208_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-202_203_206_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-205_207_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-2100_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-211_214_216_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-212_213_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-2150_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-215_217_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-2200_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-220_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-225_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-235_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-240_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-243_245_247_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-255_257_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-300_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-302_303_305_306_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-3100_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-310_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-312_313_315_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-3150_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-3200_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-320_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-322_323_325_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-330_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-332_335_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-340_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-342_343_345_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-352_355_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-400_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-402_403_405_406_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-4100_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-410_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-412_413_415_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-4150_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-4200_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-420_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-422_423_425_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-430_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-432_435_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-440_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-442_445_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-452_455_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-510_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-520_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-530_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-540_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-55_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-600_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-610_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-620_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-630_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-640_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-700_Series-epson-escpr-en.ppd +#usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-7100_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-710_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-720_Series-epson-escpr-en.ppd #usr/share/ppd/Epson/epson-inkjet-printer-escpr/Epson-XP-750_Series-epson-escpr-en.ppd diff --git a/config/rootfiles/common/rng-tools b/config/rootfiles/packages/rng-tools similarity index 69% rename from config/rootfiles/common/rng-tools rename to config/rootfiles/packages/rng-tools index 596a911c1..fbeda7800 100644 --- a/config/rootfiles/common/rng-tools +++ b/config/rootfiles/packages/rng-tools @@ -1,4 +1,6 @@ +usr/bin/randstat usr/bin/rngtest usr/sbin/rngd #usr/share/man/man1/rngtest.1 #usr/share/man/man8/rngd.8 +etc/rc.d/init.d/rngd diff --git a/doc/language_issues.de b/doc/language_issues.de index 88c7879be..392416192 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -883,7 +883,7 @@ WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes) WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes) WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation) WARNING: untranslated string: desired = Desired -WARNING: untranslated string: dh parameter = unknown string +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: disable = Disable WARNING: untranslated string: download apple profile = Download Apple Configuration Profile WARNING: untranslated string: enable = Enable diff --git a/doc/language_issues.en b/doc/language_issues.en index c29e3bed6..08fda35b7 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -574,7 +574,6 @@ WARNING: untranslated string: details = Details WARNING: untranslated string: device = Device WARNING: untranslated string: devices on blue = Devices on BLUE WARNING: untranslated string: dh = Diffie-Hellman-Parameter -WARNING: untranslated string: dh parameter = unknown string WARNING: untranslated string: dhcp advopt add = Add a DHCP option WARNING: untranslated string: dhcp advopt added = DHCP option added WARNING: untranslated string: dhcp advopt blank value = DHCP Option value cannot be empty. @@ -601,6 +600,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: dhcp make fixed lease = Add to fix leases WARNING: untranslated string: dhcp server = DHCP Server WARNING: untranslated string: dhcp server disabled = DHCP server disabled. Stopped. diff --git a/doc/language_issues.es b/doc/language_issues.es index 0bd390d5d..ffe423bd1 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -228,6 +228,7 @@ WARNING: translation string unused: dh key move failed WARNING: translation string unused: dh key warn WARNING: translation string unused: dh key warn1 WARNING: translation string unused: dh name is invalid +WARNING: translation string unused: dh parameter WARNING: translation string unused: dhcp base ip fixed lease WARNING: translation string unused: dhcp create fixed leases WARNING: translation string unused: dhcp fixed lease err1 @@ -943,6 +944,7 @@ WARNING: untranslated string: access point name is invalid = Access Point Name i WARNING: untranslated string: access point name is required = Access Point Name is required WARNING: untranslated string: bytes = unknown string WARNING: untranslated string: cpu frequency = CPU frequency +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: dns servers = DNS Servers WARNING: untranslated string: error message = unknown string WARNING: untranslated string: fwhost cust locationgrp = unknown string diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 56d69d86e..cb06f0ab3 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -392,7 +392,6 @@ WARNING: translation string unused: generatepolicy WARNING: translation string unused: generatereport WARNING: translation string unused: genkey WARNING: translation string unused: green interface -WARNING: translation string unused: guaranteed bandwith WARNING: translation string unused: guest ok WARNING: translation string unused: gz with key WARNING: translation string unused: harddisk temperature graphs @@ -404,6 +403,7 @@ WARNING: translation string unused: host deny WARNING: translation string unused: hostname and domain already in use WARNING: translation string unused: hour-graph WARNING: translation string unused: hours2 +WARNING: translation string unused: ibod for dual isdn only WARNING: translation string unused: icmp selected but no type WARNING: translation string unused: icmp type WARNING: translation string unused: id @@ -453,6 +453,10 @@ WARNING: translation string unused: ipblocklist category scanner WARNING: translation string unused: ipfire side WARNING: translation string unused: ipsec no connections WARNING: translation string unused: iptable rules +WARNING: translation string unused: isdn +WARNING: translation string unused: isdn settings +WARNING: translation string unused: isdn1 +WARNING: translation string unused: isdn2 WARNING: translation string unused: javascript menu error1 WARNING: translation string unused: javascript menu error2 WARNING: translation string unused: kernel version @@ -908,15 +912,11 @@ WARNING: translation string unused: zoneconf val zoneslave amount error WARNING: untranslated string: access point name = Access Point Name WARNING: untranslated string: access point name is invalid = Access Point Name is invalid WARNING: untranslated string: access point name is required = Access Point Name is required -WARNING: untranslated string: advproxy errmsg invalid url = Invalid URL WARNING: untranslated string: core notice 3 = available. -WARNING: untranslated string: dh = Diffie-Hellman-Parameter -WARNING: untranslated string: dh parameter = unknown string -WARNING: untranslated string: email recipient invalid = Invalid email recipient +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: error message = unknown string WARNING: untranslated string: fwhost cust locationgrp = unknown string WARNING: untranslated string: fwhost err hostip = unknown string -WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth WARNING: untranslated string: guardian block a host = unknown string WARNING: untranslated string: guardian block httpd brute-force = unknown string WARNING: untranslated string: guardian block ssh brute-force = unknown string @@ -947,9 +947,6 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string WARNING: untranslated string: pakfire ago = ago. -WARNING: untranslated string: retbleed = Retbleed WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string -WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service. -WARNING: untranslated string: show dh = Show Diffie-Hellman parameters diff --git a/doc/language_issues.it b/doc/language_issues.it index 9999f947c..dd794f57a 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -940,13 +940,13 @@ WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired WARNING: untranslated string: dh = Diffie-Hellman-Parameter -WARNING: untranslated string: dh parameter = unknown string WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: dhcp make fixed lease = Add to fix leases WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 14a7b420e..4f100abd2 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -943,12 +943,12 @@ WARNING: untranslated string: default = Default WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired WARNING: untranslated string: dh = Diffie-Hellman-Parameter -WARNING: untranslated string: dh parameter = unknown string WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: dhcp make fixed lease = Add to fix leases WARNING: untranslated string: disable = Disable WARNING: untranslated string: disconnected = Disconnected diff --git a/doc/language_issues.pl b/doc/language_issues.pl index a53a208d9..e91e62c5b 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -915,13 +915,13 @@ WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired WARNING: untranslated string: details = Details WARNING: untranslated string: dh = Diffie-Hellman-Parameter -WARNING: untranslated string: dh parameter = unknown string WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: dhcp make fixed lease = Add to fix leases WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable diff --git a/doc/language_issues.ru b/doc/language_issues.ru index c5dc1aa61..7dd1a63d7 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -911,13 +911,13 @@ WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired WARNING: untranslated string: details = Details WARNING: untranslated string: dh = Diffie-Hellman-Parameter -WARNING: untranslated string: dh parameter = unknown string WARNING: untranslated string: dhcp deny known clients: = Deny known clients: WARNING: untranslated string: dhcp dns enable update = Enable DNS Update (RFC2136): WARNING: untranslated string: dhcp dns key name = Key Name WARNING: untranslated string: dhcp dns update = DNS Update WARNING: untranslated string: dhcp dns update algo = Algorithm WARNING: untranslated string: dhcp dns update secret = Secret +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: dhcp make fixed lease = Add to fix leases WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 552082a96..3443b1f1a 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -926,8 +926,8 @@ WARNING: untranslated string: dangerous = Dangerous WARNING: untranslated string: default IP address = Default IP Address WARNING: untranslated string: desired = Desired WARNING: untranslated string: dh = Diffie-Hellman-Parameter -WARNING: untranslated string: dh parameter = unknown string WARNING: untranslated string: dhcp deny known clients: = Deny known clients: +WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range WARNING: untranslated string: dhcp make fixed lease = Add to fix leases WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked WARNING: untranslated string: disable = Disable diff --git a/doc/language_missings b/doc/language_missings index 65d38b422..78b9e8a2d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -47,6 +47,7 @@ < could not connect to www ipfire org < cryptographic settings < desired +< dhcp fixed ip address in dynamic range < dhcp server disabled on blue interface < dhcp server enabled on blue interface < disable @@ -102,6 +103,7 @@ < access point name is required < addon < cpu frequency +< dhcp fixed ip address in dynamic range < dns servers < hardware vulnerabilities < invalid ip or hostname @@ -115,18 +117,12 @@ < access point name < access point name is invalid < access point name is required -< advproxy errmsg invalid url < ansi t1.483 < bewan adsl pci st < bewan adsl usb -< dh -< email recipient invalid +< dhcp fixed ip address in dynamic range < g.dtm < g.lite -< guaranteed bandwidth -< retbleed -< service boot setting unavailable -< show dh < upload fcdsl.o ############################################################################ # Checking cgi-bin translations for language: it # @@ -252,6 +248,7 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp fixed ip address in dynamic range < dhcp make fixed lease < dhcp valid range required when deny known clients checked < disable @@ -756,6 +753,7 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp fixed ip address in dynamic range < dhcp make fixed lease < disable < Disabled @@ -1353,6 +1351,7 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp fixed ip address in dynamic range < dhcp make fixed lease < dhcp valid range required when deny known clients checked < disable @@ -2330,6 +2329,7 @@ < dhcp dns update < dhcp dns update algo < dhcp dns update secret +< dhcp fixed ip address in dynamic range < dhcp make fixed lease < dhcp valid range required when deny known clients checked < disable @@ -3173,6 +3173,7 @@ < desired < dh < dhcp deny known clients: +< dhcp fixed ip address in dynamic range < dhcp make fixed lease < dhcp valid range required when deny known clients checked < disable diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index 125713285..28b00215c 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -547,7 +547,8 @@ if ($dhcpsettings{'ACTION'} eq '' ) { # First launch from GUI $dhcpsettings{'ADVOPT_ENABLED'} = 'on'; } -&Header::openpage($Lang::tr{'dhcp configuration'}, 1, ''); +### START PAGE ### +&Header::openpage($Lang::tr{'dhcp configuration'}, 1, $Header::extraHead); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -843,11 +844,11 @@ foreach my $line (@current1) { } if ($dhcpsettings{'KEY1'} eq $key) { - print "<tr bgcolor='${Header::colouryellow}'>"; + print "<tr class='row-colouryellow'>"; } elsif ($key % 2) { - print "<tr bgcolor='$color{'color22'}'>"; + print "<tr class='row-color22'>"; } else { - print "<tr bgcolor='$color{'color20'}'>"; + print "<tr class='row-color20'>"; } print <<END @@ -1020,8 +1021,9 @@ my $ipdup = 0; my %ipinuse = (); my %macdupl = (); # Duplicate MACs have to be on different subnets my %ipoutside = (); +my %ipinrange = (); -# mark duplicate ip or duplicate MAC +# mark duplicate IP, duplicate MAC or IP in dynamic range foreach my $line (@current2) { my @temp = split(/\,/,$line); $macdupl{$temp[0]} += 1; @@ -1032,14 +1034,21 @@ foreach my $line (@current2) { if ($ipinuse{$temp[1]} > 1) { $ipdup = 1; # Flag up duplicates for use later } - # Mark IP addresses outwith known subnets $ipoutside{$temp[1]} = 1; + $ipinrange{$temp[1]} = 0; foreach my $itf (@ITFs) { - if ( &General::IpInSubnet($temp[1], - $netsettings{"${itf}_NETADDRESS"}, - $netsettings{"${itf}_NETMASK"})) { - $ipoutside{$temp[1]} = 0; - } + # Mark IP addresses outwith known subnets + if ( &General::IpInSubnet($temp[1], + $netsettings{"${itf}_NETADDRESS"}, + $netsettings{"${itf}_NETMASK"})) { + $ipoutside{$temp[1]} = 0; + } + # Mark IP addresses that overlap with dynamic range + if (&Network::ip_address_in_range($temp[1], + $dhcpsettings{"START_ADDR_${itf}"}, + $dhcpsettings{"END_ADDR_${itf}"})) { + $ipinrange{$temp[1]} = 1; + } } } @@ -1069,13 +1078,13 @@ foreach my $line (@current2) { if ($dhcpsettings{'KEY2'} eq $key) { print "<tr>"; - $col="bgcolor='${Header::colouryellow}'"; + $col="class='row-colouryellow'"; } elsif ($key % 2) { print "<tr>"; - $col="bgcolor='$color{'color20'}'"; + $col="class='row-color20'"; } else { print "<tr>"; - $col="bgcolor='$color{'color22'}'"; + $col="class='row-color22'"; } my $TAG0 = ''; my $TAG1 = ''; @@ -1091,12 +1100,15 @@ foreach my $line (@current2) { $TAG3 = '</b>'; } if ($ipoutside{$temp[1]} > 0) { - $TAG4 = "bgcolor='orange'" if ($dhcpsettings{'KEY2'} ne $key); + $TAG4 = "class='cell-orange'" if ($dhcpsettings{'KEY2'} ne $key); + } + if ($ipinrange{$temp[1]} > 0) { + $TAG4 = "class='cell-red'" if ($dhcpsettings{'KEY2'} ne $key); } print <<END <td align='center' $col>$TAG2$temp[0]$TAG3</td> -<td align='center' $col $TAG4>$TAG0$temp[1]$TAG1</td> +<td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td> <td align='center' $col>$temp[6] </td> <td align='center' $col>$temp[3] </td> <td align='center' $col>$temp[4] </td> @@ -1153,8 +1165,10 @@ print <<END </tr> <tr> <td> </td> - <td bgcolor='orange'> </td> - <td class='base'>$Lang::tr{'ip address outside subnets'}</td> + <td> </td> + <td class='base cell-orange'>$Lang::tr{'ip address outside subnets'}</td> + <td> &nbsp</td> + <td class='base cell-red'>$Lang::tr{'dhcp fixed ip address in dynamic range'}</td> <td> </td> <td> </td> $dup diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 5fb1fcd5d..bf71b3c9f 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -49,6 +49,7 @@ $cgiparams{'ACTION'} = ''; $cgiparams{'SECTION'} = 'ipfire'; my %sections = ( + 'apcupsd' => '(apcupsd\[.*?\]: )', 'auth' => '(\w+$pam_unix$\[.*\]: )', 'wio' => '(wio:|wio\[.*\])', 'captive' => '(Captive:)', @@ -81,6 +82,7 @@ my %sections = ( # Translations for the %sections array. my %trsections = ( + 'apcupsd' => 'APCUPS', 'auth' => "$Lang::tr{'loginlogout'}", 'wio' => 'Who Is Online?', 'captive' => $Lang::tr{'Captive'}, diff --git a/html/cgi-bin/mail.cgi b/html/cgi-bin/mail.cgi index 34f52ae01..0ed3dfeca 100644 --- a/html/cgi-bin/mail.cgi +++ b/html/cgi-bin/mail.cgi @@ -297,7 +297,7 @@ sub testmail { To => $mail{'RECIPIENT'}, #Cc => 'some(a)other.com, some(a)more.com', Subject => 'IPFire Testmail', - Type => 'multipart/mixed' + Type => 'multipart/alternative' ); ### Add parts (each "attach" has same arguments as "new"): @@ -306,15 +306,6 @@ sub testmail { Data => "This is the IPFire test mail." ); - ### Add attachment for testing - #$msg->attach( - # Type => 'application/txt', - # Encoding => 'base64', - # Path => '/var/ipfire/dma/dma.conf', - # Filename => 'dma.conf', - # Disposition => 'attachment' - #); - $msg->send_by_sendmail; } diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 80753b841..5a72f53b8 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -827,6 +827,7 @@ 'dhcp dns update' => 'DNS Update', 'dhcp dns update algo' => 'Algorithm', 'dhcp dns update secret' => 'Secret', +'dhcp fixed ip address in dynamic range' => 'Fixed IP Address in dynamic range', 'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.', 'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN', 'dhcp make fixed lease' => 'Add to fix leases', diff --git a/lfs/Config b/lfs/Config index 76a3ed485..589bd7195 100644 --- a/lfs/Config +++ b/lfs/Config @@ -13,7 +13,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 # @@ -105,13 +105,19 @@ DIR_TMP_PAK = $(DIR_TMP)/package-$(PROG) # Add the compiler location and version and specs to the ccache hash CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1) -# We support EFI on x86_64 and aarch64 +# We support EFI on x86_64 riscv64 and aarch64 ifeq "$(BUILD_ARCH)" "x86_64" EFI = 1 EFI_ARCH = x64 GRUB_ARCH = $(BUILD_ARCH) endif +ifeq "$(BUILD_ARCH)" "riscv64" + EFI = 1 + EFI_ARCH = $(BUILD_ARCH) + GRUB_ARCH = $(BUILD_ARCH) +endif + ifeq "$(BUILD_ARCH)" "aarch64" EFI = 1 EFI_ARCH = aa64 diff --git a/lfs/efibootmgr b/lfs/efibootmgr index 9e11b6b0f..b962d6dcc 100644 --- a/lfs/efibootmgr +++ b/lfs/efibootmgr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 # @@ -31,7 +31,6 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = aarch64 x86_64 ############################################################################### # Top-level Rules diff --git a/lfs/efivar b/lfs/efivar index 70ed90170..7bd26fad7 100644 --- a/lfs/efivar +++ b/lfs/efivar @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # @@ -31,7 +31,6 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = aarch64 x86_64 ############################################################################### # Top-level Rules @@ -73,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-37-compile-fixes-3.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/efivar-38_remove_march=native.patch # fix an issue in Makefile causing the package to be rebuilt during installation # obtained from https://linuxfromscratch.org/blfs/view/11.1/postlfs/efivar.html diff --git a/lfs/epson-inkjet-printer-escpr b/lfs/epson-inkjet-printer-escpr index fe794205c..7b7d1c21c 100644 --- a/lfs/epson-inkjet-printer-escpr +++ b/lfs/epson-inkjet-printer-escpr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Epson ESC/P-R Inkjet Printer Driver -VER = 1.6.12 +VER = 1.7.23 LSB = 1lsb3.2 THISAPP = epson-inkjet-printer-escpr-$(VER) @@ -35,7 +35,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = epson-inkjet-printer-escpr -PAK_VER = 2 +PAK_VER = 3 DEPS = cups @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a3e27ad6af938a0f239af6dbd783b20302b3b88b19cb734f1202e0fd1641497db062bb151a3b4915bc2baf2a0d18e725de5ac928f8f8e4bbd0daf52770944aa2 +$(DL_FILE)_BLAKE2 = 037ad4bb838732a658f349506d676585f32fa651bf196387fa9c3d8c57de2c701b5d609908ac7884f8322b26a142f71c9bf41cc054f8a866c0c242cbb71cd5f7 install : $(TARGET) diff --git a/lfs/fetchmail b/lfs/fetchmail index e018861f1..539c83287 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = Full-Featured POP and IMAP Mail Retrieval Daemon -VER = 6.4.34 +VER = 6.4.36 THISAPP = fetchmail-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = fetchmail -PAK_VER = 13 +PAK_VER = 14 DEPS = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 796972391a0ac2c71382aaaad3d75fd5c10ddcc58807f6c7ef9940907779e0ec0a8403e077b24afd50e1a7df0646e852cba02ba314e99ea423904e9f8288df01 +$(DL_FILE)_BLAKE2 = eb2f68d8e9254bd1cabb20aa8058326ee1c1e6819fc2ce011943708018b455d4259a2cf21d6eec0a4898ee1768c14f32d3617302ad418ccfbf6746c75c92c1fa install : $(TARGET) diff --git a/lfs/grub b/lfs/grub index 621795e7d..c32edb2ef 100644 --- a/lfs/grub +++ b/lfs/grub @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 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 # @@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = aarch64 x86_64 +#SUP_ARCH = aarch64 x86_64 ifeq "$(BUILD_ARCH)" "x86_64" BUILD_PC = 1 @@ -95,6 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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) && autoreconf -vfi # Install unifont diff --git a/lfs/htop b/lfs/htop index 019a844e1..faaf37047 100644 --- a/lfs/htop +++ b/lfs/htop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 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 # @@ -26,7 +26,7 @@ include Config SUMMARY = An Interactive text-mode Process Viewer for Linux -VER = 3.2.1 +VER = 3.2.2 THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 19 +PAK_VER = 20 DEPS = @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 7addefca7de8f0867220e6415f4585f7e6ecf655d6245e4a8e120552ac738544fde1c2d8e24ce1139209caad23994316e8be9611f6ed0253d60547158d17ff24 +$(DL_FILE)_BLAKE2 = da3b4aea4e5d32d4b432e0f45089e7795b59d9a947dc4af76cb6b7f9137e6d45901c8169c8d2c796a3f43162c1e3c8f1e18bd17f20750637e06fe4c3ebe22caa install : $(TARGET) diff --git a/lfs/initscripts b/lfs/initscripts index c6a5f3835..55f0066e5 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -170,7 +170,6 @@ $(TARGET) : ln -sf ../init.d/setclock /etc/rc.d/rcsysinit.d/S60setclock ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock - ln -sf ../init.d/rngd /etc/rc.d/rcsysinit.d/S65rngd ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console ln -sf ../init.d/pakfire /etc/rc.d/rcsysinit.d/S71pakfire ln -sf ../init.d/cloud-init /etc/rc.d/rcsysinit.d/S74cloud-init diff --git a/lfs/lsof b/lfs/lsof index eefaf35f5..2c654dd5b 100644 --- a/lfs/lsof +++ b/lfs/lsof @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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,10 +24,10 @@ include Config -VER = 4.95.0.linux +VER = 4.98.0 -THISAPP = lsof_$(VER) -DL_FILE = $(THISAPP).tar.bz2 +THISAPP = lsof-$(VER) +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 6a7d6353ec7f0f1e14416bff98867e64009c3f3901110c947f845bb3dcf9af3d40755c7ac6d586412a61778bc8ac355d2388cf2cfa8a975dbf4870c339c75a8c +$(DL_FILE)_BLAKE2 = 7ce5576653035bced042b07a946a09cb3c23da57a4f77a9f7bc8b8f86d531d73f0375a03fb0dc9e03f6ac18caa68bbb45144d6da13cee7ba94dfbb913fae9d03 install : $(TARGET) @@ -69,7 +69,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./Configure linux cd $(DIR_APP) && make $(MAKETUNING) CC="cc $(CFLAGS) $(LDFLAGS)" cd $(DIR_APP) && install -m 755 -o root -g root lsof /usr/bin diff --git a/lfs/rng-tools b/lfs/rng-tools index cafb1bcda..6a85a8482 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 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 # @@ -25,12 +25,19 @@ include Config VER = 6.14 +SUMMARY = This is a random number generator daemon THISAPP = rng-tools-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) +PROG = rng-tools +PAK_VER = 1 + +DEPS = + +SERVICES = rngd ############################################################################### # Top-level Rules @@ -50,6 +57,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) +dist: + @$(PAK) + ############################################################################### # Downloading, checking, b2sum ############################################################################### @@ -77,5 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --without-rtlsdr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install + #install initscript + $(call INSTALL_INITSCRIPTS,$(SERVICES)) @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/rust b/lfs/rust index f14648208..d0a200d57 100644 --- a/lfs/rust +++ b/lfs/rust @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 = 1.65.0 +VER = 1.67.0 # From https://forge.rust-lang.org/infra/other-installation-methods.html#standalon… @@ -42,10 +42,10 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = db2dd8518571c5d054502820a0f49483a6cf743ac74747cdb6bb2f3d681b2132de0ed2eb2a5228eaaf7fe737e415cb477764d04d29f565e2bf6cecf6109a468b -$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 73c0c4d995cf6e81b584b078528035d1fedb12e3c0d0435025945e2ba396850676f7f581ad1e627769122bbba5424591fac734520186b704bff7f7a8ca241385 -$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = 9038b158b2590a8a0a25f72f17ff38d88aff1cb210818a150f24d34dbdff9195f156f21ddccaadf9a3ecd3901161e183b5cb0e15e012f4a26be937a9782e0c6c -$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = 76874cfd1e8235eb6d99f75bd9affafa50d1b824664b2edd35c1a5276f51eabaf3f5d5c408070580bbfbdab862e6fe4186f552427e72ac3afa245b2c41c275ae +$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = 3409ed876f430ff22eff792fe9f4a4ca8457f26411def368b8d7fa5b854719c4c1feac5e054d7bccbcc3568bd3601a0e579df8b3bcf5b20c660bb7af4dbbb8f8 +$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 82c17813fbb4a48451a207dbc7879bd7239e947e249ad24e6e098bd2e250cd8aae79ab37bbc2549cb9ffc3e24ef6e072380bbcaf8a620b02457db24f328d92ea +$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = d099645796f46769e15520b15771bb1886ee040bbee9de00f4983e8fe56c945a9afe1bded33f80c9196354d720ef09588d24468a751a8e2512688fef47a33496 +$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = e5b0efa7114840535d5a0934a22510e850b05eb339eab42e561717281da993817df2e0a57082d73ed7898001885e4dbabcce1ebfaec611cf125e51acd5d75e8a install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index 7a7b775ff..5d79bf382 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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,8 @@ include Config -VER = 5.7 +VER = 5.8 +LANGPACK = 20230225 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,11 +43,14 @@ endif # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) \ + squid-langpack-$(LANGPACK).tar.gz -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) +squid-langpack-$(LANGPACK).tar.gz = $(URL_IPFIRE)/squid-langpack-$(LANGPACK).tar.gz -$(DL_FILE)_BLAKE2 = 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 +$(DL_FILE)_BLAKE2 = c9d1ae9464e68beabdf7ae1641a70d6c614bc4d4f4bae3fc5946c2bf61510634992cbd5abe63f071104edb2fa487a6c5c7fb8fbf8f06ac723a6522ec9ade8b68 +squid-langpack-$(LANGPACK).tar.gz_BLAKE2 = 169a05d16770f56e515fd633658e8bcd9464fb01ccba76256b119932c833af7bc22e3e8d3a7d5fde37638546f15822a4d1548a78af13be9f4e3b8989758250b6 install : $(TARGET) @@ -76,6 +80,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP)/errors && tar zxf $(DIR_DL)/squid-langpack-$(LANGPACK).tar.gz cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch diff --git a/lfs/tzdata b/lfs/tzdata index 26500bba2..300ed35ad 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 = 2022e +VER = 2022g TZDATA_VER = $(VER) TZCODE_VER = $(VER) @@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz -tzdata$(TZDATA_VER).tar.gz_BLAKE2 = 0c1aa99ac8c8f1a7a10602132da1e61921053ff7ed87449be73c45d23440457f28a2abe4dffd9775c4764e294dd9f92d15d3d401caf07a9d6d046fa27c4148f2 -tzcode$(TZCODE_VER).tar.gz_BLAKE2 = 874dca6d7f347276a87a055853617c8943b3b297fd89c80a3e8d6318c81df15af88f8c58bc05d5088359c30aba0d496089df4835f888c3f76cb0ecf6cd231d3a +tzdata$(TZDATA_VER).tar.gz_BLAKE2 = 582b79cc2317d27f3883042cbca25801397d9e2808ad8d3a340017d635372ef20316ce646a25a43b0ea5d4024841b54925ecc4510613295c39c28647989645cb +tzcode$(TZCODE_VER).tar.gz_BLAKE2 = b67bb2020913c57cc6bc68d231c53ba645b95305256065e2645bce3b0d71adfaea865ed9bf40f1ec3b4a73aad7e6c48f5ecd0895de6e2d69bed6113d6b579e26 install : $(TARGET) diff --git a/lfs/wio b/lfs/wio index be80cef22..08bac2e02 100644 --- a/lfs/wio +++ b/lfs/wio @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 # @@ -32,7 +32,7 @@ THISAPP = wio-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio -PAK_VER = 15 +PAK_VER = 16 DEPS = diff --git a/src/initscripts/system/rngd b/src/initscripts/packages/rngd similarity index 100% rename from src/initscripts/system/rngd rename to src/initscripts/packages/rngd diff --git a/src/paks/rng-tools/install.sh b/src/paks/rng-tools/install.sh new file mode 100644 index 000000000..a53ccc43c --- /dev/null +++ b/src/paks/rng-tools/install.sh @@ -0,0 +1,30 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2023 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +# create startlinks +ln -sf ../init.d/rngd /etc/rc.d/rc0.d/K35rngd +ln -sf ../init.d/rngd /etc/rc.d/rc3.d/S65rngd +ln -sf ../init.d/rngd /etc/rc.d/rc6.d/K35rngd +start_service --background rngd diff --git a/src/paks/rng-tools/uninstall.sh b/src/paks/rng-tools/uninstall.sh new file mode 100644 index 000000000..cc9fbb355 --- /dev/null +++ b/src/paks/rng-tools/uninstall.sh @@ -0,0 +1,28 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2023 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service rngd +remove_files +# Remove all start links. +rm -rf /etc/rc.d/rc*.d/*rngd diff --git a/src/paks/rng-tools/update.sh b/src/paks/rng-tools/update.sh new file mode 100644 index 000000000..83bd0ad98 --- /dev/null +++ b/src/paks/rng-tools/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2023 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/efivar-38_remove_march=native.patch b/src/patches/efivar-38_remove_march=native.patch new file mode 100644 index 000000000..7c22576e6 --- /dev/null +++ b/src/patches/efivar-38_remove_march=native.patch @@ -0,0 +1,18 @@ +diff -Naur efivar-38.org/src/include/defaults.mk efivar-38/src/include/defaults.mk +--- efivar-38.org/src/include/defaults.mk 2022-01-14 20:29:35.000000000 +0100 ++++ efivar-38/src/include/defaults.mk 2023-02-23 19:38:12.493736490 +0100 +@@ -71,12 +71,8 @@ + -Wl,--version-script=$(MAP) \ + $(call family,SOFLAGS) + +-HOST_ARCH=$(shell uname -m) +-ifneq ($(HOST_ARCH),ia64) +- HOST_MARCH=-march=native +-else +- HOST_MARCH= +-endif ++HOST_MARCH= ++ + HOST_CPPFLAGS ?= $(CPPFLAGS) + override _HOST_CPPFLAGS := $(HOST_CPPFLAGS) + override HOST_CPPFLAGS = $(_HOST_CPPFLAGS) \ diff --git a/src/patches/grub/grub-Use-zifencei-on-riscv.patch b/src/patches/grub/grub-Use-zifencei-on-riscv.patch new file mode 100644 index 000000000..c575a3116 --- /dev/null +++ b/src/patches/grub/grub-Use-zifencei-on-riscv.patch @@ -0,0 +1,47 @@ +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 + diff --git a/src/wio/wio-lib.pl b/src/wio/wio-lib.pl index eb7b33e7d..46de7be2f 100644 --- a/src/wio/wio-lib.pl +++ b/src/wio/wio-lib.pl @@ -157,7 +157,7 @@ sub mailsender { From => $mailsettings{'SENDER'}, To => $mailsettings{'RECIPIENT'}, Subject => $_[0], - Type => 'multipart/mixed' + Type => 'multipart/alternative' ); $msg->attach( diff --git a/src/wio/wio.cgi b/src/wio/wio.cgi index a61102894..f31f5d565 100644 --- a/src/wio/wio.cgi +++ b/src/wio/wio.cgi @@ -1761,12 +1761,12 @@ print" <td colspan='4'> </td> </tr> <tr> - <td height='30'>$Lang::tr{'wio ipadress'}:</td> - <td align='left'><input type='text' name='IPADR' value='$wiosettings{'IPADR'}' size='25' /></td> - <td>$Lang::tr{'wio name'}:</td> - <td align='left'><input type='text' name='HOST' value='$wiosettings{'HOST'}' size='25' /></td> - <td>$Lang::tr{'remark'}:</td> - <td align='left'><input type='text' name='REMARK' value='$wiosettings{'REMARK'}' size='30'></td> + <td class='base'>$Lang::tr{'wio ipadress'}:</td> + <td><input type='text' name='IPADR' value='$wiosettings{'IPADR'}' size='18' /></td> + <td class='base'>$Lang::tr{'wio name'}:</td> + <td><input type='text' name='HOST' value='$wiosettings{'HOST'}' size='18' /></td> + <td class='base'>$Lang::tr{'remark'}:</td> + <td><input type='text' name='REMARK' value='$wiosettings{'REMARK'}' size='18' /></td> </tr> <tr> <td height='30'>$Lang::tr{'wio_ping_send'}:</td> diff --git a/tools/checkrootfiles b/tools/checkrootfiles index ab27c594b..a2712808b 100755 --- a/tools/checkrootfiles +++ b/tools/checkrootfiles @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 # @@ -53,3 +53,11 @@ if [ "${?}" == "0" ]; then --exclude-dir oldcore --exclude-dir aarch64 echo "Replace by xxxMACHINExxx !" fi + +grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude gdb --exclude liburcu --exclude go --exclude-dir oldcore --exclude-dir riscv64 >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! '/riscv64' in rootfiles files found!" + grep -r '/riscv64' ./config/rootfiles/ --exclude gcc --exclude rust-libc --exclude go \ + --exclude-dir oldcore --exclude-dir riscv64 + echo "Replace by xxxMACHINExxx !" +fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 57fb3e8c1a9532f6e883c39415f6feb974511556
by Michael Tremer 04 Mar '23

04 Mar '23

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 3.x development tree". The branch, master has been updated via 57fb3e8c1a9532f6e883c39415f6feb974511556 (commit) via fd30f093b71e245d0b4364c4aa2c20477da44722 (commit) via 4bc0fa31f26e08920d8a825f2a3079d887abcc02 (commit) via b581cb223893165efa8a3e0bba5ab076c9b895f1 (commit) via 92492e8dc8fa16d69102086127f84e695eb8a1c8 (commit) via e2cff7fa0d27689b6a8b36bff69f80c67fbd3525 (commit) via ba5912cd1b57ba95d54386bcef02ce97f7b3c307 (commit) via 7bce9e6041b9529004b2746aa8ee3b87f6d96ebf (commit) via 81a6680ed88e81525e8904b4262ec2db43277554 (commit) via bb97a2338a58b9c0ffbb5454f796ad84844efb49 (commit) via 931f85d65c36a2a547adfb456b65699999e65eab (commit) via 19e7240e65cf8d75cdc573af8c40e3ed8aa11f92 (commit) via b059a4e1560349e12b8f50c19133c2aa1354567d (commit) via b23cda09bed6f5547224ca08297da98165e7dfd5 (commit) via ecfbf11ab11fddf3f5c053d7c318600e5cefaa35 (commit) via b2acbbf9ff90b41a2abddd0b1082a5e0fbdc9acb (commit) via e002fd196d31f125a155cabb99a96d871a86916e (commit) via 5fc37d861dc7eb57fc5fb596a24189f149f1acd9 (commit) via 6876e5d8c274243016f2d27a595628803cb96266 (commit) from 40a31d41cf79d8baa5c290cf1f179bd8846aac21 (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 57fb3e8c1a9532f6e883c39415f6feb974511556 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 13:45:41 2023 +0000 kernel: Install intel-microcode only on x86_64 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fd30f093b71e245d0b4364c4aa2c20477da44722 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 13:45:07 2023 +0000 ImageMagick: Disable building documentation This added some dependencies to Perl modules that we do not build. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4bc0fa31f26e08920d8a825f2a3079d887abcc02 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 13:43:02 2023 +0000 kernel: Do not depend on net-tools Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b581cb223893165efa8a3e0bba5ab076c9b895f1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 13:42:09 2023 +0000 grub: Drop dependencies to all fonts and use Python 3 We no longer ship any fonts, but GRUB still depends on them. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 92492e8dc8fa16d69102086127f84e695eb8a1c8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 13:41:45 2023 +0000 hyperscan: Fix resetting LTO flags Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e2cff7fa0d27689b6a8b36bff69f80c67fbd3525 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 13:41:19 2023 +0000 libmpc: Disable testsuite The testsuite hangs for forever. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ba5912cd1b57ba95d54386bcef02ce97f7b3c307 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Mar 3 10:45:14 2023 +0000 tcl: Adopt makefile into new format Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 7bce9e6041b9529004b2746aa8ee3b87f6d96ebf Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Mar 3 10:46:11 2023 +0000 compat-gmp: Update source URL Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 81a6680ed88e81525e8904b4262ec2db43277554 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 13:14:51 2023 +0000 rrdtool: Do not depend on dejavu-fonts I did not test if graphs can still be generated, but we do not have this package any more. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bb97a2338a58b9c0ffbb5454f796ad84844efb49 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Mar 3 11:03:23 2023 +0000 perl: Re-enable file provides They are required by at least vim Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 931f85d65c36a2a547adfb456b65699999e65eab Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Mar 3 11:00:26 2023 +0000 expect: Fix build on aarch64 Requires autotools to support this architecture. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 19e7240e65cf8d75cdc573af8c40e3ed8aa11f92 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 4 12:52:27 2023 +0000 gcc: Create a linker script to ensure correct link against libgcc On aarch64, GCC builds some emulated functions into the code which come from libgcc. To ensure that we dynamically link as much as possible, this script is required so that it will only fall back to pull functions from the static library if there is no other resort. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b059a4e1560349e12b8f50c19133c2aa1354567d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 4 12:50:54 2023 +0000 gcc: Drop build dependency to autogen Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b23cda09bed6f5547224ca08297da98165e7dfd5 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Mar 4 12:37:07 2023 +0000 gettext: Filter weird perl dependency. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ecfbf11ab11fddf3f5c053d7c318600e5cefaa35 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Mar 3 10:51:18 2023 +0000 kbd: Update to 2.5.1 Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b2acbbf9ff90b41a2abddd0b1082a5e0fbdc9acb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 12:50:02 2023 +0000 compat-gnutls: Fix build Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e002fd196d31f125a155cabb99a96d871a86916e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 12:43:13 2023 +0000 gnutls: Build without net-tools net-tools has been dropped Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5fc37d861dc7eb57fc5fb596a24189f149f1acd9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 12:34:17 2023 +0000 perl-XML-NamespaceSupport: Fix build requirements Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6876e5d8c274243016f2d27a595628803cb96266 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 4 12:27:19 2023 +0000 curl: Do not depend on net-tools This package has been dropped Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: ImageMagick/ImageMagick.nm | 3 +- compat-gmp/compat-gmp.nm | 4 +- compat-gnutls/compat-gnutls.nm | 5 +- curl/curl.nm | 3 +- expect/expect.nm | 9 +- gcc/gcc.nm | 10 +- gettext/gettext.nm | 10 +- gnutls/gnutls.nm | 3 +- grub/grub.nm | 13 +- hyperscan/hyperscan.nm | 8 +- kbd/kbd.nm | 27 +-- kbd/patches/kbd-1.15-defkeymap.patch | 12 - kbd/patches/kbd-1.15-keycodes-man.patch | 52 ----- kbd/patches/kbd-1.15-resizecon-x86_64.patch | 15 -- kbd/patches/kbd-1.15-unicode_start.patch | 21 -- kbd/patches/kbd-1.15.3-dumpkeys-man.patch | 18 -- kbd/patches/kbd-1.15.3-fix-es-translation.patch | 12 - kbd/patches/kbd-2.5.1-backspace-1.patch | 250 +++++++++++++++++++++ kbd/vlock.pamd | 3 + kernel/kernel.nm | 7 +- libmpc/libmpc.nm | 5 +- .../perl-XML-NamespaceSupport.nm | 4 +- perl/perl.nm | 75 +++---- rrdtool/rrdtool.nm | 4 +- tcl/tcl.nm | 15 +- 25 files changed, 358 insertions(+), 230 deletions(-) delete mode 100644 kbd/patches/kbd-1.15-defkeymap.patch delete mode 100644 kbd/patches/kbd-1.15-keycodes-man.patch delete mode 100644 kbd/patches/kbd-1.15-resizecon-x86_64.patch delete mode 100644 kbd/patches/kbd-1.15-unicode_start.patch delete mode 100644 kbd/patches/kbd-1.15.3-dumpkeys-man.patch delete mode 100644 kbd/patches/kbd-1.15.3-fix-es-translation.patch create mode 100644 kbd/patches/kbd-2.5.1-backspace-1.patch create mode 100644 kbd/vlock.pamd Difference in files: diff --git a/ImageMagick/ImageMagick.nm b/ImageMagick/ImageMagick.nm index f240d11a7..a845e619c 100644 --- a/ImageMagick/ImageMagick.nm +++ b/ImageMagick/ImageMagick.nm @@ -6,7 +6,7 @@ name = ImageMagick version = 7.1.0 patchlevel = 56 -release = 1 +release = 1.1 groups = Application/Multimedia url = https://www.imagemagick.org/ @@ -45,6 +45,7 @@ build configure_options += \ --enable-shared \ --disable-static \ + --disable-docs \ --with-threads \ --with-bzlib=yes \ --with-fontconfig=yes \ diff --git a/compat-gmp/compat-gmp.nm b/compat-gmp/compat-gmp.nm index fc1d9184f..60168433a 100644 --- a/compat-gmp/compat-gmp.nm +++ b/compat-gmp/compat-gmp.nm @@ -5,7 +5,7 @@ name = compat-gmp version = 4.3.2 -release = 1 +release = 1.1 thisapp = gmp-%{version} groups = System/Libraries @@ -23,7 +23,7 @@ description emphasizes speed over simplicity/elegance in its operations. end -source_dl += https://gmplib.org/download/gmp/ ftp://ftp.gnu.org/gnu/gmp/ +source_dl += https://gmplib.org/download/gmp/archive/ ftp://ftp.gnu.org/gnu/gmp/ sources = %{thisapp}.tar.xz build diff --git a/compat-gnutls/compat-gnutls.nm b/compat-gnutls/compat-gnutls.nm index 9711d5034..3ae618164 100644 --- a/compat-gnutls/compat-gnutls.nm +++ b/compat-gnutls/compat-gnutls.nm @@ -7,7 +7,7 @@ name = compat-gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.3 ver_min = 25 -release = 3 +release = 3.1 thisapp = gnutls-%{version} groups = System/Libraries @@ -22,7 +22,7 @@ description TLS working group. end -source_dl = ftp://ftp.gnutls.org/gcrypt/gnutls/v%{ver_maj}/ +source_dl = https://www.gnupg.org/ftp/gcrypt/gnutls/v%{ver_maj}/ sources = %{thisapp}.tar.xz build @@ -32,7 +32,6 @@ build libidn-devel libtasn1-devel >= 3.2 lzo-devel - net-tools nettle-devel >= 3.2 perl p11-kit-devel >= 0.23.1 diff --git a/curl/curl.nm b/curl/curl.nm index c0e01165f..7d93a8c07 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -5,7 +5,7 @@ name = curl version = 7.86.0 -release = 2 +release = 2.1 groups = Application/Internet url = https://curl.haxx.se/ @@ -28,7 +28,6 @@ build libidn-devel libssh2-devel libtool-devel - net-tools nghttp2-devel openldap-devel openssl-devel diff --git a/expect/expect.nm b/expect/expect.nm index af7658c1d..6ed1625ef 100644 --- a/expect/expect.nm +++ b/expect/expect.nm @@ -5,7 +5,7 @@ name = expect version = 5.45.4 -release = 1 +release = 1.1 thisapp = %{name}%{version} groups = Development/Languages @@ -24,7 +24,10 @@ source_dl = https://downloads.sourceforge.net/project/expect/Expect/%{version}/ build requires + autoconf + automake tcl-devel + gettext-devel end configure_options += \ @@ -32,6 +35,10 @@ build --with-tclinclude=%{includedir} \ --enable-shared + prepare_cmds + autoreconf -vfi + end + test make test end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 4764ec0a5..84243e48e 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_graphite = 1 name = gcc version = 12.2.0 -release = 2.1 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -29,7 +29,6 @@ sources = %{thisapp}.tar.gz build requires - autogen binutils >= %{binutils_version} dejagnu elfutils-devel @@ -218,7 +217,12 @@ build # Fix libgcc_s symlinks. rm -f ${FULLPATH}/libgcc_s.so %{BUILDROOT}%{libdir}/libgcc_s.so - ln -svf ../../../../..%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so + echo '/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ + + OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`') + GROUP ( /%{libdir}/libgcc_s.so.1 libgcc.a )' > ${FULLPATH}/libgcc_s.so chmod 755 %{BUILDROOT}%{libdir}/libgcc_s.so.1 # Remove some GNU debugger stuff. diff --git a/gettext/gettext.nm b/gettext/gettext.nm index 1fcb77e6d..264eb2db0 100644 --- a/gettext/gettext.nm +++ b/gettext/gettext.nm @@ -5,7 +5,7 @@ name = gettext version = 0.21.1 -release = 2 +release = 2.1 groups = System/Base url = https://www.gnu.org/software/gettext/ @@ -67,6 +67,8 @@ packages bundled(gnulib) bundled(libcroco) = 0.6.12 end + + filter_requires = (Shell) end package %{name}-common-devel @@ -77,6 +79,8 @@ packages files /usr/share/gettext/ end + + filter_requires = (Shell) end package %{name}-devel @@ -88,6 +92,8 @@ packages git end + filter_requires = (Shell) + files += \ /usr/bin/autopoint \ /usr/share/man/man1/autopoint.1 @@ -96,6 +102,8 @@ packages package %{name}-libs template LIBS + filter_requires = (Shell) + files %{libdir}/libgettextlib-*.so %{libdir}/libgettextpo.so.* diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index 753f632f9..880a356f9 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -7,7 +7,7 @@ name = gnutls version = %{ver_maj}.%{ver_min} ver_maj = 3.7 ver_min = 8 -release = 2 +release = 2.1 groups = System/Libraries url = https://gnutls.org/ @@ -32,7 +32,6 @@ build libtasn1-devel >= 4.9 libunistring-devel lzo-devel - net-tools nettle-devel >= 3.4.1 perl p11-kit-devel >= 0.23.1 diff --git a/grub/grub.nm b/grub/grub.nm index a5deb8e31..e5ad722d0 100644 --- a/grub/grub.nm +++ b/grub/grub.nm @@ -5,7 +5,7 @@ name = grub version = 2.06 -release = 1 +release = 1.1 sup_arches = aarch64 x86_64 thisapp = %{name}-%{version} @@ -25,26 +25,20 @@ end source_dl = https://ftp.gnu.org/gnu/grub/ sources = %{thisapp}.tar.xz -# Unifont -unifont = /usr/share/X11/fonts/misc/unifont.pcf.gz - build requires autoconf - autogen automake bison bzip2-devel - debugedit >= 5.3.5-2 - dejavu-fonts-sans-fonts flex freetype-devel gettext gettext-devel libdevmapper-devel ncurses-devel + python3 zlib-devel - %{unifont} end # Don't leak our CFLAGS to boot code @@ -58,8 +52,7 @@ build end prepare_cmds - cp -vf %{unifont} unifont.pcf.gz - ./autogen.sh + PYTHON=%{python3} ./autogen.sh for platform in %{platforms}; do cp -r %{DIR_APP} %{DIR_APP}-${platform} diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm index 91a7d665d..a0a437e65 100644 --- a/hyperscan/hyperscan.nm +++ b/hyperscan/hyperscan.nm @@ -5,7 +5,7 @@ name = hyperscan version = 5.4.0 -release = 1 +release = 1.1 # This won't build on any architectures but those sup_arches = x86_64 @@ -28,9 +28,6 @@ end source_dl = https://github.com/intel/hyperscan/archive/v%{version}.tar.gz#/ -# Disable LTO -LTO_CFLAGS = - build requires boost-devel >= 1.57 @@ -41,6 +38,9 @@ build sqlite-devel end + # Disable LTO + LTO_CFLAGS = + build %{cmake} . \ -DBUILD_SHARED_LIBS:BOOL=ON \ diff --git a/kbd/kbd.nm b/kbd/kbd.nm index fbc57c7e6..4625a1c65 100644 --- a/kbd/kbd.nm +++ b/kbd/kbd.nm @@ -4,11 +4,11 @@ ############################################################################### name = kbd -version = 1.15.3 -release = 2 +version = 2.5.1 +release = 1 groups = System/Base -url = http://ftp.altlinux.org/pub/people/legion/kbd +url = http://www.kbd-project.org/ license = GPLv2+ summary = Tools for configuring the console (keyboard, virtual terminals, etc.). @@ -18,15 +18,17 @@ description fonts, the virtual terminals and font files. end -source_dl = -sources += kbd-latarcyrheb-16-fixed.tar.bz2 -sources += kbd-latsun-fonts.tar.bz2 +source_dl = https://github.com/legionus/kbd/archive/refs/tags/v%{version}.tar.gz/# +sources = %{thisapp}.tar.gz build requires + autoconf + automake bison flex - gettext + gettext-devel + pam-devel end configure_options += \ @@ -35,15 +37,8 @@ build --enable-nls prepare_cmds - # Adding our own fonts. - cd %{DIR_APP} - %{MACRO_EXTRACT} %{DIR_DL}/kbd-latarcyrheb-16-fixed.tar.bz2 - %{MACRO_EXTRACT} %{DIR_DL}/kbd-latsun-fonts.tar.bz2 - # 7-bit maps are obsolete; so are non-euro maps cd %{DIR_APP}/data/keymaps/i386 - mv qwerty/fi.map qwerty/fi-old.map - cp qwerty/fi-latin9.map qwerty/fi.map cp qwerty/pt-latin9.map qwerty/pt.map cp qwerty/sv-latin1.map qwerty/se-latin1.map mv azerty/fr.map azerty/fr-old.map @@ -51,7 +46,6 @@ build cp azerty/fr-latin9.map azerty/fr-latin0.map # Rename conflicting keymaps - mv dvorak/no.map dvorak/no-dvorak.map mv fgGIod/trf.map fgGIod/trf-fgGIod.map mv olpc/es.map olpc/es-olpc.map mv olpc/pt.map olpc/pt-olpc.map @@ -60,6 +54,9 @@ build # remove obsolete "gr" translation cd %{DIR_APP}/po rm -f gr.po gr.gmo + + # Run autogen + cd %{DIR_APP} && ./autogen.sh end end diff --git a/kbd/patches/kbd-1.15-defkeymap.patch b/kbd/patches/kbd-1.15-defkeymap.patch deleted file mode 100644 index 5e604b71e..000000000 --- a/kbd/patches/kbd-1.15-defkeymap.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kbd-1.15/src/paths.h.orig kbd-1.15/src/paths.h ---- kbd-1.15/src/paths.h.orig 2010-06-07 15:26:21.787315778 +0200 -+++ kbd-1.15/src/paths.h 2010-06-07 15:26:49.353336391 +0200 -@@ -19,7 +19,7 @@ - # define DEFMAP "sunkeymap.kmap" - # define KERNDIR "/usr/src/linux/drivers/sbus/char" - #else --# define DEFMAP "defkeymap.kmap" -+# define DEFMAP "defkeymap.map" - # define KERNDIR "/usr/src/linux/drivers/char" - #endif - diff --git a/kbd/patches/kbd-1.15-keycodes-man.patch b/kbd/patches/kbd-1.15-keycodes-man.patch deleted file mode 100644 index d18a8c8b5..000000000 --- a/kbd/patches/kbd-1.15-keycodes-man.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up kbd-1.15/man/man1/showkey.1_old kbd-1.15/man/man1/showkey.1 ---- kbd-1.15/man/man1/showkey.1_old 2008-03-13 17:46:23.000000000 +0100 -+++ kbd-1.15/man/man1/showkey.1 2008-12-10 12:31:38.000000000 +0100 -@@ -80,6 +80,19 @@ corresponds to what the keyboard hardwar - to know the scan codes sent by various keys it is better to boot a - 2.4 kernel. Since 2.6.9 there also is the boot option atkbd.softraw=0 - that tells the 2.6 kernel to return the actual scan codes. -+ -+.SH NOTES -+The raw scan codes are available only on AT and PS/2 keyboards, -+and even then they are disabled unless the -+.B atkbd.softraw=0 -+kernel parameter is used. -+When the raw scan codes are not available, the kernel uses a fixed built-in -+table to produce scan codes from keycodes. Thus, -+.BR setkeycodes (8) -+can affect the output of -+.B showkey -+in scan code dump mode. -+ - .SH "SEE ALSO" - .BR loadkeys (1), - .BR dumpkeys (1), -diff -up kbd-1.15/man/man8/setkeycodes.8_old kbd-1.15/man/man8/setkeycodes.8 ---- kbd-1.15/man/man8/setkeycodes.8_old 2008-12-10 12:31:56.000000000 +0100 -+++ kbd-1.15/man/man8/setkeycodes.8 2008-12-10 12:37:36.000000000 +0100 -@@ -41,6 +41,10 @@ to showkey(1), the command - will assign the keycode 112 to it, and then loadkeys(1) can be used - to define the function of this key. - -+USB keyboards have standardized keycodes and -+.B setkeycodes -+doesn't affect them at all. -+ - .SH "2.6 KERNELS" - In 2.6 kernels key codes lie in the range 1-255, instead of 1-127. - (It might be best to confine oneself to the range 1-239.) -@@ -54,6 +58,14 @@ None. - .SH BUGS - The keycodes of X have nothing to do with those of Linux. - Unusual keys can be made visible under Linux, but not under X. -+ -+.B setkeycodes -+affects only the "first" input device -+that has modifiable scancode-to-keycode mapping. -+If there is more than one such device, -+.B setkeycodes -+cannot change the mapping of other devices than the "first" one. -+ - .SH "SEE ALSO" - .I "dumpkeys (1), loadkeys (1), showkey (1), getkeycodes (8)" - diff --git a/kbd/patches/kbd-1.15-resizecon-x86_64.patch b/kbd/patches/kbd-1.15-resizecon-x86_64.patch deleted file mode 100644 index 5e8350a86..000000000 --- a/kbd/patches/kbd-1.15-resizecon-x86_64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up kbd-1.15/configure_old kbd-1.15/configure ---- kbd-1.15/configure_old 2009-01-08 15:11:04.000000000 +0100 -+++ kbd-1.15/configure 2009-01-08 15:11:45.000000000 +0100 -@@ -7637,8 +7637,9 @@ fi - - - case $host_cpu in -- i?86*) RESIZECONS_PROGS=yes ;; -- *) RESIZECONS_PROGS=no ;; -+ i?86*) RESIZECONS_PROGS=yes ;; -+ x86_64*) RESIZECONS_PROGS=yes ;; -+ *) RESIZECONS_PROGS=no ;; - esac - if test "$RESIZECONS_PROGS" = "yes"; then - RESIZECONS_PROGS_TRUE= diff --git a/kbd/patches/kbd-1.15-unicode_start.patch b/kbd/patches/kbd-1.15-unicode_start.patch deleted file mode 100644 index 41827ccd4..000000000 --- a/kbd/patches/kbd-1.15-unicode_start.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up kbd-1.15/src/unicode_start_old kbd-1.15/src/unicode_start ---- kbd-1.15/src/unicode_start_old 2009-01-08 13:34:10.000000000 +0100 -+++ kbd-1.15/src/unicode_start 2009-01-08 14:02:12.000000000 +0100 -@@ -72,6 +72,9 @@ stty iutf8 - # have a Unicode map attached, or explicitly specified, e.g., - # by giving `def.uni' as a second argument. - -+DEFAULT_UNICODE_FONT=latarcyrheb-sun16 -+# Also drdos8x16 is a good candidate. -+ - case "$#" in - 2) - setfont "$1" -u "$2" -@@ -80,6 +83,7 @@ case "$#" in - setfont "$1" - ;; - 0) -+ setfont $DEFAULT_UNICODE_FONT - ;; - *) - echo "usage: unicode_start [font [unicode map]]" diff --git a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch b/kbd/patches/kbd-1.15.3-dumpkeys-man.patch deleted file mode 100644 index e77718b47..000000000 --- a/kbd/patches/kbd-1.15.3-dumpkeys-man.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up kbd-1.15.3/man/man1/dumpkeys.1.in.orig kbd-1.15.3/man/man1/dumpkeys.1.in ---- kbd-1.15.3/man/man1/dumpkeys.1.in.orig 2011-08-23 13:06:16.905892768 +0200 -+++ kbd-1.15.3/man/man1/dumpkeys.1.in 2011-08-23 13:15:18.264853435 +0200 -@@ -156,6 +156,14 @@ output of - .BR dumpkeys . - .LP - .TP -+.B \-1 \-\-separate-lines -+This forces -+.B dumpkeys -+to write one line per (modifier,keycode) pair. It prefixes the word -+.I plain -+for plain keycodes. -+.LP -+.TP - .B \-\-funcs-only - When this option is given, - .B dumpkeys diff --git a/kbd/patches/kbd-1.15.3-fix-es-translation.patch b/kbd/patches/kbd-1.15.3-fix-es-translation.patch deleted file mode 100644 index 9d43d8d15..000000000 --- a/kbd/patches/kbd-1.15.3-fix-es-translation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kbd-1.15.3/po/es.po.orig kbd-1.15.3/po/es.po ---- kbd-1.15.3/po/es.po.orig 2011-08-22 15:18:35.262343023 +0200 -+++ kbd-1.15.3/po/es.po 2011-08-22 15:19:14.844340262 +0200 -@@ -1363,7 +1363,7 @@ msgstr "No se encontró nada que guardar - #: src/setfont.c:682 - #, c-format - msgid "Saved %d-char %dx%d font file on %s\n" --msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" -+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" - - #: src/setkeycodes.c:21 - #, c-format diff --git a/kbd/patches/kbd-2.5.1-backspace-1.patch b/kbd/patches/kbd-2.5.1-backspace-1.patch new file mode 100644 index 000000000..8fec17180 --- /dev/null +++ b/kbd/patches/kbd-2.5.1-backspace-1.patch @@ -0,0 +1,250 @@ +Submitted By: Matt Burgess +Date: 2008-12-06 +Initial Package Version: 1.15 +Upstream Status: Not submitted, possibly incomplete +Description: Makes Backspace and Delete keys consistent in all i386 keymaps. +Makes the Backspace key send character code 127, and Delete send a well known +escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386. + +Original patch for 1.12 by Alexander Patrakov. +Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map, +ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>. +Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>. + +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map 2008-12-03 22:27:55.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = three numbersign + keycode 12 = two at + keycode 13 = one exclam +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map +--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map 2008-06-20 12:36:01.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map 2008-12-03 22:28:13.000000000 +0000 +@@ -43,7 +43,7 @@ + keycode 11 = slash question + keycode 12 = bracketleft braceleft + keycode 13 = bracketright braceright +- keycode 14 = BackSpace Delete ++ keycode 14 = Delete Delete + ! -------------------------------------------------------------------------- + ! Row 3 + ! -------------------------------------------------------------------------- +diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-10-23 20:03:58.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map 2008-12-03 22:40:32.000000000 +0000 +@@ -51,7 +51,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map 2008-12-03 22:42:14.000000000 +0000 +@@ -205,7 +205,7 @@ + # edit this if you want the key above <Enter> to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -506,7 +506,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map 2008-12-03 22:42:58.000000000 +0000 +@@ -204,7 +204,7 @@ + # edit this if you want the key above <Enter> to delete symbols above + # cursor, not before. + keycode 14 = \ +- BackSpace BackSpace BackSpace BackSpace \ ++ Delete Delete Delete Delete \ + Delete Delete Delete Delete \ + Meta_BackSpace Meta_BackSpace Meta_BackSpace Meta_BackSpace \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete +@@ -505,7 +505,7 @@ + + # Edit this if you want strict VT100 emulation. + string F111 = "\033[3$" +-keycode 111 = Delete F111 Delete F111 \ ++keycode 111 = Remove F111 Remove F111 \ + Remove Remove Remove Remove \ + Meta_Delete Meta_Delete Meta_Delete Meta_Delete \ + Boot Boot Boot Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map 2008-06-20 12:36:00.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map 2008-12-03 22:44:25.000000000 +0000 +@@ -3,7 +3,7 @@ + # Send comments to Kjetil T. Homme <kjetilho(a)ifi.uio.no> + include "linux-with-alt-and-altgr" + plain keycode 83 = KP_Comma +- plain keycode 111 = Delete # "Remove" originally, weird... ++ plain keycode 111 = Remove + strings as usual + + keycode 1 = Escape +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map 2008-12-03 22:45:32.000000000 +0000 +@@ -143,8 +143,8 @@ + + # The keycode "0xFF" is too dangerous for many programs (including emacs). + # So let it be bracket instead of Hard Sign. +-# altgr keycode 27 = +0xDF +-# altgr shift keycode 27 = +0xFF ++altgr keycode 27 = +0xDF ++altgr shift keycode 27 = +0xFF + control keycode 27 = Control_bracketright + altgr control keycode 27 = Control_bracketright + alt keycode 27 = Meta_bracketright +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map 2008-12-03 22:46:15.000000000 +0000 +@@ -46,7 +46,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map 2008-12-03 22:47:12.000000000 +0000 +@@ -39,7 +39,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace ++ keycode 14 = Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map 2008-12-03 22:48:10.000000000 +0000 +@@ -89,8 +89,8 @@ + altgr alt keycode 13 = Meta_equal + shift alt keycode 13 = Meta_plus + altgr shift alt keycode 13 = Meta_plus +- keycode 14 = BackSpace BackSpace BackSpace BackSpace +-# keycode 14 = Delete Delete Delete Delete ++# keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + altgr alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map 2008-12-03 22:49:17.000000000 +0000 +@@ -42,7 +42,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = equal plus equal plus + alt keycode 13 = Meta_equal +- keycode 14 = BackSpace BackSpace BackSpace BackSpace ++ keycode 14 = Delete Delete Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Tab Tab Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map 2008-12-03 22:50:18.000000000 +0000 +@@ -345,7 +345,7 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot + +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map 2008-12-03 22:50:44.000000000 +0000 +@@ -374,6 +374,6 @@ + keycode 109 = Next Scroll_Forward + keycode 110 = Insert + +- keycode 111 = Delete # "Remove" originally, weird... ++ keycode 111 = Remove + control alt keycode 111 = Boot + control altgr keycode 111 = Boot +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map 2008-12-03 22:52:09.000000000 +0000 +@@ -49,7 +49,7 @@ + alt keycode 12 = Meta_minus + keycode 13 = minus underscore + alt keycode 13 = Meta_equal +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + alt keycode 14 = Meta_Delete + keycode 15 = Tab Meta_Tab + alt keycode 15 = Meta_Tab +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map 2008-12-03 22:52:52.000000000 +0000 +@@ -249,7 +249,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map 2008-12-03 22:53:36.000000000 +0000 +@@ -250,7 +250,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map 2008-12-03 22:54:06.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace +diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map +--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map 2008-10-23 20:03:59.000000000 +0100 ++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map 2008-12-03 22:54:23.000000000 +0000 +@@ -260,7 +260,7 @@ + shift ctrll ctrlr keycode 13 = plus + alt ctrll ctrlr keycode 13 = Meta_equal + shift alt ctrll ctrlr keycode 13 = Meta_plus +-keycode 14 = BackSpace Delete ++keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete + ctrlr keycode 14 = BackSpace diff --git a/kbd/vlock.pamd b/kbd/vlock.pamd new file mode 100644 index 000000000..d2d47e5b2 --- /dev/null +++ b/kbd/vlock.pamd @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth include system-auth +account required pam_permit.so diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 4d90512e2..62c23132b 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 6.2 -release = 1 +release = 1.2 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -43,7 +43,6 @@ build hostname libunwind-devel ncurses-devel - net-tools newt-devel openssl /usr/bin/openssl @@ -290,8 +289,10 @@ packages dracut kernel-updater linux-firmware - intel-microcode wireless-regdb + + # Install intel-microcode only on x86_64 + (intel-microcode if arch(x86_64)) end files diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm index fb6aacc44..a9bf379ad 100644 --- a/libmpc/libmpc.nm +++ b/libmpc/libmpc.nm @@ -5,7 +5,7 @@ name = libmpc version = 1.3.1 -release = 1.1 +release = 1.2 thisapp = mpc-%{version} groups = System/Libraries @@ -32,7 +32,8 @@ build --disable-static test - make check LD_LIBRARY_PATH="${DIR_APP}/src/.libs" + # This testsuite runs forever on x86_64 + : # make check LD_LIBRARY_PATH="${DIR_APP}/src/.libs" end end diff --git a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm index fd4e8edda..9010e505b 100644 --- a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm +++ b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm @@ -5,7 +5,7 @@ name = perl-XML-NamespaceSupport version = 1.11 -release = 1 +release = 1.1 arch = noarch thisapp = XML-NamespaceSupport-%{version} @@ -28,6 +28,8 @@ build perl(constant) perl(Cwd) perl(ExtUtils::MakeMaker) >= 6.42 + perl(FindBin) + perl(Module::Install) perl(File::Path) perl(Test::More) >= 0.47 end diff --git a/perl/perl.nm b/perl/perl.nm index 949dc9b31..18c4c65a2 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -10,7 +10,7 @@ ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel} # Never reset release in this package, just increase. -release = 2 +release = 2.1 thisver = %{version}-%{_release} @@ -179,43 +179,42 @@ packages perl(:WITH_PERLIO) # File provides - #perl(abbrev.pl) - #perl(assert.pl) - #perl(bigfloat.pl) - #perl(bigint.pl) - #perl(bigrat.pl) - #perl(bytes_heavy.pl) - #perl(cacheout.pl) - #perl(complete.pl) - #perl(ctime.pl) - #perl(dotsh.pl) - #perl(dumpvar.pl) - #perl(exceptions.pl) - #perl(fastcwd.pl) - #perl(find.pl) - #perl(finddepth.pl) - #perl(flush.pl) - #perl(ftp.pl) - #perl(getcwd.pl) - #perl(getopt.pl) - #perl(getopts.pl) - #perl(hostname.pl) - #perl(importenv.pl) - #perl(look.pl) - #perl(newgetopt.pl) - #perl(open2.pl) - #perl(open3.pl) - #perl(perl5db.pl) - #perl(pwd.pl) - #perl(shellwords.pl) - #perl(stat.pl) - #perl(syslog.pl) - #perl(tainted.pl) - #perl(termcap.pl) - #perl(timelocal.pl) - #perl(utf8_heavy.pl) - #perl(validate.pl) - #perl(strict) + perl(abbrev.pl) + perl(assert.pl) + perl(bigfloat.pl) + perl(bigint.pl) + perl(bigrat.pl) + perl(bytes_heavy.pl) + perl(cacheout.pl) + perl(complete.pl) + perl(ctime.pl) + perl(dotsh.pl) + perl(dumpvar.pl) + perl(exceptions.pl) + perl(fastcwd.pl) + perl(find.pl) + perl(finddepth.pl) + perl(flush.pl) + perl(ftp.pl) + perl(getcwd.pl) + perl(getopt.pl) + perl(getopts.pl) + perl(hostname.pl) + perl(importenv.pl) + perl(look.pl) + perl(newgetopt.pl) + perl(open2.pl) + perl(open3.pl) + perl(perl5db.pl) + perl(pwd.pl) + perl(shellwords.pl) + perl(stat.pl) + perl(syslog.pl) + perl(tainted.pl) + perl(termcap.pl) + perl(timelocal.pl) + perl(utf8_heavy.pl) + perl(validate.pl) end end diff --git a/rrdtool/rrdtool.nm b/rrdtool/rrdtool.nm index c9fa29602..6842ba491 100644 --- a/rrdtool/rrdtool.nm +++ b/rrdtool/rrdtool.nm @@ -5,7 +5,7 @@ name = rrdtool version = 1.8.0 -release = 1 +release = 1.1 groups = Applications/Databases url = https://oss.oetiker.ch/rrdtool/ @@ -72,8 +72,6 @@ packages package %{name}-libs template LIBS - - requires += dejavu-fonts-sans-mono-fonts end package python3-%{name} diff --git a/tcl/tcl.nm b/tcl/tcl.nm index 4adf47524..d0160cad0 100644 --- a/tcl/tcl.nm +++ b/tcl/tcl.nm @@ -6,7 +6,7 @@ name = tcl major_ver = 8.6 version = %{major_ver}.13 -release = 1 +release = 1.1 thisapp = tcl%{version} groups = Development/Languages @@ -31,6 +31,8 @@ build zlib-devel end + DIR_APP = %{DIR_SRC}/%{thisapp}/unix + # tcl fails to detect that it needs to link agains libm LDFLAGS += -lm @@ -43,15 +45,10 @@ build --enable-threads \ --enable-64bit - build - cd unix && %{configure} - - make %{PARALLELISMFLAGS} - end - - install - cd unix && make install install-private-headers INSTALL_ROOT=%{BUILDROOT} + make_install_targets += \ + install-private-headers INSTALL_ROOT=%{BUILDROOT} + install_cmds ln -svf tclsh%{major_ver} %{BUILDROOT}/usr/bin/tclsh # for linking with -lib%{name} hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 40a31d41cf79d8baa5c290cf1f179bd8846aac21
by Michael Tremer 04 Mar '23

04 Mar '23

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM March 2023