compiler-rt-netbsd: Remove duplicate interceptors for puts(3) and fputs(3)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Remove duplicate interceptors for puts(3) and fputs(3)
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Thu, 14 Jun 2018 12:35:26 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Jun 14 14:35:26 2018 +0200
Changeset:	28bc5f6c77105b8840ec4dc2ae14dfcc294f355f

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
	compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
	compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg

Log Message:
compiler-rt-netbsd: Remove duplicate interceptors for puts(3) and fputs(3)

These interceptors appeared independently upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=28bc5f6c77105b8840ec4dc2ae14dfcc294f355f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/distinfo                        | 12 ++++-----
 .../patches/patch-lib_msan_msan__interceptors.cc   |  2 +-
 .../patches/patch-lib_msan_msan__linux.cc          |  2 +-
 ...zer__common_sanitizer__common__interceptors.inc | 31 +++-------------------
 ..._sanitizer__common_sanitizer__linux__libcdep.cc |  2 +-
 ...zer__common_sanitizer__platform__interceptors.h |  5 ++--
 .../patches/patch-test_fuzzer_lit.cfg              |  2 +-
 7 files changed, 15 insertions(+), 41 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 8ba7060171..3827ebaab1 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -8,13 +8,13 @@ SHA1 (patch-lib_asan_asan__posix.cc) = 0f596061c078eaab0b5b4b183550aa7820677f46
 SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = 01456bfacb94c06e008eefc660781d3c7bb1c2e7
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = e2e0e397eaf148df329f2c25ca9185f57989d082
 SHA1 (patch-lib_interception_interception.h) = a7f97b191769c846be27e17430bbe39435976642
-SHA1 (patch-lib_msan_msan__interceptors.cc) = b62c0d7178031020351f2b2d4b0d4b68348bbb2e
-SHA1 (patch-lib_msan_msan__linux.cc) = 5d01793c5147cd95affe015b407f70fe01685ee6
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 925f197989db237b32c1333feff6a503925ede2d
+SHA1 (patch-lib_msan_msan__interceptors.cc) = bfb0d6ba97382a26d54141c3e4cc0c0f584178a1
+SHA1 (patch-lib_msan_msan__linux.cc) = dc3431b7606f3e1c106ffd2568ab4a6c77321731
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 488090d6ad98c6d252ad9ec6839a3dfd6aa141f7
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9ffcb3ae5ccfcb99d842efe55f6d698cd2e02846
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 83636321cef6a17281a27e2ed3dd1b71e5429a6a
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = ac380ee0334c33e1a3f112ae6ac1444e04845e43
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = d8fa7a85ff8b3214ad985a8c17ac3ffdf4db10bf
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = ac04d9b155c7281dde98741b7f79714e98c2bbc3
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 04469f703caeebc1c643ff7a46cdfada1792d5bf
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 9a605e4fef4177c125eb7e010ef18b196e74242e
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 4ca25c16e8c586c6333976632c145ce30e71690a
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 95fef4690641063603db1b1dcb00c610948142f1
@@ -27,6 +27,6 @@ SHA1 (patch-test_asan_TestCases_Posix_stack-use-after-return.cc) = 7eb1109c646b5
 SHA1 (patch-test_asan_TestCases_heavy__uar__test.cc) = a0d7c228b02c4b5d4a198bce9ef8bc594c92544d
 SHA1 (patch-test_asan_TestCases_interception__failure__test.cc) = b4711fcc3315eaacc2a4ec1021e04b8200749e51
 SHA1 (patch-test_fuzzer_NullDerefTest.cpp) = 80b63f1c77fef2747af03c3c09a8b805ed2f27f9
-SHA1 (patch-test_fuzzer_lit.cfg) = e4862e52b743c2ca9ac0cd0aac541e247b5baa52
+SHA1 (patch-test_fuzzer_lit.cfg) = 98e8e0589d68bb17b1794634256ac03ddb9af293
 SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
 SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
diff --git a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
index e0d3643756..6edb015ea4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/msan/msan_interceptors.cc.orig	2018-06-14 12:14:39.632758893 +0000
+--- lib/msan/msan_interceptors.cc.orig	2018-06-14 12:14:39.000000000 +0000
 +++ lib/msan/msan_interceptors.cc
 @@ -34,11 +34,13 @@
  #include "sanitizer_common/sanitizer_libc.h"
diff --git a/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc b/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
index 85e11ac063..3fddc91ff3 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/msan/msan_linux.cc.orig	2018-06-14 12:14:39.633338965 +0000
+--- lib/msan/msan_linux.cc.orig	2018-06-14 12:14:39.000000000 +0000
 +++ lib/msan/msan_linux.cc
 @@ -31,6 +31,7 @@
  #include <sys/time.h>
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
index 0257d30cc3..6df234d12d 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-06-14 12:14:39.819761270 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-06-14 12:14:39.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -77,6 +77,11 @@
  #define ctime __ctime50
@@ -49,7 +49,7 @@ $NetBSD$
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, statvfs, path, buf);
    if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1);
-@@ -7234,6 +7241,1534 @@ INTERCEPTOR(struct __sanitizer_netent *,
+@@ -7234,6 +7241,1510 @@ INTERCEPTOR(struct __sanitizer_netent *,
  #define INIT_NETENT
  #endif
  
@@ -725,30 +725,6 @@ $NetBSD$
 +#define INIT_GETMNTINFO
 +#endif
 +
-+#if SANITIZER_INTERCEPT_PUTS
-+INTERCEPTOR(int, puts, const char *str) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, puts, str);
-+  if (str)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, str, REAL(strlen)(str) + 1);
-+  int ret = REAL(puts)(str);
-+  return ret;
-+}
-+INTERCEPTOR(int, fputs, const char *str, __sanitizer_FILE *stream) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fputs, str, stream);
-+  if (str)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, str, REAL(strlen)(str) + 1);
-+  int ret = REAL(fputs)(str, stream);
-+  return ret;
-+}
-+#define INIT_PUTS                                                              \
-+  COMMON_INTERCEPT_FUNCTION(puts);                                             \
-+  COMMON_INTERCEPT_FUNCTION(fputs)
-+#else
-+#define INIT_PUTS
-+#endif
-+
 +#if SANITIZER_INTERCEPT_SHA1
 +
 +INTERCEPTOR(void, SHA1Init, void *context) {
@@ -1584,7 +1560,7 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7483,6 +9018,28 @@ static void InitializeCommonInterceptors
+@@ -7483,6 +8994,27 @@ static void InitializeCommonInterceptors
    INIT_TTYENT;
    INIT_PROTOENT;
    INIT_NETENT;
@@ -1595,7 +1571,6 @@ $NetBSD$
 +  INIT_STRTONUM;
 +  INIT_VIS;
 +  INIT_GETMNTINFO;
-+  INIT_PUTS;
 +  INIT_SHA1;
 +  INIT_MD2;
 +  INIT_MD4;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
index 5994f41c7e..ae02c83148 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig	2018-06-14 12:14:40.034210928 +0000
+--- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig	2018-06-14 12:14:40.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_linux_libcdep.cc
 @@ -47,6 +47,7 @@
  #endif
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
index 530e36ec7f..cf1f5df778 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-06-14 12:14:40.207391924 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-06-14 12:14:40.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -510,4 +510,27 @@
+@@ -510,4 +510,26 @@
  #define SANITIZER_INTERCEPT_PROTOENT SI_NETBSD
  #define SANITIZER_INTERCEPT_NETENT SI_NETBSD
  
@@ -13,7 +13,6 @@ $NetBSD$
 +#define SANITIZER_INTERCEPT_STRTONUM SI_NETBSD
 +#define SANITIZER_INTERCEPT_VIS SI_NETBSD
 +#define SANITIZER_INTERCEPT_GETMNTINFO SI_NETBSD
-+#define SANITIZER_INTERCEPT_PUTS SI_POSIX
 +#define SANITIZER_INTERCEPT_SHA1 SI_NETBSD
 +#define SANITIZER_INTERCEPT_MD2 SI_NETBSD
 +#define SANITIZER_INTERCEPT_MD4 SI_NETBSD
diff --git a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg b/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
index f92b1cdc63..3769dc114c 100644
--- a/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_fuzzer_lit.cfg
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/fuzzer/lit.cfg.orig	2018-06-14 12:14:40.053065388 +0000
+--- test/fuzzer/lit.cfg.orig	2018-06-14 12:14:40.000000000 +0000
 +++ test/fuzzer/lit.cfg
 @@ -25,7 +25,7 @@ else:
  config.test_format = lit.formats.ShTest(execute_external)
Prev by Date: Remove android-tools-adb8.
Next by Date: compiler-rt-netbsd: Fix style of the code
Previous by Thread: Remove android-tools-adb8.
Next by Thread: compiler-rt-netbsd: Fix style of the code
Indexes:
Home | Main Index | Thread Index | Old Index