From 7ecfc9a451cbc509ad5d37d945f2f5fffb2b0878 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
Date: Wed, 3 Jun 2020 23:27:41 +0300
Subject: libre/iceweasel: update i686 patch

---
 ...-disable-network-test-on-static-libraries.patch | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
index bece16a04..76e12ed63 100644
--- a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
+++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
@@ -1,32 +1,29 @@
-diff -rauN firefox-74.0.1/config/makefiles/rust.mk firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk
---- firefox-74.0.1/config/makefiles/rust.mk	2020-04-03 13:10:23.000000000 +0200
-+++ firefox-74.0.1-rust-static-disable-network-test-on-static-libraries-patch/config/makefiles/rust.mk	2020-04-04 12:31:27.804227950 +0200
-@@ -283,17 +283,17 @@
+diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+index df11844..6f75d0a 100644
+--- a/config/makefiles/rust.mk
++++ b/config/makefiles/rust.mk
+@@ -299,15 +299,15 @@ $(RUST_LIBRARY_FILE): force-cargo-library-build
  # the chance of proxy bypasses originating from rust code.
  # The check only works when rust code is built with -Clto.
- # Enabling sancov or TSan also causes this to fail.
+ # Sanitizers and sancov also fail because compiler-rt hooks network functions.
 -ifndef MOZ_PROFILE_GENERATE
--ifndef MOZ_TSAN
 -ifeq ($(OS_ARCH), Linux)
--ifeq (,$(rustflags_sancov))
+-ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
 -ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
 -	$(call py3_action,check_binary,--target --networking $@)
 -endif
 -endif
 -endif
 -endif
--endif
-+#ifndef MOZ_PROFILE_GENERATE
-+#ifndef MOZ_TSAN
-+#ifeq ($(OS_ARCH), Linux)
-+#ifeq (,$(rustflags_sancov))
-+#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-+#	$(call py3_action,check_binary,--target --networking $@)
-+#endif
-+#endif
-+#endif
-+#endif
-+#endif
++# ifndef MOZ_PROFILE_GENERATE
++# ifeq ($(OS_ARCH), Linux)
++# ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
++# ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
++# 	$(call py3_action,check_binary,--target --networking $@)
++# endif
++# endif
++# endif
++# endif
  
  force-cargo-library-check:
  	$(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
-- 
cgit v1.2.3