upgrade versions of automake and check (#1670)

* upgrade versions of automake and check

* upgrade versions of automake and check

* upgrade versions of automake and check

* upgrade versions of automake and check

* upgrade versions of automake and check

* upgrade versions of automake and check

* upgrade versions of automake and check

* upgrade automake version

* address PR comment

Co-authored-by: nico <nicolasg@microsoft.com>

SPECS/automake/automake.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "automake-1.16.1.tar.xz": "5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921"
+  "automake-1.16.5.tar.gz": "07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605"
  }
 }

SPECS/automake/automake.spec

@@ -1,14 +1,13 @@
 Summary:	Programs for generating Makefiles
 Name:		automake
-Version:	1.16.1
+Version:	1.16.5
-Release:        3%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
-URL:		http://www.gnu.org/software/automake/
+URL:		https://www.gnu.org/software/automake/
 Group:		System Environment/Base
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
-Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
+Source0:	https://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.gz
-%define sha1 automake=1012bc79956013d53da0890f8493388a6cb20831
 BuildRequires:	autoconf
 BuildArch:      noarch
 
@@ -43,6 +42,10 @@ make %{?_smp_mflags} check
 %{_defaultdocdir}/%{name}-%{version}/*
 %{_mandir}/*/*
 %changelog
+* Tue Nov 23 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.16.5-1
+- Upgrade to version 1.16.5
+- License verified
+
 * Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 1.16.1-3
 - Added %%license line automatically
 

SPECS/check/check.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "check-0.12.0.tar.gz": "7816b4c38f6e23ff873786f18d966e552837677bfae144041e0587e7c39e04e8"
+  "check-0.15.2.tar.gz": "998d355294bb94072f40584272cf4424571c396c631620ce463f6ea97aa67d2e"
  }
 }

SPECS/check/check.spec

@@ -1,11 +1,10 @@
-Summary:        Check-0.12.0
+Summary:        Check is a unit testing framework for C
 Name:           check
-Version:        0.12.0
+Version:        0.15.2
-Release:        5%{?dist}
+Release:        1%{?dist}
 License:        LGPLv2+
 URL:            https://libcheck.github.io/check/
-#Source0:       https://github.com/libcheck/check/archive/%{version}.tar.gz
+Source0:        https://github.com/libcheck/check/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source0:        %{name}-%{version}.tar.gz
 Provides:       %{name}-devel = %{version}-%{release}
 Group:          Development/Tools
 Vendor:         Microsoft Corporation
@@ -46,6 +45,9 @@ make %{?_smp_mflags} check
 /usr/share/aclocal/*
 
 %changelog
+* Tue Nov 23 2021 Nicolas Guibourge <nicolasg@microsoft.com> 0.15.2-1
+- Upgrade to version 0.15.2
+
 * Mon Sep 28 2020 Ruying Chen <v-ruyche@microsoft.com> 0.12.0-5
 - Provide check-devel
 

cgmanifest.json

@@ -255,8 +255,8 @@
         "type": "other",
         "other": {
           "name": "automake",
-          "version": "1.16.1",
+          "version": "1.16.5",
-          "downloadUrl": "http://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.xz"
+          "downloadUrl": "http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz"
         }
       }
     },
@@ -666,8 +666,8 @@
         "type": "other",
         "other": {
           "name": "check",
-          "version": "0.12.0",
+          "version": "0.15.2",
-          "downloadUrl": "https://github.com/libcheck/check/archive/0.12.0.tar.gz"
+          "downloadUrl": "https://github.com/libcheck/check/archive/refs/tags/0.15.2.tar.gz"
         }
       }
     },

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -163,7 +163,7 @@ perl-threads-shared-1.61-463.cm2.aarch64.rpm
 perl-vars-1.05-463.cm2.noarch.rpm
 texinfo-6.8-1.cm2.aarch64.rpm
 autoconf-2.69-11.cm2.noarch.rpm
-automake-1.16.1-3.cm2.noarch.rpm
+automake-1.16.5-1.cm2.noarch.rpm
 openssl-1.1.1k-5.cm2.aarch64.rpm
 openssl-devel-1.1.1k-5.cm2.aarch64.rpm
 openssl-libs-1.1.1k-5.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -163,7 +163,7 @@ perl-threads-shared-1.61-463.cm2.x86_64.rpm
 perl-vars-1.05-463.cm2.noarch.rpm
 texinfo-6.8-1.cm2.x86_64.rpm
 autoconf-2.69-11.cm2.noarch.rpm
-automake-1.16.1-3.cm2.noarch.rpm
+automake-1.16.5-1.cm2.noarch.rpm
 openssl-1.1.1k-5.cm2.x86_64.rpm
 openssl-devel-1.1.1k-5.cm2.x86_64.rpm
 openssl-libs-1.1.1k-5.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -3,7 +3,7 @@ alsa-lib-debuginfo-1.2.2-2.cm2.aarch64.rpm
 alsa-lib-devel-1.2.2-2.cm2.aarch64.rpm
 asciidoc-9.1.0-1.cm2.noarch.rpm
 autoconf-2.69-11.cm2.noarch.rpm
-automake-1.16.1-3.cm2.noarch.rpm
+automake-1.16.5-1.cm2.noarch.rpm
 bash-4.4.18-7.cm2.aarch64.rpm
 bash-debuginfo-4.4.18-7.cm2.aarch64.rpm
 bash-devel-4.4.18-7.cm2.aarch64.rpm
@@ -22,8 +22,8 @@ ca-certificates-base-20200720-20.cm2.noarch.rpm
 ca-certificates-legacy-20200720-20.cm2.noarch.rpm
 ca-certificates-shared-20200720-20.cm2.noarch.rpm
 ca-certificates-tools-20200720-20.cm2.noarch.rpm
-check-0.12.0-5.cm2.aarch64.rpm
+check-0.15.2-1.cm2.aarch64.rpm
-check-debuginfo-0.12.0-5.cm2.aarch64.rpm
+check-debuginfo-0.15.2-1.cm2.aarch64.rpm
 cmake-3.17.3-5.cm2.aarch64.rpm
 cmake-debuginfo-3.17.3-5.cm2.aarch64.rpm
 coreutils-8.32-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -3,7 +3,7 @@ alsa-lib-debuginfo-1.2.2-2.cm2.x86_64.rpm
 alsa-lib-devel-1.2.2-2.cm2.x86_64.rpm
 asciidoc-9.1.0-1.cm2.noarch.rpm
 autoconf-2.69-11.cm2.noarch.rpm
-automake-1.16.1-3.cm2.noarch.rpm
+automake-1.16.5-1.cm2.noarch.rpm
 bash-4.4.18-7.cm2.x86_64.rpm
 bash-debuginfo-4.4.18-7.cm2.x86_64.rpm
 bash-devel-4.4.18-7.cm2.x86_64.rpm
@@ -22,8 +22,8 @@ ca-certificates-base-20200720-20.cm2.noarch.rpm
 ca-certificates-legacy-20200720-20.cm2.noarch.rpm
 ca-certificates-shared-20200720-20.cm2.noarch.rpm
 ca-certificates-tools-20200720-20.cm2.noarch.rpm
-check-0.12.0-5.cm2.x86_64.rpm
+check-0.15.2-1.cm2.x86_64.rpm
-check-debuginfo-0.12.0-5.cm2.x86_64.rpm
+check-debuginfo-0.15.2-1.cm2.x86_64.rpm
 cmake-3.17.3-5.cm2.x86_64.rpm
 cmake-debuginfo-3.17.3-5.cm2.x86_64.rpm
 coreutils-8.32-1.cm2.x86_64.rpm

toolkit/scripts/toolchain/container/toolchain-remote-wget-list

@@ -1,5 +1,5 @@
 http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz
-http://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.xz
+http://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz
 https://ftp.gnu.org/gnu/binutils/binutils-2.37.tar.xz
 https://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.45.6.tar.gz
 https://sourceware.org/ftp/elfutils/0.185/elfutils-0.185.tar.bz2

toolkit/scripts/toolchain/container/toolchain-sha256sums

@@ -7,7 +7,7 @@ b68c15821baecae48db6a36be83c627a4def8d23979b511761d9057cd78ea336  aarch64-jdk8u1
 9541ad4bdc995af2c9d7e65bb3839be06dcc3f84f440329bf8cd4067d184db61  aarch64-jdk8u181-b13-nashorn.tar.bz2
 f4df9cc0041aae52c8c496e2fb1b9cd7e8f1213937e14104b620290936518b22  aarch64-jdk8u181-b13.tar.bz2
 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684  autoconf-2.69.tar.xz
-5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921  automake-1.16.1.tar.xz
+07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605  automake-1.16.5.tar.gz
 604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23  bash-4.4.18.tar.gz
 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e  bigreqsproto-1.1.2.tar.bz2
 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c  binutils-2.37.tar.xz

toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh

@@ -632,14 +632,14 @@ popd
 rm -rf autoconf-2.69
 touch /logs/status_autoconf_complete
 
-echo Automake-1.16.1
+echo Automake-1.16.5
-tar xf automake-1.16.1.tar.xz
+tar xf automake-1.16.5.tar.gz
-pushd automake-1.16.1
+pushd automake-1.16.5
-./configure --prefix=/usr --docdir=/usr/share/doc/automake-1.16.1
+./configure --prefix=/usr --docdir=/usr/share/doc/automake-1.16.5
 make -j$(nproc)
 make install
 popd
-rm -rf automake-1.16.1
+rm -rf automake-1.16.5
 touch /logs/status_automake_complete
 
 echo Xz-5.2.5