Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2013-08-11 11:21:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2013-07-06 07:03:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2013-08-11 11:21:35.000000000 +0200 @@ -1,0 +2,27 @@ +Sun Aug 4 18:30:11 UTC 2013 - [email protected] + +- update to Firefox 23.0 (bnc#833389) + * MFSA 2013-63/CVE-2013-1701/CVE-2013-1702 + Miscellaneous memory safety hazards + * MFSA 2013-64/CVE-2013-1704 (bmo#883313) + Use after free mutating DOM during SetBody + * MFSA 2013-65/CVE-2013-1705 (bmo#882865) + Buffer underflow when generating CRMF requests + * MFSA 2013-67/CVE-2013-1708 (bmo#879924) + Crash during WAV audio file decoding + * MFSA 2013-68/CVE-2013-1709 (bmo#838253) + Document URI misrepresentation and masquerading + * MFSA 2013-69/CVE-2013-1710 (bmo#871368) + CRMF requests allow for code execution and XSS attacks + * MFSA 2013-70/CVE-2013-1711 (bmo#843829) + Bypass of XrayWrappers using XBL Scopes + * MFSA 2013-72/CVE-2013-1713 (bmo#887098) + Wrong principal used for validating URI for some Javascript + components + * MFSA 2013-73/CVE-2013-1714 (bmo#879787) + Same-origin bypass with web workers and XMLHttpRequest + * MFSA 2013-75/CVE-2013-1717 (bmo#406541, bmo#738397) + Local Java applets may read contents of local file system +- requires NSPR 4.10 and NSS 3.15 + +------------------------------------------------------------------- Old: ---- firefox-22.0-source.tar.bz2 l10n-22.0.tar.bz2 New: ---- firefox-23.0-source.tar.bz2 l10n-23.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -17,7 +17,7 @@ # -%define major 22 +%define major 23 %define mainver %major.0 %define update_channel release @@ -50,8 +50,8 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.6 -BuildRequires: mozilla-nss-devel >= 3.14.3 +BuildRequires: mozilla-nspr-devel >= 4.10 +BuildRequires: mozilla-nss-devel >= 3.15 BuildRequires: nss-shared-helper-devel %if %suse_version > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) @@ -60,7 +60,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2013062200 +%define releasedate 2013080200 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -553,7 +553,6 @@ %{progdir}/browser/defaults %{progdir}/browser/icons/ %{progdir}/browser/chrome/icons -#%{progdir}/browser/distribution/ %{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/browser/searchplugins/ %{progdir}/browser/blocklist.xml ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_22_0_RELEASE" -VERSION="22.0" +RELEASE_TAG="FIREFOX_23_0_RELEASE" +VERSION="23.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-22.0-source.tar.bz2 -> firefox-23.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-22.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-23.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent c2eac57908647987ed11893ad45262a32122dff4 +# Parent a5cc092ab98bc6d4c1b09b5cc86791bae1313c73 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -134,16 +134,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -136,16 +136,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -54,9 +54,9 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -572,18 +572,21 @@ - @BINPATH@/browser/distribution/extensions/[email protected] - #endif +@@ -574,18 +574,21 @@ + @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf + @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest @BINPATH@/chrome/recording.manifest ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1225 @@ +@@ -0,0 +1,1196 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -187,83 +187,40 @@ + hidden="true" + consumeoutsideclicks="true" + align="start" ++ orient="horizontal" + role="alert"> -+ <hbox flex="1"> -+ <image id="social-activation-icon" class="popup-notification-icon"/> -+ <vbox flex="1"> -+ <description id="social-activation-message" class="popup-notification-description"/> ++ <image id="social-activation-icon" class="popup-notification-icon"/> ++ <vbox flex="1"> ++ <description id="social-activation-message" class="popup-notification-description">&social.activated.description;</description> ++ <spacer flex="1"/> ++ <hbox pack="start" align="center" class="popup-notification-button-container"> ++ <label id="social-undoactivation-button" ++ class="text-link" ++ value="&social.activated.undo.label;" ++ accesskey="&social.activated.undo.accesskey;" ++ onclick="SocialUI.undoActivation(this);"/> + <spacer flex="1"/> -+ <hbox pack="end" align="center" class="popup-notification-button-container"> -+#ifndef XP_UNIX -+ <button id="social-undoactivation-button" -+ label="&social.activated.undobutton.label;" -+ accesskey="&social.activated.undobutton.accesskey;" -+ onclick="SocialUI.undoActivation(this);"/> -+ <button default="true" -+ autofocus="autofocus" -+ label="&social.ok.label;" -+ accesskey="&social.ok.accesskey;" -+ oncommand="SocialUI.notificationPanel.hidePopup();"/> -+#else -+ <button default="true" -+ autofocus="autofocus" -+ label="&social.ok.label;" -+ accesskey="&social.ok.accesskey;" -+ oncommand="SocialUI.notificationPanel.hidePopup();"/> -+ <button id="social-undoactivation-button" -+ label="&social.activated.undobutton.label;" -+ accesskey="&social.activated.undobutton.accesskey;" -+ onclick="SocialUI.undoActivation(this);"/> -+#endif -+ </hbox> -+ </vbox> -+ </hbox> ++ <button id="social-activation-button" ++ default="true" ++ autofocus="autofocus" ++ label="&social.ok.label;" ++ accesskey="&social.ok.accesskey;" ++ oncommand="SocialUI.activationPanel.hidePopup();"/> ++ </hbox> ++ </vbox> + </panel> + -+ <panel id="unsharePopup" ++ <panel id="social-share-panel" ++ class="social-panel" + type="arrow" -+ orient="vertical" -+ ignorekeys="true" -+ hidden="true" -+ onpopupshown="SocialShareButton.panelShown(event);" ++ orient="horizontal" ++ onpopupshowing="SocialShare.onShowing()" ++ onpopuphidden="SocialShare.onHidden()" + consumeoutsideclicks="true" -+ level="top"> -+ <!-- Note that 'label', 'accesskey', 'value' and 'aria-label' attributes -+ for many of these elements are supplied by the provider and filled -+ in at runtime -+ --> -+ <row id="unsharePopupHeader" align="center"> -+ <vbox align="center"> -+ <image id="socialUserPortrait" onclick="SocialUI.showProfile();"/> -+ </vbox> -+ <vbox id="unsharePopupText"> -+ <button id="socialUserDisplayName" pack="start" -+ oncommand="SocialUI.showProfile();"/> -+ <spacer flex="1"/> -+ <label id="socialUserRecommendedText"/> -+ </vbox> -+ </row> -+ <hbox id="unsharePopupBottomButtons" pack="end"> -+#ifndef XP_UNIX -+ <button id="unsharePopupStopSharingButton" -+ class="unsharePopupBottomButton" -+ command="Social:UnsharePage"/> -+ <button id="unsharePopupContinueSharingButton" -+ class="unsharePopupBottomButton" -+ default="true" -+ autofocus="autofocus" -+ oncommand="SocialShareButton.dismissUnsharePopup();"/> -+#else -+ <button id="unsharePopupContinueSharingButton" -+ class="unsharePopupBottomButton" -+ default="true" -+ autofocus="autofocus" -+ oncommand="SocialShareButton.dismissUnsharePopup();"/> -+ <button id="unsharePopupStopSharingButton" -+ class="unsharePopupBottomButton" -+ command="Social:UnsharePage"/> -+#endif -+ </hbox> ++ hidden="true"> ++ <vbox class="social-share-toolbar"> ++ <vbox id="social-share-provider-buttons" flex="1"/> ++ </vbox> + </panel> + + <panel id="social-notification-panel" @@ -455,6 +412,13 @@ + </popupnotificationcontent> + </popupnotification> + ++ <popupnotification id="servicesInstall-notification" hidden="true"> ++ <popupnotificationcontent orient="vertical" align="start"> ++ <separator class="thin"/> ++ <label id="servicesInstall-learnmore-link" class="text-link"/> ++ </popupnotificationcontent> ++ </popupnotification> ++ + <popupnotification id="pointerLock-notification" hidden="true"> + <popupnotificationcontent orient="vertical" align="start"> + <separator class="thin"/> @@ -531,7 +495,7 @@ + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" + fullscreentoolbar="true" mode="icons" customizable="true" + iconsize="large" -+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,downloads-button,home-button,bookmarks-menu-button-container,window-controls" ++ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls" + context="toolbar-context-menu"> + + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" @@ -589,10 +553,12 @@ + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> + </box> + <!-- Use onclick instead of normal popup= syntax since the popup + code fires onmousedown, and hence eats our favicon drag events. @@ -620,16 +586,9 @@ + hidden="true" + tooltiptext="&pageReportIcon.tooltip;" + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> -+ -+ <label id="share-button-status" collapsed="true" role="status"/> -+ <image id="share-button" -+ class="urlbar-icon" -+ hidden="true" -+ onclick="SocialShareButton.onClick(event);"/> -+ + <image id="star-button" + class="urlbar-icon" -+ onclick="PlacesStarButton.onClick(event);"/> ++ onclick="BookmarkingUI.onCommand(event);"/> + <image id="go-button" + class="urlbar-icon" + tooltiptext="&goEndCap.tooltip;" @@ -680,6 +639,88 @@ + oncommand="WebrtcIndicator.menuCommand(event.target);"/> + </toolbarbutton> + ++ <toolbarbutton id="bookmarks-menu-button" ++ class="toolbarbutton-1 chromeclass-toolbar-additional" ++ persist="class" ++ removable="true" ++ type="menu" ++ label="&bookmarksMenuButton.label;" ++ tooltiptext="&bookmarksMenuButton.tooltip;" ++ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" ++ ondragover="PlacesMenuDNDHandler.onDragOver(event);" ++ ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" ++ ondrop="PlacesMenuDNDHandler.onDrop(event);"> ++ <menupopup id="BMB_bookmarksPopup" ++ placespopup="true" ++ context="placesContext" ++ openInTabs="children" ++ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" ++ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" ++ onpopupshowing="BookmarkingUI.onPopupShowing(event); ++ if (!this.parentNode._placesView) ++ new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" ++ tooltip="bhTooltip" popupsinherittooltip="true"> ++ <menuitem id="BMB_viewBookmarksToolbar" ++ placesanonid="view-toolbar" ++ toolbarId="PersonalToolbar" ++ type="checkbox" ++ oncommand="onViewToolbarCommand(event)" ++ label="&viewBookmarksToolbar.label;"/> ++ <menuseparator/> ++ <menuitem id="BMB_bookmarksShowAll" ++ label="&showAllBookmarks2.label;" ++ command="Browser:ShowAllBookmarks" ++ key="manBookmarkKb"/> ++ <menuseparator/> ++ <menuitem id="BMB_bookmarkThisPage" ++#ifndef XP_MACOSX ++ class="menuitem-iconic" ++#endif ++ label="&bookmarkThisPageCmd.label;" ++ command="Browser:AddBookmarkAs" ++ key="addBookmarkAsKb"/> ++ <menuitem id="BMB_subscribeToPageMenuitem" ++#ifndef XP_MACOSX ++ class="menuitem-iconic" ++#endif ++ label="&subscribeToPageMenuitem.label;" ++ oncommand="return FeedHandler.subscribeToFeed(null, event);" ++ onclick="checkForMiddleClick(this, event);" ++ observes="singleFeedMenuitemState"/> ++ <menu id="BMB_subscribeToPageMenupopup" ++#ifndef XP_MACOSX ++ class="menu-iconic" ++#endif ++ label="&subscribeToPageMenupopup.label;" ++ observes="multipleFeedsMenuState"> ++ <menupopup id="BMB_subscribeToPageSubmenuMenupopup" ++ onpopupshowing="return FeedHandler.buildFeedList(event.target);" ++ oncommand="return FeedHandler.subscribeToFeed(null, event);" ++ onclick="checkForMiddleClick(this, event);"/> ++ </menu> ++ <menuseparator/> ++ <menu id="BMB_bookmarksToolbar" ++ placesanonid="toolbar-autohide" ++ class="menu-iconic bookmark-item" ++ label="&personalbarCmd.label;" ++ container="true"> ++ <menupopup id="BMB_bookmarksToolbarPopup" ++ placespopup="true" ++ context="placesContext" ++ onpopupshowing="if (!this.parentNode._placesView) ++ new PlacesMenu(event, 'place:folder=TOOLBAR');"/> ++ </menu> ++ <menuseparator/> ++ <!-- Bookmarks menu items --> ++ <menuseparator builder="end" ++ class="hide-if-empty-places-result"/> ++ <menuitem id="BMB_unsortedBookmarks" ++ label="&bookmarksMenuButton.unsorted.label;" ++ oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');" ++ class="menuitem-iconic"/> ++ </menupopup> ++ </toolbarbutton> ++ + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + persist="class" removable="true" + label="&homeButton.label;" @@ -690,6 +731,13 @@ + onclick="BrowserGoHome(event);" + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> + ++ <toolbarbutton id="social-share-button" ++ class="toolbarbutton-1 chromeclass-toolbar-additional" ++ hidden="true" ++ label="&sharePageCmd.label;" ++ tooltiptext="&sharePageCmd.label;" ++ command="Social:SharePage"/> ++ + <toolbaritem id="social-toolbar-item" + class="chromeclass-toolbar-additional" + removable="false" @@ -727,97 +775,20 @@ + label="&social.toggleNotifications.label;" + accesskey="&social.toggleNotifications.accesskey;"/> + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> -+ <menuseparator class="social-statusarea-separator"/> ++ <menuseparator/> + <menuseparator class="social-provider-menu" hidden="true"/> + <menuitem class="social-addons-menuitem" command="Social:Addons" + label="&social.addons.label;"/> ++ <menuitem label="&social.learnMore.label;" ++ accesskey="&social.learnMore.accesskey;" ++ oncommand="SocialUI.showLearnMore();"/> + </menupopup> + </toolbarbutton> -+ </toolbaritem> -+ -+ <toolbaritem id="bookmarks-menu-button-container" -+ class="chromeclass-toolbar-additional" -+ removable="true" -+ title="&bookmarksMenuButton.label;"> -+ <toolbarbutton id="bookmarks-menu-button" -+ type="menu" ++ <toolbarbutton id="social-mark-button" + class="toolbarbutton-1" -+ label="&bookmarksMenuButton.label;" -+ tooltiptext="&bookmarksMenuButton.tooltip;" -+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" -+ ondragover="PlacesMenuDNDHandler.onDragOver(event);" -+ ondragexit="PlacesMenuDNDHandler.onDragExit(event);" -+ ondrop="PlacesMenuDNDHandler.onDrop(event);"> -+ <menupopup id="BMB_bookmarksPopup" -+ placespopup="true" -+ context="placesContext" -+ openInTabs="children" -+ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" -+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" -+ onpopupshowing="BookmarksMenuButton.onPopupShowing(event); -+ if (!this.parentNode._placesView) -+ new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" -+ tooltip="bhTooltip" popupsinherittooltip="true"> -+ <menuitem id="BMB_viewBookmarksToolbar" -+ placesanonid="view-toolbar" -+ toolbarId="PersonalToolbar" -+ type="checkbox" -+ oncommand="onViewToolbarCommand(event)" -+ label="&viewBookmarksToolbar.label;"/> -+ <menuseparator/> -+ <menuitem id="BMB_bookmarksShowAll" -+ label="&showAllBookmarks2.label;" -+ command="Browser:ShowAllBookmarks" -+ key="manBookmarkKb"/> -+ <menuseparator/> -+ <menuitem id="BMB_bookmarkThisPage" -+#ifndef XP_MACOSX -+ class="menuitem-iconic" -+#endif -+ label="&bookmarkThisPageCmd.label;" -+ command="Browser:AddBookmarkAs" -+ key="addBookmarkAsKb"/> -+ <menuitem id="BMB_subscribeToPageMenuitem" -+#ifndef XP_MACOSX -+ class="menuitem-iconic" -+#endif -+ label="&subscribeToPageMenuitem.label;" -+ oncommand="return FeedHandler.subscribeToFeed(null, event);" -+ onclick="checkForMiddleClick(this, event);" -+ observes="singleFeedMenuitemState"/> -+ <menu id="BMB_subscribeToPageMenupopup" -+#ifndef XP_MACOSX -+ class="menu-iconic" -+#endif -+ label="&subscribeToPageMenupopup.label;" -+ observes="multipleFeedsMenuState"> -+ <menupopup id="BMB_subscribeToPageSubmenuMenupopup" -+ onpopupshowing="return FeedHandler.buildFeedList(event.target);" -+ oncommand="return FeedHandler.subscribeToFeed(null, event);" -+ onclick="checkForMiddleClick(this, event);"/> -+ </menu> -+ <menuseparator/> -+ <menu id="BMB_bookmarksToolbar" -+ placesanonid="toolbar-autohide" -+ class="menu-iconic bookmark-item" -+ label="&personalbarCmd.label;" -+ container="true"> -+ <menupopup id="BMB_bookmarksToolbarPopup" -+ placespopup="true" -+ context="placesContext" -+ onpopupshowing="if (!this.parentNode._placesView) -+ new PlacesMenu(event, 'place:folder=TOOLBAR');"/> -+ </menu> -+ <menuseparator/> -+ <!-- Bookmarks menu items --> -+ <menuseparator builder="end" -+ class="hide-if-empty-places-result"/> -+ <menuitem id="BMB_unsortedBookmarks" -+ label="&bookmarksMenuButton.unsorted.label;" -+ oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');" -+ class="menuitem-iconic"/> -+ </menupopup> -+ </toolbarbutton> ++ hidden="true" ++ disabled="true" ++ command="Social:TogglePageMark"/> + </toolbaritem> + + <hbox id="window-controls" hidden="true" pack="end"> @@ -1231,7 +1202,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -55,16 +55,18 @@ browser.jar: +@@ -53,16 +53,18 @@ browser.jar: content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) #endif content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) @@ -1249,7 +1220,7 @@ content/browser/newtab/newTab.css (content/newtab/newTab.css) content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) - * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) + content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1336,7 +1307,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -792,14 +798,25 @@ var gAdvancedPane = { +@@ -797,14 +803,25 @@ var gAdvancedPane = { * Set browser as the operating system default browser. */ setDefaultBrowser: function() @@ -1798,7 +1769,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -602,19 +602,21 @@ +@@ -604,19 +604,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/browser/defaults/profile/prefs.js ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch -# Parent cd1ec2efff2b6c41550ce2b5b9b8ba8182eb9836 +# Parent 020e09bf3fc6f17b3041ecf70f1376da37db8645 # User Wolfgang Rosenauer <[email protected]> Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -342,16 +342,20 @@ pref("browser.download.panel.shown", fal +@@ -340,16 +340,20 @@ pref("browser.download.panel.shown", fal pref("browser.download.panel.firstSessionCompleted", false); // search engines URL @@ -55,7 +55,7 @@ DIST_SUBDIRS = browser metro else DIST_SUBDIRS = $(DIST_SUBDIR) -@@ -142,20 +144,44 @@ install:: $(addprefix generic/profile/,$ +@@ -131,20 +133,44 @@ install:: $(addprefix generic/profile/,$ install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome @@ -71,17 +71,17 @@ + +searchplugins-jar:: $(SEARCHPLUGINS) + for SEARCHPLUGIN in $^; do \ -+ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ -+ $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ -+ mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ ++ $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ ++ $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ ++ mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ + done + +searchplugins-jar:: tmp-search.jar.mn + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ -+ $(QUIET) -j $(FINAL_TARGET)/chrome \ -+ -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ -+ -s $(LOCALE_SRCDIR)/searchplugins \ -+ $(MAKE_JARS_FLAGS) tmp-search.jar.mn ++ $(QUIET) -j $(FINAL_TARGET)/chrome \ ++ -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ ++ -s $(LOCALE_SRCDIR)/searchplugins \ ++ $(MAKE_JARS_FLAGS) tmp-search.jar.mn + +libs:: searchplugins-jar + @@ -92,19 +92,19 @@ @$(MAKE) -C ../../toolkit/locales libs-$* @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* + ifdef MOZ_WEBAPP_RUNTIME + @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* + endif @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) ifdef MOZ_METRO @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* - endif - @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* - diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml --- a/browser/locales/en-US/searchplugins/google.xml +++ b/browser/locales/en-US/searchplugins/google.xml @@ -9,24 +9,16 @@ - <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACuUlEQVRYw8VX60sUURSffybWv6MloxeV0Jug+hJB0YMoCCII1E3LnlYKlVkkUZKaRFEGFlgfMntYhlopVpaP1HXuPPbOzOmcOw/XZbed3ZndvXBYlr17zu+8fudcaWmlLKEsQWlFmUOBAsucY4tsSmQ8gjJTBMOpQjYjkoMGSiStUpHCnknmpXz+uLdJgY5eDsN/TJA1C9KdkUkTjraoWXXlBGDNaQZd/VwoP3xHhbVnGOxvVuHLL1MY5QZArEODbfUMllX70+kbACl8N2qAxgE2XmCLfltZI8O3CRtEXLVg00Xm2ynfAOoeacLA2+9G2t8P3lK98Lf3JsIH8OmH7eEzTEGmO6NT9p3JuBU+ADUB/40ASdsb+5KiFxAAw6pfHkt/p/G5Lu6MTZvhAyDP3VPdrqW90/zSRnmjWw8fwLG7C0VGOV5/dnGll2OXfEVeoFpZcUoOHwBJ0wvdA0FtdwS5YF0dg93XFHg1ZMDrYQNW17KcSC1nJtx3U4XH77nwdui3CaZDhAM/TSiP5c6qUhAu33qJeRFp6UnkpSMQgC1JAKZlC3Y1KsUFQEJ5dw/1/8kHWuEARKtk2HNdgctPdTENewYN0fPJxypUG1Zh74/PWsDQS2K8E/c12NmgQMU5BhXYksT/yaehSw8PgEuxn7HSUydhKkjuZIQ+N5xnwQEcv2cTkIGR3uxjzNY81LwoVLZpwQF0D3ChjCad33RRqujQchIYgDuG/2KbRX0CcDckP22ZFUBnH/dCWtuZ3SMqygTmv3/MCKcIt19RvFHMTbu6M1Eu7Yh9IwbMMEt0SGhdcOi2ClPzC9vvLBp48oELMLSq1SMv0HfakD+i5zuuKuHzwCqccmSMph6NY1pOqdWoNgbHTcEDB3AvjOZBxSV/mJT8aVZWwsdpmeQ8zyNOJOJFMBx3bJFN6R++on7RvMlpZAAAAABJRU5ErkJggg==</Image> + <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image> <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> <Url type="text/html" method="GET" template="https://www.google.com/search";> <Param name="q" value="{searchTerms}"/> @@ -131,7 +131,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -116,16 +116,17 @@ +@@ -119,14 +119,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ @@ -144,8 +144,6 @@ % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd - % locale testpilot @AB_CD@ %locale/feedback/ - locale/feedback/main.dtd (%feedback/main.dtd) - locale/feedback/main.properties (%feedback/main.properties) % locale pdf.js @AB_CD@ %locale/pdfviewer/ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) + locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -1,19 +1,19 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent be9f4eae7dc69ed989cc9f9259b3bb73d1f5dbf9 +# Parent fd73fd56ea00523bcdca2ad4be06d3640888fd58 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -231,17 +231,17 @@ pref("xpinstall.whitelist.add.36", "getp +@@ -207,17 +207,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28 + pref("xpinstall.whitelist.add", "addons.mozilla.org"); + pref("xpinstall.whitelist.add.36", "getpersonas.com"); + pref("xpinstall.whitelist.add.180", "marketplace.firefox.com"); pref("lightweightThemes.update.enabled", true); pref("keyword.enabled", true); - // Override the default keyword.URL. Empty value means - // "use the search service's default engine" - pref("keyword.URL", ""); -pref("general.useragent.locale", "@AB_CD@"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); ++++++ l10n-22.0.tar.bz2 -> l10n-23.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-22.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-23.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in -@@ -52,14 +52,15 @@ endif +@@ -56,14 +56,15 @@ endif # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -220,7 +220,7 @@ #include "AndroidBridge.h" #endif -@@ -2590,16 +2594,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2603,16 +2607,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -246,7 +246,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2626,19 +2639,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2639,19 +2652,20 @@ nsDownload::SetState(DownloadState aStat // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. @@ -271,7 +271,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -49,29 +49,33 @@ toolkit.jar: +@@ -50,29 +50,33 @@ toolkit.jar: content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) @@ -299,12 +299,12 @@ +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde content/global/bindings/progressmeter.xml (widgets/progressmeter.xml) content/global/bindings/radio.xml (widgets/radio.xml) + content/global/bindings/remote-browser.xml (widgets/remote-browser.xml) content/global/bindings/resizer.xml (widgets/resizer.xml) content/global/bindings/richlistbox.xml (widgets/richlistbox.xml) content/global/bindings/scale.xml (widgets/scale.xml) content/global/bindings/scrollbar.xml (widgets/scrollbar.xml) content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) - content/global/bindings/splitter.xml (widgets/splitter.xml) diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml new file mode 100644 --- /dev/null @@ -2203,10 +2203,10 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -63,17 +63,18 @@ else +@@ -60,17 +60,18 @@ DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICO + else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm - EXPORTS += MacQuirks.h else ifeq ($(MOZ_WIDGET_TOOLKIT),os2) CPPSRCS += nsNativeAppSupportOS2.cpp @@ -2221,8 +2221,8 @@ CPPSRCS += $(MOCSRCS) CPPSRCS += nsNativeAppSupportQt.cpp CPPSRCS += nsQAppInstance.cpp - EXPORTS += nsQAppInstance.h else + CPPSRCS += nsNativeAppSupportDefault.cpp diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp new file mode 100644 --- /dev/null @@ -2642,8 +2642,8 @@ OSHELPER += nsMIMEInfoAndroid.cpp OSHELPER += nsAndroidHandlerApp.cpp OSHELPER += nsExternalSharingAppService.cpp - EXPORTS += nsExternalSharingAppService.h OSHELPER += nsExternalURLHandlerService.cpp + endif diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp new file mode 100644 --- /dev/null @@ -3031,8 +3031,7 @@ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) { -@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c - minorType, +@@ -1266,17 +1266,17 @@ nsOSHelperAppService::GetFromExtension(c mime_types_description, true); @@ -3040,30 +3039,31 @@ #ifdef MOZ_WIDGET_GTK2 LOG(("Looking in GNOME registry\n")); -- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromExtension(aFileExt).get(); -+ nsMIMEInfoBase *gnomeInfo = nsCommonRegistry::GetFromExtension(aFileExt).get(); + nsRefPtr<nsMIMEInfoBase> gnomeInfo = +- nsGNOMERegistry::GetFromExtension(aFileExt); ++ nsCommonRegistry::GetFromExtension(aFileExt); if (gnomeInfo) { LOG(("Got MIMEInfo from GNOME registry\n")); - return gnomeInfo; + return gnomeInfo.forget(); } #endif rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, -@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const +@@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const #ifdef MOZ_WIDGET_GTK2 - nsMIMEInfoBase *gnomeInfo = nullptr; + nsRefPtr<nsMIMEInfoBase> gnomeInfo; if (handler.IsEmpty()) { // No useful data yet. Check the GNOME registry. Unfortunately, newer // GNOME versions no longer have type-to-extension mappings, so we might // get back a MIMEInfo without any extensions set. In that case we'll have // to look in our mime.types files for the extensions. LOG(("Looking in GNOME registry\n")); -- gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); -+ gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType).get(); +- gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType); ++ gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType); if (gnomeInfo && gnomeInfo->HasExtensions()) { LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n")); - return gnomeInfo; + return gnomeInfo.forget(); } } #endif @@ -3072,7 +3072,7 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in -@@ -102,11 +102,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' +@@ -96,11 +96,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' INCLUDES += \ -I$(srcdir)/../xpwidgets \ @@ -3438,7 +3438,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -46,10 +46,11 @@ LOCAL_INCLUDES = \ +@@ -34,10 +34,11 @@ LOCAL_INCLUDES = \ # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 @@ -3584,7 +3584,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -113,17 +113,17 @@ include $(topsrcdir)/ipc/chromium/chromi +@@ -77,17 +77,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8303,16 +8303,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8309,16 +8309,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -42,24 +42,18 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -93,16 +93,19 @@ DEFINES += \ +@@ -87,10 +87,13 @@ endif + CSRCS += md4.c - EXPORTS += \ - CryptoTask.h \ - nsNSSShutDown.h \ - ScopedNSSTypes.h \ - nsRandomGenerator.h \ + DEFINES += \ + -DNSS_ENABLE_ECC \ + -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ + -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ $(NULL) +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) + - EXPORTS_NAMESPACES = mozilla - - EXPORTS_mozilla += \ - PublicSSL.h \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp @@ -82,14 +76,14 @@ +#endif + #include "nsNSSComponent.h" + + #include "CertVerifier.h" #include "nsNSSCallbacks.h" #include "nsNSSIOLayer.h" #include "nsCertVerificationThread.h" #include "nsNetUtil.h" - #include "nsAppDirectoryServiceDefs.h" - #include "nsDirectoryService.h" -@@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1721,18 +1728,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -129,7 +123,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -501,17 +501,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -510,17 +510,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.fEJqem/_old 2013-08-11 11:21:49.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJqem/_new 2013-08-11 11:21:49.000000000 +0200 @@ -1,2 +1,2 @@ -REV=0d4b9c74be55 +REV=5efffaf39814 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
