mirror of
https://abf.rosa.ru/djam/firefox.git
synced 2025-02-25 02:52:59 +00:00
up to 50.1.0
This commit is contained in:
keleg
parent
417ac5d8fb
commit
f23cf10a2a
5 changed files with 36 additions and 61 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
firefox-50.0.2.source.tar.xz: 083b9a803b25064b2d7d43e289797a9f2a2e9e5d
|
||||
firefox-50.1.0.source.tar.xz: 6024dc49a566ed6296ad6cd707a199d41f090176
|
||||
|
|
|
|||
19
README.urpmi
19
README.urpmi
|
|
@ -1,19 +0,0 @@
|
|||
Note that Firefox 39 does not support encrypted access certificates
|
||||
SSL3 with key lengths 128 and 256. This is done in order to attract
|
||||
attention to inadequate protection of the access. If you still want
|
||||
to use such certificates, set these browser configuration options
|
||||
(url about: config):
|
||||
|
||||
security.ssl3.dhe_rsa_aes_128_sha=false
|
||||
security.ssl3.dhe_rsa_aes_256_sha=false
|
||||
|
||||
=== Russian ===
|
||||
|
||||
Начиная с версии 39, Firefox не поддерживает шифрованный доступ по
|
||||
сертификатам SSL3 с длиной ключа 128 и 256. Это сделано для привлечения
|
||||
внимания к недостаточной защищенности такого доступа в современных
|
||||
условиях. Если вы по-прежнему хотите использовать такие сертификаты,
|
||||
установите в конфигурации браузера (url about:config) параметры:
|
||||
|
||||
security.ssl3.dhe_rsa_aes_128_sha=false
|
||||
security.ssl3.dhe_rsa_aes_256_sha=false
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- mozilla-release.orig/modules/libpref/init/all.js 2015-05-14 03:57:03.000000000 +0300
|
||||
+++ mozilla-release/modules/libpref/init/all.js 2015-05-21 12:07:36.577448753 +0300
|
||||
@@ -1622,7 +1622,7 @@
|
||||
// For example, "foo.com" would match "http://www.foo.com/bar", etc.
|
||||
|
||||
// Force less-secure NTLMv1 when needed (NTLMv2 is the default).
|
||||
-pref("network.auth.force-generic-ntlm-v1", false);
|
||||
+pref("network.auth.force-generic-ntlm-v1", true);
|
||||
|
||||
// This list controls which URIs can use the negotiate-auth protocol. This
|
||||
// list should be limited to the servers you know you'll need to login to.
|
||||
11
firefox-50.1-fix-glibc-check.patch
Normal file
11
firefox-50.1-fix-glibc-check.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- firefox-50.1.0.old/config/config.mk 2016-11-01 04:15:27.000000000 +0800
|
||||
+++ firefox-50.1.0.new/config/config.mk 2017-01-01 20:40:17.313820042 +0800
|
||||
@@ -556,7 +556,7 @@
|
||||
|
||||
ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION))
|
||||
CHECK_STDCXX = $(call CHECK_SYMBOLS,$(1),GLIBCXX,libstdc++,v[1] > 3 || (v[1] == 3 && v[2] == 4 && v[3] > 16))
|
||||
-CHECK_GLIBC = $(call CHECK_SYMBOLS,$(1),GLIBC,libc,v[1] > 2 || (v[1] == 2 && v[2] > 12))
|
||||
+CHECK_GLIBC = $(call CHECK_SYMBOLS,$(1),GLIBC,libc,v[1] > 2 || (v[1] == 2 && v[2] > 19))
|
||||
endif
|
||||
|
||||
ifeq (,$(filter $(OS_TARGET),WINNT Darwin))
|
||||
54
firefox.spec
54
firefox.spec
|
|
@ -7,7 +7,7 @@
|
|||
# This also means only STABLE upstream releases, NO betas.
|
||||
# This is a discussed topic. Please, do not flame it again.
|
||||
|
||||
%define major 50.0.2
|
||||
%define major 50.1.0
|
||||
%define ff_epoch 0
|
||||
# (tpg) set version HERE !!!
|
||||
%define realver %{major}
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
%define pluginsdir %{_libdir}/mozilla/plugins
|
||||
|
||||
# this seems fragile, so require the exact version or later (#58754)
|
||||
%define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0)
|
||||
#%define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0)
|
||||
%define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0)
|
||||
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null |sed -e 's!\.0!!' || echo 0)
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ Summary: Next generation web browser
|
|||
Name: firefox
|
||||
Version: %{major}
|
||||
Epoch: %{ff_epoch}
|
||||
Release: 2
|
||||
Release: 1
|
||||
License: MPLv1+
|
||||
Group: Networking/WWW
|
||||
Url: http://www.mozilla.com/firefox/
|
||||
|
|
@ -44,7 +44,6 @@ Source0: https://archive.mozilla.org/pub/firefox/releases/%{realver}/source/%{na
|
|||
%endif
|
||||
Source4: %{name}.desktop
|
||||
Source9: kde.js
|
||||
Source1000: README.urpmi
|
||||
# Patches for kde integration of FF
|
||||
# http://www.rosenauer.org/hg/mozilla/summary
|
||||
Patch11: firefox-kde.patch
|
||||
|
|
@ -52,7 +51,7 @@ Patch12: mozilla-kde.patch
|
|||
Patch13: mozilla-kde-background.patch
|
||||
Patch34: xulrunner_nojit.patch
|
||||
Patch35: firefox-37-build-with-time-independent-uuids.patch
|
||||
Patch36: firefox-38.0-enable-NTLMv1.patch
|
||||
Patch37: firefox-50.1-fix-glibc-check.patch
|
||||
|
||||
# Fedora specific patches
|
||||
# Unable to install addons from https pages
|
||||
|
|
@ -74,6 +73,7 @@ BuildRequires: pkgconfig(xscrnsaver)
|
|||
BuildRequires: jpeg-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: pkgconfig(libIDL-2.0)
|
||||
BuildRequires: makedepend
|
||||
BuildRequires: nss-devel >= 2:3.24
|
||||
|
|
@ -81,10 +81,9 @@ BuildRequires: nss-static-devel
|
|||
BuildRequires: nspr-devel >= 2:4.12
|
||||
BuildRequires: startup-notification-devel
|
||||
BuildRequires: dbus-glib-devel
|
||||
BuildRequires: pkgconfig(sqlite3) >= 3.8.10.1
|
||||
#BuildRequires: pkgconfig(sqlite3) >= 3.8.10.1
|
||||
BuildRequires: pkgconfig(libevent)
|
||||
%ifnarch %arm %mips
|
||||
BuildRequires: valgrind
|
||||
BuildRequires: pkgconfig(valgrind)
|
||||
BuildRequires: java-rpmbuild
|
||||
BuildRequires: java-1.8.0-openjdk-devel
|
||||
BuildRequires: yasm >= 1.0.1
|
||||
|
|
@ -99,7 +98,6 @@ BuildRequires: hunspell-devel
|
|||
%endif
|
||||
BuildRequires: doxygen
|
||||
# BuildRequires: xulrunner-devel >= %xulrunner_version%{?prel:-0.%prel}
|
||||
BuildRequires: pkgconfig(libproxy-1.0)
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: wget
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
|
|
@ -125,11 +123,11 @@ Provides: %{name} = %{epoch}:%{realver}
|
|||
Provides: mozilla-firefox = %{epoch}:%{version}-%{release}
|
||||
Provides: webclient
|
||||
|
||||
Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
|
||||
#Requires: %{mklibname sqlite3_ 0} >= %{sqlite3_version}
|
||||
Requires: %{mklibname nss 3} >= 2:%{nss_version}
|
||||
Requires: %{mklibname nspr 4} >= 2:%{nspr_version}
|
||||
Requires: indexhtml
|
||||
Requires: xdg-utils
|
||||
Requires: xdg-utils
|
||||
# fixes bug #42096
|
||||
Requires: mailcap
|
||||
%if %_use_syshunspell
|
||||
|
|
@ -163,7 +161,6 @@ windows, cookies and downloaded files.
|
|||
%{_liconsdir}/%{name}.png
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_libdir}/%{name}-%{major}*
|
||||
%{_docdir}/%{name}/README.urpmi
|
||||
#% ghost %{mozillalibdir}/defaults/profile/bookmarks.html
|
||||
%dir %{_libdir}/mozilla
|
||||
%dir %{_libdir}/mozilla/extensions
|
||||
|
|
@ -199,7 +196,7 @@ Files and macros mainly for building Firefox extensions.
|
|||
%endif
|
||||
%endif
|
||||
%patch35 -p1
|
||||
%patch36 -p1
|
||||
%patch37 -p1
|
||||
|
||||
# Fedora patches
|
||||
%patch204 -p2 -b .966424
|
||||
|
|
@ -217,6 +214,12 @@ perl ./certdata.perl < /etc/pki/tls/mozilla/certdata.txt
|
|||
popd
|
||||
|
||||
%build
|
||||
|
||||
CFLAGS="$CFLAGS -Wno-error=coverage-mismatch -Wno-error=free-nonheap-object"
|
||||
CXXFLAGS="$CFLAGS -Wno-error=coverage-mismatch -Wno-error=free-nonheap-object"
|
||||
export CFLAGS
|
||||
export CXXFLAGS
|
||||
|
||||
export MOZCONFIG=`pwd`/mozconfig
|
||||
cat << EOF > $MOZCONFIG
|
||||
mk_add_options MOZILLA_OFFICIAL=1
|
||||
|
|
@ -224,13 +227,18 @@ mk_add_options BUILD_OFFICIAL=1
|
|||
mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}"
|
||||
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
|
||||
ac_add_options --host=%{_host}
|
||||
ac_add_options --target=%{_target_platform}
|
||||
ac_add_options --enable-optimize
|
||||
ac_add_options --target=i686-rosa-linux-gnu
|
||||
#ac_add_options --target=%{_target_platform}
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --enable-ipc-fuzzer
|
||||
ac_add_options --prefix="%{_prefix}"
|
||||
ac_add_options --libdir="%{_libdir}"
|
||||
ac_add_options --with-system-nspr
|
||||
ac_add_options --with-system-nss
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --with-system-jpeg
|
||||
ac_add_options --with-pthreads
|
||||
ac_add_options --with-system-libevent
|
||||
ac_add_options --without-system-libvpx
|
||||
ac_add_options --with-system-bz2
|
||||
ac_add_options --enable-gio
|
||||
|
|
@ -242,24 +250,11 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
|
|||
ac_add_options --enable-default-toolkit=cairo-gtk2
|
||||
%endif
|
||||
ac_add_options --enable-official-branding
|
||||
ac_add_options --enable-libproxy
|
||||
ac_add_options --with-system-jpeg
|
||||
ac_add_options --disable-system-cairo
|
||||
ac_add_options --enable-system-sqlite
|
||||
ac_add_options --disable-system-sqlite
|
||||
ac_add_options --enable-startup-notification
|
||||
ac_add_options --with-distribution-id=org.rosa
|
||||
ac_add_options --disable-crashreporter
|
||||
ac_add_options --enable-update-channel=%{update_channel}
|
||||
%ifarch %{arm}
|
||||
%if "%{_target_cpu}" != "armv7l"
|
||||
ac_add_options --disable-methodjit
|
||||
ac_add_options --disable-tracejit
|
||||
%endif
|
||||
ac_add_options --enable-system-ffi
|
||||
%endif
|
||||
%ifnarch %{arm} %{mips}
|
||||
ac_add_options --with-valgrind
|
||||
%endif
|
||||
|
||||
EOF
|
||||
|
||||
|
|
@ -372,7 +367,6 @@ cat <<FIN >%{buildroot}%{_sys_macros_dir}/%{name}.macros
|
|||
FIN
|
||||
|
||||
mkdir -p %{buildroot}%{_docdir}/%{name}
|
||||
install -p -m755 %{SOURCE1000} %{buildroot}%{_docdir}/%{name}
|
||||
|
||||
%pre
|
||||
if [ -d %{mozillalibdir}/browser/dictionaries ]; then
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue