diff --git a/.gitignore b/.gitignore index 114f12d..46b2346 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm -SOURCES/thunderbird-91.4.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-91.4.0-20211206.tar.xz +SOURCES/thunderbird-91.7.0.processed-source.tar.xz +SOURCES/thunderbird-langpacks-91.7.0-20220308.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 4f4bb2b..53e4f08 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm -b547aff4246db7d2c7c6e9ff0f0be49ead13bfdb SOURCES/thunderbird-91.4.0.processed-source.tar.xz -3d730091ab572437549ce4271b407c39b3289045 SOURCES/thunderbird-langpacks-91.4.0-20211206.tar.xz +0d9dea815661a0ad101d2fd758be855a542f2797 SOURCES/thunderbird-91.7.0.processed-source.tar.xz +eab467b27d7ff768518cbb6ee38cc8b1ab793920 SOURCES/thunderbird-langpacks-91.7.0-20220308.tar.xz diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 3f5e455..0908b6b 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -128,7 +128,7 @@ end} %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.4.0 +Version: 91.7.0 Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -138,10 +138,14 @@ Group: Applications/Internet ExcludeArch: %{ix86} %endif %if 0%{?rhel} == 8 + %if %{rhel_minor_version} == 1 +ExcludeArch: %{ix86} aarch64 s390x + %else ExcludeArch: %{ix86} + %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: s390 ppc +ExcludeArch: aarch64 s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -151,7 +155,7 @@ ExcludeArch: s390 ppc # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20211206.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220308.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -199,6 +203,9 @@ Patch512: mozilla-bmo849632.patch Patch513: mozilla-bmo998749.patch Patch514: mozilla-s390x-skia-gradient.patch Patch515: mozilla-bmo1626236.patch +Patch516: expat-CVE-2022-25235.patch +Patch517: expat-CVE-2022-25236.patch +Patch518: expat-CVE-2022-25315.patch %if %{?system_nss} %if !0%{?bundle_nss} @@ -425,7 +432,10 @@ echo "use_rustts %{?use_rustts}" %patch513 -p1 -b .mozilla-bmo998749 %patch514 -p1 -b .mozilla-s390x-skia-gradient %patch515 -p1 -b .mozilla-bmo1626236 -#patch237 -p1 -b .disable-openpgp-in-thunderbird +%patch516 -p1 -b .expat-CVE-2022-25235 +%patch517 -p1 -b .expat-CVE-2022-25236 +%patch518 -p1 -b .expat-CVE-2022-25315 +%patch237 -p1 -b .disable-openpgp-in-thunderbird %patch1001 -p1 -b .ppc64le-inline @@ -630,7 +640,7 @@ function build_bundled_package() { echo $PKG_CONFIG_PATH rpm -ivh %{SOURCE403} - rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/nss.spec + rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nss.spec pushd %{_buildrootdir} #cleanup #rm -rf {_buildrootdir}/usr/lib/debug/* @@ -865,9 +875,9 @@ ls %{_buildrootdir} export MACH_USE_SYSTEM_PYTHON=1 %if 0%{?use_llvmts} #scl enable llvm-toolset-%{llvm_version} './mach build -v' - ./mach build -v + ./mach build -v || exit 1 %else - ./mach build -v + ./mach build -v || exit 1 %endif # Look for the reason we get: /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character readelf -wl objdir/dist/bin/libxul.so | grep "/" @@ -1010,7 +1020,7 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-* # Removing librnp.so - we cannot deliver that in RHELs -#{__rm} -rf %{buildroot}%{mozappdir}/librnp.so +%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so # Register as an application to be visible in the software center # @@ -1019,47 +1029,10 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-* # # See http://www.freedesktop.org/software/appstream/docs/ for more details. # -%{__mkdir_p} %{buildroot}%{_datadir}/appdata -cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml < - - - - mozilla-thunderbird.desktop - CC0-1.0 - MPLv1.1 or GPLv2+ or LGPLv2+ - -

- Thunderbird is an email client that allows you to read, write and organise all - of your email messages. It is compatible with most email accounts, including the - most popular webmail services. -

-

- Thunderbird is designed by Mozilla, a global community working together to make - the Internet better. Mozilla believe that the Internet should be open, public, - and accessible to everyone without any restrictions. -

-
    -
  • Easier than ever to set up a new e-mail account
  • -
  • Awesome search allows you to find your messages fast
  • -
  • Thousands of add-ons give you the freedom to make Thunderbird your own
  • -
-
- http://www.mozilla.org/thunderbird/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png - - - - - -
-EOF + +# Register as an application to be visible in the software center +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/thunderbird.appdata.xml #--------------------------------------------------------------------- @@ -1151,9 +1124,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Thu Dec 09 2021 CentOS Sources - 91.4.0-2.el8.centos +* Mon Mar 14 2022 CentOS Sources - 91.7.0-2.el8.centos - Apply debranding changes +* Tue Mar 08 2022 Eike Rathke - 91.7.0-2 +- Update to 91.7.0 build2 + +* Thu Mar 03 2022 Eike Rathke - 91.7.0-1 +- Update to 91.7.0 build1 + +* Mon Feb 07 2022 Eike Rathke - 91.6.0-1 +- Update to 91.6.0 build1 + +* Fri Jan 07 2022 Eike Rathke - 91.5.0-1 +- Update to 91.5.0 build1 + * Mon Dec 06 2021 Eike Rathke - 91.4.0-2 - Update to 91.4.0 build2