Date: Thu, 25 Sep 2014 15:39:29 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r369262 - in branches/2014Q3/shells/bash: . files Message-ID: <201409251539.s8PFdTPJ037435@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Sep 25 15:39:28 2014 New Revision: 369262 URL: http://svnweb.freebsd.org/changeset/ports/369262 QAT: https://qat.redports.org/buildarchive/r369262/ Log: MFH: r369261 Fix CVE-2014-3659. The original fix in 25 was not enough. Obtained from: http://seclists.org/oss-sec/2014/q3/690 (bash developer) Security: CVE-2014-3659 Added: branches/2014Q3/shells/bash/files/patch-parse.y - copied unchanged from r369261, head/shells/bash/files/patch-parse.y Modified: branches/2014Q3/shells/bash/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/shells/bash/Makefile ============================================================================== --- branches/2014Q3/shells/bash/Makefile Thu Sep 25 15:38:56 2014 (r369261) +++ branches/2014Q3/shells/bash/Makefile Thu Sep 25 15:39:28 2014 (r369262) @@ -4,7 +4,7 @@ PORTNAME= bash PATCHLEVEL= 25 PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= shells MASTER_SITES= GNU MASTER_SITE_SUBDIR= ${PORTNAME} @@ -64,6 +64,9 @@ CONFLICTS+= bash-static-[0-9]* .endif post-patch: +# Ensure y.tab.c is regenerated + ${TOUCH} ${WRKSRC}/parse.y + ${RM} ${WRKSRC}/y.tab.c @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1 .if ${PORT_OPTIONS:MSYSLOG} @${REINPLACE_CMD} \ Copied: branches/2014Q3/shells/bash/files/patch-parse.y (from r369261, head/shells/bash/files/patch-parse.y) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/shells/bash/files/patch-parse.y Thu Sep 25 15:39:28 2014 (r369262, copy of r369261, head/shells/bash/files/patch-parse.y) @@ -0,0 +1,13 @@ +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';
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409251539.s8PFdTPJ037435>