diff --git a/.firefox.metadata b/.firefox.metadata
index 44e76b5..1ff8a8b 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
-177b27772d1009bfc277577ad4e97d538073f508 SOURCES/firefox-45.1.0esr.source.tar.xz
-e426ed2cea6e0335b979a0ebbfa83ef2ae8f6b28 SOURCES/firefox-langpacks-45.1.0esr-20160421.tar.xz
+5703a40f6ed5482f9b2d8da9cbe967f9779cc036 SOURCES/firefox-45.1.1esr.source.tar.xz
+fea9c4466da30aba9abd92e431ce44b0ca1f35d6 SOURCES/firefox-langpacks-45.1.1esr-20160504.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 a1741dd..51f973d 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.0esr.source.tar.xz
-SOURCES/firefox-langpacks-45.1.0esr-20160421.tar.xz
+SOURCES/firefox-45.1.1esr.source.tar.xz
+SOURCES/firefox-langpacks-45.1.1esr-20160504.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
-
-
-
-
-
-
- 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 fd3108f..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-1266366-branch64.patch b/SOURCES/mozilla-1266366-branch64.patch
deleted file mode 100644
index 590f745..0000000
--- a/SOURCES/mozilla-1266366-branch64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User Nicolas B. Pierron
-
-Bug 1266366 - Add branch64 functions to the none-backend MacroAssembler. r=
-
-diff --git a/js/src/jit/none/MacroAssembler-none.h b/js/src/jit/none/MacroAssembler-none.h
-index 512ae81..4441d8d 100644
---- a/js/src/jit/none/MacroAssembler-none.h
-+++ b/js/src/jit/none/MacroAssembler-none.h
-@@ -254,16 +254,18 @@ class MacroAssemblerNone : public Assembler
- template void branchSub32(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchTestPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchDouble(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
- template void branchFloat(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
- template void branchPrivatePtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
- template void branchTest64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
-+ template void branch64(Condition, T, S, Label*) { MOZ_CRASH(); }
-+ template void branch64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
- template void mov(T, S) { MOZ_CRASH(); }
- template void movq(T, S) { MOZ_CRASH(); }
- template void movePtr(T, S) { MOZ_CRASH(); }
- template void move32(T, S) { MOZ_CRASH(); }
- template void moveFloat32(T, S) { MOZ_CRASH(); }
- template void moveDouble(T, S) { MOZ_CRASH(); }
- template void move64(T, S) { MOZ_CRASH(); }
- template CodeOffset movWithPatch(T, Register) { MOZ_CRASH(); }
-
diff --git a/SOURCES/rhbz-1150082.patch b/SOURCES/rhbz-1150082.patch
new file mode 100644
index 0000000..4091cdb
--- /dev/null
+++ b/SOURCES/rhbz-1150082.patch
@@ -0,0 +1,13 @@
+diff -up mozilla-esr31/media/webrtc/trunk/Makefile.old mozilla-esr31/media/webrtc/trunk/Makefile
+diff -up mozilla-esr31/toolkit/components/osfile/modules/osfile_unix_front.jsm.old mozilla-esr31/toolkit/components/osfile/modules/osfile_unix_front.jsm
+--- mozilla-esr31/toolkit/components/osfile/modules/osfile_unix_front.jsm.old 2014-10-11 17:00:02.000000000 +0200
++++ mozilla-esr31/toolkit/components/osfile/modules/osfile_unix_front.jsm 2014-11-10 13:28:58.474001916 +0100
+@@ -574,7 +574,7 @@
+ };
+
+ // Fortunately, under Linux, that pumping function can be optimized.
+- if (UnixFile.splice) {
++ if (0) {
+ const BUFSIZE = 1 << 17;
+
+ // An implementation of |pump| using |splice| (for Linux/Android)
diff --git a/SOURCES/rhbz-1173156.patch b/SOURCES/rhbz-1173156.patch
new file mode 100644
index 0000000..9855710
--- /dev/null
+++ b/SOURCES/rhbz-1173156.patch
@@ -0,0 +1,12 @@
+diff -up firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp
+--- firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp.old 2014-11-25 12:23:22.000000000 +0100
++++ firefox-31.3.0/mozilla-esr31/extensions/auth/nsAuthSambaNTLM.cpp 2014-12-23 15:26:36.606674625 +0100
+@@ -174,7 +174,7 @@ nsAuthSambaNTLM::SpawnNTLMAuthHelper()
+ return NS_ERROR_FAILURE;
+
+ const char* const args[] = {
+- "ntlm_auth",
++ "/usr/bin/ntlm_auth",
+ "--helper-protocol", "ntlmssp-client-1",
+ "--use-cached-creds",
+ "--username", username,
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 8a2bfab..407e4bc 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -1,4 +1,3 @@
-# FIXME: HAVE TO USE SYSTEM NSS IN FINAL RELEASE!!!
%define system_nss 1
%global nspr_version 4.11.0
%global nss_version 3.21.0
@@ -89,7 +88,7 @@ ExcludeArch: ppc ia64
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 45.1.0
+Version: 45.1.1
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -101,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}-20160421.tar.xz
+Source1: firefox-langpacks-%{version}%{?ext_version}-20160504.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
@@ -117,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
@@ -126,7 +125,6 @@ Patch6: webrtc-arch-cpu.patch
Patch8: firefox-ppc64le.patch
Patch16: mozilla-1253216-disable-ion.patch
Patch17: build-nss.patch
-Patch18: mozilla-1266366-branch64.patch
# RHEL patches
Patch101: firefox-default.patch
@@ -135,6 +133,7 @@ Patch103: rhbz-966424.patch
Patch106: firefox-enable-plugins.patch
Patch109: aarch64-fix-skia.patch
Patch110: mozilla-1170092-etc-conf.patch
+Patch111: rhbz-1173156.patch
# Upstream patches
Patch201: mozilla-1005535.patch
@@ -151,6 +150,7 @@ Patch505: build-el5-rapl.patch
Patch506: build-el5-fontconfig.patch
Patch507: build-el5-stdint.patch
Patch508: build-el5-nss.patch
+Patch509: rhbz-1150082.patch
# ---------------------------------------------------
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -393,7 +393,6 @@ cd %{tarballdir}
%patch8 -p2 -b .ppc64le
%patch16 -p2 -b .moz-1253216-disable-ion
%patch17 -p1 -b .build-nss
-%patch18 -p1 -b .branch64
# RPM specific patches
%patch101 -p1 -b .default
@@ -402,6 +401,7 @@ cd %{tarballdir}
%patch106 -p2 -b .plugins
%patch109 -p1 -b .aarch64
%patch110 -p1 -b .moz-1170092-etc-conf
+%patch111 -p2 -b .rhbz-1173156
# Upstream patches
%patch201 -p1 -b .mozbz-1005535
@@ -420,6 +420,7 @@ cd %{tarballdir}
%patch506 -p1 -b .build-el5-fontconfig
%patch507 -p1 -b .build-el5-stdint
%patch508 -p1 -b .build-el5-nss
+%patch509 -p1 -b .rhbz-1150082
%endif
%{__rm} -f .mozconfig
@@ -514,6 +515,9 @@ function add_to_mozconfig() {
add_to_mozconfig "enable-optimize"
%endif
+#Disabled due to rhbz#1330898
+add_to_mozconfig "disable-ffmpeg"
+
#FIXME RTTI?? RHEL5/6
# ac_add_options --enable-cpp-rtti
# RHEL7: ac_add_options --with-system-bz2
@@ -920,7 +924,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/plugin-container
%{mozappdir}/dependentlibs.list
%exclude %{mozappdir}/defaults/pref/channel-prefs.js
-%{mozappdir}/gmp-clearkey
%if !%{?system_nss}
%{mozappdir}/*.chk
%endif
@@ -937,8 +940,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
-* Tue Apr 26 2016 Johnny Hughes - 45.1.0-1
-- Roll in CentOS Branding
+* Wed May 4 2016 Jan Horak - 45.1.1-1
+- Update to 45.1.1 ESR
+
+* Tue May 3 2016 Martin Stransky - 45.1.0-3
+- Disabled ffmpeg (rhbz#1330898)
+
+* Fri Apr 29 2016 Jan Horak - 45.1.0-1
+- Fixed some regressions introduced by rebase
* Thu Apr 21 2016 Jan Horak - 45.1.0-1
- Update to 45.1.0 ESR