Revert "Revert "Merge 3.0-dev for May 2025 2 release"" (microsoft#13847)

Author: anphel31

.pipelines/prchecks/PackageBuildPRCheck.yml

@@ -11,12 +11,12 @@ parameters:
     type: object
     default:
       - name: "AMD64"
-        agentPool: "$(DEV_AMD64_Managed)"
+        agentPool: "$(DEV_AMD64_Managed_NoUMI_AZL3)"
         maxCPUs: "$(($(nproc) / 2))"
         rawToolchainCacheURL: "$(rawToolchainCacheURL_AMD64_3.0)"
         rawToolchainExpectedHash: "$(rawToolchainCacheHash_AMD64_3.0)"
       - name: "ARM64"
-        agentPool: "$(DEV_ARM64_Managed)"
+        agentPool: "$(DEV_ARM64_Managed_NoUMI_AZL3)"
         maxCPUs: "$(($(nproc) / 3))"
         rawToolchainCacheURL: "$(rawToolchainCacheURL_ARM64_3.0)"
         rawToolchainExpectedHash: "$(rawToolchainCacheHash_ARM64_3.0)"
@@ -63,6 +63,13 @@ extends:
                   ob_artifactBaseName: $(toolchainArtifactNameBase)_${{ configuration.name }}_$(System.JobAttempt)
                   ob_outputDirectory: $(Build.ArtifactStagingDirectory)
                 steps:
+                  # Making sure all pip installations are using the authorized feed.
+                  - task: PipAuthenticate@1
+                    displayName: Enable internal pip feed
+                    inputs:
+                      onlyAddExtraIndex: false
+                      artifactFeeds: "MarinerFeed"
+
                   - template: .pipelines/templates/RawToolchainDownload.yml@self
                     parameters:
                       rawToolchainCacheURL: ${{ configuration.rawToolchainCacheURL }}
@@ -120,6 +127,13 @@ extends:
                       patterns: "**/$(toolchainTarballName)"
                       targetPath: $(inputArtifactsLocation)
 
+                  # Making sure all pip installations are using the authorized feed.
+                  - task: PipAuthenticate@1
+                    displayName: Enable internal pip feed
+                    inputs:
+                      onlyAddExtraIndex: false
+                      artifactFeeds: "MarinerFeed"
+
                   - template: .pipelines/templates/PackageBuild.yml@self
                     parameters:
                       checkBuildRetries: "1"
@@ -172,6 +186,13 @@ extends:
                       patterns: "**/$(toolchainTarballName)"
                       targetPath: $(inputArtifactsLocation)
 
+                  # Making sure all pip installations are using the authorized feed.
+                  - task: PipAuthenticate@1
+                    displayName: Enable internal pip feed
+                    inputs:
+                      onlyAddExtraIndex: false
+                      artifactFeeds: "MarinerFeed"
+
                   - template: .pipelines/templates/PackageBuild.yml@self
                     parameters:
                       checkBuildRetries: "1"
@@ -216,6 +237,13 @@ extends:
                       patterns: "**/$(rpmsTarballName)"
                       targetPath: $(inputArtifactsLocation)
 
+                  # Making sure all pip installations are using the authorized feed.
+                  - task: PipAuthenticate@1
+                    displayName: Enable internal pip feed
+                    inputs:
+                      onlyAddExtraIndex: false
+                      artifactFeeds: "MarinerFeed"
+
                   - template: .pipelines/templatesWithCheckout/SodiffCheck.yml@self
                     parameters:
                       inputArtifactsFolder: $(inputArtifactsLocation)

.pipelines/templates/PackageTestResultsAnalysis.yml

@@ -32,7 +32,7 @@ parameters:
     default: "$(Agent.TempDirectory)"
 
 steps:
-  - bash: sudo tdnf install -y python3-junit-xml
+  - bash: pip3 install --user junit_xml==1.9
     retryCountOnTaskFailure: 3
     displayName: "Install Python dependencies"
 

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -861,7 +861,7 @@
                 "lua-filesystem",
                 "lua-json",
                 "lua-lpeg",
-                "lua-lunit",
+                "lua-lunitx",
                 "lua-rpm-macros",
                 "lua-term",
                 "luajit",
@@ -1973,6 +1973,7 @@
                 "rubygem-thread_order",
                 "rusers",
                 "rust-cbindgen",
+                "s-nail",
                 "samba",
                 "sanlock",
                 "sassist",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -21,7 +21,7 @@
 Summary:        A command line tool used for creating OCI Images
 Name:           buildah
 Version:        1.18.0
-Release:        29%{?dist}
+Release:        30%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -32,7 +32,7 @@ BuildRequires:  btrfs-progs-devel
 BuildRequires:  device-mapper-devel
 BuildRequires:  git
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-9%{?dist}
+BuildRequires:  glibc-static >= 2.38-10%{?dist}
 BuildRequires:  go-md2man
 BuildRequires:  go-rpm-macros
 BuildRequires:  golang
@@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon May 12 2025 Andrew Phelps <[email protected]> - 1.18.0-30
+- Bump to rebuild with updated glibc
+
 * Tue Feb 25 2025 Chris Co <[email protected]> - 1.18.0-29
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/buildah/buildah.spec

@@ -3,7 +3,7 @@ Distribution:   Azure Linux
 
 Name: catatonit
 Version: 0.1.7
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: A signal-forwarding process manager for containers
 License: GPLv3+
 URL: https://github.com/openSUSE/catatonit
@@ -13,7 +13,7 @@ BuildRequires: automake
 BuildRequires: file
 BuildRequires: gcc
 BuildRequires: git
-BuildRequires: glibc-static >= 2.38-9%{?dist}
+BuildRequires: glibc-static >= 2.38-10%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 
@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
+* Mon May 12 2025 Andrew Phelps <[email protected]> - 0.1.7-18
+- Bump to rebuild with updated glibc
+
 * Tue Feb 25 2025 Chris Co <[email protected]> - 0.1.7-17
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/catatonit/catatonit.spec

@@ -1,7 +1,7 @@
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
-Release: 19%{?dist}
+Release: 20%{?dist}
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL: http://www.dyninst.org
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
 
 # Extra requires just for the testsuite
 BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
-BuildRequires: glibc-static >= 2.38-9%{?dist}
+BuildRequires: glibc-static >= 2.38-10%{?dist}
 
 # Testsuite files should not provide/require anything
 %{?filter_setup:
@@ -194,6 +194,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Mon May 12 2025 Andrew Phelps <[email protected]> - 10.1.0-20
+- Bump to rebuild with updated glibc
+
 * Tue Feb 25 2025 Chris Co <[email protected]> - 10.1.0-19
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/dyninst/dyninst.spec

@@ -1,8 +1,11 @@
+%global _kde4_appsdir /usr/share/kde4/apps
+%global _kde4_iconsdir /usr/share/icons
+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 Name:       generic-logos
 Version:    18.0.0
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    Icons and pictures
 
 URL:        https://pagure.io/generic-logos
@@ -11,7 +14,7 @@ Source0:    https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 License:    GPLv2 and LGPLv2+
 BuildArch:  noarch
 
-Obsoletes:  redhat-logos
+Obsoletes:  redhat-logos < %{version}-%{release}
 Obsoletes:  generic-logos < 17.0.0-5
 Provides:   redhat-logos = %{version}-%{release}
 Provides:   system-logos = %{version}-%{release}
@@ -158,6 +161,10 @@ fi
 %{_datadir}/pixmaps/poweredby.png
 
 %changelog
+* Thu Apr 24 2025 Durga Jagadeesh Palli <[email protected]> - 18.0.0-12
+- Fix build error by correcting file paths: _kde4_appsdir and _kde4_iconsdir must start with "/".
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 18.0.0-11
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 

SPECS-EXTENDED/generic-logos/generic-logos.spec

@@ -6,8 +6,8 @@
             destdir="${build}"
 -           target="1.4"
 -           source="1.4"
-+           target="1.6"
-+           source="1.6"
++           target="1.8"
++           source="1.8"
             debug="${javac.debug}">
        <classpath refid="lib.path.ref"/>
        <exclude name="com/jcraft/jsch/jcraft/Compression.java"

SPECS-EXTENDED/jsch/jsch-0.1.54-sourcetarget.patch

@@ -15,7 +15,7 @@
          <attribute name="Export-Package" value='com.jcraft.jsch;version="${version}",com.jcraft.jsch.jce;version="${version}";x-internal:=true,com.jcraft.jsch.jcraft;version="${version}";x-internal:=true,com.jcraft.jsch.jgss;version="${version}";x-internal:=true'/>
 -        <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss,com.jcraft.jzlib"/>
 +        <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces,org.ietf.jgss,com.jcraft.jzlib;resolution:=optional"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
++        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.8))&quot;"/>
        </manifest>
 -      -->
      </jar>