Merge branch 'main' into 2.0

Author: jslobodzian

.github/workflows/go-test-coverage.yml

@@ -12,7 +12,7 @@ on:
 permissions: read-all
 
 env:
-  EXPECTED_GO_VERSION: "1.20"
+  EXPECTED_GO_VERSION: "1.21"
 
 jobs:
   build:

.pipelines/prchecks/PackageBuildPRCheck.yml

@@ -22,6 +22,10 @@ parameters:
         maxCPUs: "$(($(nproc) / 3))"
         rawToolchainCacheURL: "$(rawToolchainCacheURL_ARM64)"
         rawToolchainExpectedHash: "65de43b3bdcfdaac71df1f11fd1f830a8109b1eb9d7cb6cbc2e2d0e929d0ef76"
+  - name: debug
+    type: boolean
+    default: false
+    displayName: "Run in debug mode"
 
 resources:
   repositories:
@@ -37,7 +41,7 @@ variables:
   - name: toolchainArtifactNameBase
     value: Toolchain
   - name: system.debug
-    value: 'true'
+    value: '${{ parameters.debug }}'
 
 extends:
   template: v2/OneBranch.NonOfficial.CrossPlat.yml@templates
@@ -103,6 +107,7 @@ extends:
                 steps:
                   - template: .pipelines/templates/PackageBuild.yml@self
                     parameters:
+                      checkBuildRetries: "1"
                       customToolchainArtifactName: $(toolchainArtifactName)
                       isCheckBuild: true
                       isQuickRebuildPackages: true

.pipelines/templates/PackageBuild.yml

@@ -6,6 +6,10 @@ parameters:
     type: string
     default: "$(Build.SourcesDirectory)"
 
+  - name: checkBuildRetries
+    type: string
+    default: ""
+
   - name: concurrentPackageBuilds
     type: number
     default: 12
@@ -22,10 +26,6 @@ parameters:
     type: string
     default: ""
 
-  - name: testRerunList
-    type: string
-    default: ""
-
   - name: failOnTestFailures
     type: boolean
     default: true
@@ -125,6 +125,10 @@ parameters:
     type: string
     default: ""
 
+  - name: testRerunList
+    type: string
+    default: ""
+
   - name: testSuiteName
     type: string
     default: "Package test"
@@ -176,6 +180,10 @@ steps:
         displayName: "Populate cache RPMs"
 
   - script: |
+      if [[ -n "${{ parameters.checkBuildRetries }}" ]]; then
+        check_build_retries_arg="CHECK_BUILD_RETRIES=${{ parameters.checkBuildRetries }}"
+      fi
+
       if [[ ${{ parameters.isDeltaBuild }} == "true" ]]; then
         delta_fetch_arg="DELTA_FETCH=y"
       elif [[ ${{ parameters.isDeltaBuild }} == "false" ]]; then
@@ -217,6 +225,7 @@ steps:
         SPECS_DIR="${{ parameters.buildRepoRoot }}/${{ parameters.specsFolderPath }}" \
         SRPM_PACK_LIST="${{ parameters.srpmPackList }}" \
         TEST_RERUN_LIST="${{ parameters.testRerunList }}" \
+        $check_build_retries_arg \
         $delta_fetch_arg \
         $max_cascading_rebuilds_arg \
         $quick_rebuild_packages_arg \

SPECS-EXTENDED/js-jquery/CVE-2019-20149.patch

@@ -0,0 +1,27 @@
+From 638d1c5d1c33b4383a4e307f5bcb8b366dd36071 Mon Sep 17 00:00:00 2001
+From: Amrita Kohli <[email protected]>
+Date: Fri, 9 Aug 2024 16:19:34 +0000
+Subject: [PATCH] Modified upstream patch from PR https://github.com/jonschlinkert/kind-of/pull/31 with commit id
+ 975c13a7cfaf25d811475823824af3a9c04b0ba8 for CVE-2019-20149. Modified by:
+ Amrita Kohli <[email protected]>
+
+---
+ node_modules/kind-of/index.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/node_modules/kind-of/index.js b/node_modules/kind-of/index.js
+index dfa799b7..bdcfdc85 100644
+--- a/node_modules/kind-of/index.js
++++ b/node_modules/kind-of/index.js
+@@ -66,7 +66,7 @@ module.exports = function kindOf(val) {
+ };
+ 
+ function ctorName(val) {
+-  return typeof val.constructor === 'function' ? val.constructor.name : null;
++  return val.constructor && typeof val.constructor === 'function' ? val.constructor.name : null;
+ }
+ 
+ function isArray(val) {
+-- 
+2.34.1
+

SPECS-EXTENDED/js-jquery/js-jquery.spec

@@ -2,7 +2,7 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Name:           js-jquery
 Version:        3.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        JavaScript DOM manipulation, event handling, and AJAX library
 BuildArch:      noarch
 
@@ -18,6 +18,8 @@ Source1:        jquery_%{version}_node_modules.tar.gz
 
 # disable gzip-js during build
 Patch1:         %{name}-disable-gzip-js.patch
+# Patch for CVE-2019-20149 in kind-of package https://github.com/jonschlinkert/kind-of/pull/31
+Patch2:         CVE-2019-20149.patch
 
 
 BuildRequires:  web-assets-devel
@@ -45,14 +47,15 @@ browsers. With a combination of versatility and extensibility, jQuery has
 changed the way that millions of people write JavaScript.
 
 %prep
-%autosetup -n jquery-%{version} -v -p1
+%setup -n jquery-%{version}
+%patch1 -p1
 
 #remove precompiled stuff
 rm -rf dist/*
 
 # Install the cached node modules
 tar xf %{SOURCE1}
-
+%patch2 -p1
 
 %build
 ./node_modules/grunt-cli/bin/grunt -v 'build:*:*' uglify
@@ -83,6 +86,10 @@ ln -s %{version} %{installdir}/%{ver_x}.%{ver_y}
 
 
 %changelog
+* Fri Aug 9 2024 Amrita Kohli <[email protected]> - 3.5.0-4
+- Patch CVE-2019-20149 in kind-of package.
+- License verified
+
 * Mon Jun 14 2021 Thomas Crain <[email protected]> - 3.5.0-3
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Add explicit build-time dependency on nodejs-devel

SPECS-EXTENDED/mosh/mosh.signatures.json

@@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "mosh-1.4.0.tar.gz": "872e4b134e5df29c8933dff12350785054d2fd2839b5ae6b5587b14db1465ddd"
+ }
+}

SPECS-EXTENDED/mosh/mosh.spec

@@ -0,0 +1,226 @@
+Name:           mosh
+Version:        1.4.0
+Release:        6%{?dist}
+Summary:        Mobile shell that supports roaming and intelligent local echo
+Vendor:         Microsoft Corporation
+Distribution:   Mariner
+
+License:        GPLv3+
+URL:            https://mosh.mit.edu/
+Source0:        https://github.com/mobile-shell/mosh/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires:  libutempter-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  perl-diagnostics
+BuildRequires:  perl-generators
+BuildRequires:  protobuf-compiler
+BuildRequires:  protobuf-devel
+BuildRequires:  zlib-devel
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  make
+Requires:       openssh-clients
+Requires:       openssl
+Requires:       perl-IO-Socket-IP
+
+%description
+Mosh is a remote terminal application that supports:
+  - intermittent network connectivity,
+  - roaming to different IP address without dropping the connection, and
+  - intelligent local echo and line editing to reduce the effects
+    of "network lag" on high-latency connections.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure --disable-silent-rules CC=gcc CXX=g++
+%make_build
+
+
+%install
+%make_install
+
+
+%files
+%doc README.md ChangeLog
+%license COPYING
+%{_bindir}/mosh
+%{_bindir}/mosh-client
+%{_bindir}/mosh-server
+%{_mandir}/man1/mosh.1.gz
+%{_mandir}/man1/mosh-client.1.gz
+%{_mandir}/man1/mosh-server.1.gz
+
+
+%changelog
+* Sun Aug 11 2024 Chris Co <[email protected]> - 1.4.0-6
+- Initial CBL-Mariner import from Fedora 40 (license: MIT)
+- License verified
+
+* Thu Jan 25 2024 Fedora Release Engineering <[email protected]> - 1.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <[email protected]> - 1.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Oct 26 2022 Alex Chernyakhovsky <[email protected]> - 1.4.0-1
+- Update to mosh 1.4.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <[email protected]> - 1.3.2-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Apr 05 2022 Michal Josef Špaček <[email protected]> - 1.3.2-14
+- Remove dependency to obsolete IO::Socket::INET6
+
+* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 1.3.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Nov 06 2021 Adrian Reber <[email protected]> - 1.3.2-12
+- Rebuilt for protobuf 3.19.0
+
+* Tue Oct 26 2021 Adrian Reber <[email protected]> - 1.3.2-11
+- Rebuilt for protobuf 3.18.1
+
+* Tue Sep 14 2021 Sahana Prasad <[email protected]> - 1.3.2-10
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 1.3.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 1.3.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 14 08:32:44 CET 2021 Adrian Reber <[email protected]> - 1.3.2-7
+- Rebuilt for protobuf 3.14
+
+* Thu Sep 24 2020 Adrian Reber <[email protected]> - 1.3.2-6
+- Rebuilt for protobuf 3.13
+
+* Tue Jul 28 2020 Fedora Release Engineering <[email protected]> - 1.3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jun 14 2020 Adrian Reber <[email protected]> - 1.3.2-4
+- Rebuilt for protobuf 3.12
+
+* Wed Jan 29 2020 Fedora Release Engineering <[email protected]> - 1.3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Dec 19 2019 Orion Poplawski <[email protected]> - 1.3.2-2
+- Rebuild for protobuf 3.11
+
+* Sun Sep 22 2019 Alex Chernyakhovsky <[email protected]> - 1.3.2-1
+- Update to mosh 1.3.2
+
+* Thu Jul 25 2019 Fedora Release Engineering <[email protected]> - 1.3.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <[email protected]> - 1.3.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Nov 21 2018 Igor Gnatenko <[email protected]> - 1.3.0-9
+- Rebuild for protobuf 3.6
+
+* Fri Jul 13 2018 Fedora Release Engineering <[email protected]> - 1.3.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <[email protected]> - 1.3.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Nov 29 2017 Igor Gnatenko <[email protected]> - 1.3.0-6
+- Rebuild for protobuf 3.5
+
+* Mon Nov 13 2017 Igor Gnatenko <[email protected]> - 1.3.0-5
+- Rebuild for protobuf 3.4
+
+* Thu Aug 03 2017 Fedora Release Engineering <[email protected]> - 1.3.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <[email protected]> - 1.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 13 2017 Orion Poplawski <[email protected]> - 1.3.0-2
+- Rebuild for protobuf 3.3.1
+
+* Sun Mar 26 2017 Alex Chernyakhovsky <[email protected]> - 1.3.0-1
+- Update to mosh 1.3.0
+
+* Fri Feb 10 2017 Fedora Release Engineering <[email protected]> - 1.2.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 26 2017 Orion Poplawski <[email protected]> - 1.2.6-3
+- Rebuild for protobuf 3.2.0
+
+* Sat Nov 19 2016 Orion Poplawski <[email protected]> - 1.2.6-2
+- Rebuild for protobuf 3.1.0
+
+* Wed Aug 10 2016 Alex Chernyakhovsky <[email protected]> - 1.2.6-1
+- Update to mosh 1.2.6
+
+* Mon Feb 08 2016 Ralf Corsépius <[email protected]> - 1.2.5-3
+- Let package honor RPM_OPT_FLAGS (Fix F24FTBFS).
+- Add %%license.
+- Make building verbose.
+
+* Thu Feb 04 2016 Fedora Release Engineering <[email protected]> - 1.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Aug  6 2015 Alex Chernyakhovsky <[email protected]> - 1.2.5-1
+- Update to mosh 1.2.5
+
+* Wed Jun 17 2015 Fedora Release Engineering <[email protected]> - 1.2.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Apr 26 2015 Alex Chernyakhovsky <[email protected]> - 1.2.4-6
+- Rebuild for protobuf version bump.
+
+* Sun Aug 17 2014 Fedora Release Engineering <[email protected]> - 1.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <[email protected]> - 1.2.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <[email protected]> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <[email protected]> - 1.2.4-2
+- Perl 5.18 rebuild
+
+* Wed Mar 27 2013 Alexander Chernyakhovsky <[email protected]> - 1.2.4-1
+- Update to mosh 1.2.4
+
+* Sun Mar 10 2013 Alexander Chernyakhovsky <[email protected]> - 1.2.3-3
+- Rebuilt for Protobuf API change from 2.4.1 to 2.5.0
+
+* Thu Feb 14 2013 Fedora Release Engineering <[email protected]> - 1.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Oct 19 2012 Alexander Chernyakhovsky <[email protected]> - 1.2.3-1
+- Update to mosh 1.2.3
+
+* Fri Jul 20 2012 Fedora Release Engineering <[email protected]> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jun 13 2012 Alexander Chernyakhovsky <[email protected]> - 1.2.2-1
+- Update to mosh 1.2.2
+
+* Sat Apr 28 2012 Alexander Chernyakhovsky <[email protected]> - 1.2-2
+- Add -g and -O2 CFLAGS
+
+* Fri Apr 27 2012 Alexander Chernyakhovsky <[email protected]> - 1.2-1
+- Update to mosh 1.2.
+
+* Mon Mar 26 2012 Alexander Chernyakhovsky <[email protected]> - 1.1.1-1
+- Update to mosh 1.1.1.
+
+* Wed Mar 21 2012 Alexander Chernyakhovsky <[email protected]> - 1.1-1
+- Initial packaging for mosh.