Skip to content

Commit

Permalink
tevent: fix build on systems with memset_explicit()
Browse files Browse the repository at this point in the history
  • Loading branch information
0-wiz-0 committed Nov 11, 2024
1 parent a584325 commit 9f5658e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
3 changes: 2 additions & 1 deletion devel/tevent/distinfo
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.20 2024/01/31 17:43:16 adam Exp $
$NetBSD: distinfo,v 1.21 2024/11/11 15:34:13 wiz Exp $

BLAKE2s (tevent-0.16.1.tar.gz) = 048dab2834f532ef6ba6272ae85879df1810157cf3a28b6e5990ac91ac8915a8
SHA512 (tevent-0.16.1.tar.gz) = cda001d91728b2f28dd081e9c5f6d8ede345dcd9ce1dca04394860cd83090c15aa8dfef1c53b73e120bd17f0d95551fa9301eb4927963314556d016fe5420a39
Size (tevent-0.16.1.tar.gz) = 890010 bytes
SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 50ff76f5b085f770751ca8bb93c8544cfdcd40d9
SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d
SHA1 (patch-buildtools_wafsamba_samba__utils.py) = 0a587421870c1974175fadbb02dde215f35938f2
SHA1 (patch-lib_replace_replace.c) = 0f7f092196f7e47560799959348d12cfd795893d
SHA1 (patch-wscript) = 5ef57da7398e66f02abb4f8897447c937de3d8e3
16 changes: 16 additions & 0 deletions devel/tevent/patches/patch-lib_replace_replace.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
$NetBSD: patch-lib_replace_replace.c,v 1.1 2024/11/11 15:34:13 wiz Exp $

memset_explicit only takes three arguments.
https://gitlab.com/samba-team/samba/-/merge_requests/3865

--- lib/replace/replace.c.orig 2022-12-09 08:35:17.185507800 +0000
+++ lib/replace/replace.c
@@ -970,7 +970,7 @@ int rep_memset_s(void *dest, size_t dest
}

#if defined(HAVE_MEMSET_EXPLICIT)
- memset_explicit(dest, destsz, ch, count);
+ memset_explicit(dest, ch, count);
#else /* HAVE_MEMSET_EXPLICIT */
memset(dest, ch, count);
# if defined(HAVE_GCC_VOLATILE_MEMORY_PROTECTION)

0 comments on commit 9f5658e

Please sign in to comment.