diff --git a/SPECS/bash/bash.spec b/SPECS/bash/bash.spec index 6aadcba2c92..c6d15f24192 100755 --- a/SPECS/bash/bash.spec +++ b/SPECS/bash/bash.spec @@ -1,7 +1,7 @@ Summary: Bourne-Again SHell Name: bash Version: 4.4.18 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3 URL: http://www.gnu.org/software/bash/ Group: System Environment/Base @@ -42,7 +42,7 @@ These are the additional language files of bash. %patch0 -p1 %build %configure \ - "CFLAGS=-fPIC" \ + "CFLAGS=-fPIC %{build_cflags}" \ --bindir=/bin \ --htmldir=%{_defaultdocdir}/%{name}-%{version} \ --without-bash-malloc \ @@ -325,9 +325,10 @@ fi %defattr(-,root,root) %changelog -* Sat May 09 00:20:50 PST 2020 Nick Samson - 4.4.18-4 -- Added %%license line automatically - +* Fri Jul 31 2020 Leandro Pereira 4.4.18-5 +- Don't stomp on CFLAGS. +* Sat May 09 2020 Nick Samson - 4.4.18-4 +- Added %%license line automatically * Thu Feb 27 2020 Henry Beberman 4.4.18-3 - Explicitly provide /usr/bin/sh and /usr/bin/bash * Tue Sep 03 2019 Mateusz Malisz 4.4.18-2 diff --git a/SPECS/bzip2/bzip2.spec b/SPECS/bzip2/bzip2.spec index 541c0f56df8..e99c4118d4a 100644 --- a/SPECS/bzip2/bzip2.spec +++ b/SPECS/bzip2/bzip2.spec @@ -1,7 +1,7 @@ Summary: Contains programs for compressing and decompressing files Name: bzip2 Version: 1.0.6 -Release: 14%{?dist} +Release: 15%{?dist} License: BSD URL: https://sourceforge.net/projects/bzip2/ Group: System Environment/Base @@ -12,6 +12,7 @@ Provides: libbz2.so.1()(64bit) Patch0: http://www.linuxfromscratch.org/patches/lfs/7.2/bzip2-1.0.6-install_docs-1.patch Patch1: CVE-2016-3189.patch Patch2: CVE-2019-12900.patch +Patch3: cflags-fix.patch Requires: bzip2-libs = %{version}-%{release} Conflicts: toybox @@ -37,6 +38,7 @@ This package contains minimal set of shared bzip2 libraries. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile @@ -96,6 +98,8 @@ make %{?_smp_mflags} check %{_lib}/libbz2.so.* %changelog +* Fri Jul 31 2020 Leandro Pereira 1.0.6-15 +- Don't stomp on CFLAGS. * Tue May 26 2020 Emre Girgin 1.0.6-14 - Fix CVE-2019-12900. This was erroneously named CVE-2019-1353 before, which is not even related to bzip2. * Sat May 09 00:21:38 PST 2020 Nick Samson - 1.0.6-13 diff --git a/SPECS/bzip2/cflags-fix.patch b/SPECS/bzip2/cflags-fix.patch new file mode 100644 index 00000000000..353ecbcdb30 --- /dev/null +++ b/SPECS/bzip2/cflags-fix.patch @@ -0,0 +1,11 @@ +--- Makefile~ 2010-09-10 22:46:02.000000000 +0000 ++++ Makefile 2020-07-31 20:10:07.167902212 +0000 +@@ -21,7 +21,7 @@ + LDFLAGS= + + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS+=-Wall -Winline -O2 -g $(BIGFILES) + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local diff --git a/SPECS/e2fsprogs/e2fsprogs.spec b/SPECS/e2fsprogs/e2fsprogs.spec index 014773b6b6e..1b1e0b2bbf1 100644 --- a/SPECS/e2fsprogs/e2fsprogs.spec +++ b/SPECS/e2fsprogs/e2fsprogs.spec @@ -1,7 +1,7 @@ Summary: Contains the utilities for the ext2 file system Name: e2fsprogs Version: 1.44.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 and BSD and MIT URL: http://e2fsprogs.sourceforge.net Group: System Environment/Base @@ -38,7 +38,7 @@ sed -i -e 's|^LD_LIBRARY_PATH.*|&:/tools/lib|' tests/test_config %build LIBS=-L/tools/lib \ -CFLAGS=-I/tools/include \ +CFLAGS="%{build_cflags} -I/tools/include" \ PKG_CONFIG_PATH=/tools/lib/pkgconfig \ %configure \ --with-root-prefix='' \ @@ -127,6 +127,8 @@ make %{?_smp_mflags} check %defattr(-,root,root) %changelog +* Fri Jul 31 2020 Leandro Pereira - 1.44.6-3 +- Don't stomp on CFLAGS. * Sat May 09 00:21:25 PST 2020 Nick Samson - 1.44.6-2 - Added %%license line automatically diff --git a/SPECS/krb5/krb5.spec b/SPECS/krb5/krb5.spec index 1eed98cb407..c52dd316e07 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: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://web.mit.edu/kerberos/ Group: System Environment/Security @@ -39,7 +39,7 @@ These are the additional language files of krb5. cd src && sed -e 's@\^u}@^u cols 300}@' \ -i tests/dejagnu/config/default.exp && -CPPFLAGS="-D_GNU_SOURCE" \ +CPPFLAGS="-D_GNU_SOURCE %{getenv:CPPFLAGS}" \ autoconf && ./configure \ --prefix=%{_prefix} \ @@ -117,6 +117,8 @@ rm -rf %{buildroot}/* %{_datarootdir}/locale/* %changelog +* 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 - Added %%license line automatically diff --git a/SPECS/lua/lua.spec b/SPECS/lua/lua.spec index 43015992281..d8862b6d19e 100644 --- a/SPECS/lua/lua.spec +++ b/SPECS/lua/lua.spec @@ -4,7 +4,7 @@ Summary: Programming language Name: lua Version: 5.3.5 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: https://www.lua.org Group: Development/Tools @@ -31,7 +31,7 @@ Static libraries and header files for the support library for lua %setup -q %patch0 -p1 sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h -sed -i 's/CFLAGS= -fPIC -O2 /CFLAGS= -fPIC -O2 -DLUA_COMPAT_MODULE /' src/Makefile +sed -i 's/CFLAGS= -fPIC -O2 /CFLAGS+= -DLUA_COMPAT_MODULE /' src/Makefile cp %{SOURCE1} ./ %build @@ -91,6 +91,8 @@ rm -rf %{buildroot} %{_libdir}/liblua.so %changelog +* Fri Jul 31 2020 Leandro Pereira 5.3.5-5 +- Don't stomp on CFLAGS. * Thu Jun 06 2020 Joe Schmitt 5.3.5-4 - Added %%license macro. * Mon Apr 13 2020 Jon Slobodzian 5.3.5-3 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index e428390ce20..7bdca11c5d0 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -37,12 +37,12 @@ readline-7.0-4.cm1.aarch64.rpm readline-devel-7.0-4.cm1.aarch64.rpm coreutils-8.30-5.cm1.aarch64.rpm coreutils-lang-8.30-5.cm1.aarch64.rpm -bash-4.4.18-4.cm1.aarch64.rpm -bash-devel-4.4.18-4.cm1.aarch64.rpm -bash-lang-4.4.18-4.cm1.aarch64.rpm -bzip2-1.0.6-14.cm1.aarch64.rpm -bzip2-devel-1.0.6-14.cm1.aarch64.rpm -bzip2-libs-1.0.6-14.cm1.aarch64.rpm +bash-4.4.18-5.cm1.aarch64.rpm +bash-devel-4.4.18-5.cm1.aarch64.rpm +bash-lang-4.4.18-5.cm1.aarch64.rpm +bzip2-1.0.6-15.cm1.aarch64.rpm +bzip2-devel-1.0.6-15.cm1.aarch64.rpm +bzip2-libs-1.0.6-15.cm1.aarch64.rpm sed-4.5-3.cm1.aarch64.rpm sed-lang-4.5-3.cm1.aarch64.rpm procps-ng-3.3.15-3.cm1.aarch64.rpm @@ -124,7 +124,7 @@ rpm-lang-4.14.2-10.cm1.aarch64.rpm rpm-libs-4.14.2-10.cm1.aarch64.rpm cpio-2.13-2.cm1.aarch64.rpm cpio-lang-2.13-2.cm1.aarch64.rpm -e2fsprogs-libs-1.44.6-2.cm1.aarch64.rpm +e2fsprogs-libs-1.44.6-3.cm1.aarch64.rpm libsolv-0.7.7-4.cm1.aarch64.rpm libsolv-devel-0.7.7-4.cm1.aarch64.rpm libssh2-1.9.0-1.cm1.aarch64.rpm @@ -142,8 +142,8 @@ 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-2.cm1.aarch64.rpm -lua-5.3.5-4.cm1.aarch64.rpm +krb5-1.17-3.cm1.aarch64.rpm +lua-5.3.5-5.cm1.aarch64.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-repos-1.0-8.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 20ee0e7826a..9b39531b239 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -37,12 +37,12 @@ readline-7.0-4.cm1.x86_64.rpm readline-devel-7.0-4.cm1.x86_64.rpm coreutils-8.30-5.cm1.x86_64.rpm coreutils-lang-8.30-5.cm1.x86_64.rpm -bash-4.4.18-4.cm1.x86_64.rpm -bash-devel-4.4.18-4.cm1.x86_64.rpm -bash-lang-4.4.18-4.cm1.x86_64.rpm -bzip2-1.0.6-14.cm1.x86_64.rpm -bzip2-devel-1.0.6-14.cm1.x86_64.rpm -bzip2-libs-1.0.6-14.cm1.x86_64.rpm +bash-4.4.18-5.cm1.x86_64.rpm +bash-devel-4.4.18-5.cm1.x86_64.rpm +bash-lang-4.4.18-5.cm1.x86_64.rpm +bzip2-1.0.6-15.cm1.x86_64.rpm +bzip2-devel-1.0.6-15.cm1.x86_64.rpm +bzip2-libs-1.0.6-15.cm1.x86_64.rpm sed-4.5-3.cm1.x86_64.rpm sed-lang-4.5-3.cm1.x86_64.rpm procps-ng-3.3.15-3.cm1.x86_64.rpm @@ -124,7 +124,7 @@ rpm-lang-4.14.2-10.cm1.x86_64.rpm rpm-libs-4.14.2-10.cm1.x86_64.rpm cpio-2.13-2.cm1.x86_64.rpm cpio-lang-2.13-2.cm1.x86_64.rpm -e2fsprogs-libs-1.44.6-2.cm1.x86_64.rpm +e2fsprogs-libs-1.44.6-3.cm1.x86_64.rpm libsolv-0.7.7-4.cm1.x86_64.rpm libsolv-devel-0.7.7-4.cm1.x86_64.rpm libssh2-1.9.0-1.cm1.x86_64.rpm @@ -142,8 +142,8 @@ 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-2.cm1.x86_64.rpm -lua-5.3.5-4.cm1.x86_64.rpm +krb5-1.17-3.cm1.x86_64.rpm +lua-5.3.5-5.cm1.x86_64.rpm mariner-rpm-macros-1.0-3.cm1.noarch.rpm mariner-check-macros-1.0-3.cm1.noarch.rpm mariner-repos-1.0-8.cm1.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 41db2d98297..71c7f02fd2b 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -4,19 +4,19 @@ alsa-lib-devel-1.2.2-1.cm1.aarch64.rpm asciidoc-8.6.10-4.cm1.noarch.rpm autoconf-2.69-9.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -bash-4.4.18-4.cm1.aarch64.rpm -bash-debuginfo-4.4.18-4.cm1.aarch64.rpm -bash-devel-4.4.18-4.cm1.aarch64.rpm -bash-lang-4.4.18-4.cm1.aarch64.rpm +bash-4.4.18-5.cm1.aarch64.rpm +bash-debuginfo-4.4.18-5.cm1.aarch64.rpm +bash-devel-4.4.18-5.cm1.aarch64.rpm +bash-lang-4.4.18-5.cm1.aarch64.rpm binutils-2.32-3.cm1.aarch64.rpm binutils-debuginfo-2.32-3.cm1.aarch64.rpm binutils-devel-2.32-3.cm1.aarch64.rpm bison-3.1-3.cm1.aarch64.rpm bison-debuginfo-3.1-3.cm1.aarch64.rpm -bzip2-1.0.6-14.cm1.aarch64.rpm -bzip2-debuginfo-1.0.6-14.cm1.aarch64.rpm -bzip2-devel-1.0.6-14.cm1.aarch64.rpm -bzip2-libs-1.0.6-14.cm1.aarch64.rpm +bzip2-1.0.6-15.cm1.aarch64.rpm +bzip2-debuginfo-1.0.6-15.cm1.aarch64.rpm +bzip2-devel-1.0.6-15.cm1.aarch64.rpm +bzip2-libs-1.0.6-15.cm1.aarch64.rpm ca-certificates-20200720-3.cm1.noarch.rpm ca-certificates-base-20200720-3.cm1.noarch.rpm ca-certificates-shared-20200720-3.cm1.noarch.rpm @@ -59,11 +59,11 @@ diffutils-3.6-4.cm1.aarch64.rpm diffutils-debuginfo-3.6-4.cm1.aarch64.rpm docbook-dtd-xml-4.5-11.cm1.noarch.rpm docbook-style-xsl-1.79.1-10.cm1.noarch.rpm -e2fsprogs-1.44.6-2.cm1.aarch64.rpm -e2fsprogs-debuginfo-1.44.6-2.cm1.aarch64.rpm -e2fsprogs-devel-1.44.6-2.cm1.aarch64.rpm -e2fsprogs-lang-1.44.6-2.cm1.aarch64.rpm -e2fsprogs-libs-1.44.6-2.cm1.aarch64.rpm +e2fsprogs-1.44.6-3.cm1.aarch64.rpm +e2fsprogs-debuginfo-1.44.6-3.cm1.aarch64.rpm +e2fsprogs-devel-1.44.6-3.cm1.aarch64.rpm +e2fsprogs-lang-1.44.6-3.cm1.aarch64.rpm +e2fsprogs-libs-1.44.6-3.cm1.aarch64.rpm elfutils-0.176-3.cm1.aarch64.rpm elfutils-debuginfo-0.176-3.cm1.aarch64.rpm elfutils-devel-0.176-3.cm1.aarch64.rpm @@ -147,10 +147,10 @@ kernel-headers-5.4.42-1.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-2.cm1.aarch64.rpm -krb5-debuginfo-1.17-2.cm1.aarch64.rpm -krb5-devel-1.17-2.cm1.aarch64.rpm -krb5-lang-1.17-2.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 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 @@ -223,9 +223,9 @@ libxml2-python-2.9.10-1.cm1.aarch64.rpm libxslt-1.1.34-1.cm1.aarch64.rpm libxslt-debuginfo-1.1.34-1.cm1.aarch64.rpm libxslt-devel-1.1.34-1.cm1.aarch64.rpm -lua-5.3.5-4.cm1.aarch64.rpm -lua-debuginfo-5.3.5-4.cm1.aarch64.rpm -lua-devel-5.3.5-4.cm1.aarch64.rpm +lua-5.3.5-5.cm1.aarch64.rpm +lua-debuginfo-5.3.5-5.cm1.aarch64.rpm +lua-devel-5.3.5-5.cm1.aarch64.rpm lvm2-2.03.05-5.cm1.aarch64.rpm lvm2-debuginfo-2.03.05-5.cm1.aarch64.rpm lvm2-devel-2.03.05-5.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 9ef9c41988a..796d37d3210 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -4,19 +4,19 @@ alsa-lib-devel-1.2.2-1.cm1.x86_64.rpm asciidoc-8.6.10-4.cm1.noarch.rpm autoconf-2.69-9.cm1.noarch.rpm automake-1.16.1-3.cm1.noarch.rpm -bash-4.4.18-4.cm1.x86_64.rpm -bash-debuginfo-4.4.18-4.cm1.x86_64.rpm -bash-devel-4.4.18-4.cm1.x86_64.rpm -bash-lang-4.4.18-4.cm1.x86_64.rpm +bash-4.4.18-5.cm1.x86_64.rpm +bash-debuginfo-4.4.18-5.cm1.x86_64.rpm +bash-devel-4.4.18-5.cm1.x86_64.rpm +bash-lang-4.4.18-5.cm1.x86_64.rpm binutils-2.32-3.cm1.x86_64.rpm binutils-debuginfo-2.32-3.cm1.x86_64.rpm binutils-devel-2.32-3.cm1.x86_64.rpm bison-3.1-3.cm1.x86_64.rpm bison-debuginfo-3.1-3.cm1.x86_64.rpm -bzip2-1.0.6-14.cm1.x86_64.rpm -bzip2-debuginfo-1.0.6-14.cm1.x86_64.rpm -bzip2-devel-1.0.6-14.cm1.x86_64.rpm -bzip2-libs-1.0.6-14.cm1.x86_64.rpm +bzip2-1.0.6-15.cm1.x86_64.rpm +bzip2-debuginfo-1.0.6-15.cm1.x86_64.rpm +bzip2-devel-1.0.6-15.cm1.x86_64.rpm +bzip2-libs-1.0.6-15.cm1.x86_64.rpm ca-certificates-20200720-3.cm1.noarch.rpm ca-certificates-base-20200720-3.cm1.noarch.rpm ca-certificates-shared-20200720-3.cm1.noarch.rpm @@ -59,11 +59,11 @@ diffutils-3.6-4.cm1.x86_64.rpm diffutils-debuginfo-3.6-4.cm1.x86_64.rpm docbook-dtd-xml-4.5-11.cm1.noarch.rpm docbook-style-xsl-1.79.1-10.cm1.noarch.rpm -e2fsprogs-1.44.6-2.cm1.x86_64.rpm -e2fsprogs-debuginfo-1.44.6-2.cm1.x86_64.rpm -e2fsprogs-devel-1.44.6-2.cm1.x86_64.rpm -e2fsprogs-lang-1.44.6-2.cm1.x86_64.rpm -e2fsprogs-libs-1.44.6-2.cm1.x86_64.rpm +e2fsprogs-1.44.6-3.cm1.x86_64.rpm +e2fsprogs-debuginfo-1.44.6-3.cm1.x86_64.rpm +e2fsprogs-devel-1.44.6-3.cm1.x86_64.rpm +e2fsprogs-lang-1.44.6-3.cm1.x86_64.rpm +e2fsprogs-libs-1.44.6-3.cm1.x86_64.rpm elfutils-0.176-3.cm1.x86_64.rpm elfutils-debuginfo-0.176-3.cm1.x86_64.rpm elfutils-devel-0.176-3.cm1.x86_64.rpm @@ -147,10 +147,10 @@ kernel-headers-5.4.42-1.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-2.cm1.x86_64.rpm -krb5-debuginfo-1.17-2.cm1.x86_64.rpm -krb5-devel-1.17-2.cm1.x86_64.rpm -krb5-lang-1.17-2.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 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 @@ -223,9 +223,9 @@ libxml2-python-2.9.10-1.cm1.x86_64.rpm libxslt-1.1.34-1.cm1.x86_64.rpm libxslt-debuginfo-1.1.34-1.cm1.x86_64.rpm libxslt-devel-1.1.34-1.cm1.x86_64.rpm -lua-5.3.5-4.cm1.x86_64.rpm -lua-debuginfo-5.3.5-4.cm1.x86_64.rpm -lua-devel-5.3.5-4.cm1.x86_64.rpm +lua-5.3.5-5.cm1.x86_64.rpm +lua-debuginfo-5.3.5-5.cm1.x86_64.rpm +lua-devel-5.3.5-5.cm1.x86_64.rpm lvm2-2.03.05-5.cm1.x86_64.rpm lvm2-debuginfo-2.03.05-5.cm1.x86_64.rpm lvm2-devel-2.03.05-5.cm1.x86_64.rpm