mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Update supplimentary Samba libs to the latest versions.
Sponsored by: iXsystems Inc.
This commit is contained in:
parent
e5a42a8c3c
commit
f8a1071d96
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=462465
31 changed files with 545 additions and 73 deletions
|
@ -22,7 +22,12 @@ LDB_DEPENDS= talloc>=2.1.8:devel/talloc \
|
|||
tdb>=1.3.12,1:databases/tdb \
|
||||
popt>=0:devel/popt
|
||||
|
||||
CONFLICTS= ldb1[23]-1.*
|
||||
CONFLICTS_INSTALL= ldb1[23]-1.*
|
||||
|
||||
#FLAVORS= default nopython
|
||||
#nopython_PKGNAMESUFFIX= -nopython
|
||||
#nopython_CONFLICTS= ldb
|
||||
#default_CONFLICTS= ldb-nopython
|
||||
|
||||
USES= compiler pkgconfig waf
|
||||
USE_LDCONFIG= yes
|
||||
|
@ -38,7 +43,7 @@ CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt \
|
|||
--with-privatelibdir=${PREFIX}/lib/ldb
|
||||
|
||||
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
|
||||
--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
|
||||
--with-openldap=${LOCALBASE} \
|
||||
--disable-rpath \
|
||||
--without-gettext
|
||||
|
||||
|
@ -143,13 +148,13 @@ post-install:
|
|||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
|
||||
.else
|
||||
.for file in include/pyldb.h \
|
||||
.for f in include/pyldb.h \
|
||||
lib/libpyldb-util.so \
|
||||
lib/libpyldb-util.so.1 \
|
||||
lib/ldb/libpytalloc-util.so.2
|
||||
${RM} ${STAGEDIR}${PREFIX}/${file}
|
||||
.endfor
|
||||
.for file in ${PYTHON_SITELIBDIR}/ldb.so \
|
||||
.for f in ${PYTHON_SITELIBDIR}/ldb.so \
|
||||
${PYTHON_SITELIBDIR}/_ldb_text.py \
|
||||
${PYTHON_SITELIBDIR}/_tdb_text.py \
|
||||
${PYTHON_SITELIBDIR}/_tevent.so \
|
||||
|
|
|
@ -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 == []:
|
||||
|
|
22
databases/ldb/files/patch-buildtools__wafsamba__wscript
Normal file
22
databases/ldb/files/patch-buildtools__wafsamba__wscript
Normal file
|
@ -0,0 +1,22 @@
|
|||
--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC
|
||||
+++ buildtools/wafsamba/wscript
|
||||
@@ -74,12 +74,17 @@ def set_options(opt):
|
||||
help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
|
||||
action="store", dest='PRIVATELIBDIR', default=None)
|
||||
|
||||
+ opt.add_option('--with-openldap',
|
||||
+ help='additional directory to search for OpenLDAP libs',
|
||||
+ action='store', dest='ldap_open', default=None,
|
||||
+ match = ['Checking for library lber', 'Checking for library ldap'])
|
||||
+
|
||||
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')
|
11
databases/ldb/files/patch-common__ldb_modules.c
Normal file
11
databases/ldb/files/patch-common__ldb_modules.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- common/ldb_modules.c.orig 2018-02-14 01:18:43 UTC
|
||||
+++ common/ldb_modules.c
|
||||
@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
|
||||
*/
|
||||
void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
|
||||
{
|
||||
- int ret = ldb_modules_load_path(path, LDB_VERSION);
|
||||
+ int ret = ldb_modules_load_dir(path, LDB_VERSION);
|
||||
if (ret != LDB_SUCCESS) {
|
||||
ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
|
||||
}
|
|
@ -19,12 +19,17 @@ BUILD_DEPENDS= ${LDB_DEPENDS}
|
|||
RUN_DEPENDS= ${LDB_DEPENDS}
|
||||
|
||||
LDB_DEPENDS= talloc>=2.1.10:devel/talloc \
|
||||
tevent>=0.9.33:devel/tevent \
|
||||
tevent>=0.9.34:devel/tevent \
|
||||
tdb>=1.3.15:databases/tdb \
|
||||
cmocka>=1.1.1:sysutils/cmocka \
|
||||
popt>=0:devel/popt
|
||||
|
||||
CONFLICTS= ldb-1.1.* ldb13-1.3.*
|
||||
CONFLICTS_INSTALL= ldb-1.1.* ldb13-1.3.*
|
||||
|
||||
#FLAVORS= default nopython
|
||||
#nopython_PKGNAMESUFFIX= -nopython
|
||||
#nopython_CONFLICTS= ldb
|
||||
#default_CONFLICTS= ldb-nopython
|
||||
|
||||
USES= compiler pkgconfig waf
|
||||
USE_LDCONFIG= yes
|
||||
|
@ -40,7 +45,7 @@ CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
|
|||
--with-privatelibdir=${PREFIX}/lib/ldb
|
||||
|
||||
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
|
||||
--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
|
||||
--with-openldap=${LOCALBASE} \
|
||||
--disable-rpath \
|
||||
--without-gettext
|
||||
|
||||
|
@ -113,7 +118,7 @@ PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
|
|||
|
||||
PLIST_FILES+= lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
|
||||
lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.1 \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.so \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.%%SAMBA4_PYTHON3_SO_ABI%%.so \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py \
|
||||
%%PKGCONFIGDIR%%/pyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
|
||||
.endif
|
||||
|
@ -173,7 +178,7 @@ post-install:
|
|||
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
|
||||
.if defined(SAMBA4_PYTHON3)
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
|
||||
.endif
|
||||
.endif
|
||||
|
||||
|
|
|
@ -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 == []:
|
||||
|
|
|
@ -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 % ''
|
||||
|
|
22
databases/ldb12/files/patch-buildtools__wafsamba__wscript
Normal file
22
databases/ldb12/files/patch-buildtools__wafsamba__wscript
Normal file
|
@ -0,0 +1,22 @@
|
|||
--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC
|
||||
+++ buildtools/wafsamba/wscript
|
||||
@@ -74,12 +74,17 @@ def set_options(opt):
|
||||
help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
|
||||
action="store", dest='PRIVATELIBDIR', default=None)
|
||||
|
||||
+ opt.add_option('--with-openldap',
|
||||
+ help='additional directory to search for OpenLDAP libs',
|
||||
+ action='store', dest='ldap_open', default=None,
|
||||
+ match = ['Checking for library lber', 'Checking for library ldap'])
|
||||
+
|
||||
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')
|
11
databases/ldb12/files/patch-common__ldb_modules.c
Normal file
11
databases/ldb12/files/patch-common__ldb_modules.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- common/ldb_modules.c.orig 2018-02-14 01:18:43 UTC
|
||||
+++ common/ldb_modules.c
|
||||
@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
|
||||
*/
|
||||
void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
|
||||
{
|
||||
- int ret = ldb_modules_load_path(path, LDB_VERSION);
|
||||
+ int ret = ldb_modules_load_dir(path, LDB_VERSION);
|
||||
if (ret != LDB_SUCCESS) {
|
||||
ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= ldb
|
||||
PORTVERSION= 1.3.0
|
||||
PORTVERSION= 1.3.1
|
||||
PORTREVISION= 0
|
||||
PORTEPOCH= 0
|
||||
CATEGORIES= databases
|
||||
|
@ -18,14 +18,19 @@ IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with
|
|||
BUILD_DEPENDS= ${LDB_DEPENDS}
|
||||
RUN_DEPENDS= ${LDB_DEPENDS}
|
||||
|
||||
LDB_DEPENDS= talloc>=2.1.10:devel/talloc \
|
||||
tevent>=0.9.33:devel/tevent \
|
||||
LDB_DEPENDS= talloc>=2.1.11:devel/talloc \
|
||||
tevent>=0.9.35:devel/tevent \
|
||||
tdb>=1.3.15:databases/tdb \
|
||||
cmocka>=1.1.1:sysutils/cmocka \
|
||||
popt>=0:devel/popt
|
||||
|
||||
CONFLICTS_INSTALL= ldb-1.1.* ldb12-1.2.*
|
||||
|
||||
#FLAVORS= default nopython
|
||||
#nopython_PKGNAMESUFFIX= -nopython
|
||||
#nopython_CONFLICTS= ldb
|
||||
#default_CONFLICTS= ldb-nopython
|
||||
|
||||
USES= compiler pkgconfig waf
|
||||
USE_LDCONFIG= yes
|
||||
WAF_CMD= buildtools/bin/waf
|
||||
|
@ -40,7 +45,7 @@ CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
|
|||
--with-privatelibdir=${PREFIX}/lib/ldb
|
||||
|
||||
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
|
||||
--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
|
||||
--with-openldap=${LOCALBASE} \
|
||||
--disable-rpath \
|
||||
--without-gettext
|
||||
|
||||
|
@ -113,7 +118,7 @@ PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
|
|||
|
||||
PLIST_FILES+= lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so \
|
||||
lib/libpyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.so.1 \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.so \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/ldb.%%SAMBA4_PYTHON3_SO_ABI%%.so \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/_ldb_text.py \
|
||||
%%PKGCONFIGDIR%%/pyldb-util.%%SAMBA4_PYTHON3_SO_ABI%%.pc
|
||||
.endif
|
||||
|
@ -173,7 +178,7 @@ post-install:
|
|||
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb.so
|
||||
.if defined(SAMBA4_PYTHON3)
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util.${SAMBA4_PYTHON3_SO_ABI}.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/ldb.${SAMBA4_PYTHON3_SO_ABI}.so
|
||||
.endif
|
||||
.endif
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1509845308
|
||||
SHA256 (ldb-1.3.0.tar.gz) = 44b53e5a3bc45c8dc837a7e0e00a78e87911da5959ad1b026a62f5b9b4d5590d
|
||||
SIZE (ldb-1.3.0.tar.gz) = 1359144
|
||||
TIMESTAMP = 1516159739
|
||||
SHA256 (ldb-1.3.1.tar.gz) = b19f2c9f55ae0f46aa5ebaea0bf1a47ec1ac135e1d78af0f6318cf50bf62cbd2
|
||||
SIZE (ldb-1.3.1.tar.gz) = 1361723
|
||||
|
|
|
@ -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 == []:
|
||||
|
|
|
@ -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 % ''
|
||||
|
|
22
databases/ldb13/files/patch-buildtools__wafsamba__wscript
Normal file
22
databases/ldb13/files/patch-buildtools__wafsamba__wscript
Normal file
|
@ -0,0 +1,22 @@
|
|||
--- buildtools/wafsamba/wscript.orig 2017-04-28 11:57:26 UTC
|
||||
+++ buildtools/wafsamba/wscript
|
||||
@@ -74,12 +74,17 @@ def set_options(opt):
|
||||
help=("private library directory [PREFIX/lib/%s]" % Utils.g_module.APPNAME),
|
||||
action="store", dest='PRIVATELIBDIR', default=None)
|
||||
|
||||
+ opt.add_option('--with-openldap',
|
||||
+ help='additional directory to search for OpenLDAP libs',
|
||||
+ action='store', dest='ldap_open', default=None,
|
||||
+ match = ['Checking for library lber', 'Checking for library ldap'])
|
||||
+
|
||||
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')
|
11
databases/ldb13/files/patch-common__ldb_modules.c
Normal file
11
databases/ldb13/files/patch-common__ldb_modules.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- common/ldb_modules.c.orig 2018-02-14 01:18:43 UTC
|
||||
+++ common/ldb_modules.c
|
||||
@@ -1103,7 +1103,7 @@ static int ldb_modules_load_dir(const ch
|
||||
*/
|
||||
void ldb_set_modules_dir(struct ldb_context *ldb, const char *path)
|
||||
{
|
||||
- int ret = ldb_modules_load_path(path, LDB_VERSION);
|
||||
+ int ret = ldb_modules_load_dir(path, LDB_VERSION);
|
||||
if (ret != LDB_SUCCESS) {
|
||||
ldb_asprintf_errstring(ldb, "Failed to load modules from: %s\n", path);
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= tdb
|
||||
PORTVERSION= 1.3.15
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= SAMBA
|
||||
|
@ -14,6 +14,13 @@ LICENSE= GPLv3
|
|||
|
||||
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
|
||||
|
||||
#FLAVORS= default nopython debug
|
||||
#nopython_PKGNAMESUFFIX= -nopython
|
||||
#debug_PKGNAMESUFFIX= -debug
|
||||
#nopython_CONFLICTS= tdb tdb-debug
|
||||
#debug_CONFLICTS= tdb tdb-nopython
|
||||
#default_CONFLICTS= tdb-nopython rdb-debug
|
||||
|
||||
USES= compiler pkgconfig waf
|
||||
USE_LDCONFIG= yes
|
||||
WAF_CMD= buildtools/bin/waf
|
||||
|
@ -23,7 +30,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
|
||||
|
||||
|
@ -43,6 +49,10 @@ PLIST_FILES+= include/tdb.h \
|
|||
lib/libtdb.so.1 \
|
||||
%%PKGCONFIGDIR%%/tdb.pc
|
||||
|
||||
.if defined(SAMBA4_DEBUG)
|
||||
CFLAGS+= -DTDB_TRACE=1
|
||||
.endif
|
||||
|
||||
.if defined(NO_PYTHON)
|
||||
USES+= python:2.7,build
|
||||
CONFIGURE_ARGS+= --disable-python
|
||||
|
@ -72,7 +82,7 @@ CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
|
|||
PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
|
||||
SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
|
||||
|
||||
PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/tdb.so \
|
||||
PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/tdb.%%SAMBA4_PYTHON3_SO_ABI%%.so \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/_tdb_text.py
|
||||
.endif
|
||||
.endif
|
||||
|
@ -125,7 +135,7 @@ post-install:
|
|||
.if !defined(NO_PYTHON)
|
||||
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb.so
|
||||
.if defined(SAMBA4_PYTHON3)
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/tdb.${SAMBA4_PYTHON3_SO_ABI}.so
|
||||
.endif
|
||||
.endif
|
||||
|
||||
|
|
|
@ -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 == []:
|
||||
|
|
|
@ -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 % ''
|
||||
|
|
15
databases/tdb/files/patch-buildtools__wafsamba__wscript
Normal file
15
databases/tdb/files/patch-buildtools__wafsamba__wscript
Normal file
|
@ -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')
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 == []:
|
||||
|
|
|
@ -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 % ''
|
||||
|
|
15
devel/talloc/files/patch-buildtools__wafsamba__wscript
Normal file
15
devel/talloc/files/patch-buildtools__wafsamba__wscript
Normal file
|
@ -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')
|
20
devel/talloc/files/patch-talloc.c
Normal file
20
devel/talloc/files/patch-talloc.c
Normal file
|
@ -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
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= tevent
|
||||
PORTVERSION= 0.9.34
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 0.9.35
|
||||
PORTREVISION= 0
|
||||
PORTEPOCH= 0
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= SAMBA
|
||||
|
@ -14,8 +14,13 @@ LICENSE= LGPL3
|
|||
|
||||
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
|
||||
|
||||
BUILD_DEPENDS= talloc>=2.1.10:devel/talloc
|
||||
RUN_DEPENDS= talloc>=2.1.10:devel/talloc
|
||||
BUILD_DEPENDS= talloc>=2.1.11:devel/talloc
|
||||
RUN_DEPENDS= talloc>=2.1.11:devel/talloc
|
||||
|
||||
#FLAVORS= default nopython
|
||||
#nopython_PKGNAMESUFFIX= -nopython
|
||||
#nopython_CONFLICTS= tevent
|
||||
#default_CONFLICTS= tevent-nopython
|
||||
|
||||
USES= compiler pkgconfig waf
|
||||
USE_LDCONFIG= yes
|
||||
|
@ -28,7 +33,6 @@ PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
|
|||
CONFIGURE_ARGS+= --bundled-libraries=!talloc
|
||||
|
||||
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
|
||||
--infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \
|
||||
--disable-rpath \
|
||||
--without-gettext
|
||||
|
||||
|
@ -73,7 +77,7 @@ CONFIGURE_ARGS+= --extra-python=${LOCALBASE}/bin/${SAMBA4_PYTHON3}
|
|||
PLIST_SUB+= SAMBA4_PYTHON3_SO_ABI=${SAMBA4_PYTHON3_SO_ABI} \
|
||||
SAMBA4_PYTHON3_SITELIBDIR=${SAMBA4_PYTHON3_SITELIBDIR}
|
||||
|
||||
PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.so \
|
||||
PLIST_FILES+= %%SAMBA4_PYTHON3_SITELIBDIR%%/_tevent.%%SAMBA4_PYTHON3_SO_ABI%%.so \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.py \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyc \
|
||||
%%SAMBA4_PYTHON3_SITELIBDIR%%/tevent.pyo
|
||||
|
@ -108,16 +112,18 @@ pre-configure:
|
|||
${FALSE}; \
|
||||
fi
|
||||
|
||||
.if !defined(NO_PYTHON)
|
||||
post-build:
|
||||
${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py
|
||||
${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
|
||||
.if !defined(NO_PYTHON)
|
||||
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent.so
|
||||
.if defined(SAMBA4_PYTHON3)
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.so
|
||||
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SAMBA4_PYTHON3_SITELIBDIR}/_tevent.${SAMBA4_PYTHON3_SO_ABI}.so
|
||||
.endif
|
||||
.endif
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1510686207
|
||||
SHA256 (tevent-0.9.34.tar.gz) = 73213ef8b27f4a0164e375140a177a751e06fe190a90f3178e24f206b4747b8a
|
||||
SIZE (tevent-0.9.34.tar.gz) = 590260
|
||||
TIMESTAMP = 1516161103
|
||||
SHA256 (tevent-0.9.35.tar.gz) = 25a3a9d264eb3af9a688c38512f248fc1640fd86d663d3346dbfa18feb5c16e9
|
||||
SIZE (tevent-0.9.35.tar.gz) = 591546
|
||||
|
|
|
@ -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 == []:
|
||||
|
|
|
@ -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 % ''
|
||||
|
|
15
devel/tevent/files/patch-buildtools__wafsamba__wscript
Normal file
15
devel/tevent/files/patch-buildtools__wafsamba__wscript
Normal file
|
@ -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')
|
Loading…
Add table
Reference in a new issue