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 3a42eaa9b727c9fa85d45fdf03606efe4b6d70a2 (commit) via 24109ebef7e4497959083c58e71f338956d19f26 (commit) via 90c1a2758b760e19fa0ff478c6bbdd37467a8d48 (commit) via 39ff37072ead6719828c4ac5181e40c263149561 (commit) via da0b8e4fb9bf2d0d2a3e9d5c70da8eb7805d2955 (commit) via 81c3f9e1b9977616259e928468d01a0d84f9e99d (commit) via 4e3a53528f7209162b5e46ff9de3c84e4b5a9a9e (commit) via 2bfcbac468277beeaebb2d7d976cdc9cedad2bc9 (commit) via 92cb2b5573d342d5836e4b7ef98f93a941063a25 (commit) via 6bdf47513b819bb5b50a17cdc637a4722f06bac4 (commit) via 394437551f2ec8506a0c42987a5014a7e67ce804 (commit) via 8cb2214c3af990cfec03eb64d70930dbe6b003ca (commit) via f07ddd93938e4fb67ebed9217312dff4f522cc4c (commit) via bff0999f031af9e5ea1aaa15fcbc7750a27f54e3 (commit) via ef3feaf566082ae5b160ea1d8cc2c3f556a5f52f (commit) from 7bdda6ae236f5aed480a9ee2167809829308838d (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 3a42eaa9b727c9fa85d45fdf03606efe4b6d70a2 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Nov 25 11:59:44 2022 +0000

Core Update 172: Ship sudo

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 24109ebef7e4497959083c58e71f338956d19f26 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:55:31 2022 +0100

sudo: Update to version 1.9.12p1

- Update from version 1.9.11p3 to 1.9.12p1 - Update of rootfile - Changelog What's new in Sudo 1.9.12p1 * Sudo's configure script now does a better job of detecting when the -fstack-clash-protection compiler option does not work. GitHub issue #191. * Fixed CVE-2022-43995, a potential out-of-bounds write for passwords smaller than 8 characters when passwd authentication is enabled. This does not affect configurations that use other authentication methods such as PAM, AIX authentication or BSD authentication. * Fixed a build error with some configurations compiling host_port.c. What's new in Sudo 1.9.12 * Fixed a bug in the ptrace-based intercept mode where the current working directory could include garbage at the end. * Fixed a compilation error on systems that lack the stdint.h header. Bug #1035 * Fixed a bug when logging the command's exit status in intercept mode. The wrong command could be logged with the exit status. * For ptrace-based intercept mode, sudo will now attempt to verify that the command path name, arguments and environment have not changed from the time when they were authorized by the security policy. The new "intercept_verify" sudoers setting can be used to control this behavior. * Fixed running commands with a relative path (e.g. ./foo) in intercept mode. Previously, this would fail if sudo's current working directory was different from that of the command. * Sudo now supports passing the execve(2) system call the NULL pointer for the `argv` and/or `envp` arguments when in intercept mode. Linux treats a NULL pointer like an empty array. * The sudoers LDAP schema now allows sudoUser, sudoRunasUser and sudoRunasGroup to include UTF-8 characters, not just 7-bit ASCII. * Fixed a problem with "sudo -i" on SELinux when the target user's home directory is not searchable by sudo. GitHub issue #160. * Neovim has been added to the list of visudo editors that support passing the line number on the command line. * Fixed a bug in sudo's SHA384 and SHA512 message digest padding. * Added a new "-N" (--no-update) command line option to sudo which can be used to prevent sudo from updating the user's cached credentials. It is now possible to determine whether or not a user's cached credentials are currently valid by running: $ sudo -Nnv and checking the exit value. One use case for this is to indicate in a shell prompt that sudo is "active" for the user. * PAM approval modules are no longer invoked when running sub-commands in intercept mode unless the "intercept_authenticate" option is set. There is a substantial performance penalty for calling into PAM for each command run. PAM approval modules are still called for the initial command. * Intercept mode on Linux now uses process_vm_readv(2) and process_vm_writev(2) if available. * The XDG_CURRENT_DESKTOP environment variable is now preserved by default. This makes it possible for graphical applications to choose the correct theme when run via sudo. * On 64-bit systems, if sudo fails to load a sudoers group plugin, it will use system-specific heuristics to try to locate a 64-bit version of the plugin. * The cvtsudoers manual now documents the JSON and CSV output formats. GitHub issue #172. * Fixed a bug where sub-commands were not being logged to a remote log server when log_subcmds was enabled. GitHub issue #174. * The new log_stdin, log_stdout, log_stderr, log_ttyin, and log_ttyout sudoers settings can be used to support more fine-grained I/O logging. The sudo front-end no longer allocates a pseudo-terminal when running a command if the I/O logging plugin requests logging of stdin, stdout, or stderr but not terminal input/output. * Quieted a libgcrypt run-time initialization warning. This fixes Debian bug #1019428 and Ubuntu bug #1397663. * Fixed a bug in visudo that caused literal backslashes to be removed from the EDITOR environment variable. GitHub issue #179. * The sudo Python plugin now implements the "find_spec" method instead of the the deprecated "find_module". This fixes a test failure when a newer version of setuptools that doesn't include "find_module" is found on the system. * Fixed a bug introduced in sudo 1.9.9 where sudo_logsrvd created the process ID file, usually /var/run/sudo/sudo_logsrvd.pid, as a directory instead of a plain file. The same bug could result in I/O log directories that end in six or more X's being created literally in addition to the name being used as a template for the mkdtemp(3) function. * Fixed a long-standing bug where a sudoers rule with a command line argument of "", which indicates the command may be run with no arguments, would also match a literal "" on the command line. GitHub issue #182. * Added the -I option to visudo which only edits the main sudoers file. Include files are not edited unless a syntax error is found. * Fixed "sudo -l -U otheruser" output when the runas list is empty. Previously, sudo would list the invoking user instead of the list user. GitHub issue #183. * Fixed the display of command tags and options in "sudo -l" output when the RunAs user or group changes. A new line is started for RunAs changes which means we need to display the command tags and options again. GitHub issue #184. * The sesh helper program now uses getopt_long(3) to parse the command line options. * The embedded copy of zlib has been updated to version 1.2.13. * Fixed a bug that prevented event log data from being sent to the log server when I/O logging was not enabled. This only affected systems without PAM or configurations where the pam_session and pam_setcred options were disabled in the sudoers file. * Fixed a bug where "sudo -l" output included a carriage return after the newline. This is only needed when displaying to a terminal in raw mode. Bug #1042.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 90c1a2758b760e19fa0ff478c6bbdd37467a8d48 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:55:00 2022 +0100

qemu-ga: Update to version 7.1.0

- Update in line with update of qemu from version 7.0.0 to 7.1.0 - Update of rootfile not required - Changelog - see changelog info in the qemu update

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 39ff37072ead6719828c4ac5181e40c263149561 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:54:59 2022 +0100

qemu: Update to version 7.1.0

- Update from 7.0.0 to 7.1.0 - Update of rootfile not required - Removal of qemu-7.0.0-fix-glibc-headers.patch as an alternative patch approach has been implemeted into thye source tarball. - Changelog is too large to include here. Details can be found at https://wiki.qemu.org/ChangeLog/7.1

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit da0b8e4fb9bf2d0d2a3e9d5c70da8eb7805d2955 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:54:43 2022 +0100

nginx: Update to version 1.22.1

- Update from version 1.21.6 to 1.22.1 - Update of rootfile not required - Changelog Changes with nginx 1.22.1 19 Oct 2022 *) Security: processing of a specially crafted mp4 file by the ngx_http_mp4_module might cause a worker process crash, worker process memory disclosure, or might have potential other impact (CVE-2022-41741, CVE-2022-41742). Changes with nginx 1.22.0 24 May 2022 *) 1.22.x stable branch.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 81c3f9e1b9977616259e928468d01a0d84f9e99d Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:54:24 2022 +0100

libvirt: Update to version 8.9.0

- Update from 7.10.0 to 8.9.0 - Update of rootfile - Removal of sheepdog_storage option in ./configure as it has been removed from libvirt - Removal of libvirt-7.10.0-fix-glibc-headers.patch as contents are now built in to source tarball. - Changelog is too large to include here. Details can be found in the NEWS.rst file in the source tarball.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 4e3a53528f7209162b5e46ff9de3c84e4b5a9a9e Author: Peter Müller peter.mueller@ipfire.org Date: Fri Nov 25 11:58:03 2022 +0000

Core Update 172: Ship libpng

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 2bfcbac468277beeaebb2d7d976cdc9cedad2bc9 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:51:56 2022 +0100

libpng: Update to version 1.6.39

- Update from version 1.6.37 to 1.6.39 - Update of rootfile - Changelog Version 1.6.39 [November 20, 2022] Changed the error handler of oversized chunks (i.e. larger than PNG_USER_CHUNK_MALLOC_MAX) from png_chunk_error to png_benign_error. Fixed a buffer overflow error in contrib/tools/pngfix. Fixed a memory leak (CVE-2019-6129) in contrib/tools/pngcp. Disabled the ARM Neon optimizations by default in the CMake file, following the default behavior of the configure script. Allowed configure.ac to work with the trunk version of autoconf. Removed the support for "install" targets from the legacy makefiles; removed the obsolete makefile.cegcc. Cleaned up the code and updated the internal documentation. Version 1.6.38 [September 14, 2022] Added configurations and scripts for continuous integration. Fixed various errors in the handling of tRNS, hIST and eXIf. Implemented many stability improvements across all platforms. Updated the internal documentation.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 92cb2b5573d342d5836e4b7ef98f93a941063a25 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Nov 25 11:57:10 2022 +0000

Core Update 172: Ship libedit

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 6bdf47513b819bb5b50a17cdc637a4722f06bac4 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:51:43 2022 +0100

libedit: Update to version 20221030-3.1

- Update from 20210910-3.1 to 20221030-3.1 - Update of rootfile - Changelog * version-info: 0:70:0 * src/sys.h, src/reallocarr.c: Remove unused sys/cdefs.h include, to compile against musl libc * version-info: 0:69:0 * src/sys.h: Add __sun guard around sys/types.h in sys.h * all: sync with upstream source

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit 394437551f2ec8506a0c42987a5014a7e67ce804 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Nov 25 11:56:11 2022 +0000

Core Update 172: Ship curl

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit 8cb2214c3af990cfec03eb64d70930dbe6b003ca Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 25 09:51:25 2022 +0100

curl: Update to version 7.86.0

- Update from version 7.84.0 to 7.86.0 - Update of rootfile - curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch removed as this is now built into the source tarball version - Changelog - is too large to inclkude here. The details can be found in the RELEASE_NOTES file in the source tarballs.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit f07ddd93938e4fb67ebed9217312dff4f522cc4c Author: Peter Müller peter.mueller@ipfire.org Date: Fri Nov 25 11:55:16 2022 +0000

Core Update 172: Remove pcmcia files

Signed-off-by: Peter Müller peter.mueller@ipfire.org

commit bff0999f031af9e5ea1aaa15fcbc7750a27f54e3 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Nov 23 21:07:38 2022 +0100

pcmciautils: Remove package from IPFire

- Current version is 014 which was released in 2008. The latest version is 018 which was released in 2011. - In 2010 pcmcia was acquired by the USB Implementers forum and all work has been focussed on usb only with nothing on pcmcia. - pcmcia is only still used as a legacy requirement on industrial computing systems for machine control etc. pcmcia was introduced originally for laptop use. - All new laptops have no pcmcia slot. Searching on amazon for laptop with pcmcia gave 55 results none of which had any pcmcia capability. - Based on the above the package pcmciautils is being removed from IPFire.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

commit ef3feaf566082ae5b160ea1d8cc2c3f556a5f52f Author: Jon Murphy jon.murphy@ipfire.org Date: Wed Nov 23 12:50:48 2022 -0600

pcengines-apu-firmware: Update to version 4.17.0.2

- Update from 4.17.0.1 to 4.17.0.2 - Changelog v4.17.0.2 - Release date: 2022-07-29 Rebased with official coreboot repository commit df721bd See: https://github.com/pcengines/coreboot/compare/v4.17.0.1...v4.17.0.2

Signed-off-by: Jon Murphy jon.murphy@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/curl | 9 ++- config/rootfiles/common/libedit | 2 +- config/rootfiles/common/libpng | 2 +- config/rootfiles/common/pcmciautils | 9 --- config/rootfiles/common/sudo | 2 - .../{oldcore/104 => core/172}/filelists/curl | 0 .../{oldcore/128 => core/172}/filelists/libedit | 0 .../{oldcore/109 => core/172}/filelists/libpng | 0 .../{oldcore/112 => core/172}/filelists/sudo | 0 config/rootfiles/core/172/update.sh | 9 +++ config/rootfiles/packages/libvirt | 57 +++++++++++++- config/rootfiles/packages/pcengines-apu-firmware | 13 ++-- lfs/curl | 8 +- lfs/libedit | 4 +- lfs/libpng | 4 +- lfs/libvirt | 8 +- lfs/nginx | 6 +- lfs/pcengines-apu-firmware | 24 +++--- lfs/pcmciautils | 88 ---------------------- lfs/qemu | 7 +- lfs/qemu-ga | 4 +- lfs/sudo | 4 +- make.sh | 1 - ...include_sched_h_if_available_to_fix_build.patch | 24 ------ src/patches/libvirt-7.10.0-fix-glibc-headers.patch | 42 ----------- src/patches/qemu-7.0.0-fix-glibc-headers.patch | 11 --- 26 files changed, 111 insertions(+), 227 deletions(-) delete mode 100644 config/rootfiles/common/pcmciautils copy config/rootfiles/{oldcore/104 => core/172}/filelists/curl (100%) copy config/rootfiles/{oldcore/128 => core/172}/filelists/libedit (100%) copy config/rootfiles/{oldcore/109 => core/172}/filelists/libpng (100%) copy config/rootfiles/{oldcore/112 => core/172}/filelists/sudo (100%) delete mode 100644 lfs/pcmciautils delete mode 100644 src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch delete mode 100644 src/patches/libvirt-7.10.0-fix-glibc-headers.patch delete mode 100644 src/patches/qemu-7.0.0-fix-glibc-headers.patch

Difference in files: diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index 2a8a29867..01a5fd792 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -12,6 +12,7 @@ usr/bin/curl #usr/include/curl/system.h #usr/include/curl/typecheck-gcc.h #usr/include/curl/urlapi.h +#usr/include/curl/websockets.h #usr/lib/libcurl.la #usr/lib/libcurl.so usr/lib/libcurl.so.4 @@ -173,7 +174,6 @@ usr/lib/libcurl.so.4.8.0 #usr/share/man/man3/CURLOPT_FTP_ALTERNATIVE_TO_USER.3 #usr/share/man/man3/CURLOPT_FTP_CREATE_MISSING_DIRS.3 #usr/share/man/man3/CURLOPT_FTP_FILEMETHOD.3 -#usr/share/man/man3/CURLOPT_FTP_RESPONSE_TIMEOUT.3 #usr/share/man/man3/CURLOPT_FTP_SKIP_PASV_IP.3 #usr/share/man/man3/CURLOPT_FTP_SSL_CCC.3 #usr/share/man/man3/CURLOPT_FTP_USE_EPRT.3 @@ -264,6 +264,7 @@ usr/lib/libcurl.so.4.8.0 #usr/share/man/man3/CURLOPT_PROGRESSDATA.3 #usr/share/man/man3/CURLOPT_PROGRESSFUNCTION.3 #usr/share/man/man3/CURLOPT_PROTOCOLS.3 +#usr/share/man/man3/CURLOPT_PROTOCOLS_STR.3 #usr/share/man/man3/CURLOPT_PROXY.3 #usr/share/man/man3/CURLOPT_PROXYAUTH.3 #usr/share/man/man3/CURLOPT_PROXYHEADER.3 @@ -304,6 +305,7 @@ usr/lib/libcurl.so.4.8.0 #usr/share/man/man3/CURLOPT_READDATA.3 #usr/share/man/man3/CURLOPT_READFUNCTION.3 #usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS.3 +#usr/share/man/man3/CURLOPT_REDIR_PROTOCOLS_STR.3 #usr/share/man/man3/CURLOPT_REFERER.3 #usr/share/man/man3/CURLOPT_REQUEST_TARGET.3 #usr/share/man/man3/CURLOPT_RESOLVE.3 @@ -321,6 +323,7 @@ usr/lib/libcurl.so.4.8.0 #usr/share/man/man3/CURLOPT_SASL_IR.3 #usr/share/man/man3/CURLOPT_SEEKDATA.3 #usr/share/man/man3/CURLOPT_SEEKFUNCTION.3 +#usr/share/man/man3/CURLOPT_SERVER_RESPONSE_TIMEOUT.3 #usr/share/man/man3/CURLOPT_SERVICE_NAME.3 #usr/share/man/man3/CURLOPT_SHARE.3 #usr/share/man/man3/CURLOPT_SOCKOPTDATA.3 @@ -398,6 +401,7 @@ usr/lib/libcurl.so.4.8.0 #usr/share/man/man3/CURLOPT_WILDCARDMATCH.3 #usr/share/man/man3/CURLOPT_WRITEDATA.3 #usr/share/man/man3/CURLOPT_WRITEFUNCTION.3 +#usr/share/man/man3/CURLOPT_WS_OPTIONS.3 #usr/share/man/man3/CURLOPT_XFERINFODATA.3 #usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3 #usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3 @@ -483,6 +487,9 @@ usr/lib/libcurl.so.4.8.0 #usr/share/man/man3/curl_url_strerror.3 #usr/share/man/man3/curl_version.3 #usr/share/man/man3/curl_version_info.3 +#usr/share/man/man3/curl_ws_meta.3 +#usr/share/man/man3/curl_ws_recv.3 +#usr/share/man/man3/curl_ws_send.3 #usr/share/man/man3/libcurl-easy.3 #usr/share/man/man3/libcurl-env.3 #usr/share/man/man3/libcurl-errors.3 diff --git a/config/rootfiles/common/libedit b/config/rootfiles/common/libedit index a27458f0e..087e3b2e7 100644 --- a/config/rootfiles/common/libedit +++ b/config/rootfiles/common/libedit @@ -4,7 +4,7 @@ #usr/lib/libedit.la #usr/lib/libedit.so usr/lib/libedit.so.0 -usr/lib/libedit.so.0.0.68 +usr/lib/libedit.so.0.0.70 #usr/lib/pkgconfig/libedit.pc #usr/share/man/man3/editline.3 #usr/share/man/man3/el_deletestr.3 diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng index fa776cf9f..2b1f250d2 100644 --- a/config/rootfiles/common/libpng +++ b/config/rootfiles/common/libpng @@ -16,7 +16,7 @@ usr/lib/libpng.so #usr/lib/libpng16.la usr/lib/libpng16.so usr/lib/libpng16.so.16 -usr/lib/libpng16.so.16.37.0 +usr/lib/libpng16.so.16.39.0 #usr/lib/pkgconfig/libpng.pc #usr/lib/pkgconfig/libpng16.pc #usr/share/man/man3/libpng.3 diff --git a/config/rootfiles/common/pcmciautils b/config/rootfiles/common/pcmciautils deleted file mode 100644 index c7a2afa56..000000000 --- a/config/rootfiles/common/pcmciautils +++ /dev/null @@ -1,9 +0,0 @@ -#etc/pcmcia -etc/pcmcia/config.opts -etc/udev/rules.d/60-pcmcia.rules -sbin/lspcmcia -sbin/pccardctl -sbin/pcmcia-check-broken-cis -sbin/pcmcia-socket-startup -#usr/share/man/man8/lspcmcia.8 -#usr/share/man/man8/pccardctl.8 diff --git a/config/rootfiles/common/sudo b/config/rootfiles/common/sudo index 93d9cbce2..43b8f7127 100644 --- a/config/rootfiles/common/sudo +++ b/config/rootfiles/common/sudo @@ -16,8 +16,6 @@ usr/lib/sudo/group_file.so #usr/lib/sudo/libsudo_util.so #usr/lib/sudo/libsudo_util.so.0 usr/lib/sudo/libsudo_util.so.0.0.0 -#usr/lib/sudo/sample_approval.la -usr/lib/sudo/sample_approval.so #usr/lib/sudo/sudo_intercept.la usr/lib/sudo/sudo_intercept.so #usr/lib/sudo/sudo_noexec.la diff --git a/config/rootfiles/core/172/filelists/curl b/config/rootfiles/core/172/filelists/curl new file mode 120000 index 000000000..4b84bef53 --- /dev/null +++ b/config/rootfiles/core/172/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/172/filelists/libedit b/config/rootfiles/core/172/filelists/libedit new file mode 120000 index 000000000..03fc483da --- /dev/null +++ b/config/rootfiles/core/172/filelists/libedit @@ -0,0 +1 @@ +../../../common/libedit \ No newline at end of file diff --git a/config/rootfiles/core/172/filelists/libpng b/config/rootfiles/core/172/filelists/libpng new file mode 120000 index 000000000..8ef96e2c1 --- /dev/null +++ b/config/rootfiles/core/172/filelists/libpng @@ -0,0 +1 @@ +../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/core/172/filelists/sudo b/config/rootfiles/core/172/filelists/sudo new file mode 120000 index 000000000..0d3c45e04 --- /dev/null +++ b/config/rootfiles/core/172/filelists/sudo @@ -0,0 +1 @@ +../../../common/sudo \ No newline at end of file diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh index cc31851ab..7e4e031ae 100644 --- a/config/rootfiles/core/172/update.sh +++ b/config/rootfiles/core/172/update.sh @@ -47,7 +47,9 @@ fi

# Remove files rm -rvf \ + /etc/pcmcia \ /etc/strongswan.d/scepclient.conf \ + /etc/udev/rules.d/60-pcmcia.rules \ /lib/firmware/cnm/wave521c_j721s2_codec_fw.bin \ /lib/firmware/cxgb4/t4fw-1.26.6.0.bin \ /lib/firmware/cxgb4/t5fw-1.26.6.0.bin \ @@ -66,8 +68,13 @@ rm -rvf \ /lib/firmware/qcom/vpu-2.0/venus.mdt \ /lib/firmware/rtl_bt \ /lib/libz.so.1.2.12 \ + /sbin/lspcmcia \ + /sbin/pccardctl \ + /sbin/pcmcia-check-broken-cis \ + /sbin/pcmcia-socket-startup \ /usr/lib/libbind9-9.16.33.so \ /usr/lib/libdns-9.16.33.so \ + /usr/lib/libedit.so.0.0.6* \ /usr/lib/libexpat.so.1.8.9 \ /usr/lib/libhistory.so.8.1 \ /usr/lib/libirs-9.16.33.so \ @@ -77,6 +84,7 @@ rm -rvf \ /usr/lib/liblzma.so.5.2.5 \ /usr/lib/libnetfilter_conntrack.so.3.7.0 \ /usr/lib/libns-9.16.33.so \ + /usr/lib/libpng16.so.16.37.0 \ /usr/lib/libreadline.so.8.1 \ /usr/lib/libunbound.so.8.1.1* \ /usr/lib/libxml2.so.2.9.* \ @@ -107,6 +115,7 @@ rm -rvf \ /usr/lib/python3.10/site-packages/setuptools/_vendor/pyparsing.py \ /usr/lib/python3.10/site-packages/setuptools/config.py \ /usr/lib/python3.10/site-packages/setuptools_rust/utils.py \ + /usr/lib/sudo/sample_approval.so \ /usr/libexec/ipsec/scepclient \ /var/ipfire/ca/dh1024.pem

diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt index e57ead069..5682b73c8 100644 --- a/config/rootfiles/packages/libvirt +++ b/config/rootfiles/packages/libvirt @@ -27,8 +27,13 @@ etc/libvirt/libvirtd.conf #etc/libvirt/nwfilter/no-other-rarp-traffic.xml #etc/libvirt/nwfilter/qemu-announce-self-rarp.xml #etc/libvirt/nwfilter/qemu-announce-self.xml +etc/libvirt/qemu etc/libvirt/qemu-lockd.conf etc/libvirt/qemu.conf +etc/libvirt/qemu/autostart +etc/libvirt/secrets +etc/libvirt/storage +etc/libvirt/storage/autostart etc/libvirt/virt-login-shell.conf etc/libvirt/virtchd.conf etc/libvirt/virtinterfaced.conf @@ -53,6 +58,7 @@ usr/bin/virt-host-validate usr/bin/virt-login-shell usr/bin/virt-pki-query-dn usr/bin/virt-pki-validate +usr/bin/virt-qemu-qmp-proxy usr/bin/virt-qemu-run usr/bin/virt-ssh-helper usr/bin/virt-xml-validate @@ -78,16 +84,16 @@ usr/bin/virt-xml-validate #usr/lib/libvirt #usr/lib/libvirt-admin.so usr/lib/libvirt-admin.so.0 -usr/lib/libvirt-admin.so.0.7010.0 +usr/lib/libvirt-admin.so.0.8009.0 #usr/lib/libvirt-lxc.so usr/lib/libvirt-lxc.so.0 -usr/lib/libvirt-lxc.so.0.7010.0 +usr/lib/libvirt-lxc.so.0.8009.0 #usr/lib/libvirt-qemu.so usr/lib/libvirt-qemu.so.0 -usr/lib/libvirt-qemu.so.0.7010.0 +usr/lib/libvirt-qemu.so.0.8009.0 #usr/lib/libvirt.so usr/lib/libvirt.so.0 -usr/lib/libvirt.so.0.7010.0 +usr/lib/libvirt.so.0.8009.0 #usr/lib/libvirt/connection-driver usr/lib/libvirt/connection-driver/libvirt_driver_ch.so usr/lib/libvirt/connection-driver/libvirt_driver_interface.so @@ -110,6 +116,7 @@ usr/lib/libvirt/storage-file/libvirt_storage_file_fs.so #usr/lib/pkgconfig/libvirt.pc #usr/lib/sysctl.d usr/lib/sysctl.d/60-libvirtd.conf +usr/lib/sysctl.d/60-qemu-postcopy-migration.conf usr/libexec/libvirt_iohelper usr/libexec/virt-login-shell-helper usr/sbin/libvirtd @@ -209,14 +216,19 @@ usr/sbin/virtstoraged usr/share/libvirt/cpu_map/arm_FT-2000plus.xml usr/share/libvirt/cpu_map/arm_Falkor.xml usr/share/libvirt/cpu_map/arm_Kunpeng-920.xml +usr/share/libvirt/cpu_map/arm_Neoverse-N1.xml +usr/share/libvirt/cpu_map/arm_Neoverse-N2.xml +usr/share/libvirt/cpu_map/arm_Neoverse-V1.xml usr/share/libvirt/cpu_map/arm_Tengyun-S2500.xml usr/share/libvirt/cpu_map/arm_ThunderX299xx.xml +usr/share/libvirt/cpu_map/arm_a64fx.xml usr/share/libvirt/cpu_map/arm_cortex-a53.xml usr/share/libvirt/cpu_map/arm_cortex-a57.xml usr/share/libvirt/cpu_map/arm_cortex-a72.xml usr/share/libvirt/cpu_map/arm_features.xml usr/share/libvirt/cpu_map/arm_vendors.xml usr/share/libvirt/cpu_map/index.xml +usr/share/libvirt/cpu_map/ppc64_POWER10.xml usr/share/libvirt/cpu_map/ppc64_POWER6.xml usr/share/libvirt/cpu_map/ppc64_POWER7.xml usr/share/libvirt/cpu_map/ppc64_POWER8.xml @@ -284,6 +296,32 @@ usr/share/libvirt/cpu_map/x86_phenom.xml usr/share/libvirt/cpu_map/x86_qemu32.xml usr/share/libvirt/cpu_map/x86_qemu64.xml usr/share/libvirt/cpu_map/x86_vendors.xml +#usr/share/libvirt/schemas +usr/share/libvirt/schemas/basictypes.rng +usr/share/libvirt/schemas/capability.rng +usr/share/libvirt/schemas/cpu.rng +usr/share/libvirt/schemas/cputypes.rng +usr/share/libvirt/schemas/domain.rng +usr/share/libvirt/schemas/domainbackup.rng +usr/share/libvirt/schemas/domaincaps.rng +usr/share/libvirt/schemas/domaincheckpoint.rng +usr/share/libvirt/schemas/domaincommon.rng +usr/share/libvirt/schemas/domainoverrides.rng +usr/share/libvirt/schemas/domainsnapshot.rng +usr/share/libvirt/schemas/inactiveDomain.rng +usr/share/libvirt/schemas/interface.rng +usr/share/libvirt/schemas/network.rng +usr/share/libvirt/schemas/networkcommon.rng +usr/share/libvirt/schemas/networkport.rng +usr/share/libvirt/schemas/nodedev.rng +usr/share/libvirt/schemas/nwfilter.rng +usr/share/libvirt/schemas/nwfilter_params.rng +usr/share/libvirt/schemas/nwfilterbinding.rng +usr/share/libvirt/schemas/secret.rng +usr/share/libvirt/schemas/storagecommon.rng +usr/share/libvirt/schemas/storagepool.rng +usr/share/libvirt/schemas/storagepoolcaps.rng +usr/share/libvirt/schemas/storagevol.rng #usr/share/libvirt/test-screenshot.png #usr/share/locale/as/LC_MESSAGES/libvirt.mo #usr/share/locale/bg/LC_MESSAGES/libvirt.mo @@ -300,10 +338,12 @@ usr/share/libvirt/cpu_map/x86_vendors.xml #usr/share/locale/fr/LC_MESSAGES/libvirt.mo #usr/share/locale/gu/LC_MESSAGES/libvirt.mo #usr/share/locale/hi/LC_MESSAGES/libvirt.mo +#usr/share/locale/hr/LC_MESSAGES/libvirt.mo #usr/share/locale/hu/LC_MESSAGES/libvirt.mo #usr/share/locale/id/LC_MESSAGES/libvirt.mo #usr/share/locale/it/LC_MESSAGES/libvirt.mo #usr/share/locale/ja/LC_MESSAGES/libvirt.mo +#usr/share/locale/ka/LC_MESSAGES/libvirt.mo #usr/share/locale/kn/LC_MESSAGES/libvirt.mo #usr/share/locale/ko/LC_MESSAGES/libvirt.mo #usr/share/locale/mk/LC_MESSAGES/libvirt.mo @@ -340,8 +380,17 @@ var/ipfire/backup/addons/includes/libvirt #var/lib/libvirt/lockd #var/lib/libvirt/lockd/files #var/lib/libvirt/qemu +#var/lib/libvirt/qemu/channel +#var/lib/libvirt/qemu/channel/target +#var/lib/libvirt/qemu/checkpoint +#var/lib/libvirt/qemu/dump +#var/lib/libvirt/qemu/nvram +#var/lib/libvirt/qemu/ram +#var/lib/libvirt/qemu/save +#var/lib/libvirt/qemu/snapshot #var/lib/libvirt/swtpm #var/log/libvirt +#var/log/libvirt/ch #var/log/libvirt/qemu var/log/swtpm var/log/swtpm/libvirt diff --git a/config/rootfiles/packages/pcengines-apu-firmware b/config/rootfiles/packages/pcengines-apu-firmware index 6a46ad7ec..7ed3981d7 100644 --- a/config/rootfiles/packages/pcengines-apu-firmware +++ b/config/rootfiles/packages/pcengines-apu-firmware @@ -1,8 +1,9 @@ #lib/firmware/pcengines #lib/firmware/pcengines/apu -lib/firmware/pcengines/apu/apu1_v4.17.0.1.rom -lib/firmware/pcengines/apu/apu2_v4.17.0.1.rom -lib/firmware/pcengines/apu/apu3_v4.17.0.1.rom -lib/firmware/pcengines/apu/apu4_v4.17.0.1.rom -lib/firmware/pcengines/apu/apu5_v4.17.0.1.rom -lib/firmware/pcengines/apu/apu6_v4.17.0.1.rom +lib/firmware/pcengines/apu/apu1_v4.17.0.2.rom +lib/firmware/pcengines/apu/apu2_v4.17.0.2.rom +lib/firmware/pcengines/apu/apu3_v4.17.0.2.rom +lib/firmware/pcengines/apu/apu4_v4.17.0.2.rom +lib/firmware/pcengines/apu/apu5_v4.17.0.2.rom +lib/firmware/pcengines/apu/apu6_v4.17.0.2.rom +lib/firmware/pcengines/apu/apu7_v4.17.0.2.rom \ No newline at end of file diff --git a/lfs/curl b/lfs/curl index fc8057e0b..33678f795 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,7 +24,7 @@

include Config

-VER = 7.84.0 +VER = 7.86.0

THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 811a63285f39a598bc4fd73ae4b8e23e5146b93dcf3eea805345792b7dddd85bbd54240d9871a0dc9f058d58fd7ea7f4efbcb82727218e8afaaae3600bad55e1 +$(DL_FILE)_BLAKE2 = a1de7feb229de42bf1deeb5017f97df3b1c10c75fac99bcd0cd21a5dc69b6d8b62520744106d6a113c7a86bd6731dba536a263aabfa22be50d520c43e894acce

install : $(TARGET)

@@ -70,10 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) - - # Incorporate upstream patch to fix build on armv6l - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --disable-ipv6 \ diff --git a/lfs/libedit b/lfs/libedit index b62197af3..7bcd7755d 100644 --- a/lfs/libedit +++ b/lfs/libedit @@ -24,7 +24,7 @@

include Config

-VER = 20210910-3.1 +VER = 20221030-3.1

THISAPP = libedit-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 325dc756fc6c6244e336cd6faeed2ab37817bdab8c0684586c44d551074fd2ec84bfcd3f4d5897db3196e783653a042699e5b9a8a3351d653992bb256956b652 +$(DL_FILE)_BLAKE2 = f4a9784cfc2a30af2778f0e05b6e45ca489555c3009ba050ea19134670ad71fdd099425dee0526dcbb6a1a84f51bd8014ce2540be0535465cb59ab998753833c

install : $(TARGET)

diff --git a/lfs/libpng b/lfs/libpng index 5a3c9fac4..f9e0ba7f4 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -24,7 +24,7 @@

include Config

-VER = 1.6.37 +VER = 1.6.39

THISAPP = libpng-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 +$(DL_FILE)_BLAKE2 = f0a2e643e921587334349f48758e61e69b4708ebc36575567767087878d262d134eeeb98fea7f0b6ff1493ea954910ca1608b10fea57196aad770eb807a9006e

install : $(TARGET)

diff --git a/lfs/libvirt b/lfs/libvirt index 21b06e89b..aa28ef2dc 100644 --- a/lfs/libvirt +++ b/lfs/libvirt @@ -26,7 +26,7 @@ include Config

SUMMARY = Server side daemon and supporting files for libvirt

-VER = 7.10.0 +VER = 8.9.0

THISAPP = libvirt-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 aarch64 PROG = libvirt -PAK_VER = 29 +PAK_VER = 30

DEPS = ebtables libpciaccess libtirpc libyajl ncat qemu

@@ -49,7 +49,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb +$(DL_FILE)_BLAKE2 = 537b6badb6171110e99561613fb1318144991107139401296248afb747ae6f9cfafcd17b2292b8d8dcc9188ff4206035ea814efa6c129bae50c0518f61be9b81

install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -83,7 +83,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)

cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libvirt-7.10.0-fix-glibc-headers.patch

cd $(DIR_APP) && meson \ --prefix=/usr \ @@ -112,7 +111,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -D storage_mpath=disabled \ -D storage_disk=disabled \ -D storage_rbd=disabled \ - -D storage_sheepdog=disabled \ -D storage_gluster=disabled \ -D storage_zfs=disabled \ builddir/ diff --git a/lfs/nginx b/lfs/nginx index ac0530034..ef13eefb4 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -25,7 +25,7 @@ include Config

SUMMARY = A HTTP server and IMAP/POP3 proxy server -VER = 1.21.6 +VER = 1.22.1

THISAPP = nginx-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx -PAK_VER = 13 +PAK_VER = 14

DEPS =

@@ -47,7 +47,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 815d035df33bd947eec41a2f5c993d1f179aa0bd4d069280916aa089a2f96fd3bada7a7192b4a0ef7b8f43036f3a2def0e93d8c8f720dd7145a5d55ea058652f +$(DL_FILE)_BLAKE2 = 253cd4c53ed0e6d3da8ca0f0ab3b2c46f6c7222c4f6fedd05302dd05efee31869d25a33947cca3ca526899cbdfcea96754be34e15643ebd77da24175319edb46

install : $(TARGET)

diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware index d2d1b7ec8..e396f0c56 100644 --- a/lfs/pcengines-apu-firmware +++ b/lfs/pcengines-apu-firmware @@ -26,14 +26,14 @@ include Config

SUMMARY = Firmware files for PC Engines apu system boards

-VER = 4.17.0.1 +VER = 4.17.0.2

THISAPP = pcengines-apu-firmware-$(VER) DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pcengines-apu-firmware -PAK_VER = 12 +PAK_VER = 13 SUP_ARCH = x86_64

DEPS = firmware-update @@ -50,7 +50,8 @@ objects = \ apu3_v$(VER).rom \ apu4_v$(VER).rom \ apu5_v$(VER).rom \ - apu6_v$(VER).rom + apu6_v$(VER).rom \ + apu7_v$(VER).rom

apu1_v$(VER).rom = $(DL_FROM)/apu1_v$(VER).rom apu2_v$(VER).rom = $(DL_FROM)/apu2_v$(VER).rom @@ -58,14 +59,15 @@ apu3_v$(VER).rom = $(DL_FROM)/apu3_v$(VER).rom apu4_v$(VER).rom = $(DL_FROM)/apu4_v$(VER).rom apu5_v$(VER).rom = $(DL_FROM)/apu5_v$(VER).rom apu6_v$(VER).rom = $(DL_FROM)/apu6_v$(VER).rom - -apu1_v$(VER).rom_BLAKE2 = d4bad8ee0fd13d8c6cec47a5dd7d06bb4e768693e7f65979b1d5f930e541ef5bbaed398fc5d5336248a016b3916562b71308f82e373ed54dac3e159ddc982359 -apu2_v$(VER).rom_BLAKE2 = d2f226edc5edf9eca6ad332b3e526d55278e583627b645a621e0f054504f2317b95d518d2c8026fd43473a1f39a7c0b750e1497a4616af077683f6100b4f44a6 -apu3_v$(VER).rom_BLAKE2 = 498d9ef9d563d240f27468cc04b73816299eecaa62acacdcfff59076bff20a2e28526e7dc3dc88693c99303eba1bb15d345584851c4f4423c0239f7cd5304721 -apu4_v$(VER).rom_BLAKE2 = ca454c3a4241529c998bc36cbeefd36025be0d18b2bb4bba6b703125d75d0db71a63f12a31399e25bc8825d0bd229d74d1a7254f326a36ad89202f2e57a09a69 -apu5_v$(VER).rom_BLAKE2 = 2a24c540a8ff1003f40b70803b45e473bc349df66ecc41109fed7bf496ec741e264f8515f3a21682359cc5d3b65f15e291936f23c93c624064215deffa149e7c -apu6_v$(VER).rom_BLAKE2 = 87d1e8f5913205236f6d96b6e4611d464b269529bd9e7c95451b00ab9ea303147ea3c79706e4f6b514ae5985f487ae15c650ba38d54a4e208a4ef7ca5c701dda -apu7_v$(VER).rom_BLAKE2 = 078ebf4601e8eed8121683eb072f628e7cc422f67f43b9a79c89779d8703e016ab24207bb54c9f55eda4017bb78f6c71873faf6bc09a9d88815d06e7f4401dac +apu7_v$(VER).rom = $(DL_FROM)/apu7_v$(VER).rom + +apu1_v$(VER).rom_BLAKE2 = 90156d57e5d3c5907d99719668dc6b2b03b201d02d716722ea2c6bd201409dbeed83766a53a75fba89583f9a58e370c5951293c91405e9815466b91449af829d +apu2_v$(VER).rom_BLAKE2 = f074f78a3ce7cb5df813a6f3f198d06585f1f9b932a31e07d6ce94a5a48e6e4211166beba5f04b1b176b914d3d7448606f9c9fb1b60130b5609ce97c298a09ba +apu3_v$(VER).rom_BLAKE2 = 6f7f200f882bf188100f13c8a0d078e2bf94e40773cfba2d2d908d31c2a6d05567fc1cb81b2bedf4af6cdd7f9a4c8f6b67f168844298fcce99060aa13806790d +apu4_v$(VER).rom_BLAKE2 = 75f927deddbab1a4413392ac40e434a59ce3e16034bf439dc7ca93be0c84f3279c8fadd8f199134b586cbf1c102c3b28a78d4ca50f556122473055f77e031416 +apu5_v$(VER).rom_BLAKE2 = 030deaef4b784b527c699bf394bfbec3108e8ed41a8ce89d93e9a7cea208805a1a37cae686cb724fc6e4b26da48885c3f7fd745cabe8150066f4a52167ee7066 +apu6_v$(VER).rom_BLAKE2 = 19dedf8c79c3835b53252f5f4019bafbc47bd753247fd9d5bf974944a4587e8c2ec136805bb11576b11fe6ce3a5b83ccf99b2bd92341a20bf87730491548368e +apu7_v$(VER).rom_BLAKE2 = e99c0993baeffb0026e33d04be20a1bacdd2aa44c6cccf89bbd92313c361f62014080c47b8255a4381c12dd5519bc294595b917054f2289665852db174c2e22e

install : $(TARGET)

diff --git a/lfs/pcmciautils b/lfs/pcmciautils deleted file mode 100644 index eb1fd5b8d..000000000 --- a/lfs/pcmciautils +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -SUMMARY = Helper programs for PC-Cards - -VER = 014 - -THISAPP = pcmciautils-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = pcmciautils -PAK_VER = 1 - -DEPS = - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 42016d589857aafaee4852b2db84d91de1bb7b1211cf535cf85881e30ec7ef43f3b2845a2d29e847ab6cbcc36f21a013fe9caad5d1e396e875fc270ac64a493e - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist : - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make - cd $(DIR_APP) && make install - @sed -i -e 's/ MODALIAS=="?[*]",//g' /etc/udev/rules.d/60-pcmcia.rules - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/qemu b/lfs/qemu index 7f1ab7896..02f1e7b79 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -27,7 +27,7 @@ include Config SUMMARY = Machine emulator and virtualizer

# If you update the version also qemu-ga !!! -VER = 7.0.0 +VER = 7.1.0

THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,7 +35,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 35 +PAK_VER = 36

DEPS = alsa libusbredir spice libseccomp

@@ -61,7 +61,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = ceda6d9f1a585298bd49fed61e8bb35f0064ad8388a9f979c8bd68a38bfe1a47c5bb055e5f74f970c2c440957042b9de4a861524120040c56e4cd8b56c5cfb68 +$(DL_FILE)_BLAKE2 = e05f91ce4993c7591a2df08b5fb017f8b8ec2141ab7bfd55d14730ea6b793ac1091de539992058392a5522d4e58beee92a87752707be58e3619b8213ef9f35bf

install : $(TARGET)

@@ -94,7 +94,6 @@ $(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/qemu-7.0.0-fix-glibc-headers.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/lfs/qemu-ga b/lfs/qemu-ga index c83878058..8fd34f6f6 100644 --- a/lfs/qemu-ga +++ b/lfs/qemu-ga @@ -26,11 +26,11 @@ include Config

SUMMARY = Guest agent for QEMU

-VER = 7.0.0 +VER = 7.1.0 THISAPP = qemu-ga-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu-ga -PAK_VER = 3 +PAK_VER = 4

DEPS =

diff --git a/lfs/sudo b/lfs/sudo index ce9649d79..807169c5c 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -24,7 +24,7 @@

include Config

-VER = 1.9.11p3 +VER = 1.9.12p1

THISAPP = sudo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd +$(DL_FILE)_BLAKE2 = 976d00fb16b0d26b2714a188e379ccba102e0fa67b8ec6278e5435728af0cc9ba23d63db64a87d4e14d59cd52d3f62401943eb7c0f9c33317179ff764a9f950c

install : $(TARGET)

diff --git a/make.sh b/make.sh index 7aecf35be..c0d1f1d2c 100755 --- a/make.sh +++ b/make.sh @@ -1518,7 +1518,6 @@ buildipfire() { lfsmake2 rng-tools lfsmake2 lsof lfsmake2 br2684ctl - lfsmake2 pcmciautils lfsmake2 lm_sensors lfsmake2 libstatgrab lfsmake2 liboping diff --git a/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch b/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch deleted file mode 100644 index 15992d31b..000000000 --- a/src/patches/curl-7.84.0-easy_lock_h_include_sched_h_if_available_to_fix_build.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit e2e7f54b7bea521fa8373095d0f43261a720cda0 -Author: Daniel Stenberg daniel@haxx.se -Date: Mon Jun 27 08:46:21 2022 +0200 - - easy_lock.h: include sched.h if available to fix build - - Patched-by: Harry Sintonen - - Closes #9054 - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 819f50ce8..1f54289ce 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -36,6 +36,9 @@ - - #elif defined (HAVE_ATOMIC) - #include <stdatomic.h> -+#if defined(HAVE_SCHED_YIELD) -+#include <sched.h> -+#endif - - #define curl_simple_lock atomic_bool - #define CURL_SIMPLE_LOCK_INIT false diff --git a/src/patches/libvirt-7.10.0-fix-glibc-headers.patch b/src/patches/libvirt-7.10.0-fix-glibc-headers.patch deleted file mode 100644 index cfe71d4bd..000000000 --- a/src/patches/libvirt-7.10.0-fix-glibc-headers.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001 -From: Cole Robinson crobinso@redhat.com -Date: Mon, 1 Aug 2022 15:24:01 -0400 -Subject: [PATCH] virfile: Fix build with glibc 2.36 - -With glibc 2.36, sys/mount.h and linux/mount.h conflict: -https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3... - -virfile.c imports sys/mount.h and linux/fs.h, which pulls in -linux/mount.h. - -Manually define the constants we need from linux/fs.h, like was -done in llvm: - -https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 - -Reviewed-by: Erik Skultety eskultet@redhat.com -Signed-off-by: Cole Robinson crobinso@redhat.com ---- - src/util/virfile.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/util/virfile.c b/src/util/virfile.c -index 99da058db3..ce541b8946 100644 ---- a/src/util/virfile.c -+++ b/src/util/virfile.c -@@ -71,7 +71,11 @@ - # endif - # include <sys/ioctl.h> - # include <linux/cdrom.h> --# include <linux/fs.h> -+/* These come from linux/fs.h, but that header conflicts with -+ * sys/mount.h on glibc 2.36+ */ -+# define FS_IOC_GETFLAGS _IOR('f', 1, long) -+# define FS_IOC_SETFLAGS _IOW('f', 2, long) -+# define FS_NOCOW_FL 0x00800000 - #endif - - #if WITH_LIBATTR --- -GitLab - diff --git a/src/patches/qemu-7.0.0-fix-glibc-headers.patch b/src/patches/qemu-7.0.0-fix-glibc-headers.patch deleted file mode 100644 index 9332563bc..000000000 --- a/src/patches/qemu-7.0.0-fix-glibc-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qemu-7.0.0/linux-user/syscall.c~ 2022-08-10 14:03:50.721401251 +0000 -+++ qemu-7.0.0/linux-user/syscall.c 2022-08-10 14:00:22.569951783 +0000 -@@ -28,7 +28,7 @@ - #include <sys/ipc.h> - #include <sys/msg.h> - #include <sys/wait.h> --#include <sys/mount.h> -+#include <linux/mount.h> - #include <sys/file.h> - #include <sys/fsuid.h> - #include <sys/personality.h>

hooks/post-receive -- IPFire 2.x development tree