Fix check tests for git, make, krb5 and libcap-ng (#241)
* fix check tests * update toolchain manifests * fix blank spaces and tabs in make.spec
This commit is contained in:
Andrew Phelps
GitHub
Родитель
bcf0e59d7d
Коммит
e6021229ce
|
|
@ -1,7 +1,7 @@
|
|||
Summary: Fast distributed version control system
|
||||
Name: git
|
||||
Version: 2.23.3
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2
|
||||
URL: https://git-scm.com/
|
||||
Group: System Environment/Programming
|
||||
|
|
@ -55,10 +55,7 @@ install -m 0644 contrib/completion/git-completion.bash %{buildroot}/usr/share/ba
|
|||
%{_fixperms} %{buildroot}/*
|
||||
|
||||
%check
|
||||
# git expect nonroot user to run tests
|
||||
chmod g+w . -R
|
||||
useradd test -G root -m
|
||||
sudo -u test make %{?_smp_mflags} test
|
||||
make %{?_smp_mflags} test
|
||||
|
||||
%post
|
||||
if [ $1 -eq 1 ];then
|
||||
|
|
@ -90,6 +87,8 @@ rm -rf %{buildroot}/*
|
|||
%defattr(-,root,root)
|
||||
|
||||
%changelog
|
||||
* Mon Oct 19 2020 Andrew Phelps <anphel@microsoft.com> 2.23.3-2
|
||||
- Fix check test
|
||||
* Thu May 21 2020 Suresh Babu Chalamalasetty <schalam@microsoft.com> 2.23.3-1
|
||||
- Update to version 2.23.3 for fix CVE-2020-11008 and CVE-2020-5260.
|
||||
* Sat May 09 00:21:41 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.20.2-2
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Summary: The Kerberos newtork authentication system
|
||||
Name: krb5
|
||||
Version: 1.17
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: MIT
|
||||
URL: https://web.mit.edu/kerberos/
|
||||
Group: System Environment/Security
|
||||
|
|
@ -12,6 +12,11 @@ Requires: openssl
|
|||
Requires: e2fsprogs-libs
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: e2fsprogs-devel
|
||||
|
||||
%if %{with_check}
|
||||
BuildRequires: iana-etc
|
||||
%endif
|
||||
|
||||
Provides: pkgconfig(mit-krb5)
|
||||
Provides: pkgconfig(mit-krb5-gssapi)
|
||||
%description
|
||||
|
|
@ -117,6 +122,8 @@ rm -rf %{buildroot}/*
|
|||
%{_datarootdir}/locale/*
|
||||
|
||||
%changelog
|
||||
* Mon Oct 19 2020 Andrew Phelps <anphel@microsoft.com> - 1.17-4
|
||||
- Fix check tests by adding iana-etc which supplies required /etc/services file
|
||||
* Fri Jul 31 12:53:00 PST 2020 Leandro Pereira <leperei@microsoft.com> - 1.17-3
|
||||
- Don't stomp on CPPFLAGS
|
||||
* Sat May 09 00:21:22 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.17-2
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
Summary: POSIX capability Library
|
||||
Name: libcap-ng
|
||||
Version: 0.7.9
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: LGPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://people.redhat.com/sgrubb/libcap-ng
|
||||
|
|
@ -61,8 +61,7 @@ make DESTDIR=%{buildroot} install
|
|||
find %{buildroot} -name '*.la' -delete
|
||||
|
||||
%check
|
||||
chown -Rv nobody .
|
||||
sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"
|
||||
make check
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
|
@ -90,6 +89,8 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"
|
|||
%{_libdir}/*.a
|
||||
|
||||
%changelog
|
||||
* Mon Oct 19 2020 Andrew Phelps <anphel@microsoft.com> 0.7.9-3
|
||||
- Fix check test
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 0.7.9-2
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
- Added %%license line automatically
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
Summary: Program for compiling packages
|
||||
Name: make
|
||||
Version: 4.2.1
|
||||
Release: 4%{?dist}
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/make
|
||||
Group: Development/Tools
|
||||
Summary: Program for compiling packages
|
||||
Name: make
|
||||
Version: 4.2.1
|
||||
Release: 5%{?dist}
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/make
|
||||
Group: Development/Tools
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Source0: http://ftp.gnu.org/gnu/make/%{name}-%{version}.tar.bz2
|
||||
%define sha1 make=7d9d11eb36cfb752da1fb11bb3e521d2a3cc8830
|
||||
Source0: http://ftp.gnu.org/gnu/make/%{name}-%{version}.tar.bz2
|
||||
|
||||
%description
|
||||
The Make package contains a program for compiling packages.
|
||||
|
|
@ -20,8 +19,8 @@ The Make package contains a program for compiling packages.
|
|||
sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c
|
||||
|
||||
./configure \
|
||||
--prefix=%{_prefix} \
|
||||
--disable-silent-rules
|
||||
--prefix=%{_prefix} \
|
||||
--disable-silent-rules
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
|
|
@ -31,6 +30,7 @@ rm -rf %{buildroot}%{_infodir}
|
|||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
export PERL_USE_UNSAFE_INC=1
|
||||
make %{?_smp_mflags} check
|
||||
|
||||
%files -f %{name}.lang
|
||||
|
|
@ -41,11 +41,12 @@ make %{?_smp_mflags} check
|
|||
%{_mandir}/*/*
|
||||
|
||||
%changelog
|
||||
* Sat May 09 00:21:04 PST 2020 Nick Samson <nisamson@microsoft.com> - 4.2.1-4
|
||||
* Mon Oct 19 2020 Andrew Phelps <anphel@microsoft.com> 4.2.1-5
|
||||
- Fix check test
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 4.2.1-4
|
||||
- Added %%license line automatically
|
||||
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 4.2.1-3
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 4.2.1-3
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
* Sun Sep 09 2018 Alexey Makhalov <amakhalov@vmware.com> 4.2.1-2
|
||||
- Fix compilation issue against glibc-2.27
|
||||
* Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.2.1-1
|
||||
|
|
@ -54,9 +55,9 @@ make %{?_smp_mflags} check
|
|||
- Modified check
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.1-3
|
||||
- GA - Bump release of all rpms
|
||||
* Tue May 10 2016 Kumar Kaushik <kaushikk@vmware.com> 4.1-2
|
||||
* Tue May 10 2016 Kumar Kaushik <kaushikk@vmware.com> 4.1-2
|
||||
- Fix for segfaults in chroot env.
|
||||
* Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 4.1-1
|
||||
* Tue Jan 12 2016 Anish Swaminathan <anishs@vmware.com> 4.1-1
|
||||
- Update version.
|
||||
* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.0-1
|
||||
- Initial build. First version
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ findutils-4.6.0-7.cm1.aarch64.rpm
|
|||
findutils-lang-4.6.0-7.cm1.aarch64.rpm
|
||||
gettext-0.19.8.1-3.cm1.aarch64.rpm
|
||||
gzip-1.9-4.cm1.aarch64.rpm
|
||||
make-4.2.1-4.cm1.aarch64.rpm
|
||||
make-4.2.1-5.cm1.aarch64.rpm
|
||||
mariner-release-1.0-9.cm1.noarch.rpm
|
||||
patch-2.7.6-7.cm1.aarch64.rpm
|
||||
util-linux-2.32.1-3.cm1.aarch64.rpm
|
||||
|
|
@ -143,7 +143,7 @@ glib-2.58.0-6.cm1.aarch64.rpm
|
|||
libltdl-2.4.6-5.cm1.aarch64.rpm
|
||||
libltdl-devel-2.4.6-5.cm1.aarch64.rpm
|
||||
pcre-libs-8.42-4.cm1.aarch64.rpm
|
||||
krb5-1.17-3.cm1.aarch64.rpm
|
||||
krb5-1.17-4.cm1.aarch64.rpm
|
||||
lua-5.3.5-7.cm1.aarch64.rpm
|
||||
mariner-rpm-macros-1.0-3.cm1.noarch.rpm
|
||||
mariner-check-macros-1.0-3.cm1.noarch.rpm
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ findutils-4.6.0-7.cm1.x86_64.rpm
|
|||
findutils-lang-4.6.0-7.cm1.x86_64.rpm
|
||||
gettext-0.19.8.1-3.cm1.x86_64.rpm
|
||||
gzip-1.9-4.cm1.x86_64.rpm
|
||||
make-4.2.1-4.cm1.x86_64.rpm
|
||||
make-4.2.1-5.cm1.x86_64.rpm
|
||||
mariner-release-1.0-9.cm1.noarch.rpm
|
||||
patch-2.7.6-7.cm1.x86_64.rpm
|
||||
util-linux-2.32.1-3.cm1.x86_64.rpm
|
||||
|
|
@ -143,7 +143,7 @@ glib-2.58.0-6.cm1.x86_64.rpm
|
|||
libltdl-2.4.6-5.cm1.x86_64.rpm
|
||||
libltdl-devel-2.4.6-5.cm1.x86_64.rpm
|
||||
pcre-libs-8.42-4.cm1.x86_64.rpm
|
||||
krb5-1.17-3.cm1.x86_64.rpm
|
||||
krb5-1.17-4.cm1.x86_64.rpm
|
||||
lua-5.3.5-7.cm1.x86_64.rpm
|
||||
mariner-rpm-macros-1.0-3.cm1.noarch.rpm
|
||||
mariner-check-macros-1.0-3.cm1.noarch.rpm
|
||||
|
|
|
|||
|
|
@ -149,10 +149,10 @@ kernel-headers-5.4.51-2.cm1.noarch.rpm
|
|||
kmod-25-4.cm1.aarch64.rpm
|
||||
kmod-debuginfo-25-4.cm1.aarch64.rpm
|
||||
kmod-devel-25-4.cm1.aarch64.rpm
|
||||
krb5-1.17-3.cm1.aarch64.rpm
|
||||
krb5-debuginfo-1.17-3.cm1.aarch64.rpm
|
||||
krb5-devel-1.17-3.cm1.aarch64.rpm
|
||||
krb5-lang-1.17-3.cm1.aarch64.rpm
|
||||
krb5-1.17-4.cm1.aarch64.rpm
|
||||
krb5-debuginfo-1.17-4.cm1.aarch64.rpm
|
||||
krb5-devel-1.17-4.cm1.aarch64.rpm
|
||||
krb5-lang-1.17-4.cm1.aarch64.rpm
|
||||
libaio-0.3.112-2.cm1.aarch64.rpm
|
||||
libaio-debuginfo-0.3.112-2.cm1.aarch64.rpm
|
||||
libaio-devel-0.3.112-2.cm1.aarch64.rpm
|
||||
|
|
@ -234,8 +234,8 @@ lvm2-devel-2.03.05-5.cm1.aarch64.rpm
|
|||
lvm2-libs-2.03.05-5.cm1.aarch64.rpm
|
||||
m4-1.4.18-4.cm1.aarch64.rpm
|
||||
m4-debuginfo-1.4.18-4.cm1.aarch64.rpm
|
||||
make-4.2.1-4.cm1.aarch64.rpm
|
||||
make-debuginfo-4.2.1-4.cm1.aarch64.rpm
|
||||
make-4.2.1-5.cm1.aarch64.rpm
|
||||
make-debuginfo-4.2.1-5.cm1.aarch64.rpm
|
||||
mariner-check-macros-1.0-3.cm1.noarch.rpm
|
||||
mariner-release-1.0-9.cm1.noarch.rpm
|
||||
mariner-repos-1.0-11.cm1.noarch.rpm
|
||||
|
|
|
|||
|
|
@ -149,10 +149,10 @@ kernel-headers-5.4.51-2.cm1.noarch.rpm
|
|||
kmod-25-4.cm1.x86_64.rpm
|
||||
kmod-debuginfo-25-4.cm1.x86_64.rpm
|
||||
kmod-devel-25-4.cm1.x86_64.rpm
|
||||
krb5-1.17-3.cm1.x86_64.rpm
|
||||
krb5-debuginfo-1.17-3.cm1.x86_64.rpm
|
||||
krb5-devel-1.17-3.cm1.x86_64.rpm
|
||||
krb5-lang-1.17-3.cm1.x86_64.rpm
|
||||
krb5-1.17-4.cm1.x86_64.rpm
|
||||
krb5-debuginfo-1.17-4.cm1.x86_64.rpm
|
||||
krb5-devel-1.17-4.cm1.x86_64.rpm
|
||||
krb5-lang-1.17-4.cm1.x86_64.rpm
|
||||
libaio-0.3.112-2.cm1.x86_64.rpm
|
||||
libaio-debuginfo-0.3.112-2.cm1.x86_64.rpm
|
||||
libaio-devel-0.3.112-2.cm1.x86_64.rpm
|
||||
|
|
@ -234,8 +234,8 @@ lvm2-devel-2.03.05-5.cm1.x86_64.rpm
|
|||
lvm2-libs-2.03.05-5.cm1.x86_64.rpm
|
||||
m4-1.4.18-4.cm1.x86_64.rpm
|
||||
m4-debuginfo-1.4.18-4.cm1.x86_64.rpm
|
||||
make-4.2.1-4.cm1.x86_64.rpm
|
||||
make-debuginfo-4.2.1-4.cm1.x86_64.rpm
|
||||
make-4.2.1-5.cm1.x86_64.rpm
|
||||
make-debuginfo-4.2.1-5.cm1.x86_64.rpm
|
||||
mariner-check-macros-1.0-3.cm1.noarch.rpm
|
||||
mariner-release-1.0-9.cm1.noarch.rpm
|
||||
mariner-repos-1.0-11.cm1.noarch.rpm
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче