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

Updating expat to v.2.4.1 (#1667) 

* upgrading expat to 2.4.1

* updating references to expat 2.4.1

* updating changelog

* linting applied

* cleaning up expat.spec

* fixing changelog, adding global variable for underscored version

* removing useless toolchain-sha256sums entry
This commit is contained in:
Max Brodeur-Urbas 2021-11-24 12:19:54 -08:00 коммит произвёл GitHub
Родитель 7ed4a4e2db
Коммит 86d6846496
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 65 добавлений и 68 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
SPECS/expat/CVE-2018-20843.patch
Просмотреть файл

@ -1,14 +0,0 @@
Patch for CVE-2018-20843.
Adapted from expat upstream git:
1) https://github.com/libexpat/libexpat/pull/262/commits/11f8838bf99ea0a6f0b76f9760c43704d00c4ff6
--- a/lib/xmlparse.c 2018-08-12 15:40:00.000000000 -0400
+++ b/lib/xmlparse.c 2020-04-22 11:45:46.000000000 -0400
@@ -6080,7 +6080,7 @@
else
poolDiscard(&dtd->pool);
elementType->prefix = prefix;
-
+ break;
}
}
return 1;

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

@ -1,5 +1,5 @@
{
"Signatures": {
"expat-2.2.6.tar.bz2": "17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2"
"expat-2.4.1.tar.bz2": "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"
}
}

71
SPECS/expat/expat.spec
Просмотреть файл

@ -1,71 +1,75 @@
Summary: An XML parser library
Name: expat
Version: 2.2.6
Release: 4%{?dist}
License: MIT
URL: https://libexpat.github.io/
Group: System Environment/GeneralLibraries
%global underscore_version $(echo %{version} | cut -d. -f1-3 --output-delimiter="_")
Summary: An XML parser library
Name: expat
Version: 2.4.1
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://github.com/libexpat/libexpat/releases/download/R_2_2_6/%{name}-%{version}.tar.bz2
Patch0: CVE-2018-20843.patch
Requires: expat-libs = %{version}-%{release}
Group: System Environment/GeneralLibraries
URL: https://libexpat.github.io/
Source0: https://github.com/libexpat/libexpat/releases/download/R_%{underscore_version}/%{name}-%{version}.tar.bz2
Requires: %{name}-libs = %{version}-%{release}
%description
The Expat package contains a stream oriented C library for parsing XML.
%package devel
Summary: Header and development files for expat
Requires: %{name} = %{version}-%{release}
%package devel
Summary: Header and development files for expat
Requires: %{name} = %{version}-%{release}
%description devel
It contains the libraries and header files to create applications
%package libs
Summary: Libraries for expat
Group: System Environment/Libraries
Summary: Libraries for expat
Group: System Environment/Libraries
%description libs
This package contains minimal set of shared expat libraries.
%prep
%setup -q
%patch0 -p1
%build
%configure \
CFLAGS="%{optflags}" \
CXXFLAGS="%{optflags}" \
--bindir=%{_bindir} \
--libdir=%{_libdir} \
--disable-static
make %{?_smp_mflags}
%make_build
%install
[ %{buildroot} != "/"] && rm -rf %{buildroot}/*
make DESTDIR=%{buildroot} install
find %{buildroot}/%{_libdir} -name '*.la' -delete
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
rm -rf %{buildroot}/%{_docdir}/%{name}
%{_fixperms} %{buildroot}/*
%check
make %{?_smp_mflags} check
%make_build check
%ldconfig_scriptlets
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}/*
%files
%defattr(-,root,root)
%license COPYING
%doc AUTHORS Changes
%{_bindir}/*
%{_mandir}/man1/*
%files devel
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/libexpat.so
%{_libdir}/cmake/expat-%{version}
%files libs
%{_libdir}/libexpat.so.*
%license COPYING
%{_libdir}/libexpat.so.1*
%changelog
* Fri Nov 19 2021 Max Brodeur-Urbas <maxbr@microsoft.com> - 2.4.1-1
- Update to 2.4.1
- License verified
- Removed reference to manfiles, generation causes circular dependency.
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 2.2.6-4
- Added %%license line automatically
@ -74,17 +78,24 @@ rm -rf %{buildroot}/*
- Remove sha1 macro.
- Update URL.
- Update Source0.
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.2.6-2
- Initial CBL-Mariner import from Photon (license: Apache2).
* Thu Sep 20 2018 Sujay G <gsujay@vmware.com> 2.2.6-1
- Bump expat version to 2.2.6
* Tue Sep 26 2017 Anish Swaminathan <anishs@vmware.com> 2.2.4-1
- Updating version, fixes CVE-2017-9233, CVE-2016-9063, CVE-2016-0718
* Fri Apr 14 2017 Alexey Makhalov <amakhalov@vmware.com> 2.2.0-2
- Added -libs and -devel subpackages
* Fri Oct 21 2016 Kumar Kaushik <kaushikk@vmware.com> 2.2.0-1
- Updating Source/Fixing CVE-2015-1283.
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.1.0-2
- GA - Bump release of all rpms
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.1.0-1
- Initial build. First version

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

@ -1547,8 +1547,8 @@
"type": "other",
"other": {
"name": "expat",
"version": "2.2.6",
"downloadUrl": "https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2"
"version": "2.4.1",
"downloadUrl": "https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.bz2"
}
}
},

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

@ -97,9 +97,9 @@ elfutils-libelf-0.185-1.cm2.aarch64.rpm
elfutils-libelf-devel-0.185-1.cm2.aarch64.rpm
elfutils-libelf-devel-static-0.185-1.cm2.aarch64.rpm
elfutils-libelf-lang-0.185-1.cm2.aarch64.rpm
expat-2.2.6-4.cm2.aarch64.rpm
expat-devel-2.2.6-4.cm2.aarch64.rpm
expat-libs-2.2.6-4.cm2.aarch64.rpm
expat-2.4.1-1.cm2.aarch64.rpm
expat-devel-2.4.1-1.cm2.aarch64.rpm
expat-libs-2.4.1-1.cm2.aarch64.rpm
libpipeline-1.5.0-5.cm2.aarch64.rpm
libpipeline-devel-1.5.0-5.cm2.aarch64.rpm
gdbm-1.21-1.cm2.aarch64.rpm

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

@ -97,9 +97,9 @@ elfutils-libelf-0.185-1.cm2.x86_64.rpm
elfutils-libelf-devel-0.185-1.cm2.x86_64.rpm
elfutils-libelf-devel-static-0.185-1.cm2.x86_64.rpm
elfutils-libelf-lang-0.185-1.cm2.x86_64.rpm
expat-2.2.6-4.cm2.x86_64.rpm
expat-devel-2.2.6-4.cm2.x86_64.rpm
expat-libs-2.2.6-4.cm2.x86_64.rpm
expat-2.4.1-1.cm2.x86_64.rpm
expat-devel-2.4.1-1.cm2.x86_64.rpm
expat-libs-2.4.1-1.cm2.x86_64.rpm
libpipeline-1.5.0-5.cm2.x86_64.rpm
libpipeline-devel-1.5.0-5.cm2.x86_64.rpm
gdbm-1.21-1.cm2.x86_64.rpm

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

@ -64,10 +64,10 @@ elfutils-libelf-0.185-1.cm2.aarch64.rpm
elfutils-libelf-devel-0.185-1.cm2.aarch64.rpm
elfutils-libelf-devel-static-0.185-1.cm2.aarch64.rpm
elfutils-libelf-lang-0.185-1.cm2.aarch64.rpm
expat-2.2.6-4.cm2.aarch64.rpm
expat-debuginfo-2.2.6-4.cm2.aarch64.rpm
expat-devel-2.2.6-4.cm2.aarch64.rpm
expat-libs-2.2.6-4.cm2.aarch64.rpm
expat-2.4.1-1.cm2.aarch64.rpm
expat-debuginfo-2.4.1-1.cm2.aarch64.rpm
expat-devel-2.4.1-1.cm2.aarch64.rpm
expat-libs-2.4.1-1.cm2.aarch64.rpm
file-5.40-1.cm2.aarch64.rpm
file-debuginfo-5.40-1.cm2.aarch64.rpm
file-devel-5.40-1.cm2.aarch64.rpm

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

@ -64,10 +64,10 @@ elfutils-libelf-0.185-1.cm2.x86_64.rpm
elfutils-libelf-devel-0.185-1.cm2.x86_64.rpm
elfutils-libelf-devel-static-0.185-1.cm2.x86_64.rpm
elfutils-libelf-lang-0.185-1.cm2.x86_64.rpm
expat-2.2.6-4.cm2.x86_64.rpm
expat-debuginfo-2.2.6-4.cm2.x86_64.rpm
expat-devel-2.2.6-4.cm2.x86_64.rpm
expat-libs-2.2.6-4.cm2.x86_64.rpm
expat-2.4.1-1.cm2.x86_64.rpm
expat-debuginfo-2.4.1-1.cm2.x86_64.rpm
expat-devel-2.4.1-1.cm2.x86_64.rpm
expat-libs-2.4.1-1.cm2.x86_64.rpm
file-5.40-1.cm2.x86_64.rpm
file-debuginfo-5.40-1.cm2.x86_64.rpm
file-devel-5.40-1.cm2.x86_64.rpm

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

@ -42,7 +42,7 @@ https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
https://ftp.gnu.org/gnu/coreutils/coreutils-8.32.tar.xz
http://www.linuxfromscratch.org/patches/downloads/coreutils/coreutils-8.32-i18n-1.patch
https://ftp.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz
https://github.com/libexpat/libexpat/releases/download/R_2_2_6/expat-2.2.6.tar.bz2
https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.bz2
http://ftp.astron.com/pub/file/file-5.40.tar.gz
https://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz
http://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.xz

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

@ -26,7 +26,7 @@ f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 dri2proto-2.8.
01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074 dri3proto-1.0.tar.bz2
9bf7200d2737ed13f50a080af285c11529f91b088d84ecb71aae9fac58a8fbee e2fsprogs-1.44.6.tar.gz
dc8d3e74ab209465e7f568e1b3bb9a5a142f8656e2b57d10049a73da2ae6b5a6 elfutils-0.185.tar.bz2
17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2 expat-2.2.6.tar.bz2
2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40 expat-2.4.1.tar.bz2
167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57 file-5.40.tar.gz
57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 findutils-4.8.0.tar.xz
ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce fixesproto-5.0.tar.bz2

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

@ -588,17 +588,17 @@ popd
rm -rf gperf-3.1
touch /logs/status_gperf_complete
echo Expat-2.2.6
tar xf expat-2.2.6.tar.bz2
pushd expat-2.2.6
echo Expat-2.4.1
tar xf expat-2.4.1.tar.bz2
pushd expat-2.4.1
sed -i 's|usr/bin/env |bin/|' run.sh.in
./configure --prefix=/usr \
--disable-static \
--docdir=/usr/share/doc/expat-2.2.6
--docdir=/usr/share/doc/expat-2.4.1
make -j$(nproc)
make install
popd
rm -rf expat-2.2.6
rm -rf expat-2.4.1
touch /logs/status_expat_complete
echo Perl-5.32.0