rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=46

Browse Source
This commit is contained in:
OBS User unknown 2008-11-21 15:06:17 +00:00 committed by Git OBS Bridge
parent 5f1dcfb02f
commit aafe63ed78
3 changed files with 81 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MozillaFirefox.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Nov 21 03:11:41 EST 2008 - hfiguiere@suse.de
- Update firefox-lockdown-ui.patch
* Print Setup is now properly locked down. bnc#431028
* Bookmark editing it now properly locked down. bnc#439335
* Bookmars are properly hidden.
* History is properly locked down. bnc#439343
* Make sure the search bar is not put back when resetting the
toolbar. bnc#439358
-------------------------------------------------------------------
Thu Nov 20 18:49:19 CST 2008 - maw@suse.de

30
MozillaFirefox.spec
View File

@ -27,7 +27,7 @@ License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL
Provides: web_browser
Provides: firefox
Version: 3.0.4
Release: 2
Release: 3
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@ -140,7 +140,7 @@ cd $RPM_BUILD_DIR/mozilla
%patch2
%patch14
%patch17
%patch20 -p2
%patch20 -p0
%build
export MOZ_BUILD_DATE=%{releasedate}
@ -339,6 +339,14 @@ fi
%{progdir}/defaults/profile/bookmarks.html
%changelog
* Fri Nov 21 2008 hfiguiere@suse.de
- Update firefox-lockdown-ui.patch
* Print Setup is now properly locked down. bnc#431028
* Bookmark editing it now properly locked down. bnc#439335
* Bookmars are properly hidden.
* History is properly locked down. bnc#439343
* Make sure the search bar is not put back when resetting the
toolbar. bnc#439358
* Thu Nov 20 2008 maw@suse.de
- Review and approve changes.
* Thu Nov 13 2008 wr@rosenauer.org
@ -801,7 +809,7 @@ fi
UI option (#132398)
* Mon Apr 03 2006 stark@suse.de
- fixed keyword fixup patch (#162532)
* Mon Mar 27 2006 stark@suse.de
* Tue Mar 28 2006 stark@suse.de
- don't use keyword fixup for pasted text (#160034, bmo #331522)
* Mon Mar 20 2006 stark@suse.de
- added Tango theme
@ -817,7 +825,7 @@ fi
- merged dbus reconnection patch (#150042)
- default to autodetect proxy (network.proxy.type=4) (#151811)
- added GTK category to desktop file
* Mon Feb 13 2006 stark@suse.de
* Tue Feb 14 2006 stark@suse.de
- modified lockdown patches (#67281, #67282)
- applied set of security patches (#148876)
bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947
@ -1000,7 +1008,7 @@ fi
(it's not needed and caused problems: bnc #75418)
- fixed NLD lockdown patch (bnc #75418)
- don't write prefs back to gconf for now
* Tue Jun 21 2005 stark@suse.de
* Wed Jun 22 2005 stark@suse.de
- new NLD lockdown patch which is syncing user prefs to gconf
- update to 1.0.5pre security-release
* Wed Jun 08 2005 stark@suse.de
@ -1108,7 +1116,7 @@ fi
- bumped version number to 1.0.1
* Tue Feb 15 2005 stark@suse.de
- got updates from 1.0.1 branch
* Wed Feb 09 2005 stark@suse.de
* Thu Feb 10 2005 stark@suse.de
- additional fireflashing fix (#50635, bmo #280664)
- some more security related fixes
(bmo #268483, #273498, #277322)
@ -1161,7 +1169,7 @@ fi
- update to 1.0rc2
* Sat Oct 30 2004 stark@suse.de
- added missing s390(x) patch
* Tue Oct 26 2004 stark@suse.de
* Wed Oct 27 2004 stark@suse.de
- update to 1.0rc1 codebase
- printing via XFT/fontconfig
- freetype changes to avoid API conflicts with newer freetype2
@ -1180,7 +1188,7 @@ fi
- fixed chrome registration
* Wed Oct 06 2004 joeshaw@suse.de
- disable gconf settings as default (Ximian #67718)
* Tue Oct 05 2004 stark@suse.de
* Wed Oct 06 2004 stark@suse.de
- fixed inclusion of RealPlayer plugin again
* Tue Oct 05 2004 stark@suse.de
- small important fix in firefox-download.patch (Ximian #65472)
@ -1198,7 +1206,7 @@ fi
* Mon Sep 27 2004 joeshaw@suse.de
- Update the industrial default patch, for some reason it didn't
take before.
* Thu Sep 23 2004 stark@suse.de
* Fri Sep 24 2004 stark@suse.de
- fix for Ximian #65176 (mozilla.org #240068)
- revised patch for update function (Ximian #65615)
* Thu Sep 23 2004 joeshaw@suse.de
@ -1299,12 +1307,12 @@ fi
- enabled gnomevfs extension
* Fri Mar 26 2004 uli@suse.de
- fixed hang during build on s390* (bug #35440)
* Tue Mar 02 2004 stark@suse.de
* Wed Mar 03 2004 stark@suse.de
- removed unused patches for GTK2 build
- more fixes for (#35179)
* Mon Mar 01 2004 stark@suse.de
- improved start-script to interact with thunderbird (#35179)
* Wed Feb 25 2004 stark@suse.de
* Thu Feb 26 2004 stark@suse.de
- use official releasedate
- added official (trademarked) artwork
- added firefox icon to /usr/share/pixmaps

72
firefox-ui-lockdown.patch
View File

@ -1,7 +1,7 @@
diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc
index 07795f1..c035302 100644
--- a/mozilla/browser/base/content/browser-menubar.inc
+++ b/mozilla/browser/base/content/browser-menubar.inc
Index: browser/base/content/browser-menubar.inc
===================================================================
--- browser/base/content/browser-menubar.inc.orig
+++ browser/base/content/browser-menubar.inc
@@ -68,9 +68,9 @@
<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"/>
@ -14,11 +14,11 @@ index 07795f1..c035302 100644
#endif
<menuitem label="&printCmd.label;" accesskey="&printCmd.accesskey;" key="printKb" command="cmd_print"/>
<menuseparator/>
diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 288becb..249d282 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -920,6 +920,150 @@ function prepareForStartup()
Index: browser/base/content/browser.js
===================================================================
--- browser/base/content/browser.js.orig
+++ browser/base/content/browser.js
@@ -920,6 +920,152 @@ function prepareForStartup()
gBrowser.addEventListener("DOMLinkAdded", DOMLinkHandler, false);
}
@ -43,7 +43,7 @@ index 288becb..249d282 100644
+ var disablePrinting = gPrefService.getBoolPref("config.lockdown.printing");
+ var disablePrintSetup = gPrefService.getBoolPref("config.lockdown.printsetup");
+ if (!isStartup || disablePrintSetup || disablePrintSetup) {
+ lockdownElement("menu_printSetup", disablePrinting || disablePrintSetup);
+ lockdownElement("cmd_pageSetup", disablePrinting || disablePrintSetup);
+ lockdownElement("menu_printPreview", disablePrinting || disablePrintSetup);
+ lockdownElement("cmd_print", disablePrinting);
+ }
@ -70,10 +70,11 @@ index 288becb..249d282 100644
+ var disableBookmarks = gPrefService.getBoolPref("config.lockdown.hidebookmark");
+ var disableBookmarkEditing = gPrefService.getBoolPref("config.lockdown.bookmark");
+ if (!isStartup || disableBookmarks || disableBookmarkEditing) {
+ lockdownElement("bookmarks-menu", disableBookmarks, true);
+ lockdownElement("bookmarksMenu", disableBookmarks, true);
+ lockdownElement("viewBookmarksSidebar", disableBookmarks);
+ lockdownElement("PersonalToolbar", disableBookmarks); // XXX check
+ lockdownElement("Browser:AddBookmarkAs", disableBookmarks || disableBookmarkEditing);
+ lockdownElement("Browser:ShowAllBookmarks", disableBookmarks || disableBookmarkEditing);
+ lockdownElement("manBookmark", disableBookmarks || disableBookmarkEditing);
+ lockdownElement("context-bookmarkpage", disableBookmarks || disableBookmarkEditing);
+ lockdownElement("context-bookmarklink", disableBookmarks || disableBookmarkEditing);
@ -86,12 +87,13 @@ index 288becb..249d282 100644
+
+ var disableHistory = gPrefService.getBoolPref("config.lockdown.history");
+ if (!isStartup || disableHistory) {
+ lockdownElement("go-menu", disableHistory, true);
+ lockdownElement("history-menu", disableHistory, true);
+ lockdownElement("viewHistorySidebar", disableHistory);
+ lockdownElement("Browser:ShowAllHistory", disableHistory);
+ gURLBar.setAttribute("enablehistory", disableHistory ? "false" : "true");
+ gURLBar.disableAutoComplete = disableHistory;
+ }
+
+
+ var defaultPrefs = Cc["@mozilla.org/preferences-service;1"]
+ .getService(Ci.nsIPrefService).getDefaultBranch(null);
+ if (isStartup && disableHistory) {
@ -169,7 +171,7 @@ index 288becb..249d282 100644
function delayedStartup()
{
var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
@@ -928,7 +1072,16 @@ function delayedStartup()
@@ -928,7 +1074,16 @@ function delayedStartup()
if (!gPrefService)
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
@ -187,7 +189,7 @@ index 288becb..249d282 100644
BrowserOffline.init();
OfflineApps.init();
@@ -940,8 +1093,8 @@ function delayedStartup()
@@ -940,8 +1095,8 @@ function delayedStartup()
Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager);
if (gMustLoadSidebar) {
@ -197,7 +199,7 @@ index 288becb..249d282 100644
sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
}
@@ -1134,6 +1287,8 @@ function BrowserShutdown()
@@ -1132,6 +1287,8 @@ function BrowserShutdown()
os.removeObserver(gSessionHistoryObserver, "browser:purge-session-history");
os.removeObserver(gXPInstallObserver, "xpinstall-install-blocked");
@ -206,7 +208,20 @@ index 288becb..249d282 100644
try {
gBrowser.removeProgressListener(window.XULBrowserWindow);
} catch (ex) {
@@ -3222,6 +3377,7 @@ function BrowserCustomizeToolbar()
@@ -3065,6 +3222,12 @@ function FillHistoryMenu(aParent) {
aParent.removeChild(children[i]);
}
+ // lockdown. Don't display anything if locked down.
+ var disableHistory = gPrefService.getBoolPref("config.lockdown.history");
+ if (disableHistory) {
+ return false;
+ }
+
var webNav = getWebNavigation();
var sessionHistory = webNav.sessionHistory;
var bundle_browser = document.getElementById("bundle_browser");
@@ -3220,6 +3383,7 @@ function BrowserCustomizeToolbar()
var cmd = document.getElementById("cmd_CustomizeToolbars");
cmd.setAttribute("disabled", "true");
@ -214,7 +229,7 @@ index 288becb..249d282 100644
var splitter = document.getElementById("urlbar-search-splitter");
if (splitter)
@@ -3253,6 +3409,15 @@ function BrowserCustomizeToolbar()
@@ -3251,6 +3415,15 @@ function BrowserCustomizeToolbar()
#endif
}
@ -230,7 +245,22 @@ index 288becb..249d282 100644
function BrowserToolboxCustomizeDone(aToolboxChanged)
{
#ifdef TOOLBAR_CUSTOMIZATION_SHEET
@@ -3302,8 +3467,7 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
@@ -3266,6 +3439,14 @@ function BrowserToolboxCustomizeDone(aTo
gIdentityHandler._cacheElements();
window.XULBrowserWindow.init();
+ // make sure the search bar is not put back if locked down
+ var disableSearchBar = gPrefService.getBoolPref("config.lockdown.searchbar");
+ if (disableSearchBar) {
+ document.getElementById("search-container")
+ .setAttribute("style", (disableSearchBar) ? "display: none;" : "");
+ }
+
+
var backForwardDropmarker = document.getElementById("back-forward-dropmarker");
if (backForwardDropmarker)
backForwardDropmarker.disabled =
@@ -3300,8 +3481,7 @@ function BrowserToolboxCustomizeDone(aTo
var menubar = document.getElementById("main-menubar");
for (var i = 0; i < menubar.childNodes.length; ++i)
menubar.childNodes[i].setAttribute("disabled", false);
@ -240,7 +270,7 @@ index 288becb..249d282 100644
// XXXmano bug 287105: wallpaper to bug 309953,
// the reload button isn't in sync with the reload command.
@@ -4481,6 +4645,9 @@ function onViewToolbarsPopupShowing(aEvent)
@@ -4479,6 +4659,9 @@ function onViewToolbarsPopupShowing(aEve
menuItem.setAttribute("toolbarindex", i);
menuItem.setAttribute("type", "checkbox");
menuItem.setAttribute("label", toolbarName);
@ -250,7 +280,7 @@ index 288becb..249d282 100644
menuItem.setAttribute("accesskey", toolbar.getAttribute("accesskey"));
menuItem.setAttribute("checked", toolbar.getAttribute("collapsed") != "true");
popup.insertBefore(menuItem, firstMenuItem);
@@ -6353,7 +6520,7 @@ BookmarkAllTabsHandler.prototype = {
@@ -6329,7 +6512,7 @@ BookmarkAllTabsHandler.prototype = {
if (aTabClose)
numTabs--;