- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of TwoLinePageRow in private tabs. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 4744f30185f1e76fd8243bdc07e2c5dac6dd2302 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:40 2018 +0200 Bug 1448305 - Avoid disk cache for icons of TwoLinePageRow in private tabs. r=JanH E.g. autocompletion results and the "Recently closed" list. --- .../base/java/org/mozilla/gecko/home/TwoLinePageRow.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java b/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java index 334842e2bb2f..5be453f5a536 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java @@ -204,14 +204,11 @@ public class TwoLinePageRow extends ThemedLinearLayout * selected tab. */ protected void updateDisplayedUrl() { - final Tab selectedTab = Tabs.getInstance().getSelectedTab(); - final boolean isPrivate = (selectedTab != null) && (selectedTab.isPrivate()); - // We always want to display the underlying page url, however for readermode pages // we navigate to the about:reader equivalent, hence we need to use that url when finding // existing tabs final String navigationUrl = mHasReaderCacheItem ? ReaderModeUtils.getAboutReaderForUrl(mPageUrl) : mPageUrl; - Tab tab = Tabs.getInstance().getFirstTabForUrl(navigationUrl, isPrivate); + Tab tab = Tabs.getInstance().getFirstTabForUrl(navigationUrl, isCurrentTabInPrivateMode()); if (!mShowIcons || tab == null) { @@ -280,6 +277,7 @@ public class TwoLinePageRow extends ThemedLinearLayout } else if (bookmarkId < BrowserContract.Bookmarks.FAKE_PARTNER_BOOKMARKS_START) { mOngoingIconLoad = Icons.with(getContext()) .pageUrl(pageURL) + .setPrivateMode(isCurrentTabInPrivateMode()) .skipNetwork() .privileged(true) .icon(IconDescriptor.createGenericIcon( @@ -289,6 +287,7 @@ public class TwoLinePageRow extends ThemedLinearLayout } else { mOngoingIconLoad = Icons.with(getContext()) .pageUrl(pageURL) + .setPrivateMode(isCurrentTabInPrivateMode()) .skipNetwork() .build() .execute(mFavicon.createIconCallback()); @@ -307,6 +306,15 @@ public class TwoLinePageRow extends ThemedLinearLayout } /** + * @return true if this view is shown inside a private tab, independent of whether + * a private mode theme is applied via <code>setPrivateMode(true)</code>. + */ + private boolean isCurrentTabInPrivateMode() { + final Tab tab = Tabs.getInstance().getSelectedTab(); + return tab != null && tab.isPrivate(); + } + + /** * Update the data displayed by this row. * <p> * This method must be invoked on the UI thread.

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tabs in the TabsLayoutItemView. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 34242a922172ddfcee8e089949e9972f4c0a882f Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:27 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tabs in the TabsLayoutItemView. r=JanH --- mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java index bfd09e2a5e56..329eb9f437f4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java @@ -201,6 +201,7 @@ public class TabsLayoutItemView extends LinearLayout final Context appContext = getContext().getApplicationContext(); mOngoingIconLoad = Icons.with(appContext) .pageUrl(url) + .setPrivateMode(tab.isPrivate()) .skipNetwork() .targetSize(iconSize) .textSize(textSize)

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tabs. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c04236287b17b1e8a3ca2a30344d2fe718cae788 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:35:39 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tabs. r=JanH --- .../mozilla/gecko/icons/TestIconRequestBuilder.java | 21 +++++++++++++++++++++ mobile/android/base/java/org/mozilla/gecko/Tab.java | 1 + .../java/org/mozilla/gecko/icons/IconRequest.java | 9 +++++++++ .../org/mozilla/gecko/icons/IconRequestBuilder.java | 10 ++++++++++ .../gecko/icons/processing/DiskProcessor.java | 2 +- 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java index 620caa9f70d0..066febaf2b93 100644 --- a/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java +++ b/mobile/android/app/src/test/java/org/mozilla/gecko/icons/TestIconRequestBuilder.java @@ -85,6 +85,27 @@ public class TestIconRequestBuilder { } @Test + public void testPrivateMode() { + IconRequest request = Icons.with(RuntimeEnvironment.application) + .pageUrl(TEST_PAGE_URL_1) + .build(); + + Assert.assertFalse(request.isPrivateMode()); + + request.modify() + .setPrivateMode(true) + .deferBuild(); + + Assert.assertTrue(request.isPrivateMode()); + + request.modify() + .setPrivateMode(false) + .deferBuild(); + + Assert.assertFalse(request.isPrivateMode()); + } + + @Test public void testSkipNetwork() { IconRequest request = Icons.with(RuntimeEnvironment.application) .pageUrl(TEST_PAGE_URL_1) diff --git a/mobile/android/base/java/org/mozilla/gecko/Tab.java b/mobile/android/base/java/org/mozilla/gecko/Tab.java index 8b84a2c7db66..91c1d1571435 100644 --- a/mobile/android/base/java/org/mozilla/gecko/Tab.java +++ b/mobile/android/base/java/org/mozilla/gecko/Tab.java @@ -443,6 +443,7 @@ public class Tab { } mRunningIconRequest = mIconRequestBuilder + .setPrivateMode(isPrivate()) .build() .execute(new IconCallback() { @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java index 8161b9510f3f..da74a8fb5318 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequest.java @@ -23,6 +23,7 @@ public class IconRequest { // Those values are written by the IconRequestBuilder class. /* package-private */ String pageUrl; /* package-private */ boolean privileged; + /* package-private */ boolean isPrivate; /* package-private */ TreeSet<IconDescriptor> icons; /* package-private */ boolean skipNetwork; /* package-private */ boolean backgroundThread; @@ -40,6 +41,7 @@ public class IconRequest { // Setting some sensible defaults. this.privileged = false; + this.isPrivate = false; this.skipMemory = false; this.skipDisk = false; this.skipNetwork = false; @@ -97,6 +99,13 @@ public class IconRequest { } /** + * Is this request initiated from a tab in private browsing mode? + */ + public boolean isPrivateMode() { + return isPrivate; + } + + /** * Get the number of icon descriptors associated with this request. */ public int getIconCount() { diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java index ddae3b64bc64..b2fb46e3a39f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/IconRequestBuilder.java @@ -62,6 +62,15 @@ public class IconRequestBuilder { } /** + * Set the private mode to avoid saving the result to the disk. + */ + @CheckResult + public IconRequestBuilder setPrivateMode(boolean isPrivate) { + internal.isPrivate = isPrivate; + return this; + } + + /** * Skip the network and do not load an icon from a network connection. */ @CheckResult @@ -165,6 +174,7 @@ public class IconRequestBuilder { IconRequest request = new IconRequest(internal.getContext()); request.pageUrl = internal.pageUrl; request.privileged = internal.privileged; + request.isPrivate = internal.isPrivate; request.icons = new TreeSet<>(internal.icons); request.skipNetwork = internal.skipNetwork; request.backgroundThread = internal.backgroundThread; diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java b/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java index 150aa503b83e..4923c6fc93c4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/processing/DiskProcessor.java @@ -8,7 +8,7 @@ import org.mozilla.gecko.util.StringUtils; public class DiskProcessor implements Processor { @Override public void process(IconRequest request, IconResponse response) { - if (request.shouldSkipDisk()) { + if (request.shouldSkipDisk() || request.isPrivateMode()) { return; }

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448305 - Avoid disk cache for icons of private tab's session history. r=JanH
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit c72b56ea4eb7dcbb73d1fce9b9ac066abbe5bd53 Author: Rob Wu <rob(a)robwu.nl> Date: Thu Jun 21 15:36:05 2018 +0200 Bug 1448305 - Avoid disk cache for icons of private tab's session history. r=JanH --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 ++-- .../java/org/mozilla/gecko/tabs/TabHistoryController.java | 6 ++++-- .../java/org/mozilla/gecko/tabs/TabHistoryFragment.java | 13 +++++++++---- .../base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java | 3 ++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index ea9480d149cc..4a497f6999e0 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -784,7 +784,7 @@ public class BrowserApp extends GeckoApp // Initialize Tab History Controller. tabHistoryController = new TabHistoryController(new OnShowTabHistory() { @Override - public void onShowHistory(final List<TabHistoryPage> historyPageList, final int toIndex) { + public void onShowHistory(final List<TabHistoryPage> historyPageList, final int toIndex, final boolean isPrivate) { runOnUiThread(new Runnable() { @Override public void run() { @@ -798,7 +798,7 @@ public class BrowserApp extends GeckoApp return; } - final TabHistoryFragment fragment = TabHistoryFragment.newInstance(historyPageList, toIndex); + final TabHistoryFragment fragment = TabHistoryFragment.newInstance(historyPageList, toIndex, isPrivate); final FragmentManager fragmentManager = getSupportFragmentManager(); GeckoAppShell.getHapticFeedbackDelegate().performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); fragment.show(R.id.tab_history_panel, fragmentManager.beginTransaction(), TAB_HISTORY_FRAGMENT_TAG); diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java index 0d81f587ca5a..5144c10da05b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java @@ -25,7 +25,7 @@ public class TabHistoryController { }; public interface OnShowTabHistory { - void onShowHistory(List<TabHistoryPage> historyPageList, int toIndex); + void onShowHistory(List<TabHistoryPage> historyPageList, int toIndex, boolean isPrivate); } public TabHistoryController(OnShowTabHistory showTabHistoryListener) { @@ -40,6 +40,8 @@ public class TabHistoryController { data.putString("action", action.name()); data.putInt("tabId", tab.getId()); + final boolean isPrivate = tab.isPrivate(); + EventDispatcher.getInstance().dispatch("Session:GetHistory", data, new EventCallback() { @Override public void sendSuccess(final Object response) { @@ -74,7 +76,7 @@ public class TabHistoryController { historyPageList.add(new TabHistoryPage(title, url, selected)); } - showTabHistoryListener.onShowHistory(historyPageList, toIndex); + showTabHistoryListener.onShowHistory(historyPageList, toIndex, isPrivate); } @Override diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java index 3324636e1141..0877fe258746 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java @@ -32,6 +32,7 @@ import android.widget.ListView; public class TabHistoryFragment extends Fragment implements OnItemClickListener, OnClickListener { private static final String ARG_LIST = "historyPageList"; private static final String ARG_INDEX = "index"; + private static final String ARG_PRIVATE_MODE = "private"; private static final String BACK_STACK_ID = "backStateId"; private List<TabHistoryPage> historyPageList; @@ -45,11 +46,12 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, } - public static TabHistoryFragment newInstance(List<TabHistoryPage> historyPageList, int toIndex) { + public static TabHistoryFragment newInstance(List<TabHistoryPage> historyPageList, int toIndex, boolean isPrivate) { final TabHistoryFragment fragment = new TabHistoryFragment(); final Bundle args = new Bundle(); args.putParcelableArrayList(ARG_LIST, (ArrayList<? extends Parcelable>) historyPageList); args.putInt(ARG_INDEX, toIndex); + args.putBoolean(ARG_PRIVATE_MODE, isPrivate); fragment.setArguments(args); return fragment; } @@ -79,7 +81,8 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, Bundle bundle = getArguments(); historyPageList = bundle.getParcelableArrayList(ARG_LIST); toIndex = bundle.getInt(ARG_INDEX); - final ArrayAdapter<TabHistoryPage> urlAdapter = new TabHistoryAdapter(getActivity(), historyPageList); + boolean isPrivate = bundle.getBoolean(ARG_PRIVATE_MODE); + final ArrayAdapter<TabHistoryPage> urlAdapter = new TabHistoryAdapter(getActivity(), historyPageList, isPrivate); dialogList.setAdapter(urlAdapter); dialogList.setOnItemClickListener(this); } @@ -153,11 +156,13 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, private static class TabHistoryAdapter extends ArrayAdapter<TabHistoryPage> { private final List<TabHistoryPage> pages; private final Context context; + private final boolean isPrivate; - public TabHistoryAdapter(Context context, List<TabHistoryPage> pages) { + public TabHistoryAdapter(Context context, List<TabHistoryPage> pages, boolean isPrivate) { super(context, R.layout.tab_history_item_row, pages); this.context = context; this.pages = pages; + this.isPrivate = isPrivate; } @Override @@ -167,7 +172,7 @@ public class TabHistoryFragment extends Fragment implements OnItemClickListener, row = new TabHistoryItemRow(context, null); } - row.update(pages.get(position), position == 0, position == pages.size() - 1); + row.update(pages.get(position), position == 0, position == pages.size() - 1, isPrivate); return row; } } diff --git a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java index 112dbc07dc9a..7e4220c94fd4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java +++ b/mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java @@ -38,7 +38,7 @@ public class TabHistoryItemRow extends RelativeLayout { } // Update the views with historic page detail. - public void update(final TabHistoryPage historyPage, boolean isFirstElement, boolean isLastElement) { + public void update(final TabHistoryPage historyPage, boolean isFirstElement, boolean isLastElement, boolean isPrivate) { ThreadUtils.assertOnUiThread(); timeLineTop.setVisibility(isFirstElement ? View.INVISIBLE : View.VISIBLE); @@ -62,6 +62,7 @@ public class TabHistoryItemRow extends RelativeLayout { ongoingIconLoad = Icons.with(getContext()) .pageUrl(historyPage.getUrl()) + .setPrivateMode(isPrivate) .skipNetwork() .build() .execute(favicon.createIconCallback());

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1441345 - Force the use of the Linux phishing list on Android. r=dimi, a=pascalc
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 9ec06f1b4bb17e562e10cb7d39e1af8370522538 Author: Francois Marier <francois(a)mozilla.com> Date: Wed Sep 12 18:07:26 2018 +0300 Bug 1441345 - Force the use of the Linux phishing list on Android. r=dimi, a=pascalc Reviewers: dimi Reviewed By: dimi Subscribers: dveditz, francois, dimi Bug #: 1441345 Differential Revision: https://phabricator.services.mozilla.com/D5479 --HG-- extra : source : 3fa9372e4c5f05713fe1a9f758487fa443ce7500 --- .../url-classifier/nsUrlClassifierUtils.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp index ce445d4a473e..b8ca0539550a 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierUtils.cpp @@ -112,7 +112,15 @@ InitListUpdateRequest(ThreatType aThreatType, ListUpdateRequest* aListUpdateRequest) { aListUpdateRequest->set_threat_type(aThreatType); - aListUpdateRequest->set_platform_type(GetPlatformType()); + PlatformType platform = GetPlatformType(); +#if defined(ANDROID) + // Temporary hack to fix bug 1441345. + if ((aThreatType == SOCIAL_ENGINEERING_PUBLIC) || + (aThreatType == SOCIAL_ENGINEERING)) { + platform = LINUX_PLATFORM; + } +#endif + aListUpdateRequest->set_platform_type(platform); aListUpdateRequest->set_threat_entry_type(URL); Constraints* contraints = new Constraints(); @@ -418,6 +426,8 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, // Set up FindFullHashesRequest.threat_info. auto threatInfo = r.mutable_threat_info(); + PlatformType platform = GetPlatformType(); + // 1) Set threat types. for (uint32_t i = 0; i < aListCount; i++) { // Add threat types. @@ -433,6 +443,14 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, } threatInfo->add_threat_types((ThreatType)threatType); +#if defined(ANDROID) + // Temporary hack to fix bug 1441345. + if (((ThreatType)threatType == SOCIAL_ENGINEERING_PUBLIC) || + ((ThreatType)threatType == SOCIAL_ENGINEERING)) { + platform = LINUX_PLATFORM; + } +#endif + // Add client states for index 'i' only when the threat type is available // on current platform. nsCString stateBinary; @@ -442,7 +460,7 @@ nsUrlClassifierUtils::MakeFindFullHashRequestV4(const char** aListNames, } // 2) Set platform type. - threatInfo->add_platform_types(GetPlatformType()); + threatInfo->add_platform_types(platform); // 3) Set threat entry type. threatInfo->add_threat_entry_types(URL);

1 0

[tor-browser/tor-browser-60.2.1esr-8.5-1] Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 1e7ee8ad5a57315bda89fb5b1f7fba49e63ccce4 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Mon Jun 18 15:27:06 2018 -0400 Bug 1448014 - avoid needless flattening in AndroidDecoderModule; r=jesup --- dom/media/platforms/android/AndroidDecoderModule.cpp | 12 +++++++----- dom/media/platforms/android/AndroidDecoderModule.h | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dom/media/platforms/android/AndroidDecoderModule.cpp b/dom/media/platforms/android/AndroidDecoderModule.cpp index df32d9b2f4fd..bffefde46a36 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.cpp +++ b/dom/media/platforms/android/AndroidDecoderModule.cpp @@ -33,15 +33,17 @@ namespace mozilla { mozilla::LazyLogModule sAndroidDecoderModuleLog("AndroidDecoderModule"); -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType) { if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP8)) { - return "video/x-vnd.on2.vp8"; + static NS_NAMED_LITERAL_CSTRING(vp8, "video/x-vnd.on2.vp8"); + return vp8; } else if (VPXDecoder::IsVPX(aMimeType, VPXDecoder::VP9)) { - return "video/x-vnd.on2.vp9"; + static NS_NAMED_LITERAL_CSTRING(vp9, "video/x-vnd.on2.vp9"); + return vp9; } - return PromiseFlatCString(aMimeType).get(); + return nsCString(aMimeType); } static bool @@ -112,7 +114,7 @@ AndroidDecoderModule::SupportsMimeType( } return java::HardwareCodecCapabilityUtils::FindDecoderCodecInfoForMimeType( - nsCString(TranslateMimeType(aMimeType))); + TranslateMimeType(aMimeType)); } already_AddRefed<MediaDataDecoder> diff --git a/dom/media/platforms/android/AndroidDecoderModule.h b/dom/media/platforms/android/AndroidDecoderModule.h index 86a0766c36e6..4f67965d2b3a 100644 --- a/dom/media/platforms/android/AndroidDecoderModule.h +++ b/dom/media/platforms/android/AndroidDecoderModule.h @@ -31,7 +31,7 @@ private: extern LazyLogModule sAndroidDecoderModuleLog; -const char* +const nsCString TranslateMimeType(const nsACString& aMimeType); } // namespace mozilla

1 0

[tor-browser-build/master] Bug 27827: update go to 1.11.1
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 6cdefb462010bf92ce57751f0c3ccb44ea45d353 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 17 09:28:58 2018 -0600 Bug 27827: update go to 1.11.1 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 2a3b1ad..1841705 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.8.3 +version: 1.11.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 + sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Merge remote-tracking branch 'dcf/bug_27827'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit 889be4318d80f11f2b5b2b845ab11868149c48f1 Merge: d8ce7fc f92f149 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 10:21:29 2018 +0000 Merge remote-tracking branch 'dcf/bug_27827' projects/go/config | 4 ++-- projects/snowflake/build | 27 ++++----------------------- 2 files changed, 6 insertions(+), 25 deletions(-)

1 0

[tor-browser-build/master] Bug 27827: pass -tmpdir to the linker in snowflake build
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit f92f149ea8ffb9dd64a798453c85aa124a9391aa Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 16 18:40:59 2018 -0600 Bug 27827: pass -tmpdir to the linker in snowflake build The update to go 1.11.1 fixed part of #27827, namely the /tmp/go-buildRANDOMNUM paths embedded in the binary. However there is still a single /tmp/go-link-RANDOMNUM/go.o path remaining -- it comes from here: https://github.com/golang/go/blob/go1.11.1/src/cmd/link/internal/ld/lib.go#… The random path affects the Go build ID even if we overwrite the random digits in the binary. Luckily there's a -tmpdir flag that lets us override the random path. --- projects/snowflake/build | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index f3616f4..a66a1e9 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -30,32 +30,13 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - [% c("var/faketime") %] go build -ldflags '-s' + # The -tmpdir flag overrides what would otherwise be a randomly generated + # path, /tmp/go-link-RANDOMNUM/go.o. + mkdir -p /var/tmp/go-link.tmpdir + [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' [% ELSE -%] go build -ldflags '-s' [% END -%] -[% IF c("var/osx") -%] - # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 - # on Darwin embeds such paths and the issue is unsolved in upstream Go as of - # 2016-06-28: - # https://github.com/golang/go/issues/9206#issuecomment-310476743 - # The two kinds of paths are ("000000000" stands for 9 random digits): - # /tmp/go-build000000000 - # /tmp/go-link-000000000 - # Such paths are the output of ioutil.TempDir("", "go-build") and - # ioutil.TempDir("", "go-link-"). - cp -a client client.stomped - sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped - # Sanity check: make sure the file actually changed. If it did not, it could - # mean that a change in go or clang has made this step unnecessary. - if cmp client client.stomped - then - echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." - echo "Check projects/snowflake/build" - exit 1 - fi - mv -f client.stomped client -[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0

[tor-browser-build/master] Merge remote-tracking branch 'arthur/28082'
by gk＠torproject.org 18 Oct '18

18 Oct '18

commit d8ce7fca64a15cf9b71f7685ef2a8f36dae6a21a Merge: 0166d3d fbb72c6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 18 09:16:59 2018 +0000 Merge remote-tracking branch 'arthur/28082' rbm.conf | 4 ++++ 1 file changed, 4 insertions(+)

1 0