diff options
| author | christos <christos> | 2014-09-27 02:50:26 +0000 |
|---|---|---|
| committer | christos <christos> | 2014-09-27 02:50:26 +0000 |
| commit | 02480a69f8126b992d6fc6bfc6a41c2d8a5886b1 (patch) | |
| tree | a4e246f7afa94e4f44e455965d415bc3b72d844f /shells | |
| parent | edcdfcc6a62fa0c5021940f75764f25271dee5e4 (diff) | |
| download | pkgsrc-02480a69f8126b992d6fc6bfc6a41c2d8a5886b1.tar.gz | |
use the official version of the parse.y patch.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/bash/Makefile | 7 | ||||
| -rw-r--r-- | shells/bash/distinfo | 6 | ||||
| -rw-r--r-- | shells/bash/patches/patch-parse.y | 17 |
3 files changed, 8 insertions, 22 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 96ddaa743dc..00c2bc33453 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.67 2014/09/25 21:32:33 jmcneill Exp $ +# $NetBSD: Makefile,v 1.68 2014/09/27 02:50:26 christos Exp $ BASH_VERSION= 4.3 -BASH_PATCHLEVEL= 025 +BASH_PATCHLEVEL= 026 DISTNAME= bash-${BASH_VERSION} PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} -PKGREVISION= 2 +PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \ ftp://ftp.cwru.edu/pub/bash/ @@ -16,6 +16,7 @@ PATCHFILES+= bash43-006 bash43-007 bash43-008 bash43-009 bash43-010 PATCHFILES+= bash43-011 bash43-012 bash43-013 bash43-014 bash43-015 PATCHFILES+= bash43-016 bash43-017 bash43-018 bash43-019 bash43-020 PATCHFILES+= bash43-021 bash43-022 bash43-023 bash43-024 bash43-025 +PATCHFILES+= bash43-026 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/bash/bash.html diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 47bad9022d5..fa9853010b4 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2014/09/25 20:28:32 christos Exp $ +$NetBSD: distinfo,v 1.34 2014/09/27 02:50:26 christos Exp $ SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84 RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845 @@ -78,11 +78,13 @@ Size (bash43-024) = 1909 bytes SHA1 (bash43-025) = 484d85e54547a18f9702284c55145e34e74768d1 RMD160 (bash43-025) = 9fd51a95756fcaf9b57cab9c29d6e3f6e3b900fe Size (bash43-025) = 3940 bytes +SHA1 (bash43-026) = ddfe741f358fb6ff0182d7d1eb6b36aabe0598b7 +RMD160 (bash43-026) = bec0d5846a592fee0b62b02713b8d9c908c02edb +Size (bash43-026) = 1575 bytes SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb SHA1 (patch-lib_readline_colors.c) = f2f47e7aa0b5c1e999368109de10f80e39fd4438 -SHA1 (patch-parse.y) = 41c747ef8095b43c6b077a3fab54105d338f156e SHA1 (patch-shell.c) = 08e55c3fa57a9e8eb6366c4eba91aa70f487acb2 SHA1 (patch-variables.c) = 9fa0c4fc7650581b23d4fa768a0c76757a8874aa diff --git a/shells/bash/patches/patch-parse.y b/shells/bash/patches/patch-parse.y deleted file mode 100644 index a9bae586848..00000000000 --- a/shells/bash/patches/patch-parse.y +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-parse.y,v 1.1 2014/09/25 14:02:34 tron Exp $ - -Fix for CVE-2014-7169 taken from here: - -http://www.openwall.com/lists/oss-security/2014/09/25/10 - ---- parse.y.orig 2014-09-25 14:24:07.000000000 +0100 -+++ parse.y 2014-09-25 14:25:05.000000000 +0100 -@@ -2953,6 +2953,8 @@ - FREE (word_desc_to_read); - word_desc_to_read = (WORD_DESC *)NULL; - -+ eol_ungetc_lookahead = 0; -+ - current_token = '\n'; /* XXX */ - last_read_token = '\n'; - token_to_read = '\n'; |