Attachment #140574 for bug #187206

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




# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
# $FreeBSD$

PORTNAME=			bash
PATCHLEVEL=			0
PORTVERSION=		4.3.${PATCHLEVEL:S/^0//g}
PORTREVISION?=		0
CATEGORIES=			shells
MASTER_SITES=		GNU
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=			${PORTNAME}-${PORTVERSION:R}
DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
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


OPTIONS_DEFINE=	IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS
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

USES=			bison
OPTIONS_SUB=	yes

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

HELP_CONFIGURE_ENABLE=	help-builtin
NLS_CONFIGURE_ENABLE=	nls
NLS_USES=				gettext iconv

INFO=	bash
EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-colonbreakswords
.endif

INFO=			bash

MAKE_JOBS_UNSAFE=	yes
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 <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
CONFIGURE_ARGS+=	--enable-static-link
PKGNAMESUFFIX=		-static-devel
CONFLICTS+=		bash-[0-9]* bash-static-[0-9]* bash-devel-[0-9]*
.else
CONFIGURE_ARGS+=	--disable-static-link
PKGNAMESUFFIX=		-devel
CONFLICTS+=		bash-static-[0-9]* bash-[0-9]* bash-static-devel-[0-9]*
.endif

.if empty(PORT_OPTIONS:MHELP)
CONFIGURE_ARGS+=	--disable-help-builtin
.endif

.if empty(PORT_OPTIONS:MNLS)
CONFIGURE_ARGS+=	--disable-nls
PLIST_SUB+=		NLS="@comment "
.else
USES+=			gettext iconv
PLIST_SUB+=		NLS=""
.endif

CPPFLAGS+=		${PTHREAD_CFLAGS} \
			-I${LOCALBASE}/include
LDFLAGS+=		-L${LOCALBASE}/lib

CONFIGURE_ENV=		YACC="bison -y" \
			bash_cv_dev_fd=absent


post-patch:
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
.if ${PORT_OPTIONS:MSYSLOG}

	@${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





SHA256 (bash/bash-4.3.tar.gz) = afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4
SIZE (bash/bash-4.3.tar.gz) = 7955839
SHA256 (bash/bash42-001) = 8d6ca028576c4af23e660a2fbc2112221a11c8a785c0b37f033967e5cd12b47a
SIZE (bash/bash42-001) = 2944
SHA256 (bash/bash42-002) = febac927e199aceeba2004908d971d4afb49b521796c3f42d1166f9fbbfbcef9
SIZE (bash/bash42-002) = 1780
SHA256 (bash/bash42-003) = 5a0a7c15018c87348ea87cb0beea14345faf878dbb0e25c17fa70677194cb4cd
SIZE (bash/bash42-003) = 6896
SHA256 (bash/bash42-004) = 4e34b0f830d2583d56e14225a66937abc81f45bbafcd2eb49daf61c9462140c1
SIZE (bash/bash42-004) = 1686
SHA256 (bash/bash42-005) = a81749e73004b81cfdf0fe075bec365dc1fef756ee5e3fd142821e317d1459a0
SIZE (bash/bash42-005) = 3424
SHA256 (bash/bash42-006) = c91148945a2ddafa792682d7c8668c59e7e645eae1334b15b0d5d9ad22634bd1
SIZE (bash/bash42-006) = 1187
SHA256 (bash/bash42-007) = 405826acf443dd1084f236a15cb76d7f0ee2dbe5edff45c5fb836db571fb7e95
SIZE (bash/bash42-007) = 1394
SHA256 (bash/bash42-008) = 23080d11a60a78941210e2477f6bca066b45db03defa60da86fd765107ba2437
SIZE (bash/bash42-008) = 2164
SHA256 (bash/bash42-009) = e7ed5440b4c19765786e90e4f1ded43195d38b3e4d1c4b39fcc23de9a74ccb20
SIZE (bash/bash42-009) = 2384
SHA256 (bash/bash42-010) = acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc
SIZE (bash/bash42-010) = 1818
SHA256 (bash/bash42-011) = a491ae359a7ebbd7321aede561728289d71e1fc84777f402766a8afd4d261532
SIZE (bash/bash42-011) = 1426
SHA256 (bash/bash42-012) = 354433f1d2da02f1b9652cd20a5b85bbfb5bc2aaf79c42461ebd929d89b9b7b8
SIZE (bash/bash42-012) = 4247
SHA256 (bash/bash42-013) = 3412c5c6cbbce6c88592604aec054d8182ce64410038b5ecea69fc3968cf85ea
SIZE (bash/bash42-013) = 1340
SHA256 (bash/bash42-014) = b5a678e609858532735f94faedb5fabce00dfd6577a4e9ec5eec85fe682c8b33
SIZE (bash/bash42-014) = 1434
SHA256 (bash/bash42-015) = 2d876a8304bdf3d664e87e0a8d73bc4ccc100a9dd8c0d054e8649472d8748a98
SIZE (bash/bash42-015) = 1991
SHA256 (bash/bash42-016) = 2895ccbcf7fc98da73a8fa3ba7440aaf2bfaef6c0af8bdd3a9c39403cf03e2a6
SIZE (bash/bash42-016) = 1410
SHA256 (bash/bash42-017) = 73552444498c761d6073dd67ccfe043b36ef24bb418c266d91d9750884daee7f
SIZE (bash/bash42-017) = 1399
SHA256 (bash/bash42-018) = e2a9457172370d454d31b84bbcba758ee6394316dbe755374553b52aadbb494d
SIZE (bash/bash42-018) = 1929
SHA256 (bash/bash42-019) = a8b7cd02207656976016d93cab48e073cb5da002ceb27b7a63fc5ea62007eb56
SIZE (bash/bash42-019) = 1415
SHA256 (bash/bash42-020) = 494773f0d0078cb35372d24caa523b00d8fdbbaed71e41dc14c9e47579da3c6f
SIZE (bash/bash42-020) = 1825
SHA256 (bash/bash42-021) = a887a97be226575ecf483be2c76655bd6d1edde1cdfe199c27bd2e6baf32badc
SIZE (bash/bash42-021) = 1532
SHA256 (bash/bash42-022) = 9dcdf69df7f8cd2ba88d18c45a0d8f55fbe4f0e273411179db94dd6198b85c6b
SIZE (bash/bash42-022) = 1395
SHA256 (bash/bash42-023) = 5dc11394f1a6c887373c081396efd4f4cc04492696722c57a4811c207965f0bf
SIZE (bash/bash42-023) = 1699
SHA256 (bash/bash42-024) = 99c826bdd33bee281d0a9191550d62a24d0b256cd41c90afd10abd63a66b99e6
SIZE (bash/bash42-024) = 1363
SHA256 (bash/bash42-025) = 0db0646fd7a559d5702911192bdd387acbbc61cf3c29a34007c3ec840e275515
SIZE (bash/bash42-025) = 3969
SHA256 (bash/bash42-026) = e7e90cfaabbce3b4b9c699994e9d9ea4a2f084fd9f37788a80b0b70b47d323d2
SIZE (bash/bash42-026) = 1577
SHA256 (bash/bash42-027) = 0c1f6b7256fcc17f42c05f9bbb4138f8e8bb67e79c622c3485711b6f37f7ed42
SIZE (bash/bash42-027) = 1461
SHA256 (bash/bash42-028) = 204226de39ba81aaf3dd5a29cd59de052ec9f648538bb9e7f1c8150852b1ed7a
SIZE (bash/bash42-028) = 1834
SHA256 (bash/bash42-029) = d0b08c0817bc5acdb28b466727622a8422ca4d61188313cf162443b7f338f581
SIZE (bash/bash42-029) = 16812
SHA256 (bash/bash42-030) = 12594366591a136d8ccdcb8e218010f2ddab6be28a7f96d0ed32ca927e44afae
SIZE (bash/bash42-030) = 5046
SHA256 (bash/bash42-031) = 55f38c4d34775fbb063510c4222b195d998dd86f88288b64a6103e3812f8d9f9
SIZE (bash/bash42-031) = 2047
SHA256 (bash/bash42-032) = e3a8b563dbb1e5cb7ca85a53515da8b2941213973496d48c4cc5a11c604791ed
SIZE (bash/bash42-032) = 2416
SHA256 (bash/bash42-033) = f5d12790d69fdfb2f47ac86fa1ea1ecc088880141570273f38dfd3fa4a46434b
SIZE (bash/bash42-033) = 1634
SHA256 (bash/bash42-034) = 01c1f332101389cedf347c7736102966722a3b213900954e5d625bbc2f1e41b8
SIZE (bash/bash42-034) = 1345
SHA256 (bash/bash42-035) = cecde463b038b4849635ff0993d9b264fc92403e7ae0accb52c7877aeaed78df
SIZE (bash/bash42-035) = 1920
SHA256 (bash/bash42-036) = fe293a1bc92ac4d272ae9b9a0de3afef7c06145a2b52337a09cacccc5305aafa
SIZE (bash/bash42-036) = 3123
SHA256 (bash/bash42-037) = c7578cddd3bb2430689c740f58a03403800726dcd1268b28f91bf37f368e1674
SIZE (bash/bash42-037) = 3483
SHA256 (bash/bash42-038) = b8c9a81bdf206be58ba491dfad80373b3348af769e80aaf72f7611ddbbbe6d57
SIZE (bash/bash42-038) = 1290
SHA256 (bash/bash42-039) = f4f9300a60321a5088ae9e54052a64c4d3e876f9a3a17ca104d58fa38b9c1791
SIZE (bash/bash42-039) = 1603
SHA256 (bash/bash42-040) = b265f9caf3c7321f95bc8e0b9e2c46bd86c226f00f05e823699aafb83c4aaa6c
SIZE (bash/bash42-040) = 1710
SHA256 (bash/bash42-041) = 05cc1951bd9f6624088dd6067486ff47f1825e333273d7df5f1b06b23baaf5eb
SIZE (bash/bash42-041) = 1463
SHA256 (bash/bash42-042) = faaa5c1f456517b258b2a65eaa664dd6a01eeff73c8ca4447c3a6de371bbf304
SIZE (bash/bash42-042) = 1571
SHA256 (bash/bash42-043) = dc2683840f3e890a9c5f85338366ff6cd923285e558eb46aa818a03fa67c5c57
SIZE (bash/bash42-043) = 2110
SHA256 (bash/bash42-044) = 10d32d6c9ccdedb1d826f46468631d475f9dcf983fac087766e16df7b99766e6
SIZE (bash/bash42-044) = 1871
SHA256 (bash/bash42-045) = ddb7eff0f59d394a483b09feec3771d9026f81ba90afac32846a19b172b2986d
SIZE (bash/bash42-045) = 1572




--- bashline.c.orig	2014-03-02 13:26:23.000000000 -0500
+++ bashline.c	2014-03-02 13:30:09.000000000 -0500
@@ -255,6 +255,11 @@
    host list. */
 int perform_hostname_completion = 1;
 

 /* If non-zero, we don't do command completion on an empty line. */
 int no_empty_command_completion;
 
@@ -284,7 +289,8 @@
 
 static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
 static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";

 
 static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
 static char *custom_filename_quote_characters = 0;
@@ -403,6 +409,80 @@
   return (old_value);
 }
 

+  else
+    {
+      colon_is_wordbreak = 0;
+      rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!{~";   /*}*/
+    }
+
+  /* Now we need to figure out how to appropriately modify and assign

+     allocate new memory for rl_completer_word_break_characters. */
+
+  if (bash_readline_initialized == 0 &&
+      (rl_completer_word_break_characters == 0 ||
+       rl_completer_word_break_characters == rl_basic_word_break_characters))
+    {
+      if (on_or_off)
+       rl_completer_word_break_characters = savestring (bash_completer_word_break_characters);
+      else
+       rl_completer_word_break_characters = savestring (bash_nocolon_word_break_characters);
+    }
+  else
+    {

+      nval = (char *)xmalloc (strlen (rl_completer_word_break_characters) + 1 + on_or_off);
+
+      if (on_or_off == 0)
+       {
+         /* Turn it off -- just remove `:' from word break chars.  We want
+            to remove all occurrences of `:' from the char list, so we loop
+            rather than just copy the rest of the list over AT. */
+         for (nv = nval, at = rl_completer_word_break_characters; *at; )
+           if (*at != ':')
+             *nv++ = *at++;
+           else
+             at++;
+         *nv = '\0';
+       }
+      else
+       {
+         nval[0] = ':';
+         strcpy (nval + 1, rl_completer_word_break_characters);
+        }
+
+      free (rl_completer_word_break_characters);

 /* Called once from parse.y if we are going to use readline. */
 void
 initialize_readline ()
@@ -573,8 +653,13 @@
      completion is enabled. */
   enable_hostname_completion (perform_hostname_completion);
 

   /* characters that need to be quoted when appearing in filenames. */
-  rl_filename_quote_characters = default_filename_quote_characters;
+//  rl_filename_quote_characters = default_filename_quote_characters;
   set_filename_bstab (rl_filename_quote_characters);
 
   rl_filename_quoting_function = bash_quote_filename;
--- builtins/shopt.def.orig	2014-03-02 13:30:44.000000000 -0500
+++ builtins/shopt.def	2014-03-02 13:31:38.000000000 -0500
@@ -103,6 +103,8 @@
 extern int complete_fullquote;
 extern int dircomplete_spelling;
 
 extern int enable_hostname_completion __P((int));
+extern int colon_is_wordbreak;

 #endif
 
 #if defined (PROGRAMMABLE_COMPLETION)
@@ -166,6 +168,9 @@
   { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
   { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
 #endif
+#if defined (READLINE)

   { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
   { "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },
   { "expand_aliases", &expand_aliases, (shopt_set_func_t *)NULL },
--- doc/bash.1.orig	2014-03-02 13:32:14.000000000 -0500
+++ doc/bash.1	2014-03-02 13:32:40.000000000 -0500
@@ -9252,6 +9252,18 @@
 command in the same history entry.  This allows
 easy re-editing of multi-line commands.
 .TP 8

 .B compat31
 If set,
 .B bash
--- doc/bashref.texi.orig	2014-03-02 13:33:17.000000000 -0500
+++ doc/bashref.texi	2014-03-02 13:33:44.000000000 -0500
@@ -4937,6 +4937,11 @@
 command in the same history entry.  This allows
 easy re-editing of multi-line commands.
 

+separating word being completed (@pxref{Commands For Completion}).
+This option is enabled by default.
+
 @item compat31
 If set, Bash
 changes its behavior to that of version 3.1 with respect to quoted




--- execute_cmd.c.orig	2014-03-02 13:15:12.000000000 -0500
+++ execute_cmd.c	2014-03-02 13:17:14.000000000 -0500
@@ -199,6 +199,9 @@
#
--- execute_cmd.c.orig	Sat Nov  5 17:37:21 2005
+++ execute_cmd.c	Wed Dec 28 19:38:09 2005
@@ -190,6 +190,9 @@
 /* The line number that the currently executing function starts on. */
 static int function_line_number;
 
 static int execute_intern_function __P((WORD_DESC *, FUNCTION_DEF *));
 
+/* add an implicit `cd' if the command is the name of a directory */
+int implicitcd = 0;
+

 /* Set to 1 if fd 0 was the subject of redirection to a subshell.  Global
    so that reader_loop can set it to zero before executing a command. */
 int stdin_redir;
@@ -4111,6 +4114,20 @@
   this_command_name = words->word->word;
 
   QUIT;
 
+  if (implicitcd && interactive_shell && words->next == NULL && func == 0 && builtin == 0)
+    {
+      struct stat finfo;
+
+      if ((stat (words->word->word, &finfo) == 0) && (S_ISDIR (finfo.st_mode)))
+       {
+         this_command_name = "cd";
+         last_shell_builtin = this_shell_builtin;
+         this_shell_builtin = builtin_address (this_command_name);
+         result = (*this_shell_builtin) (words);
+         goto return_result;
+       }
+    }
+
   /* This command could be a shell builtin or a user-defined function.
      We have already found special builtins by this time, so we do not
      set builtin_is_special.  If this is a function or builtin, and we
--- builtins/shopt.def.orig	2014-03-02 13:18:07.000000000 -0500
+++ builtins/shopt.def	2014-03-02 13:19:22.000000000 -0500
@@ -83,6 +83,7 @@
 extern int check_window_size;
 extern int glob_ignore_case, match_ignore_case;
 extern int hup_on_exit;

+extern int implicitcd;
 extern int xpg_echo;
 extern int gnu_error_format;
 extern int check_jobs_at_exit;
@@ -192,6 +193,7 @@
   { "hostcomplete", &perform_hostname_completion, shopt_enable_hostname_completion },
 #endif
   { "huponexit", &hup_on_exit, (shopt_set_func_t *)NULL },
+  { "implicitcd", &implicitcd, (shopt_set_func_t *)NULL },
   { "interactive_comments", &interactive_comments, set_shellopts_after_change },
   { "lastpipe", &lastpipe_opt, (shopt_set_func_t *)NULL },
 #if defined (HISTORY)
@@ -305,6 +307,7 @@
@@ -253,6 +255,7 @@
   cdable_vars = mail_warning = 0;
   no_exit_on_failed_exec = print_shift_error = 0;
   check_hashed_filenames = cdspelling = expand_aliases = 0;
+  implicitcd = 0;
 
   source_uses_path = promptvars = 1;
 
--- doc/bash.1.orig	2014-03-02 13:19:59.000000000 -0500
+++ doc/bash.1	2014-03-02 13:21:10.000000000 -0500
@@ -9480,6 +9480,15 @@
 .B SIGHUP
 to all jobs when an interactive login shell exits.
 .TP 8

 .B interactive_comments
 If set, allow a word beginning with
 .B #
--- doc/bashref.texi.orig	2014-03-02 13:21:54.000000000 -0500
+++ doc/bashref.texi	2014-03-02 13:22:31.000000000 -0500
@@ -5118,6 +5118,15 @@
 If set, Bash will send @code{SIGHUP} to all jobs when an interactive
 login shell exits (@pxref{Signals}).
 

Lines 1-10 Link Here

(-)files/patch-config-top.h (-4 / +4 lines)
1	--- config-top.h.orig Wed Dec 28 19:52:23 2005	1	--- config-top.h.orig 2014-03-02 13:36:24.000000000 -0500
2	+++ config-top.h Wed Dec 28 19:54:12 2005	2	+++ config-top.h 2014-03-02 13:38:13.000000000 -0500
3	@@ -52,18 +52,18 @@	3	@@ -59,18 +59,18 @@
4	/* The default value of the PATH variable. */	4	/* The default value of the PATH variable. */
5	#ifndef DEFAULT_PATH_VALUE	5	#ifndef DEFAULT_PATH_VALUE
6	#define DEFAULT_PATH_VALUE \	6	#define DEFAULT_PATH_VALUE \
7	- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."	7	- "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:."
8	+ "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin"	8	+ "/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin"
9	#endif	9	#endif
10		10




--- doc/Makefile.in.orig	2014-03-02 13:39:04.000000000 -0500
+++ doc/Makefile.in	2014-03-02 13:39:56.000000000 -0500
@@ -167,7 +167,7 @@
 bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
 	${SET_TEXINPUTS} $(TEXI2DVI) $(srcdir)/bashref.texi || { ${RM} $@ ; exit 1; }
 
-bashref.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
+bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
 	$(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
 
 # can also use:
@@ -175,9 +175,6 @@
 bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
 	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
 
-bash.info: bashref.info
-	${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
-
 bash.txt: bash.1
 bash.ps: bash.1
 bash.html: bash.1 $(MAN2HTML)




--- doc/bashref.texi.orig	2014-03-02 13:40:51.000000000 -0500
+++ doc/bashref.texi	2014-03-02 13:42:04.000000000 -0500
@@ -1,6 +1,6 @@
 \input texinfo.tex @c -*- texinfo -*-
 @c %**start of header

-@setfilename bashref.info
+@setfilename bash.info
 @settitle Bash Reference Manual
 @c %**end of header
 
 @include version.texi
@@ -8,7 +8,7 @@
 
 @copying
 This text is a brief description of the features that are present in

 
 This is Edition @value{EDITION}, last updated @value{UPDATED},
 of @cite{The GNU Bash Reference Manual},
@@ -5299,7 +5299,7 @@
 
 
 @item PS1
-The primary prompt string.  The default value is @samp{\s-\v\$ }.
+The primary prompt string.  The default value is @samp{[\u@@\h \w]\$ }.
 @xref{Controlling the Prompt}, for the complete list of escape
 sequences that are expanded before @env{PS1} is displayed.
 

Return to bug 187206

Lines 1-15 Link Here

(-)Makefile (-46 / +25 lines)
1	# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>	1	# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= bash	4	PORTNAME= bash
5	PATCHLEVEL= 45	5	PATCHLEVEL= 0
6	PORTVERSION= 4.2.${PATCHLEVEL:S/^0//g}	6	PORTVERSION= 4.3.${PATCHLEVEL:S/^0//g}
7	PORTREVISION?= 2	7	PORTREVISION?= 0
8	CATEGORIES= shells	8	CATEGORIES= shells
9	MASTER_SITES= GNU	9	MASTER_SITES= GNU
10	MASTER_SITE_SUBDIR= ${PORTNAME}	10	MASTER_SITE_SUBDIR= ${PORTNAME}
11	DISTNAME= ${PORTNAME}-${PORTVERSION:R}	11	DISTNAME= ${PORTNAME}-${PORTVERSION:R}
12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
13	DIST_SUBDIR= ${PORTNAME}	12	DIST_SUBDIR= ${PORTNAME}
14	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	13	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
15		14
Lines 16-24 Link Here
16	PATCH_SITES= ${MASTER_SITE_GNU} \	15	PATCH_SITES= ${MASTER_SITE_GNU} \
17	ftp://ftp.cwru.edu/pub/%SUBDIR%/	16	ftp://ftp.cwru.edu/pub/%SUBDIR%/
18	PATCH_SITE_SUBDIR= ${PORTNAME}/${DISTNAME}-patches/	17	PATCH_SITE_SUBDIR= ${PORTNAME}/${DISTNAME}-patches/
19	PATCHFILES!= /usr/bin/jot -s " " -w \	18	#PATCHFILES!= /usr/bin/jot -s " " -w \
20	${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \	19	# ${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
21	${PATCHLEVEL} 1 ${PATCHLEVEL}	20	# ${PATCHLEVEL} 1 ${PATCHLEVEL}
22		21
23	MAINTAINER= ehaupt@FreeBSD.org	22	MAINTAINER= ehaupt@FreeBSD.org
24	COMMENT= The GNU Project's Bourne Again SHell	23	COMMENT= The GNU Project's Bourne Again SHell
Lines 27-89 Link Here
27		26
28	OPTIONS_DEFINE= IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS	27	OPTIONS_DEFINE= IMPLICITCD COLONBREAKSWORDS HELP NLS STATIC SYSLOG DOCS
29	OPTIONS_DEFAULT=IMPLICITCD COLONBREAKSWORDS HELP NLS	28	OPTIONS_DEFAULT=IMPLICITCD COLONBREAKSWORDS HELP NLS
30	IMPLICITCD_DESC= Use directory name alone to cd into it	29	IMPLICITCD_DESC=Use directory name alone to cd into it
31	COLONBREAKSWORDS_DESC= Colons break words	30	COLONBREAKSWORDS_DESC= Colons break words
32	HELP_DESC= Enable builtin help	31	HELP_DESC= Enable builtin help
33		32
34	USES= bison	33	USES= bison
		34	OPTIONS_SUB= yes
35		35
36	.include <bsd.port.options.mk>	36	IMPLICITCD_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-implicitcd
		37	COLONBREAKSWORDS_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-colonbreakswords
37		38
38	.if ${PORT_OPTIONS:MIMPLICITCD}	39	HELP_CONFIGURE_ENABLE= help-builtin
39	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-implicitcd	40	NLS_CONFIGURE_ENABLE= nls
40	.endif	41	NLS_USES= gettext iconv
41		42
42	.if ${PORT_OPTIONS:MCOLONBREAKSWORDS}	43	INFO= bash
43	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-colonbreakswords
44	.endif
45		44
46	INFO= bash
47
48	MAKE_JOBS_UNSAFE= yes	45	MAKE_JOBS_UNSAFE= yes
49	GNU_CONFIGURE= yes	46	GNU_CONFIGURE= yes
50		47
51	PORTDOCS= FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH	48	PORTDOCS= FAQ INTRO CHANGES COMPAT NEWS POSIX RBASH README bash.html bashref.html
52		49
53	CONFIGURE_ARGS= --without-bash-malloc \	50	CONFIGURE_ARGS+= --without-bash-malloc \
54	--disable-rpath \	51	--disable-rpath \
55	--enable-disabled-builtins	52	--enable-disabled-builtins
56		53
		54	.include <bsd.port.options.mk>
		55
57	.if ${PORT_OPTIONS:MSTATIC} \|\| defined(NO_DYNAMICROOT) \|\| (defined(NOSHARED) && ${NOSHARED:L} != "no")	56	.if ${PORT_OPTIONS:MSTATIC} \|\| defined(NO_DYNAMICROOT) \|\| (defined(NOSHARED) && ${NOSHARED:L} != "no")
58	CONFIGURE_ARGS+= --enable-static-link	57	CONFIGURE_ARGS+= --enable-static-link
59	PKGNAMESUFFIX= -static-devel	58	PKGNAMESUFFIX= -static-devel
60	CONFLICTS+= bash-[0-9]* bash-static-[0-9]* bash-devel-[0-9]*	59	CONFLICTS+= bash-[0-9]* bash-static-[0-9]* bash-devel-[0-9]*
61	.else	60	.else
62	CONFIGURE_ARGS+= --enable-static-link=no	61	CONFIGURE_ARGS+= --disable-static-link
63	PKGNAMESUFFIX= -devel	62	PKGNAMESUFFIX= -devel
64	CONFLICTS+= bash-static-[0-9]* bash-[0-9]* bash-static-devel-[0-9]*	63	CONFLICTS+= bash-static-[0-9]* bash-[0-9]* bash-static-devel-[0-9]*
65	.endif	64	.endif
66		65
67	.if empty(PORT_OPTIONS:MHELP)
68	CONFIGURE_ARGS+= --disable-help-builtin
69	.endif
70
71	.if empty(PORT_OPTIONS:MNLS)
72	CONFIGURE_ARGS+= --disable-nls
73	PLIST_SUB+= NLS="@comment "
74	.else
75	USES+= gettext iconv
76	PLIST_SUB+= NLS=""
77	.endif
78
79	CPPFLAGS+= ${PTHREAD_CFLAGS} \
80	-I${LOCALBASE}/include
81	LDFLAGS+= -L${LOCALBASE}/lib
82
83	CONFIGURE_ENV= YACC="bison -y" \
84	bash_cv_dev_fd=absent
85
86
87	post-patch:	66	post-patch:
88	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/doc/bash.1	67	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/doc/bash.1
89	.if ${PORT_OPTIONS:MSYSLOG}	68	.if ${PORT_OPTIONS:MSYSLOG}
Lines 106-116 Link Here
106	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build	85	@${ECHO_CMD} $$((${PORTREVISION}-1)) > ${WRKSRC}/.build
107		86
108	post-install:	87	post-install:
109	@cd ${STAGEDIR}${PREFIX}/bin ; ${LN} -sf bash rbash	88	${LN} -sf bash ${STAGEDIR}${PREFIX}/bin/rbash
110	@${MKDIR} ${STAGEDIR}${DOCSDIR}	89	@${MKDIR} ${STAGEDIR}${DOCSDIR}
111	@${INSTALL_DATA} ${WRKSRC}/doc/FAQ \	90	${INSTALL_DATA} ${WRKSRC}/doc/FAQ \
112	${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR}	91	${WRKSRC}/doc/INTRO ${STAGEDIR}${DOCSDIR}
113	@for d in ${PORTDOCS:NFAQ:NINTRO}; do \	92	for d in ${PORTDOCS:NFAQ:NINTRO:N*html}; do \
114	${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \	93	${INSTALL_DATA} ${WRKSRC}/$${d} ${STAGEDIR}${DOCSDIR}; \
115	done	94	done
116		95

Lines 1-92 Link Here

(-)distinfo (-92 / +2 lines)
1	SHA256 (bash/bash-4.2.tar.gz) = a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8	1	SHA256 (bash/bash-4.3.tar.gz) = afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4
2	SIZE (bash/bash-4.2.tar.gz) = 7009201	2	SIZE (bash/bash-4.3.tar.gz) = 7955839
3	SHA256 (bash/bash42-001) = 8d6ca028576c4af23e660a2fbc2112221a11c8a785c0b37f033967e5cd12b47a
4	SIZE (bash/bash42-001) = 2944
5	SHA256 (bash/bash42-002) = febac927e199aceeba2004908d971d4afb49b521796c3f42d1166f9fbbfbcef9
6	SIZE (bash/bash42-002) = 1780
7	SHA256 (bash/bash42-003) = 5a0a7c15018c87348ea87cb0beea14345faf878dbb0e25c17fa70677194cb4cd
8	SIZE (bash/bash42-003) = 6896
9	SHA256 (bash/bash42-004) = 4e34b0f830d2583d56e14225a66937abc81f45bbafcd2eb49daf61c9462140c1
10	SIZE (bash/bash42-004) = 1686
11	SHA256 (bash/bash42-005) = a81749e73004b81cfdf0fe075bec365dc1fef756ee5e3fd142821e317d1459a0
12	SIZE (bash/bash42-005) = 3424
13	SHA256 (bash/bash42-006) = c91148945a2ddafa792682d7c8668c59e7e645eae1334b15b0d5d9ad22634bd1
14	SIZE (bash/bash42-006) = 1187
15	SHA256 (bash/bash42-007) = 405826acf443dd1084f236a15cb76d7f0ee2dbe5edff45c5fb836db571fb7e95
16	SIZE (bash/bash42-007) = 1394
17	SHA256 (bash/bash42-008) = 23080d11a60a78941210e2477f6bca066b45db03defa60da86fd765107ba2437
18	SIZE (bash/bash42-008) = 2164
19	SHA256 (bash/bash42-009) = e7ed5440b4c19765786e90e4f1ded43195d38b3e4d1c4b39fcc23de9a74ccb20
20	SIZE (bash/bash42-009) = 2384
21	SHA256 (bash/bash42-010) = acfc5482c25e6923116fcf4b4f7f6345b80f75ad7299749db4b736ad67aa43dc
22	SIZE (bash/bash42-010) = 1818
23	SHA256 (bash/bash42-011) = a491ae359a7ebbd7321aede561728289d71e1fc84777f402766a8afd4d261532
24	SIZE (bash/bash42-011) = 1426
25	SHA256 (bash/bash42-012) = 354433f1d2da02f1b9652cd20a5b85bbfb5bc2aaf79c42461ebd929d89b9b7b8
26	SIZE (bash/bash42-012) = 4247
27	SHA256 (bash/bash42-013) = 3412c5c6cbbce6c88592604aec054d8182ce64410038b5ecea69fc3968cf85ea
28	SIZE (bash/bash42-013) = 1340
29	SHA256 (bash/bash42-014) = b5a678e609858532735f94faedb5fabce00dfd6577a4e9ec5eec85fe682c8b33
30	SIZE (bash/bash42-014) = 1434
31	SHA256 (bash/bash42-015) = 2d876a8304bdf3d664e87e0a8d73bc4ccc100a9dd8c0d054e8649472d8748a98
32	SIZE (bash/bash42-015) = 1991
33	SHA256 (bash/bash42-016) = 2895ccbcf7fc98da73a8fa3ba7440aaf2bfaef6c0af8bdd3a9c39403cf03e2a6
34	SIZE (bash/bash42-016) = 1410
35	SHA256 (bash/bash42-017) = 73552444498c761d6073dd67ccfe043b36ef24bb418c266d91d9750884daee7f
36	SIZE (bash/bash42-017) = 1399
37	SHA256 (bash/bash42-018) = e2a9457172370d454d31b84bbcba758ee6394316dbe755374553b52aadbb494d
38	SIZE (bash/bash42-018) = 1929
39	SHA256 (bash/bash42-019) = a8b7cd02207656976016d93cab48e073cb5da002ceb27b7a63fc5ea62007eb56
40	SIZE (bash/bash42-019) = 1415
41	SHA256 (bash/bash42-020) = 494773f0d0078cb35372d24caa523b00d8fdbbaed71e41dc14c9e47579da3c6f
42	SIZE (bash/bash42-020) = 1825
43	SHA256 (bash/bash42-021) = a887a97be226575ecf483be2c76655bd6d1edde1cdfe199c27bd2e6baf32badc
44	SIZE (bash/bash42-021) = 1532
45	SHA256 (bash/bash42-022) = 9dcdf69df7f8cd2ba88d18c45a0d8f55fbe4f0e273411179db94dd6198b85c6b
46	SIZE (bash/bash42-022) = 1395
47	SHA256 (bash/bash42-023) = 5dc11394f1a6c887373c081396efd4f4cc04492696722c57a4811c207965f0bf
48	SIZE (bash/bash42-023) = 1699
49	SHA256 (bash/bash42-024) = 99c826bdd33bee281d0a9191550d62a24d0b256cd41c90afd10abd63a66b99e6
50	SIZE (bash/bash42-024) = 1363
51	SHA256 (bash/bash42-025) = 0db0646fd7a559d5702911192bdd387acbbc61cf3c29a34007c3ec840e275515
52	SIZE (bash/bash42-025) = 3969
53	SHA256 (bash/bash42-026) = e7e90cfaabbce3b4b9c699994e9d9ea4a2f084fd9f37788a80b0b70b47d323d2
54	SIZE (bash/bash42-026) = 1577
55	SHA256 (bash/bash42-027) = 0c1f6b7256fcc17f42c05f9bbb4138f8e8bb67e79c622c3485711b6f37f7ed42
56	SIZE (bash/bash42-027) = 1461
57	SHA256 (bash/bash42-028) = 204226de39ba81aaf3dd5a29cd59de052ec9f648538bb9e7f1c8150852b1ed7a
58	SIZE (bash/bash42-028) = 1834
59	SHA256 (bash/bash42-029) = d0b08c0817bc5acdb28b466727622a8422ca4d61188313cf162443b7f338f581
60	SIZE (bash/bash42-029) = 16812
61	SHA256 (bash/bash42-030) = 12594366591a136d8ccdcb8e218010f2ddab6be28a7f96d0ed32ca927e44afae
62	SIZE (bash/bash42-030) = 5046
63	SHA256 (bash/bash42-031) = 55f38c4d34775fbb063510c4222b195d998dd86f88288b64a6103e3812f8d9f9
64	SIZE (bash/bash42-031) = 2047
65	SHA256 (bash/bash42-032) = e3a8b563dbb1e5cb7ca85a53515da8b2941213973496d48c4cc5a11c604791ed
66	SIZE (bash/bash42-032) = 2416
67	SHA256 (bash/bash42-033) = f5d12790d69fdfb2f47ac86fa1ea1ecc088880141570273f38dfd3fa4a46434b
68	SIZE (bash/bash42-033) = 1634
69	SHA256 (bash/bash42-034) = 01c1f332101389cedf347c7736102966722a3b213900954e5d625bbc2f1e41b8
70	SIZE (bash/bash42-034) = 1345
71	SHA256 (bash/bash42-035) = cecde463b038b4849635ff0993d9b264fc92403e7ae0accb52c7877aeaed78df
72	SIZE (bash/bash42-035) = 1920
73	SHA256 (bash/bash42-036) = fe293a1bc92ac4d272ae9b9a0de3afef7c06145a2b52337a09cacccc5305aafa
74	SIZE (bash/bash42-036) = 3123
75	SHA256 (bash/bash42-037) = c7578cddd3bb2430689c740f58a03403800726dcd1268b28f91bf37f368e1674
76	SIZE (bash/bash42-037) = 3483
77	SHA256 (bash/bash42-038) = b8c9a81bdf206be58ba491dfad80373b3348af769e80aaf72f7611ddbbbe6d57
78	SIZE (bash/bash42-038) = 1290
79	SHA256 (bash/bash42-039) = f4f9300a60321a5088ae9e54052a64c4d3e876f9a3a17ca104d58fa38b9c1791
80	SIZE (bash/bash42-039) = 1603
81	SHA256 (bash/bash42-040) = b265f9caf3c7321f95bc8e0b9e2c46bd86c226f00f05e823699aafb83c4aaa6c
82	SIZE (bash/bash42-040) = 1710
83	SHA256 (bash/bash42-041) = 05cc1951bd9f6624088dd6067486ff47f1825e333273d7df5f1b06b23baaf5eb
84	SIZE (bash/bash42-041) = 1463
85	SHA256 (bash/bash42-042) = faaa5c1f456517b258b2a65eaa664dd6a01eeff73c8ca4447c3a6de371bbf304
86	SIZE (bash/bash42-042) = 1571
87	SHA256 (bash/bash42-043) = dc2683840f3e890a9c5f85338366ff6cd923285e558eb46aa818a03fa67c5c57
88	SIZE (bash/bash42-043) = 2110
89	SHA256 (bash/bash42-044) = 10d32d6c9ccdedb1d826f46468631d475f9dcf983fac087766e16df7b99766e6
90	SIZE (bash/bash42-044) = 1871
91	SHA256 (bash/bash42-045) = ddb7eff0f59d394a483b09feec3771d9026f81ba90afac32846a19b172b2986d
92	SIZE (bash/bash42-045) = 1572

Lines 1-6 Link Here

(-)files/extrapatch-colonbreakswords (-37 / +40 lines)
1	--- bashline.c.orig 2009-01-08 06:29:24.000000000 -0800	1	--- bashline.c.orig 2014-03-02 13:26:23.000000000 -0500
2	+++ bashline.c 2012-07-30 15:07:10.000000000 -0500	2	+++ bashline.c 2014-03-02 13:30:09.000000000 -0500
3	@@ -235,6 +235,11 @@ int bash_readline_initialized = 0;	3	@@ -255,6 +255,11 @@
4	host list. */	4	host list. */
5	int perform_hostname_completion = 1;	5	int perform_hostname_completion = 1;
6		6
Lines 12-18 Link Here
12	/* If non-zero, we don't do command completion on an empty line. */	12	/* If non-zero, we don't do command completion on an empty line. */
13	int no_empty_command_completion;	13	int no_empty_command_completion;
14		14
15	@@ -252,7 +257,8 @@ int dircomplete_expand_relpath = 0;	15	@@ -284,7 +289,8 @@
16		16
17	static char *bash_completer_word_break_characters = " \t\n\"'@><=;\|&(:";	17	static char *bash_completer_word_break_characters = " \t\n\"'@><=;\|&(:";
18	static char *bash_nohostname_word_break_characters = " \t\n\"'><=;\|&(:";	18	static char *bash_nohostname_word_break_characters = " \t\n\"'><=;\|&(:";
Lines 22-28 Link Here
22		22
23	static const char default_filename_quote_characters = " \t\n\\\"'@<>=;\|&()#$`?[!:{~"; /}/	23	static const char default_filename_quote_characters = " \t\n\\\"'@<>=;\|&()#$`?[!:{~"; /}/
24	static char *custom_filename_quote_characters = 0;	24	static char *custom_filename_quote_characters = 0;
25	@@ -370,6 +376,80 @@ enable_hostname_completion (on_or_off)	25	@@ -403,6 +409,80 @@
26	return (old_value);	26	return (old_value);
27	}	27	}
28		28
Lines 45-51 Link Here
45	+ else	45	+ else
46	+ {	46	+ {
47	+ colon_is_wordbreak = 0;	47	+ colon_is_wordbreak = 0;
48	+ rl_filename_quote_characters = " \t\n\\\"'@<>=;\|&()#$`?[!{~"; /}*/	48	+ rl_filename_quote_characters = " \t\n\\\"'@<>=;\|&()#$`?[!{~"; /}*/
49	+ }	49	+ }
50	+	50	+
51	+ /* Now we need to figure out how to appropriately modify and assign	51	+ /* Now we need to figure out how to appropriately modify and assign
Lines 57-69 Link Here
57	+ allocate new memory for rl_completer_word_break_characters. */	57	+ allocate new memory for rl_completer_word_break_characters. */
58	+	58	+
59	+ if (bash_readline_initialized == 0 &&	59	+ if (bash_readline_initialized == 0 &&
60	+ (rl_completer_word_break_characters == 0 \|\|	60	+ (rl_completer_word_break_characters == 0 \|\|
61	+ rl_completer_word_break_characters == rl_basic_word_break_characters))	61	+ rl_completer_word_break_characters == rl_basic_word_break_characters))
62	+ {	62	+ {
63	+ if (on_or_off)	63	+ if (on_or_off)
64	+ rl_completer_word_break_characters = savestring (bash_completer_word_break_characters);	64	+ rl_completer_word_break_characters = savestring (bash_completer_word_break_characters);
65	+ else	65	+ else
66	+ rl_completer_word_break_characters = savestring (bash_nocolon_word_break_characters);	66	+ rl_completer_word_break_characters = savestring (bash_nocolon_word_break_characters);
67	+ }	67	+ }
68	+ else	68	+ else
69	+ {	69	+ {
Lines 76-96 Link Here
76	+ nval = (char *)xmalloc (strlen (rl_completer_word_break_characters) + 1 + on_or_off);	76	+ nval = (char *)xmalloc (strlen (rl_completer_word_break_characters) + 1 + on_or_off);
77	+	77	+
78	+ if (on_or_off == 0)	78	+ if (on_or_off == 0)
79	+ {	79	+ {
80	+ /* Turn it off -- just remove `:' from word break chars. We want	80	+ /* Turn it off -- just remove `:' from word break chars. We want
81	+ to remove all occurrences of `:' from the char list, so we loop	81	+ to remove all occurrences of `:' from the char list, so we loop
82	+ rather than just copy the rest of the list over AT. */	82	+ rather than just copy the rest of the list over AT. */
83	+ for (nv = nval, at = rl_completer_word_break_characters; *at; )	83	+ for (nv = nval, at = rl_completer_word_break_characters; *at; )
84	+ if (*at != ':')	84	+ if (*at != ':')
85	+ nv++ = at++;	85	+ nv++ = at++;
86	+ else	86	+ else
87	+ at++;	87	+ at++;
88	+ *nv = '\0';	88	+ *nv = '\0';
89	+ }	89	+ }
90	+ else	90	+ else
91	+ {	91	+ {
92	+ nval[0] = ':';	92	+ nval[0] = ':';
93	+ strcpy (nval + 1, rl_completer_word_break_characters);	93	+ strcpy (nval + 1, rl_completer_word_break_characters);
94	+ }	94	+ }
95	+	95	+
96	+ free (rl_completer_word_break_characters);	96	+ free (rl_completer_word_break_characters);
Lines 103-109 Link Here
103	/* Called once from parse.y if we are going to use readline. */	103	/* Called once from parse.y if we are going to use readline. */
104	void	104	void
105	initialize_readline ()	105	initialize_readline ()
106	@@ -538,8 +618,13 @@ initialize_readline ()	106	@@ -573,8 +653,13 @@
107	completion is enabled. */	107	completion is enabled. */
108	enable_hostname_completion (perform_hostname_completion);	108	enable_hostname_completion (perform_hostname_completion);
109		109
Lines 115-127 Link Here
115	/* characters that need to be quoted when appearing in filenames. */	115	/* characters that need to be quoted when appearing in filenames. */
116	- rl_filename_quote_characters = default_filename_quote_characters;	116	- rl_filename_quote_characters = default_filename_quote_characters;
117	+// rl_filename_quote_characters = default_filename_quote_characters;	117	+// rl_filename_quote_characters = default_filename_quote_characters;
		118	set_filename_bstab (rl_filename_quote_characters);
118		119
119	rl_filename_quoting_function = bash_quote_filename;	120	rl_filename_quoting_function = bash_quote_filename;
120	rl_filename_dequoting_function = bash_dequote_filename;	121	--- builtins/shopt.def.orig 2014-03-02 13:30:44.000000000 -0500
121	--- builtins/shopt.def.orig 2009-01-13 05:43:16.000000000 -0800	122	+++ builtins/shopt.def 2014-03-02 13:31:38.000000000 -0500
122	+++ builtins/shopt.def 2009-03-08 01:03:39.000000000 -0800	123	@@ -103,6 +103,8 @@
123	@@ -96,6 +97,8 @@ extern int force_fignore;	124	extern int complete_fullquote;
124	extern int dircomplete_spelling;
125		125
126	extern int enable_hostname_completion __P((int));	126	extern int enable_hostname_completion __P((int));
127	+extern int colon_is_wordbreak;	127	+extern int colon_is_wordbreak;
Lines 129-136 Link Here
129	#endif	129	#endif
130		130
131	#if defined (PROGRAMMABLE_COMPLETION)	131	#if defined (PROGRAMMABLE_COMPLETION)
132	@@ -147,6 +150,9 @@ static struct {	132	@@ -166,6 +168,9 @@
133	#if defined (READLINE)	133	{ "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
134	{ "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },	134	{ "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
135	#endif	135	#endif
136	+#if defined (READLINE)	136	+#if defined (READLINE)
Lines 139-147 Link Here
139	{ "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },	139	{ "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
140	{ "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },	140	{ "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },
141	{ "expand_aliases", &expand_aliases, (shopt_set_func_t *)NULL },	141	{ "expand_aliases", &expand_aliases, (shopt_set_func_t *)NULL },
142	--- doc/bash.1.orig 2009-03-08 00:53:01.000000000 -0800	142	--- doc/bash.1.orig 2014-03-02 13:32:14.000000000 -0500
143	+++ doc/bash.1 2009-03-08 01:05:32.000000000 -0800	143	+++ doc/bash.1 2014-03-02 13:32:40.000000000 -0500
144	@@ -8473,6 +8473,18 @@ attempts to save all lines of a multiple	144	@@ -9252,6 +9252,18 @@
145	command in the same history entry. This allows	145	command in the same history entry. This allows
146	easy re-editing of multi-line commands.	146	easy re-editing of multi-line commands.
147	.TP 8	147	.TP 8
Lines 160-168 Link Here
160	.B compat31	160	.B compat31
161	If set,	161	If set,
162	.B bash	162	.B bash
163	--- doc/bashref.texi.orig 2009-03-08 00:53:01.000000000 -0800	163	--- doc/bashref.texi.orig 2014-03-02 13:33:17.000000000 -0500
164	+++ doc/bashref.texi 2009-03-08 01:07:00.000000000 -0800	164	+++ doc/bashref.texi 2014-03-02 13:33:44.000000000 -0500
165	@@ -4321,6 +4321,11 @@ attempts to save all lines of a multiple	165	@@ -4937,6 +4937,11 @@
166	command in the same history entry. This allows	166	command in the same history entry. This allows
167	easy re-editing of multi-line commands.	167	easy re-editing of multi-line commands.
168		168
Lines 171-173 Link Here
171	+separating word being completed (@pxref{Commands For Completion}).	171	+separating word being completed (@pxref{Commands For Completion}).
172	+This option is enabled by default.	172	+This option is enabled by default.
173	+	173	+
		174	@item compat31
		175	If set, Bash
		176	changes its behavior to that of version 3.1 with respect to quoted

Lines 1-13 Link Here

(-)files/extrapatch-implicitcd (-35 / +31 lines)
1	#	1	--- execute_cmd.c.orig 2014-03-02 13:15:12.000000000 -0500
2	# new shopt `implicitcd'	2	+++ execute_cmd.c 2014-03-02 13:17:14.000000000 -0500
3	# http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00024.html	3	@@ -199,6 +199,9 @@
4	#
5	--- execute_cmd.c.orig Sat Nov 5 17:37:21 2005
6	+++ execute_cmd.c Wed Dec 28 19:38:09 2005
7	@@ -190,6 +190,9 @@
8	/* The line number that the currently executing function starts on. */
9	static int function_line_number;
10		4
		5	static int execute_intern_function __P((WORD_DESC , FUNCTION_DEF ));
		6
11	+/* add an implicit `cd' if the command is the name of a directory */	7	+/* add an implicit `cd' if the command is the name of a directory */
12	+int implicitcd = 0;	8	+int implicitcd = 0;
13	+	9	+
Lines 14-43 Link Here
14	/* Set to 1 if fd 0 was the subject of redirection to a subshell. Global	10	/* Set to 1 if fd 0 was the subject of redirection to a subshell. Global
15	so that reader_loop can set it to zero before executing a command. */	11	so that reader_loop can set it to zero before executing a command. */
16	int stdin_redir;	12	int stdin_redir;
17	@@ -2913,6 +2916,20 @@	13	@@ -4111,6 +4114,20 @@
18	this_command_name = words->word->word;
19		14
20	QUIT;	15	QUIT;
21	+	16
22	+ if (implicitcd && interactive_shell && words->next == NULL && func == 0 && builtin == 0)	17	+ if (implicitcd && interactive_shell && words->next == NULL && func == 0 && builtin == 0)
23	+ {	18	+ {
24	+ struct stat finfo;	19	+ struct stat finfo;
25	+	20	+
26	+ if ((stat (words->word->word, &finfo) == 0) && (S_ISDIR (finfo.st_mode)))	21	+ if ((stat (words->word->word, &finfo) == 0) && (S_ISDIR (finfo.st_mode)))
27	+ {	22	+ {
28	+ this_command_name = "cd";	23	+ this_command_name = "cd";
29	+ last_shell_builtin = this_shell_builtin;	24	+ last_shell_builtin = this_shell_builtin;
30	+ this_shell_builtin = builtin_address (this_command_name);	25	+ this_shell_builtin = builtin_address (this_command_name);
31	+ result = (*this_shell_builtin) (words);	26	+ result = (*this_shell_builtin) (words);
32	+ goto return_result;	27	+ goto return_result;
33	+ }	28	+ }
34	+ }	29	+ }
35		30	+
36	/* This command could be a shell builtin or a user-defined function.	31	/* This command could be a shell builtin or a user-defined function.
37	We have already found special builtins by this time, so we do not	32	We have already found special builtins by this time, so we do not
38	--- builtins/shopt.def.orig Sat Feb 19 19:25:03 2005	33	set builtin_is_special. If this is a function or builtin, and we
39	+++ builtins/shopt.def Wed Dec 28 19:38:09 2005	34	--- builtins/shopt.def.orig 2014-03-02 13:18:07.000000000 -0500
40	@@ -66,6 +66,7 @@	35	+++ builtins/shopt.def 2014-03-02 13:19:22.000000000 -0500
		36	@@ -83,6 +83,7 @@
41	extern int check_window_size;	37	extern int check_window_size;
42	extern int glob_ignore_case, match_ignore_case;	38	extern int glob_ignore_case, match_ignore_case;
43	extern int hup_on_exit;	39	extern int hup_on_exit;
Lines 44-69 Link Here
44	+extern int implicitcd;	40	+extern int implicitcd;
45	extern int xpg_echo;	41	extern int xpg_echo;
46	extern int gnu_error_format;	42	extern int gnu_error_format;
47		43	extern int check_jobs_at_exit;
48	@@ -145,6 +146,7 @@	44	@@ -192,6 +193,7 @@
49	{ "hostcomplete", &perform_hostname_completion, enable_hostname_completion },	45	{ "hostcomplete", &perform_hostname_completion, shopt_enable_hostname_completion },
50	#endif	46	#endif
51	{ "huponexit", &hup_on_exit, (shopt_set_func_t *)NULL },	47	{ "huponexit", &hup_on_exit, (shopt_set_func_t *)NULL },
52	+ { "implicitcd", &implicitcd, (shopt_set_func_t *)NULL },	48	+ { "implicitcd", &implicitcd, (shopt_set_func_t *)NULL },
53	{ "interactive_comments", &interactive_comments, set_shellopts_after_change },	49	{ "interactive_comments", &interactive_comments, set_shellopts_after_change },
		50	{ "lastpipe", &lastpipe_opt, (shopt_set_func_t *)NULL },
54	#if defined (HISTORY)	51	#if defined (HISTORY)
55	{ "lithist", &literal_history, (shopt_set_func_t *)NULL },	52	@@ -305,6 +307,7 @@
56	@@ -253,6 +255,7 @@
57	cdable_vars = mail_warning = 0;	53	cdable_vars = mail_warning = 0;
58	no_exit_on_failed_exec = print_shift_error = 0;	54	no_exit_on_failed_exec = print_shift_error = 0;
59	check_hashed_filenames = cdspelling = expand_aliases = check_window_size = 0;	55	check_hashed_filenames = cdspelling = expand_aliases = 0;
60	+ implicitcd = 0;	56	+ implicitcd = 0;
61		57
62	source_uses_path = promptvars = 1;	58	source_uses_path = promptvars = 1;
63		59
64	--- doc/bash.1.orig Wed Oct 12 12:40:52 2005	60	--- doc/bash.1.orig 2014-03-02 13:19:59.000000000 -0500
65	+++ doc/bash.1 Wed Dec 28 19:38:09 2005	61	+++ doc/bash.1 2014-03-02 13:21:10.000000000 -0500
66	@@ -8090,6 +8090,15 @@	62	@@ -9480,6 +9480,15 @@
67	.B SIGHUP	63	.B SIGHUP
68	to all jobs when an interactive login shell exits.	64	to all jobs when an interactive login shell exits.
69	.TP 8	65	.TP 8
Lines 79-87 Link Here
79	.B interactive_comments	75	.B interactive_comments
80	If set, allow a word beginning with	76	If set, allow a word beginning with
81	.B #	77	.B #
82	--- doc/bashref.texi.orig Mon Oct 3 16:07:21 2005	78	--- doc/bashref.texi.orig 2014-03-02 13:21:54.000000000 -0500
83	+++ doc/bashref.texi Wed Dec 28 19:38:09 2005	79	+++ doc/bashref.texi 2014-03-02 13:22:31.000000000 -0500
84	@@ -3697,6 +3697,15 @@	80	@@ -5118,6 +5118,15 @@
85	If set, Bash will send @code{SIGHUP} to all jobs when an interactive	81	If set, Bash will send @code{SIGHUP} to all jobs when an interactive
86	login shell exits (@pxref{Signals}).	82	login shell exits (@pxref{Signals}).
87		83

Lines 1-18 Link Here

(-)files/patch-doc_Makefile.in (-6 / +9 lines)
1	--- doc/Makefile.in.orig Wed Dec 28 20:00:02 2005	1	--- doc/Makefile.in.orig 2014-03-02 13:39:04.000000000 -0500
2	+++ doc/Makefile.in Wed Dec 28 20:00:58 2005	2	+++ doc/Makefile.in 2014-03-02 13:39:56.000000000 -0500
3	@@ -161,14 +161,11 @@	3	@@ -167,7 +167,7 @@
4	bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)	4	bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
5	${SET_TEXINPUTS} $(TEXI2DVI) $(srcdir)/bashref.texi	5	${SET_TEXINPUTS} $(TEXI2DVI) $(srcdir)/bashref.texi \|\| { ${RM} $@ ; exit 1; }
6		6
7	-bashref.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)	7	-bashref.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
8	+bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)	8	+bash.info: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
9	$(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi	9	$(MAKEINFO) --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
10		10
		11	# can also use:
		12	@@ -175,9 +175,6 @@
11	bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)	13	bashref.html: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
12	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi	14	$(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi
13	-	15
14	-bash.info: bashref.info	16	-bash.info: bashref.info
15	- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \	17	- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \
16		18	-
17	bash.txt: bash.1	19	bash.txt: bash.1
18	bash.ps: bash.1	20	bash.ps: bash.1
		21	bash.html: bash.1 $(MAN2HTML)

Lines 1-5 Link Here

(-)files/patch-doc_bashref.texi (-6 / +6 lines)
1	--- doc/bashref.texi.orig Wed Dec 28 19:44:28 2005	1	--- doc/bashref.texi.orig 2014-03-02 13:40:51.000000000 -0500
2	+++ doc/bashref.texi Wed Dec 28 20:09:16 2005	2	+++ doc/bashref.texi 2014-03-02 13:42:04.000000000 -0500
3	@@ -1,6 +1,6 @@	3	@@ -1,6 +1,6 @@
4	\input texinfo.tex @c -- texinfo --	4	\input texinfo.tex @c -- texinfo --
5	@c %**start of header	5	@c %**start of header
Lines 6-14 Link Here
6	-@setfilename bashref.info	6	-@setfilename bashref.info
7	+@setfilename bash.info	7	+@setfilename bash.info
8	@settitle Bash Reference Manual	8	@settitle Bash Reference Manual
9	@c %**end of header
10		9
11	@@ -10,7 +10,7 @@	10	@include version.texi
		11	@@ -8,7 +8,7 @@
12		12
13	@copying	13	@copying
14	This text is a brief description of the features that are present in	14	This text is a brief description of the features that are present in
Lines 17-28 Link Here
17		17
18	This is Edition @value{EDITION}, last updated @value{UPDATED},	18	This is Edition @value{EDITION}, last updated @value{UPDATED},
19	of @cite{The GNU Bash Reference Manual},	19	of @cite{The GNU Bash Reference Manual},
20	@@ -4277,7 +4277,7 @@	20	@@ -5299,7 +5299,7 @@
21		21
22		22
23	@item PS1	23	@item PS1
24	-The primary prompt string. The default value is @samp{\s-\v\$ }.	24	-The primary prompt string. The default value is @samp{\s-\v\$ }.
25	+The primary prompt string. The default value is @samp{[\u@@\h \w]\$ }.	25	+The primary prompt string. The default value is @samp{[\u@@\h \w]\$ }.
26	@xref{Printing a Prompt}, for the complete list of escape	26	@xref{Controlling the Prompt}, for the complete list of escape
27	sequences that are expanded before @env{PS1} is displayed.	27	sequences that are expanded before @env{PS1} is displayed.
28		28

Lines 11-17 Link Here

(-)pkg-plist (+7 lines)
11	%%NLS%%share/locale/bg/LC_MESSAGES/bash.mo	11	%%NLS%%share/locale/bg/LC_MESSAGES/bash.mo
12	%%NLS%%share/locale/ca/LC_MESSAGES/bash.mo	12	%%NLS%%share/locale/ca/LC_MESSAGES/bash.mo
13	%%NLS%%share/locale/cs/LC_MESSAGES/bash.mo	13	%%NLS%%share/locale/cs/LC_MESSAGES/bash.mo
		14	%%NLS%%share/locale/da/LC_MESSAGES/bash.mo
14	%%NLS%%share/locale/de/LC_MESSAGES/bash.mo	15	%%NLS%%share/locale/de/LC_MESSAGES/bash.mo
		16	%%NLS%%share/locale/el/LC_MESSAGES/bash.mo
15	%%NLS%%share/locale/en@boldquot/LC_MESSAGES/bash.mo	17	%%NLS%%share/locale/en@boldquot/LC_MESSAGES/bash.mo
16	%%NLS%%share/locale/en@quot/LC_MESSAGES/bash.mo	18	%%NLS%%share/locale/en@quot/LC_MESSAGES/bash.mo
17	%%NLS%%share/locale/eo/LC_MESSAGES/bash.mo	19	%%NLS%%share/locale/eo/LC_MESSAGES/bash.mo
Lines 20-27 Link Here
20	%%NLS%%share/locale/fi/LC_MESSAGES/bash.mo	22	%%NLS%%share/locale/fi/LC_MESSAGES/bash.mo
21	%%NLS%%share/locale/fr/LC_MESSAGES/bash.mo	23	%%NLS%%share/locale/fr/LC_MESSAGES/bash.mo
22	%%NLS%%share/locale/ga/LC_MESSAGES/bash.mo	24	%%NLS%%share/locale/ga/LC_MESSAGES/bash.mo
		25	%%NLS%%share/locale/gl/LC_MESSAGES/bash.mo
23	%%NLS%%share/locale/hu/LC_MESSAGES/bash.mo	26	%%NLS%%share/locale/hu/LC_MESSAGES/bash.mo
		27	%%NLS%%share/locale/hr/LC_MESSAGES/bash.mo
24	%%NLS%%share/locale/id/LC_MESSAGES/bash.mo	28	%%NLS%%share/locale/id/LC_MESSAGES/bash.mo
		29	%%NLS%%share/locale/it/LC_MESSAGES/bash.mo
25	%%NLS%%share/locale/ja/LC_MESSAGES/bash.mo	30	%%NLS%%share/locale/ja/LC_MESSAGES/bash.mo
26	%%NLS%%share/locale/lt/LC_MESSAGES/bash.mo	31	%%NLS%%share/locale/lt/LC_MESSAGES/bash.mo
27	%%NLS%%share/locale/nl/LC_MESSAGES/bash.mo	32	%%NLS%%share/locale/nl/LC_MESSAGES/bash.mo
Lines 30-35 Link Here
30	%%NLS%%share/locale/ro/LC_MESSAGES/bash.mo	35	%%NLS%%share/locale/ro/LC_MESSAGES/bash.mo
31	%%NLS%%share/locale/ru/LC_MESSAGES/bash.mo	36	%%NLS%%share/locale/ru/LC_MESSAGES/bash.mo
32	%%NLS%%share/locale/sk/LC_MESSAGES/bash.mo	37	%%NLS%%share/locale/sk/LC_MESSAGES/bash.mo
		38	%%NLS%%share/locale/sl/LC_MESSAGES/bash.mo
		39	%%NLS%%share/locale/sr/LC_MESSAGES/bash.mo
33	%%NLS%%share/locale/sv/LC_MESSAGES/bash.mo	40	%%NLS%%share/locale/sv/LC_MESSAGES/bash.mo
34	%%NLS%%share/locale/tr/LC_MESSAGES/bash.mo	41	%%NLS%%share/locale/tr/LC_MESSAGES/bash.mo
35	%%NLS%%share/locale/uk/LC_MESSAGES/bash.mo	42	%%NLS%%share/locale/uk/LC_MESSAGES/bash.mo