--- bash-4.2.orig/debian/bash-static.postinst +++ bash-4.2/debian/bash-static.postinst @@ -0,0 +1,13 @@ +#! /bin/sh + +set -e + +if [ "$1" = configure ] && dpkg --compare-versions "$2" le 3.2-4 \ + && which add-shell >/dev/null +then + add-shell /bin/bash-static +fi + +#DEBHELPER# + +exit 0 --- bash-4.2.orig/debian/bash.postinst +++ bash-4.2/debian/bash.postinst @@ -0,0 +1,26 @@ +#! /bin/bash + +set -e + +# This should never happen. +if [ ! -e /bin/sh ]; then + ln -s bash /bin/sh +fi + +update-alternatives --install \ + /usr/share/man/man7/builtins.7.gz \ + builtins.7.gz \ + /usr/share/man/man7/bash-builtins.7.gz \ + 10 \ + || true + +if [ "$1" = configure ] && dpkg --compare-versions "$2" le 3.2-3 \ + && which add-shell >/dev/null +then + add-shell /bin/bash + add-shell /bin/rbash +fi + +#DEBHELPER# + +exit 0 --- bash-4.2.orig/debian/bashbug.1 +++ bash-4.2/debian/bashbug.1 @@ -0,0 +1,68 @@ +.TH "BASHBUG" "1" "11 December 2007" "GNU Bash 3\.1" "bashbug" +.nh +.ad l +.SH "NAME" +bashbug - report a bug in bash +.SH "SYNOPSIS" +.HP 8 +\fBbashbug\fR [\fB\-\-help\fR] [\fB\-\-version\fR] [\fB\fIbug\-report\-email\-addresses\fR\fR] +.SH "DESCRIPTION" +.PP + +\fBbashbug\fR +is a utility for reporting bugs in Bash to the maintainers\. +.PP + +\fBbashbug\fR +will start up your preferred editor with a preformatted bug report template for you to fill in\. Save the file and quit the editor once you have completed the missing fields\. +\fBbashbug\fR +will notify you of any problems with the report and ask for confirmation before sending it\. By default the bug report is mailed to both the GNU developers and the Debian Bash maintainers\. The recipients can be changed by giving a comma separated list of +\fIbug\-report\-email\-addresses\fR\. +.PP +If you invoke +\fBbashbug\fR +by accident, just quit your editor\. You will always be asked for confirmation before a bug report is sent\. +.SH "OPTIONS" +.PP +.PP +\fB\-\-help\fR +.RS +Show a brief usage message and exit\. +.RE +.PP +\fB\-\-version\fR +.RS +Show the version of +\fBbashbug\fR +and exit\. +.RE +.PP +\fBbug\-report\-email\-addresses\fR +.RS +Comma separated list of recipients\' email addresses\. By default the report is mailed to both the GNU developers and the Debian Bash maintainers\. +.RE +.SH "ENVIRONMENT" +.PP +.PP +\fBDEFEDITOR\fR +.RS +Editor to use for editing the bug report\. +.RE +.PP +\fBEDITOR\fR +.RS +Editor to use for editing the bug report (overridden by +\fBDEFEDITOR\fR)\. +.RE +.SH "SEE ALSO" +.PP + +\fBbash\fR(1), +\fBreportbug\fR(1), +\fBupdate-alternatives\fR(8) +for preferred editor\. +.SH "AUTHOR" +.PP +This manual page was written by Christer Andersson + +for the Debian project (but may be used by others)\. --- bash-4.2.orig/debian/README.commands +++ bash-4.2/debian/README.commands @@ -0,0 +1,189 @@ + This is a jumping-off reference point for new users who may be + completely unfamiliar with Linux commands. It does not contain all + the information you need about using the Linux console, but instead + just gives you enough information to get started finding the + information you need. + +Linux Commands + + To run a command, type the command at the prompt, followed by any + necessary options, and then press the Enter or Return key. + + Most commands operate silently unless they are specifically asked to + say what they are doing. If there is no error message, the command + should have worked. + + The operation of most commands can be changed by putting command + options immediately after the command name. There are several styles + of options used, and you have to check the documentation for each + command to know what options it can take, and what they do. + + Linux commands are case-sensitive, and almost always are all + lower-case. ls is a valid command; LS is not. + + In most cases you can use the tab key to ask the command shell to + auto-complete the command, directory or filename you have started + to type. If a unique completion exists, the shell will type it. If + not, you can press tab a second time to obtain a list of the + possible auto-completions. + +Commands for Reading Documentation + + In the following command examples, the [ ] characters are not + typed, they mean that whatever is enclosed is optional. For + example, you can also start `info' without any subject at all. + + When a given keyboard shortcut is preceded by ctrl- or alt- , that + means hold the control or alt key down, and type the given key + while holding it down (the same way you use the shift key). A + shorthand notation for ctrl- is ^ (^C means ctrl-C). + + man subject + man shows the manual page on the command (use q or ctrl-C to + get out of it if it doesn't terminate at the end of the + text). + + info [subject] + A lot of Debian Linux documentation is provided in info + format. This is similar to a hypertext format, in that you + can jump to other sections of the documentation by following + links embedded in the text. An info tutorial is available + within info, using ctrl-h followed by h. + + help [subject] + Use help for on-line help about the shell's built-in commands. + help by itself prints a list of subjects for which you can + ask for help. + + pager filename + pager displays a plain text file one screen at a time. + Additional screens can be displayed by pressing the space + bar, and previous screens can be displayed by pressing the b + key. When finished viewing the help, press q to return to + the prompt. + + Using -h --help with | pager + Most commands offer very brief built-in help by typing the + command followed by + + -h or --help + + If the help scrolls up beyond the top of the screen before + you can read it, add + + | pager + + to the end of the command. + + zmore document.gz + zmore is a document pager -- it displays the contents of + compressed documentation on your disk, one screenful at a + time. Compression is signified by filenames ending in .gz . + + lynx [document] or lynx [directory] or lynx [url] + lynx is a text-based web browser. It can display documents + (plain-text, compressed, or html), directory listings, and + urls such as www.google.com. It does not display images. + +Commands for Navigating Directories + + pwd + Displays your current working directory. The p stands for + print, which is a carryover from when unix was designed, + before the advent of computer screens. Interactive computer + responses were printed on paper by a connected electric + typewriter instead of being displayed electronically. + + cd [directory] + Change your current directory to the named directory. If you + don't specify directory, you will be returned to your home + directory. The `root' directory is signified by / at the + beginning of the directory path ( / also separates directory + and file names within the path). Thus paths beginning with / + are `absolute' paths; cd will take you to an absolute path + no matter what your current directory is. Paths not + beginning with / specify paths relative to your + current directory. cd .. means change to the parent + directory of your current working directory. + + ls [directory] + ls lists the contents of directory. If you don't specify a + directory name, the current working directory's list is + displayed. + + find directory -name filename + find tells you where filename is in the tree starting at + directory. This command has many other useful options. + +Documentation Indices + + The standard doc-linux-text package installs compressed text linux + HOWTOs in + + /usr/share/doc/HOWTO/en-txt/ + + Particularly helpful HOWTOs for new users are + + /usr/share/doc/HOWTO/en-txt/Unix-and-Internet-Fundamentals-HOWTO.gz + /usr/share/doc/HOWTO/en-txt/mini/INDEX.gz + /usr/share/doc/HOWTO/en-txt/Reading-List-HOWTO.gz + /usr/share/doc/HOWTO/en-txt/META-FAQ.gz + + Individual package documentation is installed in + + /usr/share/doc/ + + New user website references include + + http://www.debian.org/doc/FAQ + http://www.linuxdoc.org/LDP/gs/gs.html + +Recording User Sessions + + script filename + Use script to record everything that appears on the screen + (until the next exit) in filename. This is useful if you + need to record what's going on in order to include it in + your message when you ask for help. Use exit, logout or + ctrl-D to stop the recording session. + +Turning Echo On/Off + + To turn off echoing of characters to the screen, you can use + ctrl-S. ctrl-Q starts the echo again. If your terminal suddenly + seems to become unresponsive, try ctrl-Q; you may have accidentally + typed ctrl-S which activated echo-off. + +Virtual Consoles + + By default, six virtual consoles are provided. If you want to + execute another command without interrupting the operation of a + command you previously started, you can switch to another virtual + console (similar to a separate window). This is very handy for + displaying the documentation for a command in one console while + actually trying the command in another. Switch consoles 1 through 6 + by using alt-F1 through alt-F6. + +Logging Out + + exit or logout + + Use exit or logout to terminate your session and log + out. You should be returned to the log-in prompt. + +Turning Off the Computer + + Turning the computer on and off is really a system administration + subject, but I include it here because it is something that every + user who is his own administrator needs to know. + + halt or shutdown -t 0 -h now + This command shuts the computer down safely. You can also + use ctrl-alt-del if your system is set up for that. (If you + are in X, ctrl-alt-del will be intercepted by X. Get out of + X first by using ctrl-alt-backspace.) + + +To display this file one screen at a time, type + +pager /usr/share/doc/doc-linux-text/README.commands --- bash-4.2.orig/debian/etc.inputrc +++ bash-4.2/debian/etc.inputrc @@ -0,0 +1,17 @@ +# /etc/inputrc - global inputrc for libreadline +# See readline(3readline) and `info readline' for more information. + +# Be 8 bit clean. +set input-meta on +set output-meta on + +# To allow the use of german 8bit-characters like the german umlauts, comment +# out the two lines below. However this makes the meta key not work as a meta +# key, which is annoying to those which don't need to type in 8-bit characters. + +#set meta-flag on +#set convert-meta off + +# use a visible bell if one is available +#set bell-style none +#set bell-style visible --- bash-4.2.orig/debian/rules +++ bash-4.2/debian/rules @@ -0,0 +1,477 @@ +#! /usr/bin/make -f +# -*- makefile -*- + +#export DH_VERBOSE=1 + +unexport LANG LC_ALL LC_CTYPE LC_COLLATE LC_TIME LC_NUMERIC LC_MESSAGES + +# architecture dependent variables +vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) +DPKG_VARS := $(shell dpkg-architecture) +DEB_BUILD_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_OS) +DEB_HOST_GNU_CPU ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_CPU) +DEB_HOST_GNU_SYSTEM ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_SYSTEM) +DEB_HOST_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH) + +VERSION := 4.2 +#PKGVERSION := $(shell dpkg-parsechangelog \ +# | sed -n '/Version:/s/\(.* \)\(.*\)-2\(.*\)/\2\3/p') +#PKGVERSION := 3.0 +#dpkg_ctrl_args := -v$(PKGVERSION) -VBinary-Version=$(PKGVERSION) + +with_gfdl = yes + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CC = $(DEB_HOST_GNU_TYPE)-gcc + STRIP = $(DEB_HOST_GNU_TYPE)-strip +else + CC = gcc + STRIP = strip +endif +dpkg_buildflags = DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags +CFLAGS := $(shell $(dpkg_buildflags) --get CFLAGS) +CPPFLAGS := $(shell $(dpkg_buildflags) --get CPPFLAGS) +LDFLAGS := $(shell $(dpkg_buildflags) --get LDFLAGS) + +SHELL = /bin/bash +YACC = bison -y + +IX = install -o 0 -g 0 +ID = install -o 0 -g 0 -m 644 + +# built with installed libreadline? +with_installed_rl = no + +debflags = + +p = bash +p_stat = bash-static +p_bins = bash-builtins +p_doc = bash-doc + +d = debian/$(p) +d_stat = debian/$(p_stat) +d_bins = debian/$(p_bins) +d_doc = debian/$(p_doc) + +termcap_lib := $(if $(wildcard /usr/lib/libtinfo.so /usr/lib/$(DEB_HOST_MULTIARCH)/libtinfo.so), \ + -ltinfo, \ + -lncurses) + +conf_args = \ + --with-curses \ + --enable-largefile \ + --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man +ifeq ($(with_installed_rl),yes) + conf_args += --with-installed-readline +endif +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + conf_args += --build $(DEB_HOST_GNU_TYPE) +else + conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +static_conf_args := $(conf_args) \ + --enable-static-link \ + --without-bash-malloc \ + +#build: bash-build static-build preinst-build check +build: before-build bash-build static-build preinst-build check +build-arch: build +build-indep: build + +before-build: + : # see #327477, needed to have HAVE_DEV_STDIN defined + (test -d /dev/fd && test -r /dev/stdin < /dev/null) \ + || (test -d /proc/self/fd && test -r /dev/stdin < /dev/null) +ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux freebsd)) + $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o clear_console \ + debian/clear_console.c $(termcap_lib) +endif + +# --------------------------------------------------------------------------- +# build standard bash + +bash-build: + $(MAKE) -f debian/rules do-build-bash \ + bash_src=bash \ + bash_patches="$(debian_patches)" \ + build=bash \ + configure_args="$(conf_args)" +bash-configure: + $(MAKE) -f debian/rules do-configure-bash \ + bash_src=bash \ + bash_patches="$(debian_patches)" \ + build=bash \ + configure_args="$(conf_args)" + +# --------------------------------------------------------------------------- +# build static bash + +static-build: + $(MAKE) -f debian/rules do-build-static \ + bash_src=bash \ + bash_patches="$(debian_patches)" \ + build=static \ + configure_args="$(static_conf_args)" +static-configure: + $(MAKE) -f debian/rules do-configure-static \ + bash_src=bash \ + bash_patches="$(debian_patches)" \ + build=static \ + configure_args="$(static_conf_args)" + +# --------------------------------------------------------------------------- + +bash-doc-build: stamps/stamp-build-bash-doc +stamps/stamp-build-bash-doc: +ifeq ($(with_gfdl),yes) + rm -f bash/doc/bashref.info + $(MAKE) -C build-bash/doc bashref.info bashref.pdf +endif + $(MAKE) -C build-bash/doc bash.html bash.pdf + touch stamps/stamp-build-bash-doc + +# --------------------------------------------------------------------------- + +check: stamps/stamp-check +stamps/stamp-check: bash-build + @echo BEGIN test +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) + -sh debian/locale-gen + LOCPATH=$(CURDIR)/locales \ + time $(MAKE) -C build-bash test 2>&1 | tee build-bash/test-protocol + endif +else + @echo Suppress 'make' test, because this is cross build +endif + @echo END test + touch stamps/stamp-check + +# --------------------------------------------------------------------------- + +clean: + dh_testdir + dh_testroot + rm -rf stamps build-* bash + rm -f debian/bash.preinst debian/*.o + rm -f debian/README.Debian + rm -rf locales + rm -f clear_console + rm -f debian/patches/series + rm -rf .pc + dh_clean + +preinst-build: debian/bash.preinst + +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + STRIP = : strip +endif + +PREINST_OBJECTS = debian/bash.preinst.o debian/bash.preinst-lib.o + +$(PREINST_OBJECTS): %.o: %.c debian/bash.preinst.h + $(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) $< + +debian/bash.preinst: $(PREINST_OBJECTS) + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(PREINST_OBJECTS) + $(STRIP) -R .comment -R .note debian/bash.preinst + +# --------------------------------------------------------------------------- + + +install: bash-install + +bash-install: bash-build stamps/stamp-install-bash +stamps/stamp-install-bash: before-build stamps/stamp-build-bash + dh_testdir + dh_testroot + dh_clean -k -p$(p) -p$(p_doc) -p$(p_bins) + dh_installdirs -p$(p) \ + bin \ + etc/skel \ + usr/share/doc/$(p) + dh_installdirs -p$(p_doc) \ + usr/share/doc/$(p) + dh_installdirs -p$(p_bins) \ + usr/share/doc/$(p)/examples/loadables \ + usr/include/bash/{builtins,lib/{glob,tilde}} + +ifeq ($(with_gfdl),yes) +# XXXXX + cp -p build-bash/doc/*.info bash/doc/ +endif + + : # install it + $(MAKE) -C build-bash install \ + YACC="$(YACC)" \ + DESTDIR=$(CURDIR)/$(d) + mv $(d)/usr/bin/bash $(d)/bin/. + chmod 755 $(d)/usr/bin/bashbug + $(ID) debian/bashbug.1 $(d)/usr/share/man/man1/ +ifneq ($(with_gfdl),yes) + mkdir -p $(d)/usr/share/man/man1 + cp -p bash/doc/bash.1 $(d)/usr/share/man/man1/bash.1 +endif + + : # extra links + ln -sf bash $(d)/bin/rbash + + : # skeleton files + $(ID) debian/etc.bash.bashrc $(d)/etc/bash.bashrc + $(ID) debian/skel.bashrc $(d)/etc/skel/.bashrc + $(ID) debian/skel.profile $(d)/etc/skel/.profile + $(ID) debian/skel.bash_logout $(d)/etc/skel/.bash_logout + + : # clean_console +ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux freebsd)) + $(IX) clear_console $(d)/usr/bin/ + $(ID) debian/clear_console.1 $(d)/usr/share/man/man1/ +endif + +ifeq ($(with_gfdl),yes) + : # files for the bash-doc package + mv $(d)/usr/share/info/bash.info $(d)/usr/share/info/bashref.info + ln -sf bashref.info $(d)/usr/share/info/bash.info + mv $(d)/usr/share/info $(d_doc)/usr/share/ +else + rm -rf $(d)/usr/share/info +endif + + dh_installexamples -p$(p_doc) bash/examples/* + mv $(d_doc)/usr/share/doc/$(p_doc)/examples \ + $(d_doc)/usr/share/doc/$(p)/examples + rm -rf $(d_doc)/usr/share/doc/$(p)/examples/loadables + ln -sf ../$(p)/examples $(d_doc)/usr/share/doc/$(p_doc)/examples + + rm -rf $(d_doc)/usr/share/doc/$(p)/examples/obashdb + cd $(d_doc)/usr/share/doc/$(p)/examples && chmod 755 \ + misc/aliasconv.*sh misc/cshtobash + + cd $(d_doc)/usr/share/doc/$(p)/examples && chmod 644 \ + scripts/shprompt scripts/precedence \ + scripts/bcsh.sh scripts/krand.bash + + : # files for the bash-builtins package + $(ID) bash/include/*.h bash/*.h $(d_bins)/usr/include/bash/ + $(ID) build-bash/*.h $(d_bins)/usr/include/bash/ + rm -f $(d_bins)/usr/include/bash/y.tab.h + $(ID) bash/builtins/*.h $(d_bins)/usr/include/bash/builtins/ + $(ID) bash/lib/glob/*.h $(d_bins)/usr/include/bash/lib/glob/ + $(ID) bash/lib/tilde/*.h $(d_bins)/usr/include/bash/lib/tilde/ + $(ID) bash/examples/loadables/{README,*.c} \ + $(d_bins)/usr/share/doc/$(p)/examples/loadables + $(ID) build-bash/examples/loadables/Makefile \ + $(d_bins)/usr/share/doc/$(p)/examples/loadables + ln -sf bash $(d_bins)/usr/share/doc/$(p_bins) + + cat debian/README stamps/stamp-patch-bash > debian/README.Debian + + touch stamps/stamp-install-bash + +binary-doc: bash-install bash-doc-build + dh_testdir + dh_testroot + mkdir -p $(d_doc)/usr/share/doc/$(p) +ifeq ($(with_gfdl),yes) + dh_installdocs -p$(p_doc) + cp -p build-bash/doc/bashref.pdf $(d_doc)/usr/share/doc/$(p)/. + dh_link -p$(p_doc) \ + /usr/share/doc/$(p)/bashref.pdf /usr/share/doc/$(p_doc)/bashref.pdf +else + dh_installdocs -p$(p_doc) -X.doc-base + rm -f $(d_doc)/usr/share/doc-base/bashref +endif + rm -f $(d_doc)/usr/share/info/dir* + cp -p build-bash/doc/bash.html build-bash/doc/bash.pdf \ + $(d_doc)/usr/share/doc/$(p)/ + dh_link -p$(p_doc) \ + /usr/share/doc/$(p)/bash.html /usr/share/doc/$(p_doc)/bash.html \ + /usr/share/doc/$(p)/bash.pdf /usr/share/doc/$(p_doc)/bash.pdf + dh_installchangelogs -p$(p_doc) bash/CWRU/changelog + dh_compress -p$(p_doc) -Xexamples -X.pdf + dh_fixperms -p$(p_doc) + dh_installdeb -p$(p_doc) + dh_gencontrol -p$(p_doc) + dh_md5sums -p$(p_doc) + dh_builddeb -p$(p_doc) + +binary-bash: bash-install debian/bash.preinst + dh_testdir + dh_testroot + dh_installchangelogs -p$(p) + dh_installdocs -p$(p) \ + bash/{CHANGES,NEWS,COMPAT,doc/INTRO,POSIX} \ + debian/{README.Debian,README.abs-guide,README.commands} \ + debian/inputrc.arrows +ifeq ($(with_gfdl),yes) + cp -p bash/doc/FAQ $(d)/usr/share/doc/$(p)/. +else + cp -p debian/FAQ $(d)/usr/share/doc/$(p)/. +endif + install -D -m 644 debian/bash.overrides \ + debian/bash/usr/share/lintian/overrides/bash + dh_installman -p$(p) bash/doc/rbash.1 debian/bash-builtins.7 + dh_installmenu -p$(p) + dh_strip -p$(p) + dh_compress -p$(p) + dh_fixperms -p$(p) + dh_shlibdeps -p$(p) -- -dPre-Depends $(d)/bin/bash debian/bash.preinst + dh_installdeb -p$(p) + dh_gencontrol -p$(p) + dh_md5sums -p$(p) + dh_builddeb -p$(p) + +# Even though it contains only headers and example files, +# bash-builtins is NOT arch-independent because the config.h* files +# differ on different archs. +binary-builtins: bash-install + dh_testdir + dh_testroot + dh_compress -p$(p_bins) -Xexamples + dh_fixperms -p$(p_bins) + dh_installdeb -p$(p_bins) + dh_gencontrol -p$(p_bins) + dh_md5sums -p$(p_bins) + dh_builddeb -p$(p_bins) + +binary-static: static-build + dh_testdir + dh_testroot + dh_clean -k -p$(p_stat) + dh_installdirs -p$(p_stat) \ + bin \ + usr/share/man/man1 + cp -p build-static/bash $(d_stat)/bin/bash-static + cp -p bash/doc/bash.1 $(d_stat)/usr/share/man/man1/bash-static.1 + dh_installdocs -p$(p_stat) + dh_installchangelogs -p$(p_stat) + install -D -m 644 debian/bash-static.overrides \ + debian/bash-static/usr/share/lintian/overrides/bash-static + dh_strip -p$(p_stat) + dh_compress -p$(p_stat) + dh_fixperms -p$(p_stat) + dh_installdeb -p$(p_stat) + dh_gencontrol -p$(p_stat) + dh_md5sums -p$(p_stat) + dh_builddeb -p$(p_stat) + +binary-indep: binary-doc +binary-arch: binary-bash binary-builtins binary-static +binary: binary-indep binary-arch + +# --------------------------------------------------------------------------- +# common rules for all bash build variations + +do-build-$(build): stamps/stamp-build-$(build) +stamps/stamp-build-$(build): stamps/stamp-configure-$(build) + dh_testdir +ifneq (,$(profiled_build)) + $(MAKE) -C build-$(build) \ + CFLAGS='$(CFLAGS) -fprofile-generate' \ + YACC="$(YACC)" \ + TERMCAP_LIB="$(termcap_lib)" \ + deb_builddir=build-$(build)/ \ + $(debflags) + -sh debian/locale-gen + cp debian/run-my-gprof bash/tests/ + LOCPATH=$(CURDIR)/locales \ + time $(MAKE) -C build-$(build) TESTSCRIPT=run-my-gprof test 2>&1 \ + | tee build-bash/profile-protocol + $(MAKE) -C build-$(build) clean + rm -f build-$(build)/lib/malloc/malloc*.gc?? + $(MAKE) -C build-$(build) \ + CFLAGS='$(CFLAGS) -fprofile-use' \ + YACC="$(YACC)" \ + TERMCAP_LIB="$(termcap_lib)" \ + deb_builddir=build-$(build)/ \ + $(debflags) +else + $(MAKE) -C build-$(build) \ + YACC="$(YACC)" \ + TERMCAP_LIB="$(termcap_lib)" \ + deb_builddir=build-$(build)/ \ + $(debflags) +endif +ifeq ($(with_gfdl),yes) + $(MAKE) -C build-$(build)/doc \ + bash.info +endif + touch stamps/stamp-build-$(build) + +do-configure-$(build): stamps/stamp-configure-$(build) +stamps/stamp-configure-$(build): stamps/stamp-patch-$(bash_src) + dh_testdir + rm -rf build-$(build) + mkdir build-$(build) + cd build-$(build) && \ + CC="$(CC)" \ + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ + YACC="$(YACC)" \ + ../$(bash_src)/configure $(configure_args) + if ! grep -q '#define HAVE_DEV_STDIN 1' build-$(build)/config.h; then \ + echo "HAVE_DEV_STDIN not defined, abortig build"; \ + exit 1; \ + fi + touch stamps/stamp-configure-$(build) + +patchdir = debian/patches + +$(patchdir)/series: $(patchdir)/series.in + cpp -E \ + $(if $(filter no, $(with_gfdl)),,-DGFDL) \ + -Darch_os_$(DEB_HOST_ARCH_OS) -Darch_$(DEB_HOST_ARCH) \ + -o - $(patchdir)/series.in \ + | egrep -v '^(#.*|$$)' > $(patchdir)/series + +patch-$(bash_src): stamps/stamp-patch-$(bash_src) +stamps/stamp-patch-$(bash_src): $(patchdir)/series stamps/stamp-unpack-$(bash_src) + QUILT_PATCHES=$(patchdir) quilt push -a || test $$? = 2 + mkdir -p stamps + echo ""; echo "Patches applied in this version:" > stamps/pxx + for i in $$(cat $(patchdir)/series); do \ + echo ""; echo "$$i:"; \ + sed -n 's/^# *DP: */ /p' $(patchdir)/$$i; \ + done >> stamps/pxx + mv stamps/pxx $@ + +reverse-patches: unpatch +unpatch: + QUILT_PATCHES=$(patchdir) quilt pop -a -R || test $$? = 2 + rm -f stamps/stamp-patch $(patchdir)/series + rm -rf configure autom4te.cache + +update-patches: $(patchdir)/series stamps/stamp-unpack-$(bash_src) + export QUILT_PATCHES=$(patchdir); \ + export QUILT_REFRESH_ARGS="--no-timestamps --no-index -p ab"; \ + export QUILT_DIFF_ARGS="--no-timestamps --no-index -p ab"; \ + while quilt push; do quilt refresh; done + +unpack-$(bash_src): stamps/stamp-unpack-$(bash_src) +stamps/stamp-unpack-$(bash_src): + mkdir -p stamps + rm -rf bash-$(VERSION) $(bash_src) + rm -f stamps/stamp-patch-$(bash_src){,-*} + tar xf bash-$(VERSION)*.tar.xz + mv bash-$(VERSION) $(bash_src) + rm -f bash/y.tab.? + cp -p /usr/share/misc/config.* $(bash_src)/. + cp -p /usr/share/misc/config.* $(bash_src)/support/. + touch stamps/stamp-unpack-$(bash_src) + +.PHONY: unpack patch binary binary-arch binary-indep clean \ + build bash-build static-build preinst-build \ + check \ + bash-configure static-configure \ + binary-doc binary-bash binary-builtins binary-static \ + install bash-install + +# Local Variables: +# mode: makefile +# end: --- bash-4.2.orig/debian/watch +++ bash-4.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +ftp://ftp.gnu.org/gnu/bash/bash-([\d\.]*).tar.gz debian uupdate --- bash-4.2.orig/debian/control +++ bash-4.2/debian/control @@ -0,0 +1,71 @@ +Source: bash +Section: base +Priority: required +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matthias Klose +Standards-Version: 3.9.3 +Build-Depends: autoconf, autotools-dev, quilt, bison, libncurses5-dev, + texinfo, debhelper (>= 5), texi2html, locales, gettext:any, sharutils, time, + xz-utils, dpkg-dev (>= 1.16.1) +Build-Depends-Indep: texlive-latex-base, ghostscript +Homepage: http://tiswww.case.edu/php/chet/bash/bashtop.html +Vcs-Browser: https://code.launchpad.net/~doko/+junk/pkg-bash-debian +Vcs-Bzr: http://bazaar.launchpad.net/~doko/+junk/pkg-bash-debian + +Package: bash +Architecture: any +Pre-Depends: dash (>= 0.5.5.1-2.2), ${shlibs:Pre-Depends}, ${misc:Depends} +Depends: base-files (>= 2.1.12), debianutils (>= 2.15) +Recommends: bash-completion (>= 20060301-0) +Conflicts: bash-completion (<< 20060301-0) +Replaces: bash-doc (<= 2.05-1), bash-completion (<< 20060301-0) +Suggests: bash-doc +Essential: yes +Section: shells +Priority: required +Description: GNU Bourne Again SHell + Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). + . + Bash is ultimately intended to be a conformant implementation of the + IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). + . + The Programmable Completion Code, by Ian Macdonald, is now found in + the bash-completion package. + +Package: bash-static +Architecture: any +Depends: passwd (>= 1:4.0.3-10), ${misc:Depends} +Suggests: bash-doc +Section: shells +Priority: optional +Description: GNU Bourne Again SHell (static version) + Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). + . + Statically linked. + +Package: bash-builtins +Architecture: any +Depends: bash (= ${binary:Version}), ${misc:Depends} +Section: utils +Priority: optional +Description: Bash loadable builtins - headers & examples + Bash can dynamically load new builtin commands. Included are the + necessary headers to compile your own builtins and lots of examples. + +Package: bash-doc +Architecture: all +Depends: ${misc:Depends}, dpkg (>= 1.15.4) | install-info +Section: doc +Priority: optional +Replaces: bash (<< 3.2-1) +Description: Documentation and examples for the The GNU Bourne Again SHell + Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). + . + This package contains the distributable documentation, all the + examples and the main changelog. --- bash-4.2.orig/debian/bash.preinst.h +++ bash-4.2/debian/bash.preinst.h @@ -0,0 +1,37 @@ +#ifndef BASH_PREINST_H +#define BASH_PREINST_H + +/* + * This file is in the public domain. + * You may freely use, modify, distribute, and relicense it. + */ + +#define _XOPEN_SOURCE 700 +#include +#include +#include + +#if !defined(__GNUC__) && !defined(__attribute__) +# define __attribute__(x) +#endif +#define NORETURN __attribute__((__noreturn__)) +#define PRINTFLIKE __attribute__((format(printf, 1, 2))) + +enum wait_or_die_flags { + ERROR_OK = 1, + SIGPIPE_OK = 2 +}; + +extern NORETURN PRINTFLIKE void die_errno(const char *fmt, ...); +extern NORETURN PRINTFLIKE void die(const char *fmt, ...); + +extern int exists(const char *path); +extern void set_cloexec(int fd); +extern void xpipe(int pipefd[2]); + +extern void wait_or_die(pid_t child, const char *desc, int flags); +extern pid_t spawn(const char * const cmd[], int outfd, int errfd); +extern void run(const char * const cmd[]); /* spawn and wait */ +extern FILE *spawn_pipe(pid_t *pid, const char * const cmd[], int errfd); + +#endif --- bash-4.2.orig/debian/bash-doc.doc-base.bashref +++ bash-4.2/debian/bash-doc.doc-base.bashref @@ -0,0 +1,10 @@ +Document: bashref +Title: Bash Reference Manual +Author: Chet Ramey +Abstract: Bash is an sh-compatible command language interpreter that executes + commands read from the standard input or from a file. Bash also + incorporates useful features from the Korn and C shells (ksh and csh). +Section: Shells + +Format: pdf +Files: /usr/share/doc/bash/bashref.pdf --- bash-4.2.orig/debian/clear_console.c +++ bash-4.2/debian/clear_console.c @@ -0,0 +1,285 @@ +/* +Copyright (C) 2006-2008 Canonical Ltd. + +clear_console and it's man page are free software; you can redistribute it +and/or modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2, or (at your +option) any later version. +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#if defined(__linux) +#include +#include +#elif defined(__FreeBSD_kernel__) +#include +#include +#endif + +#include +#include + +#define VERSION "0.1" + +char* progname; +int quiet = 0; + +void usage() +{ + fprintf(stderr, "Usage: %s [option]\n", progname); + fprintf(stderr, "valid options are:\n"); + fprintf(stderr, "\t-q --quiet don't print error messages\n"); + fprintf(stderr, "\t-h --help display this help text and exit\n"); + fprintf(stderr, "\t-V --version display version information and exit\n"); +} + +const struct option opts[] = +{ + /* operations */ + {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'V'}, + {"quiet", no_argument, 0, 'q'}, + {0, 0, 0, 0} +}; + +static int putch(int c) +{ + return putchar(c); +} + + +/* taken from console-utils, lib/misc-console-utils.c */ + +int is_a_console(int fd) +{ +#if defined(__linux__) + char arg; +#elif defined(__FreeBSD_kernel__) + int arg; +#endif + + arg = 0; + return (ioctl(fd, KDGKBTYPE, &arg) == 0 + && ((arg == KB_OTHER) || (arg == KB_101) || (arg == KB_84))); +} + +static int open_a_console(char *fnam) +{ + int fd; + + /* try read-only */ + fd = open(fnam, O_RDWR); + + /* if failed, try read-only */ + if (fd < 0 && errno == EACCES) + fd = open(fnam, O_RDONLY); + + /* if failed, try write-only */ + if (fd < 0 && errno == EACCES) + fd = open(fnam, O_WRONLY); + + /* if failed, fail */ + if (fd < 0) + return -1; + + /* if not a console, fail */ + if (! is_a_console(fd)) + { + close(fd); + return -1; + } + + /* success */ + return fd; +} + +/* + * Get an fd for use with kbd/console ioctls. + * We try several things because opening /dev/console will fail + * if someone else used X (which does a chown on /dev/console). + * + * if tty_name is non-NULL, try this one instead. + */ + +int get_console_fd(char* tty_name) +{ + int fd; + + if (tty_name) + { + if (-1 == (fd = open_a_console(tty_name))) + return -1; + else + return fd; + } + + fd = open_a_console("/dev/tty"); + if (fd >= 0) + return fd; + + fd = open_a_console("/dev/tty0"); + if (fd >= 0) + return fd; + + fd = open_a_console("/dev/console"); + if (fd >= 0) + return fd; + + for (fd = 0; fd < 3; fd++) + if (is_a_console(fd)) + return fd; + +#if 0 + fprintf(stderr, + _("Couldnt get a file descriptor referring to the console\n")); +#endif + return -1; /* total failure */ +} + + +int is_pseudo_tty(int fd) +{ + char *tty = ttyname(fd); + + if (!tty) + { + if (!quiet) + perror("ttyname"); + return 0; + } + + if (strlen(tty) >= 9 && !strncmp(tty, "/dev/pts/", 9)) + return 1; + + if (strlen(tty) >= 8 && !strncmp(tty, "/dev/tty", 8) + && tty[8] >= 'a' && tty[8] <= 'z') + return 1; + + return 0; +} + +int clear_console(int fd) +{ + int num, tmp_num; +#if defined(__linux__) + struct vt_stat vtstat; +#endif + + /* clear screen */ + setupterm((char *) 0, 1, (int *) 0); + if (tputs(clear_screen, lines > 0 ? lines : 1, putch) == ERR) + { + exit(1); + } + + if (is_pseudo_tty(STDIN_FILENO)) + return 0; + + if (!strcmp(getenv("TERM"), "screen")) + return 0; + + /* get current vt */ +#if defined(__linux__) + if (ioctl(fd, VT_GETSTATE, &vtstat) < 0) +#elif defined(__FreeBSD_kernel__) + if (ioctl(fd, VT_ACTIVATE, &num) < 0) +#endif + { + if (!quiet) + fprintf(stderr, "%s: cannot get VTstate\n", progname); + exit(1); + } +#if defined(__linux__) + num = vtstat.v_active; +#endif + tmp_num = (num == 1 ? 2 : 1); + + /* switch vt to clear the scrollback buffer */ + if (ioctl(fd, VT_ACTIVATE, tmp_num)) + { + if (!quiet) + perror("chvt: VT_ACTIVATE"); + exit(1); + } + + if (ioctl(fd, VT_WAITACTIVE, tmp_num)) + { + if (!quiet) + perror("VT_WAITACTIVE"); + exit(1); + } + + /* switch back */ + if (ioctl(fd, VT_ACTIVATE, num)) + { + if (!quiet) + perror("chvt: VT_ACTIVATE"); + exit(1); + } + + if (ioctl(fd, VT_WAITACTIVE, num)) + { + if (!quiet) + perror("VT_WAITACTIVE"); + exit(1); + } + return 0; +} + +int main (int argc, char* argv[]) +{ + int fd; + int result; /* option handling */ + int an_option; + + if ((progname = strrchr(argv[0], '/')) == NULL) + progname = argv[0]; + else + progname++; + + while (1) + { + result = getopt_long(argc, argv, "Vhq", opts, &an_option); + + if (result == EOF) + break; + + switch (result) + { + case 'V': + fprintf(stdout, "%s: Version %s\n", progname, VERSION); + exit (0); + case 'h': + usage(); + exit (0); + + case 'q': + quiet = 1; + } + } + + if (optind < argc) + { + if (!quiet) + fprintf(stderr, "%s: no non-option arguments are valid", progname); + exit(1); + } + + if ((fd = get_console_fd(NULL)) == -1) + { + if (!quiet) + fprintf(stderr, "%s: terminal is not a console\n", progname); + exit(1); + } + + clear_console(fd); + + return 0; +} --- bash-4.2.orig/debian/bash-builtins.7 +++ bash-4.2/debian/bash-builtins.7 @@ -0,0 +1,18 @@ +.\" This is a hack to force bash builtins into the whatis database +.\" and to get the list of builtins to come up with the man command. +.TH BASH-BUILTINS 7 "2001 October 29" "GNU Bash-2.05a" +.SH NAME +bash-builtins \- bash built-in commands, see \fBbash\fR(1) +.SH SYNOPSIS +bash defines the following built-in commands: +:, ., [, alias, bg, bind, break, builtin, case, cd, command, compgen, complete, +continue, declare, dirs, disown, echo, enable, eval, exec, exit, +export, fc, fg, getopts, hash, help, history, if, jobs, kill, +let, local, logout, popd, printf, pushd, pwd, read, readonly, return, set, +shift, shopt, source, suspend, test, times, trap, type, typeset, +ulimit, umask, unalias, unset, until, wait, while. +.SH BASH BUILTIN COMMANDS +.nr zZ 1 +.so man1/bash.1 +.SH SEE ALSO +bash(1), sh(1) --- bash-4.2.orig/debian/copyright +++ bash-4.2/debian/copyright @@ -0,0 +1,429 @@ +This is Debian GNU/Linux's prepackaged version of the FSF's GNU Bash, +the Bourne Again SHell. + +This package was put together by Matthias Klose , from +the following sources: + + bash: ftp.gnu.org:/pub/gnu/bash/bash-4.2.tar.gz + +Bash homepage: http://tiswww.case.edu/php/chet/bash/bashtop.html + +Copyright (C) 1987-2010 Free Software Foundation, Inc. + +Bash is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +Bash is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Bash. If not, see . +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/GPL-3'. + +The Free Software Foundation has exempted Bash from the requirement of +Paragraph 2c of the General Public License. This is to say, there is +no requirement for Bash to print a notice when it is started +interactively in the usual way. We made this exception because users +and standards expect shells not to print such messages. This +exception applies to any program that serves as a shell and that is +based primarily on Bash as opposed to other GNU software. + + +Files with other copyright statement than: Copyright FSF, License GPL +--------------------------------------------------------------------- + +doc/FAQ ("the Bash FAQ") + + This document is Copyright 1995-2005 by Chester Ramey. + + Permission is hereby granted, without written agreement and + without license or royalty fees, to use, copy, and distribute + this document for any purpose, provided that the above copyright + notice appears in all copies of this document and that the + contents of this document remain unaltered. + + +doc/bashref.texi ("Bash Reference Manual"): + + Copyright (c) 1988-2005 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice + are preserved on all copies. + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' + and with the Back-Cover Texts as in (a) below. A copy of the license is + included in the section entitled ``GNU Free Documentation License.'' + + (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify + this GNU Manual, like GNU software. Copies published by the Free + Software Foundation raise funds for GNU development.'' + + +examples/obashdb/bashdb (Bash shell debugger) + + # Adapted from an idea in O'Reilly's `Learning the Korn Shell' + # Copyright (C) 1993-1994 O'Reilly and Associates, Inc. + # Copyright (C) 1998, 1999, 2001 Gary V. Vaughan > + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License [...] + + +examples/functions/pathfuncs (add dir to path) + + # @(#)Copyright (c) 1991 Simon J. Gerraty + # + # This file is provided in the hope that it will + # be of use. There is absolutely NO WARRANTY. + # Permission to copy, redistribute or otherwise + # use this file is hereby granted provided that + # the above copyright notice and this notice are + # left intact. + + +examples/functions/recurse (Recursive Directory Traverser) + + # Author: Kaz Kylheku + # Copyright 1999 + + +examples/scripts/bcsh.sh (Bourne shell cshell-emulator) + + # "Copyright (c) Chris Robertson, December 1985" + # + # This software may be used for any purpose provided the original + # copyright notice and this notice are affixed thereto. No warranties of + # any kind whatsoever are provided with this software, and it is hereby + # understood that the author is not liable for any damagages arising + # from the use of this software. + + +examples/scripts/websrv.sh (WWW server in sh) + + #copyright chris ulrich; This software may be used or modified + #in any way so long as this notice remains intact. + + +examples/loadables/getconf.c (POSIX.2 getconf utility) + + /* + * ORIGINAL COPYRIGHT STATEMENT: + * + * Copyright (c) 1994 Winning Strategies, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Winning Strategies, Inc. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + + /* + * POSIX.2 getconf utility + * + * Originally Written by: + * J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc. + * + * Heavily modified for inclusion in bash by + * Chet Ramey + */ + + +examples/loadables/cut.c: + + /* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Adam S. Moskowitz of Menlo Consulting and Marciano Pitargue. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + + +lib/readline/doc/rlman.texi (part of the GNU Readline Library manual) + + Copyright (c) 1988-2004 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice + are preserved on all copies. + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' + and with the Back-Cover Texts as in (a) below. A copy of the license is + included in the section entitled ``GNU Free Documentation License.'' + + (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify + this GNU Manual, like GNU software. Copies published by the Free + Software Foundation raise funds for GNU development.'' + + +lib/readline/doc/rltech.texi (part of the GNU Readline Library manual) + + Copyright (C) 1988-2005 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice + pare preserved on all copies. + + Permission is granted to process this file through TeX and print the + results, provided the printed document carries copying permission + notice identical to this one except for the removal of this paragraph + (this paragraph not being relevant to the printed manual). + + Permission is granted to copy and distribute modified versions of this + manual under the conditions for verbatim copying, provided that the entire + resulting derived work is distributed under the terms of a permission + notice identical to this one. + + Permission is granted to copy and distribute translations of this manual + into another language, under the above conditions for modified versions, + except that this permission notice may be stated in a translation approved + by the Foundation. + + +lib/readline/doc/rluser.texi (part of the GNU Readline Library manual) + + Copyright (C) 1988-2005 Free Software Foundation, Inc. + + Authored by Brian Fox and Chet Ramey. + + Permission is granted to process this file through Tex and print the + results, provided the printed document carries copying permission notice + identical to this one except for the removal of this paragraph (this + paragraph not being relevant to the printed manual). + + Permission is granted to make and distribute verbatim copies of this manual + provided the copyright notice and this permission notice are preserved on + all copies. + + Permission is granted to copy and distribute modified versions of this + manual under the conditions for verbatim copying, provided also that the + GNU Copyright statement is available to the distributee, and provided that + the entire resulting derived work is distributed under the terms of a + permission notice identical to this one. + + Permission is granted to copy and distribute translations of this manual + into another language, under the above conditions for modified versions. + + +readline/doc/{history,hstech,hsuser}.texi (GNU History Library Manual) + + Copyright (C) 1988-2002 Free Software Foundation, Inc. + Authored by Brian Fox and Chet Ramey. + + Permission is granted to make and distribute verbatim copies of this manual + provided the copyright notice and this permission notice are preserved on + all copies. + + Permission is granted to process this file through Tex and print the + results, provided the printed document carries copying permission notice + identical to this one except for the removal of this paragraph (this + paragraph not being relevant to the printed manual). + + Permission is granted to copy and distribute modified versions of this + manual under the conditions for verbatim copying, provided also that the + GNU Copyright statement is available to the distributee, and provided that + the entire resulting derived work is distributed under the terms of a + permission notice identical to this one. + + Permission is granted to copy and distribute translations of this manual + into another language, under the above conditions for modified versions. + + +lib/sh/inet_aton.c: + + * Copyright (c) 1983, 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * - + * Portions Copyright (c) 1993 by Digital Equipment Corporation. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies, and that + * the name of Digital Equipment Corporation not be used in advertising or + * publicity pertaining to distribution of the document or software without + * specific, written prior permission. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL + * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT + * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + + +lib/termcap/grot/termcap.info (GNU termcap library manual) + + Copyright (C) 1988 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice + are preserved on all copies. + + Permission is granted to process this file through TeX and print the + results, provided the printed document carries copying permission + notice identical to this one except for the removal of this paragraph + (this paragraph not being relevant to the printed manual). + + Permission is granted to copy and distribute modified versions of this + manual under the conditions for verbatim copying, provided that the entire + resulting derived work is distributed under the terms of a permission + notice identical to this one. + + Permission is granted to copy and distribute translations of this manual + into another language, under the above conditions for modified versions, + except that this permission notice may be stated in a translation approved + by the Foundation. + + +support/man2html.c + + * This program was written by Richard Verhoeven (NL:5482ZX35) + * at the Eindhoven University of Technology. Email: rcb5@win.tue.nl + * + * Permission is granted to distribute, modify and use this program as long + * as this comment is not removed or changed. + * + * THIS IS A MODIFIED VERSION. IT WAS MODIFIED BY chet@po.cwru.edu FOR + * USE BY BASH. + +debian/md5.[ch] + +/* + Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + L. Peter Deutsch + ghost@aladdin.com + + */ +/* $Id: md5.h 43594 2006-04-03 16:27:50Z matthias.klose $ */ +/* + Independent implementation of MD5 (RFC 1321). + + This code implements the MD5 Algorithm defined in RFC 1321, whose + text is available at + http://www.ietf.org/rfc/rfc1321.txt + The code is derived from the text of the RFC, including the test suite + (section A.5) but excluding the rest of Appendix A. It does not include + any code or documentation that is identified in the RFC as being + copyrighted. + + The original and principal author of md5.h is L. Peter Deutsch + . Other authors are noted in the change history + that follows (in reverse chronological order): + + 2002-04-13 lpd Removed support for non-ANSI compilers; removed + references to Ghostscript; clarified derivation from RFC 1321; + now handles byte order either statically or dynamically. + 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. + 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); + added conditionalization for C++ compilation from Martin + Purschke . + 1999-05-03 lpd Original version. + */ --- bash-4.2.orig/debian/skel.profile +++ bash-4.2/debian/skel.profile @@ -0,0 +1,22 @@ +# ~/.profile: executed by the command interpreter for login shells. +# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login +# exists. +# see /usr/share/doc/bash/examples/startup-files for examples. +# the files are located in the bash-doc package. + +# the default umask is set in /etc/profile; for setting the umask +# for ssh logins, install and configure the libpam-umask package. +#umask 022 + +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi --- bash-4.2.orig/debian/etc.bash.bashrc +++ bash-4.2/debian/etc.bash.bashrc @@ -0,0 +1,64 @@ +# System-wide .bashrc file for interactive bash(1) shells. + +# To enable the settings / commands in this file for login shells as well, +# this file has to be sourced in /etc/profile. + +# If not running interactively, don't do anything +[ -z "$PS1" ] && return + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, overwrite the one in /etc/profile) +PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + +# Commented out, don't overwrite xterm -T "title" -n "icontitle" by default. +# If this is an xterm set the title to user@host:dir +#case "$TERM" in +#xterm*|rxvt*) +# PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' +# ;; +#*) +# ;; +#esac + +# enable bash completion in interactive shells +#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then +# . /etc/bash_completion +#fi + +# sudo hint +if [ ! -e "$HOME/.sudo_as_admin_successful" ] && [ ! -e "$HOME/.hushlogin" ] ; then + case " $(groups) " in *\ admin\ *) + if [ -x /usr/bin/sudo ]; then + cat <<-EOF + To run a command as administrator (user "root"), use "sudo ". + See "man sudo_root" for details. + + EOF + fi + esac +fi + +# if the command-not-found package is installed, use it +if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then + function command_not_found_handle { + # check because c-n-f could've been removed in the meantime + if [ -x /usr/lib/command-not-found ]; then + /usr/bin/python /usr/lib/command-not-found -- "$1" + return $? + elif [ -x /usr/share/command-not-found/command-not-found ]; then + /usr/bin/python /usr/share/command-not-found/command-not-found -- "$1" + return $? + else + printf "%s: command not found\n" "$1" >&2 + return 127 + fi + } +fi --- bash-4.2.orig/debian/bash.preinst.c +++ bash-4.2/debian/bash.preinst.c @@ -0,0 +1,170 @@ +/* + * This file is in the public domain. + * You may freely use, modify, distribute, and relicense it. + */ + +#include "bash.preinst.h" +#include +#include +#include +#include +#include +#include +#include + +static void backup(const char *file, const char *dest) +{ + const char * const cmd[] = {"cp", "-dp", file, dest, NULL}; + if (exists(file)) + run(cmd); +} + +static void force_symlink(const char *target, const char *link, + const char *temp) +{ + /* + * Forcibly create a symlink to "target" from "link". + * This is performed in two stages with an + * intermediate temporary file because symlink(2) cannot + * atomically replace an existing file. + */ + if ((unlink(temp) && errno != ENOENT) || + symlink(target, temp) || + rename(temp, link)) + die_errno("cannot create symlink %s -> %s", link, target); +} + +static void reset_diversion(const char *package, const char *file, + const char *distrib) +{ + const char * const remove_old_diversion[] = + {"dpkg-divert", "--package", "bash", "--remove", file, NULL}; + const char * const new_diversion[] = + {"dpkg-divert", "--package", package, + "--divert", distrib, "--add", file, NULL}; + run(remove_old_diversion); + run(new_diversion); +} + +static int has_binsh_line(FILE *file) +{ + char item[sizeof("/bin/sh\n")]; + + while (fgets(item, sizeof(item), file)) { + int ch; + + if (!memcmp(item, "/bin/sh\n", strlen("/bin/sh\n") + 1)) + return 1; + if (strchr(item, '\n')) + continue; + + /* Finish the line. */ + for (ch = 0; ch != '\n' && ch != EOF; ch = fgetc(file)) + ; /* just reading */ + if (ch == EOF) + break; + } + if (ferror(file)) + die_errno("cannot read pipe"); + return 0; +} + +static int binsh_in_filelist(const char *package) +{ + const char * const cmd[] = {"dpkg-query", "-L", package, NULL}; + pid_t child; + int sink; + FILE *in; + int found; + + /* + * dpkg -L $package 2>/dev/null | ... + * + * Redirection of stderr is for quieter output + * when $package is not installed. If opening /dev/null + * fails, no problem; leave stderr alone in that case. + */ + sink = open("/dev/null", O_WRONLY); + if (sink >= 0) + set_cloexec(sink); + in = spawn_pipe(&child, cmd, sink); + + /* ... | grep "^/bin/sh\$" */ + found = has_binsh_line(in); + if (fclose(in)) + die_errno("cannot close read end of pipe"); + + /* + * dpkg -L will error out if $package is not already installed. + * + * We stopped reading early if we found a match, so + * tolerate SIGPIPE in that case. + */ + wait_or_die(child, "dpkg-query -L", ERROR_OK | + (found ? SIGPIPE_OK : 0)); + return found; +} + +static int undiverted(const char *path) +{ + const char * const cmd[] = + {"dpkg-divert", "--listpackage", path, NULL}; + pid_t child; + char packagename[sizeof("bash\n")]; + size_t len; + FILE *in = spawn_pipe(&child, cmd, -1); + int diverted = 1; + + /* Is $path diverted by someone other than bash? */ + + len = fread(packagename, 1, sizeof(packagename), in); + if (ferror(in)) + die_errno("cannot read from dpkg-divert"); + if (len == 0) + diverted = 0; /* No diversion. */ + if (len == strlen("bash\n") && !memcmp(packagename, "bash\n", len)) + diverted = 0; /* Diverted by bash. */ + + if (fclose(in)) + die_errno("cannot close read end of pipe"); + wait_or_die(child, "dpkg-divert", ERROR_OK | SIGPIPE_OK); + return !diverted; +} + +int main(int argc, char *argv[]) +{ + /* /bin/sh needs to point to a valid target. */ + + if (access("/bin/sh", X_OK)) { + backup("/bin/sh", "/bin/sh.distrib"); + backup("/usr/share/man/man1/sh.1.gz", + "/usr/share/man/man1/sh.distrib.1.gz"); + + force_symlink("bash", "/bin/sh", "/bin/sh.temp"); + force_symlink("bash.1.gz", "/usr/share/man/man1/sh.1.gz", + "/usr/share/man/man1/sh.1.gz.temp"); + } + if (!binsh_in_filelist("bash")) + /* Ready. */ + return 0; + + /* + * In bash (<= 4.1-3), the bash package included symlinks for + * /bin/sh and the sh(1) manpage in its data.tar. + * + * Unless we are careful, unpacking the new version of bash + * will remove them. So we tell dpkg that the files from bash + * to be removed are elsewhere, using a diversion on behalf of + * another package. + * + * Based on an idea by Michael Stone. + * “You're one sick individual.” -- Anthony Towns + * http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=85;bug=34717 + */ + if (undiverted("/bin/sh")) + reset_diversion("dash", "/bin/sh", "/bin/sh.distrib"); + if (undiverted("/usr/share/man/man1/sh.1.gz")) + reset_diversion("dash", "/usr/share/man/man1/sh.1.gz", + "/usr/share/man/man1/sh.distrib.1.gz"); + return 0; +} --- bash-4.2.orig/debian/run-my-gprof +++ bash-4.2/debian/run-my-gprof @@ -0,0 +1,32 @@ +#! /bin/sh + +PATH=.:$PATH # just to get recho/zecho/printenv if not run via `make tests' +export PATH + +# unset BASH_ENV only if it is set +[ "${BASH_ENV+set}" = "set" ] && unset BASH_ENV +# ditto for SHELLOPTS +#[ "${SHELLOPTS+set}" = "set" ] && unset SHELLOPTS + +: ${THIS_SH:=../bash} +export THIS_SH + +${THIS_SH} ./version + +rm -f /tmp/xx + +echo Any output from any test, unless otherwise noted, indicates a possible anomaly + +echo Running tests as test load ... + +for x in run-* +do + case $x in + $0|run-minimal|run-gprof|run-all) ;; + run-jobs|run-gprof) echo SKIP $x ;; + *.orig|*~) ;; + *) echo $x ; sh $x ;; + esac +done + +exit 0 --- bash-4.2.orig/debian/clear_console.1 +++ bash-4.2/debian/clear_console.1 @@ -0,0 +1,50 @@ +.\"*************************************************************************** +.\" Copyright (c) 1998,2000 Free Software Foundation, Inc. * +.\" * +.\" Permission is hereby granted, free of charge, to any person obtaining a * +.\" copy of this software and associated documentation files (the * +.\" "Software"), to deal in the Software without restriction, including * +.\" without limitation the rights to use, copy, modify, merge, publish, * +.\" distribute, distribute with modifications, sublicense, and/or sell * +.\" copies of the Software, and to permit persons to whom the Software is * +.\" furnished to do so, subject to the following conditions: * +.\" * +.\" The above copyright notice and this permission notice shall be included * +.\" in all copies or substantial portions of the Software. * +.\" * +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * +.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * +.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * +.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * +.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +.\" * +.\" Except as contained in this notice, the name(s) of the above copyright * +.\" holders shall not be used in advertising or otherwise to promote the * +.\" sale, use or other dealings in this Software without prior written * +.\" authorization. * +.\"*************************************************************************** +.\" +.\" $Id: clear.1,v 1.3 2000/07/15 23:59:35 china Exp $ +.TH clear_console 1 "" +.ds n 5 +.SH NAME +\fBclear_console\fR - clear the console +.SH SYNOPSIS +\fBclear_console\fR +.br +.SH DESCRIPTION +\fBclear_console\fR clears your console if this is possible. It looks in the +environment for the terminal type and then in the \fBterminfo\fR database to +figure out how to clear the screen. To clear the buffer, it then changes the +foreground virtual terminal to another terminal and then back to the original +terminal. +.SH SEE ALSO +\fBclear\fR(1), \fBchvt\fR(1) +.\"# +.\"# The following sets edit modes for GNU EMACS +.\"# Local Variables: +.\"# mode:nroff +.\"# fill-column:79 +.\"# End: --- bash-4.2.orig/debian/README.abs-guide +++ bash-4.2/debian/README.abs-guide @@ -0,0 +1,26 @@ +[ This is just a pointer to a document, which you might find helpful] + + Advanced Bash-Scripting Guide + + A complete guide to shell scripting, using Bash + + Mendel Cooper - Brindlesoft + + thegrendel@theriver.com + + +This tutorial assumes no previous knowledge of scripting or programming, but +progresses rapidly toward an intermediate/advanced level of instruction +(...all the while sneaking in little snippets of UNIX wisdom and lore). It +serves as a textbook, a manual for self-study, and a reference and source +of knowledge on shell scripting techniques. The exercises and heavily- +commented examples invite active reader participation, under the premise that +the only way to really learn scripting is to write scripts. + +The guide is availabe at http://tldp.org/LDP/abs/html/ + +The latest update of this document, as an archived "tarball" including both +the SGML source and rendered HTML, may be downloaded from the author's home +site (http://personal.riverusers.com/~thegrendel/abs-guide-2.1.tar.bz2). See +the change log for a revision history +(http://personal.riverusers.com/~thegrendel/Change.log). --- bash-4.2.orig/debian/skel.bash_logout +++ bash-4.2/debian/skel.bash_logout @@ -0,0 +1,7 @@ +# ~/.bash_logout: executed by bash(1) when login shell exits. + +# when leaving the console clear the screen to increase privacy + +if [ "$SHLVL" = 1 ]; then + [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q +fi --- bash-4.2.orig/debian/README.bash_completion +++ bash-4.2/debian/README.bash_completion @@ -0,0 +1,17 @@ + Programmable Completion + ======================= + +[BUG REPORTING: Please direct all enhancement requests directly to the + bash_completion maintainer, the completion script won't be changed for + Debian specific enhancements. If you find a real bug, report it the usual + way. The bash_completion author can be reached at + http://freshmeat.net/projects/bashcompletion/ + + If you find a newer version on freshmeat, you can replace it, if you did + not change the Debian version. +] + +To enable programmable completion for bash on Debian, uncomment the +bash_completion lines in /etc/bash.bashrc to source /etc/bash_completion. +/etc/bash_completion sources ~/.bash_completion, if it exists. + --- bash-4.2.orig/debian/compat +++ bash-4.2/debian/compat @@ -0,0 +1 @@ +5 --- bash-4.2.orig/debian/bash.menu +++ bash-4.2/debian/bash.menu @@ -0,0 +1,2 @@ +?package(bash):needs="text" section="Applications/Shells" title="Bash" command="/bin/bash --login" +?package(bash):needs="text" section="Applications/Shells" title="Sh" command="/bin/sh --login" --- bash-4.2.orig/debian/bash-static.overrides +++ bash-4.2/debian/bash-static.overrides @@ -0,0 +1,5 @@ +# yes lintian, it's called -static +bash-static binary: embedded-library + +# no, used conditionally +bash-static binary: manpage-has-errors-from-man --- bash-4.2.orig/debian/etc.profile +++ bash-4.2/debian/etc.profile @@ -0,0 +1,27 @@ +# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) +# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). + +PATH="/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games" + +if [ -f /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +if [ "$PS1" ]; then + if [ "$BASH" ]; then + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + if [ -f /etc/bash.bashrc ]; then + . /etc/bash.bashrc + fi + else + if [ "`id -u`" -eq 0 ]; then + PS1='# ' + else + PS1='$ ' + fi + fi +fi + +export PATH + +umask 022 --- bash-4.2.orig/debian/inputrc.arrows +++ bash-4.2/debian/inputrc.arrows @@ -0,0 +1,30 @@ +# This file controls the behaviour of line input editing for +# programs that use the Gnu Readline library. +# +# Arrow keys in keypad mode +# +"\C-[OD" backward-char +"\C-[OC" forward-char +"\C-[OA" previous-history +"\C-[OB" next-history +# +# Arrow keys in ANSI mode +# +"\C-[[D" backward-char +"\C-[[C" forward-char +"\C-[[A" previous-history +"\C-[[B" next-history +# +# Arrow keys in 8 bit keypad mode +# +"\C-M-OD" backward-char +"\C-M-OC" forward-char +"\C-M-OA" previous-history +"\C-M-OB" next-history +# +# Arrow keys in 8 bit ANSI mode +# +"\C-M-[D" backward-char +"\C-M-[C" forward-char +"\C-M-[A" previous-history +"\C-M-[B" next-history --- bash-4.2.orig/debian/locale-gen +++ bash-4.2/debian/locale-gen @@ -0,0 +1,30 @@ +#!/bin/sh + +LOCPATH=`pwd`/locales +export LOCPATH + +[ -d $LOCPATH ] || mkdir -p $LOCPATH + +umask 022 + +echo "Generating locales..." +while read locale charset; do + case $locale in \#*) continue;; esac + [ -n "$locale" -a -n "$charset" ] || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`" + echo -n ".$charset" + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'` + echo -n '...' + if [ -f $LOCPATH/$locale ]; then + input=$locale + else + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'` + fi + localedef -i $input -c -f $charset $LOCPATH/$locale #-A /etc/locale.alias + echo ' done'; \ +done </dev/null && [ -f /etc/shells ]; then + remove-shell /bin/bash + remove-shell /bin/rbash + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- bash-4.2.orig/debian/bash.preinst-lib.c +++ bash-4.2/debian/bash.preinst-lib.c @@ -0,0 +1,131 @@ +/* + * This file is in the public domain. + * You may freely use, modify, distribute, and relicense it. + */ + +#include "bash.preinst.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +extern char **environ; + +__attribute__((format(printf, 1, 0))) +static void vreportf(const char *err, va_list params, int errnum) +{ + fprintf(stderr, "bash.preinst: "); + vfprintf(stderr, err, params); + if (errnum) + fprintf(stderr, ": %s", strerror(errnum)); + fprintf(stderr, "\n"); +} + +__attribute__((format(printf, 1, 2))) +NORETURN void die_errno(const char *fmt, ...) +{ + va_list params; + va_start(params, fmt); + vreportf(fmt, params, errno); + va_end(params); + exit(1); +} + +__attribute__((format(printf, 1, 2))) +NORETURN void die(const char *fmt, ...) +{ + va_list params; + va_start(params, fmt); + vreportf(fmt, params, 0); + va_end(params); + exit(1); +} + +int exists(const char *file) +{ + struct stat sb; + if (!lstat(file, &sb)) + return 1; + if (errno == ENOENT) + return 0; + die_errno("cannot get status of %s", file); +} + +void set_cloexec(int fd) +{ + int flags = fcntl(fd, F_GETFL); + if (flags < 0 || fcntl(fd, F_SETFL, flags | FD_CLOEXEC)) + die_errno("cannot set close-on-exec flag"); +} + +void xpipe(int pipefd[2]) +{ + if (pipe(pipefd)) + die_errno("cannot create pipe"); + set_cloexec(pipefd[0]); + set_cloexec(pipefd[1]); +} + +void wait_or_die(pid_t child, const char *name, int flags) +{ + int status; + if (waitpid(child, &status, 0) != child) + die_errno("cannot wait for %s", name); + if ((WIFEXITED(status) && WEXITSTATUS(status) == 0) || + ((flags & ERROR_OK) && WIFEXITED(status)) || + ((flags & SIGPIPE_OK) && + WIFSIGNALED(status) && WTERMSIG(status) == SIGPIPE)) + return; + + if (WIFEXITED(status)) + die("%s exited with status %d", name, WEXITSTATUS(status)); + if (WIFSIGNALED(status)) + die("%s killed by signal %d", name, WTERMSIG(status)); + if (WIFSTOPPED(status)) + die("%s stopped by signal %d", name, WSTOPSIG(status)); + die("waitpid is confused (status=%d)", status); +} + +pid_t spawn(const char * const cmd[], int out, int err) +{ + pid_t child; + posix_spawn_file_actions_t redir; + + if (posix_spawn_file_actions_init(&redir) || + (out >= 0 && posix_spawn_file_actions_adddup2(&redir, out, 1)) || + (err >= 0 && posix_spawn_file_actions_adddup2(&redir, err, 2)) || + posix_spawnp(&child, cmd[0], &redir, NULL, + (char **) cmd, environ) || + posix_spawn_file_actions_destroy(&redir)) + die_errno("cannot run %s", cmd[0]); + return child; +} + +void run(const char * const cmd[]) +{ + pid_t child = spawn(cmd, -1, -1); + wait_or_die(child, cmd[0], 0); +} + +FILE *spawn_pipe(pid_t *pid, const char * const cmd[], int errfd) +{ + int pipefd[2]; + FILE *f; + + xpipe(pipefd); + *pid = spawn(cmd, pipefd[1], errfd); + if (close(pipefd[1]) || (errfd != -1 && close(errfd))) + die_errno("cannot close unneeded fd"); + + f = fdopen(pipefd[0], "r"); + if (!f) + die_errno("cannot stream read end of pipe"); + return f; +} --- bash-4.2.orig/debian/changelog +++ bash-4.2/debian/changelog @@ -0,0 +1,2588 @@ +bash (4.2-2ubuntu2.9) precise-security; urgency=medium + + * SECURITY UPDATE: Heap-based buffer overflow + - debian/patches/CVE-2012-6711.patch: making u32cconv() return + the number of bytes instead a negative value in + lib/sh/unicode.c + - CVE-2012-6711 + + -- Leonidas S. Barbosa Fri, 08 Nov 2019 09:46:02 -0300 + +bash (4.2-2ubuntu2.8) precise-security; urgency=medium + + * SECURITY UPDATE: rbash restriction bypass (LP: #1803441) + - debian/patches/CVE-2019-9924.patch: if the shell is restricted, + reject attempts to add pathnames containing slashes to the hash table + in variables.c. + - CVE-2019-9924 + + -- Leonidas S. Barbosa Mon, 05 Aug 2019 10:19:12 -0300 + +bash (4.2-2ubuntu2.7) precise-security; urgency=medium + + * SECURITY UPDATE: code execution via crafted SHELLOPTS and PS4 + (LP: #1689304) + - debian/patches/CVE-2016-7543.patch: check for root in variables.c. + - CVE-2016-7543 + + -- Leonidas S. Barbosa Mon, 31 Jul 2017 18:09:46 -0300 + +bash (4.2-2ubuntu2.6) precise-security; urgency=medium + + * SECURITY UPDATE: incorrect function definition parsing with + here-document delimited by end-of-file + - debian/patches/CVE-2014-6277.diff: properly handle closing delimiter + in bash/copy_cmd.c, bash/make_cmd.c. + - CVE-2014-6277 + * SECURITY UPDATE: incorrect function definition parsing via nested + command substitutions + - debian/patches/CVE-2014-6278.diff: properly handle certain parsing + attempts in bash/builtins/evalstring.c, bash/parse.y, bash/shell.h. + - CVE-2014-6278 + * Updated patches with official upstream versions: + - debian/patches/CVE-2014-6271.diff + - debian/patches/CVE-2014-7169.diff + - debian/patches/variables-affix.diff + - debian/patches/CVE-2014-718x.diff + + -- Marc Deslauriers Tue, 07 Oct 2014 11:05:06 -0400 + +bash (4.2-2ubuntu2.5) precise-security; urgency=medium + + * SECURITY UPDATE: out-of-bounds memory access + - debian/patches/CVE-2014-718x.diff: guard against overflow and fix + off-by-one in bash/parse.y. + - CVE-2014-7186 + - CVE-2014-7187 + * SECURITY IMPROVEMENT: use prefixes and suffixes for function exports + - debian/patches/variables-affix.diff: add prefixes and suffixes in + bash/variables.c. + + -- Marc Deslauriers Fri, 26 Sep 2014 13:27:53 -0400 + +bash (4.2-2ubuntu2.3) precise-security; urgency=medium + + * SECURITY UPDATE: incomplete fix for CVE-2014-6271 + - debian/patches/CVE-2014-7169.diff: fix logic in bash/parse.y. + - CVE-2014-7169 + + -- Marc Deslauriers Thu, 25 Sep 2014 02:11:10 -0400 + +bash (4.2-2ubuntu2.2) precise-security; urgency=medium + + * SECURITY UPDATE: incorrect function parsing + - debian/patches/CVE-2014-6271.diff: fix function parsing in + bash/builtins/common.h, bash/builtins/evalstring.c, bash/variables.c. + - CVE-2014-6271 + + -- Marc Deslauriers Mon, 22 Sep 2014 15:31:07 -0400 + +bash (4.2-2ubuntu2.1) precise-proposed; urgency=low + + * Fix directory expansion. (LP: #778627) + + -- Alec Warner Mon, 18 Mar 2013 22:12:54 +0000 + +bash (4.2-2ubuntu2) precise; urgency=low + + * Really apply upstream patches 021 - 024. + + -- Matthias Klose Tue, 03 Apr 2012 17:27:05 +0200 + +bash (4.2-2ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + + -- Matthias Klose Mon, 02 Apr 2012 23:58:07 +0200 + +bash (4.2-2) unstable; urgency=low + + * Fix command-not-found location. Closes: #529313. + * Print a replacement error message if command-not-found was removed + after bashrc was loaded. Closes: #631023. LP: #561155. + * skel.bashrc: Document and prepare enabling the globstar feature (Fabian + Greffrath). Closes: #627926. + * Apply upstream patches 021 - 024. + + -- Matthias Klose Fri, 30 Mar 2012 19:20:04 +0200 + +bash (4.2-1ubuntu3) precise; urgency=low + + * When cross-building, use the cross-strip, not the host strip. + + -- Steve Langasek Fri, 30 Mar 2012 23:09:19 +0000 + +bash (4.2-1ubuntu2) precise; urgency=low + + * Build-depend on gettext:any instead of on gettext, so that apt-get can + properly resolve build-dependencies on the tool when cross-building. + + -- Steve Langasek Thu, 29 Mar 2012 21:50:28 -0700 + +bash (4.2-1ubuntu1) precise; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + - skel.bashrc: + - Run lesspipe. + - Enable ls aliases. + - Set options in ll alias to -alF. + - Define an alert alias. + - Enabled colored grep aliases. + - etc.bash.bashrc: + - Add sudo hint. + + -- Matthias Klose Wed, 30 Nov 2011 11:30:24 +0100 + +bash (4.2-1) unstable; urgency=low + + [ Matthias Klose ] + * New upstream version. + * Apply upstream patches 001 - 020. + * Fix parsing of double doublequotes. LP: #780441. + * /etc/bash.bashrc: + - Fix quoting issue calling command-not-found. LP: #754859. Closes: #587185. + * Don't cache the value of brk between sbrk calls (Samuel Thibault). + Closes: #614815. + * Remove the bashdb and bash-completion packaging rules and files. + * Just link with libtinfo instead of libncurses if available. + * Make lintian happy. + * Use quilt to apply patches. + * Fix build error with -Werror=format-security (Pierre Chifflier). + Closes: #641350. + * Fix build for the binary target, without calling the build target. + Closes: #602159. + * Fix cross builds (Steve McIntyre). Closes: #629929. + + [ Jonathan Nieder ] + * Update copyright file. Many files that were GPL-2+ were relicensed + under GPL-3+ in bash 4.0-rc1. Closes: #632177. + * debian/rules: Use "rm -rf" instead of rmdir to remove usr/share/info + directory in "with_gfdl = no" build. This prevents build failures when + using the unmodified upstream tarball. + * bash.preinst: Tidy up a little. + - Remove codepath that would rename .bash_profile → .profile if .profile + was unmodified from the gutsy → hardy transition. Closes: #602244 + - Remove commented experiment from bash-completion transition. + - Remove misleading "dpkg --assert-support-predepends" check. + Closes: #602456. + - Move utility functions to a separate bash.preinst-lib.c and corresponding + declarations to bash.preinst.h. + * Remove /bin/sh symlink and /usr/share/man/man1/sh.1.gz from bash package + contents. Closes: #602483. + - debian/rules: Do not install /bin/sh and sh.1.gz symlinks. + - bash.preinst: + - Make sure /bin/sh is present and points to an executable, forcibly + creating symlinks /bin/sh -> bash and /usr/share/man/man1/sh.1.gz -> + bash.1.gz if not. + - Divert /bin/sh and sh.1.gz on behalf of dash if we are upgrading from + a bash version with /bin/sh in the files list and bash's copy of + /bin/sh is not already diverted. This ensures unpacking bash will not + cause /bin/sh to go missing. + * bash.postinst: Simplify comment that contained an implementation detail + about how /bin/sh is provided. + * Use dpkg-buildflags to retrieve compiler options, including hardening flags. + Build-Depends: dpkg-dev (>= 1.16.1) (Steve Langasek). Closes: #629929. + * Pass --host to configure only when cross-compiling, --build always, as + recommended in autotools documentation (Steve Langasek). + + * Merge from Ubuntu (closes: #648578): + - /etc/skel/.bashrc: + - Don't set HISTCONTROL twice. Thanks to Kevin Knerr. LP: #465500. + - Set HISTFILESIZE to 2000 and HISTSIZE to 1000. LP: #544542. + - README.Debian: Remove obsolete entry "Why is bash configured + with --disable-net-redirections?" + + -- Matthias Klose Wed, 30 Nov 2011 07:29:05 +0100 + +bash (4.2-0ubuntu4) oneiric; urgency=low + + * Apply upstream patches: + - 009: Fix segfault running `fc -l' two times in succession. + - 010: Correctly print/reproduce here documents attached to commands + inside compound commands. + * Fix parsing of double doublequotes. LP: #780441. + * /etc/bash.bashrc: + - Fix quoting issue calling command-not-found. LP: #754859. Closes: #587185. + - For .hushlogin file for sudo hint. LP: #672496. + * Don't cache the value of brk between sbrk calls (Samuel Thibault). + Closes: #614815. + + -- Matthias Klose Wed, 18 May 2011 10:56:41 +0200 + +bash (4.2-0ubuntu3) natty; urgency=low + + * Apply upstream patches 007 - 008. + + -- Matthias Klose Thu, 31 Mar 2011 17:59:39 +0200 + +bash (4.2-0ubuntu2) natty; urgency=high + + * Apply upstream patches 001 - 006. + * Fix bug in case evaluation handling (Chet Ramey). LP: #728748. + * Work around build failure in bash-static on amd64. + + -- Matthias Klose Fri, 04 Mar 2011 00:16:53 +0100 + +bash (4.2-0ubuntu1) natty; urgency=low + + * Bash 4.2 release. + + -- Matthias Klose Thu, 24 Feb 2011 01:25:40 +0100 + +bash (4.1-3) unstable; urgency=low + + * Apply upstream patches 003, 004, 005. + * Fix crash in declare builtin. + * /etc/skel/.bashrc: + - Enable sourcing of ~/.bash_aliases by default. Closes: #569798. + - Find command-not-found script. Closes: #529313. + * README.Debian: + - Remove references to --disable-net-redirections, bash-minimal. + - Mention that the upstream changelog can be found in the bash-doc + package. Closes: #551019. + + -- Matthias Klose Sat, 10 Apr 2010 10:35:29 +0200 + +bash (4.1-2ubuntu5) natty; urgency=low + + * No-change upload to reduce changelogs. + + -- Martin Pitt Mon, 13 Dec 2010 12:46:59 +0100 + +bash (4.1-2ubuntu4) maverick; urgency=low + + * debian/skel.bashrc: add 'alert' alias, LP: #616028 + + -- Dustin Kirkland Tue, 10 Aug 2010 15:35:08 -0400 + +bash (4.1-2ubuntu3) lucid; urgency=low + + * Rebuild statically linked bash-static binary against recent libc. + + -- Matthias Klose Sun, 18 Apr 2010 23:59:44 +0200 + +bash (4.1-2ubuntu2) lucid; urgency=low + + * Apply upstream patches 003, 004, 005. + - Fix crash with command completion on a word with a quoted globbing + character. + - Fix executing a shell function in Posix mode without local + variables, bash will not propagate a variable in a special builtin's + temporary environment to have global scope. + - Fix the `read' builtin times out after the timeout specified with -t + is exceeded, it does not reset the flags that tell signal handlers to + process signals immediately instead of deferring their handling. + * Fix crash in declare builtin. LP: #556101. + * README.Debian: + - Remove references to bash-minimal. + - Mention that the upstream changelog can be found in the bash-doc + package. + + -- Matthias Klose Sat, 10 Apr 2010 12:56:48 +0200 + +bash (4.1-2ubuntu1) lucid; urgency=low + + [ Dustin Kirkland ] + * Merge from debian testing. Remaining changes: + - Build from the upstream sources, build the documentation in info format. + - /etc/bash.bashrc: + + add sudo hint + + allow special characters + + add ll, la, l aliases + - /etc/skel/.bashrc: + + don't set HISTCONTROL twice + + set HISTSIZE to a reasonable 2000 + + eval lesspipe + + enable colored grep + + add ll, la, l aliases + * New bug fix, LP: #545262 + - /etc/skel/.bashrc: Uncomment useful aliases for ll, la, and l, + to better match sysadmin's expectations coming from other + enterprise distros + + [ Matthias Klose ] + * Set HISTFILESIZE to 2000 in the skeleton bashrc. LP: #544542. + + -- Dustin Kirkland Tue, 23 Mar 2010 11:56:51 -0700 + +bash (4.1-2) unstable; urgency=low + + * Apply upstream patches 001, 002. + + -- Matthias Klose Fri, 12 Mar 2010 02:08:45 +0100 + +bash (4.1-1ubuntu2) lucid; urgency=low + + * Allow special characters in home path in /etc/bash.bashrc + (LP: #330664) + * skel.bashrc: Don't set HISTCONTROL twice + (LP: #465500) + + -- Bryce Harrington Wed, 10 Feb 2010 23:10:50 -0800 + +bash (4.1-1ubuntu1) lucid; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + - /etc/skel/.bashrc: eval lesspipe. + + -- Matthias Klose Mon, 04 Jan 2010 19:10:28 +0100 + +bash (4.1-1) unstable; urgency=low + + * New upstream version 4.1. + * Stop building the bash-minimal package, not needed anymore with + dash being the default shell. + + -- Matthias Klose Sat, 02 Jan 2010 13:49:24 +0100 + +bash (4.1~rc1-1) unstable; urgency=low + + * New upstream version 4.1, release candidate 1. + + -- Matthias Klose Wed, 30 Dec 2009 15:41:40 +0100 + +bash (4.0-7) unstable; urgency=medium + + * Re-add the sh and sh(1) symlinks. Closes: #546516. + + -- Matthias Klose Mon, 14 Sep 2009 08:11:58 +0200 + +bash (4.0-6) unstable; urgency=medium + + * Pre-depend on dash, instead of just depending on it. + Closes: #546504, #546516, #546518. + * Update and set homepage attribute. Closes: #546377, #546381. + + -- Matthias Klose Sun, 13 Sep 2009 13:35:38 +0200 + +bash (4.0-5ubuntu2) karmic; urgency=low + + * Still ship the sh and sh(1) symlinks. LP: #429048. + + -- Matthias Klose Mon, 14 Sep 2009 06:51:00 +0200 + +bash (4.0-5ubuntu1) karmic; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + - /etc/skel/.bashrc: eval lesspipe. + + -- Matthias Klose Sun, 13 Sep 2009 13:22:17 +0200 + +bash (4.0-5) unstable; urgency=low + + * Re-add dependency on dash, lost with the upload of 4.0. + * Don't configure with --disable-net-redirections. + * Fix name of system wide bash_logout in bash(1). Closes: #546200. + * Stop shipping the sh and sh(1) symlinks. Closes: #545103. + * Apply upstream patches 029 - 033. + + -- Matthias Klose Sun, 13 Sep 2009 12:55:54 +0200 + +bash (4.0-4ubuntu2) karmic; urgency=low + + * Changes to the skeleton .bashrc: + - Source ~/.bash_aliases by default. LP: #408329. + + -- Matthias Klose Mon, 24 Aug 2009 13:59:12 +0200 + +bash (4.0-4ubuntu1) karmic; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + - /etc/skel/.bashrc: eval lesspipe. + * Changes to the skeleton .bashrc: + - Source .bash_aliases after defining aliases. LP: #400686. + - Enable color support for grep. LP: #386502. + * The bash docs now describe uname -s not having any effect on many + systems. LP: #378595. + * Don't ship an info dir file. LP: #358932. + * Fix some lintian warnings. + + -- Matthias Klose Mon, 24 Aug 2009 12:06:59 +0200 + +bash (4.0-4) unstable; urgency=low + + * Apply upstream patches 024 - 028. + - patch 028 closes: #519165. bash-4.0 reverted to the historical + shell behavior of raising an error when $@ or $* was expanded + after `set -u' had been executed and there were no positional + parameters. The Posix working group has since clarified the + standard's position on the issue, and $@ and $* are now the only + variables, parameters, or special parameters that do not raise an + error when unset if set -u is enabled. + * Enable net redirections, now that bash isn't the default shell + anymore. + * Changes to the skeleton .bashrc: + - Fix example lines in /etc/bash.bashrc to enable bash completion. + Closes: #523706, #522857. + - Don't export HISTCONTROL in bashrc. Closes: #540371. + - Support user dircolors settings in ~/.dircolors. Closes: #506213. + + -- Matthias Klose Sun, 23 Aug 2009 16:09:36 +0200 + +bash (4.0-3) experimental; urgency=low + + * Apply upstream patches 011 - 024. + + -- Matthias Klose Sun, 17 May 2009 15:29:21 +0200 + +bash (4.0-2) experimental; urgency=low + + * Apply upstream patches 001 - 010. Closes: #518289. + * Fix insecure temp file handling in examples scripts. Closes: #509279. + * /etc/skel.bashrc: Only source bash_completion, if posix mode is turned + off. Closes: #498474. + + -- Matthias Klose Sat, 21 Mar 2009 15:06:46 +0100 + +bash (4.0-1ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + - /etc/skel/.bashrc: eval lesspipe. + + -- Matthias Klose Sun, 01 Mar 2009 11:00:00 +0100 + +bash (4.0-1) experimental; urgency=low + + * New upstream version 4.0. + + -- Matthias Klose Sun, 01 Mar 2009 10:56:15 +0100 + +bash (4.0-0ubuntu1) jaunty; urgency=low + + * New upstream version 4.0 beta. + + -- Matthias Klose Sat, 29 Nov 2008 18:20:35 +0100 + +bash (3.2-6) unstable; urgency=medium + + * bash. Depend on dash to install dash as a required package. + + -- Matthias Klose Mon, 20 Jul 2009 23:56:24 +0000 + +bash (3.2-5ubuntu1) jaunty; urgency=low + + * Merge with Debian; remaining changes: + + -- Matthias Klose Sun, 01 Mar 2009 10:40:20 +0100 + +bash (3.2-6) unstable; urgency=medium + + * bash. Depend on dash to install dash as a required package. + + -- Matthias Klose Mon, 20 Jul 2009 23:56:24 +0000 + +bash (3.2-5) unstable; urgency=low + + * Apply upstream fixes 040 - 048. + + -- Matthias Klose Sun, 01 Mar 2009 10:20:52 +0100 + +bash (3.2-4ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + - /etc/skel/.bashrc: eval lesspipe. + + -- Matthias Klose Mon, 12 May 2008 18:53:01 +0200 + +bash (3.2-4) unstable; urgency=low + + * bash-minimal, bash-static: Only call `add-shell' on new installations. + * Only call remove-shell on package removal or purge. + + -- Matthias Klose Mon, 12 May 2008 18:49:07 +0200 + +bash (3.2-3ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + - /etc/skel/.bashrc: eval lesspipe. + + -- Matthias Klose Sun, 11 May 2008 08:32:22 +0000 + +bash (3.2-3) unstable; urgency=low + + * /etc/skel/.bashrc: Overwrite SHELL for calling lesspipe. Closes: #385168. + * Only call `add-shell' on new installations. Closes: #477750. + * Apply upstream fixes 034 - 039. + * Add explicit copyright notice to clear_console(1). + + -- Matthias Klose Sun, 20 Apr 2008 13:31:10 +0200 + +bash (3.2-2ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Build from the upstream sources, build the documentation in info format. + + -- Matthias Klose Wed, 07 May 2008 11:31:40 +0200 + +bash (3.2-2) unstable; urgency=low + + * Add a shopt option compat31 to fall back to the behaviour of bash-3.1 + and earlier versions, in that quoting the string argument to the [[ + command's =~ +operator does not force string matching. + + * Merge from Ubuntu: + - Remove /etc/skel/.bash_profile, if it is unmodified; if modified and + /etc/skel/.profile is unmodifed, move .bash_profile to .profile. + - /etc/skel/.bashrc: Add an option to blurt a terminal window with a + colored prompt. + - /etc/skel/.bashrc: Add color support for grep and friends (commented + out by default). Closes: #420659. + - /etc/skel/.profile: Avoid the use of `~'. + - Don't run command-not-found from the shell scripts when it has been + removed in the meantime. + * /etc/skel/.bashrc: + - Comment out the lesspipe settings. Closes: #470453. + - Don't use PROMPT_COMMAND to set the title of an xterm. Closes: #420656. + - Don't second-guess terminal handling in dircolors. Closes: #473870. + - Don't overwrite GNU Midnight Commander's setting of HISTCONTROL to + `ignorespace'. Closes: #440102. + - Add a comment about setting HISTSIZE and HISTFILESIZE. Closes: #449587. + - Append to the history file, don't overwrite it. Closes: #452459. + - Use dir and vdir commands for dir vdir aliases. Closes: #420661. + * /etc/skel/.profile: + - Add comment about setting the umask for ssh logins. Closes: #314533. + + * Added code to defer the initialization of HISTSIZE until the history file + is loaded. Closes: #383762. + * Fix typos in README.Debian and preinst. Closes: #374452. + * Mention `exec' builtin in the section `redirection'. Closes: #378067. + * Add bashbug(1). Closes: #442477. + * Fix typos in bash(1). Closes: #390493, #426687. + * Fix bug in Bash_aliases example. Closes: #423488. + * Fix typo in help message for caller builtin. Closes: #452656. + + -- Matthias Klose Sun, 20 Apr 2008 11:20:08 +0200 + +bash (3.2-1) experimental; urgency=low + + * New upstream version (including upstream patches 01 - 33). Closes: #431620. + - Added write error reporting to printf builtin. Closes: #414285. + - Fixed a bug that caused `unset LANG' to not properly reset the locale. + Closes: #364861. + - Describe expansion of pattern in case statement. Closes: #342225. + - Improved handling of non-printable characters in prompt. Closes: #352234, + #362010, #397086, #418961, #471490. + - Fix typos in documentation. Closes: #382892. + + The syntax of regexes in Bash 3.2 was changed so that single quotes no + longer surround regexes. e.g, a regex of the form + if [[ "foo.tex" =~ '^(.*)\.tex$' ]] + becomes + if [[ "foo.tex" =~ ^(.*)\.tex$ ]] + + * Merge from Ubuntu: + - debian/skel.bashrc: Check for dircolors before using it. + - debian/skel.bashrc: Set HISTCONTROL to ignoreboth. + - Include correct bash.pot file. + - Move CWRU/changelog from the bash to the bash-doc package (we already + have the CHANGES files). + - debian/etc.bash.bashrc: Install command-not-found handler if available. + + -- Matthias Klose Sun, 10 Feb 2008 23:49:35 +0100 + +bash (3.2-0ubuntu17) hardy-proposed; urgency=low + + * /etc/skel/.bashrc: Fix typo, forcing a colored prompt. LP: #223256. + * Add missing md5sum for feisty and gutsy /etc/skel/.bash_profile, + so it is removed on upgrade to hardy if unmodified. LP: #211406. + * Apply upstream patches 034 - 039, applying fixes for: + - The bash getcwd replacement will write past the end of allocated memory + when it allocates the buffer itself if it uses the buffer size passed + as an argument, and that size is less than the length of the pathname. + - Bash incorrectly puts the second and subsequent children spawned by a + shell forked to run a command substitution in the wrong process group. + - When initializing a subshell, bash did not reset a sentinel keeping + track of the number of command substitutions, leading to an infinite + loop if an error was encountered in the subshell. + - Bash inappropriately evaluates command substitutions while expanding + directory names as part of command substitution. + - When reading input lines into a single variable using the `read' builtin, + bash did not free the memory it read after assigining it to the named + variable, causing a memory leak noticable when reading large amounts of + data. + - Replace shell-compat patches with upstream patch 039 (compat31). + * Reenable running the testsuite during the build. + * Only call add-shell on new installations; guard remove-shell in post + removal. + + -- Matthias Klose Wed, 07 May 2008 09:56:53 +0200 + +bash (3.2-0ubuntu16) hardy; urgency=low + + * Remove /etc/skel/.bash_profile, if it is unmodified; if modified and + /etc/skel/.profile is unmodifed, move .bash_profile to .profile. + LP: #211406. + * /etc/skel/.bashrc: Add an option to blurt a terminal window with a + colored prompt. LP: #103929. + * /etc/skel/.bashrc: Add color support for grep and friends (commented out + by default). LP: #144632. + * /etc/skel/.profile: Avoid the use of `~'. LP: #200283. + * Add a shopt option compat31 to falls back to the behaviour of bash-3.1 + and earlier versions, in that quoting the string argument to the [[ + command's =~ +operator does not force string matching. LP: #110407. + + -- Matthias Klose Tue, 15 Apr 2008 01:24:06 +0200 + +bash (3.2-0ubuntu15) hardy; urgency=low + + * Don't run command-not-found from the shell scripts when it has been + removed in the meantime (LP: #194939) + + -- Kjell Braden Sun, 24 Feb 2008 12:01:31 +0100 + +bash (3.2-0ubuntu14) hardy; urgency=low + + * Build-depend on sharutils ... but save the control file before uploading. + + -- Matthias Klose Sat, 09 Feb 2008 03:10:16 +0100 + +bash (3.2-0ubuntu13) hardy; urgency=low + + * Build-depend on sharutils. + + -- Matthias Klose Sat, 09 Feb 2008 00:19:37 +0000 + +bash (3.2-0ubuntu12) hardy; urgency=low + + * Apply upstream patches 026 - 033. Fixes for: + - Keep the Apple linker from attempting to link bash against Apple's + readline library "replacement" rather than the one shipped with bash. + - When updating the display after displaying, for instance, a list + of possible completions, readline will place the cursor at the wrong + position if the prompt contains invisible characters and a newline. + LP: #119938. + - Under some circumstances, readline will incorrectly display a prompt + string containing invisible characters after the final newline. + - When the bash arithmetic expression evaluator has temporarily turned off + evalation, such as when parsing a pre- or post-decrement or -increment + operator, and an error occurs, evaluation is not re-enabled. + - If redirections attached to a compound command fail, bash does not set + the command's exit status correctly. This only happens when the command + is the first in a sequential list. + - In certain cases when outputting characters at the end of the line, e.g., + when displaying the prompt string, readline positions the cursor + incorrectly if the prompt string contains invisible characters and the + text being drawn begins before the last invisible character in the line. + - There is an off-by-one error in the code that buffers characters + received very quickly in succession, causing characters to be dropped. + - References made within a function to an uninitialized local array + variable using the [*] subscript in a double-quoted string can result + in spurious ASCII 127 characters in the expanded value. + * Remove bash-completion from the source. + * Remove the conflict with bash-completion, recommend bash-completion. + * debian/skel.bashrc: Check for dircolors before using it. LP: #121992. + * Include correct bash.pot file. LP: #104261. + + -- Matthias Klose Fri, 08 Feb 2008 19:26:17 +0100 + +bash (3.2-0ubuntu11) gutsy; urgency=low + + * Move CWRU/changelog from the bash to the bash-doc package (we already + have the CHANGES files). + * Support safe-upgrade and full-upgrade in aptitude auto completion. + (Benjamin Rubin). LP: #128575. + + [ Daniel Hahler] + * Apply upstream patches 018 - 025 (LP: #147946), fixes for: + - 018: Fix losing saved status of a background job and fix + infinite loop after creating and waiting for 4096 jobs. + - 019: Properly report error status when rl_read_key returns -1, + fixes cause of input loops. + - 020: Fix state consistency in some cases of error processing, + when jumping back to the top-level processing loop from + a builtin command. + - 021: When the parser read a backslash-escaped character that would + be treated internally as an escape, it would double the number + of escape characters. + - 022: POSIX specifies that the `read' builtin invoked from an interative + shell must prompt with $PS2 when a line is continued using a backslash + while reading from a terminal. + - 023: When an error occurs during the pattern removal word expansion, + the shell can free unallocated memory or free memory multiple times. + - 024: Fix calculation of screen position when performing a redisplay in + which the new text uses more space, but fewer bytes. + - 025: Fix dropping each 511th character of buffered input, e.g. when + pasting a large amount of data. + + -- Matthias Klose Fri, 05 Oct 2007 15:31:40 +0200 + +bash (3.2-0ubuntu10) gutsy; urgency=low + + * Trigger rebuild for hppa + + -- LaMont Jones Fri, 28 Sep 2007 10:34:31 -0600 + +bash (3.2-0ubuntu9) gutsy; urgency=low + + * debian/etc.bash.bashrc: + - updated for new location of command-not-found + - fix parsing of commands that look like arguments (LP: #124301) + + -- Michael Vogt Mon, 27 Aug 2007 08:53:07 +0200 + +bash (3.2-0ubuntu8) gutsy; urgency=low + + * Apply upstream patch 014 - 017, fixes for: + - Mishandling word splitting under certain circumstances when IFS is + null (IFS=). + - Fix unlinking FIFOs under certain circumstances, when using FIFOs + for process substitution. + - Fixes for displaying long prompts. + * textex -> texlive transition. + + -- Matthias Klose Thu, 17 May 2007 11:39:42 +0200 + +bash (3.2-0ubuntu7) feisty; urgency=low + + * Apply upstream patch 011 - 013, fixes for: + - 011: Under certain circumstances (loopback mounts), the bash getcwd does + not return correct results. This patch allows the use of the Solaris + libc getcwd even though it doesn't dynamically allocate memory. + - 012: Some systems (AIX 4.x) don't implement the PRI_xxx macros correctly, + causing syntax errors when attempting to compile bash on those systems. + This patch adds support for the PRI_MACROS_BROKEN define. + - 013: Readline neglects to reallocate the array it uses to keep track + of wrapped screen lines when increasing its size. This will eventually + result in segmentation faults when given sufficiently long input. + + -- Matthias Klose Fri, 6 Apr 2007 15:34:09 +0200 + +bash (3.2-0ubuntu6) feisty; urgency=low + + * Apply upstream patch 010. + The glibc implementation of regcomp/regexec does not allow backslashes to + escape "ordinary" pattern characters when matching. Bash used backslashes + to quote all characters when the pattern argument to the [[ special + command's =~ operator was quoted. This caused the match to fail on Linux + and other systems using GNU libc. + + -- Matthias Klose Tue, 6 Mar 2007 03:59:49 +0100 + +bash (3.2-0ubuntu5) feisty; urgency=low + + * Install /etc/skel/.profile, instead of /etc/skel/.bash_profile. + Users will find a ~/.profile instead of ~/.bash_profile; ~/.profile + is not read by a bash login shell, if ~/.bash_profile still exists. + * Fix one more crash in clear_console. Ubuntu #87402. + + -- Matthias Klose Sat, 3 Mar 2007 14:06:07 +0100 + +bash (3.2-0ubuntu4) feisty; urgency=low + + * Fix crash in clear_console. Ubuntu #85165. + * Fix scp command completion. Ubuntu #82849. + * Set Ubuntu maintainer address. + + -- Matthias Klose Wed, 21 Feb 2007 15:38:51 +0100 + +bash (3.2-0ubuntu3) feisty; urgency=low + + * debian/rules: Adjust to changed brace expansion in 3.2. + + -- Matthias Klose Mon, 8 Jan 2007 16:29:27 +0000 + +bash (3.2-0ubuntu2) feisty; urgency=low + + * Apply upstream patches 006 - 009. + + -- Matthias Klose Mon, 8 Jan 2007 11:07:45 +0000 + +bash (3.2-0ubuntu1) feisty; urgency=low + + * New upstream version. + - Remove rl-inputrc.dpatch, applied upstream. + - Remove ulimit.dpatch, ulimit-doc.dpatch, read-memleak, login-shell, + man-typos, applied upstream. + * Bugs fixed upstream: + - Traps overwrite job names. Ubuntu #41082. + * Apply upstream patches 001 - 005. + * Set HISTCONTROL to ignoreboth. Ubuntu #66539. + * Fix comment about umask setting in /etc/skel/.bash_profile. Ubuntu #71294. + * bash-completion: + - Fix typo in pkg-config completion. Ubuntu #58054. + - Add completion for apt-get autoremove. Ubuntu #60666. + - Add kaffeine completion for srt files. Ubuntu #64274. + * Merge with Debian unstable; remaining changes: + - Source package built using the unmodified upstream tarball. + - Build the bash-doc package including the texinfo docs. + - Skeleton scripts. + + -- Matthias Klose Mon, 4 Dec 2006 10:01:04 +0000 + +bash (3.1dfsg-9) unstable; urgency=low + + * Remove bash-completion from the source. + * Remove the conflict with bash-completion, recommend bash-completion. + * Fix quotes in man page. Closes: #402845. + * clear_console: Don't segv if stdin isn't a tty. Closes: #451819. + * clear_console(1): Fix synopsis. Closes: #441242. + * Clarify bash-doc package description: Closes: #394275. + + -- Matthias Klose Sat, 09 Feb 2008 10:14:22 +0100 + +bash (3.1dfsg-8) unstable; urgency=high + + * bash-doc: Install copyright file when building without the + gfdl'ed docs. Closes: #402471. + + -- Matthias Klose Mon, 11 Dec 2006 22:08:10 +0100 + +bash (3.1dfsg-7) unstable; urgency=medium + + * Restore the bash(1) manual page. Closes: #392989. + + -- Matthias Klose Sun, 22 Oct 2006 13:41:59 +0000 + +bash (3.1dfsg-6) unstable; urgency=low + + * Remove the texinfo documentation from the package. Closes: #357260. + * Remove the FAQ from the package. + + -- Matthias Klose Thu, 12 Oct 2006 22:35:46 +0200 + +bash (3.1-5ubuntu3) edgy; urgency=low + + * debian/bash_completion/bash_completion: + - added new apt autoremove option + * debian/etc.bash.bashrc: + - if the command-not-found package is installed, use it + + -- Michael Vogt Tue, 19 Sep 2006 21:56:57 +0200 + +bash (3.1-5ubuntu2) edgy; urgency=low + + * debian/patches/command-not-found-bashrc.diff: + - support the command-not-found package (if installed) + out-of-the-box (command-not-found-magic spec) + + -- Michael Vogt Mon, 28 Aug 2006 20:22:52 +0200 + +bash (3.1-5ubuntu1) edgy; urgency=low + + * Resynchronize with Debian unstable. + - Remaining change: bashrc sudo hint. + + -- Matthias Klose Wed, 5 Jul 2006 13:11:22 +0000 + +bash (3.1-5) unstable; urgency=low + + * Work around the broken remove-shell, not checking for the existance + of /etc/shells (closes: #337097). + * Force rebuild of bashref.info (closes: #354303, #357258). + * Apply upstream patches 015, 016, 017, fixing + - a problem with the extended globbing code prevented dots from matching + filenames when used in some extended matching patterns. + - core dumps when attempting to perform globbing in directories with + very large numbers of files. + - Array expansion failure with an arithmetic syntax error when the + subscript appears within double quotes. Closes: #358831. + * Add copyrights for contributed files (Joost van Baal). Closes: #357607. + * bash_completion: + - Add apt-cache madison completion: Closes: #342073, #359021. + - Complete files with spaces for bzip2. Closes: #356218. + - Complete whatis and apropos like man. Closes: #352145. + - Ignore stderr in apt-cache completion. Closes: #367198. + - Add flv|FLV files completion for mplayer. Closes: #364509, #373904. + - Add dvi|DVI files completion for evince. Ubuntu #49880. + * Fix typos in man page. Closes: #360543. + + [ Ian Jackson ] + * Make bash die if it cannot read its input file. Closes: #320036. + (This is not an ideal fix because, for example, the exit status is + still wrong - it should be 127, not 2. Also, the filename is not + printed. Unfortunately the code is badly tangled making this small + fix the most appropriate approach.) + + -- Matthias Klose Wed, 5 Jul 2006 06:56:54 +0200 + +bash (3.1-4) unstable; urgency=low + + * Update upstream patch 010, apply upstream patches 012, 013, 014. + * bash-default-editor.dpatch: Fix typo (closes: #356308). + * clear_console: Add FreeBSD support (Aurelian Jarno). Closes: #355336. + * clear_console: Only get rid of any history in the scrollback, if + not running in a pseudo tty (closes: #355815). + * bash_completion: + - Fix error in minicom completion (closes: #357241). + + -- Matthias Klose Thu, 23 Mar 2006 01:16:22 +0100 + +bash (3.1-3) unstable; urgency=low + + * Apply upstream patches 006, 007, 008, 009, 010 and 011. + * Define PGRP_PIPE to avoid race condition; monitor mode causes emacs as + $EDITOR to hang on kernel 2.6 (Jim Paris). Closes: #224543. + * Fix read memleak when reading from non-blocking fd (Tim Waugh). + * Recognize 'exec -l /bin/bash' as login shell (Tim Waugh). + * Fix parameter expansion: Array member length expansion fails with nested + index expression (Jan C. Nordholz). Closes: #345861. + * Add swedish translation of message strings. Closes: #349677. + + Merge from Ubuntu: + * clear_console: New helper program to clear the console, including + the scrollback buffer. + * /etc/skel/.bash_logout: Install it again and use clear_console. + Ubuntu #29405. Closes: #331504. + * /etc/skel/.bashrc: Enable bash_completion. + Ubuntu #11414, #25096. + * bash_completion: + - Fix ssh completion to match lines starting with `Hostname' as well. + Closes: #343312. + * Add ulimit options -e and -r. + + * Update bash_completion to 20060301: + - Completion for minicom(1), mtr(8), sysctl(8), smartctl(8), vncviewer(1), + invoke-rc.d, update-rc.d and dpkg-source has been added. + Closes: #323824, #327414. + - gdb completion of second parameter was broken when first parameter + contained white space. + - gdb completion wasn't completing second parameter correctly when it was + a file, rather than a PID. + - Ruby ri completion has been broken for some time. This is now fixed. + - Various fixes to work around change in how POSIX quoting is handled in + bash 3.1. + - subversion completion has been reimplemented from scratch and integrated + into the main file. + - iconv(1) completion has been improved. + - yum(8) completion has been updated for current version of yum. + - ant completion will now make use of complete-ant-cmd.pl, if available. + - cvs(1) completion has been improved with 'update' and 'stat' completion. + - 'aptitude show' now works in the same way as 'apt-cache show'. + - make(1) now also completes on file names. + - MPlayer will now also complete on .flac, .mpc and .3gp files. + Closes: #340452. + - wine will now also complete on .exe.so files. + - unzip will now also complete on oowriter's .ott files. + - xine et al will now complete on .mng files. + - The list of programs completing on .dvi files has been expanded. + - The range of files on which timidity and evince complete has been + expanded. Closes: #351848. + - mkisofs completion now defaults to treating results as file names. + - $DEBUG has been renamed $BASH_COMPLETION_DEBUG to avoid namespace clashes + with other software. + - man(1) completion now works correctly on OpenBSD. + - svk and Mercurial completion have been added to contribs. Closes: #324169. + - Many other small optimisations and fixes. Closes: #325056. + + -- Matthias Klose Sat, 4 Mar 2006 01:54:25 +0100 + +bash (3.1-2) unstable; urgency=low + + * Apply upstream patches 002 - 005. + + -- Matthias Klose Tue, 10 Jan 2006 00:19:25 +0100 + +bash (3.1-0ubuntu3) dapper; urgency=low + + * Document supported ulimit options. + * Fix parsing problems with compound assignments + * Fix readline callback interface. + * Fix ssh command completion (closes: #343312). + + -- Matthias Klose Fri, 23 Dec 2005 11:31:36 +0100 + +bash (3.1-0ubuntu2) dapper; urgency=low + + * command-not-found handler: Print error message, when command not found. + Ubuntu #5120. + * fix ssh command completion. + + -- Matthias Klose Sun, 11 Dec 2005 16:14:14 +0100 + +bash (3.1-1) unstable; urgency=low + + * New upstream version (final 3.1 release). + - Fixed a small memory leak in the programmable completion code. + Closes: #338822. + * Generate the locales needed for the testsuite, build-depend on locales. + * Improve check for existance of /dev/stdin during build. Closes: #333935. + * Fix bash_completion, sudo completion does not protect empty arguments. + Closes: #329148. + * /etc/bash.bashrc: Don't change the xterm title by default, keep the + default for /etc/skel/.bashrc. Closes: #313617, #314614. + + -- Matthias Klose Sat, 10 Dec 2005 00:56:28 +0100 + +bash (3.0+3.1rc1-1) unstable; urgency=low + + * New upstream version (3.1-rc1). + * Remove patches applied upstream: rl-del-backspace-policy, bad-interp. + + -- Matthias Klose Fri, 11 Nov 2005 12:59:32 +0000 + +bash (3.0+3.1b1-1) unstable; urgency=low + + * New upstream version (3.1-beta1). + * Remove bash's dependency on passwd, add one to debianutils (>= 2.15). + + -- Matthias Klose Thu, 13 Oct 2005 15:49:49 +0200 + +bash (3.0+3.1a1-1) unstable; urgency=low + + * New upstream version (3.1-alpha1). + - Fix "cd -P" hanging (closes: #316407). + - Fixed exit status code so that a suspended job returns 128+signal as its + exit status (preventing commands after it in `&&' lists from being + executed). Closes: #288319. + - The globbing code now uses malloc, with its better failure properties, + rather than alloca(). Closes: #238226. + - In POSIX mode, if `xpg_echo' option is enabled, the `echo' builtin + doesn't try to interpret any options at all, as POSIX requires. + Closes: #303649. + - Some changes to the display code to improve display and redisplay of + multibyte characters. Closes: #309654. + - Fixed a bug that caused bash to close fd 2 if an `exec' failed and the + shell didn't exit. Closes: #310308. + - Fix segmentation fault if execve'd with NULL argv. Closes: #316206. + - Fix segfault, if free is called with already freed block argument. + Closes: #317324. + - Fix garbage in bash(1), section SIGNALS. Closes: #327035. + - Fixed vi-mode searching so that failure preserves the current line rather + than the last line in the history list. Closes: #297330. + - Fix segfault on variable assignment. Closes: #291840. + - Fixed parser to generate an error when the pipeline `argument' + to `!' or `time' is NULL. Closes: #273324, #342228. + - A bare `%' once again expands to the current job when used as a job + specifier, updated the help for `%'. Closes: #262095. + - Fix tilde expansion for some cases where it was performed + inappropriately. Closes: #263023. + - Replicate first character of $PS4, not only the first byte. + Closes: #288125. + - bashref.texi: Remove blank lines from contents. Closes: #307264. + * Remove patches applied upstream: + - bash30*, wcontinued, man-cdpath, update-multibyte-ifs, histtimeformat, + spelingm. + - rl-examples, rl-setenv, rl-display, rl-self-insert. + * Update patches: + - deb-bash-config, man-test, man-test2. + * bash(1): Fix /etc/bash.logout file name (closes: #289355). + * Document, that bash is configured using --disable-net-redirections. + Closes: #313538. + * Use `command -v editor`, as an editor, if available. Closes: #296603. + + -- Matthias Klose Fri, 9 Sep 2005 21:09:46 +0200 + +bash (3.0-17) unstable; urgency=low + + * Check that the device files /dev/std{in,out,err} are present at + build time. Closes: #327477. + * Remove html completion for w3m, users claim w3m to be a general viewer. + * /etc/bash.bashrc: Avoid stat on /etc/debian_chroot, if not necessary. + Closes: #303712. + * debian/patches/wcontinued.dpatch: Update, fixing hangs in + bash_completion (Junichi Uekawa). Closes: #318301. + * Build-depend on texinfo (>= 4.8). Closes: #316066. + + -- Matthias Klose Thu, 13 Oct 2005 11:24:21 +0000 + +bash (3.0-16ubuntu3) breezy; urgency=low + + * Don't install .bash_logout again, doesn't clear the buffer and + ps is not in required. + + -- Matthias Klose Wed, 5 Oct 2005 13:29:22 +0200 + +bash (3.0-16ubuntu2) breezy; urgency=low + + * Fix segmentation fault due to gcc optimization and longjmp. Patch + by Jim Paris. Debian #331381. + * Don't overwrite PROMPT_COMMAND in /etc/bash.bashrc. Ubuntu #15122. + Closes #330889. + * Install skeleton .bash_logout to clear the screen, when logging out + from the console. Ubuntu #10149. + + -- Matthias Klose Tue, 4 Oct 2005 18:01:26 +0200 + +bash (3.0-16ubuntu1) breezy; urgency=low + + * bash_completion changes: + - Add completion for evince. + - Fix completion for aptitude (Ubuntu 12549). + Closes: #293979, #325045, #327413. + - Add completion for *.flac files in mplayer (closes: #304778). + - Add completion for *.ott files for unzip and zipinfo (closes: #322481). + - Add html completion for w3m. + + -- Matthias Klose Fri, 9 Sep 2005 20:33:31 +0200 + +bash (3.0-16) unstable; urgency=low + + * Update to bash_completion 20050721 (v1.827). + - Fix function name in aptitude completion (closes: #304624, #320390). + * In PROMPT_COMMAND, use ~ instead of the complete path. + * Adjust for dpkg-dev (>= 1.13.9). Closes: #313546. + + -- Matthias Klose Mon, 5 Sep 2005 18:37:19 +0200 + +bash (3.0-15) unstable; urgency=low + + * glibc-2.3.5 defines WCONTINUED, which is available only since + Linux 2.6.10. On older kernels waitpid() returns -1 with errno + set to EINVAL if WCONTINUED is supplied in options. Retry without + WCONTINUED set in that case. + + -- Matthias Klose Wed, 25 May 2005 12:38:09 +0000 + +bash (3.0-14ubuntu1) breezy; urgency=low + + * Configure the static build --without-bash-malloc. + + -- Matthias Klose Sat, 21 May 2005 07:28:25 +0000 + +bash (3.0-15) unstable; urgency=low + + * Print out bad interpreter names with trailing ^M (DOS line endings). + Closes: #282762. + + -- Matthias Klose Sun, 23 Jan 2005 20:24:58 +0100 + +bash (3.0-14) unstable; urgency=low + + * Fix re-read-init-file (C-xC-r) not to read /etc/inputrc twice, + but /etc/inputrc and ~/.inputrc. Thanks to Vasco Pedro. + * Fix bug in readline's self-insert command (closes: #290103). + * Fix bash-builtins package description (closes: #290258). + * Add cross build support (closes: #283732). + * Update to bash_completion 20050121 (v1.786). + - Improve ssh2 known hosts completion. (closes: #282767). + - Pass over switches to metacommands like sudo, nice, exec, etc. + (closes: #289847) + - Trivial fix to allow python to be called with a path component without + bash displaying a bad subscript error. (closes: #290748) + - unzip should also work on .sxw files. (closes: #286738). + - Lots of commands that use _longopts() don't use filenames at all, so + these shouldn't be mapped with '-o filenames'. (closes: #283069, which + related only to wget). + - Make dd treat completions as filenames, which is bad for options, but + good for filename arguments to 'if' and 'of'. (closes: #287286). + - Fix lvresize errors when running as non-root (closes: #285604). + + -- Matthias Klose Sat, 22 Jan 2005 23:08:57 +0100 + +bash (3.0-13) unstable; urgency=low + + * Update to bash_completion 20050103 (v1.772). + * Fix segfault in the ``reverse-search-history'' feature of the readline + library, if the search string matches a previously entered command (ie + history) and must overflow the current screen width. Closes: #288940. + + -- Matthias Klose Wed, 12 Jan 2005 08:11:36 +0100 + +bash (3.0-12) unstable; urgency=low + + * debian/skel.bashrc: Quote dircolors invocation (closes: #285840). + + -- Matthias Klose Sun, 19 Dec 2004 17:48:17 +0100 + +bash (3.0-11) unstable; urgency=low + + * Adjustments to the skeleton files. + * Fix spelling errors in the docs (closes: #281842). + + -- Matthias Klose Wed, 17 Nov 2004 06:37:48 +0100 + +bash (3.0-10) unstable; urgency=low + + * Apply upstream patch 015-016. + + -- Matthias Klose Thu, 11 Nov 2004 07:15:34 +0100 + +bash (3.0-9) unstable; urgency=low + + * Apply upstream patch 001-014. + * Document handling of parameters of the test builtin (closes: #173273). + + -- Matthias Klose Fri, 29 Oct 2004 23:57:19 +0200 + +bash (3.0-8) unstable; urgency=low + + * Add a comment to /etc/bash.bashrc that the file is not read by + login shells (closes: #271413). + * Sync builtin CDPATH documentation with man page (closes: #259767). + * Document conditional file expressions acting on the target of + symbolic links as well (except -h, -L). Closes: #231267. + * Update to bash_completion 20041017 (v1.758). + - Unset `have' variable at end of sourcing (closes: #273809). + - Fix scp completion breakage when filenames contained an ampersand. + Closes: #262354. + + -- Matthias Klose Sun, 17 Oct 2004 09:31:03 +0200 + +bash (3.0-7) unstable; urgency=low + + * Apply upstream patches 001-013, remove patches collected from the net. + * Patch bash30-003 restores a measure of backwards compatibility for the + `trap signum' syntax (closes: #261948). + * Trim skeleton files. + + -- Matthias Klose Sun, 19 Sep 2004 09:06:36 +0200 + +bash (3.0-6) unstable; urgency=low + + * Fixed in bash-3.0: + - New option pipefail. If set, the return value of a pipeline is the + value of the last (rightmost) command to exit with a non-zero status, + or zero if all commands in the pipeline exit successfully. This option + is disabled by default. The two oldest outstanding bash reports are + gone (closes: #7047, #10494). + - "$( substitution strangeness (closes: #187983). + - timestamp support in history (closes: #161057). + * Various updates from the net: + - Fix a bug in array expansion. + - Fix a bug in brace expansion. + - Handle multibyte characters in IFS values. + - Fix a bug, when pipefail option is set. + - History saved-line handling (closes: #253766, #268922). + - Fix parameter expansion with UTF-8 and ${#var} or ${var: -1}. + * Apply patch to fix non POSIX function name and avoid use of global + variables (Stephen Gildea). Closes: #262105. + * Add command_not_found_handle in non POSIX interactive shells. + Closes: #243015. + * Check for /usr/sbin/remove-shell before using it (closes: #265982). + * bash-builtins: Install missing header files (closes: #265259). + * Clarify documentation about substring expansion (closes: #192831, #203767). + * Fix completion on ~/../``/ (closes: #261142). + * Clarify documentation about case-insensitive pathname expansion. + Closes: #141292. + * Apply patch to fix the display of UTF-8 characters. + Closes: #224916, #257540. + + -- Matthias Klose Sat, 4 Sep 2004 10:21:23 +0200 + +bash (3.0-5) unstable; urgency=medium + + * Fix segfault and wrong behaviour running the firehol script. + Closes: #262438, #262642. + * Add history scrolling patch patch (closes: #263064). + * Strip bash binary, leftover from debugging (closes: #263451). + * `cd -' printing the directory in non-interactive mode, non-POSIX mode + is new behaviour, not a bug (closes: #262619). + * Address build failure calling the 'binary' target directly instead of + dpkg-buildpackage (closes: #263797). + * Remove kfreebsd-gnu hack to disable bash malloc (closes: #263005). + + -- Matthias Klose Fri, 6 Aug 2004 07:10:24 +0200 + +bash (3.0-4) unstable; urgency=low + + * Revert substitution patch trying to fix completion on ~/../``/. + Reopens: #261142. Closes: #261955, #262338, #262602. + + -- Matthias Klose Sun, 1 Aug 2004 12:36:57 +0200 + +bash (3.0-3) unstable; urgency=high + + * Revert the following upstream change (until sarge is released): + The historical behavior of `trap' that allows a missing `action' argument + to cause each specified signal's handling to be reset to its default is + now only supported when `trap' is given a single non-option argument. + Addresses: #261948. + * Fix line wrapping (closes: #261957). + + -- Matthias Klose Fri, 30 Jul 2004 16:17:22 +0200 + +bash (3.0-2) unstable; urgency=medium + + * Fix typo in bash-minimal's postinst. Closes: #260506. + * Fixed in bash-3.0: + - pwd builtin exiting with write error. Closes: #243872. + + -- Matthias Klose Thu, 29 Jul 2004 07:13:13 +0200 + +bash (3.0-1) unstable; urgency=medium + + * New upstream release. + * Bugs fixed in this release (and the alpha/beta releases and release + candidates): + - Fixed a bug that caused the prompt to overwrite previous output when the + output doesn't contain a newline and the locale supports multibyte + characters. This same change fixes the problem of readline redisplay + slowing down dramatically as the line gets longer in multibyte locales. + Closed: #179883. + - The shell no longer seg faults if the expanded value of $PS4 is null + and `set -x' is enabled. Closes: #165533. + - Don't define a default DEFAULT_MAIL_DIRECTORY, because it can cause + a timeout on NFS mounts. Closes: #211426. + - Fixed a bad interaction between alias and completion. Closes: #186218. + - Fix initialization of local variables with "$@". Closes: #180290. + - Fixed segfault in "read -a foo <<< $(echo)". Closes: #167003. + - Fixed the history word tokenizer to handle <( and >( better when used as + part of bash. Closes: #165212. + - Fixed EINTR signal killing redirection. Closes: #164134. + - Fixed infinite loop with IFS="" and compgen -W. + Closes: #162952. + - Fixed the internal logout code so that shells that time out waiting for + input (using $TMOUT) run ~/.bash_logout. Closes: #152847. + - Speedups to the multibyte character redisplay code. Closes: #197965. + - Better error message on wrong kill arguments. Closes: #193570. + - Overwriting of prompt. Closes: #176968. + - The shell now reports on processes that dump core due to signals when + invoked as `-c command'. Closes: #211693. + - Fixed ferror beeing called w/o always first calling clearerr + results in spurious errors reported. Closes: #195116. + - Add missing trailing slash on directory completion. Closes: #178828. + - Fix different behaviour for builtin and external commands together + with arithmetic expansion. Closes: #173744. + - Fixed a bug that caused redirections accompanying a null command + to persist in the current shell. Closes: #173148. + - Fixed a bug that caused a leading `-' in the shell's name to cause it to + not be recognized as a restricted shell. Closes: #170298. + - Fix segfault in ill formed paramter expansion. Closes: #162773. + - Fixed a bug in brace expansion that caused a quoted `$' preceding an + open brace to inhibit brace expansion. Closes: #157954. + - Removed the attempts to avoid adding a slash at the end of a completed + executable name if there was a directory with the same name in the + current directory. Closes: #155134, #189006. + - Fix error message for circular alias expansions. Closes: #173588. + - Fixed a bug that caused some key bindings set in an inputrc to be ignored + at shell startup. Closes: #110969. + - Fix segfault on bad array subscripts. Closes: #232653. + - Fix "set completion-ignore-case on" breaking some tab completion. + Closes: #224303. + - Flag an error when a user uses "% DIGITS" instead of "%DIGITS", and + don't give him a different job instead. Closes: #173854. + - For 'cd filename' say 'not a directory', not 'no such file or directory' + when filename exists and is not a directory. Closes: #219958. + - Expansion results are the same for ${1:+"$@"} and "$@" if IFS is not + the default. + - The locale code does a better job of recomputing the various locale + variable values when LC_ALL is unset. Closes: #160932. + - Fix substitution error triggering an assertion. Closes: #251801. + * Documentation updated in this release (and the alpha/beta releases): + - Fix documentation about exit status of unset builtin. Closes: #183352. + - Clarify documentation for arguments of wait builtin. Closes: #174133. + - Document ${!prefix@} expansion. Closes: #168318. + - Fix documentation of GLOBIGNORE behaviour. Closes: #168267. + - Document the use of $EMACS. Closes: #174744. + - Improve documentation of the value of arithmetic expressions. + Closes: #168321. + - Make docs more explicit about variable indirection in shell parameter + expansion. Closes: #167002. + - Documentation for values of various assignments updated. Closes: #168331. + - In section "Shell Functions", add documentation for syntax, + which bash accepts. Closes: #172971. + - Fix documentation of the PATH variable. Closes: #155369. + - Document SHELL variable in section "Shell Variables". Closes: #249657. + - Remove reference to missing section in rbash(1). Closes: #249219. + * Fix another segfault in completion code. Closes: #261142. + + -- Matthias Klose Tue, 27 Jul 2004 21:23:42 +0200 + +bash (2.05b-2-22) unstable; urgency=low + + * Brown paperbag ... Fix typo in bash-minimal's postinst. + + -- Matthias Klose Tue, 20 Jul 2004 23:04:56 +0200 + +bash (2.05b-2-21) unstable; urgency=low + + * Remove the pre-dependency on passwd. + * Explicitely check for the existance of /usr/sbin/add-shell. + * Reassign #257744 to debootstrap to correctly handle the installation. + + -- Matthias Klose Mon, 19 Jul 2004 22:57:19 +0200 + +bash (2.05b-2-20) unstable; urgency=medium + + * Make passwd a pre-dependency (closes: #257744). + + -- Matthias Klose Sat, 17 Jul 2004 06:56:38 +0200 + +bash (2.05b-2-19) unstable; urgency=low + + * Build using gcc, not gcc-3.4 (closes: #259208). + + -- Matthias Klose Tue, 13 Jul 2004 21:25:28 +0200 + +bash (2.05b-2-18) unstable; urgency=low + + * Tighten dependency on passwd (closes: #257717). + * Update to bash_completion 20040711 (v1.737). + - Fix mutt folder completion (closes: #248635). + * Fix tab completion on relative path directories (closes: #189006). + * Modify lib/malloc/malloc.c to make it compile with gcc-3.4 (Andreas + Jochens). Closes: #258456. + + -- Matthias Klose Tue, 13 Jul 2004 06:15:46 +0200 + +bash (2.05b-2-17) unstable; urgency=low + + * Add dependencies on passwd (closes: #257630). + + -- Matthias Klose Sun, 4 Jul 2004 22:56:17 +0200 + +bash (2.05b-2-16) unstable; urgency=low + + * Handle shells using add-shell/remove-shell (closes: #254476). + * Update to bash_completion 20040704 (v1.731). + - Add autocompletion for dpkg -P, --purge (closes: #241042, #249934). + - Fix mutt folder completion (closes: #248635). + - Add autossh to ssh completions (closes: #252090). + - Emacs completion does not discard .tar* archives (closes: #252347). + - Add MS filename extensions to OpenOffice (closes: #252635). + - Add completion for tar.Z files (closes: #254896). + - Fix problems with sed-4.1 (closes: #256000). + - Fix dpkg completion with multiple arguments (closes: #257544). + * Fix formatting in bash(1). Closes: #248344. + + -- Matthias Klose Sun, 4 Jul 2004 16:07:24 +0200 + +bash (2.05b-2-15) unstable; urgency=low + + * Fix a bug that caused a leading `-' in the shell's name to cause it to + not be recognized as a restricted shell (closes: #170298). + * Fix option in menu file (closes: #162152). + * Backout patches/random patch (closes: #242111). + * Update to bash_completion 20040331 (v1.700). + * Update skeleton files and /etc/bash.bashrc to include the contents + of /etc/debian_chroot in the prompt, if the file exists. + * Add openoffice completions (closes: #244611). + * Remove ee (eeyes) completion (closes: #240668). eeyes isn't distributed + anymore. + * bash(1): Document ~/.bash_login and ~/.profile in FILES section. + Closes: #204766. + * Apply patch from http://www.savarese.org/posix/ to improve the mail + checking code so it won't check (and possibly cause an NFS file system + mount) until MAILPATH or MAIL is given a value. Closes: #211426. + * Add missing dependency in debian/rules (closes: #247413). + + -- Matthias Klose Sat, 8 May 2004 18:36:41 +0200 + +bash (2.05b-2-14) unstable; urgency=low + + * Add bash reference manual in PDF format (closes: #202849). + * Remove FAQ; the license doesn't allow modification (closes: #231157). + * debian/copyright: Name the copyright holders (closes: #233716). + * Update to bash_completion 20040214 (v1.690). + - Make xspec parsing immune to comments (closes: #226812). + - Another fix to sudo completion: "sudo completion is virtually + impossible to get right. It's just a question of choosing what + aspect of it is the least annoying to leave broken. :-(" + Closes: #223094. + - xine can also complete on .asx files (closes: #231356). + - Speedup dpkg completion (closes: #232585). + - Fix chsh completion (closes: #232214). + * Disable the GNU/kFreeBSD kludge (--without-bash-malloc). Closes: #234137. + + -- Matthias Klose Sun, 22 Feb 2004 13:31:03 +0100 + +bash (2.05b-2-13) unstable; urgency=medium + + * Apply patch to speedup display of characters under multibyte locales. + Thanks to Denis Barbier. Closes: #197965. + * Update to bash_completion 20040101 (v1.672). + - Closes: #215030, #224981. + - Include completion for sitecopy in contrib directory (closes: #223294). + * Fix typo in man page (closes: #224477). + * Don't build bashdb anymore. Not ready for use. Closes: #224573, #224566. + * Document /etc/bash.bashrc in bash man page (closes: #216403). + + -- Matthias Klose Sat, 24 Jan 2004 21:20:25 +0100 + +bash (2.05b-2-12) unstable; urgency=low + + * Update to bash_completion 20031022 (v1.644). + * Fix "suspend" segfaults in non-interactive shells (closes: #217188). + * Rename bashdb's gud.el to gud-bashdb.el (closes: #220002). + + -- Matthias Klose Mon, 10 Nov 2003 23:53:35 +0100 + +bash (2.05b-2-11) unstable; urgency=medium + + * Tighten automake build dependency (closes: #215350). + * Add dependency line for bashdb (closes: #215634). + * /etc/skel/.bashrc: set xterm's title as we do for PS1 (closes: #176734). + * Remove build dependency on readline (closes: #215165). + * Update to bash_completion 20031007 (v1.630). + + -- Matthias Klose Tue, 14 Oct 2003 20:37:23 +0200 + +bash (2.05b-2-10) unstable; urgency=low + + * Update to bash_completion 20030911 (v1.624). + + -- Matthias Klose Mon, 22 Sep 2003 11:43:39 +0200 + +bash (2.05b-2-9.1) unstable; urgency=low + + * Added build dependency on texi2html (closes: #211151). + * Create site-lisp directory in bashdb target. + + -- Herbert Xu Thu, 18 Sep 2003 18:39:51 +1000 + +bash (2.05b-2-9) unstable; urgency=low + + * Recompilation fixes segfaults in bash-static (closes: #205185). + * Build debugger enabled bash binary (bash-bashdb). Closes: #195877. + * Update to bash_completion 20030821 (v1.617). Closes: #203859, #205741. + * Adjust config.guess triplet for GNU/FreeBSD (closes: #194182). + * Fix package description (closes: #202344). + + -- Matthias Klose Mon, 8 Sep 2003 23:34:50 +0200 + +bash (2.05b-2-8.1) unstable; urgency=low + + * Fixed versioned dependency of bash-builtins (closes: #196421). + * Call dh_fixperms in bash-minimal. + + -- Herbert Xu Sat, 7 Jun 2003 12:44:18 +1000 + +bash (2.05b-2-8) unstable; urgency=low + + * Apply upstream patches 005, 006, 007. + 006 addresses the LSB 1.3 test suite failures (closes: #184888). + 007 addresses ~ command working with UTF-8 locales (closes: #179946). + * Build a minimal shell in package bash-minimal (closes: #176164). + Sort of fix for reports complaining that /bin/sh does have + additional features compiled in (closes: #183185). + * Build a static shell in package bash-static (closes: #138089). + * Update to bash_completion 20030527 (v1.571) (closes: #167852, #171523, + #184738, #185711, #189535, #192282). + * /etc/skel.profile: Export MANPATH (commented out). Closes: #180717. + * Add menu entry for bash (closes: #187596). + * + * Install info docs as bashref.info, symlink to bash.info (closes: #174674). + * Fix segfault with builtin shift, no arguments and "shopt -s shift_verbose". + Closes: #159996. + * Update config.{sub,guess} (closes: #179737). + * Fix apt-cache search completion (closes: #184144). + * Configure --without-bash-malloc on GNU/FreeBSD (closes: #194182). + + -- Matthias Klose Thu, 29 May 2003 17:00:53 +0200 + +bash (2.05b-7) unstable; urgency=medium + + * Fix rbash man page (closes: #181248). + * On m68k-linux, bash is miscompiled using gcc-3.2 and gcc-snapshot. + Revert back to gcc-2.95. + + -- Matthias Klose Fri, 28 Feb 2003 00:54:22 +0100 + +bash (2.05b-6) unstable; urgency=low + + * First upload compiled using gcc-3.2 as the default compiler. + * Update to bash_completion 20030126 (v1.520) (closes: #168478, #145481, + #150628, #158039, #168700, #169232, #169586, #171161, #171420, #171523, + #173096, #177654). + + -- Matthias Klose Mon, 27 Jan 2003 21:08:19 +0100 + +bash (2.05b-5) unstable; urgency=high + + * Build-depend on bison-1.35 (closes: #167635). + + -- Matthias Klose Mon, 4 Nov 2002 09:30:39 +0100 + +bash (2.05b-4) unstable; urgency=low + + * Ignore *~ and *.bak files in /etc/bash_completion.d/ (closes: #161027). + * debian/patches/rl-mbutil.dpatch: Fix segfault in mbutil.c. + * Update to bash_completion 20021026 (v1.462) (closes: #161671, #162161, + #163096, #163097, #164890, #165937). + * Apply fix for debian/bash.preinst.c (closes: #162424). + * Avoid warning in s390 build (closes: #160731). + * /etc/skel.bashrc: Add commented example to set the `checkwinsize' + option (maybe closes: #161984). + * Install builtins manpage as bash-builtins(7), add an alternative + builtins(7) with priority 10 (closes: #166082). + * Fix typo in documentation of deprecated arithmethic expansion. + Closes: #161386. + * rl-8bit-init.dpatch: Apply (closes: #164809). + * README.Debian: Removed invalid entry about ssh (closes: #159754). + + -- Matthias Klose Tue, 24 Sep 2002 12:40:35 +0200 + +bash (2.05b-3) unstable; urgency=low + + * Apply upstream patch 003 (Fix completing executable names). + Closes: #155134, #159466. + * Apply upstream patch 004. + * Fix completion by TAB in quoted sequence(`...`) with Multibyte Locale. + Patch from Satoshi Koike (closes: #155436). + * Update to bash_completion 20020909 (v1.410) (closes: #154595, #155211, + #155706). + * Don't set umask in /etc/skel/.bash_profile (closes: #155973). + * Drop suggestion of grep-dctrl (closes: #156351). + + -- Matthias Klose Fri, 9 Aug 2002 05:30:24 +0200 + +bash (2.05b-2) unstable; urgency=medium + + * Apply upstream patches: + - Fix a command completion problem (closes: #154273). + - Fix a segfault (closes: #154123). + - Fix for repeating an edit in vi mode. + * Fix typo in /etc/skel/.bashrc (closes: #153856). + * Update to bash_completion 20020727 (v1.390) (closes: #148873, #153045). + * Install info docs in "Shells" section (closes: #154618). + + -- Matthias Klose Fri, 2 Aug 2002 19:24:28 +0200 + +bash (2.05b-1) unstable; urgency=low + + * New upstream version: + - Fixed a problem with process substitution that resulted in incorrect + behavior when the number of process substitutions in an individual + command approached 64 (closes: #149229). + - Added putenv, setenv, unsetenv to getenv replacement (closes: #149262). + - Fixed bug, where bash incorrectly reports failure to execute a script. + Closes: #126620, #140819. + - Fixes an `out of memmory in pipe' error (closes: #134004). + - Fixed a bug that could cause the -O expand_aliases invocation option + to not take effect (closes: #122362). + - New code to handle multibyte characters (obsoletes and closes: #25131, + #118724). + - Fixed the /= and %= arithmetic operators to catch division by zero. + Closes: #148950. + - Fixed abort in completion of absolute filenames (closes: #136625). + - Fixed "declare -f"'s handling of here-documents (closes: #127452). + - Documentation for `==' adds hint for POSIX compliance (closes: #137741). + - Not reproducible anymore with new upstream version. Upstream regards + these as fixed (closes: #142906, #143811, #144375). + - Fix bug in `compgen -W' (closes: #143518). + - Fix memory corruption error printing error message (closes: #145229). + - Unreproducible with the new upstream version (closes: #135062). + - Fixed a bug that caused a syntax error when a command was terminated by + EOF (closes: #147258). + - Fixed a problem which caused the display to be messed up when the last + line of a multi-line prompt (possibly containing invisible characters) + was longer than the screen width (closes: #137268). + - The `home' and `end' keys are now bound to beginning-of-line and + end-of-line, respectively, if the corresponding termcap capabilities + are present (closes: #89026, #89034, #98029, #107453, #107897, #116943, + #119491, #128687, #130029). + - Fixed a bug that could cause the -O expand_aliases invocation option + to not take effect (closes: 148505). + - Bash now correctly honors setting LANG to some value when LC_ALL does not + already have a value (closes: #145597). + - The `unset' builtin no longer returns a failure status when asked to + unset a previously-unset variable or function (closes: #98743). + - Changes to make reading and writing the history file a little faster, and + to cope with huge history files without calling abort(3) from xmalloc. + Closes: #61006. + * Fixed in earlier versions of bash: + - Fixed a bug that caused SIGINT to kill shell scripts after the script + called `wait' (closes: #14658). + - Handling of ANSI sequences in PS1 (closes: #60914). + - ctrl+z when running while-loop puts bash in broken state (closes: #98521). + * Fix build error (closes: #151681). + * bash suggests bash-doc (closes: #152353). + * /etc/skel/.bashrc: Only enable color support for ls, when $TERM != dumb. + Closes: #143361. + * Report is missing any information. Bug submitter didn't respond. + Closes: #130051. + * Close a report for a sefault in bash-2.03, which cannot be reproduced + anymore in newer versions (2.05) (closes: #58404). + * Add the README.commands document to the doc directory. Reassign #106170 + to doc-linux-text. + * Update to bash_completion 20020716 (v1.383) (closes: #145938). + + -- Matthias Klose Fri, 19 Jul 2002 22:33:25 +0200 + +bash (2.05a-12) unstable; urgency=low + + * Update to bash_completion 20020528 (v1.335) (closes: #141970, #142015, + #142859, #144335, #146152, #146309, #146693). + Put the the contributed completion files into /usr/share/doc. + * Suggest grep-dctrl, which is called by the completion code. Added + note to README.bash_completion, that the completion code depends on it. + Closes: #146152. + * Mention bash_completion in the package description (closes: #146878). + * Fix brace expansion (Fix by Richard Kettlewell ). + Forwarded. Closes: #144983. + + -- Matthias Klose Thu, 30 May 2002 23:50:40 +0200 + +bash (2.05a-11) unstable; urgency=medium + + * Don't mishandle negative pid in `kill' builtin (closes: #133927, #137742). + * builtins(1) doesn't document `for' (closes: #118755). + * Add /usr/share/bash_completion directory to source package specific + completion files. + * Update to bash_completion 20020408 (v1.264). + Closes: #133109, #139375, #139675, #134713, #141134. + * Add completion to /etc/skel/.bashrc (commented out). Closes: #138921. + + -- Matthias Klose Mon, 8 Apr 2002 20:51:41 +0200 + +bash (2.05a-10) unstable; urgency=medium + + * Init seed of random generator in subshells (patch from Miha Tomsic). + * Update to bash_completion 20020330 (v1.237). + Closes: #138673, #138707, #139110 and #139675. + * Strip bash(1) again (closes: #138902). + + -- Matthias Klose Sun, 31 Mar 2002 08:08:26 +0200 + +bash (2.05a-9) unstable; urgency=low + + * Fix bug reading /etc/bash_completion.d files. + + -- Matthias Klose Sat, 16 Mar 2002 00:54:28 +0100 + +bash (2.05a-8) unstable; urgency=low + + * A last bash_completion bug fix upload (updated to v1.195, + see changelog.bash_completion.gz for details). + All files in /etc/bash_completion.d are read before ~/.bash_completion + is read. Files containing a dot are ignored. + Included completion extensions (closes: #129661, #137725, #137732). + + -- Matthias Klose Tue, 12 Mar 2002 23:25:21 +0100 + +bash (2.05a-7) unstable; urgency=low + + * A bash_completion bug fix upload (updated to v1.180, + see changelog.bash_completion.gz for details). Really closes: #133825. + + -- Matthias Klose Thu, 7 Mar 2002 00:06:14 +0100 + +bash (2.05a-6) unstable; urgency=medium + + * Configure --without-bash-malloc. At least on hppa, this fixes an error, + which shows up when building gcc or kernels: + malloc: /build/buildd/bash-2.05a/unwind_prot.c:284: assertion botched + free: called with unallocated block argument + * A bash_completion bug fix upload (updated to v1.163, + see changelog.bash_completion.gz for details). + Closes: #133111, #133112, #133116, #133825, #134296. + * Updated service completion patch (Ian Macdonald). + + -- Matthias Klose Sat, 2 Mar 2002 00:27:22 +0100 + +bash (2.05a-5) unstable; urgency=medium + + * A bash_completion bug fix upload (updated to v1.93, + see changelog.bash_completion.gz for details). + Closes: #129106, #130167, #129033, #129228, #129451, #129884, #132309, + #132529, #132552, #132553. + Ian even added completion for Quake! Horrible ... + * Include service completion patch. + * README.bash_completion: Fix reference to /etc/bash.bashrc (closes: #129816). + + -- Matthias Klose Wed, 6 Feb 2002 22:22:09 +0100 + +bash (2.05a-4) unstable; urgency=high + + * Fix for causing a segmentation fault when some special shell variables + are declared as array (therefore urgency high). + * Apply patch for function prototypes (closes: #124004, #124362). + * Capitalize `POSIX' in package description (closes: #124439). + * Add (commented) setting of MANPATH to /etc/skel/.bash_profile + (closes: #123792). + * Update builtins(1) (closes: #125673). + * Taken from the current upstream sources: Make the symlinked directory + completion behavior introduced in readline-4.2a a user-settable option. + If `mark-symlinked-directories' is set to `on', the symlinked directory + completion behavior is disabled, and symlinks that point to directories + have a slash appended. + * Add a script for programmable bash completion (version 1.53) from + http://www.caliban.org/bash/index.shtml#completion. Add commented + code into /etc/bash.bashrc and (closes: #127645). + * Install the changelog _and_ the CHANGES file to the doc dir. + * bash(1): mention quoting when assigning to FIGNORE (closes: #115290). + + -- Matthias Klose Sat, 12 Jan 2002 16:00:08 +0100 + +bash (2.05a-3) unstable; urgency=low + + * Include version.h in /usr/include/bash (closes: #120069). + * Link statically with readline and history to speed up link time + (and was done in bash-2.03). Closes: #107160. + * Add comment to set HISTCONTROL in /etc/skel/.bashrc (closes: #118132). + + -- Matthias Klose Sat, 8 Dec 2001 12:29:28 +0100 + +bash (2.05a-2) unstable; urgency=high + + * Update config.{sub,guess} from ftp://ftp.gnu.org/pub/gnu/config/. + + -- Matthias Klose Fri, 16 Nov 2001 19:07:06 +0100 + +bash (2.05a-1) unstable; urgency=medium + + * New upstream release. + * This is mainly a bugfix and code cleanup release (as you can see + from the version number as well). Fixes 64bit issues and index + overflow errors. Fixes the following Debian reports: + - Segmentation fault in script from report (closes: #119250). + - Extensions to the printf command (closes: #72320). + - Accept an empty list of items in a for loop (as ash does). + Closes: #91983. + - A bug that caused redirections with (...) subshells to be performed in + the wrong order was fixed (closes: #97551). + - Correctly handle errors from pipelines in andor lists (closes: #102196). + - Subshells of login shells no longer source ~/.bash_logout when they exit + (closes: #117701). + - Don't pass unset shell variable in the environment (closes: #117673). + * Upstream integrates the following Debian patches: + - debian/patches/mailcheck.dpatch: check for mail in the maildir format. + - debian/patches/gnu-source.dpatch: define GNU_SOURCE and include + strsignal prototype. + - Don't include -I/usr/include in CFLAGS. + - debian/patches/print-cmd.dpatch: Fixed an unassigned variable problem + in the redirection printing code. + - debian/patches/64bit.dpatch: 64-bit uncleanliness. + * Unable to reproduce behaviour with beta1, rc1 and final version from + report (closes: #110483, #110484). + * Point to the bash-doc package for example startup files (closes: #117642). + * The man page is precises: comments start with a word beginning with a `#'. + With '\ #', the doesn't start a word. Closes: #115118. + + -- Matthias Klose Wed, 14 Nov 2001 22:13:21 +0100 + +bash (2.05a-0rc1) unstable; urgency=low + + * New upstream (bugfix) release (release candidate). + * Add README.abs-guide, a pointer to the `Advanced Bash Scripting Guide'. + + -- Matthias Klose Fri, 2 Nov 2001 10:59:11 +0100 + +bash (2.05a-0beta1) unstable; urgency=low + + * New upstream (bugfix) release. + * Configured with --enable-largefile. + * Bugs fixed in this version. Closes: #72320, #91983, #97551, #102196, + #105231, #110483, #110484. + * Remove debian/patches/mailcheck.dpatch, included upstream. + * Closes: #61006. Logging history commands in the history cannot work. + * Not a bug (closes: #100743, #110604). + + -- Matthias Klose Thu, 11 Oct 2001 23:05:20 +0200 + +bash (2.05-10) unstable; urgency=medium + + * Rebuild with released libreadline library (closes: #113182). + + -- Matthias Klose Sun, 23 Sep 2001 01:16:48 +0200 + +bash (2.05-9) unstable; urgency=medium + + * Remove files left from test build (closes: #110307, #109807). + * Apply patches from reports (closes: #110275, #110276). + * Fix include of rbash man page (closes: #113111). + + -- Matthias Klose Sat, 22 Sep 2001 11:26:44 +0200 + +bash (2.05-8) unstable; urgency=low + + * Apply patch (Eric Gillespie) to define GNU_SOURCE and include + strsignal prototype (closes: #109807). + * Fix include of builtins man page (closes: #109917). + + -- Matthias Klose Sun, 26 Aug 2001 08:35:47 +0200 + +bash (2.05-7) unstable; urgency=high + + * Remove config.{cache,status} from source package (#107679). + (high urgency for hurd). + * /etc/skel/.bashrc: Fix dircolors invocation (closes: #107373). + Add commented code to set xterm's title to the prompt. + + -- Matthias Klose Mon, 6 Aug 2001 23:33:41 +0200 + +bash (2.05-6) unstable; urgency=low + + * Apply upstream patches p5, p6. + * Include missing header files in builtins package (closes: #105302). + * Don't list names of built-in commands in NAME section of builtins(1). + (closes: #99532). + * Document deprecated syntax of arithmetic evaluation (closes: #94266, + #95502). + * README.Debian: Document unsetting of SSH_CLIENT (closes: #88032). + + -- Matthias Klose Sat, 21 Jul 2001 18:41:10 +0200 + +bash (2.05-5) unstable; urgency=low + + * The behavior of range specificiers within bracket matching expressions + in the pattern matcher (e.g., [A-Z]) depends on the current locale, + specifically the value of the LC_COLLATE environment variable. + See /usr/share/doc/COMPAT.gz, 14. Closes #95285. + * Tagging reports as 'wontfix' and closing reports: + - exit status of pipes (#7047, #10494). + - completion behaviour on ':' (#78991). + - */text* completion (#21645). + * Documentation of command hashing is documented (#76135). + + -- Matthias Klose Thu, 26 Apr 2001 09:03:37 +0200 + +bash (2.05-4) unstable; urgency=low + + * Apply upstream patches p1-p4 (closes #92455). + * Fixed in bash-2.05-alpha1: closes #47588. + + -- Matthias Klose Wed, 25 Apr 2001 19:32:36 +0200 + +bash (2.05-3) unstable; urgency=low + + * Add 'Replaces: bash-doc (<= 2.05-1)' (closes: #93799). + + -- Matthias Klose Fri, 13 Apr 2001 01:15:19 +0200 + +bash (2.05-2) unstable; urgency=medium + + * Tighten build dependency (fixes #93509). Only an issue for upgrades + from bash-2.05-0, therefore urgency=medium. + * Remove changelog from bash package (also in bash-doc). Reported as + #93446, #93454, #93455. + * Fixed in bash-2.04, wrong example in report (#33822). + * Documented behaviour (ulimit, #72898). + * Use of redirection for #92324. + * sed, awk, ... builtins should be provided by the specific package. + there are other ways to make system scripts faster (ash, perl, + python, ...) (#61648). + * Unable to reproduce #34977 submitted for version 2.02.1, bug submitter + didn't respond to inquiries. Closing ... + * http://metalab.unc.edu/pub/Linux/docs/HOWTO/other-formats/html_single/Text-Terminal-HOWTO.html + as explanation for C-s behaviour (#68387, not sure why I missed this + for so long). + * Part one of the report is Posix.2 behaviour; part 2 (cd-ing relatively + from a subdirectory into a specified root-level directory) already + fixed in bash-2.04. #65316. + * Closing #13645. "The `-l' option should never have been documented, and it + was a mistake to include it in the first place -- it screws up the grammar. + Old Bourne shells and test commands had it because there was no other + way to find the length of a variable's value. Since bash has + ${#variable}, there's no need for it. POSIX.2 says, in the rationale, + that implementation is irregular and that the shell supports it directly + * Unable to reproduce #19211 submitted for version 2.01 in current + versions (2.04, 2.05). + * Close #2301, safe creation of temp files is documented in bash(1): + "If the redirection operator is >, and the noclobber option to the set + builtin has been enabled, the redirection will fail if the file whose + name results from the expansion of word exists and is a regular file. + If the redirection operator is >|, or the redirection operator is > and + the noclobber option to the set builtin command is not enabled, the + redirection is attempted even if the file named by word exists." + * Fixed upstream in 2.05: #84743. + * #76596: Bourne-style shells have always accepted multiple directory name + arguments to cd. If the user doesn't like it, have him define a shell + function (see README.Debian). + * bash already has enabled the system wide /etc/bash.bashrc (#82117). + * #88223: Starting bash with --posix, or -o posix, or as `sh', does make + the entire bash session posix-compliant (with the caveats noted in the + info manual). Posix-compliant does not mean `behaves exactly like + historical versions of sh', nor does it mean `does only what is in + the standard and nothing more'. + + Posix says nothing about brace expansion, so whether or not bash does + brace expansion in posix mode has no bearing on posix compliance. + + If you don't want brace expansion, use `set +o braceexpand' or + `set +B' or start bash with the `+B' option. + + * Lower temporarily severity of #92455, so that this version can move + to testing. This bug exists in 2.04 as well, so we don't make things + worse. + * Apply upstream patch 1. + + -- Matthias Klose Mon, 9 Apr 2001 23:29:24 +0200 + +bash (2.05-1) unstable; urgency=low + + * New upstream release. + * /etc/skel/.bashrc: fix alias (#92440). + + -- Matthias Klose Mon, 9 Apr 2001 18:24:10 +0200 + +bash (2.05-0beta2) unstable; urgency=low + + * New upstream release 2.05-beta2. + * Fixed upstream: #85234. + + -- Matthias Klose Thu, 29 Mar 2001 23:57:12 +0200 + +bash (2.05-0beta1) unstable; urgency=low + + * New upstream release 2.05-beta1. + * Fixed upstream: #66891, #67519, #68931, #72898, #75104, #75315, #75957, + #76603, #84906. + Reverted behaviour: #60375, #75540. + * /etc/skel/.bash_logout: Removed. Submitted bug report to util-linux. + Fixes #63025, #72327, #83609. + * Depend on makeinfo (fixes #87688). + + -- Matthias Klose Tue, 6 Feb 2001 18:46:40 +0100 + +bash (2.05-0alpha) unstable; urgency=low + + * New upstream release. + + -- Matthias Klose Sun, 26 Nov 2000 17:32:16 +0100 + +bash (2.04-9) unstable; urgency=low + + * Fix build bug. + + -- Matthias Klose Mon, 20 Nov 2000 23:35:03 +0100 + +bash (2.04-8) unstable; urgency=low + + * debian/control: Add bison to Build-Depends (fixes #73667). + * debian/rules: Add config.h to bash-builtins package (fixes #69802). + Strip bash binary (fixes #71252). + + -- Matthias Klose Sat, 18 Nov 2000 14:01:54 +0100 + +bash (2.04-7) unstable; urgency=low + + * debian/skel.bash_logout: Fix to clear all ttys (fixes #67772). + * debian/skel.bash_profile: Fix to include expanded ~/bin in path + (fixes #67714). + * Fix builtins.1 include (fixes #67094, #70007, #71848). + * debian/README.Debian: Document that bash is compiled with + -DSYS_BASHRC (fixes #66939). + * Fix hsuser doc (fixes #69392). + + -- Matthias Klose Mon, 2 Oct 2000 01:26:45 +0200 + +bash (2.04-6) unstable; urgency=low + + * debian/skel.bash_profile: Clarify where to look for for example files + (package bash-doc). Fixes #64311. + * debian/README.Debian: Explain, why bash is configured without + '--enable-net-redirections' (fixes #66352). + + -- Matthias Klose Wed, 28 Jun 2000 19:47:25 +0200 + +bash (2.04-5) unstable; urgency=low + + * debian/patches/alpha-unwind.dpatch: Patch from "Mikolaj J. Habryn" + . Should fix #62170, #62690, #65053. + * debian/rules: Configure with --disable-net-redirections (as suggested + in #65172). The patch submitted in the report can be found in + debian/patches/tcp-udp-service-names.dpatch. + * debian/patches/getcwd-error: Fix error message for two levels of + unreadable directories (#64659). + + -- Matthias Klose Mon, 5 Jun 2000 05:59:59 +0200 + +bash (2.04-4) unstable; urgency=low + + * debian/patches/p[5-7].dpatch: Upstream patches. + + -- Matthias Klose Wed, 3 May 2000 01:05:23 +0200 + +bash (2.04-3) unstable; urgency=low + + * debian/patches/p[1-4].dpatch: Upstream patches. + * debian/bash.preinst.c: s/MAX_PATH/PATH_MAX/g (fixes #62323). + + -- Matthias Klose Wed, 26 Apr 2000 19:53:16 +0200 + +bash (2.04-2) unstable; urgency=low + + * debian/patches/pattern-operator.dpatch: Fix pattern operator bug. + * debian/README.Debian: Add FAQ how to get rid off beeps for ambiguous + completions (fixes #59550). + + -- Matthias Klose Sat, 8 Apr 2000 22:06:34 +0200 + +bash (2.04-1) unstable; urgency=low + + * Final release. + * Don't strip bash (debugging #58404 ...). + + -- Matthias Klose Mon, 20 Mar 2000 19:37:44 +0100 + +bash (2.04-0beta5db1) unstable; urgency=low + + * New upstream version, beta 5, Debian build 1. + * Remove six dpatch files with patches now integrated upstream. + * Bugs fixed with this upstream version: #5703, #15165, #21363, #21901, + #33900, #36652, #38804, #41916, #47179, #47990, #50353, #56209, #57544. + * Compiled with NON_INTERACTIVE_LOGIN_SHELLS to run the startup files when + not in posix mode. Fixes #11938, #14287, #25245. + * Still in this version: #27090. + * The `-l' option to test is not included by intent (fixes #13645). + Comment from upstream: "The `-l' option should never have been documented, + and it was a mistake to include it in the first place -- it screws up the + grammar. Old Bourne shells and test commands had it because there was no + other way to find the length of a variable's value. Since bash has + ${#variable}, there's no need for it. POSIX.2 says, in the rationale, + that implementation is irregular and that the shell supports it directly. + * Report #26720: perl -e 'print ":;" x 100000' > foo; . ./foo dumps core. + Comment from upstream: This is not a bash bug; it is a process resource + problem. The default resource limit for stack size is 8M on my version of + Linux. The call tree created by the parser for the script (100000 calls + to `:') is 99999 nodes deep, and requires that many recursive calls to the + command execution routines. This overflows the stack, and bash segfaults. + I couldn't reproduce it anywhere but Linux, because the machines I tested + on all have reasonable default stack sizes. Raising the limit to 16M is + sufficient to cause the script to run successfully (I didn't try anything + between 8M and 16M). + * Report #30460: redirection is different from standard: bash --posix + $ mkdir foo; cd foo; echo anything goes > "this file" + $ for f in *; do tr ay \ o < $f | cat; done + sh: $f: ambiguous redirect + This is POSIX.2 behaviour. + * debian/bash.preinst.c: Check if /bin/sh points to something other than + bash and is not diverted and point to README.Debian how to divert + a file (fixes #34717, #45656). + * debian/patches/random.dpatch: Fix bug in patch (closes #38804). + * debian/README.Debian: Commented behaviour from report #50853. + + -- Matthias Klose Thu, 24 Feb 2000 19:34:10 +0100 + +bash (2.03-6) frozen unstable; urgency=medium + + * debian/bash.preinst.c: Evil kludge, deal with arbitrary name lengths + (fixes #54876). + * Apply NMU (fixes #55887). + * debian/rules: Install debian/bash.conffiles (fixes #57963, #58541). + + -- Matthias Klose Sun, 20 Feb 2000 19:50:48 +0100 + +bash (2.03-5.1) unstable; urgency=low + + * debian/patches/job-control-segfault.dpatch: Patch from Eric Weigel + . Closes: #55887 + + -- Adam Heath Sat, 22 Jan 2000 15:10:50 -0600 + +bash (2.03-5) unstable; urgency=low + + * Update rl.ctrl-char patch from Dan Jacobowitz. + Fixes #54805, #54639, #54612. + * Add autoconf to Build-Depends (finally, Roman ...) + + -- Matthias Klose Tue, 11 Jan 2000 20:50:31 +0100 + +bash (2.03-4) unstable; urgency=low + + * debian/control: Fix build dependencies (fixes #52777). + * debian/rules: Cleanup. + * debian/patches/rl-ctrl-char.dpatch: Don't assume char is signed by + default (fixes #53252). + * Build with libncurses5-dev (fixes #54165). + * Fix changelog symlink in bash-doc package (fixes #54240). + * debian/README.Debian: Add paragraph for writing prompts. + * debian/README.Debian: Add paragraph about hashing of moved commands + (and closing #36877). + * Install more verbose skeleton files (closes #39728). + * The `-l' option to test is not included by intent (fixes #13645). + Comment from upstream: "The `-l' option should never have been documented, + and it was a mistake to include it in the first place -- it screws up the + grammar. Old Bourne shells and test commands had it because there was no + other way to find the length of a variable's value. Since bash has + ${#variable}, there's no need for it. POSIX.2 says, in the rationale, + that implementation is irregular and that the shell supports it directly. + * Report #26720: perl -e 'print ":;" x 100000' > foo; . ./foo dumps core. + Comment from upstream: This is not a bash bug; it is a process resource + problem. The default resource limit for stack size is 8M on my version of + Linux. The call tree created by the parser for the script (100000 calls + to `:') is 99999 nodes deep, and requires that many recursive calls to the + command execution routines. This overflows the stack, and bash segfaults. + I couldn't reproduce it anywhere but Linux, because the machines I tested + on all have reasonable default stack sizes. Raising the limit to 16M is + sufficient to cause the script to run successfully (I didn't try anything + between 8M and 16M). + * Report #30460: redirection is different from standard: bash --posix + $ mkdir foo; cd foo; echo anything goes > "this file" + $ for f in *; do tr ay \ o < $f | cat; done + sh: $f: ambiguous redirect + This is POSIX.2 behaviour. + * debian/bash.preinst.c: Check if /bin/sh points to something other than + bash and is not diverted and point to README.Debian how to divert + a file (fixes #34717, #45656). + + -- Matthias Klose Fri, 7 Jan 2000 07:19:00 +0100 + +bash (2.03-3) unstable; urgency=low + + * Moved /etc/profile to base-files package (closes #52987). + * debian/skel.bash_profile: Use umask 022 as in debian/etc.profile + (closes #53020). + * debian/patches/secure-build.dpatch: Build bash without using guessable + file names in /tmp (closes #36027). + * debian/patches/bashbug-editor.dpatch: Use editor command, not emacs + (closes #32576, #32577). + * Fixed in 2.03 or before: #16013, #20455, #30803 (according to upstream + author, bug submitter does not respond). + * #44015 not a bug. Bash is more liberal than POSIX specifies, but function + names that are not identifiers is something that may go away in the future. + * #40242 not a bug: Non-interactive bash shells have always unset PS1, + so scripts and so on can test for it. + * Report #21645: */text* completion doesn't work anymore. According to the + upstream author, this feature was removed in bash-2.01.1. The TAB + completion only succeeds with globbing characters if there is a single + completion. It caused too many problems otherwise. + * Define DONT_REPORT_SIGPIPE: We don't want to see `Broken pipe' messages + when a job like `cat jobs.c | exit 1' is executed. Fixes part of #7047, + #10259, #10433 and #10494. Comment from the upstream author: "The default + bash behavior with respect to the exit status of a pipeline will not + change. Changing it as suggested in the discussion of #10494 would render + bash incompatible with every other shell out there.". Closed these reports. + * debian/etc.bash.bashrc: Set checkwinsize. + + -- Matthias Klose Sun, 19 Dec 1999 15:58:43 +0100 + +bash (2.03-2) unstable; urgency=low + + * Apply privmode patch (do not drop privileges, if called as /sh. + Closes #52586). + + -- Matthias Klose Mon, 13 Dec 1999 22:25:22 +0100 + +bash (2.03-1) unstable; urgency=low + + * New maintainer. + * New upstream version (closes: #34077, #35642, #46916). For a terse + description of new features and bug fixes see /usr/share/doc/bash/NEWS.gz. + * Fixed in upstream release (closes: #14229, #16856, #21363, #22498, #28849, + #29863, #37971, #38411, #40930, #49702). #37971 either here or in libc6. + #30803. + * Separate out documentation and examples to bash-doc package. + * Do not build shared readline libs from this source. According to the + upstream author: "It's not appropriate to build shared libraries from + the readline shipped with bash. That is designed to be linked directly + into bash." + * Link statically with included libreadline. It's intended, because + potato does not have a libreadline4 yet. Wait for bash-2.04 and + it's version of libreadline. + * debian/README.Debian: Sort of FAQ suggested by Guy Maor. + * debian/copyright: Updated URL. + * debian/rules: Introduced some variables for packages and directories. + * debian/control: Updated package names. Add Build-Depends. + * Point to /usr/doc/share in man pages (rbash.1, builtins.1). + * Make /usr/doc compatibility links (all but libreadline.postinst, which + is a C file). + * debian/patches/conf-update.dpatch: New config files from automake + (closes #33745). + * debian/patches/bashbug-editor.dpatch: Use EDITOR variable + (closes #32576, #32577). + * debian/etc.profile: Fixed comment that /etc/profile is used for Bourne + shell and Bourne compatible shells (closes: #3459). + * debian/patches/tempnam.dpatch: Applied patch from report #35975 + (closes: #35975). + * bash is not responsible for setting $USER in login shells (closes: #36103). + * Compile with -DSYS_BASHRC defined. /etc/bash.bashrc is empty by default + (closes #27055). + * Fixed with boot-floppies 2.1.3 (closes: #22517). + * debian/patches/mailcheck.dpatch: Add maildir support. Patch from + Miquel van Smoorenburg (closes #38794). + * Patches from NMU are applied (should close #43096). + * debian/control: Make builtins depend on source version of bash. + * Build for i386, not i486. + * Report #28811: "dpkg segfaults trying to install bash. Logging in then + produces segfault. Still having to run 2.00.0(1)". Not reproducable. + * Report #15165: "If the last command in the pipeline is killed by a signal, + bash does not report it even though $? contains the correct value". + Not reproducable. + * Report #21645: "If you type `rm */text*', previous versions would + complete text given that they're under the same directory. 2.01.1-1 + doesn't do that anymore.". Not documented anywhere. It seems, this was + a bug disguised as a feature ;-) + * Report #36027: "During compiling bash package, files with hardcoded names + are created in /tmp. In a malicious multi-user environment, this allows + attacks to the user's files and possibly allow creating trojan packages. + If the compiling user is root...". + Submitter cannot be reached. autoconf/automake issues? Reassign to general? + * Report #16700: "bash terminated when I asked it "mailq -v", while in an + xterm, with a sysload of approx 1"; not reproducable. Submitter offers + core file. + * Report #37637: Not reproduceable (should close #37637). + * Report #37275: A dpkg error? Or just another reason to completely link + bash statically? + * Report #34978, #42858: The prerm now is a binary pragram. + #34977 as well? #36016 (patch)? + * Report #43737: Non bug. Behaviour changed from 1.4 to 2.0 (closes: #43737). + * Report #36459: Non bug (closes #36459). + * Report #19211: Wanted behaviour? + * Report #11938: The included patch is applied upstream (closes: #11938). + * Report #10699, #45656: Todo: See #34717 ... + * Report #35127: Apply included patch. TODO: test and forward upstream. + * Report #41082: Obsoleted patches (closes: #35130, #41802). + * Reports tested and still in this version (should be forwarded ...): + #2301, #21901, #26619, #26720, #27090, #30460, #33900, #34833, + #36877 + #38804, #41916 (update docs?), + #46901, #47990. + * Report #47849: You *must* reset OPTIND to 1 before reusing getopts. + * Report #45841: This is a POSIX.2/XPG5 requirement. + * Report #35979, #45379: set -e works on simple commands only. + (command) is not a simple command. + * Report #38244: -x and -v and all of the rest of the options are documented + in the `set' builtin section. The OPTIONS section of the man page refers + to `set'. + * Report #37654: When in a pipeline, `tty' prints `not a tty'. This is why + grep is looking for `not' in file `a'. Try `w | echo $(tty)'. + * Report #33822: This is a locale problem. The de_DE locale gives lower case + and upper case letters the same collating weight. POSIX.2 warns that + range expressions are not portable across locales. + * Report #28789, #22291: resizing xterm bash doesn' t update window limits. + Use `shopt -s checkwinsize'. (closes: #28789, #22291). + * Report #39728: Suggestion to add something to /etc/skel files. A matter + of taste. Added comments where to find `fancy' startup files. + + * Work needed: #33822 (huh?), #42916 and #44015 (update docs, dashs in + identifiers). + + * Not tested: (#7047, #10259, #10433, #10494), #14287 (how to test?), + #14658 (how to test?), #16013, #16797, #20455 (alpha arch), #20821, + #22632, #26571, #29610, #35994 (powerpc arch), + #36652, #40242, #47179. + + -- Matthias Klose Sat, 4 Dec 1999 17:03:47 +0100 + +bash (2.02.1-1.8) unstable; urgency=low + + * Applied Anthonies patch and recompiled as the libc5 version did + not compile for him (closes: #34717, #43050, #43096, #10699). + * Bumped the version number of libreadline and recompiled, + hopefully in time before the dinstall run ;) + + -- Torsten Landschoff Sat, 18 Sep 1999 19:26:20 +0200 + +bash (2.02.1-1.7) unstable; urgency=low + + * Non-maintainer release. + * Make bash not Pre-Depend on itself. That is, make bash's preinst + something other than a /bin/sh script; in this case a reasonably + simple binary. + * Remove /bin/sh from the .deb, and reinstate it in the postinst if + it's not already present. Hence make the postinst a /bin/bash script + instead of a /bin/sh script. + + -- Anthony Towns Sat, 28 Aug 1999 01:09:08 +1000 + +bash (2.02.1-1.6) unstable; urgency=low + + * Non-maintainer release. + * Link bash statically with libreadline. Closes: #42858. + + -- Thomas Quinot Fri, 13 Aug 1999 21:47:35 +0200 + +bash (2.02.1-1.5) unstable; urgency=low + + * Non-maintainer release. + * Updated to standards version 3.0.0. + * Fixed dependency on libreadlineg2. Closes: #35130, #39280, #41802. + + -- Thomas Quinot Thu, 29 Jul 1999 13:05:26 +0200 + +bash (2.02.1-1.4) unstable; urgency=low + + * Non-maintainer release. + * Make libreadlineg2 conflict with bash (<< 2.02.1-1.2) + + -- Joel Klecker Thu, 25 Mar 1999 09:40:39 -0800 + +bash (2.02.1-1.3) unstable; urgency=low + + * Non-maintainer release. + * Recompile against ncurses 4.2-3.2 for versioned dependency. + * Add (>= 2.1-13.1) depend to readline shlibs. + + -- Joel Klecker Thu, 18 Mar 1999 12:33:28 -0800 + +bash (2.02.1-1.2) unstable; urgency=low + + * Non-maintainer release. + * Recompile against glibc 2.1 for libreadline. + + -- Joel Klecker Fri, 5 Mar 1999 09:36:54 -0800 + +bash (2.02.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Replaced config.{sub,guess} with newer ones for ARM. + + -- Jim Pick Mon, 22 Feb 1999 23:57:53 -0800 + +bash (2.02.1-1) unstable; urgency=low + + * libreadline 2.1-13 + * Upstream upgrade, closes: #26582 + * Bugs fixed upstream: closes: #21511, #24004. + * Rules, control fixes for hurd, powerpc, alpha closes: #29123, #29395, + #24931, #31289. + * Included paren-matching feature in readline, closes: #27707. + * Removed convert-meta comment from etc/inputrc, closes: #23035. + * Use system random instead of lousy builtin one, closes: #22104. + + -- Guy Maor Mon, 15 Feb 1999 12:57:53 -0800 + +bash (2.01.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + * libreadline 2.1-12 + * Rebuild with ncurses4.0 to avoid packages linked with libreadline + depending on two versions of ncurses; reported by Martin Mitchell + . [#27762] + * debian/rl.shlibs: bump versioned dependency to >= 2.1-12. + * debian/rules (build): add --with-curses to avoid ever linking with + termcap; reported by, ehm, Guy Maor . [#25118] + + -- James Troup Tue, 20 Oct 1998 03:24:03 +0100 + +bash (2.01.1-3.1) frozen unstable; urgency=low + + * Non-maintainer release. + * Build with ncurses3.0-altdev, so libreadline2 doesn't depend on libc6. + * Use -linux instead of -debian-linux. + + -- Joel Klecker Tue, 14 July 1998 16:26:43 -0700 + +bash (2.01.1-3) unstable frozen; urgency=medium + + * libreadline 2.1-10 + * Make libreadlineg2's postinst a c program, like libreadline2. + * Check return code from tempfile in bashbug, closes: #22349. + * glibc 2.1 patch, closes #22532. + * remove . from /etc/profile PATH, closes #22738. + + -- Guy Maor Mon, 25 May 1998 22:41:06 -0700 + +bash (2.01.1-2) unstable frozen; urgency=high + + * libreadline 2.1-9. + * Predepend on libreadlineg2 >= 2.1-8, closes: #20572. + + -- Guy Maor Wed, 8 Apr 1998 01:07:10 -0700 + +bash (2.01.1-1) frozen unstable; urgency=low + + * libreadline 2.1-8. + * Upstream upgrade, closes: #13762, #14446, #18296. + * Fixed /etc/inputrc, closes: #19745, #19075, #13643, #18004, #17256, + #15345, #14672, #15213, #15345, #15638, #18004, #16797, #15638, #19241. + * Applied patch to read End, Delete, closes: #20053. + * Don't build libc5 packages on alpha & powerpc, closes: #13761, #15538, + #15829. + * Add sh(1) - symlink to bash(1), close: #15659. + * Fix unsafe requests in rbash(1), builtins(1), closes: #19086. + * bashbug uses tempfile, closes: #19781. + * fixed fc -l segfault, closes: #13726. + + -- Guy Maor Sat, 28 Mar 1998 19:34:15 -0800 + +bash (2.01-5) unstable; urgency=low + + * libreadline 2.1-7 + * libreadline tries INPUTRC if it's set, else _both_ /etc/inputrc and + ~/.inputrc + * A better /etc/inputrc. + + -- Guy Maor Thu, 25 Sep 1997 11:38:41 -0500 + +bash (2.01-4) unstable; urgency=low + + * libreadline 2.1-6 + * bash-builtin examples moved to correct place. + * libreadline tries /etc/inputrc if ~/.inputrc doesn't exist. + * set -a; set +a problem seems to be fixed (8390) + + -- Guy Maor Wed, 24 Sep 1997 14:36:02 -0500 + +bash (2.01-3) unstable; urgency=low + + * libreadline 2.1-5 + * Bash depended on wrong version of libreadlineg2. (#12150, #12316) + * Put current version in libreadlineg2 shlibs file. + * Honor TMPDIR by using tempnam(3) (#9201). + + -- Guy Maor Sun, 24 Aug 1997 23:31:19 -0500 + +bash (2.01-2) unstable; urgency=low + + * libreadline 2.1-4 + * Make bash predepend on libreadlineg2 (>=2.01-1) so as not to break + systems which installed James's releases. + * Fix references to shell runtime code in libreadline.so and libhistory.so. + * Fix declare -p dumping core on empty temp variable (#12017). + * make_quoted_replacement() checks for empty rl_filename_quote_characters + (12051). + * readline/readline.h - rl_dispatching should be extern (#11049). + * Added libreadline2g-dbg. + + -- Guy Maor Sat, 16 Aug 1997 13:38:37 -0500 + +bash (2.01-1) unstable; urgency=low + + * libreadline 2.1-3 + * Maintainer release of 2.01. (2.01 fixes 3815, 4783, 7782, 8439, 10416, + 10598, 10604, 11806). + * Cleaned and corrected rules, Makefiles, control files. (7580, 11406). + * Reimplemented SHELL compile time as runtime check. Backward compatible + with old bash (10916). + * Added rbash man page (8645). + * ldconfig run in postinst, compiled as libc5 (10176) + * :( set -a;set +a problem still there, but acts differently. + + -- Guy Maor Thu, 14 Aug 1997 15:35:23 -0500 + +bash (2.01-0.1) unstable; urgency=high + + * libreadline 2.1-2.2 + * libreadline2 now has a preinst script which ensures that ld.so.1 + knows about /lib/libc5-compat and /usr/lib/libc5-compat. Before this + change, trying to install with a libc (< 5.4.23-4) broke bash. + * libreadlineg2 no longer has version dependant shlibs file [#10742]. + + -- James Troup Mon, 23 Jun 1997 22:00:18 +0100 + +bash (2.01-0) unstable; urgency=medium + + * libreadline 2.1-2.1 + * Non-maintainer release + * New upstream version [#10416, #10598, #10604, #8390] + * Rebuilt for glibc; now provides libreadline2g{,-dev} and + libreadline2{,-altdev}. + * Not all of Guy's changes are implemented, noticeably a security + improvement in execute-cmds.c and his alteration of libreadline's + compile time dependance on -DSHELL to run time dependance. + + -- James Troup Thur, 19 June 1997 19:13:34 +0100 + +bash (2.0-3) unstable; urgency=medium + + * libreadline 2.1-2 + * #include in general.h needed for alpha build (#7658) + * Don't drop suid/sgid bits if invoked as sh (#7796) + * Applied patch to fix time in for loop (#7436) + * Split off bash-builtins with examples & necessary headers + * Juggled libreadline2 documentation around (#7275) + + -- Guy Maor Mon, 10 Mar 1997 12:45:06 -0600 + +bash (2.0-2) unstable; urgency=low + + * Added NEWS, COMPAT to /usr/doc/bash + + -- Guy Maor Fri, 7 Feb 1997 17:35:21 -0600 + +bash (2.0-1) unstable; urgency=low + + * Upstream upgrade. + * .bash_history created 600 by default. + * Security improvements when creating files in /tmp + * Reimplemented SHELL run-time check with backward 2.0 compatibility + + -- Guy Maor Wed, 29 Jan 1997 03:31:47 -0600 + +bash (1.14.7-2) frozen unstable; urgency=low + + * libhistory.so had wrong soname (fixes bug 5381). + + -- Guy Maor Sat, 16 Nov 1996 11:07:08 -0600 + +bash (1.14.7-1) frozen unstable; urgency=low + + * New upstream version converted to new source format. + libreadline2, libreadline2-dev produced from bash source. + * Made libreadline SHELL define into a runtime check with rl_shell, + history_shell flags, 4 hooks. + * echo checks write errors (fixes 818). + * default unreadable .bash_history in /etc/skel (fixes 1549). + + -- Guy Maor Sat, 9 Nov 1996 05:07:31 -0600 + --- bash-4.2.orig/debian/skel.bashrc +++ bash-4.2/debian/skel.bashrc @@ -0,0 +1,107 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +[ -z "$PS1" ] && return + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# some more ls aliases +alias ll='ls -alF' +alias la='ls -A' +alias l='ls -CF' + +# Add an "alert" alias for long running commands. Use like so: +# sleep 10; alert +alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if [ -f /etc/bash_completion ] && ! shopt -oq posix; then + . /etc/bash_completion +fi --- bash-4.2.orig/debian/bash.prerm +++ bash-4.2/debian/bash.prerm @@ -0,0 +1,22 @@ +#! /bin/bash + +set -e + +case "$1" in + upgrade) + update-alternatives --remove builtins.7.gz \ + /usr/share/man/man7/bash-builtins.7.gz + ;; + + remove|deconfigure) + ;; + + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# --- bash-4.2.orig/debian/bash-static.postrm +++ bash-4.2/debian/bash-static.postrm @@ -0,0 +1,21 @@ +#! /bin/sh + +set -e + +case "$1" in + upgrade|failed-upgrade|abort-install|abort-upgrade) + ;; + remove|purge|disappear) + if which remove-shell >/dev/null && [ -f /etc/shells ]; then + remove-shell /bin/bash-static + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- bash-4.2.orig/debian/patches/privmode.diff +++ bash-4.2/debian/patches/privmode.diff @@ -0,0 +1,19 @@ +# DP: XXX missing description +# DP: +# DP: Comment from Chet Ramey : +# DP: +# DP: Nope. This will allow setuid scripts if not called as `sh' and not +# DP: called with the -p option. I won't install this. + + +--- a/bash/shell.c ++++ b/bash/shell.c +@@ -486,7 +486,7 @@ + if (dump_translatable_strings) + read_but_dont_execute = 1; + +- if (running_setuid && privileged_mode == 0) ++ if (running_setuid && privileged_mode == 0 && act_like_sh == 0) + disable_priv_mode (); + + /* Need to get the argument to a -c option processed in the --- bash-4.2.orig/debian/patches/CVE-2014-718x.diff +++ bash-4.2/debian/patches/CVE-2014-718x.diff @@ -0,0 +1,121 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-051 + +Bug-Reported-by: Florian Weimer +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +There are two local buffer overflows in parse.y that can cause the shell +to dump core when given many here-documents attached to a single command +or many nested loops. + +Index: bash-4.2.temp/bash/parse.y +=================================================================== +--- bash-4.2.temp.orig/bash/parse.y 2014-10-07 11:02:50.000000000 -0400 ++++ bash-4.2.temp/bash/parse.y 2014-10-07 11:03:11.870803757 -0400 +@@ -167,6 +167,9 @@ + + static int reserved_word_acceptable __P((int)); + static int yylex __P((void)); ++ ++static void push_heredoc __P((REDIRECT *)); ++static char *mk_alexpansion __P((char *)); + static int alias_expand_token __P((char *)); + static int time_command_acceptable __P((void)); + static int special_case_tokens __P((char *)); +@@ -264,7 +267,9 @@ + + /* 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]; ++#define HEREDOC_MAX 16 ++ ++static REDIRECT *redir_stack[HEREDOC_MAX]; + int need_here_doc; + + /* Where shell input comes from. History expansion is performed on each +@@ -306,7 +311,7 @@ + or `for WORD' begins. This is a nested command maximum, since the array + index is decremented after a case, select, or for command is parsed. */ + #define MAX_CASE_NEST 128 +-static int word_lineno[MAX_CASE_NEST]; ++static int word_lineno[MAX_CASE_NEST+1]; + static int word_top = -1; + + /* If non-zero, it is the token that we want read_token to return +@@ -519,42 +524,42 @@ + source.dest = 0; + redir.filename = $2; + $$ = make_redirection (source, r_reading_until, redir, 0); +- redir_stack[need_here_doc++] = $$; ++ push_heredoc ($$); + } + | NUMBER LESS_LESS WORD + { + source.dest = $1; + redir.filename = $3; + $$ = make_redirection (source, r_reading_until, redir, 0); +- redir_stack[need_here_doc++] = $$; ++ push_heredoc ($$); + } + | 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_heredoc ($$); + } + | 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_heredoc ($$); + } + | 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_heredoc ($$); + } + | 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_heredoc ($$); + } + | LESS_LESS_LESS WORD + { +@@ -2531,6 +2536,21 @@ + which allow ESAC to be the next one read. */ + static int esacs_needed_count; + ++static void ++push_heredoc (r) ++ REDIRECT *r; ++{ ++ if (need_here_doc >= HEREDOC_MAX) ++ { ++ last_command_exit_value = EX_BADUSAGE; ++ need_here_doc = 0; ++ report_syntax_error (_("maximum here-document count exceeded")); ++ reset_parser (); ++ exit_shell (last_command_exit_value); ++ } ++ redir_stack[need_here_doc++] = r; ++} ++ + void + gather_here_documents () + { --- bash-4.2.orig/debian/patches/variables-affix.diff +++ bash-4.2/debian/patches/variables-affix.diff @@ -0,0 +1,162 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-050 + +Bug-Reported-by: Florian Weimer +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +This patch changes the encoding bash uses for exported functions to avoid +clashes with shell variables and to avoid depending only on an environment +variable's contents to determine whether or not to interpret it as a shell +function. + +Index: bash-4.2.temp/bash/variables.c +=================================================================== +--- bash-4.2.temp.orig/bash/variables.c 2014-10-07 11:02:24.162804496 -0400 ++++ bash-4.2.temp/bash/variables.c 2014-10-07 11:02:38.142804279 -0400 +@@ -79,6 +79,11 @@ + + #define ifsname(s) ((s)[0] == 'I' && (s)[1] == 'F' && (s)[2] == 'S' && (s)[3] == '\0') + ++#define BASHFUNC_PREFIX "BASH_FUNC_" ++#define BASHFUNC_PREFLEN 10 /* == strlen(BASHFUNC_PREFIX */ ++#define BASHFUNC_SUFFIX "%%" ++#define BASHFUNC_SUFFLEN 2 /* == strlen(BASHFUNC_SUFFIX) */ ++ + extern char **environ; + + /* Variables used here and defined in other files. */ +@@ -268,7 +273,7 @@ + static void propagate_temp_var __P((PTR_T)); + static void dispose_temporary_env __P((sh_free_func_t *)); + +-static inline char *mk_env_string __P((const char *, const char *)); ++static inline char *mk_env_string __P((const char *, const char *, int)); + static char **make_env_array_from_var_list __P((SHELL_VAR **)); + static char **make_var_export_array __P((VAR_CONTEXT *)); + static char **make_func_export_array __P((void)); +@@ -338,27 +343,41 @@ + + /* If exported function, define it now. Don't import functions from + the environment in privileged mode. */ +- if (privmode == 0 && read_but_dont_execute == 0 && STREQN ("() {", string, 4)) ++ if (privmode == 0 && read_but_dont_execute == 0 && ++ STREQN (BASHFUNC_PREFIX, name, BASHFUNC_PREFLEN) && ++ STREQ (BASHFUNC_SUFFIX, name + char_index - BASHFUNC_SUFFLEN) && ++ STREQN ("() {", string, 4)) + { ++ size_t namelen; ++ char *tname; /* desired imported function name */ ++ ++ namelen = char_index - BASHFUNC_PREFLEN - BASHFUNC_SUFFLEN; ++ ++ tname = name + BASHFUNC_PREFLEN; /* start of func name */ ++ tname[namelen] = '\0'; /* now tname == func name */ ++ + string_length = strlen (string); +- temp_string = (char *)xmalloc (3 + string_length + char_index); ++ temp_string = (char *)xmalloc (namelen + string_length + 2); + +- strcpy (temp_string, name); +- temp_string[char_index] = ' '; +- strcpy (temp_string + char_index + 1, string); ++ memcpy (temp_string, tname, namelen); ++ temp_string[namelen] = ' '; ++ memcpy (temp_string + namelen + 1, string, string_length + 1); + + /* Don't import function names that are invalid identifiers from the + environment. */ +- if (legal_identifier (name)) +- parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); ++ if (absolute_program (tname) == 0 && (posixly_correct == 0 || legal_identifier (tname))) ++ parse_and_execute (temp_string, tname, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + +- if (temp_var = find_function (name)) ++ if (temp_var = find_function (tname)) + { + VSETATTR (temp_var, (att_exported|att_imported)); + array_needs_making = 1; + } + else +- report_error (_("error importing function definition for `%s'"), name); ++ report_error (_("error importing function definition for `%s'"), tname); ++ ++ /* Restore original suffix */ ++ tname[namelen] = BASHFUNC_SUFFIX[0]; + } + #if defined (ARRAY_VARS) + # if 0 +@@ -2537,7 +2556,7 @@ + var->context = variable_context; /* XXX */ + + INVALIDATE_EXPORTSTR (var); +- var->exportstr = mk_env_string (name, value); ++ var->exportstr = mk_env_string (name, value, 0); + + array_needs_making = 1; + +@@ -3389,21 +3408,42 @@ + /* **************************************************************** */ + + static inline char * +-mk_env_string (name, value) ++mk_env_string (name, value, isfunc) + const char *name, *value; ++ int isfunc; + { +- int name_len, value_len; +- char *p; ++ size_t name_len, value_len; ++ char *p, *q; + + name_len = strlen (name); + value_len = STRLEN (value); +- p = (char *)xmalloc (2 + name_len + value_len); +- strcpy (p, name); +- p[name_len] = '='; ++ ++ /* If we are exporting a shell function, construct the encoded function ++ name. */ ++ if (isfunc && value) ++ { ++ p = (char *)xmalloc (BASHFUNC_PREFLEN + name_len + BASHFUNC_SUFFLEN + value_len + 2); ++ q = p; ++ memcpy (q, BASHFUNC_PREFIX, BASHFUNC_PREFLEN); ++ q += BASHFUNC_PREFLEN; ++ memcpy (q, name, name_len); ++ q += name_len; ++ memcpy (q, BASHFUNC_SUFFIX, BASHFUNC_SUFFLEN); ++ q += BASHFUNC_SUFFLEN; ++ } ++ else ++ { ++ p = (char *)xmalloc (2 + name_len + value_len); ++ memcpy (p, name, name_len); ++ q = p + name_len; ++ } ++ ++ q[0] = '='; + if (value && *value) +- strcpy (p + name_len + 1, value); ++ memcpy (q + 1, value, value_len + 1); + else +- p[name_len + 1] = '\0'; ++ q[1] = '\0'; ++ + return (p); + } + +@@ -3489,7 +3529,7 @@ + /* Gee, I'd like to get away with not using savestring() if we're + using the cached exportstr... */ + list[list_index] = USE_EXPORTSTR ? savestring (value) +- : mk_env_string (var->name, value); ++ : mk_env_string (var->name, value, function_p (var)); + + if (USE_EXPORTSTR == 0) + SAVE_EXPORTSTR (var, list[list_index]); --- bash-4.2.orig/debian/patches/bash42-006.diff +++ bash-4.2/debian/patches/bash42-006.diff @@ -0,0 +1,39 @@ +# DP: bash-4.2 upstream patch 006 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-006 + +Bug-Reported-by: Allan McRae +Bug-Reference-ID: <4D6D0D0B.50908@archlinux.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00001.html + +Bug-Description: + +A problem with bash42-005 caused it to dump core if TZ was unset. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 5 ++#define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/variables.c ++++ b/bash/variables.c +@@ -3660,7 +3660,7 @@ + SHELL_VAR *v; + + v = find_variable (name); +- if (exported_p (v)) ++ if (v && exported_p (v)) + { + array_needs_making = 1; + maybe_make_export_env (); --- bash-4.2.orig/debian/patches/bash42-024.diff +++ bash-4.2/debian/patches/bash42-024.diff @@ -0,0 +1,42 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-024 + +Bug-Reported-by: Jim Avera +Bug-Reference-ID: <4F29E07A.80405@yahoo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-02/msg00001.html + +Bug-Description: + +When `printf -v' is used to set an array element, the format string contains +`%b', and the corresponding argument is the empty string, the buffer used +to store the value to be assigned can be NULL, which results in NUL being +assigned to the array element. This causes a seg fault when it's used later. + +Index: b/bash/builtins/printf.def +=================================================================== +--- a/bash/builtins/printf.def ++++ b/bash/builtins/printf.def +@@ -255,6 +255,8 @@ + #endif + { + vflag = 1; ++ if (vbsize == 0) ++ vbuf = xmalloc (vbsize = 16); + vblen = 0; + if (vbuf) + vbuf[0] = 0; +Index: b/bash/patchlevel.h +=================================================================== +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 23 ++#define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/bash42-002.diff +++ bash-4.2/debian/patches/bash42-002.diff @@ -0,0 +1,52 @@ +# DP: bash-4.2 upstream patch 002 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-002 + +Bug-Reported-by: Clark J. Wang +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html + +Bug-Description: + +The readline vi-mode `cc', `dd', and `yy' commands failed to modify the +entire line. + +Patch (apply with `patch -p0'): + +--- a/bash/lib/readline/callback.c ++++ b/bash/lib/readline/callback.c +@@ -148,6 +148,9 @@ + eof = _rl_vi_domove_callback (_rl_vimvcxt); + /* Should handle everything, including cleanup, numeric arguments, + and turning off RL_STATE_VIMOTION */ ++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) ++ _rl_internal_char_cleanup (); ++ + return; + } + #endif +--- a/bash/lib/readline/vi_mode.c ++++ b/bash/lib/readline/vi_mode.c +@@ -1114,7 +1114,7 @@ + rl_beg_of_line (1, c); + _rl_vi_last_motion = c; + RL_UNSETSTATE (RL_STATE_VIMOTION); +- return (0); ++ return (vidomove_dispatch (m)); + } + #if defined (READLINE_CALLBACKS) + /* XXX - these need to handle rl_universal_argument bindings */ +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 1 ++#define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/CVE-2016-7543.patch +++ bash-4.2/debian/patches/CVE-2016-7543.patch @@ -0,0 +1,33 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.3 +Patch-ID: bash43-048 + +Bug-Reported-by: up201407890@alunos.dcc.fc.up.pt +Bug-Reference-ID: <20151210201649.126444eionzfsam8@webmail.alunos.dcc.fc.up.pt> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2015-12/msg00054.html + +Bug-Description: + +If a malicious user can inject a value of $SHELLOPTS containing `xtrace' +and a value for $PS4 that includes a command substitution into a shell +running as root, bash will expand the command substitution as part of +expanding $PS4 when it executes a traced command. +Index: bash-4.2/bash/variables.c +=================================================================== +--- bash-4.2.orig/bash/variables.c ++++ bash-4.2/bash/variables.c +@@ -465,7 +465,11 @@ initialize_shell_variables (env, privmod + #endif + set_if_not ("PS2", secondary_prompt); + } +- set_if_not ("PS4", "+ "); ++ ++ if (current_user.euid == 0) ++ bind_variable ("PS4", "+ ", 0); ++ else ++ set_if_not ("PS4", "+ "); + + /* Don't allow IFS to be imported from the environment. */ + temp_var = bind_variable ("IFS", " \t\n", 0); --- bash-4.2.orig/debian/patches/CVE-2012-6711.patch +++ bash-4.2/debian/patches/CVE-2012-6711.patch @@ -0,0 +1,106 @@ +Backported of: + +From 863d31ae775d56b785dc5b0105b6d251515d81d5 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Mon, 5 Mar 2012 21:17:40 -0500 +Subject: commit bash-20120224 snapshot +diff --git a/bash/lib/sh/unicode.c b/bash/lib/sh/unicode.c +index d34fa08..2456058 100644 +--- a/bash/lib/sh/unicode.c ++++ b/bash/lib/sh/unicode.c +@@ -140,6 +140,32 @@ u32toutf8 (wc, s) + return l; + } + ++/* Convert a 32-bit unsigned int (unicode) to a UTF-16 string. Rarely used, ++ only if sizeof(wchar_t) == 2. */ ++int ++u32toutf16 (c, s) ++ u_bits32_t c; ++ unsigned short *s; ++{ ++ int l; ++ ++ l = 0; ++ if (c < 0x0d800) ++ { ++ s[0] = (unsigned short) (c & 0xFFFF); ++ l = 1; ++ } ++ else if (c >= 0x0e000 && c <= 0x010ffff) ++ { ++ c -= 0x010000; ++ s[0] = (unsigned short)((c >> 10) + 0xd800); ++ s[1] = (unsigned short)((c & 0x3ff) + 0xdc00); ++ l = 2; ++ } ++ s[l] = 0; ++ return l; ++} ++ + /* convert a single unicode-32 character into a multibyte string and put the + result in S, which must be large enough (at least MB_LEN_MAX bytes) */ + int +@@ -148,6 +174,7 @@ u32cconv (c, s) + char *s; + { + wchar_t wc; ++ wchar_t ws[3]; + int n; + #if HAVE_ICONV + const char *charset; +@@ -157,14 +184,16 @@ u32cconv (c, s) + size_t sn; + #endif + +- wc = c; +- + #if __STDC_ISO_10646__ +- if (sizeof (wchar_t) == 4) +- { +- n = wctomb (s, wc); +- return n; +- } ++ wc = c; ++ if (sizeof (wchar_t) == 4 && c <= 0x7fffffff) ++ n = wctomb (s, wc); ++ else if (sizeof (wchar_t) == 2 && c <= 0x10ffff && u32toutf16 (c, ws)) ++ n = wcstombs (s, ws, MB_LEN_MAX); ++ else ++ n = -1; ++ if (n != -1) ++ return n; + #endif + + #if HAVE_NL_LANGINFO +@@ -196,19 +225,9 @@ u32cconv (c, s) + u32init = 1; + } + +- if (utf8locale) +- { +- n = u32toutf8 (wc, s); +- return n; +- } +- +- if (localconv == (iconv_t)-1) +- { +- n = u32tochar (wc, s); +- return n; +- } +- + n = u32toutf8 (wc, s); ++ if (utf8locale || localconv == (iconv_t)-1) ++ return n; + + optr = obuf; + obytesleft = sizeof (obuf); +@@ -228,7 +247,7 @@ u32cconv (c, s) + return (optr - obuf); + #endif + +- n = u32tochar (wc, s); /* fallback */ ++ n = u32tochar (c, s); /* fallback */ + return n; + } + --- bash-4.2.orig/debian/patches/deb-bash-config.diff +++ bash-4.2/debian/patches/deb-bash-config.diff @@ -0,0 +1,69 @@ +# DP: Changed compile time configuration options: +# DP: +# DP: - Set the default path to comply with Debian policy +# DP: +# DP: - Enable System-wide .bashrc file for interactive shells. +# DP: +# DP: - Enable System-wide .bash.logout file for interactive shells. +# DP: +# DP: - make non-interactive shells begun with argv[0][0] == '-' +# DP: run the startup files when not in posix mode. +# DP: +# DP: - try to check whether bash is being run by sshd and source +# DP: the .bashrc if so (like the rshd behavior). +# DP: +# DP: - don't define a default DEFAULT_MAIL_DIRECTORY, because it +# DP: can cause a timeout on NFS mounts. + +--- a/bash/config-bot.h ++++ b/bash/config-bot.h +@@ -196,4 +196,4 @@ + /******************************************************************/ + + /* If you don't want bash to provide a default mail file to check. */ +-/* #undef DEFAULT_MAIL_DIRECTORY */ ++#undef DEFAULT_MAIL_DIRECTORY +--- a/bash/config-top.h ++++ b/bash/config-top.h +@@ -54,14 +54,14 @@ + /* The default value of the PATH variable. */ + #ifndef DEFAULT_PATH_VALUE + #define DEFAULT_PATH_VALUE \ +- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:." ++ "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + #endif + + /* The value for PATH when invoking `command -p'. This is only used when + the Posix.2 confstr () function, or CS_PATH define are not present. */ + #ifndef STANDARD_UTILS_PATH + #define STANDARD_UTILS_PATH \ +- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc" ++ "/bin:/usr/bin:/sbin:/usr/sbin" + #endif + + /* Default primary and secondary prompt strings. */ +@@ -75,20 +75,20 @@ + #define KSH_COMPATIBLE_SELECT + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ +-/* #define NON_INTERACTIVE_LOGIN_SHELLS */ ++#define NON_INTERACTIVE_LOGIN_SHELLS + + /* Define this if you want bash to try to check whether it's being run by + sshd and source the .bashrc if so (like the rshd behavior). This checks + for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, + which can be fooled under certain not-uncommon circumstances. */ +-/* #define SSH_SOURCE_BASHRC */ ++#define SSH_SOURCE_BASHRC + + /* Define if you want the case-capitalizing operators (~[~]) and the + `capcase' variable attribute (declare -c). */ --- bash-4.2.orig/debian/patches/bash42-029.diff +++ bash-4.2/debian/patches/bash42-029.diff @@ -0,0 +1,477 @@ + BASH PATCH REPORT + ================= + + Bash-Release: 4.2 + Patch-ID: bash42-029 + +Bug-Reported-by: "Michael Kalisz" +Bug-Reference-ID: <50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html + +Bug-Description: + +Bash-4.2 tries to leave completed directory names as the user typed them, +without expanding them to a full pathname. One effect of this is that +shell variables used in pathnames being completed (e.g., $HOME) are left +unchanged, but the `$' is quoted by readline because it is a special +character to the shell. + +This patch introduces two things: + +1. A new shell option, `direxpand', which, if set, attempts to emulate the + bash-4.1 behavior of expanding words to full pathnames during completion; +2. A set of heuristics that reduce the number of times special characters + such as `$' are quoted when the directory name is not expanded. + +Patch (apply with `patch -p0'): + +--- +diff --git a/bash/bashline.c b/bash/bashline.c +index 52c6de6..3cbb18f 100644 +--- a/bash/bashline.c ++++ b/bash/bashline.c +@@ -121,6 +121,9 @@ static int bash_directory_completion_hook __P((char **)); + static int filename_completion_ignore __P((char **)); + static int bash_push_line __P((void)); + ++static rl_icppfunc_t *save_directory_hook __P((void)); ++static void reset_directory_hook __P((rl_icppfunc_t *)); ++ + static void cleanup_expansion_error __P((void)); + static void maybe_make_readline_line __P((char *)); + static void set_up_new_line __P((char *)); +@@ -243,10 +246,17 @@ int force_fignore = 1; + /* Perform spelling correction on directory names during word completion */ + int dircomplete_spelling = 0; + ++/* Expand directory names during word/filename completion. */ ++int dircomplete_expand = 0; ++int dircomplete_expand_relpath = 0; ++ + 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; ++ + static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL; + + static int dot_in_path = 0; +@@ -501,7 +511,7 @@ initialize_readline () + + /* Tell the completer that we might want to follow symbolic links or + do other expansion on directory names. */ +- rl_directory_rewrite_hook = bash_directory_completion_hook; ++ set_directory_hook (); + + rl_filename_rewrite_hook = bash_filename_rewrite_hook; + +@@ -529,7 +539,7 @@ initialize_readline () + enable_hostname_completion (perform_hostname_completion); + + /* characters that need to be quoted when appearing in filenames. */ +- rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/ ++ rl_filename_quote_characters = default_filename_quote_characters; + + rl_filename_quoting_function = bash_quote_filename; + rl_filename_dequoting_function = bash_dequote_filename; +@@ -564,8 +574,10 @@ bashline_reset () + tilde_initialize (); + rl_attempted_completion_function = attempt_shell_completion; + rl_completion_entry_function = NULL; +- rl_directory_rewrite_hook = bash_directory_completion_hook; + rl_ignore_some_completions_function = filename_completion_ignore; ++ rl_filename_quote_characters = default_filename_quote_characters; ++ ++ set_directory_hook (); + } + + /* Contains the line to push into readline. */ +@@ -1279,6 +1291,9 @@ attempt_shell_completion (text, start, end) + matches = (char **)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + ++ rl_filename_quote_characters = default_filename_quote_characters; ++ set_directory_hook (); ++ + /* Determine if this could be a command word. It is if it appears at + the start of the line (ignoring preceding whitespace), or if it + appears after a character that separates commands. It cannot be a +@@ -1591,6 +1606,12 @@ command_word_completion_function (hint_text, state) + } + else + { ++ if (dircomplete_expand && dot_or_dotdot (filename_hint)) ++ { ++ dircomplete_expand = 0; ++ set_directory_hook (); ++ dircomplete_expand = 1; ++ } + mapping_over = 4; + goto inner; + } +@@ -1791,6 +1812,9 @@ globword: + + inner: + val = rl_filename_completion_function (filename_hint, istate); ++ if (mapping_over == 4 && dircomplete_expand) ++ set_directory_hook (); ++ + istate = 1; + + if (val == 0) +@@ -2693,6 +2717,52 @@ bash_filename_rewrite_hook (fname, fnlen) + return conv; + } + ++/* Functions to save and restore the appropriate directory hook */ ++/* This is not static so the shopt code can call it */ ++void ++set_directory_hook () ++{ ++ if (dircomplete_expand) ++ { ++ rl_directory_completion_hook = bash_directory_completion_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)0; ++ } ++ else ++ { ++ rl_directory_rewrite_hook = bash_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)0; ++ } ++} ++ ++static rl_icppfunc_t * ++save_directory_hook () ++{ ++ rl_icppfunc_t *ret; ++ ++ if (dircomplete_expand) ++ { ++ ret = rl_directory_completion_hook; ++ rl_directory_completion_hook = (rl_icppfunc_t *)NULL; ++ } ++ else ++ { ++ ret = rl_directory_rewrite_hook; ++ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; ++ } ++ ++ return ret; ++} ++ ++static void ++restore_directory_hook (hookf) ++ rl_icppfunc_t *hookf; ++{ ++ if (dircomplete_expand) ++ rl_directory_completion_hook = hookf; ++ else ++ rl_directory_rewrite_hook = hookf; ++} ++ + /* Handle symbolic link references and other directory name + expansions while hacking completion. This should return 1 if it modifies + the DIRNAME argument, 0 otherwise. It should make sure not to modify +@@ -2702,20 +2772,31 @@ bash_directory_completion_hook (dirname) + char **dirname; + { + char *local_dirname, *new_dirname, *t; +- int return_value, should_expand_dirname; ++ int return_value, should_expand_dirname, nextch, closer; + WORD_LIST *wl; + struct stat sb; + +- return_value = should_expand_dirname = 0; ++ return_value = should_expand_dirname = nextch = closer = 0; + local_dirname = *dirname; + +- if (mbschr (local_dirname, '$')) +- should_expand_dirname = 1; ++ if (t = mbschr (local_dirname, '$')) ++ { ++ should_expand_dirname = '$'; ++ nextch = t[1]; ++ /* Deliberately does not handle the deprecated $[...] arithmetic ++ expansion syntax */ ++ if (nextch == '(') ++ closer = ')'; ++ else if (nextch == '{') ++ closer = '}'; ++ else ++ nextch = 0; ++ } + else + { + t = mbschr (local_dirname, '`'); + if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0) +- should_expand_dirname = 1; ++ should_expand_dirname = '`'; + } + + #if defined (HAVE_LSTAT) +@@ -2739,6 +2820,23 @@ bash_directory_completion_hook (dirname) + free (new_dirname); + dispose_words (wl); + local_dirname = *dirname; ++ /* XXX - change rl_filename_quote_characters here based on ++ should_expand_dirname/nextch/closer. This is the only place ++ custom_filename_quote_characters is modified. */ ++ if (rl_filename_quote_characters && *rl_filename_quote_characters) ++ { ++ int i, j, c; ++ i = strlen (default_filename_quote_characters); ++ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1); ++ for (i = j = 0; c = default_filename_quote_characters[i]; i++) ++ { ++ if (c == should_expand_dirname || c == nextch || c == closer) ++ continue; ++ custom_filename_quote_characters[j++] = c; ++ } ++ custom_filename_quote_characters[j] = '\0'; ++ rl_filename_quote_characters = custom_filename_quote_characters; ++ } + } + else + { +@@ -2758,11 +2856,31 @@ bash_directory_completion_hook (dirname) + local_dirname = *dirname = new_dirname; + } + ++ /* no_symbolic_links == 0 -> use (default) logical view of the file system. ++ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the ++ current directory (./). ++ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames ++ in the current directory (e.g., lib/bash/sh). ++ XXX - should we do spelling correction on these? */ ++ ++ /* This is test as it was in bash-4.2: skip relative pathnames in current ++ directory. Change test to ++ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/')) ++ if we want to skip paths beginning with ./ also. */ + if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1])) + { + char *temp1, *temp2; + int len1, len2; + ++ /* If we have a relative path ++ (local_dirname[0] != '/' && local_dirname[0] != '.') ++ that is canonical after appending it to the current directory, then ++ temp1 = temp2+'/' ++ That is, ++ strcmp (temp1, temp2) == 0 ++ after adding a slash to temp2 below. It should be safe to not ++ change those. ++ */ + t = get_working_directory ("symlink-hook"); + temp1 = make_absolute (local_dirname, t); + free (t); +@@ -2797,7 +2915,15 @@ bash_directory_completion_hook (dirname) + temp2[len2 + 1] = '\0'; + } + } +- return_value |= STREQ (local_dirname, temp2) == 0; ++ ++ /* dircomplete_expand_relpath == 0 means we want to leave relative ++ pathnames that are unchanged by canonicalization alone. ++ *local_dirname != '/' && *local_dirname != '.' == relative pathname ++ (consistent with general.c:absolute_pathname()) ++ temp1 == temp2 (after appending a slash to temp2) means the pathname ++ is not changed by canonicalization as described above. */ ++ if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0)) ++ return_value |= STREQ (local_dirname, temp2) == 0; + free (local_dirname); + *dirname = temp2; + free (temp1); +@@ -3002,12 +3128,13 @@ bash_complete_filename_internal (what_to_do) + + orig_func = rl_completion_entry_function; + orig_attempt_func = rl_attempted_completion_function; +- orig_dir_func = rl_directory_rewrite_hook; + orig_ignore_func = rl_ignore_some_completions_function; + orig_rl_completer_word_break_characters = rl_completer_word_break_characters; ++ ++ orig_dir_func = save_directory_hook (); ++ + rl_completion_entry_function = rl_filename_completion_function; + rl_attempted_completion_function = (rl_completion_func_t *)NULL; +- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL; + rl_ignore_some_completions_function = filename_completion_ignore; + rl_completer_word_break_characters = " \t\n\"\'"; + +@@ -3015,10 +3142,11 @@ bash_complete_filename_internal (what_to_do) + + rl_completion_entry_function = orig_func; + rl_attempted_completion_function = orig_attempt_func; +- rl_directory_rewrite_hook = orig_dir_func; + rl_ignore_some_completions_function = orig_ignore_func; + rl_completer_word_break_characters = orig_rl_completer_word_break_characters; + ++ restore_directory_hook (orig_dir_func); ++ + return r; + } + +diff --git a/bash/bashline.h b/bash/bashline.h +index 9daa8f9..38964ea 100644 +--- a/bash/bashline.h ++++ b/bash/bashline.h +@@ -33,10 +33,15 @@ extern void bashline_reset __P((void)); + extern void bashline_reinitialize __P((void)); + extern int bash_re_edit __P((char *)); + ++extern void bashline_set_event_hook __P((void)); ++extern void bashline_reset_event_hook __P((void)); ++ + extern int bind_keyseq_to_unix_command __P((char *)); + + extern char **bash_default_completion __P((const char *, int, int, int, int)); + ++void set_directory_hook __P((void)); ++ + /* Used by programmable completion code. */ + extern char *command_word_completion_function __P((const char *, int)); + extern char *bash_groupname_completion_function __P((const char *, int)); +diff --git a/bash/builtins/shopt.def b/bash/builtins/shopt.def +index 27685aa..6cd8c4f 100644 +--- a/bash/builtins/shopt.def ++++ b/bash/builtins/shopt.def +@@ -61,6 +61,10 @@ $END + #include "common.h" + #include "bashgetopt.h" + ++#if defined (READLINE) ++# include "../bashline.h" ++#endif ++ + #if defined (HISTORY) + # include "../bashhist.h" + #endif +@@ -94,7 +98,7 @@ extern int extended_glob; + extern int hist_verify, history_reediting, perform_hostname_completion; + extern int no_empty_command_completion; + extern int force_fignore; +-extern int dircomplete_spelling; ++extern int dircomplete_spelling, dircomplete_expand; + + extern int enable_hostname_completion __P((int)); + #endif +@@ -121,6 +125,10 @@ static int set_compatibility_level __P((char *, int)); + static int set_restricted_shell __P((char *, int)); + #endif + ++#if defined (READLINE) ++static int shopt_set_complete_direxpand __P((char *, int)); ++#endif ++ + static int shopt_login_shell; + static int shopt_compat31; + static int shopt_compat32; +@@ -150,6 +158,7 @@ static struct { + { "compat40", &shopt_compat40, set_compatibility_level }, + { "compat41", &shopt_compat41, set_compatibility_level }, + #if defined (READLINE) ++ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, + { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL }, + #endif + { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL }, +@@ -535,6 +544,17 @@ set_compatibility_level (option_name, mode) + return 0; + } + ++#if defined (READLINE) ++static int ++shopt_set_complete_direxpand (option_name, mode) ++ char *option_name; ++ int mode; ++{ ++ set_directory_hook (); ++ return 0; ++} ++#endif ++ + #if defined (RESTRICTED_SHELL) + /* Don't allow the value of restricted_shell to be modified. */ + +diff --git a/bash/doc/bash.1 b/bash/doc/bash.1 +index 0ba4f8e..103d27e 100644 +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -8948,6 +8948,16 @@ parameter expansion as a special character. The single quotes must match + quoted. This is the behavior of posix mode through version 4.1. + The default bash behavior remains as in previous versions. + .TP 8 ++.B direxpand ++If set, ++.B bash ++replaces directory names with the results of word expansion when performing ++filename completion. This changes the contents of the readline editing ++buffer. ++If not set, ++.B bash ++attempts to preserve what the user typed. ++.TP 8 + .B dirspell + If set, + .B bash +diff --git a/bash/doc/bashref.texi b/bash/doc/bashref.texi +index b4fd8d3..ae982d5 100644 +--- a/bash/doc/bashref.texi ++++ b/bash/doc/bashref.texi +@@ -4535,6 +4535,13 @@ parameter expansion as a special character. The single quotes must match + quoted. This is the behavior of @sc{posix} mode through version 4.1. + The default Bash behavior remains as in previous versions. + ++@item direxpand ++If set, Bash ++replaces directory names with the results of word expansion when performing ++filename completion. This changes the contents of the readline editing ++buffer. ++If not set, Bash attempts to preserve what the user typed. ++ + @item dirspell + If set, Bash + attempts spelling correction on directory names during word completion +diff --git a/bash/patchlevel.h b/bash/patchlevel.h +index a2be105..7da4a26 100644 +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 24 ++#define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ +diff --git a/bash/tests/shopt.right b/bash/tests/shopt.right +index 4080503..0d3c08c 100644 +--- a/bash/tests/shopt.right ++++ b/bash/tests/shopt.right +@@ -12,6 +12,7 @@ shopt -u compat31 + shopt -u compat32 + shopt -u compat40 + shopt -u compat41 ++shopt -u direxpand + shopt -u dirspell + shopt -u dotglob + shopt -u execfail +@@ -68,6 +69,7 @@ shopt -u compat31 + shopt -u compat32 + shopt -u compat40 + shopt -u compat41 ++shopt -u direxpand + shopt -u dirspell + shopt -u dotglob + shopt -u execfail +@@ -101,6 +103,7 @@ compat31 off + compat32 off + compat40 off + compat41 off ++direxpand off + dirspell off + dotglob off + execfail off +-- +cgit v0.9.0.2 --- bash-4.2.orig/debian/patches/series.in +++ bash-4.2/debian/patches/series.in @@ -0,0 +1,60 @@ +bash42-001.diff +bash42-002.diff +bash42-003.diff +bash42-004.diff +bash42-005.diff +bash42-006.diff +bash42-007.diff +bash42-008.diff +bash42-009.diff +bash42-010.diff +bash42-011.diff +bash42-012.diff +bash42-013.diff +bash42-014.diff +bash42-015.diff +bash42-016.diff +bash42-017.diff +bash42-018.diff +bash42-019.diff +bash42-020.diff +bash42-021.diff +bash42-022.diff +bash42-023.diff +bash42-024.diff +bash42-029.diff +bashbug-editor.diff +deb-bash-config.diff +deb-examples.diff +man-arithmetic.diff +man-fignore.diff +man-bashrc.diff +man-bashlogout.diff +man-substring-exp.diff +man-nocaseglob.diff +man-test.diff +man-test2.diff +privmode.diff +rbash-manpage.diff +bash-default-editor.diff +bash-subst-param-length.diff +pgrp-pipe.diff +input-err.diff +exec-redirections-man.diff +bash-aliases-repeat.diff +no-brk-caching.diff +#if defined(GFDL) +man-substring-exp-doc.diff +man-test2-doc.diff +exec-redirections-texi.diff +#endif +hardening-formatstring.diff +CVE-2014-6271.diff +CVE-2014-7169.diff +variables-affix.diff +CVE-2014-718x.diff +CVE-2014-6277.diff +CVE-2014-6278.diff +CVE-2016-7543.patch +CVE-2019-9924.patch +CVE-2012-6711.patch --- bash-4.2.orig/debian/patches/bash42-007.diff +++ bash-4.2/debian/patches/bash42-007.diff @@ -0,0 +1,41 @@ +# DP: bash-4.2 upstream patch 007 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-007 + +Bug-Reported-by: Matthias Klose +Bug-Reference-ID: <4D6FD2AC.1010500@debian.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00015.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as case statement word expansion, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not expanded correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 6 ++#define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/subst.c ++++ b/bash/subst.c +@@ -4609,6 +4609,7 @@ + if (ifs_firstc == 0) + #endif + word->flags |= W_NOSPLIT; ++ word->flags |= W_NOSPLIT2; + result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); + expand_no_split_dollar_star = 0; + --- bash-4.2.orig/debian/patches/CVE-2014-7169.diff +++ bash-4.2/debian/patches/CVE-2014-7169.diff @@ -0,0 +1,28 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-049 + +Bug-Reported-by: Tavis Ormandy +Bug-Reference-ID: +Bug-Reference-URL: http://twitter.com/taviso/statuses/514887394294652929 + +Bug-Description: + +Under certain circumstances, bash can incorrectly save a lookahead character and +return it on a subsequent call, even when reading a new line. + +Index: bash-4.2.temp/bash/parse.y +=================================================================== +--- bash-4.2.temp.orig/bash/parse.y 2014-10-07 11:01:53.882804965 -0400 ++++ bash-4.2.temp/bash/parse.y 2014-10-07 11:02:08.066804745 -0400 +@@ -2848,6 +2848,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'; --- bash-4.2.orig/debian/patches/bash42-015.diff +++ bash-4.2/debian/patches/bash42-015.diff @@ -0,0 +1,71 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-015 + +Bug-Reported-by: +Bug-Reference-ID: <728_1312188080_4E3666B0_728_118711_1_3B5D3E0F95CC5C478D6500CDCE8B691F7AAAA4AA3D@PUEXCB2B.nanterre.francetelecom.fr> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00000.html + +Bug-Description: + +When in a context where arithmetic evaluation is not taking place, the +evaluator should not check for division by 0. + +Patch (apply with `patch -p0'): + +--- a/bash/expr.c ++++ b/bash/expr.c +@@ -476,19 +476,23 @@ + + if (special) + { ++ if ((op == DIV || op == MOD) && value == 0) ++ { ++ if (noeval == 0) ++ evalerror (_("division by 0")); ++ else ++ value = 1; ++ } ++ + switch (op) + { + case MUL: + lvalue *= value; + break; + case DIV: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue /= value; + break; + case MOD: +- if (value == 0) +- evalerror (_("division by 0")); + lvalue %= value; + break; + case PLUS: +@@ -804,7 +808,12 @@ + val2 = exppower (); + + if (((op == DIV) || (op == MOD)) && (val2 == 0)) +- evalerror (_("division by 0")); ++ { ++ if (noeval == 0) ++ evalerror (_("division by 0")); ++ else ++ val2 = 1; ++ } + + if (op == MUL) + val1 *= val2; +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 14 ++#define PATCHLEVEL 15 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/exec-redirections-man.diff +++ bash-4.2/debian/patches/exec-redirections-man.diff @@ -0,0 +1,13 @@ +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -3452,6 +3452,10 @@ + Redirections using file descriptors greater than 9 should be used with + care, as they may conflict with file descriptors the shell uses + internally. ++.PP ++Note that the ++.B exec ++builtin command can make redirections take effect in the current shell. + .SS Redirecting Input + .PP + Redirection of input causes the file whose name results from --- bash-4.2.orig/debian/patches/rl-header.dpatch +++ bash-4.2/debian/patches/rl-header.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: include stdio.h in readline.h +--- lib/readline/readline.h~ Thu Aug 5 14:10:59 1999 ++++ lib/readline/readline.h Mon Oct 9 20:32:56 2000 +@@ -32,6 +32,7 @@ + # include "keymaps.h" + # include "tilde.h" + #else ++# include + # include + # include + # include --- bash-4.2.orig/debian/patches/input-err.diff +++ bash-4.2/debian/patches/input-err.diff @@ -0,0 +1,13 @@ +# DP: Define PGRP_PIPE to avoid race condition. + +--- a/bash/input.c ++++ b/bash/input.c +@@ -498,7 +498,7 @@ + if (nr == 0) + bp->b_flag |= B_EOF; + else +- bp->b_flag |= B_ERROR; ++ fatal_error("error reading input file: %s", strerror(errno)); + return (EOF); + } + --- bash-4.2.orig/debian/patches/man-bashrc.diff +++ bash-4.2/debian/patches/man-bashrc.diff @@ -0,0 +1,64 @@ +# DP: document /etc/bash.bashrc in bash man page + +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -182,7 +182,9 @@ + .PD + Execute commands from + .I file +-instead of the standard personal initialization file ++instead of the system wide initialization file ++.I /etc/bash.bashrc ++and the standard personal initialization file + .I ~/.bashrc + if the shell is interactive (see + .SM +@@ -213,7 +215,9 @@ + below). + .TP + .B \-\-norc +-Do not read and execute the personal initialization file ++Do not read and execute the system wide initialization file ++.I /etc/bash.bashrc ++and the personal initialization file + .I ~/.bashrc + if the shell is interactive. + This option is on by default if the shell is invoked as +@@ -321,13 +325,15 @@ + .PP + When an interactive shell that is not a login shell is started, + .B bash +-reads and executes commands from \fI~/.bashrc\fP, if that file exists. ++reads and executes commands from \fI/etc/bash.bashrc\fP and \fI~/.bashrc\fP, ++if these files exist. + This may be inhibited by using the + .B \-\-norc + option. + The \fB\-\-rcfile\fP \fIfile\fP option will force + .B bash +-to read and execute commands from \fIfile\fP instead of \fI~/.bashrc\fP. ++to read and execute commands from \fIfile\fP instead of ++\fI/etc/bash.bashrc\fP and \fI~/.bashrc\fP. + .PP + When + .B bash +@@ -413,7 +419,8 @@ + If + .B bash + determines it is being run in this fashion, it reads and executes +-commands from \fI~/.bashrc\fP, if that file exists and is readable. ++commands from \fI~/.bashrc\fP and \fI~/.bashrc\fP, if these files ++exist and are readable. + It will not do this if invoked as \fBsh\fP. + The + .B \-\-norc +@@ -9830,6 +9837,9 @@ + .FN /etc/profile + The systemwide initialization file, executed for login shells + .TP ++.FN /etc/bash.bashrc ++The systemwide per-interactive-shell startup file ++.TP + .FN ~/.bash_profile + The personal initialization file, executed for login shells + .TP --- bash-4.2.orig/debian/patches/bash42-014.diff +++ bash-4.2/debian/patches/bash42-014.diff @@ -0,0 +1,38 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-014 + +Bug-Reported-by: Shawn Bohrer +Bug-Reference-ID: <20110504152320.6E8F28130527@dev1.rgmadvisors.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00018.html + +Bug-Description: + +The regular expression matching operator did not correctly match +expressions with an embedded ^A. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 13 ++#define PATCHLEVEL 14 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/pathexp.c ++++ b/bash/pathexp.c +@@ -196,7 +196,7 @@ + { + if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/') + continue; +- if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) ++ if (pathname[i+1] != CTLESC && (qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0) + continue; + temp[j++] = '\\'; + i++; --- bash-4.2.orig/debian/patches/random.dpatch +++ bash-4.2/debian/patches/random.dpatch @@ -0,0 +1,107 @@ +#! /bin/sh -e + +dir=. +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir=$3 +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p1 < $0 + echo '2.05' > $dir/_distribution + echo '0' > $dir/_patchlevel + cd $dir && autoconf + rm -f $dir/_distribution $dir/_patchlevel + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 + rm -f $dir/configure $dir/_distribution $dir/_patchlevel + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: use the system random functions + +diff -urb bash.orig/config.h.in bash/config.h.in +--- bash.orig/config.h.in 2003-09-22 14:42:35.000000000 +0200 ++++ bash/config.h.in 2003-09-28 00:27:15.000000000 +0200 +@@ -606,6 +606,9 @@ + /* Define if you have the putenv function. */ + #undef HAVE_PUTENV + ++/* Define if you have the random function. */ ++#undef HAVE_RANDOM ++ + /* Define if you have the readlink function. */ + #undef HAVE_READLINK + +@@ -696,6 +699,9 @@ + /* Define if you have the strsignal function or macro. */ + #undef HAVE_STRSIGNAL + ++/* Define if you have the srandom function. */ ++#undef HAVE_SRANDOM ++ + /* Define if you have the sysconf function. */ + #undef HAVE_SYSCONF + +diff -urb bash.orig/variables.c bash/variables.c +--- bash.orig/variables.c 2003-07-31 16:28:57.000000000 +0200 ++++ bash/variables.c 2003-09-28 00:27:15.000000000 +0200 +@@ -1098,16 +1098,22 @@ + static unsigned long rseed = 1; + static int last_random_value; + +-/* A linear congruential random number generator based on the example +- one in the ANSI C standard. This one isn't very good, but a more +- complicated one is overkill. */ ++/* Use the random number genrator provided by the standard C library, ++ else use a linear congruential random number generator based on the ++ ANSI C standard. This one isn't very good (the values are alternately ++ odd and even, for example), but a more complicated one is overkill. */ + + /* Returns a pseudo-random number between 0 and 32767. */ + static int + brand () + { ++#if defined(HAVE_RANDOM) ++ rseed = (unsigned int) (labs(random()) & 32767); ++ return rseed; ++#else + rseed = rseed * 1103515245 + 12345; + return ((unsigned int)((rseed >> 16) & 32767)); /* was % 32768 */ ++#endif + } + + /* Set the random number generator seed to SEED. */ +@@ -1115,8 +1121,12 @@ + sbrand (seed) + unsigned long seed; + { ++#if defined(HAVE_SRANDOM) ++ srandom(seed); ++#else + rseed = seed; + last_random_value = 0; ++#endif + } + + static SHELL_VAR * +--- bash/configure.in~ 2004-03-02 00:04:29.000000000 +0100 ++++ bash/configure.in 2004-03-02 00:05:48.000000000 +0100 +@@ -667,6 +667,9 @@ + + AC_FUNC_MKTIME + ++dnl checks for random functions ++AC_CHECK_FUNCS(random srandom) ++ + dnl + dnl Checks for lib/intl and related code (uses some of the output from + dnl AM_GNU_GETTEXT) --- bash-4.2.orig/debian/patches/man-test.diff +++ bash-4.2/debian/patches/man-test.diff @@ -0,0 +1,15 @@ +# DP: document conditional file expressions acting on the target of +# DP: symbolic links as well (except -h, -L). + +--- a/bash/builtins/test.def ++++ b/bash/builtins/test.def +@@ -64,6 +64,9 @@ + + FILE1 -ef FILE2 True if file1 is a hard link to file2. + ++All file operators except -h and -L are acting on the target of a symbolic ++link, not on the symlink itself, if FILE is a symbolic link. ++ + String operators: + + -z STRING True if string is empty. --- bash-4.2.orig/debian/patches/bash42-012.diff +++ bash-4.2/debian/patches/bash42-012.diff @@ -0,0 +1,145 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-012 + +Bug-Reported-by: Rui Santos +Bug-Reference-ID: <4E04C6D0.2020507@grupopie.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00079.html + +Bug-Description: + +When calling the parser to recursively parse a command substitution within +an arithmetic expansion, the shell overwrote the saved shell input line and +associated state, resulting in a garbled command. + +Patch (apply with `patch -p0'): + +--- a/bash/parse.y ++++ b/bash/parse.y +@@ -3842,6 +3842,7 @@ + int flags; + { + sh_parser_state_t ps; ++ sh_input_line_state_t ls; + int orig_ind, nc, sflags; + char *ret, *s, *ep, *ostring; + +@@ -3849,10 +3850,12 @@ + orig_ind = *indp; + ostring = string; + ++/*itrace("xparse_dolparen: size = %d shell_input_line = `%s'", shell_input_line_size, shell_input_line);*/ + sflags = SEVAL_NONINT|SEVAL_NOHIST|SEVAL_NOFREE; + if (flags & SX_NOLONGJMP) + sflags |= SEVAL_NOLONGJMP; + save_parser_state (&ps); ++ save_input_line_state (&ls); + + /*(*/ + parser_state |= PST_CMDSUBST|PST_EOFTOKEN; /* allow instant ')' */ /*(*/ +@@ -3861,6 +3864,8 @@ + + restore_parser_state (&ps); + reset_parser (); ++ /* reset_parser clears shell_input_line and associated variables */ ++ restore_input_line_state (&ls); + if (interactive) + token_to_read = 0; + +@@ -5908,6 +5913,12 @@ + ps->expand_aliases = expand_aliases; + ps->echo_input_at_read = echo_input_at_read; + ++ ps->token = token; ++ ps->token_buffer_size = token_buffer_size; ++ /* Force reallocation on next call to read_token_word */ ++ token = 0; ++ token_buffer_size = 0; ++ + return (ps); + } + +@@ -5949,6 +5960,42 @@ + + expand_aliases = ps->expand_aliases; + echo_input_at_read = ps->echo_input_at_read; ++ ++ FREE (token); ++ token = ps->token; ++ token_buffer_size = ps->token_buffer_size; ++} ++ ++sh_input_line_state_t * ++save_input_line_state (ls) ++ sh_input_line_state_t *ls; ++{ ++ if (ls == 0) ++ ls = (sh_input_line_state_t *)xmalloc (sizeof (sh_input_line_state_t)); ++ if (ls == 0) ++ return ((sh_input_line_state_t *)NULL); ++ ++ ls->input_line = shell_input_line; ++ ls->input_line_size = shell_input_line_size; ++ ls->input_line_len = shell_input_line_len; ++ ls->input_line_index = shell_input_line_index; ++ ++ /* force reallocation */ ++ shell_input_line = 0; ++ shell_input_line_size = shell_input_line_len = shell_input_line_index = 0; ++} ++ ++void ++restore_input_line_state (ls) ++ sh_input_line_state_t *ls; ++{ ++ FREE (shell_input_line); ++ shell_input_line = ls->input_line; ++ shell_input_line_size = ls->input_line_size; ++ shell_input_line_len = ls->input_line_len; ++ shell_input_line_index = ls->input_line_index; ++ ++ set_line_mbstate (); + } + + /************************************************ +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 11 ++#define PATCHLEVEL 12 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/shell.h ++++ b/bash/shell.h +@@ -136,6 +136,9 @@ + int parser_state; + int *token_state; + ++ char *token; ++ int token_buffer_size; ++ + /* input line state -- line number saved elsewhere */ + int input_line_terminator; + int eof_encountered; +@@ -166,6 +169,16 @@ + + } sh_parser_state_t; + ++typedef struct _sh_input_line_state_t { ++ char *input_line; ++ int input_line_index; ++ int input_line_size; ++ int input_line_len; ++} sh_input_line_state_t; ++ + /* Let's try declaring these here. */ + extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); + extern void restore_parser_state __P((sh_parser_state_t *)); ++ ++extern sh_input_line_state_t *save_input_line_state __P((sh_input_line_state_t *)); ++extern void restore_input_line_state __P((sh_input_line_state_t *)); --- bash-4.2.orig/debian/patches/rbash-manpage.diff +++ bash-4.2/debian/patches/rbash-manpage.diff @@ -0,0 +1,12 @@ +# DP: doc/rbash.1: fix bash(1) reference + +--- a/bash/doc/rbash.1 ++++ b/bash/doc/rbash.1 +@@ -3,6 +3,6 @@ + rbash \- restricted bash, see \fBbash\fR(1) + .SH RESTRICTED SHELL + .nr zY 1 +-.so bash.1 ++.so man1/bash.1 + .SH SEE ALSO + bash(1) --- bash-4.2.orig/debian/patches/CVE-2014-6278.diff +++ bash-4.2/debian/patches/CVE-2014-6278.diff @@ -0,0 +1,108 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-053 + +Bug-Reported-by: Michal Zalewski +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +A combination of nested command substitutions and function importing from +the environment can cause bash to execute code appearing in the environment +variable value following the function definition. + +Index: bash-4.2.temp/bash/builtins/evalstring.c +=================================================================== +--- bash-4.2.temp.orig/bash/builtins/evalstring.c 2014-10-07 11:04:23.614802645 -0400 ++++ bash-4.2.temp/bash/builtins/evalstring.c 2014-10-07 11:04:51.262802217 -0400 +@@ -261,12 +261,25 @@ + { + struct fd_bitmap *bitmap; + +- if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def) ++ if (flags & SEVAL_FUNCDEF) + { +- internal_warning ("%s: ignoring function definition attempt", from_file); +- should_jump_to_top_level = 0; +- last_result = last_command_exit_value = EX_BADUSAGE; +- break; ++ char *x; ++ ++ /* If the command parses to something other than a straight ++ function definition, or if we have not consumed the entire ++ string, or if the parser has transformed the function ++ name (as parsing will if it begins or ends with shell ++ whitespace, for example), reject the attempt */ ++ if (command->type != cm_function_def || ++ ((x = parser_remaining_input ()) && *x) || ++ (STREQ (from_file, command->value.Function_def->name->word) == 0)) ++ { ++ internal_warning (_("%s: ignoring function definition attempt"), from_file); ++ should_jump_to_top_level = 0; ++ last_result = last_command_exit_value = EX_BADUSAGE; ++ reset_parser (); ++ break; ++ } + } + + bitmap = new_fd_bitmap (FD_BITMAP_SIZE); +@@ -331,7 +344,10 @@ + discard_unwind_frame ("pe_dispose"); + + if (flags & SEVAL_ONECMD) +- break; ++ { ++ reset_parser (); ++ break; ++ } + } + } + else +Index: bash-4.2.temp/bash/parse.y +=================================================================== +--- bash-4.2.temp.orig/bash/parse.y 2014-10-07 11:04:23.650802645 -0400 ++++ bash-4.2.temp/bash/parse.y 2014-10-07 11:04:51.266802217 -0400 +@@ -2433,6 +2433,16 @@ + eol_ungetc_lookahead = c; + } + ++char * ++parser_remaining_input () ++{ ++ if (shell_input_line == 0) ++ return 0; ++ if (shell_input_line_index < 0 || shell_input_line_index >= shell_input_line_len) ++ return '\0'; /* XXX */ ++ return (shell_input_line + shell_input_line_index); ++} ++ + #ifdef INCLUDE_UNUSED + /* Back the input pointer up by one, effectively `ungetting' a character. */ + static void +@@ -3888,8 +3898,8 @@ + reset_parser (); + /* reset_parser clears shell_input_line and associated variables */ + restore_input_line_state (&ls); +- if (interactive) +- token_to_read = 0; ++ ++ token_to_read = 0; + + /* Need to find how many characters parse_and_execute consumed, update + *indp, if flags != 0, copy the portion of the string parsed into RET +Index: bash-4.2.temp/bash/shell.h +=================================================================== +--- bash-4.2.temp.orig/bash/shell.h 2014-10-07 11:04:23.158802652 -0400 ++++ bash-4.2.temp/bash/shell.h 2014-10-07 11:04:51.266802217 -0400 +@@ -177,6 +177,8 @@ + } sh_input_line_state_t; + + /* Let's try declaring these here. */ ++extern char *parser_remaining_input __P((void)); ++ + extern sh_parser_state_t *save_parser_state __P((sh_parser_state_t *)); + extern void restore_parser_state __P((sh_parser_state_t *)); + --- bash-4.2.orig/debian/patches/rl-examples-bdb.dpatch +++ bash-4.2/debian/patches/rl-examples-bdb.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Modified readline examples to properly build with Debian setup. + +--- ./lib/readline/examples/rl.c~ Mon Nov 8 22:22:03 1999 ++++ ./lib/readline/examples/rl.c Fri Dec 31 17:34:30 1999 +@@ -11,7 +11,7 @@ + + #include + #include +-#include "posixstat.h" ++#include + + #if defined (READLINE_LIBRARY) + # include "readline.h" --- bash-4.2.orig/debian/patches/bash42-017.diff +++ bash-4.2/debian/patches/bash42-017.diff @@ -0,0 +1,42 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-017 + +Bug-Reported-by: Curtis Doty +Bug-Reference-ID: <20110621035324.A4F70849F59@mx1.iParadigms.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00053.html + +Bug-Description: + +Using `read -a foo' where foo was an already-declared associative array +caused the shell to die with a segmentation fault. + +Patch (apply with `patch -p0'): + +--- a/bash/builtins/read.def ++++ b/bash/builtins/read.def +@@ -642,6 +642,12 @@ + xfree (input_string); + return EXECUTION_FAILURE; /* readonly or noassign */ + } ++ if (assoc_p (var)) ++ { ++ builtin_error (_("%s: cannot convert associative to indexed array"), arrayname); ++ xfree (input_string); ++ return EXECUTION_FAILURE; /* existing associative array */ ++ } + array_flush (array_cell (var)); + + alist = list_string (input_string, ifs_chars, 0); +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 16 ++#define PATCHLEVEL 17 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/bash42-020.diff +++ bash-4.2/debian/patches/bash42-020.diff @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-020 + +Bug-Reported-by: Vincent Sheffer +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2011-08/msg00000.html + +Bug-Description: + +The shared object helper script needs to be updated for Mac OS X 10.7 +(Lion, darwin11). + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 19 ++#define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/support/shobj-conf ++++ b/bash/support/shobj-conf +@@ -157,7 +157,7 @@ + ;; + + # Darwin/MacOS X +-darwin[89]*|darwin10*) ++darwin[89]*|darwin1[012]*) + SHOBJ_STATUS=supported + SHLIB_STATUS=supported + +@@ -186,7 +186,7 @@ + SHLIB_LIBSUFF='dylib' + + case "${host_os}" in +- darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' ++ darwin[789]*|darwin1[012]*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; + *) SHOBJ_LDFLAGS='-dynamic' --- bash-4.2.orig/debian/patches/rl-del-backspace-policy.dpatch +++ bash-4.2/debian/patches/rl-del-backspace-policy.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Handle Debian Backspace/Delete keyboard policy + +diff -urb bash.orig/lib/readline/terminal.c bash/lib/readline/terminal.c +--- bash.orig/lib/readline/terminal.c 2003-09-18 17:03:42.000000000 +0200 ++++ bash/lib/readline/terminal.c 2003-09-27 23:25:59.000000000 +0200 +@@ -148,6 +148,9 @@ + /* Insert key */ + static char *_rl_term_kI; + ++/* The key sequence sent by the Delete key, if any. */ ++static char *_rl_term_kD; ++ + /* Cursor control */ + static char *_rl_term_vs; /* very visible */ + static char *_rl_term_ve; /* normal */ +@@ -314,6 +317,7 @@ + { "ic", &_rl_term_ic }, + { "im", &_rl_term_im }, + { "kH", &_rl_term_kH }, /* home down ?? */ ++ { "kD", &_rl_term_kD }, /* delete */ + { "kI", &_rl_term_kI }, /* insert */ + { "kd", &_rl_term_kd }, + { "ke", &_rl_term_ke }, /* end keypad mode */ +@@ -492,6 +496,7 @@ + + rl_bind_keyseq_if_unbound (_rl_term_kh, rl_beg_of_line); /* Home */ + rl_bind_keyseq_if_unbound (_rl_term_at7, rl_end_of_line); /* End */ ++ rl_bind_keyseq_if_unbound (_rl_term_kD, rl_delete); /* Delete */ + + _rl_keymap = xkeymap; + } --- bash-4.2.orig/debian/patches/man-nocaseglob.diff +++ bash-4.2/debian/patches/man-nocaseglob.diff @@ -0,0 +1,15 @@ +# DP: Clarify documentation about case-insensitive pathname expansion + +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -3154,6 +3154,10 @@ + .B nocaseglob + is enabled, the match is performed without regard to the case + of alphabetic characters. ++Note that when using range expressions like ++[a-z] (see below), letters of the other case may be included, ++depending on the setting of ++.B LC_COLLATE. + When a pattern is used for pathname expansion, + the character + .B ``.'' --- bash-4.2.orig/debian/patches/bash42-011.diff +++ bash-4.2/debian/patches/bash42-011.diff @@ -0,0 +1,41 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-011 + +Bug-Reported-by: "David Parks" +Bug-Reference-ID: <014101cc82c6$46ac1540$d4043fc0$@com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-10/msg00031.html + +Bug-Description: + +Overwriting a value in an associative array causes the memory allocated to +store the key on the second and subsequent assignments to leak. + +Patch (apply with `patch -p0'): + +--- a/bash/assoc.c ++++ b/bash/assoc.c +@@ -77,6 +77,11 @@ + b = hash_search (key, hash, HASH_CREATE); + if (b == 0) + return -1; ++ /* If we are overwriting an existing element's value, we're not going to ++ use the key. Nothing in the array assignment code path frees the key ++ string, so we can free it here to avoid a memory leak. */ ++ if (b->key != key) ++ free (key); + FREE (b->data); + b->data = value ? savestring (value) : (char *)0; + return (0); +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 10 ++#define PATCHLEVEL 11 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/bash42-013.diff +++ bash-4.2/debian/patches/bash42-013.diff @@ -0,0 +1,43 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-013 + +Bug-Reported-by: Marten Wikstrom +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-05/msg00049.html + +Bug-Description: + +An off-by-one error caused the shell to skip over CTLNUL characters, +which are used internally to mark quoted null strings. The effect +was to have stray 0x7f characters left after expanding words like +""""""""aa. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 12 ++#define PATCHLEVEL 13 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/subst.c ++++ b/bash/subst.c +@@ -3706,7 +3706,10 @@ + break; + } + else if (string[i] == CTLNUL) +- i++; ++ { ++ i++; ++ continue; ++ } + + prev_i = i; + ADVANCE_CHAR (string, slen, i); --- bash-4.2.orig/debian/patches/bash42-021.diff +++ bash-4.2/debian/patches/bash42-021.diff @@ -0,0 +1,50 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-021 + +Bug-Reported-by: Dan Douglas +Bug-Reference-ID: <4585554.nZWb4q7YoZ@smorgbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-12/msg00084.html + +Bug-Description: + +Using `read -N' to assign values to an array can result in NUL values being +assigned to some array elements. These values cause seg faults when referenced +later. + +Index: b/bash/builtins/read.def +=================================================================== +--- a/bash/builtins/read.def ++++ b/bash/builtins/read.def +@@ -737,7 +737,7 @@ + xfree (t1); + } + else +- var = bind_read_variable (varname, t); ++ var = bind_read_variable (varname, t ? t : ""); + } + else + { +@@ -798,7 +798,7 @@ + xfree (t); + } + else +- var = bind_read_variable (list->word->word, input_string); ++ var = bind_read_variable (list->word->word, input_string ? input_string : ""); + + if (var) + { +Index: b/bash/patchlevel.h +=================================================================== +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 20 ++#define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/man-bashlogout.diff +++ bash-4.2/debian/patches/man-bashlogout.diff @@ -0,0 +1,14 @@ +# DP: document /etc/bash.bashrc in bash man page + +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -9840,6 +9840,9 @@ + .FN /etc/bash.bashrc + The systemwide per-interactive-shell startup file + .TP ++.FN /etc/bash.bash.logout ++The systemwide login shell cleanup file, executed when a login shell exits ++.TP + .FN ~/.bash_profile + The personal initialization file, executed for login shells + .TP --- bash-4.2.orig/debian/patches/bash42-001.diff +++ bash-4.2/debian/patches/bash42-001.diff @@ -0,0 +1,67 @@ +# DP: bash-4.2 upstream patch 001 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-001 + +Bug-Reported-by: Juergen Daubert +Bug-Reference-ID: <20110214175132.GA19813@jue.netz> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00125.html + +Bug-Description: + +When running in Posix mode, bash does not correctly expand the right-hand +side of a double-quoted word expansion containing single quotes. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 0 ++#define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/subst.c ++++ b/bash/subst.c +@@ -1379,10 +1379,12 @@ + slen = strlen (string + *sindex) + *sindex; + + /* The handling of dolbrace_state needs to agree with the code in parse.y: +- parse_matched_pair() */ +- dolbrace_state = 0; +- if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) +- dolbrace_state = (flags & SX_POSIXEXP) ? DOLBRACE_QUOTE : DOLBRACE_PARAM; ++ parse_matched_pair(). The different initial value is to handle the ++ case where this function is called to parse the word in ++ ${param op word} (SX_WORD). */ ++ dolbrace_state = (flags & SX_WORD) ? DOLBRACE_WORD : DOLBRACE_PARAM; ++ if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && (flags & SX_POSIXEXP)) ++ dolbrace_state = DOLBRACE_QUOTE; + + i = *sindex; + while (c = string[i]) +@@ -7176,7 +7178,7 @@ + { + /* Extract the contents of the ${ ... } expansion + according to the Posix.2 rules. */ +- value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#') ? SX_POSIXEXP : 0); ++ value = extract_dollar_brace_string (string, &sindex, quoted, (c == '%' || c == '#' || c =='/' || c == '^' || c == ',' || c ==':') ? SX_POSIXEXP|SX_WORD : SX_WORD); + if (string[sindex] == RBRACE) + sindex++; + else +--- a/bash/subst.h ++++ b/bash/subst.h +@@ -56,6 +56,7 @@ + #define SX_NOLONGJMP 0x0040 /* don't longjmp on fatal error */ + #define SX_ARITHSUB 0x0080 /* extracting $(( ... )) (currently unused) */ + #define SX_POSIXEXP 0x0100 /* extracting new Posix pattern removal expansions in extract_dollar_brace_string */ ++#define SX_WORD 0x0200 /* extracting word in ${param op word} */ + + /* Remove backslashes which are quoting backquotes from STRING. Modifies + STRING, and returns a pointer to it. */ --- bash-4.2.orig/debian/patches/bash42-009.diff +++ bash-4.2/debian/patches/bash42-009.diff @@ -0,0 +1,67 @@ +# DP: bash-4.2 upstream patch 009 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-009 + +Bug-Reported-by: +Bug-Reference-ID: <4DAAC0DB.7060606@piumalab.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00075.html + +Bug-Description: + +Under certain circumstances, running `fc -l' two times in succession with a +relative history offset at the end of the history will result in an incorrect +calculation of the last history entry and a seg fault. + +Patch (apply with `patch -p0'): + +--- a/bash/builtins/fc.def ++++ b/bash/builtins/fc.def +@@ -304,7 +304,7 @@ + last_hist = i - rh - hist_last_line_added; + + /* XXX */ +- if (saved_command_line_count > 0 && i == last_hist && hlist[last_hist] == 0) ++ if (i == last_hist && hlist[last_hist] == 0) + while (last_hist >= 0 && hlist[last_hist] == 0) + last_hist--; + if (last_hist < 0) +@@ -475,7 +475,7 @@ + HIST_ENTRY **hlist; + { + int sign, n, clen, rh; +- register int i, j; ++ register int i, j, last_hist; + register char *s; + + sign = 1; +@@ -495,7 +495,15 @@ + has been enabled (interactive or not) should use it in the last_hist + calculation as if it were on. */ + rh = remember_on_history || ((subshell_environment & SUBSHELL_COMSUB) && enable_history_list); +- i -= rh + hist_last_line_added; ++ last_hist = i - rh - hist_last_line_added; ++ ++ if (i == last_hist && hlist[last_hist] == 0) ++ while (last_hist >= 0 && hlist[last_hist] == 0) ++ last_hist--; ++ if (last_hist < 0) ++ return (-1); ++ ++ i = last_hist; + + /* No specification defaults to most recent command. */ + if (command == NULL) +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 8 ++#define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/man-substring-exp-doc.diff +++ bash-4.2/debian/patches/man-substring-exp-doc.diff @@ -0,0 +1,14 @@ +# DP: Clarify documentation about substring expansion + +--- a/bash/doc/bashref.texi ++++ b/bash/doc/bashref.texi +@@ -1773,6 +1773,9 @@ + + If @var{offset} evaluates to a number less than zero, the value + is used as an offset from the end of the value of @var{parameter}. ++Arithmetic expressions starting with a - must be separated by whitespace ++from the preceding : to be ++distinguished from the $@{@var{parameter}:@minus{}@var{word}@} expansion. + If @var{length} evaluates to a number less than zero, and @var{parameter} + is not @samp{@@} and not an indexed or associative array, it is interpreted + as an offset from the end of the value of @var{parameter} rather than --- bash-4.2.orig/debian/patches/bash42-022.diff +++ bash-4.2/debian/patches/bash42-022.diff @@ -0,0 +1,48 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-022 + +Bug-Reported-by: Gregory Margo +Bug-Reference-ID: <20110727174529.GA3333@pacbell.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-07/msg00102.html + +Bug-Description: + +The return value from lseek is `off_t'. This can cause corrupted return +values when the file offset is greater than 2**31 - 1. + +Index: b/bash/lib/sh/zread.c +=================================================================== +--- a/bash/lib/sh/zread.c ++++ b/bash/lib/sh/zread.c +@@ -160,14 +160,13 @@ + zsyncfd (fd) + int fd; + { +- off_t off; +- int r; ++ off_t off, r; + + off = lused - lind; + r = 0; + if (off > 0) + r = lseek (fd, -off, SEEK_CUR); + +- if (r >= 0) ++ if (r != -1) + lused = lind = 0; + } +Index: b/bash/patchlevel.h +=================================================================== +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 21 ++#define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/bash42-010.diff +++ bash-4.2/debian/patches/bash42-010.diff @@ -0,0 +1,58 @@ +# DP: bash-4.2 upstream patch 010 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-010 + +Bug-Reported-by: Mike Frysinger +Bug-Reference-ID: <201104122356.20160.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-04/msg00058.html + +Bug-Description: + +Bash did not correctly print/reproduce here documents attached to commands +inside compound commands such as arithmetic for loops and user-specified +subshells. This affected the execution of such commands inside a shell +function when the function definition is saved and later restored using +`.' or `eval'. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 9 ++#define PATCHLEVEL 10 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/print_cmd.c ++++ b/bash/print_cmd.c +@@ -315,6 +315,7 @@ + cprintf ("( "); + skip_this_indent++; + make_command_string_internal (command->value.Subshell->command); ++ PRINT_DEFERRED_HEREDOCS (""); + cprintf (" )"); + break; + +@@ -592,6 +593,7 @@ + newline ("do\n"); + indentation += indentation_amount; + make_command_string_internal (arith_for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; + newline ("done"); +@@ -653,6 +655,7 @@ + } + + make_command_string_internal (group_command->command); ++ PRINT_DEFERRED_HEREDOCS (""); + + if (inside_function_def) + { --- bash-4.2.orig/debian/patches/no-brk-caching.diff +++ bash-4.2/debian/patches/no-brk-caching.diff @@ -0,0 +1,59 @@ +# DP: Don't cache the value of brk between sbrk calls. + +--- a/bash/lib/malloc/malloc.c ++++ b/bash/lib/malloc/malloc.c +@@ -227,8 +227,6 @@ + static int pagebucket; /* bucket for requests a page in size */ + static int maxbuck; /* highest bucket receiving allocation request. */ + +-static char *memtop; /* top of heap */ +- + static const unsigned long binsizes[NBUCKETS] = { + 8UL, 16UL, 32UL, 64UL, 128UL, 256UL, 512UL, 1024UL, 2048UL, 4096UL, + 8192UL, 16384UL, 32768UL, 65536UL, 131072UL, 262144UL, 524288UL, +@@ -538,7 +536,6 @@ + siz = binsize (nu); + /* Should check for errors here, I guess. */ + sbrk (-siz); +- memtop -= siz; + + #ifdef MALLOC_STATS + _mstats.nsbrk++; +@@ -629,8 +626,6 @@ + if ((long)mp == -1) + goto morecore_done; + +- memtop += sbrk_amt; +- + /* shouldn't happen, but just in case -- require 8-byte alignment */ + if ((long)mp & MALIGN_MASK) + { +@@ -680,7 +675,7 @@ + Some of this partial page will be wasted space, but we'll use as + much as we can. Once we figure out how much to advance the break + pointer, go ahead and do it. */ +- memtop = curbrk = sbrk (0); ++ curbrk = sbrk (0); + sbrk_needed = pagesz - ((long)curbrk & (pagesz - 1)); /* sbrk(0) % pagesz */ + if (sbrk_needed < 0) + sbrk_needed += pagesz; +@@ -695,7 +690,6 @@ + curbrk = sbrk (sbrk_needed); + if ((long)curbrk == -1) + return -1; +- memtop += sbrk_needed; + + /* Take the memory which would otherwise be wasted and populate the most + popular bin (2 == 32 bytes) with it. Add whatever we need to curbrk +@@ -902,9 +896,9 @@ + xbotch (mem, ERR_ASSERT_FAILED, _("free: start and end chunk sizes differ"), file, line); + + #if 1 +- if (nunits >= LESSCORE_MIN && ((char *)p + binsize(nunits) == memtop)) ++ if (nunits >= LESSCORE_MIN && ((char *)p + binsize(nunits) == sbrk(0))) + #else +- if (((char *)p + binsize(nunits) == memtop) && nunits >= LESSCORE_MIN) ++ if (((char *)p + binsize(nunits) == sbrk(0)) && nunits >= LESSCORE_MIN) + #endif + { + /* If above LESSCORE_FRC, give back unconditionally. This should be set --- bash-4.2.orig/debian/patches/bash42-003.diff +++ bash-4.2/debian/patches/bash42-003.diff @@ -0,0 +1,233 @@ +# DP: bash-4.2 upstream patch 003 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-003 + +Bug-Reported-by: Clark J. Wang +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00136.html + +Bug-Description: + +When using the pattern replacement and pattern removal word expansions, bash +miscalculates the possible match length in the presence of an unescaped left +bracket without a closing right bracket, resulting in a failure to match +the pattern. + +Patch (apply with `patch -p0'): + +--- a/bash/lib/glob/gmisc.c ++++ b/bash/lib/glob/gmisc.c +@@ -77,8 +77,8 @@ + wchar_t *wpat; + size_t wmax; + { +- wchar_t wc, *wbrack; +- int matlen, t, in_cclass, in_collsym, in_equiv; ++ wchar_t wc; ++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*wpat == 0) + return (0); +@@ -118,58 +118,80 @@ + break; + case L'[': + /* scan for ending `]', skipping over embedded [:...:] */ +- wbrack = wpat; ++ bracklen = 1; + wc = *wpat++; + do + { + if (wc == 0) + { +- matlen += wpat - wbrack - 1; /* incremented below */ +- break; ++ wpat--; /* back up to NUL */ ++ matlen += bracklen; ++ goto bad_bracket; + } + else if (wc == L'\\') + { +- wc = *wpat++; +- if (*wpat == 0) +- break; ++ /* *wpat == backslash-escaped character */ ++ bracklen++; ++ /* If the backslash or backslash-escape ends the string, ++ bail. The ++wpat skips over the backslash escape */ ++ if (*wpat == 0 || *++wpat == 0) ++ { ++ matlen += bracklen; ++ goto bad_bracket; ++ } + } + else if (wc == L'[' && *wpat == L':') /* character class */ + { + wpat++; ++ bracklen++; + in_cclass = 1; + } + else if (in_cclass && wc == L':' && *wpat == L']') + { + wpat++; ++ bracklen++; + in_cclass = 0; + } + else if (wc == L'[' && *wpat == L'.') /* collating symbol */ + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as collating symbol */ +- wpat++; ++ { ++ wpat++; ++ bracklen++; ++ } + in_collsym = 1; + } + else if (in_collsym && wc == L'.' && *wpat == L']') + { + wpat++; ++ bracklen++; + in_collsym = 0; + } + else if (wc == L'[' && *wpat == L'=') /* equivalence class */ + { + wpat++; ++ bracklen++; + if (*wpat == L']') /* right bracket can appear as equivalence class */ +- wpat++; ++ { ++ wpat++; ++ bracklen++; ++ } + in_equiv = 1; + } + else if (in_equiv && wc == L'=' && *wpat == L']') + { + wpat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((wc = *wpat++) != L']'); + matlen++; /* bracket expression can only match one char */ ++bad_bracket: + break; + } + } +@@ -213,8 +235,8 @@ + char *pat; + size_t max; + { +- char c, *brack; +- int matlen, t, in_cclass, in_collsym, in_equiv; ++ char c; ++ int matlen, bracklen, t, in_cclass, in_collsym, in_equiv; + + if (*pat == 0) + return (0); +@@ -254,58 +276,80 @@ + break; + case '[': + /* scan for ending `]', skipping over embedded [:...:] */ +- brack = pat; ++ bracklen = 1; + c = *pat++; + do + { + if (c == 0) + { +- matlen += pat - brack - 1; /* incremented below */ +- break; ++ pat--; /* back up to NUL */ ++ matlen += bracklen; ++ goto bad_bracket; + } + else if (c == '\\') + { +- c = *pat++; +- if (*pat == 0) +- break; ++ /* *pat == backslash-escaped character */ ++ bracklen++; ++ /* If the backslash or backslash-escape ends the string, ++ bail. The ++pat skips over the backslash escape */ ++ if (*pat == 0 || *++pat == 0) ++ { ++ matlen += bracklen; ++ goto bad_bracket; ++ } + } + else if (c == '[' && *pat == ':') /* character class */ + { + pat++; ++ bracklen++; + in_cclass = 1; + } + else if (in_cclass && c == ':' && *pat == ']') + { + pat++; ++ bracklen++; + in_cclass = 0; + } + else if (c == '[' && *pat == '.') /* collating symbol */ + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as collating symbol */ +- pat++; ++ { ++ pat++; ++ bracklen++; ++ } + in_collsym = 1; + } + else if (in_collsym && c == '.' && *pat == ']') + { + pat++; ++ bracklen++; + in_collsym = 0; + } + else if (c == '[' && *pat == '=') /* equivalence class */ + { + pat++; ++ bracklen++; + if (*pat == ']') /* right bracket can appear as equivalence class */ +- pat++; ++ { ++ pat++; ++ bracklen++; ++ } + in_equiv = 1; + } + else if (in_equiv && c == '=' && *pat == ']') + { + pat++; ++ bracklen++; + in_equiv = 0; + } ++ else ++ bracklen++; + } + while ((c = *pat++) != ']'); + matlen++; /* bracket expression can only match one char */ ++bad_bracket: + break; + } + } +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 2 ++#define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/CVE-2014-6271.diff +++ bash-4.2/debian/patches/CVE-2014-6271.diff @@ -0,0 +1,89 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-048 + +Bug-Reported-by: Stephane Chazelas +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +Under certain circumstances, bash will execute user code while processing the +environment for exported function definitions. + +Index: bash-4.2.temp/bash/builtins/common.h +=================================================================== +--- bash-4.2.temp.orig/bash/builtins/common.h 2014-10-07 11:00:22.000000000 -0400 ++++ bash-4.2.temp/bash/builtins/common.h 2014-10-07 11:01:40.550805172 -0400 +@@ -35,6 +35,8 @@ + #define SEVAL_NOLONGJMP 0x040 + + /* Flags for describe_command, shared between type.def and command.def */ ++#define SEVAL_FUNCDEF 0x080 /* only allow function definitions */ ++#define SEVAL_ONECMD 0x100 /* only allow a single command */ + #define CDESC_ALL 0x001 /* type -a */ + #define CDESC_SHORTDESC 0x002 /* command -V */ + #define CDESC_REUSABLE 0x004 /* command -v */ +Index: bash-4.2.temp/bash/builtins/evalstring.c +=================================================================== +--- bash-4.2.temp.orig/bash/builtins/evalstring.c 2014-10-07 11:00:22.000000000 -0400 ++++ bash-4.2.temp/bash/builtins/evalstring.c 2014-10-07 11:01:40.550805172 -0400 +@@ -261,6 +261,14 @@ + { + struct fd_bitmap *bitmap; + ++ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def) ++ { ++ internal_warning ("%s: ignoring function definition attempt", from_file); ++ should_jump_to_top_level = 0; ++ last_result = last_command_exit_value = EX_BADUSAGE; ++ break; ++ } ++ + bitmap = new_fd_bitmap (FD_BITMAP_SIZE); + begin_unwind_frame ("pe_dispose"); + add_unwind_protect (dispose_fd_bitmap, bitmap); +@@ -321,6 +329,9 @@ + dispose_command (command); + dispose_fd_bitmap (bitmap); + discard_unwind_frame ("pe_dispose"); ++ ++ if (flags & SEVAL_ONECMD) ++ break; + } + } + else +Index: bash-4.2.temp/bash/variables.c +=================================================================== +--- bash-4.2.temp.orig/bash/variables.c 2014-10-07 11:00:48.586805977 -0400 ++++ bash-4.2.temp/bash/variables.c 2014-10-07 11:01:40.554805172 -0400 +@@ -347,12 +347,10 @@ + temp_string[char_index] = ' '; + strcpy (temp_string + char_index + 1, string); + +- parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); +- +- /* Ancient backwards compatibility. Old versions of bash exported +- functions like name()=() {...} */ +- if (name[char_index - 1] == ')' && name[char_index - 2] == '(') +- name[char_index - 2] = '\0'; ++ /* Don't import function names that are invalid identifiers from the ++ environment. */ ++ if (legal_identifier (name)) ++ parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD); + + if (temp_var = find_function (name)) + { +@@ -361,10 +359,6 @@ + } + else + report_error (_("error importing function definition for `%s'"), name); +- +- /* ( */ +- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0') +- name[char_index - 2] = '('; /* ) */ + } + #if defined (ARRAY_VARS) + # if 0 --- bash-4.2.orig/debian/patches/bash42-019.diff +++ bash-4.2/debian/patches/bash42-019.diff @@ -0,0 +1,42 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-019 + +Bug-Reported-by: Diego Augusto Molina +Bug-Reference-ID: +Bug-Reference-URL: lists.gnu.org/archive/html/bug-bash/2011-09/msg00047.html + +Bug-Description: + +Using `declare' with attributes and an invalid array variable name or +assignment reference resulted in a segmentation fault instead of a +declaration error. + +Patch (apply with `patch -p0'): + +--- a/bash/builtins/declare.def ++++ b/bash/builtins/declare.def +@@ -513,6 +513,11 @@ + *subscript_start = '['; /* ] */ + var = assign_array_element (name, value, 0); /* XXX - not aflags */ + *subscript_start = '\0'; ++ if (var == 0) /* some kind of assignment error */ ++ { ++ assign_error++; ++ NEXT_VARIABLE (); ++ } + } + else if (simple_array_assign) + { +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 18 ++#define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/CVE-2019-9924.patch +++ bash-4.2/debian/patches/CVE-2019-9924.patch @@ -0,0 +1,24 @@ +Description: if the shell is restricted, reject attempts to add pathnames + containing slashes to the hash table +Origin: backport, http://git.savannah.gnu.org/cgit/bash.git/commit/?h=bash-4.4-testing&id=a4eef1991c25c9d1c55f777952cd522c762c6fc3 +Bug: https://savannah.gnu.org/support/?108969 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1803441 + +Index: a/bash/variables.c +=================================================================== +--- a/bash/variables.c 2019-07-12 14:12:19.000000000 -0400 ++++ b/bash/variables.c 2019-07-12 14:24:58.364792719 -0400 +@@ -1601,6 +1601,13 @@ assign_hashcmd (self, value, ind, key) + arrayind_t ind; + char *key; + { ++#if defined (RESTRICTED_SHELL) ++ if (restricted && strchr (value, '/')) ++ { ++ sh_restricted (value); ++ return (SHELL_VAR *)NULL; ++ } ++#endif + phash_insert (key, value, 0, 0); + return (build_hashcmd (self)); + } --- bash-4.2.orig/debian/patches/man-fignore.diff +++ bash-4.2/debian/patches/man-fignore.diff @@ -0,0 +1,15 @@ +# DP: bash(1): mention quoting when assigning to FIGNORE + +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -1902,7 +1902,9 @@ + is excluded from the list of matched filenames. + A sample value is + .if t \f(CW".o:~"\fP. +-.if n ".o:~". ++.if n ".o:~" ++(Quoting is needed when assigning a value to this variable, ++which contains tildes). + .TP + .B FUNCNEST + If set to a numeric value greater than 0, defines a maximum function --- bash-4.2.orig/debian/patches/bash42-008.diff +++ bash-4.2/debian/patches/bash42-008.diff @@ -0,0 +1,67 @@ +# DP: bash-4.2 upstream patch 008 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-008 + +Bug-Reported-by: Doug McMahon +Bug-Reference-ID: <1299441211.2535.11.camel@doug-XPS-M1330> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00050.html + +Bug-Description: + +Bash-4.2 does not attempt to save the shell history on receipt of a +terminating signal that is handled synchronously. Unfortunately, the +`close' button on most X11 terminal emulators sends SIGHUP, which +kills the shell. + +This is a very small patch to save the history in the case that an +interactive shell receives a SIGHUP or SIGTERM while in readline and +reading a command. + +The next version of bash will do this differently. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 7 ++#define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/sig.c ++++ b/bash/sig.c +@@ -46,6 +46,7 @@ + + #if defined (READLINE) + # include "bashline.h" ++# include + #endif + + #if defined (HISTORY) +@@ -62,6 +63,7 @@ + #if defined (HISTORY) + extern int history_lines_this_session; + #endif ++extern int no_line_editing; + + extern void initialize_siglist (); + +@@ -505,7 +507,10 @@ + { + #if defined (HISTORY) + /* XXX - will inhibit history file being written */ +- history_lines_this_session = 0; ++# if defined (READLINE) ++ if (interactive_shell == 0 || interactive == 0 || (sig != SIGHUP && sig != SIGTERM) || no_line_editing || (RL_ISSTATE (RL_STATE_READCMD) == 0)) ++# endif ++ history_lines_this_session = 0; + #endif + terminate_immediately = 0; + termsig_handler (sig); --- bash-4.2.orig/debian/patches/man-arithmetic.diff +++ bash-4.2/debian/patches/man-arithmetic.diff @@ -0,0 +1,14 @@ +# DP: document deprecated syntax for arithmetic evaluation. + +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -2994,6 +2994,9 @@ + \fB$((\fP\fIexpression\fP\fB))\fP + .RE + .PP ++The old format \fB$[\fP\fIexpression\fP\fB]\fP is deprecated and will ++be removed in upcoming versions of bash. ++.PP + The + .I expression + is treated as if it were within double quotes, but a double quote --- bash-4.2.orig/debian/patches/bash42-004.diff +++ bash-4.2/debian/patches/bash42-004.diff @@ -0,0 +1,42 @@ +# DP: bash-4.2 upstream patch 004 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-004 + +Bug-Reported-by: Mike Frysinger +Bug-Reference-ID: <201102182106.17834.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00222.html + +Bug-Description: + +When used in contexts where word splitting and quote removal were not +performed, such as pattern removal or pattern substitution, empty strings +(either literal or resulting from quoted variables that were unset or +null) were not matched correctly, resulting in failure. + +Patch (apply with `patch -p0'): + +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 3 ++#define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/subst.c ++++ b/bash/subst.c +@@ -3373,7 +3373,7 @@ + if (string == 0 || *string == '\0') + return (WORD_LIST *)NULL; + +- td.flags = 0; ++ td.flags = W_NOSPLIT2; /* no splitting, remove "" and '' */ + td.word = string; + tresult = call_expand_word_internal (&td, quoted, 1, dollar_at_p, has_dollar_at); + return (tresult); --- bash-4.2.orig/debian/patches/rl-setenv.dpatch +++ bash-4.2/debian/patches/rl-setenv.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Prefer setenv over putenv + +--- lib/readline/shell.c~ 2004-10-17 13:07:37.000000000 +0200 ++++ lib/readline/shell.c 2004-10-17 13:06:48.000000000 +0200 +@@ -122,7 +122,7 @@ + { + char *b; + +-#if defined (HAVE_PUTENV) ++#if 0 + b = (char *)xmalloc (INT_STRLEN_BOUND (int) + sizeof ("LINES=") + 1); + sprintf (b, "LINES=%d", lines); + putenv (b); --- bash-4.2.orig/debian/patches/CVE-2014-6277.diff +++ bash-4.2/debian/patches/CVE-2014-6277.diff @@ -0,0 +1,42 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-052 + +Bug-Reported-by: Michal Zalewski +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +When bash is parsing a function definition that contains a here-document +delimited by end-of-file (or end-of-string), it leaves the closing delimiter +uninitialized. This can result in an invalid memory access when the parsed +function is later copied. + +Index: bash-4.2.temp/bash/copy_cmd.c +=================================================================== +--- bash-4.2.temp.orig/bash/copy_cmd.c 2009-09-11 16:28:02.000000000 -0400 ++++ bash-4.2.temp/bash/copy_cmd.c 2014-10-07 11:04:13.950802795 -0400 +@@ -126,7 +126,7 @@ + { + case r_reading_until: + case r_deblank_reading_until: +- new_redirect->here_doc_eof = savestring (redirect->here_doc_eof); ++ new_redirect->here_doc_eof = redirect->here_doc_eof ? savestring (redirect->here_doc_eof) : 0; + /*FALLTHROUGH*/ + case r_reading_string: + case r_appending_to: +Index: bash-4.2.temp/bash/make_cmd.c +=================================================================== +--- bash-4.2.temp.orig/bash/make_cmd.c 2009-09-11 17:26:12.000000000 -0400 ++++ bash-4.2.temp/bash/make_cmd.c 2014-10-07 11:04:13.946802795 -0400 +@@ -689,6 +689,7 @@ + /* First do the common cases. */ + temp->redirector = source; + temp->redirectee = dest_and_filename; ++ temp->here_doc_eof = 0; + temp->instruction = instruction; + temp->flags = 0; + temp->rflags = flags; --- bash-4.2.orig/debian/patches/bash-default-editor.diff +++ bash-4.2/debian/patches/bash-default-editor.diff @@ -0,0 +1,31 @@ +# DP: Use `command -v editor`, as an editor, if available. + +--- a/bash/bashline.c ++++ b/bash/bashline.c +@@ -850,8 +850,8 @@ + command being entered (if no explicit argument is given), otherwise on + a command from the history file. */ + +-#define VI_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-vi}}\"" +-#define EMACS_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-emacs}}\"" ++#define VI_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-$(command -v editor || echo vi)}}\"" ++#define EMACS_EDIT_COMMAND "fc -e \"${VISUAL:-${EDITOR:-$(command -v editor || echo emacs)}}\"" + #define POSIX_VI_EDIT_COMMAND "fc -e vi" + + static int +--- a/bash/builtins/fc.def ++++ b/bash/builtins/fc.def +@@ -159,11 +159,11 @@ + #endif + + /* String to execute on a file that we want to edit. */ +-#define FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-vi}}" ++#define FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-$(command -v editor || echo vi)}}" + #if defined (STRICT_POSIX) + # define POSIX_FC_EDIT_COMMAND "${FCEDIT:-ed}" + #else +-# define POSIX_FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-ed}}" ++# define POSIX_FC_EDIT_COMMAND "${FCEDIT:-${EDITOR:-$(command -v editor || echo ed)}}" + #endif + + int --- bash-4.2.orig/debian/patches/pgrp-pipe.diff +++ bash-4.2/debian/patches/pgrp-pipe.diff @@ -0,0 +1,11 @@ +# DP: Define PGRP_PIPE to avoid race condition. + +--- a/bash/config-bot.h ++++ b/bash/config-bot.h +@@ -197,3 +197,6 @@ + + /* If you don't want bash to provide a default mail file to check. */ + #undef DEFAULT_MAIL_DIRECTORY ++ ++/* Bug #224543 */ ++#define PGRP_PIPE 1 --- bash-4.2.orig/debian/patches/bash42-005.diff +++ bash-4.2/debian/patches/bash42-005.diff @@ -0,0 +1,116 @@ +# DP: bash-4.2 upstream patch 005 + + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-005 + +Bug-Reported-by: Dennis Williamson +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00147.html + +Bug-Description: + +Systems that use tzset() to set the local timezone require the TZ variable +to be in the environment. Bash must make sure the environment has been +modified with any updated value for TZ before calling tzset(). This +affects prompt string expansions and the `%T' printf conversion specification +on systems that do not allow bash to supply a replacement for getenv(3). + +Patch (apply with `patch -p0'): + +--- a/bash/builtins/printf.def ++++ b/bash/builtins/printf.def +@@ -465,6 +465,9 @@ + secs = shell_start_time; /* roughly $SECONDS */ + else + secs = arg; ++#if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++#endif + tm = localtime (&secs); + n = strftime (timebuf, sizeof (timebuf), timefmt, tm); + free (timefmt); +--- a/bash/parse.y ++++ b/bash/parse.y +@@ -5135,6 +5135,9 @@ + case 'A': + /* Make the current time/date into a string. */ + (void) time (&the_time); ++#if defined (HAVE_TZSET) ++ sv_tz ("TZ"); /* XXX -- just make sure */ ++#endif + tm = localtime (&the_time); + + if (c == 'd') +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 4 ++#define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +--- a/bash/variables.c ++++ b/bash/variables.c +@@ -3653,6 +3653,22 @@ + return n; + } + ++int ++chkexport (name) ++ char *name; ++{ ++ SHELL_VAR *v; ++ ++ v = find_variable (name); ++ if (exported_p (v)) ++ { ++ array_needs_making = 1; ++ maybe_make_export_env (); ++ return 1; ++ } ++ return 0; ++} ++ + void + maybe_make_export_env () + { +@@ -4214,7 +4230,7 @@ + { "TEXTDOMAIN", sv_locale }, + { "TEXTDOMAINDIR", sv_locale }, + +-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) ++#if defined (HAVE_TZSET) + { "TZ", sv_tz }, + #endif + +@@ -4558,12 +4574,13 @@ + } + #endif /* HISTORY */ + +-#if defined (HAVE_TZSET) && defined (PROMPT_STRING_DECODE) ++#if defined (HAVE_TZSET) + void + sv_tz (name) + char *name; + { +- tzset (); ++ if (chkexport (name)) ++ tzset (); + } + #endif + +--- a/bash/variables.h ++++ b/bash/variables.h +@@ -313,6 +313,7 @@ + + extern void sort_variables __P((SHELL_VAR **)); + ++extern int chkexport __P((char *)); + extern void maybe_make_export_env __P((void)); + extern void update_export_env_inplace __P((char *, int, char *)); + extern void put_command_name_into_env __P((char *)); --- bash-4.2.orig/debian/patches/man-vx-opts.dpatch +++ bash-4.2/debian/patches/man-vx-opts.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: document -v / -x options + +--- ./doc/bash.1~ Wed Jan 20 22:48:04 1999 ++++ ./doc/bash.1 Sun Nov 14 13:26:59 1999 +@@ -104,6 +104,12 @@ + This option allows the positional parameters to be set + when invoking an interactive shell. + .TP ++.B \-v ++Print shell input lines as they are read. ++.TP ++.B \-x ++Print commands and their arguments as they are executed. ++.TP + .B \-D + A list of all double-quoted strings preceded by \fB$\fP + is printed on the standard ouput. --- bash-4.2.orig/debian/patches/bashbug-editor.diff +++ bash-4.2/debian/patches/bashbug-editor.diff @@ -0,0 +1,12 @@ +# DP: send bug reports to Debian bash maintainer too. + +--- a/bash/support/bashbug.sh ++++ b/bash/support/bashbug.sh +@@ -117,6 +117,7 @@ + esac ;; + esac + ++BUGBASH="${BUGBASH},bash@packages.debian.org" + BUGADDR="${1-$BUGBASH}" + + if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then --- bash-4.2.orig/debian/patches/bash-aliases-repeat.diff +++ bash-4.2/debian/patches/bash-aliases-repeat.diff @@ -0,0 +1,28 @@ +# DP: Fix bug in Bash_aliases example. + +--- a/bash/examples/startup-files/Bash_aliases ++++ b/bash/examples/startup-files/Bash_aliases +@@ -41,20 +41,20 @@ + { + local count="$1" i; + shift; +- for i in $(seq 1 "$count"); ++ for i in $(_seq 1 "$count"); + do + eval "$@"; + done + } + + # Subfunction needed by `repeat'. +-seq () ++_seq () + { + local lower upper output; + lower=$1 upper=$2; + + if [ $lower -ge $upper ]; then return; fi +- while [ $lower -le $upper ]; ++ while [ $lower -lt $upper ]; + do + echo -n "$lower " + lower=$(($lower + 1)) --- bash-4.2.orig/debian/patches/man-substring-exp.diff +++ bash-4.2/debian/patches/man-substring-exp.diff @@ -0,0 +1,14 @@ +# DP: Clarify documentation about substring expansion + +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -2758,6 +2758,9 @@ + below). + If \fIoffset\fP evaluates to a number less than zero, the value + is used as an offset from the end of the value of \fIparameter\fP. ++Arithmetic expressions starting with a - must be separated by whitespace ++from the preceding : to be ++distinguished from the \fBUse Default Values\fP expansion. + If \fIlength\fP evaluates to a number less than zero, and \fIparameter\fP + is not \fB@\fP and not an indexed or associative array, it is interpreted + as an offset from the end of the value of \fIparameter\fP rather than --- bash-4.2.orig/debian/patches/man-test2.diff +++ bash-4.2/debian/patches/man-test2.diff @@ -0,0 +1,27 @@ +# DP: Document handling of parameters of the test builtin. + +--- a/bash/builtins/test.def ++++ b/bash/builtins/test.def +@@ -98,6 +98,9 @@ + less-than, less-than-or-equal, greater-than, or greater-than-or-equal + than ARG2. + ++See the bash manual page bash(1) for the handling of parameters (i.e. ++missing parameters). ++ + Exit Status: + Returns success if EXPR evaluates to true; fails if EXPR evaluates to + false or an invalid argument is given. +--- a/bash/doc/bash.1 ++++ b/bash/doc/bash.1 +@@ -702,6 +702,10 @@ + .if n .sp 1 + When used with \fB[[\fP, the \fB<\fP and \fB>\fP operators sort + lexicographically using the current locale. ++.PP ++See the description of the \fItest\fP builtin command (section SHELL ++BUILTIN COMMANDS below) for the handling of parameters (i.e. ++missing parameters). + .if t .sp 0.5 + .if n .sp 1 + When the \fB==\fP and \fB!=\fP operators are used, the string to the --- bash-4.2.orig/debian/patches/man-builtin.dpatch +++ bash-4.2/debian/patches/man-builtin.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: fix man page include + +--- doc/builtins.1~ Mon Nov 29 22:30:13 1999 ++++ doc/builtins.1 Tue Aug 1 21:54:06 2000 +@@ -10,6 +10,6 @@ + ulimit, umask, unalias, unset, until, wait, while \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +-.so bash.1 ++.so /usr/share/man/man1/bash.1 + .SH SEE ALSO + bash(1), sh(1) --- bash-4.2.orig/debian/patches/bash42-023.diff +++ bash-4.2/debian/patches/bash42-023.diff @@ -0,0 +1,57 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-023 + +Bug-Reported-by: Ewan Mellor +Bug-Reference-ID: <6005BE083BF501439A84DC3523BAC82DC4B964FD12@LONPMAILBOX01.citrite.net> +Bug-Reference-URL: + +Bug-Description: + +Under some circumstances, an exit trap triggered by a bad substitution +error when errexit is enabled will cause the shell to exit with an +incorrect exit status (0). + +Index: b/bash/error.c +=================================================================== +--- a/bash/error.c ++++ b/bash/error.c +@@ -200,7 +200,11 @@ + + va_end (args); + if (exit_immediately_on_error) +- exit_shell (1); ++ { ++ if (last_command_exit_value == 0) ++ last_command_exit_value = 1; ++ exit_shell (last_command_exit_value); ++ } + } + + void +Index: b/bash/patchlevel.h +=================================================================== +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 22 ++#define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ +Index: b/bash/subst.c +=================================================================== +--- a/bash/subst.c ++++ b/bash/subst.c +@@ -7274,6 +7274,7 @@ + default: + case '\0': + bad_substitution: ++ last_command_exit_value = EXECUTION_FAILURE; + report_error (_("%s: bad substitution"), string ? string : "??"); + FREE (value); + FREE (temp); --- bash-4.2.orig/debian/patches/bash-minimal.dpatch +++ bash-4.2/debian/patches/bash-minimal.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh -e + +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch $pdir -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +# DP: Build fixes for minimal bash + +--- bash/parse.y~ 2009-11-02 23:34:15.000000000 +0100 ++++ bash/parse.y 2009-12-30 17:08:12.341085169 +0100 +@@ -2772,12 +2772,14 @@ + dstack.delimiter_depth = 0; /* No delimiters found so far. */ + open_brace_count = 0; + ++#if defined (EXTENDED_GLOB) + /* Reset to global value of extended glob */ + if (parser_state & PST_EXTPAT) + { + /*itrace("reset_parser: parser_state includes PST_EXTPAT");*/ + extended_glob = global_extglob; + } ++#endif + + parser_state = 0; + +--- bash/execute_cmd.c~ 2009-11-29 03:29:34.000000000 +0100 ++++ bash/execute_cmd.c 2009-12-30 17:13:36.041085541 +0100 +@@ -4196,7 +4196,9 @@ + if (variable_context == 0 || this_shell_function == 0) + { + make_funcname_visible (0); ++#if defined (PROCESS_SUBSTITUTION) + unlink_fifo_list (); ++#endif + } + + return (result); +--- bash/lib/glob/glob.c~ 2009-11-15 00:39:30.000000000 +0100 ++++ bash/lib/glob/glob.c 2009-12-30 17:34:56.802336552 +0100 +@@ -640,7 +640,11 @@ + continue; + } + ++#ifdef MACOS + convfn = fnx_fromfs (dp->d_name, D_NAMLEN (dp)); ++#else ++ convfn = dp->d_name; ++#endif + if (strmatch (pat, convfn, mflags) != FNM_NOMATCH) + { + if (nalloca < ALLOCA_MAX) --- bash-4.2.orig/debian/patches/bash-subst-param-length.diff +++ bash-4.2/debian/patches/bash-subst-param-length.diff @@ -0,0 +1,11 @@ +--- a/bash/subst.c ++++ b/bash/subst.c +@@ -6957,7 +6957,7 @@ + { + t_index++; + free (name); +- temp1 = string_extract (string, &t_index, "#%:-=?+/}", 0); ++ temp1 = string_extract (string, &t_index, "#%:-=?+/}", SX_VARNAME); + name = (char *)xmalloc (3 + (strlen (temp1))); + *name = string[sindex]; + if (string[sindex] == '!') --- bash-4.2.orig/debian/patches/bash42-018.diff +++ bash-4.2/debian/patches/bash42-018.diff @@ -0,0 +1,57 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-018 + +Bug-Reported-by: Thomas Cort +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-06/msg00110.html + +Bug-Description: + +Bash fails to compile unless JOB_CONTROL is defined. + +Patch (apply with `patch -p0'): + +--- a/bash/execute_cmd.c ++++ b/bash/execute_cmd.c +@@ -2196,6 +2196,7 @@ + if (ignore_return && cmd) + cmd->flags |= CMD_IGNORE_RETURN; + ++#if defined (JOB_CONTROL) + lastpipe_flag = 0; + begin_unwind_frame ("lastpipe-exec"); + lstdin = -1; +@@ -2215,15 +2216,19 @@ + lastpipe_jid = stop_pipeline (0, (COMMAND *)NULL); /* XXX */ + add_unwind_protect (lastpipe_cleanup, lastpipe_jid); + } +- cmd->flags |= CMD_LASTPIPE; ++ if (cmd) ++ cmd->flags |= CMD_LASTPIPE; + } + if (prev >= 0) + add_unwind_protect (close, prev); ++#endif + + exec_result = execute_command_internal (cmd, asynchronous, prev, pipe_out, fds_to_close); + ++#if defined (JOB_CONTROL) + if (lstdin > 0) + restore_stdin (lstdin); ++#endif + + if (prev >= 0) + close (prev); +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 17 ++#define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/man-test2-doc.diff +++ bash-4.2/debian/patches/man-test2-doc.diff @@ -0,0 +1,15 @@ +# DP: Document handling of parameters of the test builtin. + +--- a/bash/doc/bashref.texi ++++ b/bash/doc/bashref.texi +@@ -5264,6 +5264,10 @@ + Unless otherwise specified, primaries that operate on files follow symbolic + links and operate on the target of the link, rather than the link itself. + ++See the description of the @code{test} builtin command (section ++@pxref{Bash Builtins} below) for the handling of parameters ++(i.e. missing parameters). ++ + @table @code + @item -a @var{file} + True if @var{file} exists. --- bash-4.2.orig/debian/patches/exec-redirections-texi.diff +++ bash-4.2/debian/patches/exec-redirections-texi.diff @@ -0,0 +1,12 @@ +--- a/bash/doc/bashref.texi ++++ b/bash/doc/bashref.texi +@@ -2030,6 +2030,9 @@ + care, as they may conflict with file descriptors the shell uses + internally. + ++Note that the @code{exec} builtin command can make redirections take ++effect in the current shell. ++ + @subsection Redirecting Input + Redirection of input causes the file whose name results from + the expansion of @var{word} --- bash-4.2.orig/debian/patches/bash42-016.diff +++ bash-4.2/debian/patches/bash42-016.diff @@ -0,0 +1,37 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-016 + +Bug-Reported-by: Martin von Gagern +Bug-Reference-ID: <4E43AD9E.8060501@gmx.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-08/msg00141.html + +Bug-Description: + +Bash should not check for mail while executing the `eval' builtin. + +Patch (apply with `patch -p0'): + +--- a/bash/parse.y ++++ b/bash/parse.y +@@ -2499,7 +2499,7 @@ + We do this only if it is time to do so. Notice that only here + is the mail alarm reset; nothing takes place in check_mail () + except the checking of mail. Please don't change this. */ +- if (prompt_is_ps1 && time_to_check_mail ()) ++ if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ()) + { + check_mail (); + reset_mail_timer (); +--- a/bash/patchlevel.h ++++ b/bash/patchlevel.h +@@ -25,6 +25,6 @@ + regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh + looks for to find the patch level (for the sccs version string). */ + +-#define PATCHLEVEL 15 ++#define PATCHLEVEL 16 + + #endif /* _PATCHLEVEL_H_ */ --- bash-4.2.orig/debian/patches/deb-examples.diff +++ bash-4.2/debian/patches/deb-examples.diff @@ -0,0 +1,14 @@ +# DP: document readline header location on Debian systems + +--- a/bash/examples/loadables/README ++++ b/bash/examples/loadables/README +@@ -32,6 +32,9 @@ + guide'. The file template.c provides a template to use for creating + new loadable builtins. + ++On Debian GNU/Linux systems, the bash headers are in /usr/include/bash. ++The appropriate options are already set in the example Makefile. ++ + basename.c Return non-directory portion of pathname. + cat.c cat(1) replacement with no options - the way cat was intended. + cut.c cut(1) replacement. --- bash-4.2.orig/debian/patches/hardening-formatstring.diff +++ bash-4.2/debian/patches/hardening-formatstring.diff @@ -0,0 +1,15 @@ +Author: Pierre Chifflier +Description: Fix build error with -Werror=format-security hardening flag. + +diff -ruN bash-4.1.orig/print_cmd.c bash-4.1/print_cmd.c +--- a/bash/print_cmd.c 2009-09-16 21:32:26.000000000 +0200 ++++ b/bash/print_cmd.c 2011-09-16 11:38:40.000000000 +0200 +@@ -1374,7 +1374,7 @@ + for (i = 0; amount > 0; amount--) + indentation_string[i++] = ' '; + indentation_string[i] = '\0'; +- cprintf (indentation_string); ++ cprintf ("%s", indentation_string); + } + + static void