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 0d7c058c321283ed7bf090b993037b01a9535c69 (commit) via 7fb17d735985e037e6e60307b0f129ce98e9f6f4 (commit) via 8d5a43f00b94ab84d3fe3673d2e81f101818348f (commit) via d45c4768f957404167da3595b5663858e9b63dde (commit) from 84d0ccd6bcefd5db00a07e1d533ce0d15663656f (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 0d7c058c321283ed7bf090b993037b01a9535c69 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 25 17:28:37 2023 +0000

core180: Ship SQLite

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 7fb17d735985e037e6e60307b0f129ce98e9f6f4 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Aug 25 13:00:43 2023 +0200

sqlite: Update to version 3430000

- Update from version 3420000 to 3430000 - Update of rootfile not required. - Changelog 3430000 Add support for Contentless-Delete FTS5 Indexes. This is a variety of FTS5 full-text search index that omits storing the content that is being indexed while also allowing records to be deleted. Enhancements to the date and time functions: Added new time shift modifiers of the form ±YYYY-MM-DD HH:MM:SS.SSS. Added the timediff() SQL function. Added the octet_length(X) SQL function. Added the sqlite3_stmt_explain() API. Query planner enhancements: Generalize the LEFT JOIN strength reduction optimization so that it works for RIGHT and FULL JOINs as well. Rename it to OUTER JOIN strength reduction. Enhance the theorem prover in the OUTER JOIN strength reduction optimization so that it returns fewer false-negatives. Enhancements to the decimal extension: New function decimal_pow2(N) returns the N-th power of 2 for integer N between -20000 and +20000. New function decimal_exp(X) works like decimal(X) except that it returns the result in exponential notation - with a "e+NN" at the end. If X is a floating-point value, then the decimal(X) function now does a full expansion of that value into its exact decimal equivalent. Performance enhancements to JSON processing results in a 2x performance improvement for some kinds of processing on large JSON strings. New makefile target "verify-source" checks to ensure that there are no unintentional changes in the source tree. (Works for canonical source code only - not for precompiled amalgamation tarballs.) Added the SQLITE_USE_SEH compile-time option that enables Structured Exception Handling on Windows while working with the memory-mapped shm file that is part of WAL mode processing. This option is enabled by default when building on Windows using Makefile.msc. The VFS for unix now assumes that the nanosleep() system call is available unless compiled with -DHAVE_NANOSLEEP=0.

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

commit 8d5a43f00b94ab84d3fe3673d2e81f101818348f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 25 17:25:23 2023 +0000

dhcpcd: Fix buffer overflow at startup

Fixes: #13252 - dhcpcd fails in next Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit d45c4768f957404167da3595b5663858e9b63dde Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 25 09:42:23 2023 +0000

pakfire: Don't give up mirror search on status code 500

The WWW library seems to report status code 500 for issues like DNS resolving problems and connection timeouts. In that case, we won't go on searching for another functioning mirror, which we should.

This patch removes that special break clause.

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/rootfiles/core/180/filelists/files | 1 + .../{oldcore/125 => core/180}/filelists/sqlite | 0 lfs/dhcpcd | 2 ++ lfs/sqlite | 4 ++-- src/pakfire/lib/functions.pl | 5 ---- ...-10.0.2-fix-off-by-one-overflow-when-read.patch | 26 ++++++++++++++++++++ ...rivsep-fix-strlcpy-overflow-in-psp-ifname.patch | 28 ++++++++++++++++++++++ 7 files changed, 59 insertions(+), 7 deletions(-) copy config/rootfiles/{oldcore/125 => core/180}/filelists/sqlite (100%) create mode 100644 src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch create mode 100644 src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch

Difference in files: diff --git a/config/rootfiles/core/180/filelists/files b/config/rootfiles/core/180/filelists/files index 7031204b9..d08a282a6 100644 --- a/config/rootfiles/core/180/filelists/files +++ b/config/rootfiles/core/180/filelists/files @@ -1,2 +1,3 @@ +opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/index.cgi var/ipfire/main/manualpages diff --git a/config/rootfiles/core/180/filelists/sqlite b/config/rootfiles/core/180/filelists/sqlite new file mode 120000 index 000000000..4ea569766 --- /dev/null +++ b/config/rootfiles/core/180/filelists/sqlite @@ -0,0 +1 @@ +../../../common/sqlite \ No newline at end of file diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 909de6e57..2323b6104 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -71,6 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.2-Allow-free-selection-of-MTU-by-the-user.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch cd $(DIR_APP) && ./configure \ --prefix="" \ --sysconfdir=/var/ipfire/dhcpc \ diff --git a/lfs/sqlite b/lfs/sqlite index d059bb068..01477e47d 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@

include Config

-VER = 3420000 +VER = 3430000

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

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

-$(DL_FILE)_BLAKE2 = 3c4837952a3d9864f03d7a2c164b303f196ad1deeef2f96056509dd808108655e1a2b2161b4bd614bd01feaec98bb9f8019237bfbd5901ec9ae06b442175d0f6 +$(DL_FILE)_BLAKE2 = dc5a5df76ffe86eb61438031ef3893fbe412f7c7607826dd032293ced06b2f76dfb5f6b85ba80e857069ea4244a3ec222f3f247faec192778c3ecfcc810faa07

install : $(TARGET)

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 4ed70308c..e623e8bc3 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -205,11 +205,6 @@ sub fetchfile { my $log = $response->status_line; logger("DOWNLOAD INFO: HTTP-Status-Code: $code - $log");

- if ( $code eq "500" ) { - message("Giving up: There was no chance to get the file "$getfile" from any available server.\nThere was an error on the way. Please fix it."); - return 0; - } - if ($response->is_success) { if (open(FILE, ">$Conf::tmpdir/$bfile")) { print FILE $final_data; diff --git a/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch b/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch new file mode 100644 index 000000000..9e9cf3695 --- /dev/null +++ b/src/patches/dhcpcd-10.0.2-fix-off-by-one-overflow-when-read.patch @@ -0,0 +1,26 @@ +From f798bf23af8e5a0eae38931912e2b67e1d45aca4 Mon Sep 17 00:00:00 2001 +From: Tobias Heider tobhe@users.noreply.github.com +Date: Sat, 12 Aug 2023 21:59:21 +0200 +Subject: [PATCH] dhcpcd: Fix off-by-one overflow when read() writes full + BUFSIZ (#236) + +--- + src/dhcpcd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dhcpcd.c b/src/dhcpcd.c +index e06733d3..688a3a6d 100644 +--- a/src/dhcpcd.c ++++ b/src/dhcpcd.c +@@ -1822,7 +1822,7 @@ dhcpcd_stderr_cb(void *arg, unsigned short events) + if (!(events & ELE_READ)) + return; + +- len = read(ctx->stderr_fd, log, sizeof(log)); ++ len = read(ctx->stderr_fd, log, sizeof(log) - 1); + if (len == -1) { + if (errno != ECONNRESET) + logerr(__func__); +-- +2.39.2 + diff --git a/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch b/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch new file mode 100644 index 000000000..07c87017e --- /dev/null +++ b/src/patches/dhcpcd-10.0.2-privsep-fix-strlcpy-overflow-in-psp-ifname.patch @@ -0,0 +1,28 @@ +From 1bd8fc7d4b34f752a32709d277a897e5ad202d97 Mon Sep 17 00:00:00 2001 +From: Tobias Heider tobhe@users.noreply.github.com +Date: Tue, 15 Aug 2023 18:06:48 +0200 +Subject: [PATCH] privsep: fix strlcpy overflow in psp_ifname (#239) + +When running our Ubuntu tests with libc6 and strlcpy overflow checks +enabled we found that the wrong size is passed to strlcpy resulting +in a crash because of an overflow. +--- + src/privsep.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/privsep.c b/src/privsep.c +index b11c0351..cfe54742 100644 +--- a/src/privsep.c ++++ b/src/privsep.c +@@ -1200,7 +1200,7 @@ ps_newprocess(struct dhcpcd_ctx *ctx, struct ps_id *psid) + #endif + + if (!(ctx->options & DHCPCD_MANAGER)) +- strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_name)); ++ strlcpy(psp->psp_ifname, ctx->ifv[0], sizeof(psp->psp_ifname)); + TAILQ_INSERT_TAIL(&ctx->ps_processes, psp, next); + return psp; + } +-- +2.39.2 +

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