compiler-rt-netbsd: Update to SVN r. 324091

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 2 15:14:19 2018 +0100
Changeset:	7f101e9a9e4e6c9bb41f461d143ef0619eb1c3a2

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc

Log Message:
compiler-rt-netbsd: Update to SVN r. 324091

Local patch merged upstream:
Author: kamil
Date: Fri Feb  2 05:56:52 2018
New Revision: 324091

URL: http://llvm.org/viewvc/llvm-project?rev=324091&view=rev
Log:
Correct the return value of strlcat(3) in the interceptor

Late fix for SVN r. 324034
Add new interceptors: strlcpy(3) and strlcat(3)

There was forgotten an addition of len to the return value.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc

Sponsored by <The NetBSD Foundation>

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

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

diffstat:
 compiler-rt-netbsd/Makefile                         |  2 +-
 compiler-rt-netbsd/distinfo                         |  2 +-
 ...izer__common_sanitizer__common__interceptors.inc | 21 ---------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index a2ef57af60..181f36619d 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=		compiler-rt
 SVN_REPO.compiler-rt=		http://llvm.org/svn/llvm-project/compiler-rt/trunk
-SVN_REVISION.compiler-rt=	324034
+SVN_REVISION.compiler-rt=	324091
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index cd289f628b..d748f3640b 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -10,7 +10,7 @@ SHA1 (patch-lib_hwasan_hwasan__interceptors.cc) = 27038b764c7d3d4f1885d85dc6d76c
 SHA1 (patch-lib_msan_msan__interceptors.cc) = f6388495e44c2ddf2cdfa4cf59e9da0e5e60c2d7
 SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
 SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = 2a0a50c9fccf4be9328aa5ecd7c55adace841fe8
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = c13f6d9ff96d743ddc922d292074c196ebf80f21
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = e145e0d674ac70a24c3c70421e07e9d603eb85f7
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors__ioctl.inc) = a4b00d19eb5528a320255e8b0dcbaf07f1f8aa16
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = a6ce44f3cfd42640c6fbe514814e8e485fac1dfc
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = a9d86ca4c434faca53db8ccb81f96a44ca309a0f
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 21d2911925..a933f74826 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
@@ -171,27 +171,6 @@ $NetBSD$
  #if SANITIZER_INTERCEPT___XSTAT
  INTERCEPTOR(int, __xstat, int version, const char *path, void *buf) {
    void *ctx;
-@@ -6741,16 +6789,15 @@ INTERCEPTOR(SIZE_T, strlcpy, char *dst, 
- 
- INTERCEPTOR(SIZE_T, strlcat, char *dst, char *src, SIZE_T size) {
-   void *ctx;
-+  SIZE_T len = 0;
-   COMMON_INTERCEPTOR_ENTER(ctx, strlcat, dst, src, size);
-   // src is checked in the strlcpy() interceptor
-   if (dst) {
--    SIZE_T len = REAL(strnlen)(dst, size);
-+    len = REAL(strnlen)(dst, size);
-     COMMON_INTERCEPTOR_READ_STRING(ctx, dst, Min(len, size - 1) + 1);
--    // Reuse the rest of the code in the strlcpy() interceptor
--    dst += len;
--    size -= len;
-   }
--  return WRAP(strlcpy)(dst, src, size);
-+  // Reuse the rest of the code in the strlcpy() interceptor
-+  return len + WRAP(strlcpy)(dst + len, src, size - len);
- }
- #define INIT_STRLCPY \
-   COMMON_INTERCEPT_FUNCTION(strlcpy); \
 @@ -6759,6 +6806,897 @@ INTERCEPTOR(SIZE_T, strlcat, char *dst, 
  #define INIT_STRLCPY
  #endif