git: 890f94ea16e9 - main - net/samba416: Update port to address CVE-2022-3437
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Oct 2022 23:22:07 UTC
The branch main has been updated by timur:
URL: https://cgit.FreeBSD.org/ports/commit/?id=890f94ea16e9af2a5f2c74e14d2ffc0873120468
commit 890f94ea16e9af2a5f2c74e14d2ffc0873120468
Author: Timur I. Bakeyev <timur@FreeBSD.org>
AuthorDate: 2022-10-25 23:11:43 +0000
Commit: Timur I. Bakeyev <timur@FreeBSD.org>
CommitDate: 2022-10-25 23:21:17 +0000
net/samba416: Update port to address CVE-2022-3437
PR: 267141
Security: CVE-2022-3437
---
net/samba416/Makefile | 32 ++++++++++++++++----------------
net/samba416/distinfo | 6 +++---
net/samba416/files/pkg-message.in | 5 +++--
net/samba416/pkg-plist | 22 ++++++++++++++++++----
net/samba416/pkg-plist.ad_dc | 13 -------------
net/samba416/pkg-plist.python | 1 -
6 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/net/samba416/Makefile b/net/samba416/Makefile
index 0ba33c34f50d..a703bb964783 100644
--- a/net/samba416/Makefile
+++ b/net/samba416/Makefile
@@ -1,13 +1,13 @@
PORTNAME= ${SAMBA4_BASENAME}416
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
MAINTAINER= timur@FreeBSD.org
COMMENT= Free SMB/CIFS and AD/DC server and client for Unix
-WWW= https://www.samba.org/
+WWW= https://gitlab.com/samba-freebsd/
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
@@ -16,7 +16,7 @@ USES= cpe
CONFLICTS_INSTALL?= samba4*
-EXTRA_PATCHES+= \
+EXTRA_PATCHES= \
${PATCHDIR}/0001-Compact-and-simplify-modules-build-and-config-genera.patch:-p1 \
${PATCHDIR}/0002-Adjust-abi_gen.sh-script-to-run-under-FreeBSD-with-i.patch:-p1 \
${PATCHDIR}/0003-Mask-CLang-prototype-warnings-in-kadm5-admin.h.patch:-p1 \
@@ -50,7 +50,7 @@ EXTRA_PATCHES+= \
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.16.5
+SAMBA4_VERSION= 4.16.6
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
@@ -73,7 +73,7 @@ SAMBA4_CONFIG= smb4.conf
SAMBA4_MODULES_CLASS= auth bind9 gensec gpext idmap ldb nss_info \
pdb perfcount process_model service vfs
-CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \
+CONFIGURE_ARGS= --mandir="${MANPREFIX}/man" \
--sysconfdir="${SAMBA4_CONFDIR}" \
--includedir="${SAMBA4_INCLUDEDIR}" \
--datadir="${DATADIR}" \
@@ -93,10 +93,10 @@ CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \
--with-privatedir="${SAMBA4_PRIVATEDIR}" \
--with-logfilebase="${SAMBA4_LOGDIR}"
# XXX: Flags
-CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread"
-MAKE_ENV+= PYTHONHASHSEED=1
+CONFIGURE_ENV= PTHREAD_LDFLAGS="-lpthread"
+MAKE_ENV= PYTHONHASHSEED=1
-USES+= compiler:c++11-lang iconv localbase:ldflags \
+USES= compiler:c++11-lang iconv localbase:ldflags \
perl5 pkgconfig shebangfix waf gettext-runtime
USE_PERL5= build
USE_LDCONFIG= ${SAMBA4_LIBDIR}
@@ -105,8 +105,8 @@ CONFIGURE_LOG= bin/config.log
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,}
-PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
-SUB_LIST+= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
+PLIST_SUB= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
+SUB_LIST= PKGCONFIGDIR=${PKGCONFIGDIR_REL}
##############################################################################
OPTIONS_SUB= yes
@@ -158,7 +158,7 @@ ZEROCONF_NONE_DESC= Zeroconf support is absent
# the system)
# Iconv(picked up unconditionaly)
-LIB_DEPENDS+= libiconv.so:converters/libiconv
+LIB_DEPENDS= libiconv.so:converters/libiconv
# unwind
LIB_DEPENDS+= libunwind.so:devel/libunwind
# Readline(sponsored by Python)
@@ -184,7 +184,7 @@ RUN_DEPENDS+= libtasn1>=3.8:security/libtasn1
BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
# Libarchive
-SAMBA4_BUNDLED_LIBS+= !libarchive
+SAMBA4_BUNDLED_LIBS= !libarchive
BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive
@@ -272,17 +272,17 @@ SAMBA4_BUNDLED_LIBS+= replace
SAMBA4_BUNDLED_LIBS+= com_err
# Set the test environment variables
TEST_USES= python
-TEST_ENV+= PYTHON="${PYTHON_CMD}" \
+TEST_ENV= PYTHON="${PYTHON_CMD}" \
SHA1SUM=/sbin/sha1 \
SHA256SUM=/sbin/sha256 \
MD5SUM=/sbin/md5 \
PYTHONDONTWRITEBYTECODE=1
-TEST_DEPENDS+= bash:shells/bash \
+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}
+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 \
diff --git a/net/samba416/distinfo b/net/samba416/distinfo
index 3d86f57054fd..71165350eb14 100644
--- a/net/samba416/distinfo
+++ b/net/samba416/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663020631
-SHA256 (samba-4.16.5.tar.gz) = c73c092017d2d1dd270709c8597321d0dd667c882a1b2470cf60f8ee56d3fd44
-SIZE (samba-4.16.5.tar.gz) = 30613439
+TIMESTAMP = 1666709216
+SHA256 (samba-4.16.6.tar.gz) = 5e4e704243ea247843b97fed624f21155432e0a8fad41793e40b5ebb576bde55
+SIZE (samba-4.16.6.tar.gz) = 30619049
diff --git a/net/samba416/files/pkg-message.in b/net/samba416/files/pkg-message.in
index e405f7d801b7..02818d517e50 100644
--- a/net/samba416/files/pkg-message.in
+++ b/net/samba416/files/pkg-message.in
@@ -13,7 +13,7 @@ How to start: http://wiki.samba.org/index.php/Samba4/HOWTO
%%AD_DC%%
%%AD_DC%%For the working DNS updates you will need to either build dns/bind9*
%%AD_DC%%with the enabled GSSAPI(GSSAPI_MIT5 is recommended) or install
-%%AD_DC%%bind/samba-nsupdate package, which is prebuild with such a support.
+%%AD_DC%%dns/samba-nsupdate package, which is preconfigured with such a support.
%%AD_DC%%
%%AD_DC%%You will need to specify location of the 'nsupdate' command in the
%%AD_DC%%%%SAMBA4_CONFIG%% file:
@@ -22,7 +22,8 @@ How to start: http://wiki.samba.org/index.php/Samba4/HOWTO
%%AD_DC%%
%%AD_DC%%For additional documentation check: https://wiki.samba.org/index.php/User_Documentation
-Port related bug reports can go to the https://gitlab.com/samba-freebsd/ports/-/issues
+Port related bug reports can go to the https://gitlab.com/samba-freebsd/ports/-/issues or
+to the FreeBSD Bugzilla https://bugs.freebsd.org/
All Samba related bug reports should go to the: https://bugzilla.samba.org/
EOM
diff --git a/net/samba416/pkg-plist b/net/samba416/pkg-plist
index 6f2178c7734d..b4c8d9238d33 100644
--- a/net/samba416/pkg-plist
+++ b/net/samba416/pkg-plist
@@ -19,6 +19,7 @@ bin/regshell
bin/regtree
bin/rpcclient
bin/samba-regedit
+%%ADS%%bin/samba-tool
bin/sharesec
bin/smbcacls
bin/smbclient
@@ -181,6 +182,7 @@ libexec/samba/samba-dcerpcd
%%LDAP%%%%SAMBA4_LIBDIR%%/private/libsmbldaphelper-samba4.so
%%SAMBA4_LIBDIR%%/private/libaddns-samba4.so
%%SAMBA4_LIBDIR%%/private/libads-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libasn1-samba4.so
%%SAMBA4_LIBDIR%%/private/libasn1util-samba4.so
%%SAMBA4_LIBDIR%%/private/libauth-samba4.so
%%SAMBA4_LIBDIR%%/private/libauth-unix-token-samba4.so
@@ -198,6 +200,7 @@ libexec/samba/samba-dcerpcd
%%SAMBA4_LIBDIR%%/private/libcluster-samba4.so
%%SAMBA4_LIBDIR%%/private/libcmdline-contexts-samba4.so
%%SAMBA4_LIBDIR%%/private/libcmdline-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libcom-err-samba4.so
%%SAMBA4_LIBDIR%%/private/libcommon-auth-samba4.so
%%SAMBA4_LIBDIR%%/private/libdbwrap-samba4.so
%%SAMBA4_LIBDIR%%/private/libdcerpc-pkt-auth-samba4.so
@@ -212,10 +215,19 @@ libexec/samba/samba-dcerpcd
%%SAMBA4_LIBDIR%%/private/libgpext-samba4.so
%%SAMBA4_LIBDIR%%/private/libgpo-samba4.so
%%SAMBA4_LIBDIR%%/private/libgse-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgss-preauth-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgssapi-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhcrypto-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhdb-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimbase-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimntlm-samba4.so
%%SAMBA4_LIBDIR%%/private/libhttp-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhx509-samba4.so
%%SAMBA4_LIBDIR%%/private/libidmap-samba4.so
%%SAMBA4_LIBDIR%%/private/libinterfaces-samba4.so
%%SAMBA4_LIBDIR%%/private/libiov-buf-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkdc-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkrb5-samba4.so
%%SAMBA4_LIBDIR%%/private/libkrb5samba-samba4.so
%%SAMBA4_LIBDIR%%/private/libldbsamba-samba4.so
%%SAMBA4_LIBDIR%%/private/liblibcli-lsa3-samba4.so
@@ -241,6 +253,7 @@ libexec/samba/samba-dcerpcd
%%SAMBA4_LIBDIR%%/private/libREG-FULL-samba4.so
%%SAMBA4_LIBDIR%%/private/libregistry-samba4.so
%%SAMBA4_LIBDIR%%/private/libreplace-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libroken-samba4.so
%%SAMBA4_LIBDIR%%/private/libRPC-SERVER-LOOP-samba4.so
%%SAMBA4_LIBDIR%%/private/libRPC-WORKER-samba4.so
%%SAMBA4_LIBDIR%%/private/libsamba-cluster-support-samba4.so
@@ -270,6 +283,7 @@ libexec/samba/samba-dcerpcd
%%SAMBA4_LIBDIR%%/private/libutil-reg-samba4.so
%%SAMBA4_LIBDIR%%/private/libutil-setid-samba4.so
%%SAMBA4_LIBDIR%%/private/libutil-tdb-samba4.so
+%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libwind-samba4.so
%%SAMBA4_LIBDIR%%/private/libxattr-tdb-samba4.so
@dir %%SAMBA4_LIBDIR%%/private
@dir %%SAMBA4_LIBDIR%%
@@ -436,8 +450,8 @@ man/man8/winbindd.8.gz
%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbrestore.8.gz
%%SAMBA4_BUNDLED_TDB%%man/man8/samba-tdbtool.8.gz
%%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so
-%%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpytalloc-util%%PYTHON_EXT_SUFFIX%%.so.2
-%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_LIBDIR%%/private/libtalloc.so.2
+%%SAMBA4_BUNDLED_TALLOC%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpytalloc-util%%PYTHON_EXT_SUFFIX%%-samba4.so
+%%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_LIBDIR%%/private/libtalloc-samba4.so
%%SAMBA4_BUNDLED_TALLOC%%man/man3/talloc.3.gz
%%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
%%SAMBA4_BUNDLED_TDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so
@@ -445,7 +459,7 @@ man/man8/winbindd.8.gz
%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbdump
%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbrestore
%%SAMBA4_BUNDLED_TDB%%bin/samba-tdbtool
-%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_LIBDIR%%/private/libtdb.so.1
+%%SAMBA4_BUNDLED_TDB%%%%SAMBA4_LIBDIR%%/private/libtdb-samba4.so
%%SAMBA4_BUNDLED_TEVENT%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so
%%SAMBA4_BUNDLED_TEVENT%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/tevent.py
-%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_LIBDIR%%/private/libtevent.so.0
+%%SAMBA4_BUNDLED_TEVENT%%%%SAMBA4_LIBDIR%%/private/libtevent-samba4.so
diff --git a/net/samba416/pkg-plist.ad_dc b/net/samba416/pkg-plist.ad_dc
index 85a2449d76ff..d7e9f6748058 100644
--- a/net/samba416/pkg-plist.ad_dc
+++ b/net/samba416/pkg-plist.ad_dc
@@ -5,19 +5,6 @@ sbin/samba_kcc
sbin/samba_spnupdate
sbin/samba_upgradedns
include/samba4/dcerpc_server.h
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libasn1-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libcom-err-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgss-preauth-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgssapi-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhcrypto-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhdb-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimbase-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimntlm-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhx509-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkdc-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkrb5-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libroken-samba4.so
-%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libwind-samba4.so
%%SAMBA4_LIBDIR%%/libdcerpc-server.so
%%SAMBA4_LIBDIR%%/libdcerpc-server.so.0
%%SAMBA4_LIBDIR%%/private/libdlz-bind9-for-torture-samba4.so
diff --git a/net/samba416/pkg-plist.python b/net/samba416/pkg-plist.python
index fb1e5d6343f7..9b475e5d2dc0 100644
--- a/net/samba416/pkg-plist.python
+++ b/net/samba416/pkg-plist.python
@@ -1,4 +1,3 @@
-bin/samba-tool
bin/smbtorture
sbin/samba-gpupdate
man/man1/smbtorture.1.gz