From 7607a4ae6fd5a7a02594998aa01c4d10355c4a28 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 08 2016 15:41:26 +0000 Subject: import firefox-45.2.0-1.el7_2 --- diff --git a/.firefox.metadata b/.firefox.metadata index 1ff8a8b..6889574 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 511960dd78451a06c9df76509635aeec05b2051a SOURCES/Python-2.7.8.tgz 467bdb846d67c01aed9e521fe0ef280065a50c3c SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -5703a40f6ed5482f9b2d8da9cbe967f9779cc036 SOURCES/firefox-45.1.1esr.source.tar.xz -fea9c4466da30aba9abd92e431ce44b0ca1f35d6 SOURCES/firefox-langpacks-45.1.1esr-20160504.tar.xz +f3b082c51afb45922b820c2bc01aab01758f0fa8 SOURCES/firefox-45.2.0esr.source.tar.xz +b3941d750f3c3fde34a500dd378c417b117be633 SOURCES/firefox-langpacks-45.2.0esr-20160603.tar.xz e5ba84786af5d0e0e23b1a9112c76821ef23306c SOURCES/gcc48-4.8.2-16.el5.src.rpm 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.gitignore b/.gitignore index 51f973d..62b0e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/Python-2.7.8.tgz SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -SOURCES/firefox-45.1.1esr.source.tar.xz -SOURCES/firefox-langpacks-45.1.1esr-20160504.tar.xz +SOURCES/firefox-45.2.0esr.source.tar.xz +SOURCES/firefox-langpacks-45.2.0esr-20160603.tar.xz SOURCES/gcc48-4.8.2-16.el5.src.rpm SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SOURCES/firefox-centos-default-bookmarks.html b/SOURCES/firefox-centos-default-bookmarks.html deleted file mode 100644 index 95a34bd..0000000 --- a/SOURCES/firefox-centos-default-bookmarks.html +++ /dev/null @@ -1,21 +0,0 @@ - - - -Bookmarks -

Bookmarks

- -

-

Personal Toolbar Folder

-

-

CentOS -

Support

-

-

CentOS Forums -
CentOS Mailing-Lists -
CentOS Documentation -
CentOS Wiki -

-

-

diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index 58d1f61..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,27 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -pref("browser.shell.checkDefaultBrowser", false); -pref("general.smoothScroll", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("storage.nfs_filesystem", false); -pref("dom.ipc.plugins.enabled.nswrapper*", false); -pref("network.manage-offline-status", true); -pref("toolkit.networkmanager.disable", false); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); -pref("toolkit.storage.synchronous", 0); -pref("startup.homepage_override_url", "http://www.centos.org/"); -pref("startup.homepage_welcome_url", "http://www.centos.org/"); -pref("extensions.shownSelectionUI", true); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); -pref("browser.tabs.remote.autostart", false); diff --git a/SOURCES/mozilla-1270046.patch b/SOURCES/mozilla-1270046.patch new file mode 100644 index 0000000..16c6b45 --- /dev/null +++ b/SOURCES/mozilla-1270046.patch @@ -0,0 +1,12 @@ +--- firefox-46.0.1/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156 2016-05-03 06:31:11.000000000 +0100 ++++ firefox-46.0.1/extensions/auth/nsAuthSambaNTLM.cpp 2016-05-04 10:18:53.157429123 +0100 +@@ -256,7 +256,8 @@ nsAuthSambaNTLM::GetNextToken(const void + nsCString line; + if (!ReadLine(mFromChildFD, line)) + return NS_ERROR_FAILURE; +- if (!StringBeginsWith(line, NS_LITERAL_CSTRING("KK "))) { ++ if (!StringBeginsWith(line, NS_LITERAL_CSTRING("KK ")) && ++ !StringBeginsWith(line, NS_LITERAL_CSTRING("AF "))) { + // Something went wrong. Perhaps no credentials are accessible. + return NS_ERROR_FAILURE; + } diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 59b7df7..be27457 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -88,7 +88,7 @@ ExcludeArch: ppc ia64 Summary: Mozilla Firefox Web browser Name: firefox -Version: 45.1.1 +Version: 45.2.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -100,10 +100,10 @@ Group: Applications/Internet # From ftp://archive.mozilla.org/pub/firefox/releases/%{version}%{?ext_version}/source Source0: firefox-%{version}%{?ext_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?ext_version}-20160504.tar.xz +Source1: firefox-langpacks-%{version}%{?ext_version}-20160603.tar.xz %endif Source10: firefox-mozconfig -Source12: firefox-centos-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source500: firefox.sh.in.rhel5 Source600: firefox.sh.in.rhel6 @@ -116,7 +116,7 @@ Source300: gcc48-%{gcc_version}.el5.src.rpm Source301: yasm-1.2.0-3.el5.src.rpm Source302: devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm # RHEL5 bookmarks -Source501: firefox-centos-default-bookmarks.html +Source501: firefox-redhat-default-bookmarks.html # Build patches Patch0: firefox-install-dir.patch @@ -139,6 +139,7 @@ Patch111: rhbz-1173156.patch Patch201: mozilla-1005535.patch # Kaie's patch, we'll most likely need this one Patch202: mozilla-1152515.patch +Patch203: mozilla-1270046.patch # RHEL5 patches Patch500: build-el5-build-id.patch @@ -407,7 +408,7 @@ cd %{tarballdir} %patch201 -p1 -b .mozbz-1005535 # FIXME: will require this?: by kai %patch202 -p1 -b .mozbz-1152515 - +%patch203 -p1 -b .mozbz-1270046 # RHEL5 only patches %if %{?rhel} == 5 @@ -940,8 +941,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue May 12 2016 Johnny Hughes - 45.1.1-1 -- Manual Debranding after autodebrand failed. +* Fri Jun 3 2016 Jan Horak - 45.2.0-1 +- Update to 45.2.0 ESR + +* Tue May 10 2016 Martin Stransky - 45.1.1-2 +- Added fix for mozbz#1270046 - new Samba auth response * Wed May 4 2016 Jan Horak - 45.1.1-1 - Update to 45.1.1 ESR