Merge branch '3.0-dev' into skarambelkar/nginx/3.0

Author: sandeepkarambelkar

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

@@ -1851,6 +1851,7 @@
                 "python-sphinxcontrib-qthelp",
                 "python-sphinxcontrib-serializinghtml",
                 "python-sphinxygen",
+                "python-spnego",
                 "python-sqlalchemy",
                 "python-suds",
                 "python-systemd",

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)

SPECS-EXTENDED/apache-commons-pool2/apache-commons-pool2.spec

@@ -30,7 +30,7 @@ Epoch: 0
 Version: 1.41.4
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 ExclusiveArch: aarch64 ppc64le s390x x86_64
@@ -43,7 +43,7 @@ BuildRequires: device-mapper-devel
 BuildRequires: git-core
 BuildRequires: golang >= 1.16.6
 BuildRequires: glib2-devel
-BuildRequires: glibc-static >= 2.38-14%{?dist}
+BuildRequires: glibc-static >= 2.38-15%{?dist}
 %if !%{defined gobuild}
 BuildRequires: go-rpm-macros
 %endif
@@ -173,6 +173,9 @@ make test-unit
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Oct 23 2025 Kanishk Bansal <[email protected]> - 0:1.41.4-3
+- Bump to rebuild with updated glibc
+
 * Wed Oct 08 2025 Andrew Phelps <[email protected]> - 0:1.41.4-2
 - 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: 22%{?dist}
+Release: 23%{?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-14%{?dist}
+BuildRequires: glibc-static >= 2.38-15%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 
@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
+* Thu Oct 23 2025 Kanishk Bansal <[email protected]> - 0.1.7-23
+- Bump to rebuild with updated glibc
+
 * Wed Oct 08 2025 Andrew Phelps <[email protected]> - 0.1.7-22
 - 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: 24%{?dist}
+Release: 25%{?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-14%{?dist}
+BuildRequires: glibc-static >= 2.38-15%{?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
+* Thu Oct 23 2025 Kanishk Bansal <[email protected]> - 10.1.0-25
+- Bump to rebuild with updated glibc
+
 * Wed Oct 08 2025 Andrew Phelps <[email protected]> - 10.1.0-24
 - Bump to rebuild with updated glibc
 

SPECS-EXTENDED/dyninst/dyninst.spec

@@ -22,7 +22,7 @@ Distribution:   Azure Linux
 
 Name:           junitperf
 Version:        1.9.1
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        JUnit extension for performance and scalability testing
 License:        BSD
 Group:          Development/Libraries/Java
@@ -79,8 +79,8 @@ find . -name "*.jar" | xargs -t rm
 export CLASSPATH=
 export OPT_JAR_LIST="junit ant/ant-junit"
 # performance tests sometimes failed on build farm, so lets disable them to avoid unpredictable build fails
-#ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -Dbuild.sysclasspath=first jar test javadoc
-ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -Dbuild.sysclasspath=first jar javadoc
+#ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 -Dbuild.sysclasspath=first jar test javadoc
+ant -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 -Dbuild.sysclasspath=first jar javadoc
 
 %install
 # jars
@@ -90,18 +90,27 @@ install -p -m 0644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -D -m 0644 build/docs/api/legal/ADDITIONAL_LICENSE_INFO \
+  $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/legal/ADDITIONAL_LICENSE_INFO
+install -D -m 0644 build/docs/api/legal/ADDITIONAL_LICENSE_INFO \
+  $RPM_BUILD_ROOT%{_licensedir}/%{name}-javadoc/ADDITIONAL_LICENSE_INFO
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 # demo
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE README docs/JUnitPerf.html
+%license LICENSE
+%doc  README docs/JUnitPerf.html
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
 
 %files javadoc
+%license LICENSE
+%license %{_licensedir}/%{name}-javadoc/ADDITIONAL_LICENSE_INFO
+%exclude /usr/share/javadoc/junitperf-1.9.1/legal/ADDITIONAL_LICENSE_INFO
+%exclude /usr/share/javadoc/junitperf-1.9.1/legal/LICENSE
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
@@ -111,6 +120,9 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Mon Feb 24 2025 Akarsh Chaudhary <[email protected]> - 1.9.1-28
+- Bumped build option to 8.
+
 * Thu Dec 16 2021 Pawel Winogrodzki <[email protected]> - 1.9.1-27
 - Removing the explicit %%clean stage.
 - License verified.

SPECS-EXTENDED/junitperf/junitperf.spec

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 6.6.104.2 Kernel Configuration
+# Linux/x86_64 6.6.112.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -546,6 +546,7 @@ CONFIG_MITIGATION_RFDS=y
 CONFIG_MITIGATION_SPECTRE_BHI=y
 CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_TSA=y
+CONFIG_MITIGATION_VMSCAPE=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
@@ -946,7 +947,8 @@ CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
-# CONFIG_BLK_WBT is not set
+CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 # CONFIG_BLK_CGROUP_FC_APPID is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set

SPECS-EXTENDED/kernel-ipe/config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.104.2 Kernel Configuration
+# Linux/arm64 6.6.112.1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y

SPECS-EXTENDED/kernel-ipe/config_aarch64

@@ -1,14 +1,14 @@
 {
   "Signatures": {
     "azurelinux-ca-20230216.pem": "d545401163c75878319f01470455e6bc18a5968e39dd964323225e3fe308849b",
-    "config": "644e1f800c5b821d7e9c68a17df0581f09b0d2d44a7dd07c25e6b149205e6ef0",
-    "config_aarch64": "94a873573f94b1a5e72cc3a5e4b92b98c84ab8e18b036279e3a16b433d3de98b",
+    "config": "77447b428d270902d02c064ea477da4b6fe23856db005fe064b8ce40ee742f10",
+    "config_aarch64": "e7876afb4c18e809d6d4c25e6dc9bb1ae546e5d9cc1d06e88444201fa70b7ee5",
     "cpupower": "d7518767bf2b1110d146a49c7d42e76b803f45eb8bd14d931aa6d0d346fae985",
     "cpupower.service": "b057fe9e5d0e8c36f485818286b80e3eba8ff66ff44797940e99b1fd5361bb98",
     "sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f",
     "azl-ipe-boot-policy.pol": "f2b7941bd3b721aadc8e937d0472c36fe5e140221f7bb54af6ef905884e0372c",
     "Makefile": "1c2e740407215ed9b9cbbc09f9102bc99c08b370bbe2cbb0490aefdc9eb70455",
     "tarfs.c": "066084e1ca2c1e7ba83e76a6696cf17928e7efb46a2b1670a7a1f597c2d9bc51",
-    "kernel-6.6.104.2.tar.gz": "dfc7b852fd9e63ce199c35721d00a5e4741c4e881da8235129f853402d784aa2"
+    "kernel-6.6.112.1.tar.gz": "2ea56b2ca06df6672cbe3387c4d137c37683e3306029da6baf8820e8fa4795ae"
   }
 }