- tor-commits - lists.torproject.org

[tor-messenger-build/master] Bump mingw-w64 to 3deeda3a
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit fe08b784f674587d92b5f933a33d5ce4f3057b2c Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 08:47:52 2016 -0700 Bump mingw-w64 to 3deeda3a --- ...fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch | 24 - ...0522-expose-whether-or-not-we-re-in-ta.mozpatch | 512 --------------------- ...2573-Require-tablet-mode-Win10-to-show.mozpatch | 149 ------ projects/instantbird/config | 6 - projects/mingw-w64/config | 2 +- 5 files changed, 1 insertion(+), 692 deletions(-) diff --git a/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch b/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch deleted file mode 100644 index 344e2ed..0000000 --- a/projects/instantbird/0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch +++ /dev/null @@ -1,24 +0,0 @@ -From 464da9c6d7b576a9b92b2c2e26d52a9213e3f89d Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Tue, 29 Sep 2015 16:06:38 +0200 -Subject: [PATCH 1/2] Revert "no bug - fix case of nsIDocShell.h in - WindowsUIUtils.cpp" - -This reverts commit 02335958d9315e5620f030617e4a599209697054. ---- - widget/windows/WindowsUIUtils.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp -index 0c93d945cf30..98325f0eb055 100644 ---- a/widget/windows/WindowsUIUtils.cpp -+++ b/widget/windows/WindowsUIUtils.cpp -@@ -11,7 +11,7 @@ - - #include "nsIObserverService.h" - #include "nsIBaseWindow.h" --#include "nsIDocShell.h" -+#include "nsIDocshell.h" - #include "nsIAppShellService.h" - #include "nsAppShellCID.h" - #include "nsIXULWindow.h" diff --git a/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch b/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch deleted file mode 100644 index bf68c7c..0000000 --- a/projects/instantbird/0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch +++ /dev/null @@ -1,512 +0,0 @@ -From 0fd6ae4f5947b5229b8c14704b893d95787e54a3 Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Tue, 29 Sep 2015 16:06:49 +0200 -Subject: [PATCH 2/2] Revert "Bug 1170522 - expose whether or not we're in - tablet mode to xul/js/css, r=jimm,ted" - -This reverts commit 6c7bdf65167060865d9f9a09c0aa3dae0d91680c. ---- - build/win32/mozconfig.vs2013-win64 | 2 +- - build/win64/mozconfig.vs2013 | 2 +- - toolkit/library/moz.build | 6 -- - widget/moz.build | 1 - - widget/nsIWindowsUIUtils.idl | 24 ----- - widget/nsWidgetsCID.h | 4 - - widget/windows/WindowsUIUtils.cpp | 174 ------------------------------------- - widget/windows/WindowsUIUtils.h | 29 ------- - widget/windows/moz.build | 1 - - widget/windows/mozwrlbase.h | 77 ---------------- - widget/windows/nsWidgetFactory.cpp | 6 -- - widget/windows/nsWindow.cpp | 16 ---- - 12 files changed, 2 insertions(+), 340 deletions(-) - delete mode 100644 widget/nsIWindowsUIUtils.idl - delete mode 100644 widget/windows/WindowsUIUtils.cpp - delete mode 100644 widget/windows/WindowsUIUtils.h - delete mode 100644 widget/windows/mozwrlbase.h - -diff --git a/build/win32/mozconfig.vs2013-win64 b/build/win32/mozconfig.vs2013-win64 -index 85821f0720aa..86a846cf670e 100644 ---- a/build/win32/mozconfig.vs2013-win64 -+++ b/build/win32/mozconfig.vs2013-win64 -@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013" - export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT - - ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ## --export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include -+export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include - - ## libs: win8.1 sdk x86 (32-bit) libs, msvc (32-bit) std library, msvc atl libs, directx sdk (32-bit) for d3d9 ## - export LIBPATH=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/Lib/winv6.3/um/x86:${_VSPATH}/vc/lib:${_VSPATH}/vc/atlmfc/lib:/c/tools/sdks/dx10/lib -diff --git a/build/win64/mozconfig.vs2013 b/build/win64/mozconfig.vs2013 -index 5fbde2df738b..776c9183e522 100644 ---- a/build/win64/mozconfig.vs2013 -+++ b/build/win64/mozconfig.vs2013 -@@ -2,7 +2,7 @@ _VSPATH="/c/tools/vs2013" - export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x64/Microsoft.VC120.CRT - - ## includes: win8.1 sdk includes, msvc std library, directx sdk for d3d9 ## --export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/winrt:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include -+export INCLUDE=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ $x86$/Windows\ Kits/8.1/include/um:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include - - ## libs: win8.1 sdk x64 (64-bit) libs, msvc (64-bit) std library, msvc atl libs, directx sdk (64-bit) for d3d9 ## - export LIBPATH=/c/Program\ Files\ $x86$/Windows\ Kits/8.1/Lib/winv6.3/um/x64:${_VSPATH}/vc/lib/amd64:${_VSPATH}/vc/atlmfc/lib/amd64:/c/tools/sdks/dx10/lib/x64 -diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build -index 62e03f45e154..fcd62bae854e 100644 ---- a/toolkit/library/moz.build -+++ b/toolkit/library/moz.build -@@ -33,12 +33,6 @@ def Libxul(name): - if CONFIG['MOZ_WEBRTC']: - DELAYLOAD_DLLS += ['msdmo.dll'] - -- if CONFIG['OS_ARCH'] == 'WINNT': -- DELAYLOAD_DLLS += [ -- 'api-ms-win-core-winrt-l1-1-0.dll', -- 'api-ms-win-core-winrt-string-l1-1-0.dll', -- ] -- - if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']: - LOCAL_INCLUDES += [ - '/widget/windows', -diff --git a/widget/moz.build b/widget/moz.build -index 373cf8b23da6..429da474c1ee 100644 ---- a/widget/moz.build -+++ b/widget/moz.build -@@ -26,7 +26,6 @@ if toolkit == 'windows': - 'nsITaskbarProgress.idl', - 'nsITaskbarTabPreview.idl', - 'nsITaskbarWindowPreview.idl', -- 'nsIWindowsUIUtils.idl', - 'nsIWinTaskbar.idl', - ] - elif toolkit == 'cocoa': -diff --git a/widget/nsIWindowsUIUtils.idl b/widget/nsIWindowsUIUtils.idl -deleted file mode 100644 -index 331562a67245..000000000000 ---- a/widget/nsIWindowsUIUtils.idl -+++ /dev/null -@@ -1,24 +0,0 @@ --/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -- * -- * This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#include "nsISupports.idl" -- -- --[scriptable, uuid(aa8a0ecf-96a1-418c-b80e-f24ae18bbedc)] --interface nsIWindowsUIUtils : nsISupports --{ -- /** -- * Whether the OS is currently in tablet mode. Always false on -- * non-Windows and on versions of Windows before win10 -- */ -- readonly attribute boolean inTabletMode; -- -- /** -- * Update the tablet mode state -- */ -- void updateTabletModeState(); --}; -- -diff --git a/widget/nsWidgetsCID.h b/widget/nsWidgetsCID.h -index a428cdee2866..afafe93f24c0 100644 ---- a/widget/nsWidgetsCID.h -+++ b/widget/nsWidgetsCID.h -@@ -185,7 +185,3 @@ - #define NS_IMEPICKER_CID \ - { 0x8e5c35ef, 0xb65b, 0x47aa, \ - { 0xbb, 0x90, 0x5b, 0x89, 0x6d, 0x88, 0x24, 0x18 } } -- --#define NS_WINDOWS_UIUTILS_CID \ --{ 0xe04a55e8, 0xfee3, 0x4ea2, \ -- { 0xa9, 0x8b, 0x41, 0xd2, 0x62, 0x1a, 0xdc, 0x3c } } -diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp -deleted file mode 100644 -index 98325f0eb055..000000000000 ---- a/widget/windows/WindowsUIUtils.cpp -+++ /dev/null -@@ -1,174 +0,0 @@ --/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#include <windows.h> --#include "mozwrlbase.h" --#include "nsServiceManagerUtils.h" -- --#include "WindowsUIUtils.h" -- --#include "nsIObserverService.h" --#include "nsIBaseWindow.h" --#include "nsIDocshell.h" --#include "nsIAppShellService.h" --#include "nsAppShellCID.h" --#include "nsIXULWindow.h" --#include "mozilla/Services.h" --#include "mozilla/WindowsVersion.h" --#include "nsString.h" --#include "nsIWidget.h" -- --#include <windows.ui.viewmanagement.h> -- --#pragma comment(lib, "runtimeobject.lib") -- --using namespace mozilla; --using namespace ABI::Windows::UI; --using namespace ABI::Windows::UI::ViewManagement; --using namespace Microsoft::WRL; --using namespace Microsoft::WRL::Wrappers; --using namespace ABI::Windows::Foundation; -- --/* All of this is win10 stuff and we're compiling against win81 headers -- * for now, so we may need to do some legwork: */ --#ifndef UserInteractionMode --namespace ABI { -- namespace Windows { -- namespace UI { -- namespace ViewManagement { -- enum UserInteractionMode { -- UserInteractionMode_Mouse = 0, -- UserInteractionMode_Touch = 1 -- }; -- } -- } -- } --} -- --#endif -- --#ifndef RuntimeClass_Windows_UI_ViewManagement_UIViewSettings --#define RuntimeClass_Windows_UI_ViewManagement_UIViewSettings L"Windows.UI.ViewManagement.UIViewSettings" --#endif -- --#ifndef IUIViewSettings --namespace ABI { -- namespace Windows { -- namespace UI { -- namespace ViewManagement { -- interface IUIViewSettings; -- MIDL_INTERFACE("C63657F6-8850-470D-88F8-455E16EA2C26") -- IUIViewSettings : public IInspectable -- { -- public: -- virtual HRESULT STDMETHODCALLTYPE get_UserInteractionMode(UserInteractionMode *value) = 0; -- }; -- -- extern const __declspec(selectany) IID & IID_IUIViewSettings = __uuidof(IUIViewSettings); -- } -- } -- } --} --#endif -- --#ifndef IUIViewSettingsInterop -- --typedef interface IUIViewSettingsInterop IUIViewSettingsInterop; -- --MIDL_INTERFACE("3694dbf9-8f68-44be-8ff5-195c98ede8a6") --IUIViewSettingsInterop : public IInspectable --{ --public: -- virtual HRESULT STDMETHODCALLTYPE GetForWindow(HWND hwnd, REFIID riid, void **ppv) = 0; --}; --#endif -- --WindowsUIUtils::WindowsUIUtils() : -- mInTabletMode(eTabletModeUnknown) --{ --} -- --WindowsUIUtils::~WindowsUIUtils() --{ --} -- --/* -- * Implement the nsISupports methods... -- */ --NS_IMPL_ISUPPORTS(WindowsUIUtils, -- nsIWindowsUIUtils) -- --NS_IMETHODIMP --WindowsUIUtils::GetInTabletMode(bool* aResult) --{ -- if (mInTabletMode == eTabletModeUnknown) { -- UpdateTabletModeState(); -- } -- *aResult = mInTabletMode == eTabletModeOn; -- return NS_OK; --} -- --NS_IMETHODIMP --WindowsUIUtils::UpdateTabletModeState() --{ -- if (!IsWin10OrLater()) { -- return NS_OK; -- } -- -- nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID)); -- nsCOMPtr<nsIXULWindow> hiddenWindow; -- -- nsresult rv = appShell->GetHiddenWindow(getter_AddRefs(hiddenWindow)); -- if (NS_FAILED(rv)) { -- return rv; -- } -- -- nsCOMPtr<nsIDocShell> docShell; -- rv = hiddenWindow->GetDocShell(getter_AddRefs(docShell)); -- if (NS_FAILED(rv) || !docShell) { -- return rv; -- } -- -- nsCOMPtr<nsIBaseWindow> baseWindow(do_QueryInterface(docShell)); -- -- if (!baseWindow) -- return NS_ERROR_FAILURE; -- -- nsCOMPtr<nsIWidget> widget; -- baseWindow->GetMainWidget(getter_AddRefs(widget)); -- -- if (!widget) -- return NS_ERROR_FAILURE; -- -- HWND winPtr = (HWND)widget->GetNativeData(NS_NATIVE_WINDOW); -- ComPtr<IUIViewSettingsInterop> uiViewSettingsInterop; -- -- HRESULT hr = GetActivationFactory( -- HStringReference(RuntimeClass_Windows_UI_ViewManagement_UIViewSettings).Get(), -- &uiViewSettingsInterop); -- if (SUCCEEDED(hr)) { -- ComPtr<IUIViewSettings> uiViewSettings; -- hr = uiViewSettingsInterop->GetForWindow(winPtr, IID_PPV_ARGS(&uiViewSettings)); -- if (SUCCEEDED(hr)) { -- UserInteractionMode mode; -- hr = uiViewSettings->get_UserInteractionMode(&mode); -- if (SUCCEEDED(hr)) { -- TabletModeState oldTabletModeState = mInTabletMode; -- mInTabletMode = (mode == UserInteractionMode_Touch) ? eTabletModeOn : eTabletModeOff; -- if (mInTabletMode != oldTabletModeState) { -- nsCOMPtr<nsIObserverService> observerService = -- mozilla::services::GetObserverService(); -- NS_NAMED_LITERAL_STRING(tabletMode, "tablet-mode"); -- NS_NAMED_LITERAL_STRING(normalMode, "normal-mode"); -- observerService->NotifyObservers(nullptr, "tablet-mode-change", -- ((mInTabletMode == eTabletModeOn) ? tabletMode.get() : normalMode.get())); -- } -- } -- } -- } -- -- return NS_OK; --} -- -diff --git a/widget/windows/WindowsUIUtils.h b/widget/windows/WindowsUIUtils.h -deleted file mode 100644 -index a33c93a94f23..000000000000 ---- a/widget/windows/WindowsUIUtils.h -+++ /dev/null -@@ -1,29 +0,0 @@ --/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#ifndef mozilla_widget_WindowsUIUtils_h__ --#define mozilla_widget_WindowsUIUtils_h__ -- --#include "nsIWindowsUIUtils.h" -- --enum TabletModeState { -- eTabletModeUnknown = 0, -- eTabletModeOff, -- eTabletModeOn --}; -- --class WindowsUIUtils final : public nsIWindowsUIUtils { --public: -- NS_DECL_ISUPPORTS -- NS_DECL_NSIWINDOWSUIUTILS -- -- WindowsUIUtils(); --protected: -- ~WindowsUIUtils(); -- -- TabletModeState mInTabletMode; --}; -- --#endif // mozilla_widget_WindowsUIUtils_h__ -diff --git a/widget/windows/moz.build b/widget/windows/moz.build -index 755e763553c1..fdb2fb70d28a 100644 ---- a/widget/windows/moz.build -+++ b/widget/windows/moz.build -@@ -63,7 +63,6 @@ SOURCES += [ - 'nsBidiKeyboard.cpp', - 'nsFilePicker.cpp', - 'nsWidgetFactory.cpp', -- 'WindowsUIUtils.cpp', - 'WinMouseScrollHandler.cpp', - ] - -diff --git a/widget/windows/mozwrlbase.h b/widget/windows/mozwrlbase.h -deleted file mode 100644 -index d82be8f0431d..000000000000 ---- a/widget/windows/mozwrlbase.h -+++ /dev/null -@@ -1,77 +0,0 @@ --/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ --/* This Source Code Form is subject to the terms of the Mozilla Public -- * License, v. 2.0. If a copy of the MPL was not distributed with this -- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -- --#pragma once -- --/* -- * Includes <wrl.h> and it's children. Defines imports needed by -- * corewrappers.h in the case where windows.h has already been -- * included w/WINVER < 0x600. Also ups WINVER/_WIN32_WINNT prior -- * to including wrl.h. Mozilla's build currently has WINVER set to -- * 0x502 for XP support. -- */ -- --#if _WIN32_WINNT < 0x600 -- --#include <windows.h> -- --VOID --WINAPI --ReleaseSRWLockExclusive( -- _Inout_ PSRWLOCK SRWLock -- ); -- --VOID --WINAPI --ReleaseSRWLockShared( -- _Inout_ PSRWLOCK SRWLock -- ); -- --BOOL --WINAPI --InitializeCriticalSectionEx( -- _Out_ LPCRITICAL_SECTION lpCriticalSection, -- _In_ DWORD dwSpinCount, -- _In_ DWORD Flags -- ); -- --VOID --WINAPI --InitializeSRWLock( -- _Out_ PSRWLOCK SRWLock -- ); -- --VOID --WINAPI --AcquireSRWLockExclusive( -- _Inout_ PSRWLOCK SRWLock -- ); -- --BOOLEAN --WINAPI --TryAcquireSRWLockExclusive( -- _Inout_ PSRWLOCK SRWLock -- ); -- --BOOLEAN --WINAPI --TryAcquireSRWLockShared( -- _Inout_ PSRWLOCK SRWLock -- ); -- --VOID --WINAPI --AcquireSRWLockShared( -- _Inout_ PSRWLOCK SRWLock -- ); -- --#undef WINVER --#undef _WIN32_WINNT --#define WINVER 0x600 --#define _WIN32_WINNT 0x600 -- --#endif // _WIN32_WINNT < 0x600 -- --#include <wrl.h> -diff --git a/widget/windows/nsWidgetFactory.cpp b/widget/windows/nsWidgetFactory.cpp -index f564d17ee6c6..b7cedbefe2cf 100644 ---- a/widget/windows/nsWidgetFactory.cpp -+++ b/widget/windows/nsWidgetFactory.cpp -@@ -44,8 +44,6 @@ - #include "JumpListBuilder.h" - #include "JumpListItem.h" - --#include "WindowsUIUtils.h" -- - #ifdef NS_PRINTING - #include "nsDeviceContextSpecWin.h" - #include "nsPrintOptionsWin.h" -@@ -114,7 +112,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListItem) - NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListSeparator) - NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListLink) - NS_GENERIC_FACTORY_CONSTRUCTOR(JumpListShortcut) --NS_GENERIC_FACTORY_CONSTRUCTOR(WindowsUIUtils) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService) -@@ -153,7 +150,6 @@ NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTITEM_CID); - NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSEPARATOR_CID); - NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTLINK_CID); - NS_DEFINE_NAMED_CID(NS_WIN_JUMPLISTSHORTCUT_CID); --NS_DEFINE_NAMED_CID(NS_WINDOWS_UIUTILS_CID); - NS_DEFINE_NAMED_CID(NS_DRAGSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_BIDIKEYBOARD_CID); - #ifdef NS_PRINTING -@@ -186,7 +182,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = { - { &kNS_WIN_JUMPLISTSEPARATOR_CID, false, nullptr, JumpListSeparatorConstructor }, - { &kNS_WIN_JUMPLISTLINK_CID, false, nullptr, JumpListLinkConstructor }, - { &kNS_WIN_JUMPLISTSHORTCUT_CID, false, nullptr, JumpListShortcutConstructor }, -- { &kNS_WINDOWS_UIUTILS_CID, false, nullptr, WindowsUIUtilsConstructor }, - { &kNS_DRAGSERVICE_CID, false, nullptr, nsDragServiceConstructor, Module::MAIN_PROCESS_ONLY }, - { &kNS_BIDIKEYBOARD_CID, false, nullptr, nsBidiKeyboardConstructor }, - #ifdef NS_PRINTING -@@ -219,7 +214,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = { - { "@mozilla.org/windows-jumplistseparator;1", &kNS_WIN_JUMPLISTSEPARATOR_CID }, - { "@mozilla.org/windows-jumplistlink;1", &kNS_WIN_JUMPLISTLINK_CID }, - { "@mozilla.org/windows-jumplistshortcut;1", &kNS_WIN_JUMPLISTSHORTCUT_CID }, -- { "@mozilla.org/windows-ui-utils;1", &kNS_WINDOWS_UIUTILS_CID }, - { "@mozilla.org/widget/dragservice;1", &kNS_DRAGSERVICE_CID, Module::MAIN_PROCESS_ONLY }, - { "@mozilla.org/widget/bidikeyboard;1", &kNS_BIDIKEYBOARD_CID }, - #ifdef NS_PRINTING -diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp -index 0ab8bee04863..b616fb725cfd 100644 ---- a/widget/windows/nsWindow.cpp -+++ b/widget/windows/nsWindow.cpp -@@ -161,8 +161,6 @@ - #include "nsIWinTaskbar.h" - #define NS_TASKBAR_CONTRACTID "@mozilla.org/windows-taskbar;1" - --#include "nsIWindowsUIUtils.h" -- - #include "nsWindowDefs.h" - - #include "nsCrashOnException.h" -@@ -4845,20 +4843,6 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, - } - break; - -- case WM_SETTINGCHANGE: -- { -- if (IsWin10OrLater() && mWindowType == eWindowType_invisible && lParam) { -- auto lParamString = reinterpret_cast<const wchar_t*>(lParam); -- if (!wcscmp(lParamString, L"UserInteractionMode")) { -- nsCOMPtr<nsIWindowsUIUtils> uiUtils(do_GetService("@mozilla.org/windows-ui-utils;1")); -- if (uiUtils) { -- uiUtils->UpdateTabletModeState(); -- } -- } -- } -- } -- break; -- - case WM_NCCALCSIZE: - { - if (mCustomNonClient) { diff --git a/projects/instantbird/0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch b/projects/instantbird/0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch deleted file mode 100644 index 5122351..0000000 --- a/projects/instantbird/0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch +++ /dev/null @@ -1,149 +0,0 @@ -From 8fffddd5b63e14b70213fe93a2dbac2953f10d5a Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Wed, 30 Sep 2015 12:08:26 +0200 -Subject: [PATCH 3/3] Revert "Bug 1192573 - Require tablet-mode (Win10+) to - show the on-screen keyboard. r=masayuki, a=sledru" - -This reverts commit 7af35d3472734b241fa053c1d5e3ff8fe1b0d513. ---- - modules/libpref/init/all.js | 3 --- - widget/windows/WinIMEHandler.cpp | 52 +++++++++++++++------------------------- - 2 files changed, 19 insertions(+), 36 deletions(-) - -diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 6e22123e9084..27b3b2834841 100644 ---- a/modules/libpref/init/all.js -+++ b/modules/libpref/init/all.js -@@ -3237,9 +3237,6 @@ pref("ui.osk.enabled", true); - pref("ui.osk.detect_physical_keyboard", true); - // Path to TabTip.exe on local machine. Cached for performance reasons. - pref("ui.osk.on_screen_keyboard_path", ""); --// Only show the on-screen keyboard when Windows is in Tablet mode. Setting --// this pref to false will allow the OSK to show in regular non-tablet mode. --pref("ui.osk.require_tablet_mode", true); - - # XP_WIN - #endif -diff --git a/widget/windows/WinIMEHandler.cpp b/widget/windows/WinIMEHandler.cpp -index 8d56bb1d3985..28b4f5a704f7 100644 ---- a/widget/windows/WinIMEHandler.cpp -+++ b/widget/windows/WinIMEHandler.cpp -@@ -16,7 +16,6 @@ - #include "nsLookAndFeel.h" - #include "nsWindow.h" - #include "WinUtils.h" --#include "nsIWindowsUIUtils.h" - - #include "shellapi.h" - #include "Shlobj.h" -@@ -27,7 +26,6 @@ - const char* kOskPathPrefName = "ui.osk.on_screen_keyboard_path"; - const char* kOskEnabled = "ui.osk.enabled"; - const char* kOskDetectPhysicalKeyboard = "ui.osk.detect_physical_keyboard"; --const char* kOskRequireTabletMode = "ui.osk.require_tablet_mode"; - - namespace mozilla { - namespace widget { -@@ -527,44 +525,19 @@ IMEHandler::SetInputScopeForIMM32(nsWindow* aWindow, - void - IMEHandler::MaybeShowOnScreenKeyboard() - { -- if (sPluginHasFocus || -- !IsWin10OrLater() || -- !Preferences::GetBool(kOskEnabled, true) || -- sShowingOnScreenKeyboard || -- IMEHandler::IsKeyboardPresentOnSlate()) { -+ if (sPluginHasFocus) { - return; - } -- -- if (Preferences::GetBool(kOskRequireTabletMode, true)) { -- // Tablet Mode is only supported on Windows 10 and higher. -- // When touch-event detection within IME is better supported -- // this check may be removed, and ShowOnScreenKeyboard can -- // run on Windows 8 and higher (adjusting the IsWin10OrLater -- // guard above and within MaybeDismissOnScreenKeyboard). -- nsCOMPtr<nsIWindowsUIUtils> -- uiUtils(do_GetService("@mozilla.org/windows-ui-utils;1")); -- if (uiUtils) { -- bool isInTabletMode = false; -- uiUtils->GetInTabletMode(&isInTabletMode); -- if (!isInTabletMode) { -- return; -- } -- } -- } -- -- IMEHandler::ShowOnScreenKeyboard(); -+ IMEHandler::ShowOnScreenKeyboard(); - } - - // static - void - IMEHandler::MaybeDismissOnScreenKeyboard() - { -- if (sPluginHasFocus || -- !IsWin10OrLater() || -- !sShowingOnScreenKeyboard) { -+ if (sPluginHasFocus) { - return; - } -- - IMEHandler::DismissOnScreenKeyboard(); - } - -@@ -666,12 +639,13 @@ IMEHandler::IsKeyboardPresentOnSlate() - { 0x4D36E96B, 0xE325, 0x11CE, - { 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18 } }; - -+ bool result = false; - // Query for all the keyboard devices. - HDEVINFO device_info = - ::SetupDiGetClassDevs(&KEYBOARD_CLASS_GUID, nullptr, - nullptr, DIGCF_PRESENT); - if (device_info == INVALID_HANDLE_VALUE) { -- return false; -+ return result; - } - - // Enumerate all keyboards and look for ACPI\PNP and HID\VID devices. If -@@ -701,11 +675,11 @@ IMEHandler::IsKeyboardPresentOnSlate() - // return true if the API's report one or more keyboards. Please note - // that this will break for non keyboard devices which expose a - // keyboard PDO. -- return true; -+ result = true; - } - } - } -- return false; -+ return result; - } - - // Based on DisplayVirtualKeyboard() in Chromium's base/win/win_util.cc. -@@ -713,6 +687,13 @@ IMEHandler::IsKeyboardPresentOnSlate() - void - IMEHandler::ShowOnScreenKeyboard() - { -+ if (!IsWin8OrLater() || -+ !Preferences::GetBool(kOskEnabled, true) || -+ sShowingOnScreenKeyboard || -+ IMEHandler::IsKeyboardPresentOnSlate()) { -+ return; -+ } -+ - nsAutoString cachedPath; - nsresult result = Preferences::GetString(kOskPathPrefName, &cachedPath); - if (NS_FAILED(result) || cachedPath.IsEmpty()) { -@@ -793,6 +774,11 @@ IMEHandler::ShowOnScreenKeyboard() - void - IMEHandler::DismissOnScreenKeyboard() - { -+ if (!IsWin8OrLater() || -+ !sShowingOnScreenKeyboard) { -+ return; -+ } -+ - sShowingOnScreenKeyboard = false; - - // Dismiss the virtual keyboard by generating the ESC keystroke diff --git a/projects/instantbird/config b/projects/instantbird/config index fa6ac16..e320000 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -105,12 +105,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: gmploader-sandbox.mozpatch enable: '[% c("var/windows") %]' - - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch - enable: '[% c("var/windows") %]' - - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch - enable: '[% c("var/windows") %]' - - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch - enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config index c080a13..5b260e2 100644 --- a/projects/mingw-w64/config +++ b/projects/mingw-w64/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 917249082fd711f6a3e13515d1f6ffd4474d4f9c +git_hash: 3deeda3a1db3dee8a8b6231be5b44f47d79ce1d7 version: '[% c("abbrev") %]' remote_docker: 1 var:

1 0

[tor-messenger-build/master] Remove WINSDK patch already in esr45
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 3393b2f3efba416f4acff6a20f7f1736f50a0cb9 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 08:18:26 2016 -0700 Remove WINSDK patch already in esr45 --- ...e-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch | 101 --------------------- projects/instantbird/config | 2 - 2 files changed, 103 deletions(-) diff --git a/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch b/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch deleted file mode 100644 index fc7daf1..0000000 --- a/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch +++ /dev/null @@ -1,101 +0,0 @@ -From 12146218bf250e6b7f2e15ebe1685d3da9cdd99a Mon Sep 17 00:00:00 2001 -From: Jacek Caban <jacek(a)codeweavers.com> -Date: Wed, 7 Oct 2015 12:26:40 +0200 -Subject: [PATCH] Bug 1197281 - Use MOZ_FIND_WINSDK_VERSION for - MOZ_WINSDK_MAXVER on mingw. r=glandium - ---- - configure.in | 11 ++++------- - js/src/configure.in | 11 ++++------- - 2 files changed, 8 insertions(+), 14 deletions(-) - -diff --git a/configure.in b/configure.in -index dc0192193ce8..3c7ee5afcf57 100644 ---- a/configure.in -+++ b/configure.in -@@ -505,6 +505,9 @@ EOF - fi - fi - -+AC_PROG_CPP -+AC_PROG_CXXCPP -+ - dnl ======================================================== - dnl Special win32 checks - dnl ======================================================== -@@ -730,8 +733,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.] - fi - CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0" - CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0" -- -- MOZ_FIND_WINSDK_VERSION - else - # Check w32api version - _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` -@@ -783,10 +784,9 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.] - # strsafe.h on mingw uses macros for function deprecation that pollutes namespace - # causing problems with local implementations with the same name. - AC_DEFINE(STRSAFE_NO_DEPRECATE) -- -- MOZ_WINSDK_MAXVER=0x06030000 - fi # !GNU_CC - -+ MOZ_FIND_WINSDK_VERSION - AC_DEFINE_UNQUOTED(WINVER,0x$WINVER) - AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER) - # Require OS features provided by IE 6.0 SP2 (XP SP2) -@@ -810,9 +810,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.] - ;; - esac - --AC_PROG_CPP --AC_PROG_CXXCPP -- - if test -n "$_WIN32_MSVC"; then - SKIP_PATH_CHECKS=1 - SKIP_COMPILER_CHECKS=1 -diff --git a/js/src/configure.in b/js/src/configure.in -index 7cc41469aa36..e0c546876201 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -303,6 +303,9 @@ MOZ_TOOL_VARIABLES - - MOZ_CHECK_COMPILER_WRAPPER - -+AC_PROG_CPP -+AC_PROG_CXXCPP -+ - dnl Special win32 checks - dnl ======================================================== - -@@ -432,8 +435,6 @@ case "$target" in - - CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0" - CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0" -- -- MOZ_FIND_WINSDK_VERSION - else - # Check w32api version - _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` -@@ -469,10 +470,9 @@ case "$target" in - then - AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.]) - fi -- -- MOZ_WINSDK_MAXVER=0x06030000 - fi # !GNU_CC - -+ MOZ_FIND_WINSDK_VERSION - AC_DEFINE_UNQUOTED(WINVER,0x$WINVER) - AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER) - # Require OS features provided by IE 6.0 SP2 (XP SP2) -@@ -494,9 +494,6 @@ case "$target" in - ;; - esac - --AC_PROG_CPP --AC_PROG_CXXCPP -- - if test -n "$_WIN32_MSVC"; then - SKIP_PATH_CHECKS=1 - SKIP_COMPILER_CHECKS=1 diff --git a/projects/instantbird/config b/projects/instantbird/config index f1982e4..fa6ac16 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -111,8 +111,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch enable: '[% c("var/windows") %]' - - filename: 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch - enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch

1 0

[tor/master] Okay fine maybe it's an alpha.
by nickm＠torproject.org 23 Mar '16

23 Mar '16

commit 20d8370800582a513dbd687a57bb49d4280f0115 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 23 11:17:57 2016 -0400 Okay fine maybe it's an alpha. --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a9dbbf..761d453 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Changes in version 0.2.8.2-rc - 2016-03-?? - Tor 0.2.8.1-alpha is the first release candidate in its series. XXXX +Changes in version 0.2.8.2-alpha - 2016-03-?? + Tor 0.2.8.2-alpha is the second alpha in its series. XXXX write more here XXXX o New system requirements:

1 0

[tor/master] Fold more changes files into the changelog
by nickm＠torproject.org 23 Mar '16

23 Mar '16

commit 316cfd77cec5e7ed12848195ee9a7a4b1b23ec3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 23 10:31:28 2016 -0400 Fold more changes files into the changelog --- ChangeLog | 47 +++++++++++++++++++++++++++++++++++++++-------- changes/bug17443 | 5 ----- changes/bug17668 | 5 ----- changes/bug17702 | 6 ------ changes/bug18253 | 3 --- changes/bug18318_ed | 7 ------- changes/bug18368 | 5 ----- changes/bug18548 | 12 ------------ 8 files changed, 39 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc7f105..5a9dbbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,9 +38,21 @@ Changes in version 0.2.8.2-rc - 2016-03-?? Fixes bug 18348; bugfix on 0.2.8.1-alpha. Reported by sysrqb, patch by teor. - o Minor features: - - Update geoip and geoip6 to the February 2 2016 Maxmind GeoLite2 - Country database. + o Major bugfixes (voting): + - Actually enable Ed25519-based directory collation. Previously, the + code had been written, but some debugging code that had + accidentally been left in the codebase made it stay turned off. + Fixes bug 17702; bugfix on 0.2.7.2-alpha. + - When collating votes by Ed25519 identities, authorities now + include a "NoEdConsensus" flag if the ed25519 value (or lack + thereof) for a server does not reflect the majority consensus. + Related to bug 17668; bugfix on 0.2.7.2-alpha. + - When generating a vote with keypinning disabled, never include two + entries for the same ed25519 identity. This bug was causing + authorities to generate votes that they could not parse when a + router violated key pinning by changing its RSA identity but + keeping its Ed25519 identity. Fixes bug 17668; fixes part of bug + 18318. Bugfix on 0.2.7.2-alpha. o Minor feature (IPv6): - Add ClientPreferIPv6DirPort, which is set to 0 by default. If set @@ -84,6 +96,12 @@ Changes in version 0.2.8.2-rc - 2016-03-?? - Update geoip and geoip6 to the March 3 2016 Maxmind GeoLite2 Country database. + o Minor features (linux seccomp2 sandbox): + - Detect and reject attempts to change our Address with "Sandbox 1" + enabled. Changing Address with Sandbox turned on would never + actually work, but previously it would fail in strange and + confusing ways. Found while fixing 18548. + o Minor features (robustness): - Exit immediately with an error message if the code attempts to use libevent without having initialized it. This should resolve some @@ -177,7 +195,20 @@ Changes in version 0.2.8.2-rc - 2016-03-?? both on success or failure. It was previously hardcoded with UNKNOWN. Fixes bug 16023; bugfix on 0.2.7.2-alpha. + o Minor bugfixes (linux seccomp2 sandbox): + - Avoid a 10-second delay when starting as a client with "Sandbox 1" + enabled and no DNS resolvers configured. This should help TAILS + start up faster. Fixes bug 18548; bugfix on 0.2.5.1-alpha. + - Fix the sandbox's interoprability with unix sockets under setuid. + Fixes bug 18253; bugfix on 0.2.8.1-alpha. + - Allow the setrlimit syscall, and the prlimit and prlimit64 + syscalls, which some libc implementations use under the hood. + Fixes bug 15221; bugfix on 0.2.5.1-alpha. + o Minor bugfixes (logging): + - When logging information about an unparseable networkstatus vote + or consensus, do not say "vote" when we mean consensus. Fixes bug + 18368; bugfix on 0.2.0.8-alpha. - Scrub service in from "unrecognized service ID" log messages. Fixes bug 18600; bugfix on 0.2.4.11-alpha. @@ -195,11 +226,6 @@ Changes in version 0.2.8.2-rc - 2016-03-?? part of bug 17852; bugfix on 0.2pre13. Part of ticket 17852. Patch from 'jsturgix'. Found with Flawfinder. - o Minor bugfixes (sandbox): - - Allow the setrlimit syscall, and the prlimit and prlimit64 - syscalls, which some libc implementations use under the hood. - Fixes bug 15221; bugfix on 0.2.5.1-alpha. - o Minor bugfixes (test networks, IPv6): - Allow internal IPv6 addresses in descriptors in test networks. Fixes bug 17153; bugfix on 6b4af1071 in 0.2.3.16-alpha. Patch by @@ -212,6 +238,11 @@ Changes in version 0.2.8.2-rc - 2016-03-?? unit tests (for example, if you want to perform branch coverage). Fixes bug 18242; bugfix on 0.2.7.1-alpha. + o Minor bugfixes (tor-gencert): + - Correctly handle the case where an authority operator enters a + passphrase but sends an EOF before sending a newline. Fixes bug + 17443; bugfix on 0.2.0.20-rc. Found by "junglefowl". + o Code simplification and refactoring: - Quote all the string interpolations in configure.ac -- even those which we are pretty sure can't contain spaces. Closes ticket diff --git a/changes/bug17443 b/changes/bug17443 deleted file mode 100644 index e4c040b..0000000 --- a/changes/bug17443 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (tor-gencert): - - Correctly handle the case where an authority operator enters a - passphrase but sends an EOF before sending a newline. - Fixes bug 17443; bugfix on 0.2.0.20-rc. Found by "junglefowl". - diff --git a/changes/bug17668 b/changes/bug17668 deleted file mode 100644 index fa5c1c8..0000000 --- a/changes/bug17668 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (voting): - - When collating votes by Ed25519 identities, authorities now - include a "NoEdConsensus" flag if the ed25519 value (or lack thereof) - for a server does not reflect the majority consensus. Related to bug - 17668; bugfix on 0.2.7.2-alpha. diff --git a/changes/bug17702 b/changes/bug17702 deleted file mode 100644 index eddfe1e..0000000 --- a/changes/bug17702 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes (voting): - - Actually enable Ed25519-based directory collation. - Previously, the code had been written, but some debugging code that had - accidentally been left in the codebase made it stay turned off. - Fixes bug 17702; bugfix on 0.2.7.2-alpha. - diff --git a/changes/bug18253 b/changes/bug18253 deleted file mode 100644 index 56bc701..0000000 --- a/changes/bug18253 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (linux seccomp2 sandbox): - - Fix the sandbox's interoprability with unix sockets under setuid. - Fixes bug 18253; bugfix on 0.2.8.1-alpha. diff --git a/changes/bug18318_ed b/changes/bug18318_ed deleted file mode 100644 index 268ad02..0000000 --- a/changes/bug18318_ed +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (voting): - - When generating a vote with keypinning disabled, never include two - entries for the same ed25519 identity. This bug was causing - authorities to generate votes that they could not parse when a router - violated key pinning by changing its RSA identity but keeping its - Ed25519 identity. Fixes bug 17668; fixes part of bug 18318. Bugfix on - 0.2.7.2-alpha. diff --git a/changes/bug18368 b/changes/bug18368 deleted file mode 100644 index 628831d..0000000 --- a/changes/bug18368 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (logging): - - When logging information about an unparseable networkstatus vote or - consensus, do not say "vote" when we mean consensus. Fixes bug - 18368; bugfix on 0.2.0.8-alpha. - diff --git a/changes/bug18548 b/changes/bug18548 deleted file mode 100644 index 542d331..0000000 --- a/changes/bug18548 +++ /dev/null @@ -1,12 +0,0 @@ - o Minor bugfixes (linux seccomp2 sandbox): - - Avoid a 10-second delay when starting as a client with "Sandbox 1" - enabled and no DNS resolvers configured. This should help TAILS - start up faster. Fixes bug 18548; bugfix on 0.2.5.1-alpha. - - - o Minor features (linux seccomp2 sandbox): - - Detect and reject attempts to change our Address with "Sandbox 1" - enabled. Changing Address with Sandbox turned on would never - actually work, but previously it would fail in strange and - confusing ways. Found while fixing 18548. -

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 23 Mar '16

23 Mar '16

commit 495d70c5adc1c88efba097a28d4bc0189ace5d13 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 23 14:46:32 2016 +0000 Update translations for tor-messenger-ircproperties --- cs/irc.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cs/irc.properties b/cs/irc.properties index 3bd3362..2e6d34b 100644 --- a/cs/irc.properties +++ b/cs/irc.properties @@ -19,7 +19,7 @@ connection.error.passwordRequired=Vyžadováno heslo # LOCALIZATION NOTE (joinChat.*): # These show up on the join chat menu. An underscore is for the access key. -joinChat.channel=Kanál +joinChat.channel=Místnost joinChat.password=Heslo # LOCALIZATION NOTE (options.*): @@ -50,7 +50,7 @@ ctcp.time=Čas pro %1$S je %2$S. command.action=%S <action to perform>: Perform an action. command.ctcp=%S <nick> <msg>: Sends a CTCP message to the nick. command.chanserv=%S <command>: Send a command to ChanServ. -command.deop=%S <nick1>[,<nick2>]*: Odebrat někomu status operátora linky. Abyste mohli provést tuto akci, musíte být operátorem linky. +command.deop=%S <nick1>[,<nick2>]*: Odebrat někomu status správce místnosti. Pouze správce místnosti má k tomuto oprávnění. command.devoice=%S <nick1>[,<nick2>]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this. command.invite2=%S <nick>[ <nick>]* [<channel>]: Invite one or more nicks to join you in the current channel, or to join the specified channel. command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Enter one or more channels, optionally providing a channel key for each if needed.

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 23 Mar '16

23 Mar '16

commit 82d029db1ea93fbc699545f988c8a4673de14b9d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 23 14:16:28 2016 +0000 Update translations for tor-messenger-ircproperties --- cs/irc.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cs/irc.properties b/cs/irc.properties index 022c345..3bd3362 100644 --- a/cs/irc.properties +++ b/cs/irc.properties @@ -19,8 +19,8 @@ connection.error.passwordRequired=Vyžadováno heslo # LOCALIZATION NOTE (joinChat.*): # These show up on the join chat menu. An underscore is for the access key. -joinChat.channel=_Channel -joinChat.password=_Password +joinChat.channel=Kanál +joinChat.password=Heslo # LOCALIZATION NOTE (options.*): # These are the protocol specific options shown in the account manager and @@ -29,19 +29,19 @@ options.server=Server options.port=Port options.ssl=Použít SSL options.encoding=Znaková sada -options.quitMessage=Quit message +options.quitMessage=Zrušit zprávu options.partMessage=Part message -options.showServerTab=Show messages from the server +options.showServerTab=Zobrazit zprávu ze serveru options.alternateNicks=Alternativní přezdívky # LOCALIZATION NOTE (ctcp.version): # %1$S is the nickname of the user whose version was requested. # %2$S is the version response from the client. -ctcp.version=%1$S is using "%2$S". +ctcp.version=%1$S používá "%2$S". # LOCALIZATION NOTE (ctcp.time): # %1$S is the nickname of the user whose time was requested. # %2$S is the time response. -ctcp.time=The time for %1$S is %2$S. +ctcp.time=Čas pro %1$S je %2$S. # LOCALZIATION NOTE (command.*): # These are the help messages for each command, the %S is the command name @@ -50,7 +50,7 @@ ctcp.time=The time for %1$S is %2$S. command.action=%S <action to perform>: Perform an action. command.ctcp=%S <nick> <msg>: Sends a CTCP message to the nick. command.chanserv=%S <command>: Send a command to ChanServ. -command.deop=%S <nick1>[,<nick2>]*: Remove channel operator status from someone. You must be a channel operator to do this. +command.deop=%S <nick1>[,<nick2>]*: Odebrat někomu status operátora linky. Abyste mohli provést tuto akci, musíte být operátorem linky. command.devoice=%S <nick1>[,<nick2>]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this. command.invite2=%S <nick>[ <nick>]* [<channel>]: Invite one or more nicks to join you in the current channel, or to join the specified channel. command.join=%S <room1>[ <key1>][,<room2>[ <key2>]]*: Enter one or more channels, optionally providing a channel key for each if needed.

1 0

[tor-messenger-build/master] Remove nss patch already in esr45
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 395577ddc6f7e0063718c1d9bc796b177a199359 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Mar 23 00:10:59 2016 -0700 Remove nss patch already in esr45 --- ...8ea23862252b-remove__DATE__and__TIME__.nsspatch | 345 --------------------- projects/instantbird/config | 1 - 2 files changed, 346 deletions(-) diff --git a/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch b/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch deleted file mode 100644 index e601b2d..0000000 --- a/projects/instantbird/8ea23862252b-remove__DATE__and__TIME__.nsspatch +++ /dev/null @@ -1,345 +0,0 @@ -# HG changeset patch -# User Mike Hommey <mh+mozilla(a)glandium.org> -# Date 1436438559 -7200 -# Thu Jul 09 12:42:39 2015 +0200 -# Node ID 8ea23862252b009f097807267f43248a820f673e -# Parent cac90b6155c9f140f63a75d38c7d7da8d2d6ca55 -Bug 1169174, Remove __DATE__ and __TIME__ references from NSS, r=rrelyea - -diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/builtins/binst.c ---- a/lib/ckfw/builtins/binst.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/ckfw/builtins/binst.c Thu Jul 09 12:42:39 2015 +0200 -@@ -65,11 +65,10 @@ - NSSCKFWInstance *fwInstance - ) - { -- extern const char __nss_builtins_rcsid[]; -- extern const char __nss_builtins_sccsid[]; -+ extern const char __nss_builtins_version[]; - volatile char c; /* force a reference that won't get optimized away */ - -- c = __nss_builtins_rcsid[0] + __nss_builtins_sccsid[0]; -+ c = __nss_builtins_version[0]; - return nss_builtins_LibraryVersion; - } - -diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/builtins/ckbiver.c ---- a/lib/ckfw/builtins/ckbiver.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/ckfw/builtins/ckbiver.c Thu Jul 09 12:42:39 2015 +0200 -@@ -13,14 +13,7 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_builtins_rcsid[] = "$Header: NSS Builtin Trusted Root CAs " -- NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_builtins_sccsid[] = "@(#)NSS Builtin Trusted Root CAs " -- NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_builtins_version[] = "Version: NSS Builtin Trusted Root CAs " -+ NSS_BUILTINS_LIBRARY_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/capi/ckcapiver.c ---- a/lib/ckfw/capi/ckcapiver.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/ckfw/capi/ckcapiver.c Thu Jul 09 12:42:39 2015 +0200 -@@ -12,14 +12,7 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_ckcapi_rcsid[] = "$Header: NSS Access to Microsoft Certificate Store " -- NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_ckcapi_sccsid[] = "@(#)NSS Access to Microsoft Certificate Store " -- NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_ckcapi_version[] = "Version: NSS Access to Microsoft Certificate Store " -+ NSS_CKCAPI_LIBRARY_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/ckfw/nssmkey/ckmkver.c ---- a/lib/ckfw/nssmkey/ckmkver.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/ckfw/nssmkey/ckmkver.c Thu Jul 09 12:42:39 2015 +0200 -@@ -12,14 +12,7 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_ckmk_rcsid[] = "$Header: NSS Access to the MAC OS X Key Ring " -- NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_ckmk_sccsid[] = "@(#)NSS Access to the MAC OS X Key Ring " -- NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_ckmk_version[] = "Version: NSS Access to the MAC OS X Key Ring " -+ NSS_CKMK_LIBRARY_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/freebl/freeblver.c ---- a/lib/freebl/freeblver.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/freebl/freeblver.c Thu Jul 09 12:42:39 2015 +0200 -@@ -13,12 +13,6 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_freebl_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_freebl_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_freebl_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/freebl/ldvector.c ---- a/lib/freebl/ldvector.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/freebl/ldvector.c Thu Jul 09 12:42:39 2015 +0200 -@@ -294,13 +294,12 @@ - const FREEBLVector * - FREEBL_GetVector(void) - { -- extern const char __nss_freebl_rcsid[]; -- extern const char __nss_freebl_sccsid[]; -+ extern const char __nss_freebl_version[]; - - /* force a reference that won't get optimized away */ - volatile char c; - -- c = __nss_freebl_rcsid[0] + __nss_freebl_sccsid[0]; -+ c = __nss_freebl_version[0]; - #ifdef FREEBL_NO_DEPEND - FREEBL_InitStubs(); - #endif -diff -r cac90b6155c9 -r 8ea23862252b lib/nss/nssinit.c ---- a/lib/nss/nssinit.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/nss/nssinit.c Thu Jul 09 12:42:39 2015 +0200 -@@ -1230,8 +1230,7 @@ - } - - --extern const char __nss_base_rcsid[]; --extern const char __nss_base_sccsid[]; -+extern const char __nss_base_version[]; - - PRBool - NSS_VersionCheck(const char *importedVersion) -@@ -1249,7 +1248,7 @@ - const char *ptr = importedVersion; - volatile char c; /* force a reference that won't get optimized away */ - -- c = __nss_base_rcsid[0] + __nss_base_sccsid[0]; -+ c = __nss_base_version[0]; - - while (isdigit(*ptr)) { - vmajor = 10 * vmajor + *ptr - '0'; -diff -r cac90b6155c9 -r 8ea23862252b lib/nss/nssver.c ---- a/lib/nss/nssver.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/nss/nssver.c Thu Jul 09 12:42:39 2015 +0200 -@@ -13,12 +13,6 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_base_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_base_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_base_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/smime/smimeutil.c ---- a/lib/smime/smimeutil.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/smime/smimeutil.c Thu Jul 09 12:42:39 2015 +0200 -@@ -754,8 +754,7 @@ - return cert; - } - --extern const char __nss_smime_rcsid[]; --extern const char __nss_smime_sccsid[]; -+extern const char __nss_smime_version[]; - - PRBool - NSSSMIME_VersionCheck(const char *importedVersion) -@@ -771,7 +770,7 @@ - */ - volatile char c; /* force a reference that won't get optimized away */ - -- c = __nss_smime_rcsid[0] + __nss_smime_sccsid[0]; -+ c = __nss_smime_version[0]; - - return NSS_VersionCheck(importedVersion); - } -diff -r cac90b6155c9 -r 8ea23862252b lib/smime/smimever.c ---- a/lib/smime/smimever.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/smime/smimever.c Thu Jul 09 12:42:39 2015 +0200 -@@ -13,12 +13,6 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_smime_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_smime_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_smime_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/softoken/legacydb/lginit.c ---- a/lib/softoken/legacydb/lginit.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/softoken/legacydb/lginit.c Thu Jul 09 12:42:39 2015 +0200 -@@ -22,15 +22,9 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_dbm_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_dbm_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_dbm_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING; - - typedef struct LGPrivateStr { - NSSLOWCERTCertDBHandle *certDB; -@@ -595,7 +589,7 @@ - PRBool readOnly = (flags == SDB_RDONLY)? PR_TRUE: PR_FALSE; - volatile char c; /* force a reference that won't get optimized away */ - -- c = __nss_dbm_rcsid[0] + __nss_dbm_sccsid[0]; -+ c = __nss_dbm_version[0]; - - rv = SECOID_Init(); - if (SECSuccess != rv) { -diff -r cac90b6155c9 -r 8ea23862252b lib/softoken/pkcs11.c ---- a/lib/softoken/pkcs11.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/softoken/pkcs11.c Thu Jul 09 12:42:39 2015 +0200 -@@ -3135,8 +3135,7 @@ - return crv; - } - --extern const char __nss_softokn_rcsid[]; --extern const char __nss_softokn_sccsid[]; -+extern const char __nss_softokn_version[]; - - /* NSC_GetInfo returns general information about Cryptoki. */ - CK_RV NSC_GetInfo(CK_INFO_PTR pInfo) -@@ -3145,7 +3144,7 @@ - - CHECK_FORK(); - -- c = __nss_softokn_rcsid[0] + __nss_softokn_sccsid[0]; -+ c = __nss_softokn_version[0]; - pInfo->cryptokiVersion.major = 2; - pInfo->cryptokiVersion.minor = 20; - PORT_Memcpy(pInfo->manufacturerID,manufacturerID,32); -diff -r cac90b6155c9 -r 8ea23862252b lib/softoken/softkver.c ---- a/lib/softoken/softkver.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/softoken/softkver.c Thu Jul 09 12:42:39 2015 +0200 -@@ -13,12 +13,6 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_softokn_rcsid[] = "$Header: NSS " SOFTOKEN_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_softokn_sccsid[] = "@(#)NSS " SOFTOKEN_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_softokn_version[] = "Version: NSS " SOFTOKEN_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/ssl/sslcon.c ---- a/lib/ssl/sslcon.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/ssl/sslcon.c Thu Jul 09 12:42:39 2015 +0200 -@@ -3669,8 +3669,7 @@ - */ - - #include "nss.h" --extern const char __nss_ssl_rcsid[]; --extern const char __nss_ssl_sccsid[]; -+extern const char __nss_ssl_version[]; - - PRBool - NSSSSL_VersionCheck(const char *importedVersion) -@@ -3686,7 +3685,7 @@ - */ - volatile char c; /* force a reference that won't get optimized away */ - -- c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0]; -+ c = __nss_ssl_version[0]; - return NSS_VersionCheck(importedVersion); - } - -diff -r cac90b6155c9 -r 8ea23862252b lib/ssl/sslver.c ---- a/lib/ssl/sslver.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/ssl/sslver.c Thu Jul 09 12:42:39 2015 +0200 -@@ -13,12 +13,6 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_ssl_rcsid[] = "$Header: NSS " NSS_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_ssl_sccsid[] = "@(#)NSS " NSS_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_ssl_version[] = "Version: NSS " NSS_VERSION _DEBUG_STRING; -diff -r cac90b6155c9 -r 8ea23862252b lib/util/secoid.c ---- a/lib/util/secoid.c Thu May 28 15:34:09 2015 -0700 -+++ b/lib/util/secoid.c Thu Jul 09 12:42:39 2015 +0200 -@@ -20,15 +20,9 @@ - #endif - - /* -- * Version information for the 'ident' and 'what commands -- * -- * NOTE: the first component of the concatenated rcsid string -- * must not end in a '$' to prevent rcs keyword substitution. -+ * Version information - */ --const char __nss_util_rcsid[] = "$Header: NSS " NSSUTIL_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__ " $"; --const char __nss_util_sccsid[] = "@(#)NSS " NSSUTIL_VERSION _DEBUG_STRING -- " " __DATE__ " " __TIME__; -+const char __nss_util_version[] = "Version: NSS " NSSUTIL_VERSION _DEBUG_STRING; - - /* MISSI Mosaic Object ID space */ - /* USGov algorithm OID space: { 2 16 840 1 101 } */ -@@ -1921,7 +1915,7 @@ - char * envVal; - volatile char c; /* force a reference that won't get optimized away */ - -- c = __nss_util_rcsid[0] + __nss_util_sccsid[0]; -+ c = __nss_util_version[0]; - - if (oidhash) { - return SECSuccess; /* already initialized */ diff --git a/projects/instantbird/config b/projects/instantbird/config index d039aed..f1982e4 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -77,7 +77,6 @@ input_files: - filename: search-context-menu.patch - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch - - filename: 8ea23862252b-remove__DATE__and__TIME__.nsspatch - filename: themes-remove-links.patch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 23 Mar '16

23 Mar '16

commit 8b4acf099458bb9eeb5441a53371d028621cb4dc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 23 06:45:52 2016 +0000 Update translations for torbutton-torbuttonproperties --- hu/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hu/torbutton.properties b/hu/torbutton.properties index b0e9537..59dfa0b 100644 --- a/hu/torbutton.properties +++ b/hu/torbutton.properties @@ -76,4 +76,4 @@ profileProblemTitle=%S Profile probléma profileReadOnly=Nem tudja futtatni a %S -t csak olvasható fájlrendszerről. Kérem másolja %S-t egy másik helyre, mielőtt használja. profileReadOnlyMac=Nem tudja futtatni a %S -t csak olvasható fájlrendszerről. Kérem másolja %S-t az Asztalra, vagy az Alkalmazások mappába, mielőtt használja. profileAccessDenied=%S nem rendelkezik jogosultsággal a profil eléréséhez. Kérem állítsa be a fájl rendsze jogosultságokat, majd próbálja újra. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=%S létező profil migrációja nem sikerült.\nÚj beállításokat fogunk használni.

1 0

[tor-messenger-build/master] Rebase block-plugins.mozpatch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit 17797dde5971517d4e173a25d813cc7644013ad6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Mar 19 07:45:47 2016 -0400 Rebase block-plugins.mozpatch --- projects/instantbird/block-plugins.mozpatch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/instantbird/block-plugins.mozpatch b/projects/instantbird/block-plugins.mozpatch index 17813be..6e4586a 100644 --- a/projects/instantbird/block-plugins.mozpatch +++ b/projects/instantbird/block-plugins.mozpatch @@ -1,7 +1,7 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -1834,6 +1834,26 @@ +@@ -2085,6 +2085,26 @@ } } @@ -28,7 +28,7 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.c typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, -@@ -1943,6 +1963,10 @@ +@@ -2194,6 +2214,10 @@ continue; } @@ -42,7 +42,7 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.c diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h --- a/dom/plugins/base/nsPluginHost.h +++ b/dom/plugins/base/nsPluginHost.h -@@ -304,6 +304,8 @@ +@@ -334,6 +334,8 @@ // Loads all cached plugins info into mCachedPlugins nsresult ReadPluginInfo();

1 0

[tor-messenger-build/master] block-plugins.mozpatch -> trac-16475.mozpatch
by arlo＠torproject.org 23 Mar '16

23 Mar '16

commit be1920b7172dec6f6e3be0110e686d6632e444c1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Mar 22 23:42:58 2016 -0700 block-plugins.mozpatch -> trac-16475.mozpatch --- projects/instantbird/block-plugins.mozpatch | 53 ----------------------------- projects/instantbird/config | 2 +- projects/instantbird/trac-16475.mozpatch | 53 +++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/projects/instantbird/block-plugins.mozpatch b/projects/instantbird/block-plugins.mozpatch deleted file mode 100644 index 6e4586a..0000000 --- a/projects/instantbird/block-plugins.mozpatch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp ---- a/dom/plugins/base/nsPluginHost.cpp -+++ b/dom/plugins/base/nsPluginHost.cpp -@@ -2085,6 +2085,26 @@ - } - } - -+PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) -+{ -+ nsCString leaf; -+ const char *leafStr; -+ nsresult rv; -+ -+ rv = pluginFile->GetNativeLeafName(leaf); -+ if (NS_FAILED(rv)) { -+ return PR_TRUE; // blacklist. -+ } -+ -+ leafStr = leaf.get(); -+ -+ if (!leafStr) { -+ return PR_TRUE; // blacklist. -+ } -+ -+ return PR_TRUE; // blacklist. -+} -+ - typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); - - nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, -@@ -2194,6 +2214,10 @@ - continue; - } - -+ if (GhettoBlacklist(localfile)) { -+ continue; -+ } -+ - // if it is not found in cache info list or has been changed, create a new one - if (!pluginTag) { - nsPluginFile pluginFile(localfile); -diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h ---- a/dom/plugins/base/nsPluginHost.h -+++ b/dom/plugins/base/nsPluginHost.h -@@ -334,6 +334,8 @@ - // Loads all cached plugins info into mCachedPlugins - nsresult ReadPluginInfo(); - -+ PRBool GhettoBlacklist(nsIFile *pluginFile); -+ - // Given a file path, returns the plugins info from our cache - // and removes it from the cache. - void RemoveCachedPluginsInfo(const char *filePath, diff --git a/projects/instantbird/config b/projects/instantbird/config index 61ae74c..d039aed 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -115,7 +115,7 @@ input_files: - filename: 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - - filename: block-plugins.mozpatch + - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch enable: '[% c("var/osx") %]' - filename: 'mozconfig-[% c("var/osname") %]' diff --git a/projects/instantbird/trac-16475.mozpatch b/projects/instantbird/trac-16475.mozpatch new file mode 100644 index 0000000..6e4586a --- /dev/null +++ b/projects/instantbird/trac-16475.mozpatch @@ -0,0 +1,53 @@ +diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp +--- a/dom/plugins/base/nsPluginHost.cpp ++++ b/dom/plugins/base/nsPluginHost.cpp +@@ -2085,6 +2085,26 @@ + } + } + ++PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile) ++{ ++ nsCString leaf; ++ const char *leafStr; ++ nsresult rv; ++ ++ rv = pluginFile->GetNativeLeafName(leaf); ++ if (NS_FAILED(rv)) { ++ return PR_TRUE; // blacklist. ++ } ++ ++ leafStr = leaf.get(); ++ ++ if (!leafStr) { ++ return PR_TRUE; // blacklist. ++ } ++ ++ return PR_TRUE; // blacklist. ++} ++ + typedef NS_NPAPIPLUGIN_CALLBACK(char *, NP_GETMIMEDESCRIPTION)(void); + + nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, +@@ -2194,6 +2214,10 @@ + continue; + } + ++ if (GhettoBlacklist(localfile)) { ++ continue; ++ } ++ + // if it is not found in cache info list or has been changed, create a new one + if (!pluginTag) { + nsPluginFile pluginFile(localfile); +diff --git a/dom/plugins/base/nsPluginHost.h b/dom/plugins/base/nsPluginHost.h +--- a/dom/plugins/base/nsPluginHost.h ++++ b/dom/plugins/base/nsPluginHost.h +@@ -334,6 +334,8 @@ + // Loads all cached plugins info into mCachedPlugins + nsresult ReadPluginInfo(); + ++ PRBool GhettoBlacklist(nsIFile *pluginFile); ++ + // Given a file path, returns the plugins info from our cache + // and removes it from the cache. + void RemoveCachedPluginsInfo(const char *filePath,

1 0