From 60bc14769184c92c0226d001dcac7fd18590ac38 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 25 Sep 2017 09:15:48 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=242
---
 bash-4.4.dif | 40 ++++++++++++++++++++++++++--------------
 bash.changes |  7 +++++++
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/bash-4.4.dif b/bash-4.4.dif
index 4d7bd610..ff2b1301 100644
--- a/bash-4.4.dif
+++ b/bash-4.4.dif
@@ -1,4 +1,5 @@
 ---
+ Makefile.in        |    2 +-
  config-top.h       |   16 ++++++++++------
  doc/Makefile.in    |    2 +-
  doc/bash.1         |    7 +++++--
@@ -12,10 +13,21 @@
  tests/glob.tests   |    4 ++--
  tests/run-intl     |    2 +-
  tests/run-read     |    2 +-
- 13 files changed, 35 insertions(+), 21 deletions(-)
+ 14 files changed, 36 insertions(+), 22 deletions(-)
 
+--- Makefile.in
++++ Makefile.in	2017-09-25 09:08:48.341515472 +0000
+@@ -447,7 +447,7 @@ SOURCES	 = $(CSOURCES) $(HSOURCES) $(BUI
+ # headers in top-level source directory that get installed by install-headers
+ INSTALLED_HEADERS = shell.h bashjmp.h command.h syntax.h general.h error.h \
+ 		    variables.h array.h assoc.h arrayfunc.h quit.h dispose_cmd.h \
+-		    make_cmd.h subst.h sig.h externs.h builtins.h \
++		    make_cmd.h subst.h sig.h externs.h builtins.h bashline.h \
+ 		    bashtypes.h xmalloc.h config-top.h config-bot.h \
+ 		    bashintl.h bashansi.h bashjmp.h alias.h hashlib.h \
+ 		    conftypes.h unwind_prot.h jobs.h siglist.h
 --- config-top.h
-+++ config-top.h	2016-09-16 10:38:13.570285185 +0000
++++ config-top.h	2017-09-25 09:08:06.210296290 +0000
 @@ -60,17 +60,21 @@
     due to EPIPE. */
  /* #define DONT_REPORT_BROKEN_PIPE_WRITE_ERRORS */
@@ -66,7 +78,7 @@
  /* Define if you want the case-capitalizing operators (~[~]) and the
     `capcase' variable attribute (declare -c). */
 --- doc/Makefile.in
-+++ doc/Makefile.in	2016-09-16 10:38:13.570285185 +0000
++++ doc/Makefile.in	2017-09-25 09:08:06.210296290 +0000
 @@ -154,7 +154,7 @@ BASHREF_FILES = $(srcdir)/bashref.texi $
  #	$(RM) $@
  #	-${TEXI2PDF} $<
@@ -77,7 +89,7 @@
  everything: all pdf
  
 --- doc/bash.1
-+++ doc/bash.1	2016-09-16 10:38:13.570285185 +0000
++++ doc/bash.1	2017-09-25 09:08:06.214296216 +0000
 @@ -5253,8 +5253,8 @@ file (the \fIinputrc\fP file).
  The name of this file is taken from the value of the
  .SM
@@ -100,7 +112,7 @@
  .SH AUTHORS
  Brian Fox, Free Software Foundation
 --- general.h
-+++ general.h	2016-09-16 10:38:17.614209958 +0000
++++ general.h	2017-09-25 09:08:06.214296216 +0000
 @@ -21,10 +21,13 @@
  #if !defined (_GENERAL_H_)
  #define _GENERAL_H_
@@ -116,7 +128,7 @@
  #if defined (HAVE_SYS_RESOURCE_H) && defined (RLIMTYPE)
  #  if defined (HAVE_SYS_TIME_H)
 --- parse.y
-+++ parse.y	2016-09-16 10:38:17.614209958 +0000
++++ parse.y	2017-09-25 09:08:06.214296216 +0000
 @@ -1426,7 +1426,7 @@ input_file_descriptor ()
  
  #if defined (READLINE)
@@ -127,7 +139,7 @@
  
  static int
 --- shell.c
-+++ shell.c	2016-09-16 10:38:17.614209958 +0000
++++ shell.c	2017-09-25 09:08:06.214296216 +0000
 @@ -45,6 +45,7 @@
  #if defined (HAVE_UNISTD_H)
  #  include <sys/types.h>
@@ -154,7 +166,7 @@
      {
        e = errno;
 --- support/bashbug.sh
-+++ support/bashbug.sh	2016-09-16 10:38:17.614209958 +0000
++++ support/bashbug.sh	2017-09-25 09:08:06.214296216 +0000
 @@ -1,4 +1,4 @@
 -#!/bin/sh -
 +#!/bin/bash -
@@ -162,7 +174,7 @@
  # bashbug - create a bug report and mail it to the bug address
  #
 --- support/man2html.c
-+++ support/man2html.c	2016-09-16 10:38:17.618209884 +0000
++++ support/man2html.c	2017-09-25 09:08:06.214296216 +0000
 @@ -78,6 +78,7 @@
  #include <time.h>
  #include <sys/time.h>
@@ -172,7 +184,7 @@
  #define NULL_TERMINATED(n) ((n) + 1)
  
 --- support/rlvers.sh
-+++ support/rlvers.sh	2016-09-16 10:38:17.618209884 +0000
++++ support/rlvers.sh	2017-09-25 09:08:06.214296216 +0000
 @@ -27,10 +27,10 @@ TDIR=$TMPDIR/rlvers
  
  # defaults
@@ -188,7 +200,7 @@
  # cannot rely on the presence of getopts
  while [ $# -gt 0 ]; do
 --- support/shobj-conf
-+++ support/shobj-conf	2016-09-16 10:38:17.618209884 +0000
++++ support/shobj-conf	2017-09-25 09:08:06.214296216 +0000
 @@ -126,10 +126,11 @@ sunos5*|solaris2*)
  linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
  	SHOBJ_CFLAGS=-fPIC
@@ -204,7 +216,7 @@
  
  freebsd2*)
 --- tests/glob.tests
-+++ tests/glob.tests	2016-09-16 10:38:17.618209884 +0000
++++ tests/glob.tests	2017-09-25 09:08:06.214296216 +0000
 @@ -12,8 +12,8 @@ ${THIS_SH} ./glob1.sub
  
  MYDIR=$PWD	# save where we are
@@ -217,7 +229,7 @@
  rm -rf *
  
 --- tests/run-intl
-+++ tests/run-intl	2016-09-16 10:38:17.618209884 +0000
++++ tests/run-intl	2017-09-25 09:08:06.214296216 +0000
 @@ -5,4 +5,4 @@ echo "warning: some of these tests will
  echo "warning: locales installed on your system." >&2
  
@@ -225,7 +237,7 @@
 -diff $AFLAG ${BASH_TSTOUT} intl.right && rm -f ${BASH_TSTOUT}
 +diff -w $AFLAG ${BASH_TSTOUT} intl.right && rm -f ${BASH_TSTOUT}
 --- tests/run-read
-+++ tests/run-read	2016-09-16 10:38:17.618209884 +0000
++++ tests/run-read	2017-09-25 09:08:06.214296216 +0000
 @@ -1,4 +1,4 @@
  echo "warning: please do not consider output differing only in the amount of" >&2
  echo "warning: white space to be an error." >&2
diff --git a/bash.changes b/bash.changes
index e810981b..82f7259b 100644
--- a/bash.changes
+++ b/bash.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 25 09:13:32 UTC 2017 - werner@suse.de
+
+- Modify patch bash-4.4.dif to let bashline.h install as well as
+  this header file is included by general.h due to the same patch
+  (boo#1060069)
+
 -------------------------------------------------------------------
 Thu May 25 17:33:36 UTC 2017 - bwiedemann@suse.com