From d6f1e24b21350343019f1e9ae085956a5259a046 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 1 Mar 2019 12:21:51 +0000 Subject: [PATCH 01/12] Accepting request 672763 from home:jengelh:branches:Base:System - Put "sh" under control of update-alternatives (allows doing the same for dash) OBS-URL: https://build.opensuse.org/request/show/672763 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=273 --- bash.changes | 5 +++++ bash.spec | 53 +++++++++++++++++++++++++++++----------------------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/bash.changes b/bash.changes index 4e0714ca..128f5798 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 8 10:30:17 UTC 2019 - Jan Engelhardt + +- Put "sh" under control of update-alternatives + ------------------------------------------------------------------- Thu Feb 7 15:06:12 UTC 2019 - Dr. Werner Fink diff --git a/bash.spec b/bash.spec index 12059c64..6729e7c8 100644 --- a/bash.spec +++ b/bash.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,18 +20,6 @@ %bcond_with sjis Name: bash -BuildRequires: audit-devel -BuildRequires: autoconf -BuildRequires: bison -BuildRequires: fdupes -BuildRequires: makeinfo -BuildRequires: ncurses-devel -BuildRequires: patchutils -BuildRequires: pkg-config -# This has to be always the same version as included in the bash its self -BuildRequires: readline-devel == 8.0 -BuildRequires: screen -BuildRequires: sed %define bextend %nil Version: 5.0 Release: 0 @@ -84,6 +72,19 @@ Patch47: bash-4.3-perl522.patch Patch48: bash-4.3-extra-import-func.patch # PATCH-EXTEND-SUSE Allow root to clean file system if filled up Patch49: bash-4.3-pathtemp.patch +BuildRequires: audit-devel +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: makeinfo +BuildRequires: ncurses-devel +BuildRequires: patchutils +BuildRequires: pkg-config +# This has to be always the same version as included in the bash its self +BuildRequires: readline-devel == 8.0 +BuildRequires: screen +BuildRequires: sed +BuildRequires: update-alternatives %global _sysconfdir /etc %global _incdir %{_includedir} %global _ldldir /%{_lib}/bash @@ -437,15 +438,10 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 rm -rf %{buildroot}/%{_lib}/pkgconfig sed -ri '/CC = gcc/s@(CC = gcc).*@\1@' %{buildroot}%{_libdir}/pkgconfig/bash.pc mkdir -p %{buildroot}/bin - mv %{buildroot}%{_bindir}/bash %{buildroot}/bin/ -%if %_minsh - install sh %{buildroot}/bin/sh - ln -sf ../../bin/sh %{buildroot}%{_bindir}/sh -%else - ln -sf bash %{buildroot}/bin/sh - ln -sf ../../bin/bash %{buildroot}%{_bindir}/sh -%endif - ln -sf ../../bin/bash %{buildroot}%{_bindir}/rbash + ln -sf bash %{buildroot}/%{_bindir}/rbash + ln -s %{_bindir}/bash %{buildroot}/bin/bash + ln -sf bash %{buildroot}/%{_bindir}/sh + ln -s %{_bindir}/sh %{buildroot}/bin/sh install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name} install -m 644 COPYING %{buildroot}%{_docdir}/%{name} install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name} @@ -482,6 +478,16 @@ EOF %find_lang bash %fdupes -s %{buildroot}%{_datadir}/bash/helpfiles +%post +update-alternatives --force \ + --install "%{_bindir}/sh" sh "%{_bindir}/bash" 100 \ + --slave "/bin/sh" _bin_sh "%{_bindir}/sh" + +%postun +if test "$1" = 0; then + update-alternatives --remove sh "%{_bindir}/bash" +fi + %post doc %install_info --info-dir=%{_infodir} %{_infodir}/bash.info.gz @@ -491,7 +497,7 @@ EOF %clean LD_LIBRARY_PATH=%{buildroot}/%{_lib} \ ldd -u -r %{buildroot}/bin/bash || true -%{?buildroot: %{__rm} -rf %{buildroot}} +%{?buildroot: rm -rf %{buildroot}} %files %defattr(-,root,root) @@ -502,6 +508,7 @@ ldd -u -r %{buildroot}/bin/bash || true /bin/bash /bin/sh %dir %{_sysconfdir}/bash_completion.d +%{_bindir}/bash %{_bindir}/bashbug %{_bindir}/rbash %{_bindir}/sh From fe7ab20ef8409997c0a0fea956a9637669de90e0 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 1 Mar 2019 14:10:47 +0000 Subject: [PATCH 02/12] ghosts OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=274 --- bash.changes | 5 +++++ bash.spec | 27 ++++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/bash.changes b/bash.changes index 128f5798..22593f05 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 14:01:16 UTC 2019 - Dr. Werner Fink + +- Make update-alternatives work flawless + ------------------------------------------------------------------- Fri Feb 8 10:30:17 UTC 2019 - Jan Engelhardt diff --git a/bash.spec b/bash.spec index 6729e7c8..b1779ec0 100644 --- a/bash.spec +++ b/bash.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -85,6 +85,8 @@ BuildRequires: readline-devel == 8.0 BuildRequires: screen BuildRequires: sed BuildRequires: update-alternatives +Requires(post): update-alternatives +Requires(postun): update-alternatives %global _sysconfdir /etc %global _incdir %{_includedir} %global _ldldir /%{_lib}/bash @@ -438,10 +440,19 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 rm -rf %{buildroot}/%{_lib}/pkgconfig sed -ri '/CC = gcc/s@(CC = gcc).*@\1@' %{buildroot}%{_libdir}/pkgconfig/bash.pc mkdir -p %{buildroot}/bin - ln -sf bash %{buildroot}/%{_bindir}/rbash - ln -s %{_bindir}/bash %{buildroot}/bin/bash - ln -sf bash %{buildroot}/%{_bindir}/sh - ln -s %{_bindir}/sh %{buildroot}/bin/sh + mkdir -p %{buildroot}%{_sysconfdir}/alternatives +# +# It should be noted that the move of /bin/bash to /usr/bin/bash +# had NOT done by me at 2019/02/08. Now only a symbolic link +# remains here :( +# The same had happen for the system POSIX shell /bin/sh +# + touch %{buildroot}%{_sysconfdir}/alternatives/sh \ + %{buildroot}%{_sysconfdir}/alternatives/_bin_sh + ln -sf %{_bindir}/bash %{buildroot}/bin/bash + ln -sf bash %{buildroot}%{_bindir}/rbash + ln -sf %{_sysconfdir}/alternatives/sh %{buildroot}%{_bindir}/sh + ln -sf %{_sysconfdir}/alternatives/_bin_sh %{buildroot}/bin/sh install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name} install -m 644 COPYING %{buildroot}%{_docdir}/%{name} install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name} @@ -480,7 +491,7 @@ EOF %post update-alternatives --force \ - --install "%{_bindir}/sh" sh "%{_bindir}/bash" 100 \ + --install "%{_bindir}/sh" sh "%{_bindir}/bash" 10100 \ --slave "/bin/sh" _bin_sh "%{_bindir}/sh" %postun @@ -497,7 +508,7 @@ fi %clean LD_LIBRARY_PATH=%{buildroot}/%{_lib} \ ldd -u -r %{buildroot}/bin/bash || true -%{?buildroot: rm -rf %{buildroot}} +%{?buildroot: %__rm -rf %{buildroot}} %files %defattr(-,root,root) @@ -505,6 +516,8 @@ ldd -u -r %{buildroot}/bin/bash || true %config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history %config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc %config %attr(644,root,root) %{_sysconfdir}/skel/.profile +%ghost %{_sysconfdir}/alternatives/sh +%ghost %{_sysconfdir}/alternatives/_bin_sh /bin/bash /bin/sh %dir %{_sysconfdir}/bash_completion.d From 33fc73434874ae4b24557df9b6c2e2a6955ea620 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 1 Mar 2019 14:45:10 +0000 Subject: [PATCH 03/12] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=275 --- bash.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash.spec b/bash.spec index b1779ec0..4128edb1 100644 --- a/bash.spec +++ b/bash.spec @@ -451,8 +451,8 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 %{buildroot}%{_sysconfdir}/alternatives/_bin_sh ln -sf %{_bindir}/bash %{buildroot}/bin/bash ln -sf bash %{buildroot}%{_bindir}/rbash + ln -sf bash %{buildroot}/bin/sh ln -sf %{_sysconfdir}/alternatives/sh %{buildroot}%{_bindir}/sh - ln -sf %{_sysconfdir}/alternatives/_bin_sh %{buildroot}/bin/sh install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name} install -m 644 COPYING %{buildroot}%{_docdir}/%{name} install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name} From e8a521247222c9d2b5f315d149f509748061d43e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 1 Mar 2019 15:00:33 +0000 Subject: [PATCH 04/12] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=276 --- bash.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bash.spec b/bash.spec index 4128edb1..279641ec 100644 --- a/bash.spec +++ b/bash.spec @@ -451,8 +451,8 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 %{buildroot}%{_sysconfdir}/alternatives/_bin_sh ln -sf %{_bindir}/bash %{buildroot}/bin/bash ln -sf bash %{buildroot}%{_bindir}/rbash - ln -sf bash %{buildroot}/bin/sh - ln -sf %{_sysconfdir}/alternatives/sh %{buildroot}%{_bindir}/sh + ln -sf bash %{buildroot}%{_bindir}/sh + ln -sf %{_bindir}/sh %{buildroot}/bin/sh install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name} install -m 644 COPYING %{buildroot}%{_docdir}/%{name} install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name} From 1c5e5d95f003f2de5e98ad68237ce3e0d9e5ea1c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 4 Mar 2019 10:18:00 +0000 Subject: [PATCH 05/12] Refine update alternatives OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=277 --- bash.changes | 6 ++++++ bash.spec | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/bash.changes b/bash.changes index 22593f05..4103f5b8 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 4 10:14:12 UTC 2019 - Dr. Werner Fink + +- Refine and harden update-alternatives work flow +- Move header and Makefile from bash-loadables to bash-devel + ------------------------------------------------------------------- Fri Mar 1 14:01:16 UTC 2019 - Dr. Werner Fink diff --git a/bash.spec b/bash.spec index 279641ec..44a02cfd 100644 --- a/bash.spec +++ b/bash.spec @@ -129,8 +129,8 @@ Group: Development/Languages/C and C++ %description devel This package contains the C header files for writing loadable new -builtins for the interpreter Bash. Use -I /usr/include/bash/ -on the compilers command line. +builtins for the interpreter Bash. Use the output of the command +`pkg-config bash --cflags' on the compilers command line. %package loadables Summary: Loadable bash builtins @@ -436,6 +436,8 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 %install %make_install make -C examples/loadables/ install-supported DESTDIR=%{buildroot} libdir=/%{_lib} + mv -vf %{buildroot}%{_ldldir}/*.h %{buildroot}%{_includedir}/bash/ + mv -vf %{buildroot}%{_ldldir}/*.inc %{buildroot}%{_datadir}/bash rm -rf %{buildroot}%{_libdir}/bash rm -rf %{buildroot}/%{_lib}/pkgconfig sed -ri '/CC = gcc/s@(CC = gcc).*@\1@' %{buildroot}%{_libdir}/pkgconfig/bash.pc @@ -447,8 +449,8 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 # remains here :( # The same had happen for the system POSIX shell /bin/sh # - touch %{buildroot}%{_sysconfdir}/alternatives/sh \ - %{buildroot}%{_sysconfdir}/alternatives/_bin_sh + ln -sf %{_bindir}/bash %{buildroot}%{_sysconfdir}/alternatives/sh + ln -sf %{_bindir}/sh %{buildroot}%{_sysconfdir}/alternatives/_bin_sh ln -sf %{_bindir}/bash %{buildroot}/bin/bash ln -sf bash %{buildroot}%{_bindir}/rbash ln -sf bash %{buildroot}%{_bindir}/sh @@ -489,14 +491,14 @@ EOF %find_lang bash %fdupes -s %{buildroot}%{_datadir}/bash/helpfiles -%post -update-alternatives --force \ - --install "%{_bindir}/sh" sh "%{_bindir}/bash" 10100 \ - --slave "/bin/sh" _bin_sh "%{_bindir}/sh" +%post -p /bin/bash +%{_sbindir}/update-alternatives --quiet --force \ + --install %{_bindir}/sh sh %{_bindir}/bash 10100 \ + --slave /bin/sh _bin_sh %{_bindir}/sh -%postun +%preun -p /bin/bash if test "$1" = 0; then - update-alternatives --remove sh "%{_bindir}/bash" + %{_sbindir}/update-alternatives --quiet --remove sh %{_bindir}/bash fi %post doc @@ -516,15 +518,15 @@ ldd -u -r %{buildroot}/bin/bash || true %config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history %config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc %config %attr(644,root,root) %{_sysconfdir}/skel/.profile -%ghost %{_sysconfdir}/alternatives/sh -%ghost %{_sysconfdir}/alternatives/_bin_sh +%ghost %config %{_sysconfdir}/alternatives/sh +%ghost %config %{_sysconfdir}/alternatives/_bin_sh /bin/bash -/bin/sh +%verify(not link mtime) /bin/sh %dir %{_sysconfdir}/bash_completion.d %{_bindir}/bash %{_bindir}/bashbug %{_bindir}/rbash -%{_bindir}/sh +%verify(not link mtime) %{_bindir}/sh %dir %{_datadir}/bash %dir %{_datadir}/bash/helpfiles %{_datadir}/bash/helpfiles/* @@ -541,18 +543,17 @@ ldd -u -r %{buildroot}/bin/bash || true %doc %{_mandir}/man1/rbash.1* %doc %{_docdir}/%{name} -%if 0%suse_version >= 1020 %files devel %defattr(-,root,root) -%dir /%{_includedir}/bash/ -%dir /%{_includedir}/bash/ -%dir /%{_includedir}/bash/builtins/ -%dir /%{_includedir}/bash/include/ -/%{_incdir}/bash/*.h -/%{_incdir}/bash/builtins/*.h -/%{_incdir}/bash/include/*.h +%dir %{_includedir}/bash/ +%dir %{_includedir}/bash/ +%dir %{_includedir}/bash/builtins/ +%dir %{_includedir}/bash/include/ +%{_incdir}/bash/*.h +%{_incdir}/bash/builtins/*.h +%{_incdir}/bash/include/*.h %{_libdir}/pkgconfig/bash.pc -%endif +%{_datadir}/bash/*.inc %files loadables %defattr(-,root,root) From ce134bb18f85dfa3a40d957afd4608ef46c818a4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 4 Mar 2019 14:33:14 +0000 Subject: [PATCH 06/12] Add temporary patch from upstream to fix boo#1127700 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=278 --- bash-5.0-patches.tar.bz2 | 4 ++-- bash.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bash-5.0-patches.tar.bz2 b/bash-5.0-patches.tar.bz2 index 631ed5a1..230f4494 100644 --- a/bash-5.0-patches.tar.bz2 +++ b/bash-5.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:451e4caf69166071183ad310964137ff0a239119bda68db692727bd9088338ec -size 2852 +oid sha256:5754cd89ff2a04607912274af09a30f9d9f9b6d92d810101838c8a1072dc2057 +size 3932 diff --git a/bash.changes b/bash.changes index 4103f5b8..17740100 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 4 14:30:38 UTC 2019 - Dr. Werner Fink + +- Add temporary patch from upstream to fix boo#1127700 + ------------------------------------------------------------------- Mon Mar 4 10:14:12 UTC 2019 - Dr. Werner Fink From 673b3e4972ff3751a55aa46b91b6db5b8a07fda6 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 5 Mar 2019 12:08:17 +0000 Subject: [PATCH 07/12] Do not link /bin/sh as slave alternative to /usr/bin/sh OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=279 --- bash.changes | 5 +++++ bash.spec | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bash.changes b/bash.changes index 17740100..9c878887 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 5 12:04:07 UTC 2019 - Dr. Werner Fink + +- Do not link /bin/sh as slave alternative to /usr/bin/sh + ------------------------------------------------------------------- Mon Mar 4 14:30:38 UTC 2019 - Dr. Werner Fink diff --git a/bash.spec b/bash.spec index 44a02cfd..33876898 100644 --- a/bash.spec +++ b/bash.spec @@ -450,11 +450,10 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 # The same had happen for the system POSIX shell /bin/sh # ln -sf %{_bindir}/bash %{buildroot}%{_sysconfdir}/alternatives/sh - ln -sf %{_bindir}/sh %{buildroot}%{_sysconfdir}/alternatives/_bin_sh ln -sf %{_bindir}/bash %{buildroot}/bin/bash + ln -sf %{_bindir}/sh %{buildroot}/bin/sh ln -sf bash %{buildroot}%{_bindir}/rbash ln -sf bash %{buildroot}%{_bindir}/sh - ln -sf %{_bindir}/sh %{buildroot}/bin/sh install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name} install -m 644 COPYING %{buildroot}%{_docdir}/%{name} install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name} @@ -493,8 +492,7 @@ EOF %post -p /bin/bash %{_sbindir}/update-alternatives --quiet --force \ - --install %{_bindir}/sh sh %{_bindir}/bash 10100 \ - --slave /bin/sh _bin_sh %{_bindir}/sh + --install %{_bindir}/sh sh %{_bindir}/bash 10100 %preun -p /bin/bash if test "$1" = 0; then @@ -519,10 +517,9 @@ ldd -u -r %{buildroot}/bin/bash || true %config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc %config %attr(644,root,root) %{_sysconfdir}/skel/.profile %ghost %config %{_sysconfdir}/alternatives/sh -%ghost %config %{_sysconfdir}/alternatives/_bin_sh -/bin/bash -%verify(not link mtime) /bin/sh %dir %{_sysconfdir}/bash_completion.d +/bin/bash +/bin/sh %{_bindir}/bash %{_bindir}/bashbug %{_bindir}/rbash From e9cd66710e79018c1bcb51d6b07bfb56ffd9c89d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 5 Mar 2019 12:24:22 +0000 Subject: [PATCH 08/12] Repair build environment in Base:System OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=280 --- bash.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/bash.spec b/bash.spec index 33876898..1acb9e5a 100644 --- a/bash.spec +++ b/bash.spec @@ -497,6 +497,7 @@ EOF %preun -p /bin/bash if test "$1" = 0; then %{_sbindir}/update-alternatives --quiet --remove sh %{_bindir}/bash +ln -sf %{_bindir}/sh /bin/sh fi %post doc From 9106a65f1b996f05e4baf62125a53e1797430b3a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 5 Mar 2019 12:43:41 +0000 Subject: [PATCH 09/12] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=281 --- bash.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash.spec b/bash.spec index 1acb9e5a..ceab31ca 100644 --- a/bash.spec +++ b/bash.spec @@ -493,11 +493,11 @@ EOF %post -p /bin/bash %{_sbindir}/update-alternatives --quiet --force \ --install %{_bindir}/sh sh %{_bindir}/bash 10100 +ln -sf %{_bindir}/sh /bin/sh %preun -p /bin/bash if test "$1" = 0; then %{_sbindir}/update-alternatives --quiet --remove sh %{_bindir}/bash -ln -sf %{_bindir}/sh /bin/sh fi %post doc From abf9b51ef9cae221a7b12ab24437537f96274f03 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 5 Mar 2019 14:06:47 +0000 Subject: [PATCH 10/12] . OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=282 --- bash.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/bash.spec b/bash.spec index ceab31ca..77667722 100644 --- a/bash.spec +++ b/bash.spec @@ -493,7 +493,6 @@ EOF %post -p /bin/bash %{_sbindir}/update-alternatives --quiet --force \ --install %{_bindir}/sh sh %{_bindir}/bash 10100 -ln -sf %{_bindir}/sh /bin/sh %preun -p /bin/bash if test "$1" = 0; then @@ -544,7 +543,6 @@ ldd -u -r %{buildroot}/bin/bash || true %files devel %defattr(-,root,root) %dir %{_includedir}/bash/ -%dir %{_includedir}/bash/ %dir %{_includedir}/bash/builtins/ %dir %{_includedir}/bash/include/ %{_incdir}/bash/*.h From fa9d81339a03d3554a6de5f59ed709c9bfd9944a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 6 Mar 2019 11:08:24 +0000 Subject: [PATCH 11/12] Requires(postun) -> Requires(preun) OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=283 --- bash.changes | 5 +++++ bash.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bash.changes b/bash.changes index 9c878887..676b23be 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 6 11:06:10 UTC 2019 - Dr. Werner Fink + +- Requires(postun) -> Requires(preun) + ------------------------------------------------------------------- Tue Mar 5 12:04:07 UTC 2019 - Dr. Werner Fink diff --git a/bash.spec b/bash.spec index 77667722..4fa94d44 100644 --- a/bash.spec +++ b/bash.spec @@ -86,7 +86,7 @@ BuildRequires: screen BuildRequires: sed BuildRequires: update-alternatives Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(preun): update-alternatives %global _sysconfdir /etc %global _incdir %{_includedir} %global _ldldir /%{_lib}/bash From 60d7c1de11dcc4c1a345841f84dc0f3347352bb0 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 11 Mar 2019 07:33:22 +0000 Subject: [PATCH 12/12] Update temporary patch from upstream to make sed testsuite work again OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=284 --- bash-5.0-patches.tar.bz2 | 4 ++-- bash.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/bash-5.0-patches.tar.bz2 b/bash-5.0-patches.tar.bz2 index 230f4494..e9c58eec 100644 --- a/bash-5.0-patches.tar.bz2 +++ b/bash-5.0-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5754cd89ff2a04607912274af09a30f9d9f9b6d92d810101838c8a1072dc2057 -size 3932 +oid sha256:33cf9f650dd932d8a2fdf23073741d7e2b2816b6d396fa7190fcfefa5d034315 +size 4261 diff --git a/bash.changes b/bash.changes index 676b23be..6e0ce813 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 11 07:20:37 UTC 2019 - Dr. Werner Fink + +- Update temporary patch from upstream to make sed testsuite + work again + ------------------------------------------------------------------- Wed Mar 6 11:06:10 UTC 2019 - Dr. Werner Fink