summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec8
-rw-r--r--rhbz-1173156.patch12
2 files changed, 19 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index 79dbe00..0fbff9c 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -113,7 +113,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 34.0
-Release: 8%{?pre_tag}%{?dist}
+Release: 9%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -146,6 +146,7 @@ Patch204: rhbz-966424.patch
Patch215: firefox-enable-addons.patch
Patch217: firefox-baseline-disable.patch
Patch218: java-plugin-url.patch
+Patch219: rhbz-1173156.patch
# Upstream patches
Patch300: mozilla-858919.patch
@@ -301,6 +302,7 @@ cd %{tarballdir}
%ifarch %{ix86}
%patch217 -p2 -b .baseline
%endif
+%patch219 -p2 -b .rhbz-1173156
# Upstream patches
%patch300 -p1 -b .858919
@@ -777,6 +779,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Tue Dec 23 2014 Martin Stransky <stransky@redhat.com> - 34.0-9
+- Added fix for rhbz#1173156 - Native NTLM authentication
+ on Linux unsupported
+
* Sat Dec 13 2014 Martin Stransky <stransky@redhat.com> - 34.0-8
- Gtk3 - Workaround for Firefox freeze when accessibility is enabled
diff --git a/rhbz-1173156.patch b/rhbz-1173156.patch
new file mode 100644
index 0000000..9855710
--- /dev/null
+++ b/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,
bgstack15