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

Author: anphel31

.pipelines/containerSourceData/imagecustomizer/Dockerfile-imagecustomizer

@@ -25,6 +25,6 @@ RUN tdnf update -y && \
 
 # Create virtual environment and install Python dependencies for telemetry
 RUN python3 -m venv /opt/telemetry-venv
-RUN /opt/telemetry-venv/bin/pip install --no-cache-dir -r /imagecustomizer-telemetry-requirements.txt
+RUN /opt/telemetry-venv/bin/pip install --no-cache-dir -r /usr/lib/imagecustomizer/telemetry-requirements.txt
 
-ENTRYPOINT ["/usr/local/bin/imagecustomizer-entrypoint.sh"]
+ENTRYPOINT ["/usr/lib/imagecustomizer/entrypoint.sh"]

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

@@ -188,7 +188,6 @@
                 "dotconf",
                 "dovecot",
                 "dpdk",
-                "dpkg",
                 "driverctl",
                 "dropwatch",
                 "drpm",
@@ -274,7 +273,6 @@
                 "geolite2",
                 "geos",
                 "gfs2-utils",
-                "ghc-srpm-macros",
                 "gi-docgen",
                 "giflib",
                 "gl-manpages",
@@ -1786,7 +1784,6 @@
                 "python-productmd",
                 "python-prometheus_client",
                 "python-ptyprocess",
-                "python-pycares",
                 "python-pycosat",
                 "python-pydbus",
                 "python-pymongo",
@@ -1902,6 +1899,7 @@
                 "python-zstandard",
                 "python-zstd",
                 "python3-mallard-ducktype",
+                "python3-pycares",
                 "python3-pytest-asyncio",
                 "python3-typed_ast",
                 "pyusb",
@@ -1970,6 +1968,7 @@
                 "rubygem-rspec-expectations",
                 "rubygem-rspec-mocks",
                 "rubygem-rspec-support",
+                "rubygem-scanf",
                 "rubygem-sys-filesystem",
                 "rubygem-thread_order",
                 "rusers",
@@ -2192,6 +2191,7 @@
                 "xorg-x11-xinit",
                 "xorg-x11-xkb-utils",
                 "xorg-x11-xtrans-devel",
+                "xpp3",
                 "xrestop",
                 "xterm",
                 "xxhash",
@@ -2257,7 +2257,7 @@
                 "cf-cli",
                 "check-restart",
                 "clamav",
-                "cloud-hypervisor-cvm",
+                "cloud-hypervisor",
                 "cloud-provider-kubevirt",
                 "cmake-fedora",
                 "containerd2",
@@ -2295,6 +2295,7 @@
                 "keda",
                 "keras",
                 "kernel-64k-signed",
+                "kernel-hwe-signed",
                 "kernel-mshv-signed",
                 "kernel-signed",
                 "kernel-uki",
@@ -2650,7 +2651,6 @@
                 "xmlrpc-c",
                 "xmlunit",
                 "xpp2",
-                "xpp3",
                 "xz-java"
             ]
         },
@@ -2766,6 +2766,7 @@
                 "gobject-introspection",
                 "golang",
                 "golang-1.23",
+                "golang-1.24",
                 "gperf",
                 "gperftools",
                 "gpgme",
@@ -2809,6 +2810,8 @@
                 "kernel",
                 "kernel-64k",
                 "kernel-headers",
+                "kernel-hwe",
+                "kernel-hwe-headers",
                 "kernel-ipe",
                 "kernel-lpg-innovate",
                 "kernel-mshv",

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

@@ -68,7 +68,7 @@ ExcludeArch: i686
 Summary:          389 Directory Server (%{variant})
 Name:             389-ds-base
 Version:          3.1.1
-Release:          6%{?dist}
+Release:          7%{?dist}
 License:          GPL-3.0-or-later AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0
 URL:              https://www.port389.org
 Vendor:           Microsoft Corporation
@@ -732,6 +732,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Aug 08 2025 Azure Linux Security Servicing Account <[email protected]> - 3.1.1-7
+- Bump release to rebuild with rust
+
 * Mon Jul 21 2025 Jyoti Kanase <[email protected]> - 3.1.1-6
 - Bump release to rebuild with rust
 

SPECS-EXTENDED/389-ds-base/389-ds-base.spec

@@ -28,6 +28,7 @@ Group:          Development/Libraries/Java
 URL:            https://args4j.kohsuke.org
 Source0:        https://github.com/kohsuke/%{name}/archive/%{name}-site-%{version}.tar.gz
 Source1:        %{name}-build.tar.xz
+Patch0:         change-source-option-to-1.8.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel
@@ -65,7 +66,7 @@ Group:          Documentation/HTML
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{name}-site-%{version} -a 1
+%autosetup -a1 -p1 -n %{name}-%{name}-site-%{version}
 
 # removing classpath addition
 sed -i 's/<addClasspath>true/<addClasspath>false/g' %{name}-tools/pom.xml
@@ -136,6 +137,10 @@ cp -r %{name}-tools/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{nam
 %license %{name}/LICENSE.txt
 
 %changelog
+* Fri Jul 18 2025 Sumit Jena <[email protected]> - 2.33.3
+- Patch to change source and target options as build fix
+- License verified
+
 * Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 2.33-2
 - Converting the 'Release' tag to the '[number].[distribution]' format.
 

SPECS-EXTENDED/args4j/args4j.spec

@@ -0,0 +1,25 @@
+From e9080c1382570c9b028b60210ad0779a10a82ab2 Mon Sep 17 00:00:00 2001
+From: SumitJenaHCL <[email protected]>
+Date: Thu, 10 Jul 2025 05:15:48 +0000
+Subject: [PATCH] change source option to 1.8
+
+---
+ common.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common.xml b/common.xml
+index 37d36f4..d3486a0 100644
+--- a/common.xml
++++ b/common.xml
+@@ -7,7 +7,7 @@
+   <property name="project.groupId" value="args4j"/>
+   <property name="bundle.version" value="${project.version}.0"/>
+ 
+-  <property name="compiler.source" value="1.6"/>
++  <property name="compiler.source" value="1.8"/>
+   <property name="compiler.target" value="${compiler.source}"/>
+ 
+ </project>
+-- 
+2.45.2
+

SPECS-EXTENDED/args4j/change-source-option-to-1.8.patch

@@ -21,7 +21,7 @@
 Summary:        A command line tool used for creating OCI Images
 Name:           buildah
 Version:        1.18.0
-Release:        31%{?dist}
+Release:        32%{?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-11%{?dist}
+BuildRequires:  glibc-static >= 2.38-12%{?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 Aug 25 2025 Andrew Phelps <[email protected]> - 1.18.0-32
+- Bump to rebuild with updated glibc
+
 * Thu May 22 2025 Kanishk Bansal <[email protected]> - 1.18.0-31
 - 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: 19%{?dist}
+Release: 20%{?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-11%{?dist}
+BuildRequires: glibc-static >= 2.38-12%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 
@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
+* Mon Aug 25 2025 Andrew Phelps <[email protected]> - 0.1.7-20
+- Bump to rebuild with updated glibc
+
 * Thu May 22 2025 Kanishk Bansal <[email protected]> - 0.1.7-19
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/catatonit/catatonit.spec

@@ -0,0 +1,73 @@
+diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h
+index 044e72b..7b3108f 100644
+--- a/include/dbus-c++/types.h
++++ b/include/dbus-c++/types.h
+@@ -89,13 +89,7 @@ public:
+   }
+ 
+   template <typename T>
+-  operator T() const
+-  {
+-    T cast;
+-    MessageIter ri = _msg.reader();
+-    ri >> cast;
+-    return cast;
+-  }
++  operator T() const;
+ 
+ private:
+ 
+@@ -316,7 +310,7 @@ struct type< Struct<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
+   }
+ };
+ 
+-} /* namespace DBus */
++extern DXXAPI DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Variant &val);
+ 
+ inline DBus::MessageIter &operator << (DBus::MessageIter &iter, const DBus::Invalid &)
+ {
+@@ -551,6 +545,8 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Signature
+   return ++iter;
+ }
+ 
++extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val);
++
+ template<typename E>
+ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, std::vector<E>& val)
+ {
+@@ -644,7 +640,16 @@ inline DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Struct<T1,
+   return ++iter;
+ }
+ 
+-extern DXXAPI DBus::MessageIter &operator >> (DBus::MessageIter &iter, DBus::Variant &val);
++template <typename T>
++inline DBus::Variant::operator T() const
++{
++  T cast;
++  DBus::MessageIter ri = _msg.reader();
++  ri >> cast;
++  return cast;
++}
++
++} /* namespace DBus */
+ 
+ #endif//__DBUSXX_TYPES_H
+ 
+diff --git a/src/types.cpp b/src/types.cpp
+index d414a3e..70f9ac0 100644
+--- a/src/types.cpp
++++ b/src/types.cpp
+@@ -34,7 +34,7 @@
+ #include "message_p.h"
+ #include "internalerror.h"
+ 
+-using namespace DBus;
++namespace DBus {
+ 
+ Variant::Variant()
+   : _msg(CallMessage()) // dummy message used as temporary storage for variant data
+@@ -104,3 +104,4 @@ MessageIter &operator >> (MessageIter &iter, Variant &val)
+   return ++iter;
+ }
+ 
++} /* namespace DBus */

SPECS-EXTENDED/dbus-c++/dbus-c++-template-operators.patch

@@ -2,7 +2,7 @@
 
 Name:          dbus-c++
 Version:       0.9.0
-Release:       23%{?dist}
+Release:       24%{?dist}
 Summary:       Native C++ bindings for D-Bus
 
 License:       LGPLv2+
@@ -21,6 +21,7 @@ Patch3: dbus-c++-macro_collision.patch
 Patch4: dbus-c++-threading.patch
 # https://sourceforge.net/p/dbus-cplusplus/patches/19/
 Patch5: dbus-c++-writechar.patch
+Patch6: dbus-c++-template-operators.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -68,6 +69,7 @@ sed -i 's/libtoolize --force --copy/libtoolize -if --copy/' bootstrap
 %patch 3 -p1 -b .collision
 %patch 4 -p1 -b .threading
 %patch 5 -p1 -b .writechar
+%patch 6 -p1 -b .operators
 
 %build
 autoreconf -vfi
@@ -109,6 +111,10 @@ find $RPM_BUILD_ROOT -name '*.la' -print -delete
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Apr 04 2025 Sreenivasulu Malavathula <[email protected]> - 0.9-0-24
+- Fixed build Issues (license: MIT)
+- License verified
+
 * Tue Jan 12 2021 Joe Schmitt <[email protected]> - 0.9.0-23
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Disable ecore support