From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. baee54153bd2a2f0fd126e98d9499f54169af6f3
Date: Thu, 07 Aug 2025 17:17:27 +0000 (UTC) [thread overview]
Message-ID: <4byYkc0LVWz2xN7@people01.haj.ipfire.org> (raw)
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 baee54153bd2a2f0fd126e98d9499f54169af6f3 (commit)
via 0fb4546ddf85187a423ca56a7b012f5074d9c089 (commit)
via 9983bc12ca0e1508aa4e3b69a9ce34f5caa685cd (commit)
from ebfcb022fb29b17abfb6c8352e72274a72ca6dd6 (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 baee54153bd2a2f0fd126e98d9499f54169af6f3
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Aug 7 17:22:46 2025 +0200
borgbackup: Fix bug13868 - add libxxhash to dependencies - forgotten in CU189
- Add libxxhash to dependenc list and increment PAK_VER.
- Update of rootfile not required
Fixes: bug13868
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 0fb4546ddf85187a423ca56a7b012f5074d9c089
Author: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu Aug 7 17:22:45 2025 +0200
bash: Update to patch level 3
- Update from patch level 0 to 3
- Update of rootfile not required
- Changelog
Patch 3
Bash leaves internal quoting in place when expanding array subscripts
that appear inside array subscripts in an arithmetic context, causing
expansion failures.
Patch 2
There are too many differences in the various implementations of shm_open(2)
to rely on it for bash's use.
Patch 1
In posix mode, `wait -n' with pid arguments does not restrict the set of
processes it considers to those arguments.
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 9983bc12ca0e1508aa4e3b69a9ce34f5caa685cd
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu Aug 7 16:42:18 2025 +0000
arpwatch: Fix rootfile
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/arpwatch | 2 +
lfs/bash | 2 +-
lfs/borgbackup | 6 +-
src/patches/bash/bash53-001 | 48 +++++++++++++++
src/patches/bash/bash53-002 | 122 +++++++++++++++++++++++++++++++++++++
src/patches/bash/bash53-003 | 82 +++++++++++++++++++++++++
6 files changed, 258 insertions(+), 4 deletions(-)
create mode 100644 src/patches/bash/bash53-001
create mode 100644 src/patches/bash/bash53-002
create mode 100644 src/patches/bash/bash53-003
Difference in files:
diff --git a/config/rootfiles/packages/arpwatch b/config/rootfiles/packages/arpwatch
index d173da269..1a64d58fe 100644
--- a/config/rootfiles/packages/arpwatch
+++ b/config/rootfiles/packages/arpwatch
@@ -1,5 +1,7 @@
etc/rc.d/init.d/arpwatch
usr/sbin/arpsnmp
usr/sbin/arpwatch
+#usr/share/man/man8/arpsnmp.8
+#usr/share/man/man8/arpwatch.8
#var/lib/arpwatch
var/lib/arpwatch/ethercodes.dat
diff --git a/lfs/bash b/lfs/bash
index a09326198..1bc7b52f6 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -25,7 +25,7 @@
include Config
VER = 5.3
-PATCHVER = 0
+PATCHVER = 3
THISAPP = bash-$(VER)
DL_FILE = $(THISAPP).tar.gz
diff --git a/lfs/borgbackup b/lfs/borgbackup
index 107e852a6..189526073 100644
--- a/lfs/borgbackup
+++ b/lfs/borgbackup
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2025 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 #
@@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = borgbackup
-PAK_VER = 17
+PAK_VER = 18
-DEPS = python3-msgpack python3-packaging python3-pyfuse3
+DEPS = python3-msgpack python3-packaging python3-pyfuse3 libxxhash
# borgbackup only works with specific versions of python3-msgpack
SERVICES =
diff --git a/src/patches/bash/bash53-001 b/src/patches/bash/bash53-001
new file mode 100644
index 000000000..17c1d89db
--- /dev/null
+++ b/src/patches/bash/bash53-001
@@ -0,0 +1,48 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.3
+Patch-ID: bash53-001
+
+Bug-Reported-by: John Sidles <jasidles@gmail.com>
+Bug-Reference-ID: <CAHOxHhRKa86FtRpsq-FBVciAxZ9kbo5PvfQBovBDXDFySbxj7A@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2025-07/msg00035.html
+
+Bug-Description:
+
+In posix mode, `wait -n' with pid arguments does not restrict the set of
+processes it considers to those arguments.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.3/jobs.c Fri Mar 7 18:48:44 2025
+--- jobs.c Mon Jul 14 10:25:13 2025
+***************
+*** 3539,3543 ****
+ one in bgpids. We can do this in posix mode because we'll remove any
+ one we find from the table, preserving existing semantics. */
+! if (posixly_correct && (t = bgp_findone ()))
+ {
+ pid = t->pid;
+--- 3539,3543 ----
+ one in bgpids. We can do this in posix mode because we'll remove any
+ one we find from the table, preserving existing semantics. */
+! if (posixly_correct && (flags & JWAIT_WAITING) == 0 && (t = bgp_findone ()))
+ {
+ pid = t->pid;
+
+*** ../bash-5.3/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 0
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash53-002 b/src/patches/bash/bash53-002
new file mode 100644
index 000000000..cddc90e87
--- /dev/null
+++ b/src/patches/bash/bash53-002
@@ -0,0 +1,122 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.3
+Patch-ID: bash53-002
+
+Bug-Reported-by:
+Bug-Reference-ID:
+Bug-Reference-URL: https://savannah.gnu.org/bugs/?67326
+
+Bug-Description:
+
+There are too many differences in the various implementations of shm_open(2)
+to rely on it for bash's use.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.3-patched/lib/sh/anonfile.c Tue Jul 9 11:41:57 2024
+--- lib/sh/anonfile.c Thu Jul 17 11:03:23 2025
+***************
+*** 26,30 ****
+ #include <bashtypes.h>
+
+! #if defined (HAVE_MEMFD_CREATE) || defined (HAVE_SHM_OPEN) || defined (HAVE_SHM_MKSTEMP)
+ # include <sys/mman.h>
+ #endif
+--- 26,30 ----
+ #include <bashtypes.h>
+
+! #if defined (HAVE_MEMFD_CREATE) || defined (HAVE_SHM_MKSTEMP)
+ # include <sys/mman.h>
+ #endif
+***************
+*** 42,57 ****
+ #endif
+
+! #if defined (HAVE_SHM_OPEN)
+! #ifndef O_NOFOLLOW
+! # define O_NOFOLLOW 0
+! #endif
+!
+ static int
+- anonshmunlink (const char *fn)
+- {
+- return (shm_unlink (fn));
+- }
+-
+- static int
+ anonshmopen (const char *name, int flags, char **fn)
+ {
+--- 42,47 ----
+ #endif
+
+! #if defined (HAVE_SHM_MKSTEMP)
+ static int
+ anonshmopen (const char *name, int flags, char **fn)
+ {
+***************
+*** 63,95 ****
+ *fn = 0;
+
+- #if defined (HAVE_SHM_MKSTEMP)
+ fname = savestring ("/shm-XXXXXXXXXX");
+ fd = shm_mkstemp (fname);
+ if (fd < 0)
+- free (fname);
+- #endif
+-
+- if (fd < 0)
+ {
+- fname = sh_mktmpname (name, flags);
+- fd = shm_open (fname, O_RDWR|O_CREAT|O_EXCL|O_NOFOLLOW, 0600);
+- }
+-
+- if (fd < 0)
+- {
+ free (fname);
+ return fd;
+ }
+
+- if (shm_unlink (fname) < 0)
+- {
+- int o;
+- o = errno;
+- free (fname);
+- close (fd);
+- errno = o;
+- return -1;
+- }
+-
+ if (fn)
+ *fn = fname;
+--- 53,64 ----
+***************
+*** 123,127 ****
+ flag = (name && *name == '/') ? MT_TEMPLATE : MT_USETMPDIR;
+
+! #if defined (HAVE_SHM_OPEN)
+ fd = anonshmopen (name, flag, fn);
+ if (fd >= 0)
+--- 92,96 ----
+ flag = (name && *name == '/') ? MT_TEMPLATE : MT_USETMPDIR;
+
+! #if defined (HAVE_SHM_MKSTEMP)
+ fd = anonshmopen (name, flag, fn);
+ if (fd >= 0)
+
+*** ../bash-5.3/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 1
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash53-003 b/src/patches/bash/bash53-003
new file mode 100644
index 000000000..0fc6b42e0
--- /dev/null
+++ b/src/patches/bash/bash53-003
@@ -0,0 +1,82 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 5.3
+Patch-ID: bash53-003
+
+Bug-Reported-by: Isabella Bosia <izaberina@gmail.com>
+Bug-Reference-ID: <CAAZkfoJhQ1BJ7BGk3-ObctvCJJrW3rp_tWQXT=9rY7kGDvz4uw@mail.gmail.com>
+Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2025-06/msg00173.html
+
+Bug-Description:
+
+Bash leaves internal quoting in place when expanding array subscripts
+that appear inside array subscripts in an arithmetic context, causing
+expansion failures.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-5.3-patched/subst.c Sun May 18 15:00:13 2025
+--- subst.c Fri Jul 11 09:48:44 2025
+***************
+*** 3796,3802 ****
+ #endif
+
+! /* We don't perform process substitution in arithmetic expressions, so don't
+! bother checking for it. */
+! #define ARITH_EXP_CHAR(s) (s == '$' || s == '`' || s == CTLESC || s == '~')
+
+ /* If there are any characters in STRING that require full expansion,
+--- 3796,3802 ----
+ #endif
+
+! /* We don't perform process substitution or tilde expansion in arithmetic
+! expressions, so don't bother checking for them. */
+! #define ARITH_EXP_CHAR(s) (s == '$' || s == '`' || s == CTLESC)
+
+ /* If there are any characters in STRING that require full expansion,
+***************
+*** 12216,12219 ****
+--- 12216,12227 ----
+ break;
+ }
++ #if defined (ARRAY_VARS)
++ /* The only special characters that matter here are []~, since those
++ are backslash-quoted in expand_array_subscript but not dequoted
++ by the statement following this one. */
++ if ((quoted & Q_ARITH) && (c == LBRACK || c == RBRACK || c == '~'))
++ ; /* placeholder here */
++ else
++ #endif
+ if (((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || dquote) && (sh_syntaxtab[c] & CBSDQUOTE) == 0)
+ *r++ = '\\';
+*** ../bash-5.3/tests/quotearray.right Thu Nov 10 10:39:56 2022
+--- tests/quotearray.right Thu Jul 10 15:40:27 2025
+***************
+*** 45,49 ****
+ 0
+ 0
+! ./quotearray1.sub: line 68: 0\],b\[1: arithmetic syntax error: invalid arithmetic operator (error token is "\],b\[1")
+ declare -a array
+ 0
+--- 45,49 ----
+ 0
+ 0
+! ./quotearray1.sub: line 68: 0],b[1: arithmetic syntax error: invalid arithmetic operator (error token is "],b[1")
+ declare -a array
+ 0
+*** ../bash-5.3/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 2
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 3
+
+ #endif /* _PATCHLEVEL_H_ */
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2025-08-07 17:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4byYkc0LVWz2xN7@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox