Index: branches/2014Q4/shells/bash/Makefile =================================================================== --- branches/2014Q4/shells/bash/Makefile (revision 369784) +++ branches/2014Q4/shells/bash/Makefile (revision 369785) @@ -1,124 +1,124 @@ # Created by: Oliver Eikemeier # $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} DISTNAME= ${PORTNAME}-${PORTVERSION:R} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PATCH_SITES= ${MASTER_SITE_GNU} \ ftp://ftp.cwru.edu/pub/%SUBDIR%/ PATCH_SITE_SUBDIR= ${PORTNAME}/${DISTNAME}-patches/ PATCHFILES!= /usr/bin/jot -s " " -w \ ${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \ ${PATCHLEVEL} 1 ${PATCHLEVEL} MAINTAINER= ehaupt@FreeBSD.org COMMENT= The GNU Project's Bourne Again SHell LICENSE= GPLv3 OPTIONS_DEFINE= IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS OPTIONS_DEFINE+= IMPORTFUNCTIONS OPTIONS_DEFAULT= IMPLICITCD COLONBREAKSWORDS HELP NLS IMPLICITCD_DESC= Use directory name alone to cd into it COLONBREAKSWORDS_DESC= Colons break words HELP_DESC= Enable builtin help IMPORTFUNCTIONS_DESC= Import function from env without --import-functions USES= bison cpe makeinfo OPTIONS_SUB= yes CPE_VENDOR= gnu IMPLICITCD_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-implicitcd COLONBREAKSWORDS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-colonbreakswords # Always apply this for now. The option will modify the default. EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-import-functions HELP_CONFIGURE_ENABLE= help-builtin NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext iconv INFO= bash GNU_CONFIGURE= yes PORTDOCS= FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README \ bash.html bashref.html CONFIGURE_ARGS+= --without-bash-malloc \ --disable-rpath \ --enable-disabled-builtins .include .if ${PORT_OPTIONS:MIMPORTFUNCTIONS} CFLAGS+= -DIMPORT_FUNCTIONS_DEF=1 .else CFLAGS+= -DIMPORT_FUNCTIONS_DEF=0 .endif .if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no") CONFIGURE_ARGS+= --enable-static-link PKGNAMESUFFIX= -static CONFLICTS+= bash-[0-9]* .else CONFIGURE_ARGS+= --disable-static-link 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} \ -e "s|/\*.*#define SYSLOG_HISTORY .*\*/|#define SYSLOG_HISTORY|g" \ ${WRKSRC}/config-top.h .endif .if empty(PORT_OPTIONS:MNLS) @${REINPLACE_CMD} -e "s|@LIBICONV@||g" ${WRKSRC}/Makefile.in .endif post-configure: @${FIND} ${WRKSRC} -name Makefile -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" .if empty(PORT_OPTIONS:MNLS) @${REINPLACE_CMD} -e "s|#define HAVE_ICONV 1|#undef HAVE_ICONV|g" \ ${WRKSRC}/config.h .endif pre-build: @${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build post-install: ${LN} -sf bash ${STAGEDIR}${PREFIX}/bin/rbash @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/FAQ \ ${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR} for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \ ${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \ done regress: build cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test ckp: ${MAKE} -DPATCH_DEBUG clean patch # requires ftp/ncftp3 cklatest: @${ECHO} -n "Currently at: " @${MAKE} -V PATCHLEVEL -ncftpls \ ftp://ftp.cwru.edu/pub/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/\.[0-9a-z]*$//}-patches/ \ | fgrep -v .sig | ${TAIL} .include Index: branches/2014Q4/shells/bash/distinfo =================================================================== --- branches/2014Q4/shells/bash/distinfo (revision 369784) +++ branches/2014Q4/shells/bash/distinfo (revision 369785) @@ -1,56 +1,58 @@ SHA256 (bash/bash-4.3.tar.gz) = afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SIZE (bash/bash-4.3.tar.gz) = 7955839 SHA256 (bash/bash43-001) = ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 SIZE (bash/bash43-001) = 1617 SHA256 (bash/bash43-002) = eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b SIZE (bash/bash43-002) = 1594 SHA256 (bash/bash43-003) = 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d SIZE (bash/bash43-003) = 1465 SHA256 (bash/bash43-004) = 5ea0a42c6506720d26e6d3c5c358e9a0d49f6f189d69a8ed34d5935964821338 SIZE (bash/bash43-004) = 1534 SHA256 (bash/bash43-005) = 1ac83044032b9f5f11aeca8a344ae3c524ec2156185d3adbb8ad3e7a165aa3fa SIZE (bash/bash43-005) = 2636 SHA256 (bash/bash43-006) = a0648ee72d15e4a90c8b77a5c6b19f8d89e28c1bc881657d22fe26825f040213 SIZE (bash/bash43-006) = 1445 SHA256 (bash/bash43-007) = 1113e321c59cf6a8648a36245bbe4217cf8acf948d71e67886dad7d486f8f3a3 SIZE (bash/bash43-007) = 1331 SHA256 (bash/bash43-008) = 9941a98a4987192cc5ce3d45afe879983cad2f0bec96d441a4edd9033767f95e SIZE (bash/bash43-008) = 4575 SHA256 (bash/bash43-009) = c0226d6728946b2f53cdebf090bcd1c01627f01fee03295768605caa80bb40a5 SIZE (bash/bash43-009) = 2413 SHA256 (bash/bash43-010) = ce05799c0137314c70c7b6ea0477c90e1ac1d52e113344be8e32fa5a55c9f0b7 SIZE (bash/bash43-010) = 5357 SHA256 (bash/bash43-011) = 7c63402cdbc004a210f6c1c527b63b13d8bb9ec9c5a43d5c464a9010ff6f7f3b SIZE (bash/bash43-011) = 1533 SHA256 (bash/bash43-012) = 3e1379030b35fbcf314e9e7954538cf4b43be1507142b29efae39eef997b8c12 SIZE (bash/bash43-012) = 1365 SHA256 (bash/bash43-013) = bfa8ca5336ab1f5ef988434a4bdedf71604aa8a3659636afa2ce7c7446c42c79 SIZE (bash/bash43-013) = 2151 SHA256 (bash/bash43-014) = 5a4d6fa2365b6eb725a9d4966248b5edf7630a4aeb3fa8d526b877972658ac13 SIZE (bash/bash43-014) = 3533 SHA256 (bash/bash43-015) = 13293e8a24e003a44d7fe928c6b1e07b444511bed2d9406407e006df28355e8d SIZE (bash/bash43-015) = 1894 SHA256 (bash/bash43-016) = 92d60bcf49f61bd7f1ccb9602bead6f2c9946d79dea0e5ec0589bb3bfa5e0773 SIZE (bash/bash43-016) = 3674 SHA256 (bash/bash43-017) = 1267c25c6b5ba57042a7bb6c569a6de02ffd0d29530489a16666c3b8a23e7780 SIZE (bash/bash43-017) = 1565 SHA256 (bash/bash43-018) = 7aa8b40a9e973931719d8cc72284a8fb3292b71b522db57a5a79052f021a3d58 SIZE (bash/bash43-018) = 1315 SHA256 (bash/bash43-019) = a7a91475228015d676cafa86d2d7aa9c5d2139aa51485b6bbdebfdfbcf0d2d23 SIZE (bash/bash43-019) = 2610 SHA256 (bash/bash43-020) = ca5e86d87f178128641fe91f2f094875b8c1eb2de9e0d2e9154f5d5cc0336c98 SIZE (bash/bash43-020) = 2777 SHA256 (bash/bash43-021) = 41439f06883e6bd11c591d9d5e9ae08afbc2abd4b935e1d244b08100076520a9 SIZE (bash/bash43-021) = 1623 SHA256 (bash/bash43-022) = fd4d47bb95c65863f634c4706c65e1e3bae4ee8460c72045c0a0618689061a88 SIZE (bash/bash43-022) = 1782 SHA256 (bash/bash43-023) = 9ac250c7397a8f53dbc84dfe790d2a418fbf1fe090bcece39b4a5c84a2d300d4 SIZE (bash/bash43-023) = 3414 SHA256 (bash/bash43-024) = 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e622d3f960f6c 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 SHA256 (bash/bash43-027) = 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe SIZE (bash/bash43-027) = 6889 +SHA256 (bash/bash43-028) = e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d +SIZE (bash/bash43-028) = 69606 Index: branches/2014Q4/shells/bash/files/patch-parse.y =================================================================== --- branches/2014Q4/shells/bash/files/patch-parse.y (revision 369784) +++ branches/2014Q4/shells/bash/files/patch-parse.y (nonexistent) @@ -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; Property changes on: branches/2014Q4/shells/bash/files/patch-parse.y ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2014Q4 =================================================================== --- branches/2014Q4 (revision 369784) +++ branches/2014Q4 (revision 369785) Property changes on: branches/2014Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r369784