diff options
| -rw-r--r-- | shells/bash/Makefile | 6 | ||||
| -rw-r--r-- | shells/bash/distinfo | 3 | ||||
| -rw-r--r-- | shells/bash/patches/patch-parse.y | 17 |
3 files changed, 24 insertions, 2 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile index cd9872a943f..5b79a22fd22 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.61.4.1 2014/09/25 09:02:06 spz Exp $ +# $NetBSD: Makefile,v 1.61.4.2 2014/09/25 18:08:56 spz Exp $ BASH_VERSION= 4.3 BASH_PATCHLEVEL= 025 DISTNAME= bash-${BASH_VERSION} PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} +PKGREVISION= 1 CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \ ftp://ftp.cwru.edu/pub/bash/ @@ -102,6 +103,9 @@ CONFIGURE_ENV+= bash_cv_func_ctype_nonascii=yes CONFIGURE_ENV+= bash_cv_wexitstatus_offset=8 .endif +pre-configure: + ${RM} -f ${WRKSRC}/y.tab.c + post-install: ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 diff --git a/shells/bash/distinfo b/shells/bash/distinfo index 110ae02cf76..d9f0ee6d5dc 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29.4.1 2014/09/25 09:02:06 spz Exp $ +$NetBSD: distinfo,v 1.29.4.2 2014/09/25 18:08:56 spz Exp $ SHA1 (bash-4.3.tar.gz) = 45ac3c5727e7262334f4dfadecdf601b39434e84 RMD160 (bash-4.3.tar.gz) = cd21a9f51ea7780994d4e2c9c7d16d5eb000f845 @@ -82,3 +82,4 @@ SHA1 (patch-af) = dfd1d1be3d822cfc3ae0fd21bb2bbd3e35b11f0d SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48 SHA1 (patch-aj) = 8b3c52c2aee9cf53ee5a9ce64ead243d0970305e SHA1 (patch-builtins_ulimit.def) = d4cb59bedc6a6199f9a99a3530c99374e428baeb +SHA1 (patch-parse.y) = 41c747ef8095b43c6b077a3fab54105d338f156e diff --git a/shells/bash/patches/patch-parse.y b/shells/bash/patches/patch-parse.y new file mode 100644 index 00000000000..3c9ad955bbc --- /dev/null +++ b/shells/bash/patches/patch-parse.y @@ -0,0 +1,17 @@ +$NetBSD: patch-parse.y,v 1.1.2.2 2014/09/25 18:08:56 spz 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'; |