Merge lp:~ubuntu-branches/ubuntu/precise/bash/precise-201112011313 into lp:ubuntu/precise/bash

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/bash reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/bash/precise-201112011313. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

56. By Steve Langasek on 2011-11-06

debian/patches/harden-formatstring.patch: Fix build error with
-Werror=format-security hardening flag; thanks to Pierre Chifflier
<email address hidden>. Closes: #641350.

55. By Steve Langasek on 2011-11-06

Build-depend on gettext:any instead of on gettext, so that apt-get can
properly resolve build-dependencies on the tool when cross-building.

54. By Steve Langasek on 2011-11-06

Add cross-compilation support. Closes: #629929.

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-30 11:30:24 +0000
+++ debian/changelog	2011-12-01 13:22:27 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 bash (4.2-1ubuntu1) precise; urgency=low
 
   * Merge with Debian; remaining changes:
@@ -74,6 +75,19 @@
 
  -- Matthias Klose <[e-mail]>  Wed, 30 Nov 2011 07:29:05 +0100
 
+=======
+bash (4.2-0ubuntu5) UNRELEASED; urgency=low
+
+  * Add cross-compilation support.  Closes: #629929.
+  * Build-depend on gettext:any instead of on gettext, so that apt-get can
+    properly resolve build-dependencies on the tool when cross-building.
+  * debian/patches/harden-formatstring.patch: Fix build error with
+    -Werror=format-security hardening flag; thanks to Pierre Chifflier
+    <[e-mail]>.  Closes: #641350.
+
+ -- Steve Langasek <[e-mail]>  Sun, 06 Nov 2011 04:13:49 +0000
+
+>>>>>>> MERGE-SOURCE
 bash (4.2-0ubuntu4) oneiric; urgency=low
 
   * Apply upstream patches:

=== modified file 'debian/control'
--- debian/control	2011-11-30 11:30:24 +0000
+++ debian/control	2011-12-01 13:22:27 +0000
@@ -1,11 +1,19 @@
 Source: bash
 Section: base
 Priority: required
+<<<<<<< TREE
 Maintainer: Matthias Klose <[e-mail]>
 Standards-Version: 3.9.2
 Build-Depends: autoconf, autotools-dev, quilt, bison, libncurses5-dev,
  texinfo, debhelper (>= 5), texi2html, locales, gettext, sharutils, time,
  xz-utils, dpkg-dev (>= 1.16.1)
+=======
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Matthias Klose <[e-mail]>
+Standards-Version: 3.8.3
+Build-Depends: autoconf, autotools-dev, patch, bison, libncurses5-dev,
+ texinfo, debhelper (>= 5), texi2html, locales, gettext:any, sharutils, time, xz-utils, dpkg-dev (>= 1.16.1)
+>>>>>>> MERGE-SOURCE
 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

=== added file 'debian/patches/harden-formatstring.dpatch'
--- debian/patches/harden-formatstring.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/harden-formatstring.dpatch	2011-12-01 13:22:27 +0000
@@ -0,0 +1,35 @@
+#! /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: <your description>
+
+Author: Pierre Chifflier
+Description: Fix build error with -Werror=format-security hardening flag.
+Bug-Debian: http://bugs.debian.org/641350
+
+diff -ruN bash-4.1.orig/print_cmd.c bash-4.1/print_cmd.c
+--- bash-4.1.orig/print_cmd.c	2009-09-16 21:32:26.000000000 +0200
++++ bash-4.1/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

=== modified file 'debian/rules'
--- debian/rules	2011-11-30 11:30:24 +0000
+++ debian/rules	2011-12-01 13:22:27 +0000
@@ -24,6 +24,7 @@
 
 with_gfdl	= yes
 
+<<<<<<< TREE
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
   CC	= $(DEB_HOST_GNU_TYPE)-gcc
 else
@@ -34,6 +35,17 @@
 CPPFLAGS := $(shell $(dpkg_buildflags) --get CPPFLAGS)
 LDFLAGS := $(shell $(dpkg_buildflags) --get LDFLAGS)
 
+=======
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CC	= $(DEB_HOST_GNU_TYPE)-gcc
+else
+CC	= gcc
+endif
+export DEB_CFLAGS_MAINT_APPEND = -Wall
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+
+>>>>>>> MERGE-SOURCE
 SHELL	= /bin/bash
 YACC	= bison -y
 
@@ -88,8 +100,12 @@
 	(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))
+<<<<<<< TREE
 	$(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o clear_console \
 	    debian/clear_console.c $(termcap_lib)
+=======
+	$(CC) $(CFLAGS) -o clear_console debian/clear_console.c $(LDFLAGS) -lncurses
+>>>>>>> MERGE-SOURCE
 endif
 
 # ---------------------------------------------------------------------------
@@ -419,6 +435,7 @@
 	fi
 	touch stamps/stamp-configure-$(build)
 
+<<<<<<< TREE
 patchdir = debian/patches
 
 $(patchdir)/series: $(patchdir)/series.in
@@ -427,6 +444,77 @@
 	  -Darch_os_$(DEB_HOST_ARCH_OS) -Darch_$(DEB_HOST_ARCH) \
 	  -o - $(patchdir)/series.in \
 	  | egrep -v '^(#.*|$$)' > $(patchdir)/series
+=======
+patchdir	= debian/patches
+debian_patches = \
+	bash42-001 \
+	bash42-002 \
+	bash42-003 \
+	bash42-004 \
+	bash42-005 \
+	bash42-006 \
+	bash42-007 \
+	bash42-008 \
+	bash42-009 \
+	bash42-010 \
+	bashbug-editor \
+	deb-bash-config \
+	deb-examples \
+	man-arithmetic \
+	man-fignore \
+	man-bashrc \
+	man-bashlogout \
+	man-substring-exp \
+	man-nocaseglob \
+	man-test \
+	man-test2 \
+	privmode \
+	rbash-manpage \
+	bash-default-editor \
+	bash-subst-param-length \
+	pgrp-pipe \
+	input-err \
+	exec-redirections-man \
+	bash-aliases-repeat \
+	bash-amd64-no-static-libc \
+	quoted-nulls \
+	no-brk-caching \
+	harden-formatstring \
+
+ifeq ($(with_gfdl),yes)
+  debian_patches += \
+	man-substring-exp-doc \
+	man-test2-doc \
+	exec-redirections-texi \
+
+endif
+
+# all debian_patches, without bash205b-*
+# patches integrated in bashdb: builtins-shift, execute-cmd, man-arithmetic,
+#     man-builtin, man-fignore, random, rbash-manpage, report-155436,
+#     rl-8bit-init, s390-build
+# and bashdb patch
+#	rbash-manpage \
+
+bashdb_patches = \
+	bashdb \
+	rl-examples-bdb \
+	rl-inputrc \
+	bashbug-editor \
+	deb-bash-config \
+	deb-examples \
+	privmode \
+
+#	various \
+
+# these are applied in bashdb cvs as well
+#	man-arithmetic \
+#	man-fignore \
+#	random \
+#	report-155436 \
+#	s390-build \
+#	builtins-shift
+>>>>>>> MERGE-SOURCE
 
 patch-$(bash_src): stamps/stamp-patch-$(bash_src)
 stamps/stamp-patch-$(bash_src): $(patchdir)/series stamps/stamp-unpack-$(bash_src)