From 8ed1831a5be9fc0b9dc015a50952c8191fdef34e Mon Sep 17 00:00:00 2001 From: "Timur I. Bakeyev" Date: Mon, 30 Nov 2015 01:01:35 +0000 Subject: [PATCH] Update Samba4* ports to the latest supplimentary libs and versions. --- UPDATING | 11 +++++++++++ net/samba4/Makefile | 20 ++++++++++---------- net/samba41/Makefile | 32 ++++++++++++++++---------------- net/samba41/distinfo | 4 ++-- net/samba42/Makefile | 18 +++++++++--------- net/samba42/distinfo | 4 ++-- 6 files changed, 50 insertions(+), 39 deletions(-) diff --git a/UPDATING b/UPDATING index 128eb7b069fe..316cc9e0e280 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20151130: + AFFECTS: users of net/samba4, net/samba41, net/samba42 + AUTHOR: timur@FreeBSD.org + + Recent versions of devel/talloc, devel/tevent, database/tdb, database/ldb + contained infinit recursive call to the strtol* set of replacement functions, + which lead to coredumps. Unofficial patch was added menwhile, but now official + version of the fixed libs were released. If your version of net/samba4 works + fine you don't need to recompile it. Other ports were also upgraded and some + bugs were fixed in upstream. + 20151122: AFFECTS: users of audio/audacity AUTHOR: riggs@FreeBSD.org diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 4b912a219da8..52dc28b66ec3 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}4 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -13,7 +13,7 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba41-4.1.* +CONFLICTS?= *samba3[2-6]-3.* samba4[1-3]-4.[1-3].* SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 @@ -89,20 +89,20 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnsp 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.5:${PORTSDIR}/devel/talloc +RUN_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent -BUILD_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent -RUN_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/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.2.11:${PORTSDIR}/databases/tdb -RUN_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb +BUILD_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb +RUN_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ldb -BUILD_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb -RUN_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb +BUILD_DEPENDS+= ldb>=1.1.23:${PORTSDIR}/databases/ldb +RUN_DEPENDS+= ldb>=1.1.23:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err diff --git a/net/samba41/Makefile b/net/samba41/Makefile index 80a433271905..de69e25fa4ae 100644 --- a/net/samba41/Makefile +++ b/net/samba41/Makefile @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}41 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.1.18 +SAMBA4_VERSION= 4.1.21 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -88,25 +88,25 @@ BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython 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 -SAMBA4_BUNDLED_LIBS+= !talloc -# tevent -BUILD_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent -RUN_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent -SAMBA4_BUNDLED_LIBS+= !tevent -# tdb -BUILD_DEPENDS+= tdb>=1.2.12:${PORTSDIR}/databases/tdb -RUN_DEPENDS+= tdb>=1.2.12:${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 +# talloc +BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc +RUN_DEPENDS+= talloc>=2.1.5:${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.8:${PORTSDIR}/databases/tdb +RUN_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb +SAMBA4_BUNDLED_LIBS+= !tdb # ldb -BUILD_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb -RUN_DEPENDS+= ldb>=1.1.17:${PORTSDIR}/databases/ldb +BUILD_DEPENDS+= ldb>=1.1.23:${PORTSDIR}/databases/ldb +RUN_DEPENDS+= ldb>=1.1.23:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err diff --git a/net/samba41/distinfo b/net/samba41/distinfo index 3bb5f517ea9d..26d4d9242ad3 100644 --- a/net/samba41/distinfo +++ b/net/samba41/distinfo @@ -1,2 +1,2 @@ -SHA256 (samba-4.1.18.tar.gz) = 5bd302355c82195271de41d4f1e0c6353bde652a23886940b310b7734256f156 -SIZE (samba-4.1.18.tar.gz) = 19550894 +SHA256 (samba-4.1.21.tar.gz) = 00f1c26cd310811afb2fa1a3fb72a23bd2e5c2f6466e6efdcb530305d7c3ce2e +SIZE (samba-4.1.21.tar.gz) = 19561830 diff --git a/net/samba42/Makefile b/net/samba42/Makefile index 104fe126016c..b54452b30d84 100644 --- a/net/samba42/Makefile +++ b/net/samba42/Makefile @@ -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} @@ -13,11 +13,11 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.2.4 +SAMBA4_VERSION= 4.2.5 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}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnsp RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython PLIST_SUB+= PY_DNSPYTHON="@comment " # talloc -BUILD_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc -RUN_DEPENDS+= talloc>=2.1.3_1:${PORTSDIR}/devel/talloc +BUILD_DEPENDS+= talloc>=2.1.5:${PORTSDIR}/devel/talloc +RUN_DEPENDS+= talloc>=2.1.5:${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.7_1:${PORTSDIR}/databases/tdb -RUN_DEPENDS+= tdb>=1.3.7_1:${PORTSDIR}/databases/tdb +BUILD_DEPENDS+= tdb>=1.3.8:${PORTSDIR}/databases/tdb +RUN_DEPENDS+= tdb>=1.3.8:${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.21_1:${PORTSDIR}/databases/ldb -RUN_DEPENDS+= ldb>=1.1.21_1:${PORTSDIR}/databases/ldb +BUILD_DEPENDS+= ldb>=1.1.23:${PORTSDIR}/databases/ldb +RUN_DEPENDS+= ldb>=1.1.23:${PORTSDIR}/databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err diff --git a/net/samba42/distinfo b/net/samba42/distinfo index 45a16488977d..54c74be60598 100644 --- a/net/samba42/distinfo +++ b/net/samba42/distinfo @@ -1,2 +1,2 @@ -SHA256 (samba-4.2.4.tar.gz) = fb326ea486973ab684f183774e93bb943fc231ab89937512e70331b86acdf6ae -SIZE (samba-4.2.4.tar.gz) = 20735687 +SHA256 (samba-4.2.5.tar.gz) = 8191c4c0730daf7f9e9a3ea1cc6e680798d76bf855269807778adcccc8d706cf +SIZE (samba-4.2.5.tar.gz) = 20734836