Skip to content

Commit

Permalink
Merge branch '3.0-dev' into 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jslobodzian committed Aug 24, 2024
2 parents 027873e + bde321f commit 9f8d0fa
Show file tree
Hide file tree
Showing 169 changed files with 9,055 additions and 996 deletions.
7 changes: 5 additions & 2 deletions SPECS-EXTENDED/buildah/buildah.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
%{_datadir}/%{name}/test

%changelog
* Wed Aug 21 2024 Chris Co <[email protected]> - 1.18.0-27
- Bump to rebuild with updated glibc

* Wed May 22 2024 Suresh Babu Chalamalasetty <[email protected]> - 1.18.0-26
- update to build dep latest glibc-static version

Expand Down
7 changes: 5 additions & 2 deletions SPECS-EXTENDED/catatonit/catatonit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
%{_libexecdir}/podman/%{name}

%changelog
* Wed Aug 21 2024 Chris Co <[email protected]> - 0.1.7-15
- Bump to rebuild with updated glibc

* Wed May 22 2024 Suresh Babu Chalamalasetty <[email protected]> - 0.1.7-14
- update to build dep latest glibc-static version

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"distribution-gpg-keys-1.60.tar.gz": "6136be288a89d858054b0ac376553a898e596a70875b61dfc99e46e768d88e31"
"distribution-gpg-keys-1.104.tar.gz": "60ec27522ba960719f6b7d578106a65dc2dca235e9ebf2399a6a98571afffd5a"
}
}
}
14 changes: 9 additions & 5 deletions SPECS-EXTENDED/distribution-gpg-keys/distribution-gpg-keys.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -45,6 +45,10 @@ cp -a keys/* %{buildroot}%{_datadir}/%{name}/
%{_datadir}/%{name}/copr

%changelog
* Fri Aug 02 2024 Devin Anderson <[email protected]> - 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 <[email protected]> - 1.60-2
- Initial CBL-Mariner import from Fedora 33 (license: MIT)
- License verified
Expand Down
7 changes: 5 additions & 2 deletions SPECS-EXTENDED/dyninst/dyninst.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 <[email protected]> - 10.1.0-17
- Bump to rebuild with updated glibc

* Wed May 22 2024 Suresh Babu Chalamalasetty <[email protected]> - 10.1.0-16
- update to build dep latest glibc-static version

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions SPECS-EXTENDED/libldb/libldb.signatures.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
16 changes: 10 additions & 6 deletions SPECS-EXTENDED/libldb/libldb.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down Expand Up @@ -221,6 +221,10 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
%endif

%changelog
* Wed Aug 07 2024 Sindhu Karri <[email protected]> - 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 <[email protected]> - 2.1.4-2
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
- Remove distro condition check
Expand Down
7 changes: 5 additions & 2 deletions SPECS-EXTENDED/podman/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 <[email protected]> - 4.1.1-25
- Bump to rebuild with updated glibc

* Wed May 22 2024 Suresh Babu Chalamalasetty <[email protected]> - 4.1.1-24
- update to build dep latest glibc-static version

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -79,6 +79,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname}
/boot/efi/EFI/BOOT/%{grubpxeefiname}

%changelog
* Tue Aug 13 2024 Daniel McIlvaney <[email protected]> - 2.06-20
- Move grub2-rpm-macros to the azurelinux-rpm-macros package

* Wed Jun 12 2024 George Mileka <[email protected]> - 2.06-19
- disable code optimization for ip checksum calculation

Expand Down
10 changes: 8 additions & 2 deletions SPECS-SIGNED/kernel-signed/kernel-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 6.6.43.1
Release: 7%{?dist}
Version: 6.6.47.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -145,6 +145,12 @@ echo "initrd of kernel %{uname_r} removed" >&2
%exclude /module_info.ld

%changelog
* Thu Aug 22 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.47.1-1
- Auto-upgrade to 6.6.47.1

* Wed Aug 14 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.44.1-1
- Auto-upgrade to 6.6.44.1

* Sat Aug 10 2024 Thien Trung Vuong <[email protected]> - 6.6.43.1-7
- Bump release to match kernel

Expand Down
10 changes: 8 additions & 2 deletions SPECS-SIGNED/kernel-uki-signed/kernel-uki-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
%define kernelver %{version}-%{release}
Summary: Signed Unified Kernel Image for %{buildarch} systems
Name: kernel-uki-signed-%{buildarch}
Version: 6.6.43.1
Release: 7%{?dist}
Version: 6.6.47.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -65,6 +65,12 @@ popd
/lib/modules/%{kernelver}/vmlinuz-uki.efi

%changelog
* Thu Aug 22 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.47.1-1
- Auto-upgrade to 6.6.47.1

* Wed Aug 14 2024 CBL-Mariner Servicing Account <[email protected]> - 6.6.44.1-1
- Auto-upgrade to 6.6.44.1

* Sat Aug 10 2024 Thien Trung Vuong <[email protected]> - 6.6.43.1-7
- Bump release to match kernel

Expand Down
5 changes: 4 additions & 1 deletion SPECS-SIGNED/systemd-boot-signed/systemd-boot-signed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Version: 255
# determine the build information from local checkout
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
%endif
Release: 16%{?dist}
Release: 17%{?dist}
License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand Down Expand Up @@ -86,6 +86,9 @@ popd
/usr/share/man/man7/systemd-boot.7.gz

%changelog
* Fri Aug 23 2024 Chris Co <[email protected]> - 255-17
- Bump release to match systemd spec

* Wed Jul 10 2024 Thien Trung Vuong <[email protected]> - 255-16
- Bump release to match systemd spec

Expand Down
2 changes: 1 addition & 1 deletion SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"SymCrypt-OpenSSL-1.4.3.tar.gz": "9225dd28ff03ecface28df77617f22344e144817a9556d3df909484f5661004b"
"SymCrypt-OpenSSL-1.5.1.tar.gz": "946ac1bdd4d3e0d0381bca0df1b7281f9f7735430dfb6fce56344c7f2f3a7ecb"
}
}
9 changes: 8 additions & 1 deletion SPECS/SymCrypt-OpenSSL/SymCrypt-OpenSSL.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Summary: The SymCrypt engine for OpenSSL (SCOSSL) allows the use of OpenSSL with SymCrypt as the provider for core cryptographic operations
Name: SymCrypt-OpenSSL
Version: 1.4.3
Version: 1.5.1
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Expand Down Expand Up @@ -67,6 +67,13 @@ install SymCryptProvider/symcrypt_prov.cnf %{buildroot}%{_sysconfdir}/pki/tls/sy
%{_sysconfdir}/pki/tls/symcrypt_prov.cnf

%changelog
* Wed Aug 21 2024 Maxwell Moyer-McKee <[email protected]> - 1.5.1-1
- Fix minor behavior differences with default provider

* Thu Aug 15 2024 Maxwell Moyer-McKee <[email protected]> - 1.5.0-1
- Fix AES-CFB to match expected OpenSSL calling patterns
- Support ECC key X and Y coordinate export

* Thu May 16 2024 Maxwell Moyer-McKee <[email protected]> - 1.4.3-1
- Additional bugfixes for TLS connections
- Add variable length GCM IV support to the SymCrypt engine
Expand Down
3 changes: 2 additions & 1 deletion SPECS/WALinuxAgent/WALinuxAgent.signatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"WALinuxAgent-2.11.1.4.tar.gz": "956f12e31b0903f304cc070ddcbe4c8130c10e7ccc2597061e6467e911bc085d",
"ephemeral-disk-warning": "8b18fc001e5dfa43a1f559a074e334330e6fc4fe5b8c586eafc894800cc1c1ad",
"ephemeral-disk-warning.conf": "128e531c029e04afdab591f44d2b0a69d5a4eb9dec8867282d0acb1ebded76d0",
"ephemeral-disk-warning.service": "46b96609266ba56d28b09e4562a1bb03d874b06b929a7930b4df3292d7fcd303"
"ephemeral-disk-warning.service": "46b96609266ba56d28b09e4562a1bb03d874b06b929a7930b4df3292d7fcd303",
"module-setup.sh": "4dffe50e67a4d66adf4d9b4ac749a07586825ec322ed2539511782e6dce52219"
}
}
Loading

0 comments on commit 9f8d0fa

Please sign in to comment.