[3.0] Merge changes for Jan 2026 test build (#15531)

Author: jslobodzian

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

@@ -68,7 +68,7 @@ ExcludeArch: i686
 Summary:          389 Directory Server (%{variant})
 Name:             389-ds-base
 Version:          3.1.1
-Release:          8%{?dist}
+Release:          9%{?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
@@ -83,6 +83,7 @@ Source4:          389-ds-base.sysusers
 Source5:          https://fedorapeople.org/groups/389ds/libdb-5.3.28-59.tar.bz2
 %endif
 
+Patch0:           rust-1.90-fixes.patch
 Provides:         ldif2ldbm >= 0
 
 # Attach the buildrequires to the top level package:
@@ -732,6 +733,10 @@ exit 0
 %endif
 
 %changelog
+* Tue Jan 13 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.1.1-9
+- Bump release to rebuild with rust
+- Add patch add explicit lifetime for ValueArrayRef iterator
+
 * Tue Jan 06 2026 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.1.1-8
 - Bumping release to rebuild with new 'net-snmp' libs.
 

SPECS-EXTENDED/389-ds-base/rust-1.90-fixes.patch

@@ -0,0 +1,25 @@
+From 3a0d6ff3272c4a3d5f2d552a436e4f0fe0756a0a Mon Sep 17 00:00:00 2001
+From: Kavya Sree Kaitepalli <kkaitepalli@microsoft.com>
+Date: Wed, 29 Oct 2025 06:38:08 +0000
+Subject: [PATCH] Add explicit lifetime for ValueArrayRef iterator for Rust 1.90
+
+---
+ src/slapi_r_plugin/src/value.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/slapi_r_plugin/src/value.rs b/src/slapi_r_plugin/src/value.rs
+index 2fd35c8..fec74ac 100644
+--- a/src/slapi_r_plugin/src/value.rs
++++ b/src/slapi_r_plugin/src/value.rs
+@@ -61,7 +61,7 @@ impl ValueArrayRef {
+         ValueArrayRef { raw_slapi_val }
+     }
+ 
+-    pub fn iter(&self) -> ValueArrayRefIter {
++    pub fn iter(&self) -> ValueArrayRefIter<'_> {
+         ValueArrayRefIter {
+             idx: 0,
+             va_ref: &self,
+-- 
+2.45.4
+

SPECS-EXTENDED/hawtjni-runtime/hawtjni-runtime.spec

@@ -20,13 +20,14 @@ Distribution:   Azure Linux
 %global debug_package %{nil}
 Name:           hawtjni-runtime
 Version:        1.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        HawtJNI Runtime
 License:        Apache-2.0 AND EPL-1.0 AND BSD-3-Clause
 URL:            https://github.com/fusesource/hawtjni
 Source0:        https://github.com/fusesource/hawtjni/archive/hawtjni-project-%{version}.tar.gz
+Patch0:         use-commons-lang3.patch
 BuildRequires:  apache-commons-cli
-BuildRequires:  apache-commons-lang
+BuildRequires:  apache-commons-lang3
 BuildRequires:  fdupes
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local-bootstrap
@@ -48,7 +49,7 @@ This package contains the API documentation for hawtjni.
 Summary:        Code generator that produces the JNI code
 Requires:       %{name} = %{version}
 Requires:       apache-commons-cli
-Requires:       apache-commons-lang
+Requires:       apache-commons-lang3
 Requires:       javapackages-tools
 Requires:       objectweb-asm >= 5
 Requires:       xbean
@@ -62,14 +63,15 @@ JNI code which powers the eclipse platform.
 
 %prep
 %setup -q -n hawtjni-hawtjni-project-%{version}
+%patch -P 0 -p1
 
 %pom_disable_module hawtjni-example
 %pom_disable_module hawtjni-maven-plugin
 %pom_remove_plugin -r :maven-shade-plugin
 %pom_remove_plugin -r :maven-eclipse-plugin
 
 # this dependency seems to be missing
-%pom_add_dep commons-lang:commons-lang hawtjni-generator
+%pom_add_dep commons-lang:commons-lang3 hawtjni-generator
 
 for mod in runtime generator; do
   %pom_remove_parent hawtjni-${mod}
@@ -80,19 +82,19 @@ done
 
 %build
 mkdir -p hawtjni-runtime/build/classes
-javac -d hawtjni-runtime/build/classes -source 6 -target 6 \
+javac -d hawtjni-runtime/build/classes -source 8 -target 8 \
   $(find hawtjni-runtime/src/main/java/ -name *.java | xargs)
 jar cf hawtjni-runtime.jar -C hawtjni-runtime/build/classes .
 mkdir -p  hawtjni-generator/build/classes
 javac -d hawtjni-generator/build/classes \
-  -source 6 -target 6 \
-  -cp $(build-classpath commons-cli commons-lang objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util):hawtjni-runtime.jar \
+  -source 8 -target 8 \
+  -cp $(build-classpath commons-cli commons-lang3 objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util):hawtjni-runtime.jar \
   $(find hawtjni-generator/src/main/java/ -name *.java | xargs)
 jar cf hawtjni-generator.jar -C hawtjni-generator/build/classes .
 jar uf hawtjni-generator.jar -C hawtjni-generator/src/main/resources .
 mkdir -p hawtjni-runtime/build/apidoc
-javadoc -d hawtjni-runtime/build/apidoc -source 6 \
-  -classpath $(build-classpath commons-cli commons-lang objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util) \
+javadoc -d hawtjni-runtime/build/apidoc -source 8 \
+  -classpath $(build-classpath commons-cli commons-lang3 objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util) \
   $(find hawtjni-runtime/src/main/java/ -name *.java && \
     find hawtjni-generator/src/main/java/ -name *.java| xargs)
 
@@ -113,9 +115,18 @@ install -m 0644 hawtjni-generator/pom.xml %{buildroot}%{_mavenpomdir}/hawtjni/ha
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/hawtjni
 cp -pr  hawtjni-runtime/build/apidoc/* %{buildroot}%{_javadocdir}/hawtjni/
+# to remove license warnings
+install -Dm 0644 hawtjni-runtime/build/apidoc/legal/LICENSE \
+    %{buildroot}%{_licensedir}/hawtjni/LICENSE.javadoc
+
+install -Dm 0644 hawtjni-runtime/build/apidoc/legal/ADDITIONAL_LICENSE_INFO \
+    %{buildroot}%{_licensedir}/hawtjni/ADDITIONAL_LICENSE_INFO.javadoc
+
+rm -rf %{buildroot}%{_javadocdir}/hawtjni/legal
+
 %fdupes -s %{buildroot}%{_javadocdir}/hawtjni/
 
-%{jpackage_script org.fusesource.hawtjni.generator.HawtJNI "" "" commons-cli:commons-lang:objectweb-asm/asm:objectweb-asm/asm-commons:xbean/xbean-finder:xbean/xbean-asm-util:hawtjni/hawtjni-runtime:hawtjni/hawtjni-generator hawtjni-generator true}
+%{jpackage_script org.fusesource.hawtjni.generator.HawtJNI "" "" commons-cli:commons-lang3:objectweb-asm/asm:objectweb-asm/asm-commons:xbean/xbean-finder:xbean/xbean-asm-util:hawtjni/hawtjni-runtime:hawtjni/hawtjni-generator hawtjni-generator true}
 
 %files -f .mfiles
 %license license.txt
@@ -127,8 +138,13 @@ cp -pr  hawtjni-runtime/build/apidoc/* %{buildroot}%{_javadocdir}/hawtjni/
 %files -n hawtjni-javadoc
 %{_javadocdir}/hawtjni
 %license license.txt
+%license %{_licensedir}/hawtjni/*
 
 %changelog
+* Wed Dec 24 2025 Aninda Pradhan <v-anindap@microsoft.com> - 1.17-3
+- Updated dependencies to use commons-lang3
+- License verified
+
 * Thu Oct 14 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.17-2
 - Converting the 'Release' tag to the '[number].[distribution]' format.
 

SPECS-EXTENDED/hawtjni-runtime/use-commons-lang3.patch

@@ -0,0 +1,11 @@
+--- a/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java
++++ b/hawtjni-generator/src/main/java/org/fusesource/hawtjni/generator/model/ReflectField.java
+@@ -14,7 +14,7 @@
+ import java.util.Arrays;
+ import java.util.HashSet;
+
+-import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
+ import org.fusesource.hawtjni.runtime.FieldFlag;
+ import org.fusesource.hawtjni.runtime.JniField;
+ import org.fusesource.hawtjni.runtime.T32;

SPECS-EXTENDED/kernel-ipe/config

@@ -1170,7 +1170,7 @@ CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_USER_COMPAT is not set
-# CONFIG_XFRM_INTERFACE is not set
+CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_STATISTICS=y
@@ -1220,7 +1220,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 # CONFIG_INET_RAW_DIAG is not set
-# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y

SPECS-EXTENDED/kernel-ipe/config_aarch64

@@ -1231,7 +1231,7 @@ CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
 # CONFIG_INET_RAW_DIAG is not set
-# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y

SPECS-EXTENDED/kernel-ipe/kernel-ipe.signatures.json

@@ -1,8 +1,8 @@
 {
   "Signatures": {
     "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
-    "config": "4cf5c54b020b3af1f8b3af414359e7eba93cad0e505eb967a5d4b82e7e2ed9c9",
-    "config_aarch64": "13a66179d003e54d944683ec14768e73b0d6cd06a83d703f4b6a7f2b24f34334",
+    "config": "c5a9f5ed9cd1300d10dc5c353f29cf3c0d81f55a5bb1a7cc77b46e7480b834bf",
+    "config_aarch64": "afd473ab5c76245d5e4455b408a981865511a226a87146210cad12edc0c67865",
     "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
     "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
     "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",

SPECS-EXTENDED/kernel-ipe/kernel-ipe.spec

@@ -33,7 +33,7 @@
 Summary:        Linux Kernel
 Name:           kernel-ipe
 Version:        6.6.119.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -460,6 +460,12 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %{_sysconfdir}/bash_completion.d/bpftool
 
 %changelog
+* Fri Jan 16 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-3
+- Enable XFRM_INTERFACE
+
+* Thu Jan 08 2026 Rachel Menge <rachelmenge@microsoft.com> - 6.6.119.3-2
+- Enable CONFIG_INET_DIAG_DESTROY
+
 * Tue Jan 06 2026 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 6.6.119.3-1
 - Auto-upgrade to 6.6.119.3
 

SPECS-EXTENDED/lasso/lasso.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "lasso-2.8.0.tar.gz": "ffcbd5851d98586c7e1caf43bad66164211a3b61d12bf860a0598448ff9f2b38"
+  "lasso-2.9.0.tar.gz": "225f664fe602b73bb5eaf5c4b60a6b07eb2d936d0dd0cafb222524c801d98e5d"
  }
 }