Apply the used lockdown preferences. Otherwise JS code throws exceptions which break stuff. (bnc#567131)
authorWolfgang Rosenauer <wr@rosenauer.org>
Thu, 24 Dec 2009 13:55:30 +0100
changeset 36 c55ce8284eb3
parent 35 77612e091d2d
child 37 faa6691e048e
Apply the used lockdown preferences. Otherwise JS code throws exceptions which break stuff. (bnc#567131)
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/firefox-lockdown.js
mozilla-xulrunner192/mozilla-xulrunner192.spec
mozilla-xulrunner192/toolkit-lockdown.js
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Dec 21 14:53:10 2009 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Dec 24 13:55:30 2009 +0100
@@ -45,11 +45,11 @@
 Source2:        %{name}-rpmlintrc
 Source3:        mozilla.sh.in
 Source4:        find-external-requires.sh
-# this needs to be shipped when lockdown changes are back
 Source5:        firefox.schemas
 Source6:        kde.js
 Source7:        l10n-%{version}.tar.bz2
 Source8:        firefox-mimeinfo.xml
+Source9:        firefox-lockdown.js
 Source16:       firefox.1
 Source17:       firefox-suse-default-prefs.js
 Patch1:         firefox-libxul-sdk.patch
@@ -261,6 +261,7 @@
    %{SOURCE17} > suse-default-prefs
 cp suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-build.js
 rm suse-default-prefs
+cp %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/lockdown.js
 # use correct locale for useragent
 cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/firefox-lockdown.js	Thu Dec 24 13:55:30 2009 +0100
@@ -0,0 +1,9 @@
+pref("config.lockdown.printsetup", false);
+pref("config.lockdown.savepage", false);
+pref("config.lockdown.hidebookmark", false);
+pref("config.lockdown.bookmark", false);
+pref("config.lockdown.history", false);
+pref("config.lockdown.history.set", false);
+pref("config.lockdown.urlbar", false);
+pref("config.lockdown.searchbar", false);
+pref("config.lockdown.toolbarediting", false);
--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec	Mon Dec 21 14:53:10 2009 +0100
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec	Thu Dec 24 13:55:30 2009 +0100
@@ -66,6 +66,7 @@
 Source5:        add-plugins.sh.in
 Source6:        create-tar.sh
 Source7:        baselibs.conf
+Source8:        toolkit-lockdown.js
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-libproxy.patch
 Patch3:         mozilla-pkgconfig.patch
@@ -325,6 +326,7 @@
 #cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/
 # preferences
 cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js
+cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{_libdir}/xulrunner-%{version_internal}:g" \
   %{SOURCE5} > $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner192/toolkit-lockdown.js	Thu Dec 24 13:55:30 2009 +0100
@@ -0,0 +1,3 @@
+pref("config.lockdown.showsavedpasswords", false);
+pref("config.lockdown.savepage", false);
+pref("config.lockdown.printing", false),