Accepting request 570827 from home:avindra
- Add patches 13-18 to bash-4.4-patches.tar.bz2 * 13: If a here-document contains a command substitution, the command substitution can get access to the file descriptor used to write the here-document. * 14: Under some circumstances, functions that return via the `return' builtin do not clean up memory they allocated to keep track of FIFOs. * 15: Process substitution can leak internal quoting to the parser in the invoked subshell. * 16: Bash can perform trap processing while reading command substitution output instead of waiting until the command completes. * 17: There is a memory leak when `read -e' is used to read a line using readline. * 18: Under certain circumstances (e.g., reading from /dev/zero), read(2) will not return -1 even when interrupted by a signal. The read builtin needs to check for signals in this case. - partial cleanup with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/570827 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=248
This commit is contained in:
parent
efc24a4967
commit
800cfd5133
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4c8f6d1c5c94802053b08c015b4059446a9366378c329902a0eaf9ab4846f730
|
oid sha256:6610d36988d5724accfa1258299bdd2a456f4ddc4af3cf2202e18b468e85cc37
|
||||||
size 8213
|
size 10316
|
||||||
|
22
bash.changes
22
bash.changes
@ -1,3 +1,25 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 30 01:42:43 UTC 2018 - avindra@opensuse.org
|
||||||
|
|
||||||
|
- Add patches 13-18 to bash-4.4-patches.tar.bz2
|
||||||
|
* 13: If a here-document contains a command substitution, the
|
||||||
|
command substitution can get access to the file descriptor used
|
||||||
|
to write the here-document.
|
||||||
|
* 14: Under some circumstances, functions that return via the
|
||||||
|
`return' builtin do not clean up memory they allocated to keep
|
||||||
|
track of FIFOs.
|
||||||
|
* 15: Process substitution can leak internal quoting to the
|
||||||
|
parser in the invoked subshell.
|
||||||
|
* 16: Bash can perform trap processing while reading command
|
||||||
|
substitution output instead of waiting until the command
|
||||||
|
completes.
|
||||||
|
* 17: There is a memory leak when `read -e' is used to read a
|
||||||
|
line using readline.
|
||||||
|
* 18: Under certain circumstances (e.g., reading from /dev/zero),
|
||||||
|
read(2) will not return -1 even when interrupted by a signal.
|
||||||
|
The read builtin needs to check for signals in this case.
|
||||||
|
- partial cleanup with spec-cleaner
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 24 12:40:17 UTC 2018 - werner@suse.de
|
Wed Jan 24 12:40:17 UTC 2018 - werner@suse.de
|
||||||
|
|
||||||
|
17
bash.spec
17
bash.spec
@ -96,7 +96,6 @@ Patch47: bash-4.3-perl522.patch
|
|||||||
Patch48: bash-4.3-extra-import-func.patch
|
Patch48: bash-4.3-extra-import-func.patch
|
||||||
# PATCH-EXTEND-SUSE Allow root to clean file system if filled up
|
# PATCH-EXTEND-SUSE Allow root to clean file system if filled up
|
||||||
Patch49: bash-4.3-pathtemp.patch
|
Patch49: bash-4.3-pathtemp.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
%global _sysconfdir /etc
|
%global _sysconfdir /etc
|
||||||
%global _incdir %{_includedir}
|
%global _incdir %{_includedir}
|
||||||
%global _ldldir /%{_lib}/bash
|
%global _ldldir /%{_lib}/bash
|
||||||
@ -561,9 +560,9 @@ popd
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
pushd ../readline-%{rl_vers}%{rextend}
|
pushd ../readline-%{rl_vers}%{rextend}
|
||||||
make install htmldir=%{_defaultdocdir}/readline \
|
%make_install htmldir=%{_defaultdocdir}/readline \
|
||||||
installdir=%{_defaultdocdir}/readline/examples DESTDIR=%{buildroot}
|
installdir=%{_defaultdocdir}/readline/examples
|
||||||
make install-shared libdir=/%{_lib} linkagedir=%{_libdir} DESTDIR=%{buildroot}
|
%make_install install-shared libdir=/%{_lib} linkagedir=%{_libdir}
|
||||||
rm -rf %{buildroot}%{_defaultdocdir}/bash
|
rm -rf %{buildroot}%{_defaultdocdir}/bash
|
||||||
mkdir -p %{buildroot}%{_defaultdocdir}/bash
|
mkdir -p %{buildroot}%{_defaultdocdir}/bash
|
||||||
chmod 0755 %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}
|
chmod 0755 %{buildroot}/%{_lib}/libhistory.so.%{rl_vers}
|
||||||
@ -575,7 +574,7 @@ pushd ../readline-%{rl_vers}%{rextend}
|
|||||||
ln -sf /%{_lib}/libhistory.so.%{rl_vers} %{buildroot}/%{_libdir}/libhistory.so
|
ln -sf /%{_lib}/libhistory.so.%{rl_vers} %{buildroot}/%{_libdir}/libhistory.so
|
||||||
ln -sf /%{_lib}/libreadline.so.%{rl_vers} %{buildroot}/%{_libdir}/libreadline.so
|
ln -sf /%{_lib}/libreadline.so.%{rl_vers} %{buildroot}/%{_libdir}/libreadline.so
|
||||||
popd
|
popd
|
||||||
make install DESTDIR=%{buildroot}
|
%make_install
|
||||||
make -C examples/loadables/ install-supported DESTDIR=%{buildroot} libdir=/%{_lib}
|
make -C examples/loadables/ install-supported DESTDIR=%{buildroot} libdir=/%{_lib}
|
||||||
rm -rf %{buildroot}%{_libdir}/bash
|
rm -rf %{buildroot}%{_libdir}/bash
|
||||||
rm -rf %{buildroot}/%{_lib}/pkgconfig
|
rm -rf %{buildroot}/%{_lib}/pkgconfig
|
||||||
@ -656,7 +655,6 @@ ldd -u -r %{buildroot}/%{_lib}/libreadline.so.* || true
|
|||||||
%{?buildroot: %{__rm} -rf %{buildroot}}
|
%{?buildroot: %{__rm} -rf %{buildroot}}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
|
||||||
%config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history
|
%config %attr(600,root,root) %{_sysconfdir}/skel/.bash_history
|
||||||
%config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc
|
%config %attr(644,root,root) %{_sysconfdir}/skel/.bashrc
|
||||||
%config %attr(644,root,root) %{_sysconfdir}/skel/.profile
|
%config %attr(644,root,root) %{_sysconfdir}/skel/.profile
|
||||||
@ -671,10 +669,8 @@ ldd -u -r %{buildroot}/%{_lib}/libreadline.so.* || true
|
|||||||
%{_datadir}/bash/helpfiles/*
|
%{_datadir}/bash/helpfiles/*
|
||||||
|
|
||||||
%files -n bash-lang -f bash.lang
|
%files -n bash-lang -f bash.lang
|
||||||
%defattr(-,root,root)
|
|
||||||
|
|
||||||
%files -n bash-doc
|
%files -n bash-doc
|
||||||
%defattr(-,root,root)
|
|
||||||
%doc %{_infodir}/bash.info*
|
%doc %{_infodir}/bash.info*
|
||||||
%doc %{_mandir}/man1/bash.1*
|
%doc %{_mandir}/man1/bash.1*
|
||||||
%doc %{_mandir}/man1/bashbuiltins.1*
|
%doc %{_mandir}/man1/bashbuiltins.1*
|
||||||
@ -684,7 +680,6 @@ ldd -u -r %{buildroot}/%{_lib}/libreadline.so.* || true
|
|||||||
|
|
||||||
%if 0%suse_version >= 1020
|
%if 0%suse_version >= 1020
|
||||||
%files -n bash-devel
|
%files -n bash-devel
|
||||||
%defattr(-,root,root)
|
|
||||||
%dir /%{_includedir}/bash/
|
%dir /%{_includedir}/bash/
|
||||||
%dir /%{_includedir}/bash/
|
%dir /%{_includedir}/bash/
|
||||||
%dir /%{_includedir}/bash/builtins/
|
%dir /%{_includedir}/bash/builtins/
|
||||||
@ -696,26 +691,22 @@ ldd -u -r %{buildroot}/%{_lib}/libreadline.so.* || true
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files -n bash-loadables
|
%files -n bash-loadables
|
||||||
%defattr(-,root,root)
|
|
||||||
%dir %{_ldldir}/
|
%dir %{_ldldir}/
|
||||||
%dir %{_ldldir}/
|
%dir %{_ldldir}/
|
||||||
%{_ldldir}/*
|
%{_ldldir}/*
|
||||||
|
|
||||||
%files -n libreadline7
|
%files -n libreadline7
|
||||||
%defattr(-,root,root)
|
|
||||||
/%{_lib}/libhistory.so.%{rl_major}
|
/%{_lib}/libhistory.so.%{rl_major}
|
||||||
/%{_lib}/libhistory.so.%{rl_vers}
|
/%{_lib}/libhistory.so.%{rl_vers}
|
||||||
/%{_lib}/libreadline.so.%{rl_major}
|
/%{_lib}/libreadline.so.%{rl_major}
|
||||||
/%{_lib}/libreadline.so.%{rl_vers}
|
/%{_lib}/libreadline.so.%{rl_vers}
|
||||||
|
|
||||||
%files -n readline-devel
|
%files -n readline-devel
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_incdir}/readline/
|
%{_incdir}/readline/
|
||||||
%{_libdir}/libhistory.so
|
%{_libdir}/libhistory.so
|
||||||
%{_libdir}/libreadline.so
|
%{_libdir}/libreadline.so
|
||||||
|
|
||||||
%files -n readline-doc
|
%files -n readline-doc
|
||||||
%defattr(-,root,root)
|
|
||||||
%doc %{_infodir}/history.info*
|
%doc %{_infodir}/history.info*
|
||||||
%doc %{_infodir}/readline.info*
|
%doc %{_infodir}/readline.info*
|
||||||
%doc %{_infodir}/rluserman.info*
|
%doc %{_infodir}/rluserman.info*
|
||||||
|
Loading…
Reference in New Issue
Block a user