From c68d28770e083e71d01153a774a5c4738d136a2d Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Tue, 20 Oct 2020 00:19:30 -0700 Subject: [PATCH 1/3] fix check tests --- SPECS/git/git.spec | 9 ++++----- SPECS/krb5/krb5.spec | 9 ++++++++- SPECS/libcap-ng/libcap-ng.spec | 7 ++++--- SPECS/make/make.spec | 12 +++++++----- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/SPECS/git/git.spec b/SPECS/git/git.spec index 70f18c64486..5b7ca0c2506 100644 --- a/SPECS/git/git.spec +++ b/SPECS/git/git.spec @@ -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 2.23.3-2 +- Fix check test * Thu May 21 2020 Suresh Babu Chalamalasetty 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 - 2.20.2-2 diff --git a/SPECS/krb5/krb5.spec b/SPECS/krb5/krb5.spec index c52dd316e07..815f7f3dfce 100644 --- a/SPECS/krb5/krb5.spec +++ b/SPECS/krb5/krb5.spec @@ -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 - 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 - 1.17-3 - Don't stomp on CPPFLAGS * Sat May 09 00:21:22 PST 2020 Nick Samson - 1.17-2 diff --git a/SPECS/libcap-ng/libcap-ng.spec b/SPECS/libcap-ng/libcap-ng.spec index 53773f77f20..936a65a0e97 100644 --- a/SPECS/libcap-ng/libcap-ng.spec +++ b/SPECS/libcap-ng/libcap-ng.spec @@ -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 0.7.9-3 +- Fix check test * Sat May 09 2020 Nick Samson 0.7.9-2 - Initial CBL-Mariner import from Photon (license: Apache2). - Added %%license line automatically diff --git a/SPECS/make/make.spec b/SPECS/make/make.spec index 710b81702f6..c77d5de0f48 100644 --- a/SPECS/make/make.spec +++ b/SPECS/make/make.spec @@ -1,7 +1,7 @@ Summary: Program for compiling packages Name: make Version: 4.2.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/make Group: Development/Tools @@ -31,6 +31,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 +42,12 @@ make %{?_smp_mflags} check %{_mandir}/*/* %changelog -* Sat May 09 00:21:04 PST 2020 Nick Samson - 4.2.1-4 +* Mon Oct 19 2020 Andrew Phelps 4.2.1-5 +- Fix check test +* Sat May 09 2020 Nick Samson 4.2.1-4 - Added %%license line automatically - -* Tue Sep 03 2019 Mateusz Malisz 4.2.1-3 -- Initial CBL-Mariner import from Photon (license: Apache2). +* Tue Sep 03 2019 Mateusz Malisz 4.2.1-3 +- Initial CBL-Mariner import from Photon (license: Apache2). * Sun Sep 09 2018 Alexey Makhalov 4.2.1-2 - Fix compilation issue against glibc-2.27 * Fri Mar 31 2017 Michelle Wang 4.2.1-1 From 930e4dfd4df9645b1c61ce018208eacb38594465 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Tue, 20 Oct 2020 00:24:20 -0700 Subject: [PATCH 2/3] update toolchain manifests --- .../manifests/package/pkggen_core_aarch64.txt | 4 ++-- .../manifests/package/pkggen_core_x86_64.txt | 4 ++-- .../manifests/package/toolchain_aarch64.txt | 12 ++++++------ .../resources/manifests/package/toolchain_x86_64.txt | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 3fcdf9ba5c4..38f9f2f4ea2 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -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 diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 849d7231a45..aeb8418e6c4 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -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 diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index c0c6c23b58b..d60e0f0b432 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -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 diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 6801469d29a..49c6408460d 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -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 From fbf84e847b8734db66c2dd40dc8efc94241c161b Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Tue, 20 Oct 2020 10:31:44 -0700 Subject: [PATCH 3/3] fix blank spaces and tabs in make.spec --- SPECS/make/make.spec | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/SPECS/make/make.spec b/SPECS/make/make.spec index c77d5de0f48..c58e659c6d1 100644 --- a/SPECS/make/make.spec +++ b/SPECS/make/make.spec @@ -1,14 +1,13 @@ -Summary: Program for compiling packages -Name: make -Version: 4.2.1 +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 +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 @@ -44,7 +43,7 @@ make %{?_smp_mflags} check %changelog * Mon Oct 19 2020 Andrew Phelps 4.2.1-5 - Fix check test -* Sat May 09 2020 Nick Samson 4.2.1-4 +* Sat May 09 2020 Nick Samson 4.2.1-4 - Added %%license line automatically * Tue Sep 03 2019 Mateusz Malisz 4.2.1-3 - Initial CBL-Mariner import from Photon (license: Apache2). @@ -56,9 +55,9 @@ make %{?_smp_mflags} check - Modified check * Tue May 24 2016 Priyesh Padmavilasom 4.1-3 - GA - Bump release of all rpms -* Tue May 10 2016 Kumar Kaushik 4.1-2 +* Tue May 10 2016 Kumar Kaushik 4.1-2 - Fix for segfaults in chroot env. -* Tue Jan 12 2016 Anish Swaminathan 4.1-1 +* Tue Jan 12 2016 Anish Swaminathan 4.1-1 - Update version. * Wed Nov 5 2014 Divya Thaluru 4.0-1 - Initial build. First version