Date: Sun, 20 Sep 2020 02:15:25 +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: r549084 - in head/net: samba410 samba410/files samba411 samba411/files Message-ID: <202009200215.08K2FPjs084340@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Sun Sep 20 02:15:25 2020 New Revision: 549084 URL: https://svnweb.freebsd.org/changeset/ports/549084 Log: Upgrade Samba 4.10 to 4.10.18 and 4.11 to 4.11.13 to address security issue. https://www.samba.org/samba/security/CVE-2020-1472.html Security: CVE-2020-1472 Added: head/net/samba410/files/patch-third__party_wscript (contents, props changed) head/net/samba411/files/patch-third__party_wscript (contents, props changed) Deleted: head/net/samba410/files/patch-lib_util_util__paths.c head/net/samba411/files/patch-lib_util_util__paths.c Modified: head/net/samba410/Makefile head/net/samba410/distinfo head/net/samba411/Makefile head/net/samba411/distinfo head/net/samba411/files/patch-lib_util_wscript__build head/net/samba411/pkg-plist Modified: head/net/samba410/Makefile ============================================================================== --- head/net/samba410/Makefile Sun Sep 20 02:13:54 2020 (r549083) +++ head/net/samba410/Makefile Sun Sep 20 02:15:25 2020 (r549084) @@ -24,7 +24,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-provision-use-ASCII SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.10.17 +SAMBA4_VERSION= 4.10.18 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -254,8 +254,12 @@ TEST_ENV+= PYTHON="${PYTHON_CMD}" \ SHA256SUM=/sbin/sha256 \ MD5SUM=/sbin/md5 \ PYTHONDONTWRITEBYTECODE=1 + TEST_DEPENDS+= bash:shells/bash \ tshark:net/tshark +# External Python modules +TEST_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} +TEST_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} ############################################################################## CONFIGURE_ARGS+= \ --with-pam \ @@ -282,7 +286,7 @@ FRUIT_VARS= SAMBA4_MODULES+=vfs_fruit FRUIT_PLIST_FILES+= man/man8/vfs_fruit.8.gz GLUSTERFS_CONFIGURE_ENABLE= glusterfs -GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs +GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs7-libs GLUSTERFS_VARS= SAMBA4_MODULES+=vfs_glusterfs GLUSTERFS_PLIST_FILES+= man/man8/vfs_glusterfs.8.gz ############################################################################## @@ -414,33 +418,38 @@ SUB_LIST+= SAMBA4_PYTHON="" CONFIGURE_ARGS+= --nopycache MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 -.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes +. if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= pytalloc-util -.else +. else SAMBA4_BUNDLED_LIBS+= !pytalloc-util -.endif +. endif -.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes +. if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= pytevent -.else +. else SAMBA4_BUNDLED_LIBS+= !pytevent -.endif +. endif -.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes +. if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= pytdb -.else +. else SAMBA4_BUNDLED_LIBS+= !pytdb -.endif +. endif -.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes +. if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes SAMBA4_BUNDLED_LIBS+= pyldb pyldb-util -.else +. else SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util +. endif +# samba-tool requires those for *upgrade +. if ${PORT_OPTIONS:MAD_DC} +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} + +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} +. endif .endif -# External Python modules -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} -.endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} @@ -476,7 +485,6 @@ PLIST_FILES+= lib/samba4/private/libaesni-intel-samb .else CONFIGURE_ARGS+= --accel-aes=none .endif - # Only for 64-bit architectures .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe Modified: head/net/samba410/distinfo ============================================================================== --- head/net/samba410/distinfo Sun Sep 20 02:13:54 2020 (r549083) +++ head/net/samba410/distinfo Sun Sep 20 02:15:25 2020 (r549084) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593889839 -SHA256 (samba-4.10.17.tar.gz) = 03dc9758e7bfa2faf7cdeb45b4d40997e2ee16a41e71996aa666bc069e70ba3e -SIZE (samba-4.10.17.tar.gz) = 18387328 +TIMESTAMP = 1600564051 +SHA256 (samba-4.10.18.tar.gz) = 7dcfc2aaaac565b959068788e6a43fc79ce2a03e7d523f5843f7a9fddffc7c2c +SIZE (samba-4.10.18.tar.gz) = 18400638 Added: head/net/samba410/files/patch-third__party_wscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba410/files/patch-third__party_wscript Sun Sep 20 02:15:25 2020 (r549084) @@ -0,0 +1,10 @@ +--- third_party/wscript.orig 2020-09-15 22:45:54 UTC ++++ third_party/wscript +@@ -7,7 +7,6 @@ from waflib import Options, Errors + + # work out what python external libraries we need to install + external_pkgs = { +- "iso8601": "pyiso8601/iso8601", + } + + Modified: head/net/samba411/Makefile ============================================================================== --- head/net/samba411/Makefile Sun Sep 20 02:13:54 2020 (r549083) +++ head/net/samba411/Makefile Sun Sep 20 02:15:25 2020 (r549084) @@ -23,7 +23,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.pat SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.11.11 +SAMBA4_VERSION= 4.11.13 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -253,8 +253,12 @@ TEST_ENV+= PYTHON="${PYTHON_CMD}" \ SHA256SUM=/sbin/sha256 \ MD5SUM=/sbin/md5 \ PYTHONDONTWRITEBYTECODE=1 + TEST_DEPENDS+= bash:shells/bash \ tshark:net/tshark +# External Python modules +TEST_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} +TEST_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} ############################################################################## CONFIGURE_ARGS+= \ --with-pam \ @@ -280,7 +284,7 @@ FRUIT_VARS= SAMBA4_MODULES+=vfs_fruit FRUIT_PLIST_FILES+= man/man8/vfs_fruit.8.gz GLUSTERFS_CONFIGURE_ENABLE= glusterfs -GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs +GLUSTERFS_LIB_DEPENDS= libglusterfs.so:net/glusterfs7-libs GLUSTERFS_VARS= SAMBA4_MODULES+=vfs_glusterfs GLUSTERFS_PLIST_FILES+= man/man8/vfs_glusterfs.8.gz ############################################################################## @@ -412,33 +416,38 @@ SUB_LIST+= SAMBA4_PYTHON="" CONFIGURE_ARGS+= --nopycache MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 -.if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes +. if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes SAMBA4_BUNDLED_LIBS+= pytalloc-util -.else +. else SAMBA4_BUNDLED_LIBS+= !pytalloc-util -.endif +. endif -.if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes +. if defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes SAMBA4_BUNDLED_LIBS+= pytevent -.else +. else SAMBA4_BUNDLED_LIBS+= !pytevent -.endif +. endif -.if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes +. if defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes SAMBA4_BUNDLED_LIBS+= pytdb -.else +. else SAMBA4_BUNDLED_LIBS+= !pytdb -.endif +. endif -.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes +. if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes SAMBA4_BUNDLED_LIBS+= pyldb pyldb-util -.else +. else SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util +. endif +# samba-tool requires those for *upgrade +. if ${PORT_OPTIONS:MAD_DC} +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} + +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11:textproc/py-markdown@${PY_FLAVOR} +. endif .endif -# External Python modules -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} -.endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} @@ -474,7 +483,6 @@ PLIST_FILES+= lib/samba4/private/libaesni-intel-samb .else CONFIGURE_ARGS+= --accel-aes=none .endif - # Only for 64-bit architectures .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe Modified: head/net/samba411/distinfo ============================================================================== --- head/net/samba411/distinfo Sun Sep 20 02:13:54 2020 (r549083) +++ head/net/samba411/distinfo Sun Sep 20 02:15:25 2020 (r549084) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593823109 -SHA256 (samba-4.11.11.tar.gz) = 457f08a2956534269c784b95cff840250165f1e98f8db725bf64e2fca707ff60 -SIZE (samba-4.11.11.tar.gz) = 18590837 +TIMESTAMP = 1600556641 +SHA256 (samba-4.11.13.tar.gz) = e71ed29ae01c5ce7be8cee1f53e0530db86dd19b911accb08fae60224e686ba1 +SIZE (samba-4.11.13.tar.gz) = 18598813 Modified: head/net/samba411/files/patch-lib_util_wscript__build ============================================================================== --- head/net/samba411/files/patch-lib_util_wscript__build Sun Sep 20 02:13:54 2020 (r549083) +++ head/net/samba411/files/patch-lib_util_wscript__build Sun Sep 20 02:15:25 2020 (r549084) @@ -9,9 +9,27 @@ local_include=False, private_library=True) -@@ -285,4 +285,5 @@ else: - bld.SAMBA_BINARY('test_util_paths', - source='tests/test_util_paths.c', +@@ -222,7 +222,7 @@ else: + local_include=False, + public_deps='ldb', + public_headers='util_ldb.h' +- ) ++ ) + + + bld.SAMBA_SUBSYSTEM('UTIL_RUNCMD', +@@ -235,7 +235,7 @@ else: + source='util_pw.c', + local_include=False, + public_deps='talloc' +- ) ++ ) + + bld.SAMBA_LIBRARY('server_id_db', + source='server_id_db.c', +@@ -291,4 +291,5 @@ else: + bld.SAMBA_BINARY('test_util', + source='tests/test_util.c', deps='cmocka replace talloc samba-util', - local_include=False) + local_include=False, Added: head/net/samba411/files/patch-third__party_wscript ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba411/files/patch-third__party_wscript Sun Sep 20 02:15:25 2020 (r549084) @@ -0,0 +1,10 @@ +--- third_party/wscript.orig 2020-09-15 22:45:54 UTC ++++ third_party/wscript +@@ -7,7 +7,6 @@ from waflib import Options, Errors + + # work out what python external libraries we need to install + external_pkgs = { +- "iso8601": "pyiso8601/iso8601", + } + + Modified: head/net/samba411/pkg-plist ============================================================================== --- head/net/samba411/pkg-plist Sun Sep 20 02:13:54 2020 (r549083) +++ head/net/samba411/pkg-plist Sun Sep 20 02:15:25 2020 (r549084) @@ -1034,6 +1034,9 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/sites.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/timecmd.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_check_password_script.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_base.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA_userPassword.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_virtualCryptSHA.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user_wdigest.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/user.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009200215.08K2FPjs084340>