microsoft
/
CBL-Mariner
зеркало из https://github.com/microsoft/CBL-Mariner.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

update bash to 5.1.8 (#1669) 

* update bash to 5.1.8

* update toolchain_build_temp_tools.sh

* linting fixes

* fix mode

* remove nopatch
This commit is contained in:
Andrew Phelps 2021-11-24 09:57:11 -08:00 коммит произвёл GitHub
Родитель d469abadc3
Коммит 7ed4a4e2db
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
13 изменённых файлов: 45 добавлений и 45 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

0
SPECS/bash/CVE-2019-18276.nopatch
Просмотреть файл

12
SPECS/bash/bash-4.4.patch → SPECS/bash/bash-5.1.patch Executable file → Normal file
Просмотреть файл

@ -1,7 +1,7 @@
diff -dupr a/config-top.h b/config-top.h
--- a/config-top.h 2016-05-19 11:34:02.000000000 -0700
+++ b/config-top.h 2017-01-13 19:48:28.940934708 -0800
@@ -87,7 +87,7 @@
diff -ruN a/config-top.h b/config-top.h
--- a/config-top.h 2021-11-22 17:56:18.201075654 -0800
+++ b/config-top.h 2021-11-22 17:56:56.328946350 -0800
@@ -91,7 +91,7 @@
#define DEFAULT_BASHRC "~/.bashrc"
/* System-wide .bashrc file for interactive shells. */
@ -10,12 +10,12 @@ diff -dupr a/config-top.h b/config-top.h
/* System-wide .bash_logout for login shells. */
/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
@@ -100,7 +100,7 @@
@@ -104,7 +104,7 @@
sshd and source the .bashrc if so (like the rshd behavior). This checks
for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,
which can be fooled under certain not-uncommon circumstances. */
-/* #define SSH_SOURCE_BASHRC */
+#define SSH_SOURCE_BASHRC
/* Define if you want the case-capitalizing operators (~[~]) and the
/* Define if you want the case-toggling operators (~[~]) and the
`capcase' variable attribute (declare -c). */

2
SPECS/bash/bash.signatures.json
Просмотреть файл

@ -1,6 +1,6 @@
{
"Signatures": {
"bash-4.4.18.tar.gz": "604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23",
"bash-5.1.8.tar.gz": "0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be",
"bash_completion": "2243e372a314c975595bf22f0ea330533ff0242c7e5d17525d7c061e25ea5ae4"
}
}

18
SPECS/bash/bash.spec Executable file → Normal file
Просмотреть файл

@ -1,7 +1,7 @@
Summary: Bourne-Again SHell
Name: bash
Version: 4.4.18
Release: 7%{?dist}
Version: 5.1.8
Release: 1%{?dist}
License: GPLv3
Vendor: Microsoft Corporation
Distribution: Mariner
@ -9,15 +9,11 @@ Group: System Environment/Base
URL: https://www.gnu.org/software/bash/
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
Source1: bash_completion
Patch0: bash-4.4.patch
# CVE-2019-18276 has a negligible security impact,
# since we don't ship bash with suid.
# Backporting the patch is non-trivial, as well.
Patch1: CVE-2019-18276.nopatch
Patch0: bash-5.1.patch
BuildRequires: readline
Requires: readline
Requires(post): /bin/cp
Requires(post): /bin/grep
Requires(post): /bin/cp
Requires(post): /bin/grep
Requires(postun): /bin/grep
Requires(postun): /bin/mv
Provides: /bin/sh
@ -332,6 +328,10 @@ fi
%defattr(-,root,root)
%changelog
* Mon Nov 22 2021 Andrew Phelps <anphel@microsoft.com> - 5.1.8-1
- Update to version 5.1.8
- License verified
* Mon Apr 26 2021 Thomas Crain <thcrain@microsoft.com> - 4.4.18-7
- Replace incorrect %%{_lib} usage with %%{_libdir}

4
cgmanifest.json
Просмотреть файл

@ -315,8 +315,8 @@
"type": "other",
"other": {
"name": "bash",
"version": "4.4.18",
"downloadUrl": "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz"
"version": "5.1.8",
"downloadUrl": "https://ftp.gnu.org/gnu/bash/bash-5.1.8.tar.gz"
}
}
},

6
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Просмотреть файл

@ -41,9 +41,9 @@ readline-7.0-5.cm2.aarch64.rpm
readline-devel-7.0-5.cm2.aarch64.rpm
coreutils-8.32-1.cm2.aarch64.rpm
coreutils-lang-8.32-1.cm2.aarch64.rpm
bash-4.4.18-7.cm2.aarch64.rpm
bash-devel-4.4.18-7.cm2.aarch64.rpm
bash-lang-4.4.18-7.cm2.aarch64.rpm
bash-5.1.8-1.cm2.aarch64.rpm
bash-devel-5.1.8-1.cm2.aarch64.rpm
bash-lang-5.1.8-1.cm2.aarch64.rpm
bzip2-1.0.8-1.cm2.aarch64.rpm
bzip2-devel-1.0.8-1.cm2.aarch64.rpm
bzip2-libs-1.0.8-1.cm2.aarch64.rpm

6
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Просмотреть файл

@ -41,9 +41,9 @@ readline-7.0-5.cm2.x86_64.rpm
readline-devel-7.0-5.cm2.x86_64.rpm
coreutils-8.32-1.cm2.x86_64.rpm
coreutils-lang-8.32-1.cm2.x86_64.rpm
bash-4.4.18-7.cm2.x86_64.rpm
bash-devel-4.4.18-7.cm2.x86_64.rpm
bash-lang-4.4.18-7.cm2.x86_64.rpm
bash-5.1.8-1.cm2.x86_64.rpm
bash-devel-5.1.8-1.cm2.x86_64.rpm
bash-lang-5.1.8-1.cm2.x86_64.rpm
bzip2-1.0.8-1.cm2.x86_64.rpm
bzip2-devel-1.0.8-1.cm2.x86_64.rpm
bzip2-libs-1.0.8-1.cm2.x86_64.rpm

8
toolkit/resources/manifests/package/toolchain_aarch64.txt
Просмотреть файл

@ -4,10 +4,10 @@ alsa-lib-devel-1.2.2-2.cm2.aarch64.rpm
asciidoc-9.1.0-1.cm2.noarch.rpm
autoconf-2.69-11.cm2.noarch.rpm
automake-1.16.5-1.cm2.noarch.rpm
bash-4.4.18-7.cm2.aarch64.rpm
bash-debuginfo-4.4.18-7.cm2.aarch64.rpm
bash-devel-4.4.18-7.cm2.aarch64.rpm
bash-lang-4.4.18-7.cm2.aarch64.rpm
bash-5.1.8-1.cm2.aarch64.rpm
bash-debuginfo-5.1.8-1.cm2.aarch64.rpm
bash-devel-5.1.8-1.cm2.aarch64.rpm
bash-lang-5.1.8-1.cm2.aarch64.rpm
binutils-2.37-1.cm2.aarch64.rpm
binutils-debuginfo-2.37-1.cm2.aarch64.rpm
binutils-devel-2.37-1.cm2.aarch64.rpm

8
toolkit/resources/manifests/package/toolchain_x86_64.txt
Просмотреть файл

@ -4,10 +4,10 @@ alsa-lib-devel-1.2.2-2.cm2.x86_64.rpm
asciidoc-9.1.0-1.cm2.noarch.rpm
autoconf-2.69-11.cm2.noarch.rpm
automake-1.16.5-1.cm2.noarch.rpm
bash-4.4.18-7.cm2.x86_64.rpm
bash-debuginfo-4.4.18-7.cm2.x86_64.rpm
bash-devel-4.4.18-7.cm2.x86_64.rpm
bash-lang-4.4.18-7.cm2.x86_64.rpm
bash-5.1.8-1.cm2.x86_64.rpm
bash-debuginfo-5.1.8-1.cm2.x86_64.rpm
bash-devel-5.1.8-1.cm2.x86_64.rpm
bash-lang-5.1.8-1.cm2.x86_64.rpm
binutils-2.37-1.cm2.x86_64.rpm
binutils-debuginfo-2.37-1.cm2.x86_64.rpm
binutils-devel-2.37-1.cm2.x86_64.rpm

2
toolkit/scripts/toolchain/container/toolchain-remote-wget-list
Просмотреть файл

@ -36,7 +36,7 @@ http://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz
https://ftp.gnu.org/gnu/tar/tar-1.34.tar.xz
http://ftp.gnu.org/gnu/texinfo/texinfo-6.8.tar.xz
https://www.cpan.org/src/5.0/perl-5.32.0.tar.xz
http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz
https://ftp.gnu.org/gnu/bash/bash-5.1.8.tar.gz
https://ftp.gnu.org/gnu/bison/bison-3.7.6.tar.xz
https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
https://ftp.gnu.org/gnu/coreutils/coreutils-8.32.tar.xz

2
toolkit/scripts/toolchain/container/toolchain-sha256sums
Просмотреть файл

@ -8,7 +8,7 @@ b68c15821baecae48db6a36be83c627a4def8d23979b511761d9057cd78ea336 aarch64-jdk8u1
f4df9cc0041aae52c8c496e2fb1b9cd7e8f1213937e14104b620290936518b22 aarch64-jdk8u181-b13.tar.bz2
64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 autoconf-2.69.tar.xz
07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605 automake-1.16.5.tar.gz
604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23 bash-4.4.18.tar.gz
0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be bash-5.1.8.tar.gz
462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e bigreqsproto-1.1.2.tar.bz2
820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c binutils-2.37.tar.xz
67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf bison-3.7.6.tar.xz

14
toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh
Просмотреть файл

@ -543,17 +543,17 @@ popd
rm -rf grep-3.7
touch /logs/status_grep_complete
echo Bash-4.4.18
tar xf bash-4.4.18.tar.gz
pushd bash-4.4.18
./configure --prefix=/usr \
--docdir=/usr/share/doc/bash-4.4.18 \
--without-bash-malloc \
echo Bash-5.1.8
tar xf bash-5.1.8.tar.gz
pushd bash-5.1.8
./configure --prefix=/usr \
--docdir=/usr/share/doc/bash-5.1.8 \
--without-bash-malloc \
--with-installed-readline
make -j$(nproc)
make install
cd /sources
rm -rf bash-4.4.18
rm -rf bash-5.1.8
touch /logs/status_bash_complete
echo Libtool-2.4.6

8
toolkit/scripts/toolchain/container/toolchain_build_temp_tools.sh
Просмотреть файл

@ -332,15 +332,15 @@ rm -rf ncurses-6.2
touch $LFS/logs/temptoolchain/status_ncurses_complete
echo Bash-4.4.18
tar xf bash-4.4.18.tar.gz
pushd bash-4.4.18
echo Bash-5.1.8
tar xf bash-5.1.8.tar.gz
pushd bash-5.1.8
./configure --prefix=/tools --without-bash-malloc
make -j$(nproc)
make install
ln -sv bash /tools/bin/sh
popd
rm -rf bash-4.4.18
rm -rf bash-5.1.8
touch $LFS/logs/temptoolchain/status_bash_complete