aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2014-09-26 21:32:03 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2014-09-26 21:32:03 +0000
commit1c20652f7c8f80854e10d890937626cc543b0c77 (patch)
tree5c5555e866ff7e8bde8c4ee9f24c4a8dd16c72ce
parentdf421f2939c725e1d4fa6a97fd9b859ac2610fa8 (diff)
downloadports-1c20652f7c8f80854e10d890937626cc543b0c77.tar.gz
ports-1c20652f7c8f80854e10d890937626cc543b0c77.zip
MFH: r369347
Update to patchlevel 26. This is a NOP as r369261 already covered it.
Notes
Notes: svn path=/branches/2014Q3/; revision=369348
-rw-r--r--shells/bash/Makefile4
-rw-r--r--shells/bash/distinfo2
-rw-r--r--shells/bash/files/patch-parse.y13
3 files changed, 4 insertions, 15 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index a8926a4ab759..ada8e843c3d1 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= bash
-PATCHLEVEL= 25
+PATCHLEVEL= 26
PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g}
-PORTREVISION?= 2
+PORTREVISION?= 0
CATEGORIES= shells
MASTER_SITES= GNU
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 60674efb7a6b..15cef48c34e0 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -50,3 +50,5 @@ SHA256 (bash/bash43-024) = 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e6
SIZE (bash/bash43-024) = 1909
SHA256 (bash/bash43-025) = 1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251
SIZE (bash/bash43-025) = 3940
+SHA256 (bash/bash43-026) = 2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796db08724c214d
+SIZE (bash/bash43-026) = 1575
diff --git a/shells/bash/files/patch-parse.y b/shells/bash/files/patch-parse.y
deleted file mode 100644
index 9ff2a82b19e0..000000000000
--- a/shells/bash/files/patch-parse.y
+++ /dev/null
@@ -1,13 +0,0 @@
-http://seclists.org/oss-sec/2014/q3/690
-
-*** ../bash-20140912/parse.y 2014-08-26 15:09:42.000000000 -0400
---- parse.y 2014-09-24 22:47:28.000000000 -0400
-***************
-*** 2959,2962 ****
---- 2959,2964 ----
- word_desc_to_read = (WORD_DESC *)NULL;
-
-+ eol_ungetc_lookahead = 0;
-+
- current_token = '\n'; /* XXX */
- last_read_token = '\n';