aboutsummaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2014-10-02 00:22:12 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2014-10-02 00:22:12 +0000
commite603aaff0282827b2f1efdf34bae1df9256db222 (patch)
treea5c86a216bcd498ceb6d70225b17897d04d1bd0b /shells
parent33e5a12d5b017da8f9c3eea5169c4ecd2fed2538 (diff)
downloadports-e603aaff0282827b2f1efdf34bae1df9256db222.tar.gz
ports-e603aaff0282827b2f1efdf34bae1df9256db222.zip
Notes
Diffstat (limited to 'shells')
-rw-r--r--shells/bash/Makefile4
-rw-r--r--shells/bash/distinfo2
-rw-r--r--shells/bash/files/patch-parse.y86
3 files changed, 4 insertions, 88 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index b067b598f9b7..dce95530789f 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= bash
-PATCHLEVEL= 27
+PATCHLEVEL= 28
PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g}
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES= shells
MASTER_SITES= GNU
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 4ca3a02a7318..8bba90d867ab 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -54,3 +54,5 @@ SHA256 (bash/bash43-026) = 2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796d
SIZE (bash/bash43-026) = 1575
SHA256 (bash/bash43-027) = 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe
SIZE (bash/bash43-027) = 6889
+SHA256 (bash/bash43-028) = e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d
+SIZE (bash/bash43-028) = 69606
diff --git a/shells/bash/files/patch-parse.y b/shells/bash/files/patch-parse.y
deleted file mode 100644
index 0c571ecc363a..000000000000
--- a/shells/bash/files/patch-parse.y
+++ /dev/null
@@ -1,86 +0,0 @@
-From Florian Weimer at RedHat for CVE-2014-7186:
-http://www.openwall.com/lists/oss-security/2014/09/25/32
-
---- parse.y.orig 2014-09-30 12:58:08.462512373 -0400
-+++ parse.y 2014-09-30 12:58:08.629018000 -0400
-@@ -265,9 +265,21 @@
-
- /* Variables to manage the task of reading here documents, because we need to
- defer the reading until after a complete command has been collected. */
--static REDIRECT *redir_stack[10];
-+static REDIRECT **redir_stack;
- int need_here_doc;
-
-+/* Pushes REDIR onto redir_stack, resizing it as needed. */
-+static void
-+push_redir_stack (REDIRECT *redir)
-+{
-+ /* Guard against oveflow. */
-+ if (need_here_doc + 1 > INT_MAX / sizeof (*redir_stack))
-+ abort ();
-+ redir_stack = xrealloc (redir_stack,
-+ (need_here_doc + 1) * sizeof (*redir_stack));
-+ redir_stack[need_here_doc++] = redir;
-+}
-+
- /* Where shell input comes from. History expansion is performed on each
- line when the shell is interactive. */
- static char *shell_input_line = (char *)NULL;
-@@ -520,42 +532,42 @@
- source.dest = 0;
- redir.filename = $2;
- $$ = make_redirection (source, r_reading_until, redir, 0);
-- redir_stack[need_here_doc++] = $$;
-+ push_redir_stack ($$);
- }
- | NUMBER LESS_LESS WORD
- {
- source.dest = $1;
- redir.filename = $3;
- $$ = make_redirection (source, r_reading_until, redir, 0);
-- redir_stack[need_here_doc++] = $$;
-+ push_redir_stack ($$);
- }
- | REDIR_WORD LESS_LESS WORD
- {
- source.filename = $1;
- redir.filename = $3;
- $$ = make_redirection (source, r_reading_until, redir, REDIR_VARASSIGN);
-- redir_stack[need_here_doc++] = $$;
-+ push_redir_stack ($$);
- }
- | LESS_LESS_MINUS WORD
- {
- source.dest = 0;
- redir.filename = $2;
- $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-- redir_stack[need_here_doc++] = $$;
-+ push_redir_stack ($$);
- }
- | NUMBER LESS_LESS_MINUS WORD
- {
- source.dest = $1;
- redir.filename = $3;
- $$ = make_redirection (source, r_deblank_reading_until, redir, 0);
-- redir_stack[need_here_doc++] = $$;
-+ push_redir_stack ($$);
- }
- | REDIR_WORD LESS_LESS_MINUS WORD
- {
- source.filename = $1;
- redir.filename = $3;
- $$ = make_redirection (source, r_deblank_reading_until, redir, REDIR_VARASSIGN);
-- redir_stack[need_here_doc++] = $$;
-+ push_redir_stack ($$);
- }
- | LESS_LESS_LESS WORD
- {
-@@ -4905,7 +4917,7 @@
- case CASE:
- case SELECT:
- case FOR:
-- if (word_top < MAX_CASE_NEST)
-+ if (word_top + 1 < MAX_CASE_NEST)
- word_top++;
- word_lineno[word_top] = line_number;
- break;