util-linux: add buildrequires libcap-ng-devel (#3110)

* util-linux: add buildrequires libcap-ng-devel

* Add libcap-ng to toolchain
* add missing python3
* add to core to address potential library issues
* bump release of libcap-ng
This commit is contained in:
rlmenge 2022-06-22 10:57:31 -07:00 коммит произвёл GitHub
Родитель f3ad2d208f
Коммит ce21ffa820
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 45 добавлений и 19 удалений

Просмотреть файл

@ -1,7 +1,7 @@
Summary: POSIX capability Library
Name: libcap-ng
Version: 0.8.2
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -67,6 +67,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/*.a
%changelog
* Mon Jun 13 2022 Rachel Menge <rachelmenge@microsoft.com> - 0.8.2-2
- Add libcap-ng to toolchain for util-linux
* Mon Mar 14 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 0.8.2-1
- Upgrade to 0.8.2
- License verified

Просмотреть файл

@ -1,7 +1,7 @@
Summary: Utilities for file systems, consoles, partitions, and messages
Name: util-linux
Version: 2.37.4
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
@ -11,6 +11,7 @@ Source0: https://mirrors.edge.kernel.org/pub/linux/utils/%{name}/v2.37/%{
Source1: runuser
Source2: runuser-l
BuildRequires: audit-devel
BuildRequires: libcap-ng-devel
BuildRequires: libselinux-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
@ -142,6 +143,9 @@ rm -rf %{buildroot}/lib/systemd/system
%{_mandir}/man3/*
%changelog
* Mon Jun 13 2022 Rachel Menge <rachelmenge@microsoft.com> - 2.37.4-2
- Add Buildrequires libcap-ng-devel to build setpriv
* Tue Jun 07 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.37.4-1
- Updating to 2.37.4 to fix CVE-2022-0563.

Просмотреть файл

@ -64,9 +64,11 @@ gettext-0.21-2.cm2.aarch64.rpm
gzip-1.11-1.cm2.aarch64.rpm
make-4.3-2.cm2.aarch64.rpm
patch-2.7.6-7.cm2.aarch64.rpm
util-linux-2.37.4-1.cm2.aarch64.rpm
util-linux-devel-2.37.4-1.cm2.aarch64.rpm
util-linux-libs-2.37.4-1.cm2.aarch64.rpm
libcap-ng-0.8.2-2.cm2.aarch64.rpm
libcap-ng-devel-0.8.2-2.cm2.aarch64.rpm
util-linux-2.37.4-2.cm2.aarch64.rpm
util-linux-devel-2.37.4-2.cm2.aarch64.rpm
util-linux-libs-2.37.4-2.cm2.aarch64.rpm
tar-1.34-1.cm2.aarch64.rpm
xz-5.2.5-1.cm2.aarch64.rpm
xz-devel-5.2.5-1.cm2.aarch64.rpm

Просмотреть файл

@ -64,9 +64,11 @@ gettext-0.21-2.cm2.x86_64.rpm
gzip-1.11-1.cm2.x86_64.rpm
make-4.3-2.cm2.x86_64.rpm
patch-2.7.6-7.cm2.x86_64.rpm
util-linux-2.37.4-1.cm2.x86_64.rpm
util-linux-devel-2.37.4-1.cm2.x86_64.rpm
util-linux-libs-2.37.4-1.cm2.x86_64.rpm
libcap-ng-0.8.2-2.cm2.x86_64.rpm
libcap-ng-devel-0.8.2-2.cm2.x86_64.rpm
util-linux-2.37.4-2.cm2.x86_64.rpm
util-linux-devel-2.37.4-2.cm2.x86_64.rpm
util-linux-libs-2.37.4-2.cm2.x86_64.rpm
tar-1.34-1.cm2.x86_64.rpm
xz-5.2.5-1.cm2.x86_64.rpm
xz-devel-5.2.5-1.cm2.x86_64.rpm

Просмотреть файл

@ -148,6 +148,9 @@ libassuan-devel-2.5.5-2.cm2.aarch64.rpm
libcap-2.60-1.cm2.aarch64.rpm
libcap-debuginfo-2.60-1.cm2.aarch64.rpm
libcap-devel-2.60-1.cm2.aarch64.rpm
libcap-ng-0.8.2-2.cm2.aarch64.rpm
libcap-ng-debuginfo-0.8.2-2.cm2.aarch64.rpm
libcap-ng-devel-0.8.2-2.cm2.aarch64.rpm
libffi-3.4.2-2.cm2.aarch64.rpm
libffi-debuginfo-3.4.2-2.cm2.aarch64.rpm
libffi-devel-3.4.2-2.cm2.aarch64.rpm
@ -505,6 +508,7 @@ python3-debuginfo-3.9.13-1.cm2.aarch64.rpm
python3-devel-3.9.13-1.cm2.aarch64.rpm
python3-gpg-1.16.0-1.cm2.aarch64.rpm
python3-jinja2-3.0.3-2.cm2.noarch.rpm
python3-libcap-ng-0.8.2-2.cm2.aarch64.rpm
python3-libs-3.9.13-1.cm2.aarch64.rpm
python3-libxml2-2.9.14-1.cm2.aarch64.rpm
python3-lxml-4.8.0-1.cm2.aarch64.rpm
@ -556,11 +560,11 @@ texinfo-6.8-1.cm2.aarch64.rpm
texinfo-debuginfo-6.8-1.cm2.aarch64.rpm
unzip-6.0-19.cm2.aarch64.rpm
unzip-debuginfo-6.0-19.cm2.aarch64.rpm
util-linux-2.37.4-1.cm2.aarch64.rpm
util-linux-libs-2.37.4-1.cm2.aarch64.rpm
util-linux-debuginfo-2.37.4-1.cm2.aarch64.rpm
util-linux-devel-2.37.4-1.cm2.aarch64.rpm
util-linux-lang-2.37.4-1.cm2.aarch64.rpm
util-linux-2.37.4-2.cm2.aarch64.rpm
util-linux-libs-2.37.4-2.cm2.aarch64.rpm
util-linux-debuginfo-2.37.4-2.cm2.aarch64.rpm
util-linux-devel-2.37.4-2.cm2.aarch64.rpm
util-linux-lang-2.37.4-2.cm2.aarch64.rpm
which-2.21-8.cm2.aarch64.rpm
which-debuginfo-2.21-8.cm2.aarch64.rpm
xz-5.2.5-1.cm2.aarch64.rpm

Просмотреть файл

@ -148,6 +148,9 @@ libassuan-devel-2.5.5-2.cm2.x86_64.rpm
libcap-2.60-1.cm2.x86_64.rpm
libcap-debuginfo-2.60-1.cm2.x86_64.rpm
libcap-devel-2.60-1.cm2.x86_64.rpm
libcap-ng-0.8.2-2.cm2.x86_64.rpm
libcap-ng-debuginfo-0.8.2-2.cm2.x86_64.rpm
libcap-ng-devel-0.8.2-2.cm2.x86_64.rpm
libffi-3.4.2-2.cm2.x86_64.rpm
libffi-debuginfo-3.4.2-2.cm2.x86_64.rpm
libffi-devel-3.4.2-2.cm2.x86_64.rpm
@ -505,6 +508,7 @@ python3-debuginfo-3.9.13-1.cm2.x86_64.rpm
python3-devel-3.9.13-1.cm2.x86_64.rpm
python3-gpg-1.16.0-1.cm2.x86_64.rpm
python3-jinja2-3.0.3-2.cm2.noarch.rpm
python3-libcap-ng-0.8.2-2.cm2.x86_64.rpm
python3-libs-3.9.13-1.cm2.x86_64.rpm
python3-libxml2-2.9.14-1.cm2.x86_64.rpm
python3-lxml-4.8.0-1.cm2.x86_64.rpm
@ -556,11 +560,11 @@ texinfo-6.8-1.cm2.x86_64.rpm
texinfo-debuginfo-6.8-1.cm2.x86_64.rpm
unzip-6.0-19.cm2.x86_64.rpm
unzip-debuginfo-6.0-19.cm2.x86_64.rpm
util-linux-2.37.4-1.cm2.x86_64.rpm
util-linux-libs-2.37.4-1.cm2.x86_64.rpm
util-linux-debuginfo-2.37.4-1.cm2.x86_64.rpm
util-linux-devel-2.37.4-1.cm2.x86_64.rpm
util-linux-lang-2.37.4-1.cm2.x86_64.rpm
util-linux-2.37.4-2.cm2.x86_64.rpm
util-linux-libs-2.37.4-2.cm2.x86_64.rpm
util-linux-debuginfo-2.37.4-2.cm2.x86_64.rpm
util-linux-devel-2.37.4-2.cm2.x86_64.rpm
util-linux-lang-2.37.4-2.cm2.x86_64.rpm
which-2.21-8.cm2.x86_64.rpm
which-debuginfo-2.21-8.cm2.x86_64.rpm
xz-5.2.5-1.cm2.x86_64.rpm

Просмотреть файл

@ -237,6 +237,7 @@ generate_pkggen_core () {
grep "^gzip-" $TmpPkgGen
grep "^make-" $TmpPkgGen
grep "^patch-" $TmpPkgGen
grep "^libcap-ng-" $TmpPkgGen
grep "^util-linux-" $TmpPkgGen
grep "^tar-" $TmpPkgGen
grep "^xz-" $TmpPkgGen

Просмотреть файл

@ -485,8 +485,14 @@ build_rpm_in_chroot_no_install pam
# libselinux requires libsepol
chroot_and_install_rpms libsepol
build_rpm_in_chroot_no_install libselinux
# util-linux and rpm require libselinux
# libcap-ng needs: swig, python3
build_rpm_in_chroot_no_install libcap-ng
copy_rpm_subpackage python3-libcap-ng
# util-linux and rpm require libselinux and libcap-ng
chroot_and_install_rpms libselinux
chroot_and_install_rpms libcap-ng
build_rpm_in_chroot_no_install util-linux
# rpm requires debugedit
build_rpm_in_chroot_no_install debugedit