Date: Sat, 19 Sep 2015 13:38:00 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397324 - in head/net/samba42: . files Message-ID: <201509191338.t8JDc0Im011463@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Sat Sep 19 13:37:59 2015 New Revision: 397324 URL: https://svnweb.freebsd.org/changeset/ports/397324 Log: New release of Samba 4.2. Added: head/net/samba42/files/patch-buildtools__wafadmin__Logs.py (contents, props changed) head/net/samba42/files/patch-lib__crypto__wscript_configure (contents, props changed) Deleted: head/net/samba42/files/patch-lib__texpect__texpect.c Modified: head/net/samba42/Makefile head/net/samba42/distinfo Modified: head/net/samba42/Makefile ============================================================================== --- head/net/samba42/Makefile Sat Sep 19 13:36:27 2015 (r397323) +++ head/net/samba42/Makefile Sat Sep 19 13:37:59 2015 (r397324) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}42 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -17,7 +17,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.2.3 +SAMBA4_VERSION= 4.2.4 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -91,24 +91,24 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc -BUILD_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc -RUN_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc +BUILD_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc +RUN_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent BUILD_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent RUN_DEPENDS+= tevent>=0.9.25:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb -BUILD_DEPENDS+= tdb>=1.3.6:${PORTSDIR}/databases/tdb -RUN_DEPENDS+= tdb>=1.3.6:${PORTSDIR}/databases/tdb +BUILD_DEPENDS+= tdb>=1.3.7_1:${PORTSDIR}/databases/tdb +RUN_DEPENDS+= tdb>=1.3.7_1:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb RUN_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb SAMBA4_BUNDLED_LIBS+= !ntdb # ldb -BUILD_DEPENDS+= ldb>=1.1.20:${PORTSDIR}/databases/ldb -RUN_DEPENDS+= ldb>=1.1.20:${PORTSDIR}/databases/ldb +BUILD_DEPENDS+= ldb>=1.1.21_1:${PORTSDIR}/databases/ldb +RUN_DEPENDS+= ldb>=1.1.21_1:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err @@ -409,8 +409,8 @@ SHEBANG_FILES= ${PATCH_WRKSRC}/source4/ .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif -CONFIGURE_ENV+= NOCOLOR=yes -MAKE_ENV+= NOCOLOR=yes +CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' +MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ Modified: head/net/samba42/distinfo ============================================================================== --- head/net/samba42/distinfo Sat Sep 19 13:36:27 2015 (r397323) +++ head/net/samba42/distinfo Sat Sep 19 13:37:59 2015 (r397324) @@ -1,2 +1,2 @@ -SHA256 (samba-4.2.3.tar.gz) = b6dfa5ae4818d891ee2fcff04a5912f4a4fb2394b4f5e66a2a15b428da094c7c -SIZE (samba-4.2.3.tar.gz) = 20721283 +SHA256 (samba-4.2.4.tar.gz) = fb326ea486973ab684f183774e93bb943fc231ab89937512e70331b86acdf6ae +SIZE (samba-4.2.4.tar.gz) = 20735687 Added: head/net/samba42/files/patch-buildtools__wafadmin__Logs.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba42/files/patch-buildtools__wafadmin__Logs.py Sat Sep 19 13:37:59 2015 (r397324) @@ -0,0 +1,21 @@ +--- buildtools/wafadmin/Logs.py.orig 2015-08-30 19:19:48.396822145 +0000 ++++ buildtools/wafadmin/Logs.py 2015-08-30 20:14:54.119335271 +0000 +@@ -23,6 +23,9 @@ + 'cursor_off' :'\x1b[?25l', + } + ++WAF_LOG_FORMAT = os.environ.get('WAF_LOG_FORMAT', LOG_FORMAT) ++WAF_HOUR_FORMAT = os.environ.get('WAF_HOUR_FORMAT', HOUR_FORMAT) ++ + got_tty = False + term = os.environ.get('TERM', 'dumb') + if not term in ['dumb', 'emacs']: +@@ -84,7 +87,7 @@ + + class formatter(logging.Formatter): + def __init__(self): +- logging.Formatter.__init__(self, LOG_FORMAT, HOUR_FORMAT) ++ logging.Formatter.__init__(self, WAF_LOG_FORMAT, WAF_HOUR_FORMAT) + + def format(self, rec): + if rec.levelno >= logging.WARNING or rec.levelno == logging.INFO: Added: head/net/samba42/files/patch-lib__crypto__wscript_configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba42/files/patch-lib__crypto__wscript_configure Sat Sep 19 13:37:59 2015 (r397324) @@ -0,0 +1,13 @@ +--- lib/crypto/wscript_configure.orig 2015-08-30 08:56:39.517693933 +0000 ++++ lib/crypto/wscript_configure 2015-08-30 08:57:16.167655660 +0000 +@@ -1,8 +1,8 @@ + if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', + checklibc=True): +- conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', +- checklibc=True) + conf.CHECK_FUNCS_IN('MD5Init', 'md', headers='sys/md5.h', + checklibc=True) ++ conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', ++ checklibc=True) + conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h', + checklibc=True)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509191338.t8JDc0Im011463>