diff --git a/.gitignore b/.gitignore index 6549c87..3d6f9ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nss-3.90.0-2.el8_1.src.rpm SOURCES/nss-3.90.0-3.el9_0.src.rpm -SOURCES/thunderbird-115.9.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-115.9.0-20240318.tar.xz +SOURCES/thunderbird-115.10.0.b2.processed-source.tar.xz +SOURCES/thunderbird-langpacks-115.10.0-20240415.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index f22e391..5383b68 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -2,5 +2,5 @@ b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm 39d1004f8948186cdaa33bbb90423f6f994bdf6c SOURCES/nss-3.90.0-2.el8_1.src.rpm df0dd588680f6ade6728a1fd3ff2d71e7a46255d SOURCES/nss-3.90.0-3.el9_0.src.rpm -cb287fa47bd8bdff66aacb2143a3c244250bae88 SOURCES/thunderbird-115.9.0.processed-source.tar.xz -12f6297fbc364c63712e13e30d289b37840a865f SOURCES/thunderbird-langpacks-115.9.0-20240318.tar.xz +56522a0800e27a5ecee0212ad55d3768bf8a7e32 SOURCES/thunderbird-115.10.0.b2.processed-source.tar.xz +09f9395ac550f9f6974ac2f3ac5d5635b7eeab16 SOURCES/thunderbird-langpacks-115.10.0-20240415.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 522642a..46cfacf 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -124,7 +124,7 @@ end} # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # thunderbird-102.8.0.b2.processed-source.tar.xz # When unset use processed source file name as is. -##global buildnum .b2 +%global buildnum .b2 %bcond_without langpacks @@ -134,8 +134,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 115.9.0 -Release: 1%{?dist}.alma.1 +Version: 115.10.0 +Release: 2%{?dist}.alma.1 URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -165,7 +165,7 @@ ExcludeArch: aarch64 s390 ppc ppc64 #Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: thunderbird-langpacks-%{version}-20240318.tar.xz +Source1: thunderbird-langpacks-%{version}-20240415.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -220,7 +220,6 @@ Patch155: rhbz-1354671.patch # ---- Security patches ---- Patch301: CVE-2023-44488-libvpx.patch -Patch302: expat-CVE-2023-52425.patch # BUILD REQURES/REQUIRES %if %{?system_nss} && !0%{?bundle_nss} @@ -961,7 +960,6 @@ echo "--------------------------------------------" cd media/libvpx/libvpx %patch -P301 -p1 -b .CVE-2023-44488-libvpx cd - -%patch -P302 -p1 -b .expat-CVE-2023-52425 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -1519,6 +1517,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Wed Apr 24 2024 Eduard Abdullin - 115.10.0-2.alma.1 +- Revert expat CVE-2023-52425 +- Update 115.10.0.b2 + * Tue Apr 02 2024 Eduard Abdullin - 115.9.0-1.alma.1 - Debrand for AlmaLinux