Merge branch '3.0-dev' into 3.0

Author: jslobodzian

SPECS-EXTENDED/buildah/buildah.spec

@@ -21,7 +21,7 @@
 Summary:        A command line tool used for creating OCI Images
 Name:           buildah
 Version:        1.18.0
-Release:        26%{?dist}
+Release:        27%{?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-6%{?dist}
+BuildRequires:  glibc-static >= 2.38-7%{?dist}
 BuildRequires:  go-md2man
 BuildRequires:  go-rpm-macros
 BuildRequires:  golang
@@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Aug 21 2024 Chris Co <chrco@microsoft.com> - 1.18.0-27
+- Bump to rebuild with updated glibc
+
 * Wed May 22 2024 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 1.18.0-26
 - update to build dep latest glibc-static version
 

SPECS-EXTENDED/catatonit/catatonit.spec

@@ -3,7 +3,7 @@ Distribution:   Azure Linux
 
 Name: catatonit
 Version: 0.1.7
-Release: 14%{?dist}
+Release: 15%{?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-6%{?dist}
+BuildRequires: glibc-static >= 2.38-7%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 
@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
+* Wed Aug 21 2024 Chris Co <chrco@microsoft.com> - 0.1.7-15
+- Bump to rebuild with updated glibc
+
 * Wed May 22 2024 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 0.1.7-14
 - update to build dep latest glibc-static version
 

SPECS-EXTENDED/distribution-gpg-keys/distribution-gpg-keys.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "distribution-gpg-keys-1.60.tar.gz": "6136be288a89d858054b0ac376553a898e596a70875b61dfc99e46e768d88e31"
+  "distribution-gpg-keys-1.104.tar.gz": "60ec27522ba960719f6b7d578106a65dc2dca235e9ebf2399a6a98571afffd5a"
  }
-}
+}

SPECS-EXTENDED/distribution-gpg-keys/distribution-gpg-keys.spec

@@ -1,14 +1,14 @@
 Summary:	GPG keys of various Linux distributions
 Name:		distribution-gpg-keys
-Version:	1.60
-Release:	2%{?dist}
+Version:	1.104
+Release:	1%{?dist}
 License:	CC0
-URL:		https://github.com/xsuchy/distribution-gpg-keys
+URL:		https://github.com/rpm-software-management/distribution-gpg-keys
 # Sources can be obtained by
-# git clone git://github.com/xsuchy/distribution-gpg-keys.git
+# git clone git://github.com/rpm-software-management/distribution-gpg-keys.git
 # cd distribution-gpg-keys
 # tito build --tgz
-Source0:	https://github.com/xsuchy/distribution-gpg-keys/archive/refs/tags/%{name}-%{version}-1.tar.gz#/%{name}-%{version}.tar.gz
+Source0:	https://github.com/rpm-software-management/distribution-gpg-keys/archive/refs/tags/%{name}-%{version}-1.tar.gz#/%{name}-%{version}.tar.gz
 BuildArch:	noarch
 
 %description
@@ -45,6 +45,10 @@ cp -a keys/* %{buildroot}%{_datadir}/%{name}/
 %{_datadir}/%{name}/copr
 
 %changelog
+* Fri Aug 02 2024 Devin Anderson <danderson@microsoft.com> - 1.104-1
+- Update to 1.104, a more recent version that includes the Azure Linux keys.
+- Use the official repository URI to download sources.
+
 * Tue Feb 08 2022 Cameron Baird <cameronbaird@microsoft.com> - 1.60-2
 - Initial CBL-Mariner import from Fedora 33 (license: MIT)
 - License verified

SPECS-EXTENDED/dyninst/dyninst.spec

@@ -1,7 +1,7 @@
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
-Release: 16%{?dist}
+Release: 17%{?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-6%{?dist}
+BuildRequires: glibc-static >= 2.38-7%{?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
+* Wed Aug 21 2024 Chris Co <chrco@microsoft.com> - 10.1.0-17
+- Bump to rebuild with updated glibc
+
 * Wed May 22 2024 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 10.1.0-16
 - update to build dep latest glibc-static version
 

SPECS-EXTENDED/libldb/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch

@@ -131,19 +131,6 @@ index ef632ba903369e4211991f17a3b204bcd96c3a2f..63e50567860ff890b00b0ce6c7607c91
          if not m:
              conf.end_msg('not found', color='YELLOW')
              return
-diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
-index 8863c2c53e7d7dd9317c9233f0085ffd0eea6b2f..34793902fba884cf2d8358bf4315dc98027266b6 100644
---- a/buildtools/wafsamba/samba_cross.py
-+++ b/buildtools/wafsamba/samba_cross.py
-@@ -77,7 +77,7 @@ def cross_answer(ca_file, msg):
-                 f.close()
-                 return (0, ans.strip("'"))
-             else:
--                m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)
-+                m = re.match(r'\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)
-                 if m:
-                     f.close()
-                     return (int(m.group(1)), m.group(2))
 diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py
 index a268c011c5d8e406e0d763554c55668cfb5388bc..c8bee19010978a04460b0637fcc8fd484a699ea8 100644
 --- a/buildtools/wafsamba/samba_headers.py

SPECS-EXTENDED/libldb/libldb.signatures.json

@@ -1,8 +1,8 @@
 {
  "Signatures": {
-  "ldb-2.1.4.tar.asc": "e3e6c5b00295584e11216eeae1546711138772ab819bf26f3ab4ea0c76c76041",
-  "ldb-2.1.4.tar.gz": "9e0b12ee10cbd31f920f3ce1dcd7617c558411a438faaef44c596d77b4d0bf4e",
+  "ldb-2.7.2.tar.asc": "b5d4d98f3aef9fd7c22a6962af775269d819643cbf1c9fd3a8c2885a2e61f464",
+  "ldb-2.7.2.tar.gz": "26ee72d647854e662d99643eb2b2d341655abf31f4990838d6650fb5cf9209c8",
   "ldb.keyring": "9c5722acdd291bcc20a6b6d314b32d9cef30dcaeef59ef0d39635575e20167f1",
   "libldb-LICENSE.txt": "e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118"
  }
-}
+}

SPECS-EXTENDED/libldb/libldb.spec

@@ -3,18 +3,18 @@
 
 %global with_python3 1
 
-%global talloc_version 2.3.1
-%global tdb_version 1.4.3
-%global tevent_version 0.10.2
+%global talloc_version 2.4.0
+%global tdb_version 1.4.8
+%global tevent_version 0.14.1
 
 Name: libldb
-Version: 2.1.4
-Release: 2%{?dist}
+Version: 2.7.2
+Release: 1%{?dist}
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
 Requires: libtdb%{?_isa} >= %{tdb_version}
 Requires: libtevent%{?_isa} >= %{tevent_version}
-License: LGPLv3+
+License: LGPL-3.0-or-later
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL: http://ldb.samba.org/
@@ -221,6 +221,10 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %endif
 
 %changelog
+* Wed Aug 07 2024 Sindhu Karri <lakarri@microsoft.com> - 2.7.2-1
+- Upgrade to 2.7.2 to build with Python 3.12 for 3.0
+- License verified. Using SPDX format
+
 * Tue Mar 02 2021 Henry Li <lihl@microsoft.com> - 2.1.4-2
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 - Remove distro condition check

SPECS-EXTENDED/podman/podman.spec

@@ -35,7 +35,7 @@
 
 Name:           podman
 Version:        4.1.1
-Release:        24%{?dist}
+Release:        25%{?dist}
 License:        ASL 2.0 and BSD and ISC and MIT and MPLv2.0
 Summary:        Manage Pods, Containers and Container Images
 Vendor:         Microsoft Corporation
@@ -50,7 +50,7 @@ BuildRequires:  go-md2man
 BuildRequires:  golang
 BuildRequires:  gcc
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-6%{?dist}
+BuildRequires:  glibc-static >= 2.38-7%{?dist}
 BuildRequires:  git
 BuildRequires:  go-rpm-macros
 BuildRequires:  gpgme-devel
@@ -386,6 +386,9 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
 
 # rhcontainerbot account currently managed by lsm5
 %changelog
+* Wed Aug 21 2024 Chris Co <chrco@microsoft.com> - 4.1.1-25
+- Bump to rebuild with updated glibc
+
 * Wed May 22 2024 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 4.1.1-24
 - update to build dep latest glibc-static version
 

SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec

@@ -12,7 +12,7 @@
 Summary:        Signed GRand Unified Bootloader for %{buildarch} systems
 Name:           grub2-efi-binary-signed-%{buildarch}
 Version:        2.06
-Release:        19%{?dist}
+Release:        20%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -79,6 +79,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname}
 /boot/efi/EFI/BOOT/%{grubpxeefiname}
 
 %changelog
+* Tue Aug 13 2024 Daniel McIlvaney <damcilva@microsoft.com> - 2.06-20
+- Move grub2-rpm-macros to the azurelinux-rpm-macros package
+
 * Wed Jun 12 2024 George Mileka <gmileka@microsoft.com> - 2.06-19
 - disable code optimization for ip checksum calculation