Merge branch '3.0-dev' into anphel/3-oct-2025-snap

Author: anphel31

.github/workflows/check-circular-deps.yml

@@ -19,9 +19,25 @@ jobs:
       - name: Workflow trigger checkout
         uses: actions/checkout@v4
 
+      - name: Determine DAILY_BUILD_ID value
+        run: |
+          echo "GitHub 'base_ref': ${{ github.base_ref }}"
+          echo "GitHub 'ref': ${{ github.ref }}"
+
+          daily_build_id=
+          if [[ "${{ github.base_ref }}" == fasttrack/* || "${{ github.ref }}" == refs/heads/fasttrack/* ]]; then
+            echo "Building against a fast-track branch. Will use PMC RPM repo for reference."
+          else
+            echo "Not building against a fast-track branch. Will use daily build LKG RPM repo for reference."
+            daily_build_id=lkg
+          fi
+
+          echo "DAILY_BUILD_ID is set to '$daily_build_id'"
+          echo "daily_build_id=$daily_build_id" >> $GITHUB_ENV
+
       - name: Check for circular dependencies
         run: |
           echo "Checking for circular dependency loops..."
           # Setup the toolchain using the LKG daily build, and then make the full package graph.
           # This will fail if any circular dependency loops are detected in the core SPECs.
-          sudo make -C toolkit graph REBUILD_TOOLS=y DAILY_BUILD_ID=lkg -j30
+          sudo make -C toolkit graph REBUILD_TOOLS=y DAILY_BUILD_ID="${{ env.daily_build_id }}" -j30

.pipelines/containerSourceData/scripts/PublishContainers.sh

@@ -454,16 +454,29 @@ do
                 "$azure_linux_version" \
                 "$ARCHITECTURE_TO_BUILD"
 
-            if $IS_HCI_GOLDEN_IMAGE; then
+            if $IS_HCI_GOLDEN_IMAGE || [[ "$container_type" == "imagecustomizer" ]]; then
                 # create multi-arch tag with major, minor, and patch version
                 # e.g. azurelinuxpreview.azurecr.io/base/kubevirt/cdi-controller:1.55.0
+                # e.g. azurelinuxpreview.azurecr.io/base/imagecustomizer:1.0.0
                 create_multi_arch_tags \
                     "$image_name_with_noarch" \
                     "$container_name" \
                     "$package_version" \
                     "$azure_linux_version" \
                     "$ARCHITECTURE_TO_BUILD"
             fi
+
+            # Special handling for imagecustomizer: create latest tag
+            if [[ "$container_type" == "imagecustomizer" ]]; then
+                # Create 'latest' tag pointing to the current version
+                echo "Creating 'latest' tag for imagecustomizer"
+                create_multi_arch_tags \
+                    "$image_name_with_noarch" \
+                    "$container_name" \
+                    "latest" \
+                    "$azure_linux_version" \
+                    "$ARCHITECTURE_TO_BUILD"
+            fi
         fi
     done < "$PUBLISHED_CONTAINER_FILE"
 done

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

@@ -839,7 +839,6 @@
                 "libXtst",
                 "libXv",
                 "libXxf86vm",
-                "libyami",
                 "libyang",
                 "libyubikey",
                 "libzip",
@@ -1852,6 +1851,7 @@
                 "python-sphinxcontrib-qthelp",
                 "python-sphinxcontrib-serializinghtml",
                 "python-sphinxygen",
+                "python-spnego",
                 "python-sqlalchemy",
                 "python-suds",
                 "python-systemd",
@@ -1875,7 +1875,6 @@
                 "python-typing-extensions",
                 "python-typogrify",
                 "python-uamqp",
-                "python-unittest2",
                 "python-uritemplate",
                 "python-urwid",
                 "python-uswid",
@@ -2307,6 +2306,7 @@
                 "libconfini",
                 "libconfuse",
                 "libgdiplus",
+                "libimobiledevice-glue",
                 "libmaxminddb",
                 "libmetalink",
                 "libsafec",
@@ -2475,23 +2475,37 @@
             "license": "[ASL 2.0 License and spec specific licenses](http://www.apache.org/licenses/LICENSE-2.0)",
             "specs": [
                 "fwctl",
+                "fwctl-hwe",
+                "fwctl-hwe-signed",
                 "fwctl-signed",
                 "ibarr",
                 "ibsim",
                 "iser",
+                "iser-hwe",
+                "iser-hwe-signed",
                 "iser-signed",
                 "isert",
+                "isert-hwe",
+                "isert-hwe-signed",
                 "isert-signed",
                 "knem",
+                "knem-hwe",
+                "knem-hwe-modules-signed",
                 "knem-modules-signed",
                 "libnvidia-container",
                 "mft_kernel",
+                "mft_kernel-hwe",
+                "mft_kernel-hwe-signed",
                 "mft_kernel-signed",
                 "mlnx-ethtool",
                 "mlnx-iproute2",
                 "mlnx-nfsrdma",
+                "mlnx-nfsrdma-hwe",
+                "mlnx-nfsrdma-hwe-signed",
                 "mlnx-nfsrdma-signed",
                 "mlnx-ofa_kernel",
+                "mlnx-ofa_kernel-hwe",
+                "mlnx-ofa_kernel-hwe-modules-signed",
                 "mlnx-ofa_kernel-modules-signed",
                 "mlnx-tools",
                 "mlx-bootctl",
@@ -2504,8 +2518,12 @@
                 "rshim",
                 "sockperf",
                 "srp",
+                "srp-hwe",
+                "srp-hwe-signed",
                 "srp-signed",
                 "xpmem",
+                "xpmem-hwe",
+                "xpmem-hwe-modules-signed",
                 "xpmem-lib",
                 "xpmem-modules-signed"
             ]
@@ -2661,6 +2679,7 @@
                 "alsa-lib",
                 "alsa-utils",
                 "ansible",
+                "apparmor",
                 "apr",
                 "apr-util",
                 "asciidoc",

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

@@ -3,7 +3,7 @@
 Summary:        Apache Commons Pool 2.x series
 Name:           apache-commons-pool2
 Version:        2.4.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        Apache-2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -12,12 +12,11 @@ URL:            https://commons.apache.org/proper/commons-pool/
 Source0:        https://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Patch0:         jakarta-commons-pool-build.patch
 BuildRequires:  ant
-BuildRequires:  ant-junit
 BuildRequires:  cglib
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local-bootstrap
-BuildRequires:  xml-commons-apis
+BuildRequires:  javapackages-local-bootstrap >= 6
+BuildRequires:  junit
 Requires:       cglib
 Provides:       %{short_name} = %{version}
 Obsoletes:      %{short_name} < %{version}
@@ -44,55 +43,46 @@ This package contains the javadoc documentation for the Apache Commons
 Pool 2.x Package.
 
 %prep
-%autosetup -p0 -n %{short_name}-%{version}-src
+%setup -q -n %{short_name}-%{version}-src
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-
-%pom_remove_parent .
-%pom_xpath_inject "pom:project" "<groupId>org.apache.commons</groupId>" .
+find . -name "*.jar" -print -delete
+%patch -P 0
 
 %build
-export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-util)
-%{ant} -Dbuild.sysclasspath=first clean dist
+echo "cglib.jar=$(build-classpath cglib)" >> build.properties
+ant \
+    -Djavac.target.version=8 -Djavac.src.version=8 \
+    -Djava.io.tmpdir=. clean dist
 
 %install
 # jars
 install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
-%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-%check
-export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tree objectweb-asm/asm-util)
-%{ant} -Dbuild.sysclasspath=first test
-
-%files
+%files -f .mfiles
 %license LICENSE.txt
 %doc README.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{short_name}.jar
-%{_javadir}/%{short_name}-%{version}.jar
-%{_mavenpomdir}/%{name}-%{version}.pom
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files javadoc
 %doc %{_javadocdir}/%{name}
+%exclude /usr/share/javadoc/%{name}/legal
 
 %changelog
+* Wed May 28 2025 Durga Jagadeesh Palli <[email protected]> - 2.4.2-8
+- Initial Azure Linux import from openSUSE Tumbleweed (license: same as "License" tag).
+- License verified
+
 * Wed Nov 09 2022 Sumedh Sharma <[email protected]> - 2.4.2-7
 - Enable check section
 - License verified
@@ -107,32 +97,25 @@ export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tre
 * Mon Mar 25 2019 Fridrich Strba <[email protected]>
 - Remove pom parent, since we don't use it when not building with
   maven
-
 * Thu Dec 13 2018 Fridrich Strba <[email protected]>
 - Add maven pom file
-
 * Tue May 15 2018 [email protected]
 - Build with source and target 8 to prepare for a possible removal
   of 1.6 compatibility
 - Run fdupes on documentation
-
 * Thu Sep 14 2017 [email protected]
 - Fix javadoc build
-
 * Thu Sep 29 2016 [email protected]
 - Version update to 2.4.2 release from pool2:
   * rename to latest 2.x pool series for dbcp and other packages
-
 * Thu Sep 29 2016 [email protected]
 - Rename from jakarta-commons-pool to apache-commons-pool
 - Version update to 1.6:
   * drop the tomcat5 package, we need pool2 to work with new tomcat
   * Last and final from the pool1 series, new pool2 was introduced
     for future developement.
-
 * Mon Sep  9 2013 [email protected]
 - Move from jpackage-utils to javapackage-tools
-
 * Thu Mar 13 2008 [email protected]
 - merged with jpackage 1.7
 - update to 1.3
@@ -147,21 +130,15 @@ export CLASSPATH=%(build-classpath cglib objectweb-asm/asm objectweb-asm/asm-tre
 - provides and obsoletes of main package contains the version
 - new tomcat5 subpackage
 - new manual subpackage (build only with maven)
-
 * Fri Sep 15 2006 [email protected]
 - set source=1.4 for java
-
 * Wed Jan 25 2006 [email protected]
 - converted neededforbuild to BuildRequires
-
 * Thu Jul 28 2005 [email protected]
 - Adjustments in the spec file.
-
 * Mon Jul 18 2005 [email protected]
 - Current version 1.2 from JPackage.org
-
 * Thu Sep 16 2004 [email protected]
 - Fix prerequires of javadoc subpackage
-
 * Thu Sep  2 2004 [email protected]
 - Initial package created with version 1.2 (JPackage 1.5)