rebasing changes onto 3.0-stable

microsoft · Jan 16, 2025 · da1106e · da1106e
1 parent b5ee18e
commit da1106e
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 28 deletions.
diff --git a/.github/workflows/quickstart_2.0.yml b/.github/workflows/quickstart_2.0.yml
@@ -18,20 +18,40 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: '2.0-stable'
+        ref: 'osamaesmail/fix_quickstart'
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20
+        go-version: 1.21
       id: go
 
     - name: Install Remaining Prerequisites
       run: |
         # Golang and docker are already installed on the agent
         sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
+        sudo apt -y install \
+            acl \
+            curl \
+            gawk \
+            genisoimage \
+            git \
+            golang-1.21-go \
+            jq \
+            make \
+            parted \
+            pigz \
+            openssl \
+            systemd \
+            qemu-utils \
+            rpm \
+            tar \
+            wget \
+            xfsprogs
+
+        # Fix go 1.21 link
+        sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
+        sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
 
     - name: Download SRPMS
       run: |
@@ -47,20 +67,40 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: '2.0-stable'
+        ref: 'osamaesmail/fix_quickstart'
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20
+        go-version: 1.21
       id: go
 
     - name: Install Remaining Prerequisites
       run: |
         # Golang and docker are already installed on the agent
         sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
+        sudo apt -y install \
+            acl \
+            curl \
+            gawk \
+            genisoimage \
+            git \
+            golang-1.21-go \
+            jq \
+            make \
+            parted \
+            pigz \
+            openssl \
+            systemd \
+            qemu-utils \
+            rpm \
+            tar \
+            wget \
+            xfsprogs
+
+        # Fix go 1.21 link
+        sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
+        sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
 
     - name: ISO Quick Start
       run: |
@@ -75,21 +115,39 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
       with:
-        ref: '2.0-stable'
+        ref: 'osamaesmail/fix_quickstart'
 
-    - name: Set up Go 1.20
+    - name: Set up Go 1.21
       uses: actions/setup-go@v5
       with:
-        go-version: 1.20
+        go-version: 1.21
       id: go
 
     - name: Install Remaining Prerequisites
       run: |
         # Golang and docker are already installed on the agent
-        sudo apt-get update
-        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
-        sudo apt -y install pigz
-
+        sudo apt -y install \
+            acl \
+            curl \
+            gawk \
+            genisoimage \
+            git \
+            golang-1.21-go \
+            jq \
+            make \
+            parted \
+            pigz \
+            openssl \
+            systemd \
+            qemu-utils \
+            rpm \
+            tar \
+            wget \
+            xfsprogs
+
+        # Fix go 1.21 link
+        sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
+        sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
     - name: VHDX Quick Start
       run: |
         pushd toolkit

diff --git a/SPECS/acl/acl.spec b/SPECS/acl/acl.spec
@@ -102,7 +102,7 @@ sed -e 's|test/misc.test||' -i test/Makemodule.am Makefile.in Makefile
 * Tue Apr 14 2020 Henry Beberman <[email protected]> - 2.2.53-4
 - Update files to include license
 
-* Fri Mar 03 2020 Jon Slobodzian <[email protected]> - 2.2.53-3
+* Tue Mar 03 2020 Jon Slobodzian <[email protected]> - 2.2.53-3
 - Replaced dead link. Fixed Source URL. Verified license.
 
 * Tue Sep 03 2019 Mateusz Malisz <[email protected]> - 2.2.53-2

diff --git a/SPECS/cf-cli/cf-cli.spec b/SPECS/cf-cli/cf-cli.spec
@@ -5,7 +5,7 @@ Summary:        The official command line client for Cloud Foundry.
 Name:           cf-cli
 # Note: Upgrading the package also warrants an upgrade in the CF_BUILD_SHA
 Version:        8.7.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        Apache-2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -15,7 +15,7 @@ Source0:        https://github.com/cloudfoundry/cli/archive/refs/tags/v%{version
 # Below is a manually created tarball, no download link.
 # We're using pre-populated Go modules from this tarball, since network is disabled during build time.
 # How to re-build this file:
-#   1. wget https://github.com/cloudfoundry/cli/archive/refs/tags/v%{version}.tar.gz -O cli-%%{version}.tar.gz
+#   1. wget https://github.com/cloudfoundry/cli/archive/refs/tags/v%%{version}.tar.gz -O cli-%%{version}.tar.gz
 #   2. tar -xf cli-%%{version}.tar.gz
 #   3. cd cli-%%{version}
 #   4. go mod vendor
@@ -33,6 +33,7 @@ Source0:        https://github.com/cloudfoundry/cli/archive/refs/tags/v%{version
 Source1:        cli-%{version}-vendor.tar.gz
 Patch0:         CVE-2023-39325.patch
 Patch1:         CVE-2024-24786.patch
+Patch2:         CVE-2024-45337.patch
 
 BuildRequires:  golang >= 1.18.3
 %global debug_package %{nil}
@@ -46,6 +47,7 @@ The official command line client for Cloud Foundry.
 tar --no-same-owner -xf %{SOURCE1}
 %patch 0 -p1
 %patch 1 -p1
+%patch 2 -p1
 
 %build
 export GOPATH=%{our_gopath}
@@ -67,6 +69,9 @@ install -p -m 755 -t %{buildroot}%{_bindir} ./out/cf
 %{_bindir}/cf
 
 %changelog
+* Fri Dec 20 2024 Aurelien Bombo <[email protected]> - 8.7.3-4
+- Add patch for CVE-2024-45337
+
 * Mon Nov 25 2024 Bala <[email protected]> - 8.7.3-3
 - Fix CVE-2024-24786
 

diff --git a/SPECS/gzip/gzip.spec b/SPECS/gzip/gzip.spec
@@ -66,7 +66,7 @@ make %{?_smp_mflags} check
 * Sat May 09 2020 Nick Samson <[email protected]> - 1.9-4
 - Added %%license line automatically
 
-* Fri Mar 03 2020 Jon Slobodzian <[email protected]> - 1.9-3
+* Tue Mar 03 2020 Jon Slobodzian <[email protected]> - 1.9-3
 - Fixed reference URL. Verified license.
 
 * Tue Sep 03 2019 Mateusz Malisz <[email protected]> - 1.9-2

diff --git a/SPECS/javapackages-tools/javapackages-tools.spec b/SPECS/javapackages-tools/javapackages-tools.spec
@@ -4,6 +4,7 @@
 # Disable automatic bytecode compilation for files in java-utils
 # https://fedoraproject.org/wiki/Packaging:Python_Appendix#Manual_byte_compilation
 %global _python_bytecompile_extra 0
+%{!?__python3: %global __python3 /usr/bin/python3}
 %global python_interpreter %{__python3}
 %global rpmmacrodir %{_rpmconfigdir}/macros.d
 Summary:        Macros and scripts for Java packaging support

diff --git a/SPECS/libXcursor/libXcursor.spec b/SPECS/libXcursor/libXcursor.spec
@@ -77,7 +77,7 @@ rm -r %{buildroot}%{_mandir}/man3
 %{_libdir}/pkgconfig/xcursor.pc
 
 %changelog
-* Thu Feb 07 2024 Alberto David Perez Guevara <[email protected]> - 1.2.1-1
+* Wed Feb 07 2024 Alberto David Perez Guevara <[email protected]> - 1.2.1-1
 - Update package libXcursor to version 1.2.1
 
 * Fri Apr 22 2022 Olivia Crain <[email protected]> - 1.2.0-5

diff --git a/SPECS/m2crypto/m2crypto.spec b/SPECS/m2crypto/m2crypto.spec
@@ -97,7 +97,7 @@ pip3 install parameterized
 * Fri Mar 13 2020 Paul Monson <[email protected]> - 0.35.2-1
 - Update to version 0.35.2. License verified.
 
-* Fri Mar 03 2020 Jon Slobodzian <[email protected]> - 0.30.1-4
+* Tue Mar 03 2020 Jon Slobodzian <[email protected]> - 0.30.1-4
 - Replaced incorrect URL link (removed mismatched version specifier). Fixed Source URL. Verified license.
 
 * Tue Sep 03 2019 Mateusz Malisz <[email protected]> - 0.30.1-3

diff --git a/SPECS/nss-altfiles/nss-altfiles.spec b/SPECS/nss-altfiles/nss-altfiles.spec
@@ -7,7 +7,7 @@ URL:            https://github.com/aperezdc/nss-altfiles
 Group:          Applications/System
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
-#Source0:       https://github.com/aperezdc/nss-altfiles/archive/v%{version}.tar.gz
+#Source0:       https://github.com/aperezdc/nss-altfiles/archive/v%%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  glibc-devel
 

diff --git a/SPECS/ntopng/ntopng.spec b/SPECS/ntopng/ntopng.spec
@@ -8,9 +8,9 @@ Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Group:          Applications/System
 URL:            https://www.ntop.org/
-#Source0:       https://github.com/ntop/ntopng/archive/%{version}.tar.gz
+#Source0:       https://github.com/ntop/ntopng/archive/%%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.gz
-#Source1:       https://github.com/ntop/nDPI/archive/%{nDPIver}.tar.gz
+#Source1:       https://github.com/ntop/nDPI/archive/%%{nDPIver}.tar.gz
 Source1:        nDPI-%{nDPIver}.tar.gz
 Patch1:         CVE-2021-45985.patch
 Patch2:         CVE-2022-28805.patch

diff --git a/SPECS/protobuf-c/protobuf-c.spec b/SPECS/protobuf-c/protobuf-c.spec
@@ -90,7 +90,7 @@ find %{buildroot} -type f -name "libprotobuf-c.a" -delete -print
 * Sat May 09 2020 Nick Samson <[email protected]> - 1.3.1-4
 - Added %%license line automatically
 
-* Fri Mar 03 2020 Jon Slobodzian <[email protected]> - 1.20.2-3
+* Tue Mar 03 2020 Jon Slobodzian <[email protected]> - 1.20.2-3
 - Fixed Source URL. Verified license. Fixed URL. Fixed Source URL.
 
 * Tue Sep 03 2019 Mateusz Malisz <[email protected]> - 1.3.1-2

diff --git a/SPECS/python-xlrd/python-xlrd.spec b/SPECS/python-xlrd/python-xlrd.spec
@@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/runxlrd.py* \
 %attr(755,root,root) %{_bindir}/*
 
 %changelog
-* Fri Jun 08 2024 Andrew Phelps <[email protected]> - 2.0.1-17
+* Fri Jun 07 2024 Andrew Phelps <[email protected]> - 2.0.1-17
 - Remove duplicate files using python3_other_sitelib
 
 * Tue Jun 04 2024 Alberto David Perez Guevara <[email protected]> - 2.0.1-16