import firefox-78.6.0-1.el8_3
This commit is contained in:
CentOS Sources
parent
e9d55cd604
commit
9dcec3b16f
@ -1,7 +1,7 @@
|
||||
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
|
||||
a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
|
||||
f2e0607bf57105e8741c0f941bcacee8a75d672a SOURCES/firefox-78.3.0esr.source.tar.xz
|
||||
444ca305428fc4778a7252f3cdc2e65495921dcd SOURCES/firefox-langpacks-78.3.0esr-20200918.tar.xz
|
||||
4dc4e41ae749e1d189ac8f45d0b804a18b8d38c3 SOURCES/firefox-78.6.0esr.source.tar.xz
|
||||
d45296cbd3128ebc9aaf3f91a8b1d4cd6051365a SOURCES/firefox-langpacks-78.6.0esr-20201210.tar.xz
|
||||
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
|
||||
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
|
||||
5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,7 +1,7 @@
|
||||
SOURCES/Python-2.7.13.tar.xz
|
||||
SOURCES/cbindgen-vendor-0.14.3.tar.xz
|
||||
SOURCES/firefox-78.3.0esr.source.tar.xz
|
||||
SOURCES/firefox-langpacks-78.3.0esr-20200918.tar.xz
|
||||
SOURCES/firefox-78.6.0esr.source.tar.xz
|
||||
SOURCES/firefox-langpacks-78.6.0esr-20201210.tar.xz
|
||||
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
|
||||
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
|
||||
SOURCES/nodejs-10.21.0-5.fc32.src.rpm
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
diff -up firefox-73.0/build/unix/run-mozilla.sh.old firefox-73.0/build/unix/run-mozilla.sh
|
||||
--- firefox-73.0/build/unix/run-mozilla.sh.old 2020-02-12 09:58:00.150895904 +0100
|
||||
+++ firefox-73.0/build/unix/run-mozilla.sh 2020-02-12 09:58:06.505860696 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/usr/bin/sh
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
@ -17,6 +17,7 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
|
||||
ac_add_options --with-google-location-service-api-keyfile=../google-api-key
|
||||
ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
|
||||
ac_add_options --disable-av1
|
||||
ac_add_options --allow-addon-sideload
|
||||
|
||||
export BUILD_OFFICIAL=1
|
||||
export MOZILLA_OFFICIAL=1
|
||||
|
||||
@ -153,15 +153,6 @@ export MOZ_USE_XINPUT2=1
|
||||
##
|
||||
FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install"
|
||||
|
||||
# Since Firefox 60 the installation of individual langpack cannot be done by
|
||||
# copying xpi file to the home directory, because the langpack is loaded
|
||||
# as to the available languages after the language has been decided and
|
||||
# for the first run it won't be in language according to the locale.
|
||||
#
|
||||
# The current workaround is to put all langpacks to the location
|
||||
# for system wide extensions. So we set MOZ_DISABLE_LANGPACKS=1 for this moment
|
||||
export MOZ_DISABLE_LANGPACKS=1
|
||||
# MOZ_DISABLE_LANGPACKS disables language packs completely
|
||||
MOZILLA_DOWN=0
|
||||
if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
|
||||
if [ -x $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE ]; then
|
||||
|
||||
27
SOURCES/rhel6-at-no-automount.patch
Normal file
27
SOURCES/rhel6-at-no-automount.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff -ru firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp
|
||||
--- firefox-78.3.0/security/sandbox/linux/SandboxFilter.cpp 2020-09-14 21:21:02.000000000 +0200
|
||||
+++ firefox-78.4.0/security/sandbox/linux/SandboxFilter.cpp 2020-10-14 11:34:48.000000000 +0200
|
||||
@@ -243,14 +243,21 @@
|
||||
auto path = reinterpret_cast<const char*>(aArgs.args[1]);
|
||||
auto buf = reinterpret_cast<statstruct*>(aArgs.args[2]);
|
||||
auto flags = static_cast<int>(aArgs.args[3]);
|
||||
+
|
||||
+ if (fd != AT_FDCWD && (flags & AT_EMPTY_PATH) != 0 &&
|
||||
+ strcmp(path, "") == 0) {
|
||||
+ return ConvertError(fstatsyscall(fd, buf));
|
||||
+ }
|
||||
+
|
||||
if (fd != AT_FDCWD && path[0] != '/') {
|
||||
SANDBOX_LOG_ERROR("unsupported fd-relative fstatat(%d, \"%s\", %p, %d)",
|
||||
fd, path, buf, flags);
|
||||
return BlockedSyscallTrap(aArgs, nullptr);
|
||||
}
|
||||
- if ((flags & ~AT_SYMLINK_NOFOLLOW) != 0) {
|
||||
+ if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)) != 0) {
|
||||
SANDBOX_LOG_ERROR("unsupported flags %d in fstatat(%d, \"%s\", %p, %d)",
|
||||
- (flags & ~AT_SYMLINK_NOFOLLOW), fd, path, buf, flags);
|
||||
+ (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT)), fd,
|
||||
+ path, buf, flags);
|
||||
return BlockedSyscallTrap(aArgs, nullptr);
|
||||
}
|
||||
return (flags & AT_SYMLINK_NOFOLLOW) == 0 ? broker->Stat(path, buf)
|
||||
@ -7,8 +7,11 @@
|
||||
%endif
|
||||
|
||||
%global rhel_minor_version -1
|
||||
%if 0%{?flatpak:1}
|
||||
%global rhel_minor_version 4
|
||||
%endif
|
||||
%if "%{?dist}" == ".el8"
|
||||
%global rhel_minor_version 3
|
||||
%global rhel_minor_version 4
|
||||
%endif
|
||||
%if "%{?dist}" == ".el8_3"
|
||||
%global rhel_minor_version 3
|
||||
@ -126,7 +129,9 @@
|
||||
# Build as a debug package?
|
||||
%global debug_build 0
|
||||
|
||||
%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
|
||||
#%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
|
||||
# need to use full path because of flatpak where datadir is /app/share
|
||||
%global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html
|
||||
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
||||
# Minimal required versions
|
||||
%global cairo_version 1.13.1
|
||||
@ -193,7 +198,7 @@
|
||||
|
||||
%global mozappdir %{_libdir}/%{name}
|
||||
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
|
||||
%global langpackdir %{mozappdir}/distribution/extensions
|
||||
%global langpackdir %{mozappdir}/langpacks
|
||||
%global tarballdir %{name}-%{version}
|
||||
%global pre_version esr
|
||||
#global pre_tag alpha
|
||||
@ -210,7 +215,7 @@
|
||||
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 78.3.0
|
||||
Version: 78.6.0
|
||||
Release: 1%{?dist}
|
||||
URL: https://www.mozilla.org/firefox/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
@ -223,7 +228,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x
|
||||
|
||||
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
|
||||
%if %{build_langpacks}
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20200918.tar.xz
|
||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20201210.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor-0.14.3.tar.xz
|
||||
Source10: firefox-mozconfig
|
||||
@ -284,7 +289,6 @@ Patch232: firefox-rhel6-hugepage.patch
|
||||
Patch233: firefox-rhel6-nss-tls1.3.patch
|
||||
Patch234: rhbz-1821418.patch
|
||||
Patch235: firefox-pipewire-0-3.patch
|
||||
Patch236: fedora-shebang-build.patch
|
||||
|
||||
# Upstream patches
|
||||
Patch402: mozilla-1196777.patch
|
||||
@ -318,6 +322,9 @@ Patch602: rhel6-mach-fail.patch
|
||||
Patch603: rhel6-zconst.patch
|
||||
Patch604: rhel6-auxvh.patch
|
||||
Patch605: rhel6-abiv2-mozbz1642174.patch
|
||||
Patch607: rhel6-at-no-automount.patch
|
||||
|
||||
# Flatpak patches
|
||||
|
||||
%if %{?system_nss}
|
||||
%if !0%{?bundle_nss}
|
||||
@ -524,6 +531,12 @@ BuildRequires: libatomic
|
||||
BuildRequires: openssl-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?big_endian}
|
||||
%if 0%{?flatpak}
|
||||
BuildRequires: icu
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Obsoletes: mozilla <= 37:1.7.13
|
||||
Provides: webclient
|
||||
|
||||
@ -627,6 +640,12 @@ echo "use_bundled_yasm %{?use_bundled_yasm}"
|
||||
%patch215 -p1 -b .addons
|
||||
%patch219 -p1 -b .rhbz-1173156
|
||||
%patch224 -p1 -b .1170092
|
||||
|
||||
# fixing /usr/include in the patch for the flatpak build
|
||||
%if 0%{?flatpak}
|
||||
sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 8
|
||||
%if 0%{?rhel_minor_version} >= 3
|
||||
%patch235 -p1 -b .pipewire-0-3
|
||||
@ -635,7 +654,6 @@ echo "use_bundled_yasm %{?use_bundled_yasm}"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
#%patch236 -p1 -b .fedora-shebang-build
|
||||
|
||||
%if 0%{?rhel} == 6
|
||||
%patch232 -p1 -b .hugepage
|
||||
@ -675,6 +693,7 @@ echo "use_bundled_yasm %{?use_bundled_yasm}"
|
||||
%patch603 -p1 -b .rhel6-zconst
|
||||
%patch604 -p1 -b .rhel6-auxvh
|
||||
%patch605 -p1 -b .rhel6-abiv2-mozbz1642174
|
||||
%patch607 -R -p1 -b .rhel6-at-no-automount
|
||||
%endif
|
||||
|
||||
# CentOS patches
|
||||
@ -947,7 +966,19 @@ function build_bundled_package() {
|
||||
%filter_from_requires /libssl3.so.*/d
|
||||
%filter_from_requires /libnssutil3.so.*/d
|
||||
%filter_from_requires /libnspr4.so.*/d
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} == 6
|
||||
%filter_from_requires /libnss3.so.*/d
|
||||
%filter_from_requires /libsmime3.so.*/d
|
||||
%filter_from_requires /libssl3.so.*/d
|
||||
%filter_from_requires /libnssutil3.so.*/d
|
||||
%filter_from_requires /libnspr4.so.*/d
|
||||
%filter_from_provides /libnss3.so.*/d
|
||||
%filter_from_provides /libsmime3.so.*/d
|
||||
%filter_from_provides /libssl3.so.*/d
|
||||
%filter_from_provides /libnssutil3.so.*/d
|
||||
%filter_from_provides /libnspr4.so.*/d
|
||||
%endif
|
||||
|
||||
%if 0%{?bundle_gtk3}
|
||||
@ -1083,12 +1114,19 @@ esac
|
||||
./mach python -c "import sys;print(sys.path)"
|
||||
|
||||
%if 0%{?big_endian}
|
||||
%if 0%{?flatpak}
|
||||
echo "Generate big endian version of config/external/icu/data/icud58l.dat"
|
||||
icupkg -tb config/external/icu/data/icudt67l.dat config/external/icu/data/icudt67b.dat
|
||||
ls -l config/external/icu/data
|
||||
rm -f config/external/icu/data/icudt*l.dat
|
||||
%else
|
||||
echo "Generate big endian version of config/external/icu/data/icud64l.dat"
|
||||
./mach python intl/icu_sources_data.py .
|
||||
rm -f config/external/icu/data/icudt*l.dat
|
||||
# mv config/external/icu/data/icudt64l.dat config/external/icu/data/icudt64b.dat
|
||||
ls -l config/external/icu/data
|
||||
cat /tmp/icu-make*
|
||||
%endif
|
||||
%endif
|
||||
|
||||
mkdir %{_buildrootdir}/bin || :
|
||||
@ -1165,34 +1203,26 @@ MOZ_SMP_FLAGS=-j1
|
||||
[ -z "$RPM_BUILD_NCPUS" ] && \
|
||||
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
|
||||
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
|
||||
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j2
|
||||
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j2
|
||||
[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j3
|
||||
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j3
|
||||
%endif
|
||||
%endif
|
||||
|
||||
cat /proc/meminfo
|
||||
# Free memory in kB
|
||||
|
||||
MEM_AVAILABLE=$(grep MemAvailable /proc/meminfo | awk '{ print $2 }')
|
||||
# Free memory in kB
|
||||
if grep -q MemAvailable /proc/meminfo; then
|
||||
MEM_AVAILABLE=$(grep MemAvailable /proc/meminfo | awk '{ print $2 }')
|
||||
else
|
||||
MEM_AVAILABLE=$(grep MemFree /proc/meminfo | awk '{ print $2 }')
|
||||
fi
|
||||
|
||||
# Usually the compiler processes can take 2 GB of memory at peaks
|
||||
TASK_SIZE=4000000
|
||||
MEM_CONSTRAINED_JOBS=$(( MEM_AVAILABLE / TASK_SIZE ))
|
||||
CPU_AVAILABLE=$(/usr/bin/getconf _NPROCESSORS_ONLN)
|
||||
# Pick the minimum from available CPUs or memory constrained number of jobs
|
||||
#MOZ_SMP_FLAGS=-j$([ "$CPU_AVAILABLE" -le "$MEM_CONSTRAINED_JOBS" ] && echo "$CPU_AVAILABLE" || echo "$MEM_CONSTRAINED_JOBS")
|
||||
|
||||
cat /proc/meminfo
|
||||
# Free memory in kB
|
||||
|
||||
MEM_AVAILABLE=$(grep MemAvailable /proc/meminfo | awk '{ print $2 }')
|
||||
|
||||
# Usually the compiler processes can take 2 GB of memory at peaks
|
||||
TASK_SIZE=4000000
|
||||
MEM_CONSTRAINED_JOBS=$(( MEM_AVAILABLE / TASK_SIZE ))
|
||||
CPU_AVAILABLE=$(/usr/bin/getconf _NPROCESSORS_ONLN)
|
||||
# Pick the minimum from available CPUs or memory constrained number of jobs
|
||||
#MOZ_SMP_FLAGS=-j$([ "$CPU_AVAILABLE" -le "$MEM_CONSTRAINED_JOBS" ] && echo "$CPU_AVAILABLE" || echo "$MEM_CONSTRAINED_JOBS")
|
||||
MOZ_SMP_FLAGS=-j$([ "$CPU_AVAILABLE" -le "$MEM_CONSTRAINED_JOBS" ] && echo "$CPU_AVAILABLE" || echo "$MEM_CONSTRAINED_JOBS")
|
||||
|
||||
%if 0%{?bundle_gtk3}
|
||||
# gtk3-private-setup-flags-env.inc
|
||||
@ -1648,6 +1678,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Thu Dec 10 2020 Jan Horak <jhorak@redhat.com> - 78.6.0-1
|
||||
- Update to 78.6.0 build1
|
||||
|
||||
* Wed Nov 18 2020 Jan Horak <jhorak@redhat.com> - 78.5.0-1
|
||||
- Update to 78.5.0 build1
|
||||
|
||||
* Tue Nov 10 2020 erack@redhat.com - 78.4.1-1
|
||||
- Update to 78.4.1
|
||||
|
||||
* Tue Nov 10 2020 Jan Horak <jhorak@redhat.com> - 78.4.0-3
|
||||
- Fixing flatpak build, fixing firefox.sh.in to not disable langpacks loading
|
||||
|
||||
* Thu Oct 29 2020 Jan Horak <jhorak@redhat.com> - 78.4.0-2
|
||||
- Enable addon sideloading
|
||||
|
||||
* Fri Oct 16 2020 Jan Horak <jhorak@redhat.com> - 78.4.0-1
|
||||
- Update to 78.4.0 build2
|
||||
|
||||
* Fri Sep 18 2020 Jan Horak <jhorak@redhat.com>
|
||||
- Update to 78.3.0 build1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user