[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3c8adb565340ad10b6aaac5da41caf34ed8f2b30
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 3c8adb565340ad10b6aaac5da41caf34ed8f2b30 (commit) via 8814ec11f05dd26d2ac9f624bb6c55f3c45633d7 (commit) via 8c04e48d1d458706c4e15e7199088a6b6f767451 (commit) via d2e0d167f5d19f4f0677924706c83ad491eba007 (commit) via 3ae4a607cc53feec5c95e7eb8280bbd8e2b4e24a (commit) via e8df3770fa95c2607ca2311802709c011442aa0b (commit) via f56099b941f39c65c5455c603386951add1f8ebd (commit) via 893dd25c88ef2e1ed193ede5c86e0328154dfe78 (commit) via 65cc82a7a8b712a192f2b54159518e25d33e45e0 (commit) via 6d808ffd773f280b11d66f0909a94981ab4abd3b (commit) via 1e60965fd0c4f573aff72e1ee171e6046432d244 (commit) via a2645d146ecec4209a316af85b087a2d2cd8049c (commit) via e376abe95cdfffc21c8e662313a3ac409808f9f9 (commit) via 9d58c441e20787d904593624fb779f26b2aeddd3 (commit) via e325ea00fe09fcd0149bbb45a03e5a8eed67feb4 (commit) via 5bf383da9ec7c46066bb8b1efda72c18687207d2 (commit) via 7ffcccb509e55da8357db72f052ee181bdb7c1ab (commit) via 9b1575cb7f20841e3d2ab484088f25b4b9de9418 (commit) via 0d61c6807caa7abfa3dbbef9f823bb91e8e394e6 (commit) via 80c1cb5a0a2f9c13612a5a43c92d4657e0d06717 (commit) via 14ecdd86f1e57949858b47aa2a449e051bf3ee3a (commit) via f1d94e7457a3d497d8c65acd9be606291a5ac6f6 (commit) via 9f72b7bc5f566e3fc81218154d748cd84c15f0bb (commit) via 02254f55438a47b94b5be763fb9d96e48983000a (commit) via d289bc28beb65a937aba335501a86102d0455cec (commit) via 59e3c2a217e7b219c62fe07f702ead9594b1ac24 (commit) via 96bb3ba8b81eb7344213f9be58c031e15f7b7899 (commit) via acde9c1a1307ad140f7cd80b031e191678bb4ed8 (commit) via 644b91e3023ee306f411450048529c9f66cfed16 (commit) via 8f4c1855fa32a409b7244af0ef3b524e23dcf817 (commit) via 721373c3d75c0ba27f6b77e6577163820014f6d4 (commit) via 7631871fa9534ebfc9004cca9561c46797fa08b3 (commit) via 1579e8b3fc64d612e9dbf0d8922dbfa79e55d3cd (commit) via 035f866d75eb0d5fca55c02cca0f5e7dedc3894f (commit) via dae8a08086150fc12687a41ba30fc5335b6966e6 (commit) via 6f4e7823564b5517ff5eccbd358f0c9a2d5e3e27 (commit) from b7f2cb0a4457c0c86411672fbba4a612ca51f09f (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 3c8adb565340ad10b6aaac5da41caf34ed8f2b30 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:17:18 2024 +0000
core189: Ship ruby
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8814ec11f05dd26d2ac9f624bb6c55f3c45633d7 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 22:07:02 2024 +0200
ruby: Update to version 3.3.4
- Update from version 3.3.3 to 3.3.4 - Update of all rootfiles - Changelog 3.3.4 Bug #20573: Warning.warn shouldn't be called for disabled warnings Bug #20585: Size of memory allocated by String.new(:capacity) is different from the specified value Bug #20581: Ruby 3.3.3 install has missing deps for bundled net-pop gem Bug #20595: Corruption of encoding name string Bug #20598: Corruption of internal encoding string Bug #20562: Categorize RUBY_FREE_AT_EXIT warning Bug #20468: Segfault on safe navigation in for target Bug #20592: Interrupting Addrinfo causes Segmentation fault on alpine Bug #20239: Segmentation fault when using Regex on a large String Bug #20570: Nokey behavior changed since 3.3. Bug #20605: Add explicit compiler fence when pushing frames to ensure safe profiling
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c04e48d1d458706c4e15e7199088a6b6f767451 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:15:57 2024 +0000
core189: Ship xfsprogs
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d2e0d167f5d19f4f0677924706c83ad491eba007 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 21:11:09 2024 +0200
xfsprogs: Update to version 6.9.0
- Update from version 6.8.0 to 6.9.0 - Update of rootfile not required - Changelog is not available. List of commits available either at git repo or via https://www.spinics.net/lists/linux-xfs/msg87640.html
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3ae4a607cc53feec5c95e7eb8280bbd8e2b4e24a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:15:38 2024 +0000
core189: Ship meson
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e8df3770fa95c2607ca2311802709c011442aa0b Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 21:11:08 2024 +0200
meson: update to version 1.5.1
- Update from version 1.4.0 to 1.5.1 - Update of rootfile - Changelog of all changes in 1.5.x can be found at https://mesonbuild.com/Release-notes-for-1-5-0.html
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f56099b941f39c65c5455c603386951add1f8ebd Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:15:15 2024 +0000
core189: Ship lua
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 893dd25c88ef2e1ed193ede5c86e0328154dfe78 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 21:11:07 2024 +0200
lua: Update to version 5.4.7
- Update from version 5.4.6 to 5.4.7 - Update of rootfile - Rename of patch file to make it clear that it works with 5.4.7 - Changelog is not available. Details of changes have to be founbd via the list of commits https://github.com/lua/lua/commits/master
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 65cc82a7a8b712a192f2b54159518e25d33e45e0 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:14:40 2024 +0000
core189: Ship iana-etc
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6d808ffd773f280b11d66f0909a94981ab4abd3b Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 21:11:06 2024 +0200
iana-etc: Update to version 20240813
- Update from version 20240701 to 20240813 - Update of rootfile no0t required - There is no changelog.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1e60965fd0c4f573aff72e1ee171e6046432d244 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:14:19 2024 +0000
core189: Ship gdbm
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a2645d146ecec4209a316af85b087a2d2cd8049c Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 21:11:05 2024 +0200
gdbm: Update to version 1.24
- Update from version 1.23 to 1.24 - Update of rootfile not required - Changelog 1.24 * New gdbm_load option: --update The --update (-U) option instructs gdbm_load to update an existing database. * Fix semantics of gdbm_load -r The --replace (-r) is valid only when used together with --update. * Use getline in gdbmtool shell. * New function: gdbm_load_from_file_ext In contrast to gdbm_load and gdbm_load_from_file, which derive the value of the flag parameter for gdbm_open from the value of their "replace" argument, this function allows the caller to specify it explicitly. The prototype is: int gdbm_load_from_file_ext (GDBM_FILE *pdbf, FILE *fp, int flags, int replace, int meta_mask, unsigned long *line); * Bugfixes ** Fix binary dump format for key and/or data of zero size. (see https://puszcza.gnu.org.ua/bugs/?565) ** Fix location tracking and recover command in gdbtool. (see https://puszcza.gnu.org.ua/bugs/?566) ** Fix possible buffer underflow in gdbmload. ** Ensure any padding bytes in avail_elem structure are filled with 0. (fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1031276) ** Improve the documentation.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e376abe95cdfffc21c8e662313a3ac409808f9f9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:13:46 2024 +0000
core189: Ship bind
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9d58c441e20787d904593624fb779f26b2aeddd3 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 21:11:04 2024 +0200
bind: Update to version 9.20.1
- Update from version 9.16.50 to 9.20.1 - Update of rootfile - The use of liburcu has replaced isc_qsbr in 9.19.4 and therefore the position of liburcu in make.sh had to be changed. - --enable-threads, --with-libtool, --without-python & --disable-linux-caps are no longer reconised configure options (it looks like not recognised for a while. --without-python is explicitly mentioned as being removed in version 9.15.7 The others are not mentioned in the changelog notes. - The lib/bind9 and lib/irs directories in the source tarball have been removed. The The comtents of lib/bind9 have been moved to lib/isc and lib/isccfg and the contents of lib/irs have been moved to dns. - The order of the make instructions had to be changed as lib/isccfg required the results of lib/dns and the build failed without it. Changing the order solved the build problem. - A large number of CVE fixes have been applied between the new and old version. 5 9.20.0 2 9.19.21 3 9.19.20 1 9.19.17 1 9.19.14 3 9.19.9 5 9.19.5 1 9.19.1 4 9.19.0 1 9.17.19 1 9.17.17 2 9.17.12 5 9.17.4 4 9.17.2 - Changelog is too long to include here - around 5000 lines. For details see the NEWS file in the source tarball.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e325ea00fe09fcd0149bbb45a03e5a8eed67feb4 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:13:04 2024 +0000
core189: Ship automake
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5bf383da9ec7c46066bb8b1efda72c18687207d2 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Aug 25 21:11:03 2024 +0200
automake: Update to version 1.17
- Update from version 1.16.5 to 1.17 - Update of rootfile - Changelog 1.17 * New features added - AM_PATH_PYTHON will, after checking "python", prefer any Python 3 version (latest versions checked first) over any Python 2 version. If a specific version of Python 2 is still needed, the $PYTHON variable should be set beforehand. - AM_PATH_PYTHON will also search for Python versions 3.20 through 3.10. It previously searched for 3.9 through 3.0. (bug#53530) - RANLIB may be overridden on a per-target basis. - AM_TEXI2FLAGS may be defined to pass extra flags to TEXI2DVI & TEXI2PDF. - New option "posix" to emit the special target .POSIX for make. (bug#55025, bug#67891) - Systems with non-POSIX "rm -f" behavior are now supported, and the prior intent to drop support for them has been reversed. The ACCEPT_INFERIOR_RM_PROGRAM setting no longer exists. (bug#10828) - Variables using escaped # will trigger portability warnings, but be retained when appended. GNU Make & BSD Makes are known to support it. (bug#7610) - GNU Make's default pattern rules are disabled, for speed and debugging. (.SUFFIXES was already cleared.) (bug#64743) - For Texinfo documents, if a .texi.in file exists, but no .texi, the .texi.in will be read. Texinfo source files need not be present at all, and if present, need not contain @setfilename. Then the file name as given in the Makefile.am will be used. If @setfilename is present, it should be the basename of the Texinfo file, extended with .info. (bug#54063) - aclocal has a new option --aclocal-path to override $ACLOCAL_PATH. (https://lists.gnu.org/archive/html/automake-patches/2022-01/msg00029.html) - The missing script also supports autoreconf, autogen, and perl. (https://lists.gnu.org/archive/html/automake-patches/2015-08/msg00000.html) - test-suite.log now contains basic system information, and the console message about bug reporting on failure has a bit more detail. (bug#68746, bug#71421) - When using the (default) "parallel" test driver, you can now omit the output of skipped tests from test-suite.log by defining the variable IGNORE_SKIPPED_LOGS to a non-empty value. (bug#71422) * Bugs fixed - Generated file timestamp checks handle filesystems with subsecond timestamp granularity dynamically, greatly speeding up the sleep done by AC_OUTPUT when generating config.status (all packages) and Automake's make check. However, this subsecond-mtime support requires an autom4te from Autoconf 2.72 or later (or random test failures and other timing problems may ensue), as well as a Perl, sleep program, make program, and filesystem that all support subsecond resolution; otherwise, we fall back to a two-second granularity, not even testing the (common) 1s case since that would induce a 2s delay for all configure scripts in all packages on all systems that don't support subsecond mtimes. When everything is supported, a line "Features: subsecond-mtime" is now printed by automake --version and autom4te --version. To override this check and delay, e.g. to use 1 second: am_cv_filesystem_timestamp_resolution=1 export am_cv_filesystem_timestamp_resolution (commit 720a11531, https://lists.gnu.org/archive/html/automake-commit/2022-02/msg00009.html then bug#60808, bug#64756, bug#67670, bug#68808, bug#71652, history reviewed in https://lists.gnu.org/archive/html/automake/2024-06/msg00054.html and more info in surrounding threads.) - The default value of $ARFLAGS is now "cr" instead of "cru", to better support deterministic builds. (bug#20082) - Automake's make dist now uses -9 instead of --best with gzip, because Alpine gzip does not support --best. Also, GZIP_ENV is used only for compression, not decompression, because of the same system. (bug#68151) - Dependency files are now empty, instead of "# dummy", for speed. (https://lists.gnu.org/archive/html/automake/2022-05/msg00006.html) - Compiling Python modules with Python 3.5+ uses multiple optimization levels. (bug#38043) - If the Python installation "scheme" is set to posix_local (Debian), it is reset to either deb_system (if the prefix = /usr), or posix_prefix (otherwise). (bug#54412, bug#64837) - As a result of the Python scheme change, the installation directory for Python files again defaults to "site-packages" under the usual installation prefix, even on systems (generally Debian-based) that would normally use the "dist-packages" subdirectory under /usr/local. - When compiling Emacs Lisp files, emacs is run with --no-site-file to disable user config files that might hang or access the terminal; and -Q is not used, since its support and behavior varies. (bug#58102) - Emacs Lisp compilations respect silent make output. - Automake no longer incorrectly warns that the POSIX make variables $(*D) and the like are non-POSIX. Unfortunately, the make implementations which do not correctly implement all the POSIX variables are not detected, but this seems to have little impact in practice. (bug#9587) - Pass libtool tags OBJC and OBJCXX for the respective languages. (bug#67539) - distcleancheck ignores "silly rename" files (.nfs* .smb* .__afs*) that can show up on network file systems. (https://lists.gnu.org/archive/html/automake/2022-09/msg00002.html) - Pass any options given to AM_PROG_LEX on to AC_PROG_LEX. (bug#65600, bug#65730) - aclocal: recognize ; as path separator on OS/2 and Windows. (bug#71534) - Hash iterations with external effects now consistently sort keys. (bug#25629, bug#46744) - tests: avoid some declaration conflicts for lex et al. on SunOS. (bug#34151 and others) - tests: declare yyparse before use and use (void) parameter lists instead of (), to placate C23. (bug#71425) - Typos in code and other doc fixes. (bug#68003, bug#68004, et al.) * Obsolescence: - py-compile no longer supports Python 0.x or 1.x versions. Python 2.0, released in 2000, is currently the minimum required version.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7ffcccb509e55da8357db72f052ee181bdb7c1ab Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Aug 25 16:53:16 2024 +0200
mc: Update to 4.8.32
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9b1575cb7f20841e3d2ab484088f25b4b9de9418 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Aug 26 08:12:00 2024 +0000
core189: Ship initscript functions
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0d61c6807caa7abfa3dbbef9f823bb91e8e394e6 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:45 2024 +0200
initscripts fkt: Check that readhash returns 1 on a missing file
It already does that, so the function is not changed
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 80c1cb5a0a2f9c13612a5a43c92d4657e0d06717 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:44 2024 +0200
initscripts fkt: Fix shebang
We use features only available in bash. So we should state correctly that the script should be executed in bash. As sh is a symlink to bash this makes not differences on a ipfire system. But my linter is less chatty with this change.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 14ecdd86f1e57949858b47aa2a449e051bf3ee3a Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:43 2024 +0200
initscripts fkt: keep readhash compatible with older implementation
With the use of eval BLUE_DEV='blue0 net0' stored "blue0 net0" in the variable BLUE_DEV not "'blue0 net0'"
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f1d94e7457a3d497d8c65acd9be606291a5ac6f6 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:42 2024 +0200
initscripts fkt: readhash should only parse lines with a =
A line without a = is clearly invalid.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9f72b7bc5f566e3fc81218154d748cd84c15f0bb Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:41 2024 +0200
initscripts fkt: Check for invalid values in readhash
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 02254f55438a47b94b5be763fb9d96e48983000a Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:40 2024 +0200
initscripts fkt: ignore invalid keys in readhash
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d289bc28beb65a937aba335501a86102d0455cec Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:39 2024 +0200
initscripts fkt: Ignore comments in readhash
As '#Another Comment' is a valid key we test this change by checking if the comments do not end up as keys in our array.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 59e3c2a217e7b219c62fe07f702ead9594b1ac24 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:38 2024 +0200
initscript fkt: ignore blank lines in readhash
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 96bb3ba8b81eb7344213f9be58c031e15f7b7899 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:37 2024 +0200
initscript functions: add readhash
To avoid the usage of eval and to store the config in an key value array, we introduce an new function. The tests only check if we read the correct value to the correct variable.
One comment on the implementation as this has created some headache:
>From https://www.gnu.org/software/bash/manual/bash.html#Bourne-Shell-Builtins
"When used in a function, declare makes each name local, as with the local command, unless the -g option is used."
So we need to use -g here
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit acde9c1a1307ad140f7cd80b031e191678bb4ed8 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:36 2024 +0200
tests: Add functions test_that_array_doesnt_have_key
Apparently we can set way more keys then I expected. So we need a function to check that we do not set certain key. Some keys need to be skipped.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 644b91e3023ee306f411450048529c9f66cfed16 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:35 2024 +0200
test: Add functions test_that_array_is_defined
we need this check in multiple places so it makes sense to move this to a separate function.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8f4c1855fa32a409b7244af0ef3b524e23dcf817 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:34 2024 +0200
tests: Add function to test the ouput of a bash function
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 721373c3d75c0ba27f6b77e6577163820014f6d4 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:33 2024 +0200
test_value_in_array: Check if the key is defined
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7631871fa9534ebfc9004cca9561c46797fa08b3 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:32 2024 +0200
tests/lib.sh: adjust to pytest logging style
Black on white is still the best to read. So we only style FAILED or PASSED in green or red. This is also tested with different background colors. As we only style PASSED or FAILED it works without any problems
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1579e8b3fc64d612e9dbf0d8922dbfa79e55d3cd Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:31 2024 +0200
tests/lib.sh: Add logging functions
So we can change the style of our log messages better.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 035f866d75eb0d5fca55c02cca0f5e7dedc3894f Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:30 2024 +0200
tests/lib.sh: Add check if variable exists to test_value_in_array
We cannot use [ -v ] here as this does not work. We need to check if the array is correctly declared.
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dae8a08086150fc12687a41ba30fc5335b6966e6 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:29 2024 +0200
tests/lib.sh: Add function test_value_in_array
Test if a given array has the specified value stored under key.
! does not work here to access the array by variable name. So the solution here is: https://unix.stackexchange.com/questions/60584/how-to-use-a-variable-as-part...
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6f4e7823564b5517ff5eccbd358f0c9a2d5e3e27 Author: Jonatan Schlag jonatan.schlag@ipfire.org Date: Sun Jun 16 18:02:28 2024 +0200
tests: Add bash lib
This allows use to write test with less effort as we can reuse functions
Signed-off-by: Jonatan Schlag jonatan.schlag@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/aarch64/ruby | 22 +- config/rootfiles/common/automake | 239 +++++++++--------- config/rootfiles/common/bind | 112 +++------ config/rootfiles/common/lua | 2 +- config/rootfiles/common/meson | 20 +- config/rootfiles/common/riscv64/ruby | 270 +++++++++++---------- config/rootfiles/common/x86_64/ruby | 22 +- config/rootfiles/core/189/filelists/aarch64/ruby | 1 + .../{oldcore/66 => core/189}/filelists/automake | 0 .../{oldcore/100 => core/189}/filelists/bind | 0 config/rootfiles/core/189/filelists/files | 1 + .../{oldcore/164 => core/189}/filelists/gdbm | 0 .../{oldcore/123 => core/189}/filelists/iana-etc | 0 .../{oldcore/100 => core/189}/filelists/lua | 0 config/rootfiles/core/189/filelists/meson | 1 + config/rootfiles/core/189/filelists/riscv64/ruby | 1 + config/rootfiles/core/189/filelists/x86_64/ruby | 1 + .../{oldcore/125 => core/189}/filelists/xfsprogs | 0 config/rootfiles/packages/mc | 12 + lfs/automake | 6 +- lfs/bind | 19 +- lfs/gdbm | 6 +- lfs/iana-etc | 4 +- lfs/lua | 10 +- lfs/mc | 6 +- lfs/meson | 4 +- lfs/ruby | 4 +- lfs/xfsprogs | 4 +- make.sh | 2 +- src/initscripts/system/functions | 50 +++- ...ry-1.patch => lua-5.4.7-shared_library-1.patch} | 0 tests/lib.sh | 122 ++++++++++ tests/src/initscripts/system/functions/data/1 | 20 ++ .../system/functions/data/1_output_stderr | 0 .../system/functions/data/1_output_stdout | 0 tests/src/initscripts/system/functions/data/2 | 21 ++ .../system/functions/data/2_output_stderr | 9 + .../system/functions/data/2_output_stdout | 0 tests/src/initscripts/system/functions/test.sh | 47 ++++ tests/src/initscripts/system/functions/test2.sh | 21 ++ 40 files changed, 691 insertions(+), 368 deletions(-) create mode 120000 config/rootfiles/core/189/filelists/aarch64/ruby copy config/rootfiles/{oldcore/66 => core/189}/filelists/automake (100%) copy config/rootfiles/{oldcore/100 => core/189}/filelists/bind (100%) create mode 100644 config/rootfiles/core/189/filelists/files copy config/rootfiles/{oldcore/164 => core/189}/filelists/gdbm (100%) copy config/rootfiles/{oldcore/123 => core/189}/filelists/iana-etc (100%) copy config/rootfiles/{oldcore/100 => core/189}/filelists/lua (100%) create mode 120000 config/rootfiles/core/189/filelists/meson create mode 120000 config/rootfiles/core/189/filelists/riscv64/ruby create mode 120000 config/rootfiles/core/189/filelists/x86_64/ruby copy config/rootfiles/{oldcore/125 => core/189}/filelists/xfsprogs (100%) rename src/patches/{lua-5.4.6-shared_library-1.patch => lua-5.4.7-shared_library-1.patch} (100%) create mode 100644 tests/lib.sh create mode 100644 tests/src/initscripts/system/functions/data/1 copy config/backup/includes/lcdproc => tests/src/initscripts/system/functions/data/1_output_stderr (100%) copy config/backup/includes/lcdproc => tests/src/initscripts/system/functions/data/1_output_stdout (100%) create mode 100644 tests/src/initscripts/system/functions/data/2 create mode 100644 tests/src/initscripts/system/functions/data/2_output_stderr copy config/backup/includes/lcdproc => tests/src/initscripts/system/functions/data/2_output_stdout (100%) create mode 100755 tests/src/initscripts/system/functions/test.sh create mode 100755 tests/src/initscripts/system/functions/test2.sh
Difference in files: diff --git a/config/rootfiles/common/aarch64/ruby b/config/rootfiles/common/aarch64/ruby index 34783f9ae..abce9edff 100644 --- a/config/rootfiles/common/aarch64/ruby +++ b/config/rootfiles/common/aarch64/ruby @@ -222,7 +222,7 @@ #usr/include/ruby-3.3.0/ruby/vm.h #usr/lib/libruby.so #usr/lib/libruby.so.3.3 -#usr/lib/libruby.so.3.3.3 +#usr/lib/libruby.so.3.3.4 #usr/lib/pkgconfig/ruby-3.3.pc #usr/lib/ruby #usr/lib/ruby/3.3.0 @@ -1718,9 +1718,16 @@ #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/exe/rdbg #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/Makefile #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug.c +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug.o +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug_version.h +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/extconf.h #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/extconf.rb #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/iseq_collector.c +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/iseq_collector.o +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/mkmf.log +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/exts.mk #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib/debug #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib/debug.rb @@ -2166,24 +2173,37 @@ #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/exe/rbs #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/Makefile #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/extconf.h #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/extconf.rb #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.re #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexstate.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexstate.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/main.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/main.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/mkmf.log #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/rbs_extension.h #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/unescape.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/unescape.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/exts.mk #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/goodcheck.yml #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/lib #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/lib/rbs diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake index 595eaf396..99d44ab7d 100644 --- a/config/rootfiles/common/automake +++ b/config/rootfiles/common/automake @@ -1,130 +1,131 @@ #usr/bin/aclocal -#usr/bin/aclocal-1.16 +#usr/bin/aclocal-1.17 #usr/bin/automake -#usr/bin/automake-1.16 -#usr/share/aclocal -#usr/share/aclocal-1.16 -#usr/share/aclocal-1.16/amversion.m4 -#usr/share/aclocal-1.16/ar-lib.m4 -#usr/share/aclocal-1.16/as.m4 -#usr/share/aclocal-1.16/auxdir.m4 -#usr/share/aclocal-1.16/cond-if.m4 -#usr/share/aclocal-1.16/cond.m4 -#usr/share/aclocal-1.16/depend.m4 -#usr/share/aclocal-1.16/depout.m4 -#usr/share/aclocal-1.16/dmalloc.m4 -#usr/share/aclocal-1.16/extra-recurs.m4 -#usr/share/aclocal-1.16/gcj.m4 -#usr/share/aclocal-1.16/init.m4 -#usr/share/aclocal-1.16/install-sh.m4 -#usr/share/aclocal-1.16/internal -#usr/share/aclocal-1.16/internal/ac-config-macro-dirs.m4 -#usr/share/aclocal-1.16/lead-dot.m4 -#usr/share/aclocal-1.16/lex.m4 -#usr/share/aclocal-1.16/lispdir.m4 -#usr/share/aclocal-1.16/maintainer.m4 -#usr/share/aclocal-1.16/make.m4 -#usr/share/aclocal-1.16/missing.m4 -#usr/share/aclocal-1.16/mkdirp.m4 -#usr/share/aclocal-1.16/obsolete.m4 -#usr/share/aclocal-1.16/options.m4 -#usr/share/aclocal-1.16/prog-cc-c-o.m4 -#usr/share/aclocal-1.16/python.m4 -#usr/share/aclocal-1.16/runlog.m4 -#usr/share/aclocal-1.16/sanity.m4 -#usr/share/aclocal-1.16/silent.m4 -#usr/share/aclocal-1.16/strip.m4 -#usr/share/aclocal-1.16/substnot.m4 -#usr/share/aclocal-1.16/tar.m4 -#usr/share/aclocal-1.16/upc.m4 -#usr/share/aclocal-1.16/vala.m4 +#usr/bin/automake-1.17 +#usr/share/aclocal-1.17 +#usr/share/aclocal-1.17/amversion.m4 +#usr/share/aclocal-1.17/ar-lib.m4 +#usr/share/aclocal-1.17/as.m4 +#usr/share/aclocal-1.17/auxdir.m4 +#usr/share/aclocal-1.17/cond-if.m4 +#usr/share/aclocal-1.17/cond.m4 +#usr/share/aclocal-1.17/depend.m4 +#usr/share/aclocal-1.17/depout.m4 +#usr/share/aclocal-1.17/dmalloc.m4 +#usr/share/aclocal-1.17/extra-recurs.m4 +#usr/share/aclocal-1.17/gcj.m4 +#usr/share/aclocal-1.17/init.m4 +#usr/share/aclocal-1.17/install-sh.m4 +#usr/share/aclocal-1.17/internal +#usr/share/aclocal-1.17/internal/ac-config-macro-dirs.m4 +#usr/share/aclocal-1.17/lead-dot.m4 +#usr/share/aclocal-1.17/lex.m4 +#usr/share/aclocal-1.17/lispdir.m4 +#usr/share/aclocal-1.17/maintainer.m4 +#usr/share/aclocal-1.17/make.m4 +#usr/share/aclocal-1.17/missing.m4 +#usr/share/aclocal-1.17/mkdirp.m4 +#usr/share/aclocal-1.17/obsolete.m4 +#usr/share/aclocal-1.17/options.m4 +#usr/share/aclocal-1.17/prog-cc-c-o.m4 +#usr/share/aclocal-1.17/python.m4 +#usr/share/aclocal-1.17/rmf.m4 +#usr/share/aclocal-1.17/runlog.m4 +#usr/share/aclocal-1.17/sanity.m4 +#usr/share/aclocal-1.17/silent.m4 +#usr/share/aclocal-1.17/strip.m4 +#usr/share/aclocal-1.17/substnot.m4 +#usr/share/aclocal-1.17/tar.m4 +#usr/share/aclocal-1.17/upc.m4 +#usr/share/aclocal-1.17/vala.m4 +#usr/share/aclocal-1.17/xargsn.m4 #usr/share/aclocal/README -#usr/share/automake-1.16 -#usr/share/automake-1.16/Automake -#usr/share/automake-1.16/Automake/ChannelDefs.pm -#usr/share/automake-1.16/Automake/Channels.pm -#usr/share/automake-1.16/Automake/Condition.pm -#usr/share/automake-1.16/Automake/Config.pm -#usr/share/automake-1.16/Automake/Configure_ac.pm -#usr/share/automake-1.16/Automake/DisjConditions.pm -#usr/share/automake-1.16/Automake/FileUtils.pm -#usr/share/automake-1.16/Automake/General.pm -#usr/share/automake-1.16/Automake/Getopt.pm -#usr/share/automake-1.16/Automake/Item.pm -#usr/share/automake-1.16/Automake/ItemDef.pm -#usr/share/automake-1.16/Automake/Language.pm -#usr/share/automake-1.16/Automake/Location.pm -#usr/share/automake-1.16/Automake/Options.pm -#usr/share/automake-1.16/Automake/Rule.pm -#usr/share/automake-1.16/Automake/RuleDef.pm -#usr/share/automake-1.16/Automake/VarDef.pm -#usr/share/automake-1.16/Automake/Variable.pm -#usr/share/automake-1.16/Automake/Version.pm -#usr/share/automake-1.16/Automake/Wrap.pm -#usr/share/automake-1.16/Automake/XFile.pm -#usr/share/automake-1.16/COPYING -#usr/share/automake-1.16/INSTALL -#usr/share/automake-1.16/am -#usr/share/automake-1.16/am/check.am -#usr/share/automake-1.16/am/check2.am -#usr/share/automake-1.16/am/clean-hdr.am -#usr/share/automake-1.16/am/clean.am -#usr/share/automake-1.16/am/compile.am -#usr/share/automake-1.16/am/configure.am -#usr/share/automake-1.16/am/data.am -#usr/share/automake-1.16/am/dejagnu.am -#usr/share/automake-1.16/am/depend.am -#usr/share/automake-1.16/am/depend2.am -#usr/share/automake-1.16/am/distdir.am -#usr/share/automake-1.16/am/footer.am -#usr/share/automake-1.16/am/header-vars.am -#usr/share/automake-1.16/am/header.am -#usr/share/automake-1.16/am/inst-vars.am -#usr/share/automake-1.16/am/install.am -#usr/share/automake-1.16/am/java.am -#usr/share/automake-1.16/am/lang-compile.am -#usr/share/automake-1.16/am/lex.am -#usr/share/automake-1.16/am/library.am -#usr/share/automake-1.16/am/libs.am -#usr/share/automake-1.16/am/libtool.am -#usr/share/automake-1.16/am/lisp.am -#usr/share/automake-1.16/am/ltlib.am -#usr/share/automake-1.16/am/ltlibrary.am -#usr/share/automake-1.16/am/mans-vars.am -#usr/share/automake-1.16/am/mans.am -#usr/share/automake-1.16/am/program.am -#usr/share/automake-1.16/am/progs.am -#usr/share/automake-1.16/am/python.am -#usr/share/automake-1.16/am/remake-hdr.am -#usr/share/automake-1.16/am/scripts.am -#usr/share/automake-1.16/am/subdirs.am -#usr/share/automake-1.16/am/tags.am -#usr/share/automake-1.16/am/texi-vers.am -#usr/share/automake-1.16/am/texibuild.am -#usr/share/automake-1.16/am/texinfos.am -#usr/share/automake-1.16/am/vala.am -#usr/share/automake-1.16/am/yacc.am -#usr/share/automake-1.16/ar-lib -#usr/share/automake-1.16/compile -#usr/share/automake-1.16/config.guess -#usr/share/automake-1.16/config.sub -#usr/share/automake-1.16/depcomp -#usr/share/automake-1.16/install-sh -#usr/share/automake-1.16/mdate-sh -#usr/share/automake-1.16/missing -#usr/share/automake-1.16/mkinstalldirs -#usr/share/automake-1.16/py-compile -#usr/share/automake-1.16/tap-driver.sh -#usr/share/automake-1.16/test-driver -#usr/share/automake-1.16/texinfo.tex -#usr/share/automake-1.16/ylwrap +#usr/share/automake-1.17 +#usr/share/automake-1.17/Automake +#usr/share/automake-1.17/Automake/ChannelDefs.pm +#usr/share/automake-1.17/Automake/Channels.pm +#usr/share/automake-1.17/Automake/Condition.pm +#usr/share/automake-1.17/Automake/Config.pm +#usr/share/automake-1.17/Automake/Configure_ac.pm +#usr/share/automake-1.17/Automake/DisjConditions.pm +#usr/share/automake-1.17/Automake/FileUtils.pm +#usr/share/automake-1.17/Automake/General.pm +#usr/share/automake-1.17/Automake/Getopt.pm +#usr/share/automake-1.17/Automake/Item.pm +#usr/share/automake-1.17/Automake/ItemDef.pm +#usr/share/automake-1.17/Automake/Language.pm +#usr/share/automake-1.17/Automake/Location.pm +#usr/share/automake-1.17/Automake/Options.pm +#usr/share/automake-1.17/Automake/Rule.pm +#usr/share/automake-1.17/Automake/RuleDef.pm +#usr/share/automake-1.17/Automake/VarDef.pm +#usr/share/automake-1.17/Automake/Variable.pm +#usr/share/automake-1.17/Automake/Version.pm +#usr/share/automake-1.17/Automake/Wrap.pm +#usr/share/automake-1.17/Automake/XFile.pm +#usr/share/automake-1.17/COPYING +#usr/share/automake-1.17/INSTALL +#usr/share/automake-1.17/am +#usr/share/automake-1.17/am/check.am +#usr/share/automake-1.17/am/check2.am +#usr/share/automake-1.17/am/clean-hdr.am +#usr/share/automake-1.17/am/clean.am +#usr/share/automake-1.17/am/compile.am +#usr/share/automake-1.17/am/configure.am +#usr/share/automake-1.17/am/data.am +#usr/share/automake-1.17/am/dejagnu.am +#usr/share/automake-1.17/am/depend.am +#usr/share/automake-1.17/am/depend2.am +#usr/share/automake-1.17/am/distdir.am +#usr/share/automake-1.17/am/footer.am +#usr/share/automake-1.17/am/header-vars.am +#usr/share/automake-1.17/am/header.am +#usr/share/automake-1.17/am/inst-vars.am +#usr/share/automake-1.17/am/install.am +#usr/share/automake-1.17/am/java.am +#usr/share/automake-1.17/am/lang-compile.am +#usr/share/automake-1.17/am/lex.am +#usr/share/automake-1.17/am/library.am +#usr/share/automake-1.17/am/libs.am +#usr/share/automake-1.17/am/libtool.am +#usr/share/automake-1.17/am/lisp.am +#usr/share/automake-1.17/am/ltlib.am +#usr/share/automake-1.17/am/ltlibrary.am +#usr/share/automake-1.17/am/mans-vars.am +#usr/share/automake-1.17/am/mans.am +#usr/share/automake-1.17/am/program.am +#usr/share/automake-1.17/am/progs.am +#usr/share/automake-1.17/am/python.am +#usr/share/automake-1.17/am/remake-hdr.am +#usr/share/automake-1.17/am/scripts.am +#usr/share/automake-1.17/am/subdirs.am +#usr/share/automake-1.17/am/tags.am +#usr/share/automake-1.17/am/texi-vers.am +#usr/share/automake-1.17/am/texibuild.am +#usr/share/automake-1.17/am/texinfos.am +#usr/share/automake-1.17/am/vala.am +#usr/share/automake-1.17/am/yacc.am +#usr/share/automake-1.17/ar-lib +#usr/share/automake-1.17/compile +#usr/share/automake-1.17/config.guess +#usr/share/automake-1.17/config.sub +#usr/share/automake-1.17/depcomp +#usr/share/automake-1.17/install-sh +#usr/share/automake-1.17/mdate-sh +#usr/share/automake-1.17/missing +#usr/share/automake-1.17/mkinstalldirs +#usr/share/automake-1.17/py-compile +#usr/share/automake-1.17/tap-driver.sh +#usr/share/automake-1.17/test-driver +#usr/share/automake-1.17/texinfo.tex +#usr/share/automake-1.17/ylwrap #usr/share/doc/automake #usr/share/doc/automake/amhello-1.0.tar.gz #usr/share/info/automake-history.info #usr/share/info/automake.info #usr/share/info/automake.info-1 #usr/share/info/automake.info-2 -#usr/share/man/man1/aclocal-1.16.1 +#usr/share/man/man1/aclocal-1.17.1 #usr/share/man/man1/aclocal.1 -#usr/share/man/man1/automake-1.16.1 +#usr/share/man/man1/automake-1.17.1 #usr/share/man/man1/automake.1 diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index 86383fb74..74d3b93e5 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -3,10 +3,6 @@ usr/bin/dig usr/bin/host usr/bin/nslookup usr/bin/nsupdate -#usr/include/bind9 -#usr/include/bind9/check.h -#usr/include/bind9/getaddresses.h -#usr/include/bind9/version.h #usr/include/dns #usr/include/dns/acl.h #usr/include/dns/adb.h @@ -22,7 +18,6 @@ usr/bin/nsupdate #usr/include/dns/compress.h #usr/include/dns/db.h #usr/include/dns/dbiterator.h -#usr/include/dns/dbtable.h #usr/include/dns/diff.h #usr/include/dns/dispatch.h #usr/include/dns/dlz.h @@ -34,12 +29,10 @@ usr/bin/nsupdate #usr/include/dns/ds.h #usr/include/dns/dsdigest.h #usr/include/dns/dyndb.h -#usr/include/dns/ecdb.h #usr/include/dns/ecs.h #usr/include/dns/edns.h #usr/include/dns/enumclass.h #usr/include/dns/enumtype.h -#usr/include/dns/events.h #usr/include/dns/fixedname.h #usr/include/dns/forward.h #usr/include/dns/geoip.h @@ -50,17 +43,16 @@ usr/bin/nsupdate #usr/include/dns/keydata.h #usr/include/dns/keyflags.h #usr/include/dns/keymgr.h +#usr/include/dns/keystore.h #usr/include/dns/keytable.h #usr/include/dns/keyvalues.h -#usr/include/dns/lib.h #usr/include/dns/librpz.h -#usr/include/dns/lmdb.h #usr/include/dns/log.h -#usr/include/dns/lookup.h #usr/include/dns/master.h #usr/include/dns/masterdump.h #usr/include/dns/message.h #usr/include/dns/name.h +#usr/include/dns/nametree.h #usr/include/dns/ncache.h #usr/include/dns/nsec.h #usr/include/dns/nsec3.h @@ -68,8 +60,8 @@ usr/bin/nsupdate #usr/include/dns/opcode.h #usr/include/dns/order.h #usr/include/dns/peer.h -#usr/include/dns/portlist.h #usr/include/dns/private.h +#usr/include/dns/qp.h #usr/include/dns/rbt.h #usr/include/dns/rcode.h #usr/include/dns/rdata.h @@ -80,6 +72,7 @@ usr/bin/nsupdate #usr/include/dns/rdataslab.h #usr/include/dns/rdatastruct.h #usr/include/dns/rdatatype.h +#usr/include/dns/remote.h #usr/include/dns/request.h #usr/include/dns/resolver.h #usr/include/dns/result.h @@ -87,24 +80,21 @@ usr/bin/nsupdate #usr/include/dns/rpz.h #usr/include/dns/rriterator.h #usr/include/dns/rrl.h -#usr/include/dns/sdb.h #usr/include/dns/sdlz.h #usr/include/dns/secalg.h #usr/include/dns/secproto.h #usr/include/dns/soa.h #usr/include/dns/ssu.h #usr/include/dns/stats.h -#usr/include/dns/tcpmsg.h #usr/include/dns/time.h -#usr/include/dns/timer.h #usr/include/dns/tkey.h -#usr/include/dns/tsec.h +#usr/include/dns/trace.h +#usr/include/dns/transport.h #usr/include/dns/tsig.h #usr/include/dns/ttl.h #usr/include/dns/types.h #usr/include/dns/update.h #usr/include/dns/validator.h -#usr/include/dns/version.h #usr/include/dns/view.h #usr/include/dns/xfrin.h #usr/include/dns/zone.h @@ -114,60 +104,50 @@ usr/bin/nsupdate #usr/include/dst #usr/include/dst/dst.h #usr/include/dst/gssapi.h -#usr/include/dst/result.h #usr/include/irs -#usr/include/irs/context.h -#usr/include/irs/dnsconf.h -#usr/include/irs/netdb.h -#usr/include/irs/platform.h #usr/include/irs/resconf.h -#usr/include/irs/types.h -#usr/include/irs/version.h #usr/include/isc -#usr/include/isc/aes.h -#usr/include/isc/align.h -#usr/include/isc/app.h +#usr/include/isc/ascii.h #usr/include/isc/assertions.h -#usr/include/isc/astack.h +#usr/include/isc/async.h #usr/include/isc/atomic.h +#usr/include/isc/attributes.h #usr/include/isc/backtrace.h #usr/include/isc/barrier.h #usr/include/isc/base32.h #usr/include/isc/base64.h -#usr/include/isc/bind9.h #usr/include/isc/buffer.h -#usr/include/isc/bufferlist.h -#usr/include/isc/cmocka.h #usr/include/isc/commandline.h #usr/include/isc/condition.h #usr/include/isc/counter.h #usr/include/isc/crc64.h -#usr/include/isc/deprecated.h #usr/include/isc/dir.h +#usr/include/isc/dnsstream.h #usr/include/isc/endian.h +#usr/include/isc/entropy.h #usr/include/isc/errno.h #usr/include/isc/error.h -#usr/include/isc/event.h -#usr/include/isc/eventclass.h #usr/include/isc/file.h +#usr/include/isc/fips.h #usr/include/isc/formatcheck.h -#usr/include/isc/fsaccess.h #usr/include/isc/fuzz.h +#usr/include/isc/getaddresses.h #usr/include/isc/hash.h +#usr/include/isc/hashmap.h #usr/include/isc/heap.h #usr/include/isc/hex.h +#usr/include/isc/histo.h #usr/include/isc/hmac.h #usr/include/isc/ht.h #usr/include/isc/httpd.h #usr/include/isc/interfaceiter.h #usr/include/isc/iterated_hash.h +#usr/include/isc/job.h #usr/include/isc/lang.h #usr/include/isc/lex.h -#usr/include/isc/lfsr.h -#usr/include/isc/lib.h -#usr/include/isc/likely.h #usr/include/isc/list.h #usr/include/isc/log.h +#usr/include/isc/loop.h #usr/include/isc/magic.h #usr/include/isc/managers.h #usr/include/isc/md.h @@ -177,18 +157,17 @@ usr/bin/nsupdate #usr/include/isc/mutexblock.h #usr/include/isc/net.h #usr/include/isc/netaddr.h -#usr/include/isc/netdb.h #usr/include/isc/netmgr.h #usr/include/isc/netscope.h #usr/include/isc/nonce.h -#usr/include/isc/offset.h #usr/include/isc/once.h #usr/include/isc/os.h +#usr/include/isc/overflow.h #usr/include/isc/parseint.h -#usr/include/isc/platform.h -#usr/include/isc/pool.h +#usr/include/isc/pause.h #usr/include/isc/portset.h -#usr/include/isc/print.h +#usr/include/isc/proxy2.h +#usr/include/isc/queue.h #usr/include/isc/quota.h #usr/include/isc/radix.h #usr/include/isc/random.h @@ -196,62 +175,58 @@ usr/bin/nsupdate #usr/include/isc/refcount.h #usr/include/isc/regex.h #usr/include/isc/region.h -#usr/include/isc/resource.h #usr/include/isc/result.h -#usr/include/isc/resultclass.h #usr/include/isc/rwlock.h #usr/include/isc/safe.h #usr/include/isc/serial.h +#usr/include/isc/signal.h #usr/include/isc/siphash.h #usr/include/isc/sockaddr.h -#usr/include/isc/socket.h -#usr/include/isc/stat.h +#usr/include/isc/spinlock.h #usr/include/isc/stats.h -#usr/include/isc/stdatomic.h #usr/include/isc/stdio.h #usr/include/isc/stdtime.h #usr/include/isc/strerr.h #usr/include/isc/string.h #usr/include/isc/symtab.h #usr/include/isc/syslog.h -#usr/include/isc/task.h -#usr/include/isc/taskpool.h #usr/include/isc/thread.h +#usr/include/isc/tid.h #usr/include/isc/time.h #usr/include/isc/timer.h +#usr/include/isc/tls.h #usr/include/isc/tm.h #usr/include/isc/types.h +#usr/include/isc/urcu.h #usr/include/isc/url.h #usr/include/isc/utf8.h #usr/include/isc/util.h -#usr/include/isc/version.h +#usr/include/isc/uv.h +#usr/include/isc/work.h +#usr/include/isc/xml.h #usr/include/isccc #usr/include/isccc/alist.h #usr/include/isccc/base64.h #usr/include/isccc/cc.h #usr/include/isccc/ccmsg.h -#usr/include/isccc/events.h -#usr/include/isccc/result.h #usr/include/isccc/sexpr.h #usr/include/isccc/symtab.h #usr/include/isccc/symtype.h #usr/include/isccc/types.h #usr/include/isccc/util.h -#usr/include/isccc/version.h #usr/include/isccfg #usr/include/isccfg/aclconf.h #usr/include/isccfg/cfg.h -#usr/include/isccfg/dnsconf.h +#usr/include/isccfg/check.h +#usr/include/isccfg/duration.h #usr/include/isccfg/grammar.h #usr/include/isccfg/kaspconf.h #usr/include/isccfg/log.h #usr/include/isccfg/namedconf.h -#usr/include/isccfg/version.h #usr/include/ns #usr/include/ns/client.h #usr/include/ns/hooks.h #usr/include/ns/interfacemgr.h -#usr/include/ns/lib.h #usr/include/ns/listenlist.h #usr/include/ns/log.h #usr/include/ns/notify.h @@ -261,34 +236,19 @@ usr/bin/nsupdate #usr/include/ns/stats.h #usr/include/ns/types.h #usr/include/ns/update.h -#usr/include/ns/version.h #usr/include/ns/xfrout.h -#usr/include/pk11 -#usr/include/pk11/constants.h -#usr/include/pk11/internal.h -#usr/include/pk11/pk11.h -#usr/include/pk11/result.h -#usr/include/pk11/site.h -#usr/include/pkcs11 -#usr/include/pkcs11/pkcs11.h -usr/lib/libbind9-9.16.50.so -#usr/lib/libbind9.la -#usr/lib/libbind9.so -usr/lib/libdns-9.16.50.so +usr/lib/libdns-9.20.1.so #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libirs-9.16.50.so -#usr/lib/libirs.la -#usr/lib/libirs.so -usr/lib/libisc-9.16.50.so +usr/lib/libisc-9.20.1.so #usr/lib/libisc.la #usr/lib/libisc.so -usr/lib/libisccc-9.16.50.so +usr/lib/libisccc-9.20.1.so #usr/lib/libisccc.la #usr/lib/libisccc.so -usr/lib/libisccfg-9.16.50.so +usr/lib/libisccfg-9.20.1.so #usr/lib/libisccfg.la #usr/lib/libisccfg.so -usr/lib/libns-9.16.50.so +usr/lib/libns-9.20.1.so #usr/lib/libns.la #usr/lib/libns.so diff --git a/config/rootfiles/common/lua b/config/rootfiles/common/lua index 6b69167ef..799148912 100644 --- a/config/rootfiles/common/lua +++ b/config/rootfiles/common/lua @@ -7,7 +7,7 @@ usr/bin/luac #usr/include/lualib.h #usr/lib/liblua.so usr/lib/liblua.so.5.4 -usr/lib/liblua.so.5.4.6 +usr/lib/liblua.so.5.4.7 #usr/lib/lua #usr/lib/lua/5.4 #usr/lib/pkgconfig/lua.pc diff --git a/config/rootfiles/common/meson b/config/rootfiles/common/meson index 6db0e34ed..79f5ca6c2 100644 --- a/config/rootfiles/common/meson +++ b/config/rootfiles/common/meson @@ -1,11 +1,11 @@ #usr/bin/meson -#usr/lib/python3.10/site-packages/meson-1.4.0-py3.10.egg-info -#usr/lib/python3.10/site-packages/meson-1.4.0-py3.10.egg-info/PKG-INFO -#usr/lib/python3.10/site-packages/meson-1.4.0-py3.10.egg-info/SOURCES.txt -#usr/lib/python3.10/site-packages/meson-1.4.0-py3.10.egg-info/dependency_links.txt -#usr/lib/python3.10/site-packages/meson-1.4.0-py3.10.egg-info/entry_points.txt -#usr/lib/python3.10/site-packages/meson-1.4.0-py3.10.egg-info/requires.txt -#usr/lib/python3.10/site-packages/meson-1.4.0-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info +#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/top_level.txt #usr/lib/python3.10/site-packages/mesonbuild #usr/lib/python3.10/site-packages/mesonbuild/__init__.py #usr/lib/python3.10/site-packages/mesonbuild/_pathlib.py @@ -68,6 +68,7 @@ #usr/lib/python3.10/site-packages/mesonbuild/compilers/java.py #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/__init__.py +#usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/apple.py #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/arm.py #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/ccrx.py #usr/lib/python3.10/site-packages/mesonbuild/compilers/mixins/clang.py @@ -151,6 +152,7 @@ #usr/lib/python3.10/site-packages/mesonbuild/linkers/base.py #usr/lib/python3.10/site-packages/mesonbuild/linkers/detect.py #usr/lib/python3.10/site-packages/mesonbuild/linkers/linkers.py +#usr/lib/python3.10/site-packages/mesonbuild/machinefile.py #usr/lib/python3.10/site-packages/mesonbuild/mcompile.py #usr/lib/python3.10/site-packages/mesonbuild/mconf.py #usr/lib/python3.10/site-packages/mesonbuild/mdevenv.py @@ -158,12 +160,14 @@ #usr/lib/python3.10/site-packages/mesonbuild/mesondata.py #usr/lib/python3.10/site-packages/mesonbuild/mesonlib.py #usr/lib/python3.10/site-packages/mesonbuild/mesonmain.py +#usr/lib/python3.10/site-packages/mesonbuild/mformat.py #usr/lib/python3.10/site-packages/mesonbuild/minit.py #usr/lib/python3.10/site-packages/mesonbuild/minstall.py #usr/lib/python3.10/site-packages/mesonbuild/mintro.py #usr/lib/python3.10/site-packages/mesonbuild/mlog.py #usr/lib/python3.10/site-packages/mesonbuild/modules #usr/lib/python3.10/site-packages/mesonbuild/modules/__init__.py +#usr/lib/python3.10/site-packages/mesonbuild/modules/_qt.py #usr/lib/python3.10/site-packages/mesonbuild/modules/cmake.py #usr/lib/python3.10/site-packages/mesonbuild/modules/cuda.py #usr/lib/python3.10/site-packages/mesonbuild/modules/dlang.py @@ -179,7 +183,6 @@ #usr/lib/python3.10/site-packages/mesonbuild/modules/pkgconfig.py #usr/lib/python3.10/site-packages/mesonbuild/modules/python.py #usr/lib/python3.10/site-packages/mesonbuild/modules/python3.py -#usr/lib/python3.10/site-packages/mesonbuild/modules/qt.py #usr/lib/python3.10/site-packages/mesonbuild/modules/qt4.py #usr/lib/python3.10/site-packages/mesonbuild/modules/qt5.py #usr/lib/python3.10/site-packages/mesonbuild/modules/qt6.py @@ -194,6 +197,7 @@ #usr/lib/python3.10/site-packages/mesonbuild/mtest.py #usr/lib/python3.10/site-packages/mesonbuild/munstable_coredata.py #usr/lib/python3.10/site-packages/mesonbuild/optinterpreter.py +#usr/lib/python3.10/site-packages/mesonbuild/options.py #usr/lib/python3.10/site-packages/mesonbuild/programs.py #usr/lib/python3.10/site-packages/mesonbuild/rewriter.py #usr/lib/python3.10/site-packages/mesonbuild/scripts diff --git a/config/rootfiles/common/riscv64/ruby b/config/rootfiles/common/riscv64/ruby index 381703bfc..92c09e9ef 100644 --- a/config/rootfiles/common/riscv64/ruby +++ b/config/rootfiles/common/riscv64/ruby @@ -13,9 +13,6 @@ #usr/bin/syntax_suggest #usr/bin/typeprof #usr/include/ruby-3.3.0 -#usr/include/ruby-3.3.0/riscv64-linux -#usr/include/ruby-3.3.0/riscv64-linux/ruby -#usr/include/ruby-3.3.0/riscv64-linux/ruby/config.h #usr/include/ruby-3.3.0/ruby #usr/include/ruby-3.3.0/ruby.h #usr/include/ruby-3.3.0/ruby/assert.h @@ -220,9 +217,12 @@ #usr/include/ruby-3.3.0/ruby/util.h #usr/include/ruby-3.3.0/ruby/version.h #usr/include/ruby-3.3.0/ruby/vm.h +#usr/include/ruby-3.3.0/x86_64-linux +#usr/include/ruby-3.3.0/x86_64-linux/ruby +#usr/include/ruby-3.3.0/x86_64-linux/ruby/config.h #usr/lib/libruby.so #usr/lib/libruby.so.3.3 -#usr/lib/libruby.so.3.3.3 +#usr/lib/libruby.so.3.3.4 #usr/lib/pkgconfig/ruby-3.3.pc #usr/lib/ruby #usr/lib/ruby/3.3.0 @@ -1175,112 +1175,6 @@ #usr/lib/ruby/3.3.0/ripper/filter.rb #usr/lib/ruby/3.3.0/ripper/lexer.rb #usr/lib/ruby/3.3.0/ripper/sexp.rb -#usr/lib/ruby/3.3.0/riscv64-linux -#usr/lib/ruby/3.3.0/riscv64-linux/bigdecimal.so -#usr/lib/ruby/3.3.0/riscv64-linux/cgi -#usr/lib/ruby/3.3.0/riscv64-linux/cgi/escape.so -#usr/lib/ruby/3.3.0/riscv64-linux/continuation.so -#usr/lib/ruby/3.3.0/riscv64-linux/coverage.so -#usr/lib/ruby/3.3.0/riscv64-linux/date_core.so -#usr/lib/ruby/3.3.0/riscv64-linux/digest -#usr/lib/ruby/3.3.0/riscv64-linux/digest.so -#usr/lib/ruby/3.3.0/riscv64-linux/digest/bubblebabble.so -#usr/lib/ruby/3.3.0/riscv64-linux/digest/md5.so -#usr/lib/ruby/3.3.0/riscv64-linux/digest/rmd160.so -#usr/lib/ruby/3.3.0/riscv64-linux/digest/sha1.so -#usr/lib/ruby/3.3.0/riscv64-linux/digest/sha2.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc -#usr/lib/ruby/3.3.0/riscv64-linux/enc/big5.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/cesu_8.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/cp949.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/emacs_mule.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/encdb.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/euc_jp.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/euc_kr.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/euc_tw.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/gb18030.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/gb2312.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/gbk.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_1.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_10.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_11.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_13.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_14.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_15.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_16.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_2.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_3.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_4.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_5.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_6.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_7.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_8.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/iso_8859_9.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/koi8_r.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/koi8_u.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/shift_jis.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/big5.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/cesu_8.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/chinese.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/ebcdic.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/emoji.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/emoji_iso2022_kddi.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/emoji_sjis_docomo.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/emoji_sjis_kddi.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/emoji_sjis_softbank.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/escape.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/gb18030.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/gbk.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/iso2022.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/japanese.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/japanese_euc.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/japanese_sjis.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/korean.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/single_byte.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/transdb.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/utf8_mac.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/trans/utf_16_32.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/utf_16be.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/utf_16le.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/utf_32be.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/utf_32le.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/windows_1250.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/windows_1251.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/windows_1252.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/windows_1253.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/windows_1254.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/windows_1257.so -#usr/lib/ruby/3.3.0/riscv64-linux/enc/windows_31j.so -#usr/lib/ruby/3.3.0/riscv64-linux/erb -#usr/lib/ruby/3.3.0/riscv64-linux/erb/escape.so -#usr/lib/ruby/3.3.0/riscv64-linux/etc.so -#usr/lib/ruby/3.3.0/riscv64-linux/fcntl.so -#usr/lib/ruby/3.3.0/riscv64-linux/fiddle.so -#usr/lib/ruby/3.3.0/riscv64-linux/io -#usr/lib/ruby/3.3.0/riscv64-linux/io/console.so -#usr/lib/ruby/3.3.0/riscv64-linux/io/nonblock.so -#usr/lib/ruby/3.3.0/riscv64-linux/io/wait.so -#usr/lib/ruby/3.3.0/riscv64-linux/json -#usr/lib/ruby/3.3.0/riscv64-linux/json/ext -#usr/lib/ruby/3.3.0/riscv64-linux/json/ext/generator.so -#usr/lib/ruby/3.3.0/riscv64-linux/json/ext/parser.so -#usr/lib/ruby/3.3.0/riscv64-linux/monitor.so -#usr/lib/ruby/3.3.0/riscv64-linux/nkf.so -#usr/lib/ruby/3.3.0/riscv64-linux/objspace.so -#usr/lib/ruby/3.3.0/riscv64-linux/openssl.so -#usr/lib/ruby/3.3.0/riscv64-linux/pathname.so -#usr/lib/ruby/3.3.0/riscv64-linux/psych.so -#usr/lib/ruby/3.3.0/riscv64-linux/pty.so -#usr/lib/ruby/3.3.0/riscv64-linux/rbconfig -#usr/lib/ruby/3.3.0/riscv64-linux/rbconfig.rb -#usr/lib/ruby/3.3.0/riscv64-linux/rbconfig/sizeof.so -#usr/lib/ruby/3.3.0/riscv64-linux/ripper.so -#usr/lib/ruby/3.3.0/riscv64-linux/socket.so -#usr/lib/ruby/3.3.0/riscv64-linux/stringio.so -#usr/lib/ruby/3.3.0/riscv64-linux/strscan.so -#usr/lib/ruby/3.3.0/riscv64-linux/syslog.so -#usr/lib/ruby/3.3.0/riscv64-linux/zlib.so #usr/lib/ruby/3.3.0/ruby_vm #usr/lib/ruby/3.3.0/ruby_vm/rjit #usr/lib/ruby/3.3.0/ruby_vm/rjit/assembler.rb @@ -1656,6 +1550,112 @@ #usr/lib/ruby/3.3.0/uri/ws.rb #usr/lib/ruby/3.3.0/uri/wss.rb #usr/lib/ruby/3.3.0/weakref.rb +#usr/lib/ruby/3.3.0/x86_64-linux +#usr/lib/ruby/3.3.0/x86_64-linux/bigdecimal.so +#usr/lib/ruby/3.3.0/x86_64-linux/cgi +#usr/lib/ruby/3.3.0/x86_64-linux/cgi/escape.so +#usr/lib/ruby/3.3.0/x86_64-linux/continuation.so +#usr/lib/ruby/3.3.0/x86_64-linux/coverage.so +#usr/lib/ruby/3.3.0/x86_64-linux/date_core.so +#usr/lib/ruby/3.3.0/x86_64-linux/digest +#usr/lib/ruby/3.3.0/x86_64-linux/digest.so +#usr/lib/ruby/3.3.0/x86_64-linux/digest/bubblebabble.so +#usr/lib/ruby/3.3.0/x86_64-linux/digest/md5.so +#usr/lib/ruby/3.3.0/x86_64-linux/digest/rmd160.so +#usr/lib/ruby/3.3.0/x86_64-linux/digest/sha1.so +#usr/lib/ruby/3.3.0/x86_64-linux/digest/sha2.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc +#usr/lib/ruby/3.3.0/x86_64-linux/enc/big5.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/cesu_8.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/cp949.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/emacs_mule.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/encdb.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/euc_jp.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/euc_kr.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/euc_tw.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/gb18030.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/gb2312.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/gbk.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_1.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_10.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_11.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_13.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_14.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_15.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_16.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_2.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_3.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_4.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_5.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_6.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_7.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_8.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/iso_8859_9.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/koi8_r.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/koi8_u.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/shift_jis.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/big5.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/cesu_8.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/chinese.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/ebcdic.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/emoji.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/emoji_iso2022_kddi.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/emoji_sjis_docomo.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/emoji_sjis_kddi.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/emoji_sjis_softbank.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/escape.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/gb18030.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/gbk.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/iso2022.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/japanese.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/japanese_euc.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/japanese_sjis.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/korean.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/single_byte.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/transdb.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/utf8_mac.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/trans/utf_16_32.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/utf_16be.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/utf_16le.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/utf_32be.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/utf_32le.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/windows_1250.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/windows_1251.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/windows_1252.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/windows_1253.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/windows_1254.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/windows_1257.so +#usr/lib/ruby/3.3.0/x86_64-linux/enc/windows_31j.so +#usr/lib/ruby/3.3.0/x86_64-linux/erb +#usr/lib/ruby/3.3.0/x86_64-linux/erb/escape.so +#usr/lib/ruby/3.3.0/x86_64-linux/etc.so +#usr/lib/ruby/3.3.0/x86_64-linux/fcntl.so +#usr/lib/ruby/3.3.0/x86_64-linux/fiddle.so +#usr/lib/ruby/3.3.0/x86_64-linux/io +#usr/lib/ruby/3.3.0/x86_64-linux/io/console.so +#usr/lib/ruby/3.3.0/x86_64-linux/io/nonblock.so +#usr/lib/ruby/3.3.0/x86_64-linux/io/wait.so +#usr/lib/ruby/3.3.0/x86_64-linux/json +#usr/lib/ruby/3.3.0/x86_64-linux/json/ext +#usr/lib/ruby/3.3.0/x86_64-linux/json/ext/generator.so +#usr/lib/ruby/3.3.0/x86_64-linux/json/ext/parser.so +#usr/lib/ruby/3.3.0/x86_64-linux/monitor.so +#usr/lib/ruby/3.3.0/x86_64-linux/nkf.so +#usr/lib/ruby/3.3.0/x86_64-linux/objspace.so +#usr/lib/ruby/3.3.0/x86_64-linux/openssl.so +#usr/lib/ruby/3.3.0/x86_64-linux/pathname.so +#usr/lib/ruby/3.3.0/x86_64-linux/psych.so +#usr/lib/ruby/3.3.0/x86_64-linux/pty.so +#usr/lib/ruby/3.3.0/x86_64-linux/rbconfig +#usr/lib/ruby/3.3.0/x86_64-linux/rbconfig.rb +#usr/lib/ruby/3.3.0/x86_64-linux/rbconfig/sizeof.so +#usr/lib/ruby/3.3.0/x86_64-linux/ripper.so +#usr/lib/ruby/3.3.0/x86_64-linux/socket.so +#usr/lib/ruby/3.3.0/x86_64-linux/stringio.so +#usr/lib/ruby/3.3.0/x86_64-linux/strscan.so +#usr/lib/ruby/3.3.0/x86_64-linux/syslog.so +#usr/lib/ruby/3.3.0/x86_64-linux/zlib.so #usr/lib/ruby/3.3.0/yaml #usr/lib/ruby/3.3.0/yaml.rb #usr/lib/ruby/3.3.0/yaml/dbm.rb @@ -1682,19 +1682,19 @@ #usr/lib/ruby/gems/3.3.0/cache/typeprof-0.21.9.gem #usr/lib/ruby/gems/3.3.0/doc #usr/lib/ruby/gems/3.3.0/extensions -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0 -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/debug-1.9.1 -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/debug-1.9.1/debug -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/debug-1.9.1/debug/debug.so -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/debug-1.9.1/gem.build_complete -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/racc-1.7.3 -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/racc-1.7.3/gem.build_complete -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/racc-1.7.3/racc -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/racc-1.7.3/racc/cparse.so -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/rbs-3.4.0 -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/rbs-3.4.0/gem.build_complete -#usr/lib/ruby/gems/3.3.0/extensions/riscv64-linux/3.3.0/rbs-3.4.0/rbs_extension.so +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0 +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/debug-1.9.1 +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/debug-1.9.1/debug +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/debug-1.9.1/debug/debug.so +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/debug-1.9.1/gem.build_complete +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/racc-1.7.3 +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/racc-1.7.3/gem.build_complete +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/racc-1.7.3/racc +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/racc-1.7.3/racc/cparse.so +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/rbs-3.4.0 +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/rbs-3.4.0/gem.build_complete +#usr/lib/ruby/gems/3.3.0/extensions/x86_64-linux/3.3.0/rbs-3.4.0/rbs_extension.so #usr/lib/ruby/gems/3.3.0/gems #usr/lib/ruby/gems/3.3.0/gems/abbrev-0.1.2 #usr/lib/ruby/gems/3.3.0/gems/base64-0.2.0 @@ -1718,9 +1718,16 @@ #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/exe/rdbg #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/Makefile #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug.c +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug.o +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug_version.h +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/extconf.h #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/extconf.rb #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/iseq_collector.c +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/iseq_collector.o +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/mkmf.log +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/exts.mk #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib/debug #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib/debug.rb @@ -2166,24 +2173,37 @@ #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/exe/rbs #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/Makefile #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/extconf.h #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/extconf.rb #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.re #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexstate.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexstate.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/main.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/main.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/mkmf.log #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/rbs_extension.h #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/unescape.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/unescape.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/exts.mk #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/goodcheck.yml #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/lib #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/lib/rbs @@ -3043,10 +3063,10 @@ #usr/lib/ruby/gems/3.3.0/specifications/typeprof-0.21.9.gemspec #usr/lib/ruby/site_ruby #usr/lib/ruby/site_ruby/3.3.0 -#usr/lib/ruby/site_ruby/3.3.0/riscv64-linux +#usr/lib/ruby/site_ruby/3.3.0/x86_64-linux #usr/lib/ruby/vendor_ruby #usr/lib/ruby/vendor_ruby/3.3.0 -#usr/lib/ruby/vendor_ruby/3.3.0/riscv64-linux +#usr/lib/ruby/vendor_ruby/3.3.0/x86_64-linux #usr/share/man/man1/erb.1 #usr/share/man/man1/irb.1 #usr/share/man/man1/ri.1 diff --git a/config/rootfiles/common/x86_64/ruby b/config/rootfiles/common/x86_64/ruby index 2be930022..92c09e9ef 100644 --- a/config/rootfiles/common/x86_64/ruby +++ b/config/rootfiles/common/x86_64/ruby @@ -222,7 +222,7 @@ #usr/include/ruby-3.3.0/x86_64-linux/ruby/config.h #usr/lib/libruby.so #usr/lib/libruby.so.3.3 -#usr/lib/libruby.so.3.3.3 +#usr/lib/libruby.so.3.3.4 #usr/lib/pkgconfig/ruby-3.3.pc #usr/lib/ruby #usr/lib/ruby/3.3.0 @@ -1718,9 +1718,16 @@ #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/exe/rdbg #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/Makefile #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug.c +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug.o +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/debug_version.h +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/extconf.h #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/extconf.rb #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/iseq_collector.c +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/iseq_collector.o +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/ext/debug/mkmf.log +#usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/exts.mk #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib/debug #usr/lib/ruby/gems/3.3.0/gems/debug-1.9.1/lib/debug.rb @@ -2166,24 +2173,37 @@ #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/exe/rbs #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/Makefile #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/constants.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/extconf.h #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/extconf.rb #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexer.re #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexstate.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/lexstate.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/location.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/main.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/main.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/mkmf.log #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parser.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/parserstate.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/rbs_extension.h #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.c #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.h +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/ruby_objs.o #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/unescape.c +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/ext/rbs_extension/unescape.o +#usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/exts.mk #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/goodcheck.yml #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/lib #usr/lib/ruby/gems/3.3.0/gems/rbs-3.4.0/lib/rbs diff --git a/config/rootfiles/core/189/filelists/aarch64/ruby b/config/rootfiles/core/189/filelists/aarch64/ruby new file mode 120000 index 000000000..37c8b5208 --- /dev/null +++ b/config/rootfiles/core/189/filelists/aarch64/ruby @@ -0,0 +1 @@ +../../../../common/aarch64/ruby \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/automake b/config/rootfiles/core/189/filelists/automake new file mode 120000 index 000000000..df3ee421c --- /dev/null +++ b/config/rootfiles/core/189/filelists/automake @@ -0,0 +1 @@ +../../../common/automake \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/bind b/config/rootfiles/core/189/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/189/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/core/189/filelists/files new file mode 100644 index 000000000..17944f7ff --- /dev/null +++ b/config/rootfiles/core/189/filelists/files @@ -0,0 +1 @@ +etc/rc.d/init.d/functions diff --git a/config/rootfiles/core/189/filelists/gdbm b/config/rootfiles/core/189/filelists/gdbm new file mode 120000 index 000000000..ecf63bf59 --- /dev/null +++ b/config/rootfiles/core/189/filelists/gdbm @@ -0,0 +1 @@ +../../../common/gdbm \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/iana-etc b/config/rootfiles/core/189/filelists/iana-etc new file mode 120000 index 000000000..1f3d54dbd --- /dev/null +++ b/config/rootfiles/core/189/filelists/iana-etc @@ -0,0 +1 @@ +../../../common/iana-etc \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/lua b/config/rootfiles/core/189/filelists/lua new file mode 120000 index 000000000..951f661c5 --- /dev/null +++ b/config/rootfiles/core/189/filelists/lua @@ -0,0 +1 @@ +../../../common/lua \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/meson b/config/rootfiles/core/189/filelists/meson new file mode 120000 index 000000000..2fc86c133 --- /dev/null +++ b/config/rootfiles/core/189/filelists/meson @@ -0,0 +1 @@ +../../../common/meson \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/riscv64/ruby b/config/rootfiles/core/189/filelists/riscv64/ruby new file mode 120000 index 000000000..ea645e937 --- /dev/null +++ b/config/rootfiles/core/189/filelists/riscv64/ruby @@ -0,0 +1 @@ +../../../../common/riscv64/ruby \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/x86_64/ruby b/config/rootfiles/core/189/filelists/x86_64/ruby new file mode 120000 index 000000000..e5a95f26b --- /dev/null +++ b/config/rootfiles/core/189/filelists/x86_64/ruby @@ -0,0 +1 @@ +../../../../common/x86_64/ruby \ No newline at end of file diff --git a/config/rootfiles/core/189/filelists/xfsprogs b/config/rootfiles/core/189/filelists/xfsprogs new file mode 120000 index 000000000..91032964d --- /dev/null +++ b/config/rootfiles/core/189/filelists/xfsprogs @@ -0,0 +1 @@ +../../../common/xfsprogs \ No newline at end of file diff --git a/config/rootfiles/packages/mc b/config/rootfiles/packages/mc index 572d42746..72b03ed49 100644 --- a/config/rootfiles/packages/mc +++ b/config/rootfiles/packages/mc @@ -85,6 +85,7 @@ usr/libexec/mc/shell/send usr/libexec/mc/shell/unlink usr/libexec/mc/shell/utime #usr/share/man/man1/mc.1 +#usr/share/man/man1/mcdiff.1 #usr/share/man/man1/mcedit.1 #usr/share/man/man1/mcview.1 #usr/share/mc @@ -114,14 +115,23 @@ usr/share/mc/skins/gotar.ini usr/share/mc/skins/gray-green-purple256.ini usr/share/mc/skins/gray-orange-blue256.ini usr/share/mc/skins/julia256.ini +usr/share/mc/skins/julia256root.ini usr/share/mc/skins/mc46.ini +usr/share/mc/skins/modarcon16-defbg-thin.ini usr/share/mc/skins/modarcon16-defbg.ini +usr/share/mc/skins/modarcon16-thin.ini usr/share/mc/skins/modarcon16.ini +usr/share/mc/skins/modarcon16root-defbg-thin.ini usr/share/mc/skins/modarcon16root-defbg.ini +usr/share/mc/skins/modarcon16root-thin.ini usr/share/mc/skins/modarcon16root.ini +usr/share/mc/skins/modarin256-defbg-thin.ini usr/share/mc/skins/modarin256-defbg.ini +usr/share/mc/skins/modarin256-thin.ini usr/share/mc/skins/modarin256.ini +usr/share/mc/skins/modarin256root-defbg-thin.ini usr/share/mc/skins/modarin256root-defbg.ini +usr/share/mc/skins/modarin256root-thin.ini usr/share/mc/skins/modarin256root.ini usr/share/mc/skins/nicedark.ini usr/share/mc/skins/sand256.ini @@ -129,7 +139,9 @@ usr/share/mc/skins/seasons-autumn16M.ini usr/share/mc/skins/seasons-spring16M.ini usr/share/mc/skins/seasons-summer16M.ini usr/share/mc/skins/seasons-winter16M.ini +usr/share/mc/skins/xoria256-thin.ini usr/share/mc/skins/xoria256.ini +usr/share/mc/skins/xoria256root-thin.ini usr/share/mc/skins/yadt256-defbg.ini usr/share/mc/skins/yadt256.ini #usr/share/mc/syntax diff --git a/lfs/automake b/lfs/automake index 595ecd917..e595b98b6 100644 --- a/lfs/automake +++ b/lfs/automake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@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.16.5 +VER = 1.17
THISAPP = automake-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c +$(DL_FILE)_BLAKE2 = 53c24c138faf3d2be4e30ababcccd4d157c03e815fc4b7f3e3063b6648cf254dfa63afe6e3285b21309dbf260335c3e67991db3825e7532b158b25ccaead83f5
install : $(TARGET)
diff --git a/lfs/bind b/lfs/bind index a79020f03..5833b9005 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@
include Config
-VER = 9.16.50 +VER = 9.20.1
THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0464d1e246d0a5c39e20faf733b7f4ee21d192cc0ccce5bba2a22ae4303c82005ccfb319fe2da51872c7258852a747984d7327c70dec08414ab2d194c412199b +$(DL_FILE)_BLAKE2 = 0607a2753bcda828cff0f01a7929c3192286050813243a0733d4cf29313c9d9532285d049864b67f3ce352b71cbb878bc22785a73fe186bf244ca807934fefdf
install : $(TARGET)
@@ -77,31 +77,24 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && STD_CDEFINES="$(CPPFLAGS)" \ ./configure \ --prefix=/usr \ - --enable-threads \ - --with-libtool \ - --without-python \ - --disable-linux-caps \ - --disable-static + --disable-static \ + --disable-doh
# Build required libraries cd $(DIR_APP) && make -C lib/isc $(MAKETUNING) - cd $(DIR_APP) && make -C lib/isccc $(MAKETUNING) cd $(DIR_APP) && make -C lib/dns $(MAKETUNING) cd $(DIR_APP) && make -C lib/ns $(MAKETUNING) + cd $(DIR_APP) && make -C lib/isccc $(MAKETUNING) cd $(DIR_APP) && make -C lib/isccfg $(MAKETUNING) - cd $(DIR_APP) && make -C lib/bind9 $(MAKETUNING) - cd $(DIR_APP) && make -C lib/irs $(MAKETUNING) cd $(DIR_APP) && make -C bin/dig $(MAKETUNING) cd $(DIR_APP) && make -C bin/nsupdate $(MAKETUNING)
# Install utility programs cd $(DIR_APP) && make -C lib/isc install - cd $(DIR_APP) && make -C lib/isccc install cd $(DIR_APP) && make -C lib/dns install cd $(DIR_APP) && make -C lib/ns install + cd $(DIR_APP) && make -C lib/isccc install cd $(DIR_APP) && make -C lib/isccfg install - cd $(DIR_APP) && make -C lib/bind9 install - cd $(DIR_APP) && make -C lib/irs install cd $(DIR_APP) && make -C bin/dig install cd $(DIR_APP) && make -C bin/nsupdate install
diff --git a/lfs/gdbm b/lfs/gdbm index caa0bdefe..c601718b1 100644 --- a/lfs/gdbm +++ b/lfs/gdbm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@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.23 +VER = 1.24
THISAPP = gdbm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = a47746577cf2f3c9b62faea496c4d6a50a8f1b0a5af448cb2215e90057c99b5b630ba3f5357c85dfb7fd98ba4e90969e30a779120c29106ed1e8736721f9bec1 +$(DL_FILE)_BLAKE2 = 79f49adbb455c2e1b91f3450037b71165fa8de82650d6402e0e22ee1f4d278fdb0bd78100659bf416e2409b432e1f8d32ecbae523980413f7148b80ee06c9f4b
install : $(TARGET)
diff --git a/lfs/iana-etc b/lfs/iana-etc index 8dc38f4f6..3ad018bf3 100644 --- a/lfs/iana-etc +++ b/lfs/iana-etc @@ -24,7 +24,7 @@
include Config
-VER = 20240701 +VER = 20240813 # https://github.com/Mic92/iana-etc
THISAPP = iana-etc-$(VER) @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d427988c918ee3ea80c6de3112d10659dddc63d138d0f48e553971cc6687b971d63d6cf14a8df955b1b5c3735eb65b9c43b9f671daef1a8b25a6f115194e9422 +$(DL_FILE)_BLAKE2 = a62948814ceb250cb9d8218fd7f8f7373ca51349a0af698e7ac15c74c5d462337e9c5eb25066964a8726987cdabfd155b577fadc76ca470d7e709bdc5c90a197
install : $(TARGET)
diff --git a/lfs/lua b/lfs/lua index 96be2090a..e0cfc43d4 100644 --- a/lfs/lua +++ b/lfs/lua @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 5.4.6 +VER = 5.4.7
THISAPP = lua-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b5d8dbc4b3ec1708b715be438c1a1f48d4f5f226885992af147c1aa6a8823bed318f77ef7cc92b265dadd26cf6088f0f39784fbfd2f9887c35de8e9def2c0558 +$(DL_FILE)_BLAKE2 = 151baed5c40ed117a26a4fb8d0b02f247eacacd98c3270c308a19e453eb647f6c3d5a6a5811fac7ec95db9866c2f06847d5c2be97c83b1e14e561ac8f7482d30
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.6-shared_library-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.7-shared_library-1.patch # install lua pkgconfig file install -v -m 644 ${DIR_SRC}/config/lua/lua.pc \ /usr/lib/pkgconfig/lua.pc @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make INSTALL_TOP=/usr \ INSTALL_DATA="cp -d" \ INSTALL_MAN=/usr/share/man/man1 \ - TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.6" \ + TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.7" \ install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/mc b/lfs/mc index 3fb3f6d49..b23e9c759 100644 --- a/lfs/mc +++ b/lfs/mc @@ -26,7 +26,7 @@ include Config
SUMMARY = Midnight Commander
-VER = 4.8.31 +VER = 4.8.32
THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 26 +PAK_VER = 27
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = aa8406d7d68a7466f662f83730dfc157f6e4f444b62284d9b71ea12def333996e298352f94526a3eb85491030f62373cf8d5621e449a7abf1fb5267a13a396fe +$(DL_FILE)_BLAKE2 = eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347
install : $(TARGET) diff --git a/lfs/meson b/lfs/meson index fa5512b81..511d86876 100644 --- a/lfs/meson +++ b/lfs/meson @@ -24,7 +24,7 @@
include Config
-VER = 1.4.0 +VER = 1.5.1
THISAPP = meson-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7f742ef870c182e552c1ff3508d65f251009d610def6a08e01fddb6c6a4ed6d608ead0d52cf8ca7d66b5bd7a4732dccd7ab5d98f141a4a61e275398885f79486 +$(DL_FILE)_BLAKE2 = 3368b209444d0873217bafee2339b395dca9fa43df68adce19029a41ad5c0eca59426ef681d174ef8b6b89d4a6c5b4f189c1ae219deed78334028d44bdb23a95
install : $(TARGET)
diff --git a/lfs/ruby b/lfs/ruby index 408d52b57..52549b143 100644 --- a/lfs/ruby +++ b/lfs/ruby @@ -24,7 +24,7 @@
include Config
-VER = 3.3.3 +VER = 3.3.4
THISAPP = ruby-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = e1dbb8f0d5de4b2d7efe3f68c1ea7f28e4fac19dcd9d6d5e301e5c565474958a916ea5f21ef2ce0d741d4d9c45a546dd3d00b3ca3d1eccfaf61f20eba3c871a7 +$(DL_FILE)_BLAKE2 = e10b81ad7838e3d443ce0b12b8372faebb001f00a32dc0fa1f5e37c46baae99ea714e7f2a8741f0294255312030e844f32fc5d1c3695545cf8303e85b3255f21
install : $(TARGET)
diff --git a/lfs/xfsprogs b/lfs/xfsprogs index 719237412..5094485d3 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -24,7 +24,7 @@
include Config
-VER = 6.8.0 +VER = 6.9.0
THISAPP = xfsprogs-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 +$(DL_FILE)_BLAKE2 = d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894
install : $(TARGET)
diff --git a/make.sh b/make.sh index dec7b3a45..a0ea4a99d 100755 --- a/make.sh +++ b/make.sh @@ -1547,6 +1547,7 @@ build_system() { lfsmake2 unbound lfsmake2 gnutls lfsmake2 libuv + lfsmake2 liburcu lfsmake2 bind lfsmake2 dhcp lfsmake2 dhcpcd @@ -1698,7 +1699,6 @@ build_system() { lfsmake2 dosfstools lfsmake2 exfatprogs lfsmake2 reiserfsprogs - lfsmake2 liburcu lfsmake2 xfsprogs lfsmake2 sysfsutils lfsmake2 fuse diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index 1fa256e80..125aa1dc6 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ############################################################################### # # # IPFire.org - A linux based firewall # @@ -890,3 +890,51 @@ volume_fs_type() {
stat -f --format="%T" ${1} } + +readhash() { + local array="${1}" + local file="${2}" + + declare -A -g "${array}" + + local line + while read -r line; do + + # Skip Blank Lines + if [[ ${line} =~ ^[[:space:]]*$ ]]; then + continue + fi + + # Skip Comments + if [[ ${line} =~ ^#.*$ ]]; then + continue + fi + + # Skip lines without a = + if ! [[ ${line} =~ [^=]*=[^=]*$ ]]; then + echo "Invalid line '${line}'" >&2 + continue + fi + + local key="${line%=*}" + local val="${line#*=}" + + # Skip lines with an invalid key + if ! [[ ${key} =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]]; then + echo "Invalid key '${key}'" >&2 + continue + fi + + # Skip lines with invalid values + if ! [[ ${val} =~ ^['][\ A-Za-z0-9=/,.:%_@#+-]*[']$ ]] && ! [[ ${val} =~ ^[A-Za-z0-9=/,.:%_@#+-]*$ ]]; then + echo "Invalid value '${val}' for key '${key}'" >&2 + continue + fi + + # strip leading and trailing single quotes + val="${val#'}" + val="${val%'}" + + printf -v "${array}[${key}]" "%s" "${val}" + done < "${file}" +} diff --git a/src/patches/lua-5.4.6-shared_library-1.patch b/src/patches/lua-5.4.7-shared_library-1.patch similarity index 100% rename from src/patches/lua-5.4.6-shared_library-1.patch rename to src/patches/lua-5.4.7-shared_library-1.patch diff --git a/tests/lib.sh b/tests/lib.sh new file mode 100644 index 000000000..bb06e11c2 --- /dev/null +++ b/tests/lib.sh @@ -0,0 +1,122 @@ +#!/usr/bin/bash + +# Get the path of this file. +# This ist rather complex as we do not want the calling script file +# That why we use BASH_SOURCE[0] +LIB_DIR="$(readlink -f "${BASH_SOURCE[0]}")" +# In LIB_DIR is currently saved the path to this file you are currently reading +# but we need the directory where it is located so: +LIB_DIR="$(dirname "${LIB_DIR}")" + + +. ${LIB_DIR}/lib_color.sh + +log_test_failed(){ + echo -e "${CLR_RED_R}FAILED:${CLR_RESET} ${*}" +} + +log_test_succeded(){ + echo -e "${CLR_GREEN_R}PASSED:${CLR_RESET} ${*}" +} + +test_command() { + + if ! "$@" ; then + log_test_failed "${*}" + return 1 + else + log_test_succeded "${*}" + return 0 + fi +} + +var_has_value() { + [[ "${!1}" == "${2}" ]] +} + +test_that_array_is_defined() { + local arrayname="${1}" + + # `declare -p` print out how the variable with the name $arrayname was declared + # If the array was not declared as indexed or associative array we fail. We cannot check for a value in an array if + # we were not given array. + if [[ ! "$(declare -p "${arrayname}")" =~ "declare -a" && ! "$(declare -p "${arrayname}")" =~ "declare -A" ]]; then + log_test_failed "The array '${1}' does not exists. The variable is not set." + return 1 + else + log_test_succeded "The array '${1}' is defined." + return 0 + fi +} + +test_value_in_array() { + local -n array="${1}" + local arrayname="${1}" + local key="${2}" + local value="${3}" + + test_that_array_is_defined "${arrayname}" || return 1 + + # If key is not defined we return _ + # If the key is defined we return nothing + # See also https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion... + if [[ "${array["${key}"]+_}" == "" ]]; then + log_test_failed "The array does not contain the key '${key}', valid keys are: ${!array[*]}" + return 1 + fi + + if [[ "${array[${key}]}" == "${value}" ]] ; then + log_test_succeded "The array '${1}' contains the value '${value}' under the key '${key}'" + return 0 + else + log_test_failed "The array '${1}' contains the value '${array[${key}]}' under the key '${key} and not '${value}'" + return 1 + fi +} + +test_that_array_doesnt_have_key() { + local -n array="${1}" + local arrayname="${1}" + local key="${2}" + + test_that_array_is_defined "${arrayname}" || return 1 + + if [[ "${array["${key}"]+_}" == "_" ]]; then + log_test_failed "The array '${arrayname}' does contain the key '${key}'." + return 1 + else + log_test_succeded "The array '${arrayname}' does not contain the key '${key}'" + return 0 + fi + +} + + +test_that_output_is(){ + local reference_output_file="${1}" + local file_descriptor="${2}" + shift + shift + + local command="$@" + + local temp="$(mktemp)" + + case "${file_descriptor}" in + "stdout"|"1") + $command 1> "${temp}" 2>/dev/null + ;; + "stderr"|"2") + $command 2> "${temp}" 1>/dev/null + ;; + esac + + if diff -u "${temp}" "${reference_output_file}" &> /dev/null; then + log_test_succeded "The output of command '${command}' on file descriptor '${file_descriptor}' is equal to the reference output." + else + log_test_failed "The output of command '${command}' on file descriptor '${file_descriptor}' is unequal to the reference output." + diff -u --color "${reference_output_file}" "${temp}" + fi + + rm "${temp}" +} diff --git a/tests/src/initscripts/system/functions/data/1 b/tests/src/initscripts/system/functions/data/1 new file mode 100644 index 000000000..c75620b6b --- /dev/null +++ b/tests/src/initscripts/system/functions/data/1 @@ -0,0 +1,20 @@ +CONFIG_TYPE=3 +GREEN_DEV=green0 +GREEN_MACADDR=00:c0:08:8a:a0:47 +GREEN_DRIVER=r8175 +RED_DEV=red0 +RED_MACADDR=00:c0:08:8a:a0:56 +RED_DRIVER=r8283 +# Another Comment +BLUE_DEV='blue0 net0' +BLUE_MACADDR=bc:30:7d:58:6b:e3 +BLUE_DRIVER=rt2800 +RED_DHCP_HOSTNAME=ipfire +RED_DHCP_FORCE_MTU= +RED_ADDRESS=0.0.0.0 +RED_NETMASK=0.0.0.0 +RED_TYPE=PPPOE +RED_NETADDRESS=0.0.0.0 + +# Comment for testing + # Comment for testing Comments with spaces before diff --git a/tests/src/initscripts/system/functions/data/1_output_stderr b/tests/src/initscripts/system/functions/data/1_output_stderr new file mode 100644 index 000000000..e69de29bb diff --git a/tests/src/initscripts/system/functions/data/1_output_stdout b/tests/src/initscripts/system/functions/data/1_output_stdout new file mode 100644 index 000000000..e69de29bb diff --git a/tests/src/initscripts/system/functions/data/2 b/tests/src/initscripts/system/functions/data/2 new file mode 100644 index 000000000..760294c30 --- /dev/null +++ b/tests/src/initscripts/system/functions/data/2 @@ -0,0 +1,21 @@ +CONFIG_TYPE=?3 +GREEN_DEV=gree!n0 +GREEN_MACADDR=00:c0:08:8a :a0:47 +GREEN_DRIVER="r8175" +-RED_DEV=red0 +RE??D_MACADDR=00:c0:08:8a:a0:56 +RED&&_DRIVER=r8283 +# Another Comment +0BLUE_DEV='blue0 net0' +BLUE_MACADDR=bc:30:7d:58:6b:e3 +BLUE_DRIVER=rt2800 +RED_DHCP_HOSTNAME=ipfire +RED_DHCP_FORCE_MTU= +RED_ADDRESS=0.0.0.0 +RED_NETMASK=0.0.0.0 +RED_TYPE=PPPOE +RED_NETADDRESS=0.0.0.0 +Line_without_a_equal_sign_is_also_invalid + +# Comment for testing + # Comment for testing Comments with spaces before diff --git a/tests/src/initscripts/system/functions/data/2_output_stderr b/tests/src/initscripts/system/functions/data/2_output_stderr new file mode 100644 index 000000000..82f035e26 --- /dev/null +++ b/tests/src/initscripts/system/functions/data/2_output_stderr @@ -0,0 +1,9 @@ +Invalid value '?3' for key 'CONFIG_TYPE' +Invalid value 'gree!n0' for key 'GREEN_DEV' +Invalid value '00:c0:08:8a :a0:47' for key 'GREEN_MACADDR' +Invalid value '"r8175"' for key 'GREEN_DRIVER' +Invalid key '-RED_DEV' +Invalid key 'RE??D_MACADDR' +Invalid key 'RED&&_DRIVER' +Invalid key '0BLUE_DEV' +Invalid line 'Line_without_a_equal_sign_is_also_invalid' diff --git a/tests/src/initscripts/system/functions/data/2_output_stdout b/tests/src/initscripts/system/functions/data/2_output_stdout new file mode 100644 index 000000000..e69de29bb diff --git a/tests/src/initscripts/system/functions/test.sh b/tests/src/initscripts/system/functions/test.sh new file mode 100755 index 000000000..dbcbd45ef --- /dev/null +++ b/tests/src/initscripts/system/functions/test.sh @@ -0,0 +1,47 @@ +#!/usr/bin/bash + +SCRIPT_PATH="$(dirname "$(readlink -f "$0")")" + +ROOT="$(readlink -f "${SCRIPT_PATH}/../../../../..")" + +. ${ROOT}/tests/lib.sh + +. ${ROOT}/src/initscripts/system/functions + +# read the date in +readhash "CONFIG" "${SCRIPT_PATH}/data/1" +test_command [ $? == 0 ] + +# test if we read the correct data +test_value_in_array "CONFIG" "RED_DHCP_HOSTNAME" "ipfire" +test_value_in_array "CONFIG" "BLUE_MACADDR" "bc:30:7d:58:6b:e3" +test_value_in_array "CONFIG" "BLUE_DEV" "blue0 net0" + +# Test that comments are skipped +# apparently the way we read the file strips the whitespace, so the key does not contain any whitespace either +test_that_array_doesnt_have_key "CONFIG" "# Another Comment" +test_that_array_doesnt_have_key "CONFIG" "# Comment for testing" +test_that_array_doesnt_have_key "CONFIG" "# Comment for testing Comments with spaces before" + +test_that_output_is "${SCRIPT_PATH}/data/1_output_stdout" "1" readhash "CONFIG" "${SCRIPT_PATH}/data/1" +test_that_output_is "${SCRIPT_PATH}/data/1_output_stderr" "2" readhash "CONFIG" "${SCRIPT_PATH}/data/1" + +# Check with invalid Lines (values and keys) +readhash "CONFIG2" "${SCRIPT_PATH}/data/2" &> /dev/null +test_command [ $? == 0 ] + + +# test if we read the correct data +test_value_in_array "CONFIG2" "RED_DHCP_HOSTNAME" "ipfire" +test_value_in_array "CONFIG2" "BLUE_MACADDR" "bc:30:7d:58:6b:e3" + +# We could do some complex checking if we would create functions to check for correct values and keys. +# We would be then able to mock these function and check if they are correctly called and if the data +# does not end up in our array. +# I think the more simpler way of checking the logged errors is the fastes way here. +test_that_output_is "${SCRIPT_PATH}/data/2_output_stdout" "1" readhash "CONFIG2" "${SCRIPT_PATH}/data/2" +test_that_output_is "${SCRIPT_PATH}/data/2_output_stderr" "2" readhash "CONFIG2" "${SCRIPT_PATH}/data/2" + +# Check non existent file +readhash "CONFIG3" "${SCRIPT_PATH}/data/-1" &> /dev/null +test_command [ $? == 1 ] diff --git a/tests/src/initscripts/system/functions/test2.sh b/tests/src/initscripts/system/functions/test2.sh new file mode 100755 index 000000000..a568ed2a4 --- /dev/null +++ b/tests/src/initscripts/system/functions/test2.sh @@ -0,0 +1,21 @@ +#!/usr/bin/bash + +SCRIPT_PATH="$(dirname "$(readlink -f "$0")")" + +ROOT="$(readlink -f "${SCRIPT_PATH}/../../../../..")" + +. ${ROOT}/tests/lib.sh + +. ${ROOT}/src/initscripts/system/functions + +# read the date in +readhash "CONFIG" "${SCRIPT_PATH}/data/1" + +# test if we read the correct data +test_that_key_in_arry_has_value "CONFIG" "RED_DHCP_HOSTNAME" "ipfire" +test_that_key_in_arry_has_value "CONFIG" "BLUE_MACADDR" "bc:30:7d:58:6b:e3" + +test_that_output_is "${SCRIPT_PATH}/data/1_output_stdout" "1" readhash "CONFIG" "${SCRIPT_PATH}/data/1" +test_that_output_is "${SCRIPT_PATH}/data/1_output_stderr" "2" readhash "CONFIG" "${SCRIPT_PATH}/data/1" + +
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer