OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash?expand=0&rev=29

bash-3.2-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14debe8922df425ad1240cacf00691a59d7f37e6b4f0d6aef571e45753920838
+oid sha256:e006f67aef32036d0bf9385888d6c1f3f4ce15a9fb702e58ce7e42cf39967692
-size 25615
+size 29070

bash-3.2-valgrind.patch

@@ -1,18 +0,0 @@
---- array.c
-+++ array.c	2007-02-28 11:17:18.000000000 +0000
-@@ -649,13 +649,14 @@ int	quoted;
- 
- 	result = (char *)xmalloc (rsize = 128);
- 	result[0] = '(';
-+	indstr[0] = '\0';
- 	rlen = 1;
- 
- 	for (ae = element_forw(a->head); ae != a->head; ae = element_forw(ae)) {
- 		is = inttostr (element_index(ae), indstr, sizeof(indstr));
- 		valstr = element_value (ae) ? sh_double_quote (element_value(ae))
- 					    : (char *)NULL;
--		elen = STRLEN (indstr) + 8 + STRLEN (valstr);
-+		elen = STRLEN (is) + 3 + STRLEN (valstr);
- 		RESIZE_MALLOCED_BUFFER (result, rlen, (elen + 1), rsize, rsize);
- 
- 		result[rlen++] = '[';

bash.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jan 13 12:34:56 CET 2009 - olh@suse.de
+
+- obsolete old -XXbit packages (bnc#437293)
+
+-------------------------------------------------------------------
+Tue Dec  9 19:13:46 CET 2008 - schwab@suse.de
+
+- Add bash patches 40-48.
+
 -------------------------------------------------------------------
 Tue Nov 25 14:41:50 CET 2008 - werner@suse.de
 

bash.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bash (Version 3.2)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           bash
@@ -28,7 +27,7 @@ Recommends:     bash-doc = %bash_vers
 Suggests:       command-not-found
 AutoReqProv:    on
 Version:        3.2
-Release:        142
+Release:        144
 Summary:        The GNU Bourne-Again Shell
 Url:            http://www.gnu.org/software/bash/bash.html
 Source0:        bash-%{bash_vers}.tar.bz2
@@ -51,7 +50,6 @@ Patch8:         bash-3.1-random.patch
 Patch9:         bash-3.1-extended_quote.patch
 Patch10:        bash-3.2-printf.patch
 Patch11:        bash-3.1-loadables.dif
-Patch12:        bash-3.2-valgrind.patch
 Patch14:        bash-3.2-sigrestart.patch
 Patch15:        bash-3.2-longjmp.dif
 Patch16:        bash-3.2-setlocale.dif
@@ -86,7 +84,7 @@ Group:          Documentation/Man
 Provides:       bash:%{_infodir}/bash.info.gz
 PreReq:         %install_info_prereq
 Version:        3.2
-Release:        101
+Release:        103
 AutoReqProv:    on
 
 %description -n bash-doc
@@ -106,8 +104,13 @@ Summary:        The Readline Library
 Group:          System/Libraries
 Provides:       bash:/%{_lib}/libreadline.so.5
 Version:        5.2
-Release:        101
+Release:        103
 Recommends:     readline-doc = %{version}
+# bug437293
+%ifarch ppc64
+Obsoletes:      readline-64bit
+%endif
+#
 Provides:       readline =  5.2
 Obsoletes:      readline <= 5.2
 AutoReqProv:    on
@@ -130,11 +133,16 @@ Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
 Provides:       bash:%{_libdir}/libreadline.a
 Version:        5.2
-Release:        142
+Release:        144
 Requires:       libreadline5 = %{version}
 Requires:       ncurses-devel
 Recommends:     readline-doc = %{version}
 AutoReqProv:    on
+# bug437293
+%ifarch ppc64
+Obsoletes:      readline-devel-64bit
+%endif
+#
 
 %description -n readline-devel
 This package contains all necessary include files and libraries needed
@@ -154,7 +162,7 @@ Group:          System/Libraries
 Provides:       readline:%{_infodir}/readline.info.gz
 PreReq:         %install_info_prereq
 Version:        5.2
-Release:        101
+Release:        103
 AutoReqProv:    on
 
 %description -n readline-doc
@@ -169,7 +177,7 @@ Authors:
     Chet Ramey <chet@ins.cwru.edu>
 
 %prep
-%setup -n bash-%{bash_vers} -b1 -b2 -b3
+%setup -q -n bash-%{bash_vers} -b1 -b2 -b3
 for p in ../bash-%{bash_vers}-patches/*; do
     test -e $p || break
     echo Patch $p
@@ -187,7 +195,6 @@ unset p
 %patch9  -p0 -b .extended_quote
 %patch10 -p0 -b .printf
 %patch11 -p0 -b .plugins
-%patch12 -p0 -b .valgrind
 %patch14 -p0 -b .sigrestart
 %patch15 -p0 -b .longjmp
 %patch16 -p0 -b .setlocale
@@ -440,6 +447,10 @@ ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
 %doc %{_defaultdocdir}/readline/
 
 %changelog
+* Tue Jan 13 2009 olh@suse.de
+- obsolete old -XXbit packages (bnc#437293)
+* Tue Dec 09 2008 schwab@suse.de
+- Add bash patches 40-48.
 * Tue Nov 25 2008 werner@suse.de
 - Parse the return value of setlocale(LC_ALL) (bnc#447846)
 * Thu Oct 16 2008 werner@suse.de