Index: head/databases/ldb/Makefile =================================================================== --- head/databases/ldb/Makefile (revision 397322) +++ head/databases/ldb/Makefile (revision 397323) @@ -1,126 +1,126 @@ # $FreeBSD$ PORTNAME= ldb PORTVERSION= 1.1.21 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= LDAP-like embedded database LICENSE= GPLv3 CONFLICTS= *samba3[0-4]-3.* USES= compiler pkgconfig python:2 waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log USE_OPENLDAP= yes 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 OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) BUILD_DEPENDS+= talloc>=2.1.1:${PORTSDIR}/devel/talloc \ tevent>=0.9.22:${PORTSDIR}/devel/tevent \ tdb>=1.3.4,1:${PORTSDIR}/databases/tdb \ popt>=0:${PORTSDIR}/devel/popt RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt \ --with-modulesdir=${PREFIX}/lib/shared-modules \ --with-privatelibdir=${PREFIX}/lib/ldb .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES= bin/ldbedit \ bin/ldbmodify \ bin/ldbadd \ bin/ldbdel \ bin/ldbsearch \ bin/ldbrename \ include/ldb_version.h \ include/ldb_handlers.h \ include/ldb_errors.h \ include/ldb.h \ include/ldb_module.h \ lib/libldb.so \ lib/libldb.so.1 \ lib/ldb/libldb-cmdline.so \ lib/shared-modules/ldb/asq.so \ lib/shared-modules/ldb/ldap.so \ lib/shared-modules/ldb/paged_results.so \ lib/shared-modules/ldb/paged_searches.so \ lib/shared-modules/ldb/rdn_name.so \ lib/shared-modules/ldb/sample.so \ lib/shared-modules/ldb/server_sort.so \ lib/shared-modules/ldb/skel.so \ lib/shared-modules/ldb/tdb.so \ %%PKGCONFIGDIR%%/ldb.pc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes PLIST_FILES+= include/pyldb.h \ lib/libpyldb-util.so \ lib/libpyldb-util.so.1 \ %%PYTHON_SITELIBDIR%%/ldb.so \ %%PKGCONFIGDIR%%/pyldb-util.pc LDB_MAN1= man/man1/ldbadd.1.gz \ man/man1/ldbdel.1.gz \ man/man1/ldbedit.1.gz \ man/man1/ldbmodify.1.gz \ man/man1/ldbrename.1.gz \ man/man1/ldbsearch.1.gz LDB_MAN3= man/man3/ldb.3.gz PLIST_FILES+= ${LDB_MAN1} ${LDB_MAN3} IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man . for man in ${LDB_MAN1} ${LDB_MAN3} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man . endfor .endif .include Index: head/databases/ldb/files/patch-lib_replace_replace.c =================================================================== --- head/databases/ldb/files/patch-lib_replace_replace.c (nonexistent) +++ head/databases/ldb/files/patch-lib_replace_replace.c (revision 397323) @@ -0,0 +1,68 @@ +From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Tue, 18 Aug 2015 20:57:27 +0200 +Subject: [PATCH] replace: Fix bug 11455 + +Don't call rep_strtoull recursively + +Signed-off-by: Volker Lendecke +Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455 + +https://lists.samba.org/archive/samba-technical/2015-July/108587.html +https://lists.samba.org/archive/samba-technical/2015-July/108588.html + +--- ./lib/replace/replace.c.orig 2015-09-18 23:51:08 UTC ++++ ./lib/replace/replace.c 2015-09-18 23:51:08 UTC +@@ -518,8 +518,10 @@ + } + #else + #ifdef HAVE_BSD_STRTOLL ++#undef strtoll + long long int rep_strtoll(const char *str, char **endptr, int base) + { ++ int errno0 = errno; + long long int nb = strtoll(str, endptr, base); + /* With glibc EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { +@@ -528,7 +530,7 @@ + * able to make the convertion. + * Let's reset errno. + */ +- errno = 0; ++ errno = errno0; + } + } + return nb; +@@ -551,26 +553,24 @@ + #endif + } + #else +-#ifdef HAVE_BSD_STRTOLL +-#ifdef HAVE_STRTOUQ ++#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */ ++#undef strtoull + unsigned long long int rep_strtoull(const char *str, char **endptr, int base) + { +- unsigned long long int nb = strtouq(str, endptr, base); +- /* In linux EINVAL is only returned if base is not ok */ ++ int errno0 = errno; ++ unsigned long long int nb = strtoull(str, endptr, base); ++ /* With glibc EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { + if (base == 0 || (base >1 && base <37)) { + /* Base was ok so it's because we were not + * able to make the convertion. + * Let's reset errno. + */ +- errno = 0; ++ errno = errno0; + } + } + return nb; + } +-#else +-#error "You need the strtouq function" +-#endif /* HAVE_STRTOUQ */ + #endif /* HAVE_BSD_STRTOLL */ + #endif /* HAVE_STRTOULL */ + Property changes on: head/databases/ldb/files/patch-lib_replace_replace.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/tdb/Makefile =================================================================== --- head/databases/tdb/Makefile (revision 397322) +++ head/databases/tdb/Makefile (revision 397323) @@ -1,98 +1,98 @@ # $FreeBSD$ PORTNAME= tdb PORTVERSION= 1.3.7 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= Trivial Database LICENSE= GPLv3 CONFLICTS= *samba3[0-4]-3.* USES= compiler pkgconfig waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log 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 OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) .include .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python .else USES+= python:2 PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so \ %%PYTHON_SITELIBDIR%%/_tdb_text.py .endif .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES+= bin/tdbbackup \ bin/tdbdump \ bin/tdbrestore \ bin/tdbtool \ include/tdb.h \ lib/libtdb.so \ lib/libtdb.so.1 \ %%PKGCONFIGDIR%%/tdb.pc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes TDB_MAN8= man/man8/tdbbackup.8.gz \ man/man8/tdbdump.8.gz \ man/man8/tdbrestore.8.gz \ man/man8/tdbtool.8.gz PLIST_FILES+= ${TDB_MAN8} IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man . for man in ${TDB_MAN8} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man . endfor .endif .include Index: head/databases/tdb/files/patch-lib_replace_replace.c =================================================================== --- head/databases/tdb/files/patch-lib_replace_replace.c (nonexistent) +++ head/databases/tdb/files/patch-lib_replace_replace.c (revision 397323) @@ -0,0 +1,68 @@ +From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Tue, 18 Aug 2015 20:57:27 +0200 +Subject: [PATCH] replace: Fix bug 11455 + +Don't call rep_strtoull recursively + +Signed-off-by: Volker Lendecke +Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455 + +https://lists.samba.org/archive/samba-technical/2015-July/108587.html +https://lists.samba.org/archive/samba-technical/2015-July/108588.html + +--- ./lib/replace/replace.c.orig 2015-09-18 23:51:08 UTC ++++ ./lib/replace/replace.c 2015-09-18 23:51:08 UTC +@@ -518,8 +518,10 @@ + } + #else + #ifdef HAVE_BSD_STRTOLL ++#undef strtoll + long long int rep_strtoll(const char *str, char **endptr, int base) + { ++ int errno0 = errno; + long long int nb = strtoll(str, endptr, base); + /* With glibc EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { +@@ -528,7 +530,7 @@ + * able to make the convertion. + * Let's reset errno. + */ +- errno = 0; ++ errno = errno0; + } + } + return nb; +@@ -551,26 +553,24 @@ + #endif + } + #else +-#ifdef HAVE_BSD_STRTOLL +-#ifdef HAVE_STRTOUQ ++#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */ ++#undef strtoull + unsigned long long int rep_strtoull(const char *str, char **endptr, int base) + { +- unsigned long long int nb = strtouq(str, endptr, base); +- /* In linux EINVAL is only returned if base is not ok */ ++ int errno0 = errno; ++ unsigned long long int nb = strtoull(str, endptr, base); ++ /* With glibc EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { + if (base == 0 || (base >1 && base <37)) { + /* Base was ok so it's because we were not + * able to make the convertion. + * Let's reset errno. + */ +- errno = 0; ++ errno = errno0; + } + } + return nb; + } +-#else +-#error "You need the strtouq function" +-#endif /* HAVE_STRTOUQ */ + #endif /* HAVE_BSD_STRTOLL */ + #endif /* HAVE_STRTOULL */ + Property changes on: head/databases/tdb/files/patch-lib_replace_replace.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/talloc/Makefile =================================================================== --- head/devel/talloc/Makefile (revision 397322) +++ head/devel/talloc/Makefile (revision 397323) @@ -1,94 +1,94 @@ # $FreeBSD$ PORTNAME= talloc PORTVERSION= 2.1.3 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= devel MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= Hierarchical pool based memory allocator LICENSE= LGPL3 CONFLICTS= samba33-3.* USES= compiler pkgconfig waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log 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 OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) .include .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python .else USES+= python:2 PLIST_FILES+= include/pytalloc.h \ lib/libpytalloc-util.so \ lib/libpytalloc-util.so.2 \ %%PYTHON_SITELIBDIR%%/talloc.so \ %%PKGCONFIGDIR%%/pytalloc-util.pc .endif .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES+= include/talloc.h \ lib/libtalloc.so \ lib/libtalloc.so.2 \ %%PKGCONFIGDIR%%/talloc.pc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes TALLOC_MAN3= man/man3/talloc.3.gz PLIST_FILES+= ${TALLOC_MAN3} IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man . for man in ${TALLOC_MAN3} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man . endfor .endif .include Index: head/devel/talloc/files/patch-lib_replace_replace.c =================================================================== --- head/devel/talloc/files/patch-lib_replace_replace.c (nonexistent) +++ head/devel/talloc/files/patch-lib_replace_replace.c (revision 397323) @@ -0,0 +1,68 @@ +From 035dd6447a06409c2df5ed559218f52479621abd Mon Sep 17 00:00:00 2001 +From: Volker Lendecke +Date: Tue, 18 Aug 2015 20:57:27 +0200 +Subject: [PATCH] replace: Fix bug 11455 + +Don't call rep_strtoull recursively + +Signed-off-by: Volker Lendecke +Bug: https://bugzilla.samba.org/show_bug.cgi?id=11455 + +https://lists.samba.org/archive/samba-technical/2015-July/108587.html +https://lists.samba.org/archive/samba-technical/2015-July/108588.html + +--- ./lib/replace/replace.c.orig 2015-09-18 23:51:08 UTC ++++ ./lib/replace/replace.c 2015-09-18 23:51:08 UTC +@@ -518,8 +518,10 @@ + } + #else + #ifdef HAVE_BSD_STRTOLL ++#undef strtoll + long long int rep_strtoll(const char *str, char **endptr, int base) + { ++ int errno0 = errno; + long long int nb = strtoll(str, endptr, base); + /* With glibc EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { +@@ -528,7 +530,7 @@ + * able to make the convertion. + * Let's reset errno. + */ +- errno = 0; ++ errno = errno0; + } + } + return nb; +@@ -551,26 +553,24 @@ + #endif + } + #else +-#ifdef HAVE_BSD_STRTOLL +-#ifdef HAVE_STRTOUQ ++#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */ ++#undef strtoull + unsigned long long int rep_strtoull(const char *str, char **endptr, int base) + { +- unsigned long long int nb = strtouq(str, endptr, base); +- /* In linux EINVAL is only returned if base is not ok */ ++ int errno0 = errno; ++ unsigned long long int nb = strtoull(str, endptr, base); ++ /* With glibc EINVAL is only returned if base is not ok */ + if (errno == EINVAL) { + if (base == 0 || (base >1 && base <37)) { + /* Base was ok so it's because we were not + * able to make the convertion. + * Let's reset errno. + */ +- errno = 0; ++ errno = errno0; + } + } + return nb; + } +-#else +-#error "You need the strtouq function" +-#endif /* HAVE_STRTOUQ */ + #endif /* HAVE_BSD_STRTOLL */ + #endif /* HAVE_STRTOULL */ + Property changes on: head/devel/talloc/files/patch-lib_replace_replace.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property