summaryrefslogtreecommitdiff
path: root/devel/talloc
diff options
context:
space:
mode:
Diffstat (limited to 'devel/talloc')
-rw-r--r--devel/talloc/Makefile14
-rw-r--r--devel/talloc/distinfo6
-rw-r--r--devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py43
-rw-r--r--devel/talloc/files/patch-buildtools__wafsamba__samba_python.py14
-rw-r--r--devel/talloc/files/patch-buildtools__wafsamba__wscript15
-rw-r--r--devel/talloc/files/patch-talloc.c20
-rw-r--r--devel/talloc/files/patch-wscript11
7 files changed, 107 insertions, 16 deletions
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile
index 288a88b9d199..8429b265d41f 100644
--- a/devel/talloc/Makefile
+++ b/devel/talloc/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= talloc
-PORTVERSION= 2.1.10
-PORTREVISION= 1
+PORTVERSION= 2.1.11
+PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= SAMBA
@@ -13,6 +13,11 @@ LICENSE= LGPL3
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
+#FLAVORS= default nopython
+#nopython_PKGNAMESUFFIX= -nopython
+#nopython_CONFLICTS= talloc
+#default_CONFLICTS= talloc-nopython
+
USES= compiler pkgconfig waf
USE_LDCONFIG= yes
WAF_CMD= buildtools/bin/waf
@@ -22,7 +27,6 @@ PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
- --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
--disable-rpath \
--without-gettext
@@ -70,7 +74,7 @@ PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
PLIST_FILES+= lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
lib/libpytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.2 \
- %%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.so \
+ %%SAMBA4_PYTHON3_SITELIBDIR%%/talloc.%%SAMBA4_PYTHON3_SO_ABI%%.so \
%%PKGCONFIGDIR%%/pytalloc-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
.endif
.endif
@@ -125,7 +129,7 @@ post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc.so
.if defined(SAMBA4_PYTHON3)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util.${SAMBA4_PYTHON3_SO_ABI}.so
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/talloc.${SAMBA4_PYTHON3_SO_ABI}.so
.endif
.endif
diff --git a/devel/talloc/distinfo b/devel/talloc/distinfo
index 240c8759a045..84cea928b995 100644
--- a/devel/talloc/distinfo
+++ b/devel/talloc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504145176
-SHA256 (talloc-2.1.10.tar.gz) = c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619
-SIZE (talloc-2.1.10.tar.gz) = 441645
+TIMESTAMP = 1516159871
+SHA256 (talloc-2.1.11.tar.gz) = 639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3
+SIZE (talloc-2.1.11.tar.gz) = 443320
diff --git a/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py b/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
index 5245d0e4857b..c92d308462be 100644
--- a/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ b/devel/talloc/files/patch-buildtools__wafsamba__samba_autoconf.py
@@ -1,6 +1,47 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2016-10-07 04:45:35 UTC
+++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+
+
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+ '''check if a set of libraries exist as system libraries
+
+ returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+ ret.append(lib)
+ continue
+
++ if msg is None:
++ msg = 'Checking for library %s' % lib
++
+ (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+ if shlib:
+- res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++ res = conf.check(features='c cshlib',
++ fragment=fragment,
++ lib=lib,
++ uselib_store=lib,
++ ccflags=ccflags,
++ ldflags=ldflags,
++ uselib=lib.upper(),
++ mandatory=False,
++ msg=msg)
+ else:
+- res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++ res = conf.check(lib=lib,
++ uselib_store=lib,
++ ccflags=ccflags,
++ ldflags=ldflags,
++ uselib=lib.upper(),
++ mandatory=False,
++ msg=msg)
+
+ if not res:
+ if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
diff --git a/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py b/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py
index dcea3ffd78c3..429ec5e778f9 100644
--- a/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py
+++ b/devel/talloc/files/patch-buildtools__wafsamba__samba_python.py
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig 2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig 2018-01-13 09:07:51 UTC
+++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
def _check_python_headers(conf, mandatory):
try:
@@ -19,12 +19,16 @@
if conf.env['PYTHON_VERSION'] > '3':
- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+ override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+ if override_PYTHON3_SO_ABI_FLAG is not None:
-+ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG
++ '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
++ while environment variable is PYTHON3_SO_ABI_FLAG'''
++ override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
++ if override_PYTHON_SO_ABI_FLAG is not None:
++ conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
++ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ if not conf.env['PYTHON_SO_ABI_FLAG']:
+ if conf.env['PYTHON_SO_ABI']:
+ conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
++ conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
+ else:
+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
diff --git a/devel/talloc/files/patch-buildtools__wafsamba__wscript b/devel/talloc/files/patch-buildtools__wafsamba__wscript
new file mode 100644
index 000000000000..9399a316c14e
--- /dev/null
+++ b/devel/talloc/files/patch-buildtools__wafsamba__wscript
@@ -0,0 +1,15 @@
+--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -76,10 +76,10 @@ def set_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/talloc/files/patch-talloc.c b/devel/talloc/files/patch-talloc.c
new file mode 100644
index 000000000000..a2807e78b0cb
--- /dev/null
+++ b/devel/talloc/files/patch-talloc.c
@@ -0,0 +1,20 @@
+--- talloc.c.orig 2018-01-13 09:07:51 UTC
++++ talloc.c
+@@ -387,6 +387,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;
+ /*
+@@ -420,6 +423,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/talloc/files/patch-wscript b/devel/talloc/files/patch-wscript
index a74d9c4df028..1d5c9c6d13b4 100644
--- a/devel/talloc/files/patch-wscript
+++ b/devel/talloc/files/patch-wscript
@@ -1,6 +1,6 @@
---- wscript.orig 2017-07-22 22:23:56 UTC
+--- wscript.orig 2018-01-13 09:07:51 UTC
+++ wscript
-@@ -46,7 +46,7 @@ def configure(conf):
+@@ -46,13 +46,14 @@ def configure(conf):
conf.env.TALLOC_COMPAT1 = False
if conf.env.standalone_talloc:
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
@@ -9,3 +9,10 @@
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()
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 18:34:41 +0000