forked from pool/MozillaFirefox
This commit is contained in:
parent
70cdc7f831
commit
96b7ab9388
@ -1,8 +1,47 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 11 18:18:14 CET 2008 - maw@suse.de
|
||||||
|
|
||||||
|
- Security update to version 2.0.0.12 (bnc#354469):
|
||||||
|
+ MFSA 2008-11/CVE-2008-0594 Web forgery overwrite with div
|
||||||
|
overlay
|
||||||
|
+ MFSA 2008-10/CVE-2008-0593 URL token stealing via stylesheet
|
||||||
|
redirect
|
||||||
|
+ MFSA 2008-09/CVE-2008-0592 Mishandling of locally-saved plain
|
||||||
|
text files
|
||||||
|
+ MFSA 2008-08/CVE-2008-0591 File action dialog tampering
|
||||||
|
+ MFSA 2008-06/CVE-2008-0419 Web browsing history and forward
|
||||||
|
navigation stealing
|
||||||
|
+ MFSA 2008-05/CVE-2008-0418 Directory traversal via chrome: URI
|
||||||
|
+ MFSA 2008-04/CVE-2008-0417 Stored password corruption
|
||||||
|
+ MFSA 2008-03/CVE-2008-0415 Privilege escalation, XSS, Remote
|
||||||
|
Code Execution
|
||||||
|
+ MFSA 2008-02/CVE-2008-0414 Multiple file input focus stealing
|
||||||
|
vulnerabilities
|
||||||
|
+ MFSA 2008-01/CVE-2008-0412 Crashes with evidence of memory
|
||||||
|
corruption (rv:1.8.1.12)
|
||||||
|
- Reference libaoss.so in start script (bnc#117079)
|
||||||
|
- Remove mozilla-canvas-1.8.1.10.patch, as it has been upstreamed
|
||||||
|
- Update firefox-ui-lockdown.patch (FATE#301534, FATE#302023, and
|
||||||
|
FATE#302024)
|
||||||
|
- Add application/x-xpinstall mime type to MozillaFirefox.desktop
|
||||||
|
- Add MozillaFirefox.xml to bind .xpi to application/x-xpinstall
|
||||||
|
in desktop.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 17 17:52:47 CET 2008 - maw@suse.de
|
Thu Jan 17 17:52:47 CET 2008 - maw@suse.de
|
||||||
|
|
||||||
- Add mozilla-maxpathlen.patch (#354150 and bmo #412610).
|
- Add mozilla-maxpathlen.patch (#354150 and bmo #412610).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 21 18:46:50 CET 2007 - maw@suse.de
|
||||||
|
|
||||||
|
- Add firefox-348446-empty-lists.patch (bnc#348446).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 5 02:21:26 CET 2007 - maw@suse.de
|
||||||
|
|
||||||
|
- Respin proxy-dev.patch (bnc#340678) -- thanks, Anders!
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 27 18:25:25 CET 2007 - maw@suse.de
|
Tue Nov 27 18:25:25 CET 2007 - maw@suse.de
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package MozillaFirefox (Version 2.0.0.10)
|
# spec file for package MozillaFirefox (Version 2.0.0.12)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -10,7 +10,24 @@
|
|||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
Name: MozillaFirefox
|
Name: MozillaFirefox
|
||||||
|
# Checklist for updating:
|
||||||
|
# * Copy new sources (don't forget l10n-%{version}.tar.bz2) and patches
|
||||||
|
# to your package checkout.
|
||||||
|
# * Increment Version: as necessary
|
||||||
|
# * Update releasedate
|
||||||
|
# * Ensure patches are in sync among all releases
|
||||||
|
# * configure.patch should be the last patch applied against the mozilla
|
||||||
|
# source itself; the following patches apply to other tarballs.
|
||||||
|
# * configure.patch is regenerated (when necessary) by applying
|
||||||
|
# pango-cairo.patch, dbus.patch, startup.patch to an unpacked source,
|
||||||
|
# and then running autoconf 2.13. debian.suse.de used to have this
|
||||||
|
# version installed. For more info see
|
||||||
|
# http://developer.mozilla.org/en/docs/How_Mozilla's_build_system_works
|
||||||
|
# * Update the .changes file
|
||||||
|
# * Update this checklist if necessary and keep it in sync on all supported
|
||||||
|
# platforms.
|
||||||
BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel unzip update-desktop-files zip
|
BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel unzip update-desktop-files zip
|
||||||
%if %suse_version <= 1010
|
%if %suse_version <= 1010
|
||||||
BuildRequires: dbus-1-devel
|
BuildRequires: dbus-1-devel
|
||||||
@ -28,8 +45,8 @@ Obsoletes: MozillaFirebird <= 1.0.7
|
|||||||
%if %sles_version == 10
|
%if %sles_version == 10
|
||||||
Obsoletes: mozilla
|
Obsoletes: mozilla
|
||||||
%endif
|
%endif
|
||||||
Version: 2.0.0.10
|
Version: 2.0.0.12
|
||||||
Release: 16
|
Release: 1
|
||||||
Summary: Mozilla Firefox Web Browser
|
Summary: Mozilla Firefox Web Browser
|
||||||
Url: http://www.mozilla.org/
|
Url: http://www.mozilla.org/
|
||||||
Group: Productivity/Networking/Web/Browsers
|
Group: Productivity/Networking/Web/Browsers
|
||||||
@ -56,6 +73,7 @@ Source11: firefox48.png
|
|||||||
Source16: firefox.1
|
Source16: firefox.1
|
||||||
Source17: firefox-suse-default-prefs.js
|
Source17: firefox-suse-default-prefs.js
|
||||||
Source18: firefox.schemas
|
Source18: firefox.schemas
|
||||||
|
Source19: MozillaFirefox.xml
|
||||||
Patch1: visibility.patch
|
Patch1: visibility.patch
|
||||||
Patch2: rpath.patch
|
Patch2: rpath.patch
|
||||||
Patch3: gcc-undefined-ops.patch
|
Patch3: gcc-undefined-ops.patch
|
||||||
@ -79,6 +97,7 @@ Patch16: gnome-vfs-default.patch
|
|||||||
Patch17: firefox-appname.patch
|
Patch17: firefox-appname.patch
|
||||||
Patch18: firefox-no-update.patch
|
Patch18: firefox-no-update.patch
|
||||||
Patch19: dbus.patch
|
Patch19: dbus.patch
|
||||||
|
Patch20: mozilla-path_len.patch
|
||||||
# customization
|
# customization
|
||||||
Patch22: cjk-postscript-fonts.dif
|
Patch22: cjk-postscript-fonts.dif
|
||||||
Patch23: startup.patch
|
Patch23: startup.patch
|
||||||
@ -92,14 +111,13 @@ Patch33: proxy-dev.patch
|
|||||||
# integration
|
# integration
|
||||||
Patch34: skin-selection.patch
|
Patch34: skin-selection.patch
|
||||||
Patch36: greasemonkey.patch
|
Patch36: greasemonkey.patch
|
||||||
Patch37: mozilla-canvas-1.8.1.10.patch
|
|
||||||
Patch38: tango-maxversion.patch
|
Patch38: tango-maxversion.patch
|
||||||
Patch39: x11-session.patch
|
Patch39: x11-session.patch
|
||||||
Patch40: mozilla-maxpathlen.patch
|
Patch40: firefox-348446-empty-lists.patch
|
||||||
# gconf.patch dbus.patch startup.patch
|
# gconf.patch dbus.patch startup.patch
|
||||||
Patch100: configure.patch
|
Patch100: configure.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
PreReq: libstdc++ fileutils textutils /bin/sh gconf2
|
PreReq: libstdc++ fileutils textutils /bin/sh gconf2 shared-mime-info desktop-file-utils
|
||||||
%if %suse_version < 1030
|
%if %suse_version < 1030
|
||||||
Requires: /usr/lib/libaoss.so
|
Requires: /usr/lib/libaoss.so
|
||||||
%endif
|
%endif
|
||||||
@ -126,7 +144,7 @@ Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozil
|
|||||||
Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`)
|
Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`)
|
||||||
%endif
|
%endif
|
||||||
%define _unpackaged_files_terminate_build 0
|
%define _unpackaged_files_terminate_build 0
|
||||||
%define releasedate 2007073000
|
%define releasedate 2008020300
|
||||||
%define progname firefox
|
%define progname firefox
|
||||||
%if %suse_version < 1010
|
%if %suse_version < 1010
|
||||||
%define progdir /opt/MozillaFirefox/%_lib
|
%define progdir /opt/MozillaFirefox/%_lib
|
||||||
@ -195,7 +213,7 @@ cd $RPM_BUILD_DIR/mozilla
|
|||||||
%patch6
|
%patch6
|
||||||
%patch7
|
%patch7
|
||||||
# lockdown stuff
|
# lockdown stuff
|
||||||
%patch8
|
%patch8 -p1
|
||||||
%patch9
|
%patch9
|
||||||
%patch10
|
%patch10
|
||||||
%patch11
|
%patch11
|
||||||
@ -206,6 +224,7 @@ cd $RPM_BUILD_DIR/mozilla
|
|||||||
%patch17
|
%patch17
|
||||||
%patch18
|
%patch18
|
||||||
%patch19
|
%patch19
|
||||||
|
%patch20 -p1
|
||||||
# system NSS
|
# system NSS
|
||||||
%patch22
|
%patch22
|
||||||
%patch23
|
%patch23
|
||||||
@ -216,10 +235,9 @@ cd $RPM_BUILD_DIR/mozilla
|
|||||||
%patch16
|
%patch16
|
||||||
%endif
|
%endif
|
||||||
%patch32
|
%patch32
|
||||||
%patch33
|
%patch33 -p1
|
||||||
%patch34
|
%patch34
|
||||||
%patch36
|
%patch36
|
||||||
%patch37
|
|
||||||
pushd $RPM_BUILD_DIR
|
pushd $RPM_BUILD_DIR
|
||||||
%patch38
|
%patch38
|
||||||
popd
|
popd
|
||||||
@ -362,6 +380,8 @@ install -m 644 %{SOURCE1} \
|
|||||||
$RPM_BUILD_ROOT/usr/share/applications
|
$RPM_BUILD_ROOT/usr/share/applications
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
|
||||||
|
cp %{S:19} $RPM_BUILD_ROOT/%{_datadir}/mime/packages
|
||||||
# SCHEMA File
|
# SCHEMA File
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas
|
mkdir -p $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas
|
||||||
install -m 644 %{SOURCE18} \
|
install -m 644 %{SOURCE18} \
|
||||||
@ -444,6 +464,18 @@ rm -f %{my_requires}
|
|||||||
%preun -f %{name}.schemas_preun
|
%preun -f %{name}.schemas_preun
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
if [ -f usr/bin/update-mime-database ] ; then
|
||||||
|
usr/bin/update-mime-database %{_datadir}/mime >/dev/null || true
|
||||||
|
fi
|
||||||
|
%if %suse_version >= 1030
|
||||||
|
if [ -f usr/bin/update-desktop-database ] ; then
|
||||||
|
usr/bin/update-desktop-database >/dev/null || true
|
||||||
|
fi
|
||||||
|
%else
|
||||||
|
if [ -f opt/gnome/bin/update-mime-database ] ; then
|
||||||
|
opt/gnome/bin/update-mime-database >/dev/null || true
|
||||||
|
fi
|
||||||
|
%endif
|
||||||
%if %suse_version >= 1010
|
%if %suse_version >= 1010
|
||||||
# move plugins to new location
|
# move plugins to new location
|
||||||
if [ "$1" = "2" ]; then
|
if [ "$1" = "2" ]; then
|
||||||
@ -469,6 +501,20 @@ exit 0
|
|||||||
%if %suse_version <= 1000
|
%if %suse_version <= 1000
|
||||||
%posttrans -f %{name}.schemas_posttrans
|
%posttrans -f %{name}.schemas_posttrans
|
||||||
|
|
||||||
|
%postun
|
||||||
|
if [ -f usr/bin/update-mime-database ] ; then
|
||||||
|
usr/bin/update-mime-database %{_datadir}/mime >/dev/null || true
|
||||||
|
fi
|
||||||
|
%if %suse_version >= 1030
|
||||||
|
if [ -f usr/bin/update-desktop-database ] ; then
|
||||||
|
usr/bin/update-desktop-database >/dev/null || true
|
||||||
|
fi
|
||||||
|
%else
|
||||||
|
if [ -f opt/gnome/bin/update-mime-database ] ; then
|
||||||
|
opt/gnome/bin/update-mime-database >/dev/null || true
|
||||||
|
fi
|
||||||
|
%endif
|
||||||
|
|
||||||
%triggerin -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin
|
%triggerin -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin
|
||||||
%{progdir}/add-plugins.sh > /dev/null 2>&1
|
%{progdir}/add-plugins.sh > /dev/null 2>&1
|
||||||
exit 0
|
exit 0
|
||||||
@ -561,8 +607,38 @@ exit 0
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 11 2008 maw@suse.de
|
||||||
|
- Security update to version 2.0.0.12 (bnc#354469):
|
||||||
|
+ MFSA 2008-11/CVE-2008-0594 Web forgery overwrite with div
|
||||||
|
overlay
|
||||||
|
+ MFSA 2008-10/CVE-2008-0593 URL token stealing via stylesheet
|
||||||
|
redirect
|
||||||
|
+ MFSA 2008-09/CVE-2008-0592 Mishandling of locally-saved plain
|
||||||
|
text files
|
||||||
|
+ MFSA 2008-08/CVE-2008-0591 File action dialog tampering
|
||||||
|
+ MFSA 2008-06/CVE-2008-0419 Web browsing history and forward
|
||||||
|
navigation stealing
|
||||||
|
+ MFSA 2008-05/CVE-2008-0418 Directory traversal via chrome: URI
|
||||||
|
+ MFSA 2008-04/CVE-2008-0417 Stored password corruption
|
||||||
|
+ MFSA 2008-03/CVE-2008-0415 Privilege escalation, XSS, Remote
|
||||||
|
Code Execution
|
||||||
|
+ MFSA 2008-02/CVE-2008-0414 Multiple file input focus stealing
|
||||||
|
vulnerabilities
|
||||||
|
+ MFSA 2008-01/CVE-2008-0412 Crashes with evidence of memory
|
||||||
|
corruption (rv:1.8.1.12)
|
||||||
|
- Reference libaoss.so in start script (bnc#117079)
|
||||||
|
- Remove mozilla-canvas-1.8.1.10.patch, as it has been upstreamed
|
||||||
|
- Update firefox-ui-lockdown.patch (FATE#301534, FATE#302023, and
|
||||||
|
FATE#302024)
|
||||||
|
- Add application/x-xpinstall mime type to MozillaFirefox.desktop
|
||||||
|
- Add MozillaFirefox.xml to bind .xpi to application/x-xpinstall
|
||||||
|
in desktop.
|
||||||
* Thu Jan 17 2008 maw@suse.de
|
* Thu Jan 17 2008 maw@suse.de
|
||||||
- Add mozilla-maxpathlen.patch (#354150 and bmo #412610).
|
- Add mozilla-maxpathlen.patch (#354150 and bmo #412610).
|
||||||
|
* Fri Dec 21 2007 maw@suse.de
|
||||||
|
- Add firefox-348446-empty-lists.patch (bnc#348446).
|
||||||
|
* Wed Dec 05 2007 maw@suse.de
|
||||||
|
- Respin proxy-dev.patch (bnc#340678) -- thanks, Anders!
|
||||||
* Tue Nov 27 2007 maw@suse.de
|
* Tue Nov 27 2007 maw@suse.de
|
||||||
- Security update to version 2.0.0.10 (#341905, #341591):
|
- Security update to version 2.0.0.10 (#341905, #341591):
|
||||||
+ MFSA 2007-39 Referer-spoofing via window.location race condition
|
+ MFSA 2007-39 Referer-spoofing via window.location race condition
|
||||||
@ -589,7 +665,7 @@ exit 0
|
|||||||
http://www.mozilla.org/projects/security/known-vulnerabilities.html
|
http://www.mozilla.org/projects/security/known-vulnerabilities.html
|
||||||
* Sun Sep 23 2007 maw@suse.de
|
* Sun Sep 23 2007 maw@suse.de
|
||||||
- Don't explicitly require libaoss.so (#326751).
|
- Don't explicitly require libaoss.so (#326751).
|
||||||
* Fri Sep 14 2007 maw@suse.de
|
* Sat Sep 15 2007 maw@suse.de
|
||||||
- Update the Novell Support search plugin in search-addons.tar.bz2
|
- Update the Novell Support search plugin in search-addons.tar.bz2
|
||||||
(#297261)
|
(#297261)
|
||||||
- Set the browser.tabs.loadFolderAndReplace preference to false
|
- Set the browser.tabs.loadFolderAndReplace preference to false
|
||||||
@ -653,7 +729,7 @@ exit 0
|
|||||||
- Use mozilla.sh.in from the build service (#230681).
|
- Use mozilla.sh.in from the build service (#230681).
|
||||||
* Tue Jun 05 2007 sbrabec@suse.cz
|
* Tue Jun 05 2007 sbrabec@suse.cz
|
||||||
- Removed invalid desktop category "Application" (#254654).
|
- Removed invalid desktop category "Application" (#254654).
|
||||||
* Mon Jun 04 2007 maw@suse.de
|
* Tue Jun 05 2007 maw@suse.de
|
||||||
- Security update to version 2.0.0.4
|
- Security update to version 2.0.0.4
|
||||||
- Refresh configure.patch, startup.patch, and visibility.patch
|
- Refresh configure.patch, startup.patch, and visibility.patch
|
||||||
- Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2.
|
- Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2.
|
||||||
@ -665,7 +741,7 @@ exit 0
|
|||||||
U+3099 U+309A (see bugzilla #262718 comment #29).
|
U+3099 U+309A (see bugzilla #262718 comment #29).
|
||||||
* Mon Mar 12 2007 maw@suse.de
|
* Mon Mar 12 2007 maw@suse.de
|
||||||
- Package gconf stuff.
|
- Package gconf stuff.
|
||||||
* Wed Feb 21 2007 maw@suse.de
|
* Thu Feb 22 2007 maw@suse.de
|
||||||
- Security update to 2.0.0.2 (#244923), which covers:
|
- Security update to 2.0.0.2 (#244923), which covers:
|
||||||
+ mfsa2007-01
|
+ mfsa2007-01
|
||||||
* CVE-2007-0775 - layout engine crashes
|
* CVE-2007-0775 - layout engine crashes
|
||||||
@ -1209,7 +1285,7 @@ exit 0
|
|||||||
* Fri Oct 15 2004 stark@suse.de
|
* Fri Oct 15 2004 stark@suse.de
|
||||||
- inherit locale from system
|
- inherit locale from system
|
||||||
- fixed chrome registration
|
- fixed chrome registration
|
||||||
* Wed Oct 06 2004 joeshaw@suse.de
|
* Thu Oct 07 2004 joeshaw@suse.de
|
||||||
- disable gconf settings as default (Ximian #67718)
|
- disable gconf settings as default (Ximian #67718)
|
||||||
* Wed Oct 06 2004 stark@suse.de
|
* Wed Oct 06 2004 stark@suse.de
|
||||||
- fixed inclusion of RealPlayer plugin again
|
- fixed inclusion of RealPlayer plugin again
|
||||||
|
7
MozillaFirefox.xml
Normal file
7
MozillaFirefox.xml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
|
||||||
|
<mime-type type="application/x-xpinstall">
|
||||||
|
<comment xml:lang="en">Mozilla Cross-Platform Installer Module</comment>
|
||||||
|
<glob pattern="*.xpi" />
|
||||||
|
</mime-type>
|
||||||
|
</mime-info>
|
3017
configure.patch
3017
configure.patch
File diff suppressed because it is too large
Load Diff
56
dbus.patch
56
dbus.patch
@ -148,9 +148,26 @@ Index: configure.in
|
|||||||
+
|
+
|
||||||
+CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
|
+CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_GTHREAD_CFLAGS)
|
||||||
+CXXFLAGS := $(subst -pedantic,,$(CXXFLAGS))
|
+CXXFLAGS := $(subst -pedantic,,$(CXXFLAGS))
|
||||||
--- extensions/dbus/nsDBusModule.cpp
|
Index: config/system-headers
|
||||||
+++ extensions/dbus/nsDBusModule.cpp
|
===================================================================
|
||||||
@@ -0,0 +1,414 @@
|
RCS file: /cvsroot/mozilla/config/system-headers,v
|
||||||
|
retrieving revision 3.4.4.3
|
||||||
|
diff -u -r3.4.4.3 system-headers
|
||||||
|
--- config/system-headers 18 Dec 2006 23:48:58 -0000 3.4.4.3
|
||||||
|
+++ config/system-headers 13 Nov 2007 23:04:10 -0000
|
||||||
|
@@ -141,6 +141,9 @@
|
||||||
|
curses.h
|
||||||
|
cxxabi.h
|
||||||
|
DateTimeUtils.h
|
||||||
|
+dbus/dbus.h
|
||||||
|
+dbus/dbus-glib.h
|
||||||
|
+dbus/dbus-glib-lowlevel.h
|
||||||
|
ddeml.h
|
||||||
|
Debug.h
|
||||||
|
dem.h
|
||||||
|
--- extensions/dbus/nsDBusModule.cpp.none 1970-01-01 01:00:00.000000000 +0100
|
||||||
|
+++ extensions/dbus/nsDBusModule.cpp 2008-01-15 17:09:51.000000000 +0100
|
||||||
|
@@ -0,0 +1,418 @@
|
||||||
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||||
+/* vim:expandtab:shiftwidth=4:tabstop=4:
|
+/* vim:expandtab:shiftwidth=4:tabstop=4:
|
||||||
+ */
|
+ */
|
||||||
@ -347,14 +364,18 @@ Index: configure.in
|
|||||||
+ if (!mPrefsLoaded || !mGotNetworkStatus)
|
+ if (!mPrefsLoaded || !mGotNetworkStatus)
|
||||||
+ return;
|
+ return;
|
||||||
+
|
+
|
||||||
|
+ // ignore set requests if special pref is set
|
||||||
+ nsCOMPtr<nsIPrefBranch2> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
|
+ nsCOMPtr<nsIPrefBranch2> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
|
||||||
+ if (prefs) {
|
+ if (prefs) {
|
||||||
+ prefs->SetBoolPref("browser.offline", !mNetworkOnline);
|
+ PRBool ignore = PR_FALSE;
|
||||||
+ }
|
+ prefs->GetBoolPref("browser.ignoreNM", &ignore);
|
||||||
+
|
+ if (!ignore) {
|
||||||
+ nsCOMPtr<nsIIOService> ios(do_GetService(NS_IOSERVICE_CONTRACTID));
|
+ prefs->SetBoolPref("browser.offline", !mNetworkOnline);
|
||||||
+ if (ios) {
|
+ nsCOMPtr<nsIIOService> ios(do_GetService(NS_IOSERVICE_CONTRACTID));
|
||||||
+ ios->SetOffline(!mNetworkOnline);
|
+ if (ios) {
|
||||||
|
+ ios->SetOffline(!mNetworkOnline);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
@ -565,20 +586,3 @@ Index: configure.in
|
|||||||
+};
|
+};
|
||||||
+
|
+
|
||||||
+NS_IMPL_NSGETMODULE(nsDBusModule, components)
|
+NS_IMPL_NSGETMODULE(nsDBusModule, components)
|
||||||
Index: config/system-headers
|
|
||||||
===================================================================
|
|
||||||
RCS file: /cvsroot/mozilla/config/system-headers,v
|
|
||||||
retrieving revision 3.4.4.3
|
|
||||||
diff -u -r3.4.4.3 system-headers
|
|
||||||
--- config/system-headers 18 Dec 2006 23:48:58 -0000 3.4.4.3
|
|
||||||
+++ config/system-headers 13 Nov 2007 23:04:10 -0000
|
|
||||||
@@ -141,6 +141,9 @@
|
|
||||||
curses.h
|
|
||||||
cxxabi.h
|
|
||||||
DateTimeUtils.h
|
|
||||||
+dbus/dbus.h
|
|
||||||
+dbus/dbus-glib.h
|
|
||||||
+dbus/dbus-glib-lowlevel.h
|
|
||||||
ddeml.h
|
|
||||||
Debug.h
|
|
||||||
dem.h
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c68728943863b7c7f7363c9446ec1e087198f67897cca58a3373e761a2f595ca
|
|
||||||
size 37474489
|
|
3
firefox-2.0.0.12-source.tar.bz2
Normal file
3
firefox-2.0.0.12-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e693cdb4c76e985979bb913b5591bbd7406625ee1bb7fe6c373009ee502e7c77
|
||||||
|
size 37730299
|
13
firefox-348446-empty-lists.patch
Normal file
13
firefox-348446-empty-lists.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: mozilla/toolkit/components/printing/content/printdialog.js
|
||||||
|
===================================================================
|
||||||
|
--- mozilla.orig/toolkit/components/printing/content/printdialog.js
|
||||||
|
+++ mozilla/toolkit/components/printing/content/printdialog.js
|
||||||
|
@@ -93,7 +93,7 @@ function initDialog()
|
||||||
|
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
|
.getService(Components.interfaces.nsIPrefService).getBranch(null);
|
||||||
|
if (gPrefService.getBoolPref("config.lockdown.savepage")) {
|
||||||
|
- dialog.fileRadio.setAttribute("disabled", "true");
|
||||||
|
+ dialog.fileCheck.setAttribute("disabled", "true");
|
||||||
|
}
|
||||||
|
if (gPrefService.getBoolPref("config.lockdown.printing")) {
|
||||||
|
dialog.printButton.setAttribute("disabled", "true");
|
@ -1,5 +1,21 @@
|
|||||||
--- browser/base/content/browser-menubar.inc
|
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
|
||||||
+++ browser/base/content/browser-menubar.inc
|
index 72fd054..ea364fe 100644
|
||||||
|
--- a/browser/base/content/browser-context.inc
|
||||||
|
+++ b/browser/base/content/browser-context.inc
|
||||||
|
@@ -206,7 +206,8 @@
|
||||||
|
accesskey="&saveFrameCmd.accesskey;"
|
||||||
|
oncommand="saveDocument(gContextMenu.target.ownerDocument);"/>
|
||||||
|
<menuseparator/>
|
||||||
|
- <menuitem label="&viewFrameSourceCmd.label;"
|
||||||
|
+ <menuitem id="context-frame-viewFrameSourceCmd"
|
||||||
|
+ label="&viewFrameSourceCmd.label;"
|
||||||
|
accesskey="&viewFrameSourceCmd.accesskey;"
|
||||||
|
oncommand="gContextMenu.viewFrameSource();"/>
|
||||||
|
<menuitem label="&viewFrameInfoCmd.label;"
|
||||||
|
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
|
||||||
|
index bcf9109..0cc6740 100644
|
||||||
|
--- a/browser/base/content/browser-menubar.inc
|
||||||
|
+++ b/browser/base/content/browser-menubar.inc
|
||||||
@@ -55,9 +55,9 @@
|
@@ -55,9 +55,9 @@
|
||||||
<menuitem id="menu_saveFrame" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" command="Browser:SaveFrame" hidden="true"/>
|
<menuitem id="menu_saveFrame" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" command="Browser:SaveFrame" hidden="true"/>
|
||||||
<menuitem id="menu_sendLink" label="&sendPageCmd.label;" accesskey="&sendPageCmd.accesskey;" command="Browser:SendLink"/>
|
<menuitem id="menu_sendLink" label="&sendPageCmd.label;" accesskey="&sendPageCmd.accesskey;" command="Browser:SendLink"/>
|
||||||
@ -21,9 +37,11 @@
|
|||||||
label="&manBookmarksCmd.label;"
|
label="&manBookmarksCmd.label;"
|
||||||
oncommand="toOpenWindowByType('bookmarks:manager', 'chrome://browser/content/bookmarks/bookmarksManager.xul');"/>
|
oncommand="toOpenWindowByType('bookmarks:manager', 'chrome://browser/content/bookmarks/bookmarksManager.xul');"/>
|
||||||
<menuseparator/>
|
<menuseparator/>
|
||||||
--- browser/base/content/browser.js
|
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
||||||
+++ browser/base/content/browser.js
|
index 0dcabc8..bcad885 100644
|
||||||
@@ -183,6 +183,12 @@
|
--- a/browser/base/content/browser.js
|
||||||
|
+++ b/browser/base/content/browser.js
|
||||||
|
@@ -179,6 +179,12 @@ function UpdateBackForwardButtons()
|
||||||
var backBroadcaster = document.getElementById("Browser:Back");
|
var backBroadcaster = document.getElementById("Browser:Back");
|
||||||
var forwardBroadcaster = document.getElementById("Browser:Forward");
|
var forwardBroadcaster = document.getElementById("Browser:Forward");
|
||||||
|
|
||||||
@ -36,7 +54,7 @@
|
|||||||
var webNavigation = gBrowser.webNavigation;
|
var webNavigation = gBrowser.webNavigation;
|
||||||
|
|
||||||
// Avoid setting attributes on broadcasters if the value hasn't changed!
|
// Avoid setting attributes on broadcasters if the value hasn't changed!
|
||||||
@@ -953,6 +959,107 @@
|
@@ -934,6 +940,112 @@ function prepareForStartup()
|
||||||
BrowserSearch.init();
|
BrowserSearch.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,6 +88,11 @@
|
|||||||
+ lockdownElement("context-savepage", disableSave);
|
+ lockdownElement("context-savepage", disableSave);
|
||||||
+ lockdownElement("context-savelink", disableSave);
|
+ lockdownElement("context-savelink", disableSave);
|
||||||
+ lockdownElement("context-saveimage", disableSave);
|
+ lockdownElement("context-saveimage", disableSave);
|
||||||
|
+ lockdownElement("View:PageSource", disableSave);
|
||||||
|
+ lockdownElement("context-viewpartialsource-selection", disableSave);
|
||||||
|
+ lockdownElement("context-viewpartialsource-mathml", disableSave);
|
||||||
|
+ lockdownElement("context-viewsource", disableSave);
|
||||||
|
+ lockdownElement("context-frame-viewFrameSourceCmd", disableSave);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ var disableBookmarks = gPrefService.getBoolPref("config.lockdown.hidebookmark");
|
+ var disableBookmarks = gPrefService.getBoolPref("config.lockdown.hidebookmark");
|
||||||
@ -144,7 +167,7 @@
|
|||||||
function delayedStartup()
|
function delayedStartup()
|
||||||
{
|
{
|
||||||
var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||||
@@ -961,7 +1068,15 @@
|
@@ -942,7 +1054,15 @@ function delayedStartup()
|
||||||
|
|
||||||
if (!gPrefService)
|
if (!gPrefService)
|
||||||
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
|
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
@ -161,7 +184,7 @@
|
|||||||
BrowserOffline.init();
|
BrowserOffline.init();
|
||||||
|
|
||||||
if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {
|
if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {
|
||||||
@@ -980,8 +1095,8 @@
|
@@ -961,8 +1081,8 @@ function delayedStartup()
|
||||||
window.addEventListener("keypress", ctrlNumberTabSelection, false);
|
window.addEventListener("keypress", ctrlNumberTabSelection, false);
|
||||||
|
|
||||||
if (gMustLoadSidebar) {
|
if (gMustLoadSidebar) {
|
||||||
@ -171,7 +194,7 @@
|
|||||||
sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
|
sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1154,6 +1269,8 @@
|
@@ -1130,6 +1250,8 @@ function BrowserShutdown()
|
||||||
os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
|
os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
|
||||||
os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
|
os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
|
||||||
|
|
||||||
@ -180,7 +203,7 @@
|
|||||||
try {
|
try {
|
||||||
gBrowser.removeProgressListener(window.XULBrowserWindow);
|
gBrowser.removeProgressListener(window.XULBrowserWindow);
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
@@ -1739,6 +1856,9 @@
|
@@ -1687,6 +1809,9 @@ function updateGoMenu(aEvent, goMenu)
|
||||||
|
|
||||||
var history = document.getElementById("hiddenHistoryTree");
|
var history = document.getElementById("hiddenHistoryTree");
|
||||||
|
|
||||||
@ -190,7 +213,7 @@
|
|||||||
if (history.hidden) {
|
if (history.hidden) {
|
||||||
history.hidden = false;
|
history.hidden = false;
|
||||||
var globalHistory = Components.classes["@mozilla.org/browser/global-history;2"]
|
var globalHistory = Components.classes["@mozilla.org/browser/global-history;2"]
|
||||||
@@ -3405,6 +3525,7 @@
|
@@ -3355,6 +3480,7 @@ function BrowserCustomizeToolbar()
|
||||||
|
|
||||||
var cmd = document.getElementById("cmd_CustomizeToolbars");
|
var cmd = document.getElementById("cmd_CustomizeToolbars");
|
||||||
cmd.setAttribute("disabled", "true");
|
cmd.setAttribute("disabled", "true");
|
||||||
@ -198,7 +221,7 @@
|
|||||||
|
|
||||||
#ifdef TOOLBAR_CUSTOMIZATION_SHEET
|
#ifdef TOOLBAR_CUSTOMIZATION_SHEET
|
||||||
document.getElementById("customizeToolbarSheetBox").hidden = false;
|
document.getElementById("customizeToolbarSheetBox").hidden = false;
|
||||||
@@ -3432,6 +3553,15 @@
|
@@ -3382,6 +3508,15 @@ function BrowserCustomizeToolbar()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -214,7 +237,7 @@
|
|||||||
function BrowserToolboxCustomizeDone(aToolboxChanged)
|
function BrowserToolboxCustomizeDone(aToolboxChanged)
|
||||||
{
|
{
|
||||||
#ifdef TOOLBAR_CUSTOMIZATION_SHEET
|
#ifdef TOOLBAR_CUSTOMIZATION_SHEET
|
||||||
@@ -3464,8 +3594,7 @@
|
@@ -3414,8 +3549,7 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
|
||||||
var menubar = document.getElementById("main-menubar");
|
var menubar = document.getElementById("main-menubar");
|
||||||
for (var i = 0; i < menubar.childNodes.length; ++i)
|
for (var i = 0; i < menubar.childNodes.length; ++i)
|
||||||
menubar.childNodes[i].setAttribute("disabled", false);
|
menubar.childNodes[i].setAttribute("disabled", false);
|
||||||
@ -224,7 +247,7 @@
|
|||||||
|
|
||||||
// XXXmano bug 287105: wallpaper to bug 309953,
|
// XXXmano bug 287105: wallpaper to bug 309953,
|
||||||
// the reload button isn't in sync with the reload command.
|
// the reload button isn't in sync with the reload command.
|
||||||
@@ -4225,6 +4354,9 @@
|
@@ -4176,6 +4310,9 @@ function onViewToolbarsPopupShowing(aEvent)
|
||||||
menuItem.setAttribute("toolbarindex", i);
|
menuItem.setAttribute("toolbarindex", i);
|
||||||
menuItem.setAttribute("type", "checkbox");
|
menuItem.setAttribute("type", "checkbox");
|
||||||
menuItem.setAttribute("label", toolbarName);
|
menuItem.setAttribute("label", toolbarName);
|
||||||
@ -234,7 +257,7 @@
|
|||||||
menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey"));
|
menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey"));
|
||||||
menuItem.setAttribute("checked", toolbar.getAttribute("collapsed") != "true");
|
menuItem.setAttribute("checked", toolbar.getAttribute("collapsed") != "true");
|
||||||
popup.insertBefore(menuItem, firstMenuItem);
|
popup.insertBefore(menuItem, firstMenuItem);
|
||||||
@@ -4466,7 +4598,8 @@
|
@@ -4417,7 +4554,8 @@ nsContextMenu.prototype = {
|
||||||
#endif
|
#endif
|
||||||
this.showItem( "context-setDesktopBackground", haveSetDesktopBackground && this.onLoadedImage );
|
this.showItem( "context-setDesktopBackground", haveSetDesktopBackground && this.onLoadedImage );
|
||||||
|
|
||||||
@ -244,9 +267,28 @@
|
|||||||
this.setItemAttr( "context-setDesktopBackground", "disabled", this.disableSetDesktopBackground());
|
this.setItemAttr( "context-setDesktopBackground", "disabled", this.disableSetDesktopBackground());
|
||||||
|
|
||||||
// View Image depends on whether an image was clicked on.
|
// View Image depends on whether an image was clicked on.
|
||||||
--- browser/components/bookmarks/content/bookmarksProperties.js
|
diff --git a/browser/base/content/pageInfo.js b/browser/base/content/pageInfo.js
|
||||||
+++ browser/components/bookmarks/content/bookmarksProperties.js
|
index 289aad6..e9c1f34 100644
|
||||||
@@ -138,6 +138,15 @@
|
--- a/browser/base/content/pageInfo.js
|
||||||
|
+++ b/browser/base/content/pageInfo.js
|
||||||
|
@@ -757,8 +757,11 @@ function onImageSelect()
|
||||||
|
{
|
||||||
|
var tree = document.getElementById("imagetree");
|
||||||
|
var saveAsButton = document.getElementById("imagesaveasbutton");
|
||||||
|
+ var saveLocked = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
|
+ .getService(Components.interfaces.nsIPrefBranch)
|
||||||
|
+ .getBoolPref("config.lockdown.savepage");
|
||||||
|
|
||||||
|
- if (tree.view.selection.count == 1)
|
||||||
|
+ if (tree.view.selection.count == 1 && !saveLocked)
|
||||||
|
{
|
||||||
|
makePreview(tree.view.selection.currentIndex);
|
||||||
|
saveAsButton.setAttribute("disabled", "false");
|
||||||
|
diff --git a/browser/components/bookmarks/content/bookmarksProperties.js b/browser/components/bookmarks/content/bookmarksProperties.js
|
||||||
|
index fddef1d..dc2beec 100644
|
||||||
|
--- a/browser/components/bookmarks/content/bookmarksProperties.js
|
||||||
|
+++ b/browser/components/bookmarks/content/bookmarksProperties.js
|
||||||
|
@@ -138,6 +138,15 @@ function Init()
|
||||||
// set initial focus
|
// set initial focus
|
||||||
nameNode.focus();
|
nameNode.focus();
|
||||||
nameNode.select();
|
nameNode.select();
|
||||||
@ -262,9 +304,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
--- modules/libpref/src/init/all.js
|
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
|
||||||
+++ modules/libpref/src/init/all.js
|
index 16991ac..b3f5920 100644
|
||||||
@@ -1011,6 +1011,20 @@
|
--- a/modules/libpref/src/init/all.js
|
||||||
|
+++ b/modules/libpref/src/init/all.js
|
||||||
|
@@ -1018,6 +1018,21 @@ pref("config.use_system_prefs", false);
|
||||||
// if the system has enabled accessibility
|
// if the system has enabled accessibility
|
||||||
pref("config.use_system_prefs.accessibility", false);
|
pref("config.use_system_prefs.accessibility", false);
|
||||||
|
|
||||||
@ -281,13 +325,16 @@
|
|||||||
+pref("config.lockdown.searchbar",false);
|
+pref("config.lockdown.searchbar",false);
|
||||||
+pref("config.lockdown.hidebookmark",false);
|
+pref("config.lockdown.hidebookmark",false);
|
||||||
+pref("config.lockdown.setwallpaper",false);
|
+pref("config.lockdown.setwallpaper",false);
|
||||||
|
+pref("config.lockdown.showsavedpasswords", false);
|
||||||
+
|
+
|
||||||
/*
|
/*
|
||||||
* What are the entities that you want Mozilla to save using mnemonic
|
* What are the entities that you want Mozilla to save using mnemonic
|
||||||
* names rather than numeric codes? E.g. If set, we'll output
|
* names rather than numeric codes? E.g. If set, we'll output
|
||||||
--- toolkit/components/help/content/toolbarCustomization.js
|
diff --git a/toolkit/components/help/content/toolbarCustomization.js b/toolkit/components/help/content/toolbarCustomization.js
|
||||||
+++ toolkit/components/help/content/toolbarCustomization.js
|
index 67a037b..c553e70 100644
|
||||||
@@ -42,11 +42,23 @@
|
--- a/toolkit/components/help/content/toolbarCustomization.js
|
||||||
|
+++ b/toolkit/components/help/content/toolbarCustomization.js
|
||||||
|
@@ -42,11 +42,23 @@ function CustomizeToolbar(id)
|
||||||
{
|
{
|
||||||
var customizePopup = document.getElementById("cmd_CustomizeToolbars");
|
var customizePopup = document.getElementById("cmd_CustomizeToolbars");
|
||||||
customizePopup.setAttribute("disabled", "true");
|
customizePopup.setAttribute("disabled", "true");
|
||||||
@ -311,7 +358,7 @@
|
|||||||
# ToolboxCustomizeDone() - Resets the toolbar back to its default state. Reenables
|
# ToolboxCustomizeDone() - Resets the toolbar back to its default state. Reenables
|
||||||
# toolbar buttons and the "Customize Toolbar" command.
|
# toolbar buttons and the "Customize Toolbar" command.
|
||||||
#
|
#
|
||||||
@@ -54,8 +66,7 @@
|
@@ -54,8 +66,7 @@ function CustomizeToolbar(id)
|
||||||
function ToolboxCustomizeDone(aToolboxChanged)
|
function ToolboxCustomizeDone(aToolboxChanged)
|
||||||
{
|
{
|
||||||
# Update global UI elements that may have been added or removed
|
# Update global UI elements that may have been added or removed
|
||||||
@ -321,7 +368,7 @@
|
|||||||
|
|
||||||
# make sure our toolbar buttons have the correct enabled state restored to them...
|
# make sure our toolbar buttons have the correct enabled state restored to them...
|
||||||
if (this.UpdateToolbar != undefined)
|
if (this.UpdateToolbar != undefined)
|
||||||
@@ -77,8 +88,7 @@
|
@@ -77,8 +88,7 @@ function UpdateToolbar(caller)
|
||||||
document.commandDispatcher.updateCommands('help-toolbar');
|
document.commandDispatcher.updateCommands('help-toolbar');
|
||||||
|
|
||||||
# re-enable toolbar customization command
|
# re-enable toolbar customization command
|
||||||
@ -331,9 +378,27 @@
|
|||||||
|
|
||||||
# hook for extra toolbar items
|
# hook for extra toolbar items
|
||||||
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
|
||||||
--- toolkit/components/printing/content/printdialog.js
|
diff --git a/toolkit/components/passwordmgr/resources/content/passwordManager.js b/toolkit/components/passwordmgr/resources/content/passwordManager.js
|
||||||
+++ toolkit/components/printing/content/printdialog.js
|
index d128253..e4d7e70 100644
|
||||||
@@ -51,6 +51,7 @@
|
--- a/toolkit/components/passwordmgr/resources/content/passwordManager.js
|
||||||
|
+++ b/toolkit/components/passwordmgr/resources/content/passwordManager.js
|
||||||
|
@@ -137,7 +137,10 @@ function LoadSignons() {
|
||||||
|
// disable "remove all signons" button if there are no signons
|
||||||
|
var element = document.getElementById("removeAllSignons");
|
||||||
|
var toggle = document.getElementById("togglePasswords");
|
||||||
|
- if (signons.length == 0 || gSelectUserInUse) {
|
||||||
|
+ var viewLocked = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
|
+ .getService(Components.interfaces.nsIPrefBranch)
|
||||||
|
+ .getBoolPref("config.lockdown.showsavedpasswords");
|
||||||
|
+ if (signons.length == 0 || gSelectUserInUse || viewLocked) {
|
||||||
|
element.setAttribute("disabled","true");
|
||||||
|
toggle.setAttribute("disabled","true");
|
||||||
|
} else {
|
||||||
|
diff --git a/toolkit/components/printing/content/printdialog.js b/toolkit/components/printing/content/printdialog.js
|
||||||
|
index 4584a8a..b0c1e3d 100644
|
||||||
|
--- a/toolkit/components/printing/content/printdialog.js
|
||||||
|
+++ b/toolkit/components/printing/content/printdialog.js
|
||||||
|
@@ -51,6 +51,7 @@ var gPrintSettings = null;
|
||||||
var gWebBrowserPrint = null;
|
var gWebBrowserPrint = null;
|
||||||
var gPrintSetInterface = Components.interfaces.nsIPrintSettings;
|
var gPrintSetInterface = Components.interfaces.nsIPrintSettings;
|
||||||
var doDebug = false;
|
var doDebug = false;
|
||||||
@ -341,7 +406,7 @@
|
|||||||
|
|
||||||
//---------------------------------------------------
|
//---------------------------------------------------
|
||||||
function initDialog()
|
function initDialog()
|
||||||
@@ -88,11 +89,23 @@
|
@@ -88,11 +89,23 @@ function initDialog()
|
||||||
dialog.fpDialog = document.getElementById("fpDialog");
|
dialog.fpDialog = document.getElementById("fpDialog");
|
||||||
|
|
||||||
dialog.enabled = false;
|
dialog.enabled = false;
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9d3322932cf719c1f58a1651fb99a4e0b627a51856193f0ddf35434b4df8dc84
|
|
||||||
size 12358182
|
|
3
l10n-2.0.0.12.tar.bz2
Normal file
3
l10n-2.0.0.12.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:a800b4dd45f5be81b677be9483fa2876f8f9d8895855180814e128528d2c15bc
|
||||||
|
size 10954030
|
@ -1,26 +0,0 @@
|
|||||||
Index: content/canvas/src/nsCanvasRenderingContext2D.cpp
|
|
||||||
===================================================================
|
|
||||||
RCS file: /cvsroot/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp,v
|
|
||||||
retrieving revision 1.102
|
|
||||||
diff -u -8 -p -r1.102 nsCanvasRenderingContext2D.cpp
|
|
||||||
--- content/canvas/src/nsCanvasRenderingContext2D.cpp 10 Oct 2007 20:31:45 -0000 1.102
|
|
||||||
+++ content/canvas/src/nsCanvasRenderingContext2D.cpp 11 Oct 2007 23:31:32 -0000
|
|
||||||
@@ -2140,17 +2140,17 @@ nsCanvasRenderingContext2D::CairoSurface
|
|
||||||
getter_AddRefs(imgRequest));
|
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
|
||||||
if (!imgRequest)
|
|
||||||
// XXX ERRMSG we need to report an error to developers here! (bug 329026)
|
|
||||||
return NS_ERROR_NOT_AVAILABLE;
|
|
||||||
|
|
||||||
PRUint32 status;
|
|
||||||
imgRequest->GetImageStatus(&status);
|
|
||||||
- if (status != imgIRequest::STATUS_LOAD_COMPLETE)
|
|
||||||
+ if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0)
|
|
||||||
return NS_ERROR_NOT_AVAILABLE;
|
|
||||||
|
|
||||||
nsCOMPtr<nsIURI> uri;
|
|
||||||
rv = imageLoader->GetCurrentURI(uriOut);
|
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
|
||||||
|
|
||||||
*forceWriteOnlyOut = PR_FALSE;
|
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
From: upstream
|
||||||
|
Subject: crashes with Factory's glibc
|
||||||
|
References:
|
||||||
|
https://bugzilla.novell.com/show_bug.cgi?id=354150
|
||||||
|
https://bugzilla.mozilla.org/show_bug.cgi?id=412610
|
||||||
|
|
||||||
--- mozilla/toolkit/xre/nsAppRunner.h.old 2007-09-25 18:01:56.000000000 +0200
|
--- mozilla/toolkit/xre/nsAppRunner.h.old 2007-09-25 18:01:56.000000000 +0200
|
||||||
+++ mozilla/toolkit/xre/nsAppRunner.h 2007-09-25 18:02:23.000000000 +0200
|
+++ mozilla/toolkit/xre/nsAppRunner.h 2007-09-25 18:02:23.000000000 +0200
|
||||||
@@ -48,7 +48,8 @@
|
@@ -48,7 +48,8 @@
|
@ -201,8 +201,8 @@ if [ $moz_debug -eq 1 ]; then
|
|||||||
echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile"
|
echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile"
|
||||||
$moz_debugger "$MOZ_PROGRAM" -x $tmpfile
|
$moz_debugger "$MOZ_PROGRAM" -x $tmpfile
|
||||||
else
|
else
|
||||||
if [ -d /proc/asound ]; then
|
if [ -d /proc/asound -a -e /usr/$LIB/libaoss.so ]; then
|
||||||
export LD_PRELOAD=/usr/$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD}
|
export LD_PRELOAD=/usr/\$LIB/libaoss.so${LD_PRELOAD:+:$LD_PRELOAD}
|
||||||
fi
|
fi
|
||||||
$MOZ_PROGRAM "$@"
|
$MOZ_PROGRAM "$@"
|
||||||
fi
|
fi
|
||||||
|
@ -4,11 +4,11 @@ References:
|
|||||||
https://bugzilla.novell.com/show_bug.cgi?id=196506
|
https://bugzilla.novell.com/show_bug.cgi?id=196506
|
||||||
https://bugzilla.mozilla.org/show_bug.cgi?id=347307
|
https://bugzilla.mozilla.org/show_bug.cgi?id=347307
|
||||||
|
|
||||||
Index: netwerk/base/src/nsProxyAutoConfig.js
|
diff --git a/netwerk/base/src/nsProxyAutoConfig.js b/netwerk/base/src/nsProxyAutoConfig.js
|
||||||
================================================================================
|
index 6a34044..2186502 100644
|
||||||
--- netwerk/base/src/nsProxyAutoConfig.js
|
--- a/netwerk/base/src/nsProxyAutoConfig.js
|
||||||
+++ netwerk/base/src/nsProxyAutoConfig.js
|
+++ b/netwerk/base/src/nsProxyAutoConfig.js
|
||||||
@@ -50,7 +50,7 @@
|
@@ -50,7 +50,7 @@ const kPAC_CID = Components.ID("{63ac8c66-1dd2-11b2-b070-84d00d3eaece}");
|
||||||
|
|
||||||
const nsISupports = Components.interfaces.nsISupports;
|
const nsISupports = Components.interfaces.nsISupports;
|
||||||
const nsIProxyAutoConfig = Components.interfaces.nsIProxyAutoConfig;
|
const nsIProxyAutoConfig = Components.interfaces.nsIProxyAutoConfig;
|
||||||
@ -17,7 +17,7 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
|
|
||||||
// implementor of nsIProxyAutoConfig
|
// implementor of nsIProxyAutoConfig
|
||||||
function nsProxyAutoConfig() {};
|
function nsProxyAutoConfig() {};
|
||||||
@@ -114,7 +114,7 @@
|
@@ -114,7 +114,7 @@ function proxyAlert(msg) {
|
||||||
// wrapper for getting local IP address called by PAC file
|
// wrapper for getting local IP address called by PAC file
|
||||||
function myIpAddress() {
|
function myIpAddress() {
|
||||||
try {
|
try {
|
||||||
@ -26,7 +26,7 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
return '127.0.0.1';
|
return '127.0.0.1';
|
||||||
}
|
}
|
||||||
@@ -176,7 +176,7 @@
|
@@ -176,7 +176,7 @@ function NSGetModule(compMgr, fileSpec) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var pac = new nsProxyAutoConfig() ;
|
var pac = new nsProxyAutoConfig() ;
|
||||||
@ -35,9 +35,11 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
|
|
||||||
var pacUtils =
|
var pacUtils =
|
||||||
"function dnsDomainIs(host, domain) {\n" +
|
"function dnsDomainIs(host, domain) {\n" +
|
||||||
--- netwerk/dns/public/nsPIDNSService.idl
|
diff --git a/netwerk/dns/public/nsPIDNSService.idl b/netwerk/dns/public/nsPIDNSService.idl
|
||||||
+++ netwerk/dns/public/nsPIDNSService.idl
|
index e0eea6d..1abb223 100644
|
||||||
@@ -58,4 +58,11 @@
|
--- a/netwerk/dns/public/nsPIDNSService.idl
|
||||||
|
+++ b/netwerk/dns/public/nsPIDNSService.idl
|
||||||
|
@@ -58,4 +58,11 @@ interface nsPIDNSService : nsIDNSService
|
||||||
* this method.
|
* this method.
|
||||||
*/
|
*/
|
||||||
void shutdown();
|
void shutdown();
|
||||||
@ -49,8 +51,10 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
+ */
|
+ */
|
||||||
+ ACString getNetworkAddrAsString();
|
+ ACString getNetworkAddrAsString();
|
||||||
};
|
};
|
||||||
--- netwerk/dns/src/nsDNSService2.cpp
|
diff --git a/netwerk/dns/src/nsDNSService2.cpp b/netwerk/dns/src/nsDNSService2.cpp
|
||||||
+++ netwerk/dns/src/nsDNSService2.cpp
|
index f38e0c1..e928a76 100644
|
||||||
|
--- a/netwerk/dns/src/nsDNSService2.cpp
|
||||||
|
+++ b/netwerk/dns/src/nsDNSService2.cpp
|
||||||
@@ -56,6 +56,11 @@
|
@@ -56,6 +56,11 @@
|
||||||
#include "prio.h"
|
#include "prio.h"
|
||||||
#include "plstr.h"
|
#include "plstr.h"
|
||||||
@ -63,7 +67,7 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
static const char kPrefDnsCacheEntries[] = "network.dnsCacheEntries";
|
static const char kPrefDnsCacheEntries[] = "network.dnsCacheEntries";
|
||||||
static const char kPrefDnsCacheExpiration[] = "network.dnsCacheExpiration";
|
static const char kPrefDnsCacheExpiration[] = "network.dnsCacheExpiration";
|
||||||
static const char kPrefEnableIDN[] = "network.enableIDN";
|
static const char kPrefEnableIDN[] = "network.enableIDN";
|
||||||
@@ -135,6 +140,18 @@
|
@@ -135,6 +140,18 @@ nsDNSRecord::GetNextAddr(PRUint16 port, PRNetAddr *addr)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,7 +86,7 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsDNSRecord::GetNextAddrAsString(nsACString &result)
|
nsDNSRecord::GetNextAddrAsString(nsACString &result)
|
||||||
{
|
{
|
||||||
@@ -142,13 +159,7 @@
|
@@ -142,13 +159,7 @@ nsDNSRecord::GetNextAddrAsString(nsACString &result)
|
||||||
nsresult rv = GetNextAddr(0, &addr);
|
nsresult rv = GetNextAddr(0, &addr);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
@ -97,7 +101,7 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
}
|
}
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
@@ -580,3 +591,68 @@
|
@@ -580,3 +591,76 @@ nsDNSService::GetAFForLookup(const nsACString &host)
|
||||||
|
|
||||||
return af;
|
return af;
|
||||||
}
|
}
|
||||||
@ -112,6 +116,14 @@ Index: netwerk/base/src/nsProxyAutoConfig.js
|
|||||||
+ if (!(aInterface->ifa_flags & IFF_RUNNING))
|
+ if (!(aInterface->ifa_flags & IFF_RUNNING))
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+
|
+
|
||||||
|
+ // Interface must have an address
|
||||||
|
+ if (aInterface->ifa_addr == NULL)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ // Interface must have an address
|
||||||
|
+ if (aInterface->ifa_addr == NULL)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
+ // Only look at IP interfaces
|
+ // Only look at IP interfaces
|
||||||
+ sa_family_t type = aInterface->ifa_addr->sa_family;
|
+ sa_family_t type = aInterface->ifa_addr->sa_family;
|
||||||
+ if (type != AF_INET && type != AF_INET6)
|
+ if (type != AF_INET && type != AF_INET6)
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:b7b6b93daaf5e4c9ee49e5b3d5690242a3c756cdc6252de7cf44c14a9a395ea2
|
oid sha256:3c6d1179bcea9a09caa2c9c3b894925557fe9958a5cdc76b2a87b9cf7c2b81fd
|
||||||
size 3989
|
size 4712
|
||||||
|
Loading…
Reference in New Issue
Block a user