5 files changed, 75 insertions, 0 deletions
diff --git a/devel/talloc243/files/patch-buildtools_wafsamba_samba__install.py b/devel/talloc243/files/patch-buildtools_wafsamba_samba__install.py
new file mode 100644
index 000000000000..5a85a034aea7
--- /dev/null
+++ b/devel/talloc243/files/patch-buildtools_wafsamba_samba__install.py
@@ -0,0 +1,11 @@
+--- buildtools/wafsamba/samba_install.py.orig	2019-03-21 10:12:32 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -115,7 +115,7 @@ def install_library(self):
+                 inst_name    = bld.make_libname(t.target)
+         elif self.vnum:
+             vnum_base    = self.vnum.split('.')[0]
+-            install_name = bld.make_libname(target_name, version=self.vnum)
++            install_name = bld.make_libname(target_name, version=vnum_base)
+             install_link = bld.make_libname(target_name, version=vnum_base)
+             inst_name    = bld.make_libname(t.target)
+             if not self.private_library or not t.env.SONAME_ST:
diff --git a/devel/talloc243/files/patch-buildtools_wafsamba_wscript b/devel/talloc243/files/patch-buildtools_wafsamba_wscript
new file mode 100644
index 000000000000..3d4b6a56e345
--- /dev/null
+++ b/devel/talloc243/files/patch-buildtools_wafsamba_wscript
@@ -0,0 +1,15 @@
+--- buildtools/wafsamba/wscript.orig	2019-03-21 10:12:32 UTC
++++ buildtools/wafsamba/wscript
+@@ -82,10 +82,10 @@ def options(opt):
+ 
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')
diff --git a/devel/talloc243/files/patch-lib_replace_wscript b/devel/talloc243/files/patch-lib_replace_wscript
new file mode 100644
index 000000000000..d476cec47cfb
--- /dev/null
+++ b/devel/talloc243/files/patch-lib_replace_wscript
@@ -0,0 +1,11 @@
+--- lib/replace/wscript.orig	2019-03-21 10:12:32 UTC
++++ lib/replace/wscript
+@@ -119,7 +119,7 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
+     conf.CHECK_HEADERS('libgen.h')
+ 
+-    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
++    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
+         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
+ 
+     if conf.CHECK_CFLAGS('-Wno-unused-function'):
diff --git a/devel/talloc243/files/patch-talloc.c b/devel/talloc243/files/patch-talloc.c
new file mode 100644
index 000000000000..2add4433b724
--- /dev/null
+++ b/devel/talloc243/files/patch-talloc.c
@@ -0,0 +1,20 @@
+--- talloc.c.orig	2019-03-21 10:12:32 UTC
++++ talloc.c
+@@ -396,6 +396,9 @@ void talloc_lib_init(void) __attribute__
+ void talloc_lib_init(void)
+ {
+ 	uint32_t random_value;
++#if defined(HAVE_ARC4RANDOM)
++	random_value = arc4random();
++#else
+ #if defined(HAVE_GETAUXVAL) && defined(AT_RANDOM)
+ 	uint8_t *p;
+ 	/*
+@@ -429,6 +432,7 @@ void talloc_lib_init(void)
+ 		 */
+ 		random_value = ((uintptr_t)talloc_lib_init & 0xFFFFFFFF);
+ 	}
++#endif /* HAVE_ARC4RANDOM */
+ 	talloc_magic = random_value & ~TALLOC_FLAG_MASK;
+ }
+ #else
diff --git a/devel/talloc243/files/patch-wscript b/devel/talloc243/files/patch-wscript
new file mode 100644
index 000000000000..8097c806c2a4
--- /dev/null
+++ b/devel/talloc243/files/patch-wscript
@@ -0,0 +1,18 @@
+--- wscript.orig	2019-03-21 10:12:32 UTC
++++ wscript
+@@ -45,13 +45,14 @@ def configure(conf):
+     conf.env.TALLOC_COMPAT1 = False
+     if conf.env.standalone_talloc:
+         conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+-        conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
++        conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
+         conf.env.TALLOC_VERSION = VERSION
+ 
+     conf.CHECK_XSLTPROC_MANPAGES()
+ 
+     conf.CHECK_HEADERS('sys/auxv.h')
+     conf.CHECK_FUNCS('getauxval')
++    conf.CHECK_FUNCS('arc4random')
+ 
+     conf.SAMBA_CONFIG_H()
+