Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-bash-4.4 grimoire by Pavel Vinogradov (79fd11e35442bd2ca170aba09832bbab49fd0002)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-bash-4.4 grimoire by Pavel Vinogradov (79fd11e35442bd2ca170aba09832bbab49fd0002)
  • Date: Thu, 1 Dec 2016 23:11:46 +0000

GIT changes to devel-bash-4.4 grimoire by Pavel Vinogradov
<public AT sourcemage.org>:

shell-term-fm/bash/DETAILS | 10 ++++
shell-term-fm/bash/HISTORY | 4 +
shell-term-fm/bash/PRE_BUILD | 8 +--
shell-term-fm/bash/patches/bash44-001 | 60 ------------------------
shell-term-fm/bash/patches/bash44-002 | 69 ---------------------------
shell-term-fm/bash/patches/bash44-003 | 58 -----------------------
shell-term-fm/bash/patches/bash44-004 | 84
----------------------------------
shell-term-fm/bash/patches/bash44-005 | 47 -------------------
8 files changed, 18 insertions(+), 322 deletions(-)

New commits:
commit 79fd11e35442bd2ca170aba09832bbab49fd0002
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

shell-term-fm/bash: made patches downloadable and verifiable

diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index aa0f16a..a17912e 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -16,6 +16,16 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$XVERSION"
SOURCE3_GPG="gnu.gpg:${SOURCE3}.sig:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
SOURCE4_IGNORE=signature
+ PATCHES_URL="${GNU_URL}/${SPELL}/${SPELL}-${XVERSION}-patches"
+for i in $(seq -w 1 $BASH_PATCHLEVEL); do
+ local patchname="bash${XVERSION//./}-${i}"
+ eval "SOURCE$((2*i+3))=${patchname}"
+ eval "SOURCE$((2*i+3))_URL=${PATCHES_URL}/${patchname}"
+ eval "SOURCE$((2*i+4))=${patchname}.sig"
+ eval "SOURCE$((2*i+4))_URL=${PATCHES_URL}/${patchname}.sig"
+ eval "SOURCE$((2*i+3))_GPG=gnu.gpg:${patchname}.sig:UPSTREAM_KEY"
+ eval "SOURCE$((2*i+4))_IGNORE=signature"
+done
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
ENTERED=20010922
LICENSE[0]=GPL2
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 1a6fe40..3ff0381 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,7 @@
+2016-12-01 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PRE_BUILD: made patches downloadable + verifiable
+ * patches/bash44-00[1-5]: dropped
+
2016-11-12 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.4.005
* PRE_BUILD: fixed patch name formation
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index 25ac246..877e29d 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -2,11 +2,11 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
unpack_file 3 &&

-local versuffix &&
-versuffix=${XVERSION//./} &&
for i in $(seq -w 1 $BASH_PATCHLEVEL); do
- message "${MESSAGE_COLOR}applying patch bash${versuffix}-${i}
...${DEFAULT_COLOR}" &&
- patch -p0 < ${SPELL_DIRECTORY}/patches/bash${versuffix}-${i}
+ local patchname="SOURCE$((2*i+3))" &&
+ verify_file "$((2*i+3))" &&
+ message "${MESSAGE_COLOR}applying patch ${!patchname} ...${DEFAULT_COLOR}"
&&
+ patch -p0 < ${SOURCE_CACHE}/${!patchname}
done &&

if [[ "$BASH_NI_LOGIN" == y ]]; then
diff --git a/shell-term-fm/bash/patches/bash44-001
b/shell-term-fm/bash/patches/bash44-001
deleted file mode 100644
index 7b848fe..0000000
--- a/shell-term-fm/bash/patches/bash44-001
+++ /dev/null
@@ -1,60 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.4
-Patch-ID: bash44-001
-
-Bug-Reported-by: Sean Zha <freeman_cha AT hotmail.com>
-Bug-Reference-ID:
<BN3PR01MB13657D9303EB94BF6E54216E8CCA0 AT BN3PR01MB1365.prod.exchangelabs.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html
-
-Bug-Description:
-
-Bash-4.4 changed the way the history list is initially allocated to reduce
-the number of reallocations and copies. Users who set HISTSIZE to a very
-large number to essentially unlimit the size of the history list will get
-memory allocation errors
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500
---- lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400
-***************
-*** 58,61 ****
---- 58,63 ----
- #define DEFAULT_HISTORY_INITIAL_SIZE 502
-
-+ #define MAX_HISTORY_INITIAL_SIZE 8192
-+
- /* The number of slots to increase the_history by. */
- #define DEFAULT_HISTORY_GROW_SIZE 50
-***************
-*** 308,312 ****
- {
- if (history_stifled && history_max_entries > 0)
-! history_size = history_max_entries + 2;
- else
- history_size = DEFAULT_HISTORY_INITIAL_SIZE;
---- 310,316 ----
- {
- if (history_stifled && history_max_entries > 0)
-! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
-! ? MAX_HISTORY_INITIAL_SIZE
-! : history_max_entries + 2;
- else
- history_size = DEFAULT_HISTORY_INITIAL_SIZE;
-*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h 2016-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/shell-term-fm/bash/patches/bash44-002
b/shell-term-fm/bash/patches/bash44-002
deleted file mode 100644
index 6d8baef..0000000
--- a/shell-term-fm/bash/patches/bash44-002
+++ /dev/null
@@ -1,69 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.4
-Patch-ID: bash44-002
-
-Bug-Reported-by: Eric Pruitt <eric.pruitt AT gmail.com>
-Bug-Reference-ID: <20160916055120.GA28272 AT sinister.codevat.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
-
-Bug-Description:
-
-Bash-4.4 warns when discarding NUL bytes in command substitution output
-instead of silently dropping them. This patch changes the warnings from
-one per NUL byte encountered to one warning per command substitution.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
---- subst.c 2016-09-26 10:20:19.000000000 -0400
-***************
-*** 5932,5935 ****
---- 5933,5937 ----
- int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
- ssize_t bufn;
-+ int nullbyte;
-
- istring = (char *)NULL;
-***************
-*** 5939,5942 ****
---- 5941,5946 ----
- skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
-
-+ nullbyte = 0;
-+
- /* Read the output of the command through the pipe. This may need to be
- changed to understand multibyte characters in the future. */
-***************
-*** 5957,5961 ****
- {
- #if 1
-! internal_warning ("%s", _("command substitution: ignored null byte
in input"));
- #endif
- continue;
---- 5961,5969 ----
- {
- #if 1
-! if (nullbyte == 0)
-! {
-! internal_warning ("%s", _("command substitution: ignored null
byte in input"));
-! nullbyte = 1;
-! }
- #endif
- continue;
-*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h 2016-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/shell-term-fm/bash/patches/bash44-003
b/shell-term-fm/bash/patches/bash44-003
deleted file mode 100644
index 01b6b6c..0000000
--- a/shell-term-fm/bash/patches/bash44-003
+++ /dev/null
@@ -1,58 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.4
-Patch-ID: bash44-003
-
-Bug-Reported-by: op7ic \x00 <op7ica AT gmail.com>
-Bug-Reference-ID:
<CAFHyJTopWC5Jx+U7WcvxSZKu+KrqSf+_3sHPiRWo=VzXSiPq=w AT mail.gmail.com>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html
-
-Bug-Description:
-
-Specially-crafted input, in this case an incomplete pathname expansion
-bracket expression containing an invalid collating symbol, can cause the
-shell to crash.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.4/lib/glob/sm_loop.c 2016-04-10 11:23:21.000000000 -0400
---- lib/glob/sm_loop.c 2016-11-02 14:03:34.000000000 -0400
-***************
-*** 331,334 ****
---- 331,340 ----
- if (p[pc] == L('.') && p[pc+1] == L(']'))
- break;
-+ if (p[pc] == 0)
-+ {
-+ if (vp)
-+ *vp = INVALID;
-+ return (p + pc);
-+ }
- val = COLLSYM (p, pc);
- if (vp)
-***************
-*** 484,487 ****
---- 490,496 ----
- c = FOLD (c);
-
-+ if (c == L('\0'))
-+ return ((test == L('[')) ? savep : (CHAR *)0);
-+
- if ((flags & FNM_PATHNAME) && c == L('/'))
- /* [/] can never match when matching a pathname. */
-*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h 2016-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_ */
diff --git a/shell-term-fm/bash/patches/bash44-004
b/shell-term-fm/bash/patches/bash44-004
deleted file mode 100644
index 1d8af26..0000000
--- a/shell-term-fm/bash/patches/bash44-004
+++ /dev/null
@@ -1,84 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.4
-Patch-ID: bash44-004
-
-Bug-Reported-by: Christian Weisgerber <naddy AT mips.inka.de>
-Bug-Reference-ID: <20161101160302.GB54856 AT lorvorc.mips.inka.de>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html
-
-Bug-Description:
-
-There is a race condition that can result in bash referencing freed memory
-when freeing data associated with the last process substitution.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.4/jobs.c 2016-08-23 16:38:44.000000000 -0400
---- jobs.c 2016-11-02 18:24:45.000000000 -0400
-***************
-*** 454,457 ****
---- 454,472 ----
- }
-
-+ void
-+ discard_last_procsub_child ()
-+ {
-+ PROCESS *disposer;
-+ sigset_t set, oset;
-+
-+ BLOCK_CHILD (set, oset);
-+ disposer = last_procsub_child;
-+ last_procsub_child = (PROCESS *)NULL;
-+ UNBLOCK_CHILD (oset);
-+
-+ if (disposer)
-+ discard_pipeline (disposer);
-+ }
-+
- struct pipeline_saver *
- alloc_pipeline_saver ()
-*** ../bash-4.4/jobs.h 2016-04-27 10:35:51.000000000 -0400
---- jobs.h 2016-11-02 18:25:08.000000000 -0400
-***************
-*** 191,194 ****
---- 191,195 ----
- extern void stop_making_children __P((void));
- extern void cleanup_the_pipeline __P((void));
-+ extern void discard_last_procsub_child __P((void));
- extern void save_pipeline __P((int));
- extern PROCESS *restore_pipeline __P((int));
-*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
---- subst.c 2016-11-02 18:23:24.000000000 -0400
-***************
-*** 5809,5816 ****
- #if defined (JOB_CONTROL)
- if (last_procsub_child)
-! {
-! discard_pipeline (last_procsub_child);
-! last_procsub_child = (PROCESS *)NULL;
-! }
- last_procsub_child = restore_pipeline (0);
- #endif
---- 5834,5838 ----
- #if defined (JOB_CONTROL)
- if (last_procsub_child)
-! discard_last_procsub_child ();
- last_procsub_child = restore_pipeline (0);
- #endif
-*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 3
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash44-005
b/shell-term-fm/bash/patches/bash44-005
deleted file mode 100644
index bacd67a..0000000
--- a/shell-term-fm/bash/patches/bash44-005
+++ /dev/null
@@ -1,47 +0,0 @@
- BASH PATCH REPORT
- =================
-
-Bash-Release: 4.4
-Patch-ID: bash44-005
-
-Bug-Reported-by: Dr. Werner Fink <werner AT suse.de>
-Bug-Reference-ID: <20161107100936.ajnojd7dspirdflf AT noether.suse.de>
-Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html
-
-Bug-Description:
-
-Under certain circumstances, a simple command is optimized to eliminate a
-fork, resulting in an EXIT trap not being executed.
-
-Patch (apply with `patch -p0'):
-
-*** ../bash-4.4/builtins/evalstring.c 2016-08-11 14:18:51.000000000 -0400
---- builtins/evalstring.c 2016-11-08 15:05:07.000000000 -0500
-***************
-*** 105,114 ****
- *bash_input.location.string == '\0' &&
- command->type == cm_simple &&
-- #if 0
- signal_is_trapped (EXIT_TRAP) == 0 &&
- signal_is_trapped (ERROR_TRAP) == 0 &&
-- #else
- any_signals_trapped () < 0 &&
-- #endif
- command->redirects == 0 && command->value.Simple->redirects == 0 &&
- ((command->flags & CMD_TIME_PIPELINE) == 0) &&
---- 105,111 ----
-*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
---- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 4
-
- #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
- looks for to find the patch level (for the sccs version string). */
-
-! #define PATCHLEVEL 5
-
- #endif /* _PATCHLEVEL_H_ */



  • [SM-Commit] GIT changes to devel-bash-4.4 grimoire by Pavel Vinogradov (79fd11e35442bd2ca170aba09832bbab49fd0002), Pavel Vinogradov, 12/01/2016

Archive powered by MHonArc 2.6.24.

Top of Page