Attachment #147678 for bug #193932

View | Details | Raw Unified | Return to bug 193932
Collapse All | Expand All




PORTNAME=		bash
PATCHLEVEL=		25
PORTVERSION=		4.3.${PATCHLEVEL:S/^0//g}
PORTREVISION?=		2
CATEGORIES=		shells
MASTER_SITES=		GNU
MASTER_SITE_SUBDIR=	${PORTNAME}


LICENSE=		GPLv3

OPTIONS_DEFINE=		IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS NOENVFUNC
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
NOENVFUNC_DESC=		Do not parse functions from env vars

USES=			bison cpe makeinfo
OPTIONS_SUB=		yes


IMPLICITCD_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-implicitcd
COLONBREAKSWORDS_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-colonbreakswords
NOENVFUNC_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-noenvfunc

HELP_CONFIGURE_ENABLE=	help-builtin
NLS_CONFIGURE_ENABLE=	nls

Line 0 Link Here

(-)shells/bash/files/extrapatch-noenvfunc (+11 lines)
	1	--- variables.c.orig 2014-09-25 14:35:17.738573512 -0400
	2	+++ variables.c 2014-09-25 14:35:26.723573202 -0400
	3	@@ -349,7 +349,7 @@
	4
	5	/* If exported function, define it now. Don't import functions from
	6	the environment in privileged mode. */
	7	- if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
	8	+ if (0 && privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4))
	9	{
	10	string_length = strlen (string);
	11	temp_string = (char *)xmalloc (3 + string_length + char_index);

Return to bug 193932

Lines 4-10 Link Here

(-)shells/bash/Makefile (-2 / +4 lines)
4	PORTNAME= bash	4	PORTNAME= bash
5	PATCHLEVEL= 25	5	PATCHLEVEL= 25
6	PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g}	6	PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g}
7	PORTREVISION?= 1	7	PORTREVISION?= 2
8	CATEGORIES= shells	8	CATEGORIES= shells
9	MASTER_SITES= GNU	9	MASTER_SITES= GNU
10	MASTER_SITE_SUBDIR= ${PORTNAME}	10	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 24-34 Link Here
24		24
25	LICENSE= GPLv3	25	LICENSE= GPLv3
26		26
27	OPTIONS_DEFINE= IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS	27	OPTIONS_DEFINE= IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS NOENVFUNC
28	OPTIONS_DEFAULT= IMPLICITCD COLONBREAKSWORDS HELP NLS	28	OPTIONS_DEFAULT= IMPLICITCD COLONBREAKSWORDS HELP NLS
29	IMPLICITCD_DESC= Use directory name alone to cd into it	29	IMPLICITCD_DESC= Use directory name alone to cd into it
30	COLONBREAKSWORDS_DESC= Colons break words	30	COLONBREAKSWORDS_DESC= Colons break words
31	HELP_DESC= Enable builtin help	31	HELP_DESC= Enable builtin help
		32	NOENVFUNC_DESC= Do not parse functions from env vars
32		33
33	USES= bison cpe makeinfo	34	USES= bison cpe makeinfo
34	OPTIONS_SUB= yes	35	OPTIONS_SUB= yes
Lines 36-41 Link Here
36		37
37	IMPLICITCD_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-implicitcd	38	IMPLICITCD_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-implicitcd
38	COLONBREAKSWORDS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-colonbreakswords	39	COLONBREAKSWORDS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-colonbreakswords
		40	NOENVFUNC_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-noenvfunc
39		41
40	HELP_CONFIGURE_ENABLE= help-builtin	42	HELP_CONFIGURE_ENABLE= help-builtin
41	NLS_CONFIGURE_ENABLE= nls	43	NLS_CONFIGURE_ENABLE= nls