folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coreutils/findutils: Add missing requires to enable SELinux support. (#2576) 

* coreutils/findutils: Add missing requires to enable SELinux support.
This commit is contained in:
Chris PeBenito 2022-03-30 08:07:22 -04:00 committed by GitHub
parent 7a5b429522
commit eb455e43d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPECS/coreutils/coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: Basic system utilities
Name: coreutils
Version: 8.32
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3
Vendor: Microsoft Corporation
Distribution: Mariner
@ -23,6 +23,7 @@ Patch4: CVE-2013-0222.nopatch
Patch5: CVE-2013-0223.nopatch
Patch6: skip_test_if_run_as_root.patch
BuildRequires: libselinux-devel
BuildRequires: libselinux-utils
Requires: gmp
Requires: libselinux
Conflicts: toybox
@ -103,6 +104,9 @@ LANGUAGE=en_US.UTF-8 LC_ALL=en_US.UTF-8 make -k check
%defattr(-,root,root)
%changelog
* Wed Mar 23 2022 Chris PeBenito <chpebeni@microsoft.com> 8.32-3
- Add missing BuildRequires needed to correctly enable SELinux support.
* Mon Mar 14 2022 Bala <balakumaran.kannan@microsoft.com> - 8.32-2
- BR perl related packages for PTest
- Add patch to skip some tests when run as root user

6
SPECS/findutils/findutils.spec
View File

@ -1,13 +1,15 @@
Summary: This package contains programs to find files
Name: findutils
Version: 4.8.0
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/findutils
Group: Applications/File
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.xz
Requires: libselinux
BuildRequires: libselinux-devel
Conflicts: toybox
# Required to unblock automatic BR resolution for some Python packages.
@ -62,6 +64,8 @@ make %{?_smp_mflags} check
%defattr(-,root,root)
%changelog
* Wed Mar 23 2022 Chris PeBenito <chpebeni@microsoft.com> 4.8.0-3
- Add missing (Build)Requires needed to enable SELinux support.
* Mon Feb 14 2022 Pawel Winogrodzki <pawelwi@microsoft.com> 4.8.0-2
- Adding "Provides: /usr/bin/find".
* Fri Oct 22 2021 Andrew Phelps <anphel@microsoft.com> 4.8.0-1

8
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -40,8 +40,8 @@ ncurses-libs-6.2-5.cm2.aarch64.rpm
ncurses-term-6.2-5.cm2.aarch64.rpm
readline-8.1-1.cm2.aarch64.rpm
readline-devel-8.1-1.cm2.aarch64.rpm
coreutils-8.32-2.cm2.aarch64.rpm
coreutils-lang-8.32-2.cm2.aarch64.rpm
coreutils-8.32-3.cm2.aarch64.rpm
coreutils-lang-8.32-3.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
@ -58,8 +58,8 @@ grep-3.7-2.cm2.aarch64.rpm
grep-lang-3.7-2.cm2.aarch64.rpm
diffutils-3.8-1.cm2.aarch64.rpm
gawk-5.1.0-2.cm2.aarch64.rpm
findutils-4.8.0-2.cm2.aarch64.rpm
findutils-lang-4.8.0-2.cm2.aarch64.rpm
findutils-4.8.0-3.cm2.aarch64.rpm
findutils-lang-4.8.0-3.cm2.aarch64.rpm
gettext-0.21-2.cm2.aarch64.rpm
gzip-1.11-1.cm2.aarch64.rpm
make-4.3-2.cm2.aarch64.rpm

8
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -40,8 +40,8 @@ ncurses-libs-6.2-5.cm2.x86_64.rpm
ncurses-term-6.2-5.cm2.x86_64.rpm
readline-8.1-1.cm2.x86_64.rpm
readline-devel-8.1-1.cm2.x86_64.rpm
coreutils-8.32-2.cm2.x86_64.rpm
coreutils-lang-8.32-2.cm2.x86_64.rpm
coreutils-8.32-3.cm2.x86_64.rpm
coreutils-lang-8.32-3.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
@ -58,8 +58,8 @@ grep-3.7-2.cm2.x86_64.rpm
grep-lang-3.7-2.cm2.x86_64.rpm
diffutils-3.8-1.cm2.x86_64.rpm
gawk-5.1.0-2.cm2.x86_64.rpm
findutils-4.8.0-2.cm2.x86_64.rpm
findutils-lang-4.8.0-2.cm2.x86_64.rpm
findutils-4.8.0-3.cm2.x86_64.rpm
findutils-lang-4.8.0-3.cm2.x86_64.rpm
gettext-0.21-2.cm2.x86_64.rpm
gzip-1.11-1.cm2.x86_64.rpm
make-4.3-2.cm2.x86_64.rpm

12
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -28,9 +28,9 @@ check-debuginfo-0.15.2-1.cm2.aarch64.rpm
chkconfig-1.20-2.cm2.aarch64.rpm
cmake-3.21.4-2.cm2.aarch64.rpm
cmake-debuginfo-3.21.4-2.cm2.aarch64.rpm
coreutils-8.32-2.cm2.aarch64.rpm
coreutils-debuginfo-8.32-2.cm2.aarch64.rpm
coreutils-lang-8.32-2.cm2.aarch64.rpm
coreutils-8.32-3.cm2.aarch64.rpm
coreutils-debuginfo-8.32-3.cm2.aarch64.rpm
coreutils-lang-8.32-3.cm2.aarch64.rpm
cpio-2.13-3.cm2.aarch64.rpm
cpio-debuginfo-2.13-3.cm2.aarch64.rpm
cpio-lang-2.13-3.cm2.aarch64.rpm
@ -77,9 +77,9 @@ file-debuginfo-5.40-2.cm2.aarch64.rpm
file-devel-5.40-2.cm2.aarch64.rpm
file-libs-5.40-2.cm2.aarch64.rpm
filesystem-1.1-8.cm2.aarch64.rpm
findutils-4.8.0-2.cm2.aarch64.rpm
findutils-debuginfo-4.8.0-2.cm2.aarch64.rpm
findutils-lang-4.8.0-2.cm2.aarch64.rpm
findutils-4.8.0-3.cm2.aarch64.rpm
findutils-debuginfo-4.8.0-3.cm2.aarch64.rpm
findutils-lang-4.8.0-3.cm2.aarch64.rpm
flex-2.6.4-7.cm2.aarch64.rpm
flex-debuginfo-2.6.4-7.cm2.aarch64.rpm
flex-devel-2.6.4-7.cm2.aarch64.rpm

12
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -28,9 +28,9 @@ check-debuginfo-0.15.2-1.cm2.x86_64.rpm
chkconfig-1.20-2.cm2.x86_64.rpm
cmake-3.21.4-2.cm2.x86_64.rpm
cmake-debuginfo-3.21.4-2.cm2.x86_64.rpm
coreutils-8.32-2.cm2.x86_64.rpm
coreutils-debuginfo-8.32-2.cm2.x86_64.rpm
coreutils-lang-8.32-2.cm2.x86_64.rpm
coreutils-8.32-3.cm2.x86_64.rpm
coreutils-debuginfo-8.32-3.cm2.x86_64.rpm
coreutils-lang-8.32-3.cm2.x86_64.rpm
cpio-2.13-3.cm2.x86_64.rpm
cpio-debuginfo-2.13-3.cm2.x86_64.rpm
cpio-lang-2.13-3.cm2.x86_64.rpm
@ -77,9 +77,9 @@ file-debuginfo-5.40-2.cm2.x86_64.rpm
file-devel-5.40-2.cm2.x86_64.rpm
file-libs-5.40-2.cm2.x86_64.rpm
filesystem-1.1-8.cm2.x86_64.rpm
findutils-4.8.0-2.cm2.x86_64.rpm
findutils-debuginfo-4.8.0-2.cm2.x86_64.rpm
findutils-lang-4.8.0-2.cm2.x86_64.rpm
findutils-4.8.0-3.cm2.x86_64.rpm
findutils-debuginfo-4.8.0-3.cm2.x86_64.rpm
findutils-lang-4.8.0-3.cm2.x86_64.rpm
flex-2.6.4-7.cm2.x86_64.rpm
flex-debuginfo-2.6.4-7.cm2.x86_64.rpm
flex-devel-2.6.4-7.cm2.x86_64.rpm