diff options
| author | Timur I. Bakeyev <timur@FreeBSD.org> | 2020-04-29 01:55:07 +0000 |
|---|---|---|
| committer | Timur I. Bakeyev <timur@FreeBSD.org> | 2020-04-29 01:55:07 +0000 |
| commit | 29bf846e5655ead92ca1e2609095ea1439267504 (patch) | |
| tree | 3cd510459ce8c733f1e91c911dc3e46820be8c8f /net | |
| parent | Add Samba 4.11 as a possible default version. (diff) | |
Security update samba410 to the 4.10.15 and samba 411 to 4.11.8
Security: CVE-2020-10700
CVE-2020-10704
Notes
Notes:
svn path=/head/; revision=533307
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba410/Makefile | 2 | ||||
| -rw-r--r-- | net/samba410/distinfo | 6 | ||||
| -rw-r--r-- | net/samba410/files/patch-bind | 2 | ||||
| -rw-r--r-- | net/samba410/pkg-plist | 1 | ||||
| -rw-r--r-- | net/samba411/Makefile | 2 | ||||
| -rw-r--r-- | net/samba411/distinfo | 6 | ||||
| -rw-r--r-- | net/samba411/files/patch-bind | 2 | ||||
| -rw-r--r-- | net/samba411/pkg-plist | 1 |
8 files changed, 12 insertions, 10 deletions
diff --git a/net/samba410/Makefile b/net/samba410/Makefile index b93be9f95386..1628bd3396bc 100644 --- a/net/samba410/Makefile +++ b/net/samba410/Makefile @@ -24,7 +24,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-provision-use-ASCII-quotes.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.10.14 +SAMBA4_VERSION= 4.10.15 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} diff --git a/net/samba410/distinfo b/net/samba410/distinfo index d229aaf43c28..404c298bb833 100644 --- a/net/samba410/distinfo +++ b/net/samba410/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1585962923 -SHA256 (samba-4.10.14.tar.gz) = dc67f8ef9093c4fc63551cf24b05e77551dabaefcf5761945b938bbe2c036ea0 -SIZE (samba-4.10.14.tar.gz) = 18352989 +TIMESTAMP = 1588122967 +SHA256 (samba-4.10.15.tar.gz) = 0b8b62558b62fbb121015f28f40fae0f07522710b6bef77c508b51bb6914ced9 +SIZE (samba-4.10.15.tar.gz) = 18383201 diff --git a/net/samba410/files/patch-bind b/net/samba410/files/patch-bind index d41a20ba8fc5..48794d5d9b3c 100644 --- a/net/samba410/files/patch-bind +++ b/net/samba410/files/patch-bind @@ -49,7 +49,7 @@ + + bind9_dlz = ( + ' # For %s\n' -+ ' %sdatabase %s/bind9/dlz_bind%s.so";' ++ ' %sdatabase "dlopen %s/bind9/dlz_bind%s.so";' + ) % ( + bind9_version, bind9_disabled, samba.param.modules_dir(), bind9_dlz_version + ) diff --git a/net/samba410/pkg-plist b/net/samba410/pkg-plist index 21c66a0a1c6d..a6228c7a4ba3 100644 --- a/net/samba410/pkg-plist +++ b/net/samba410/pkg-plist @@ -1002,6 +1002,7 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py %%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py %%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py +%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py %%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py %%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py %%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py diff --git a/net/samba411/Makefile b/net/samba411/Makefile index f9363a12d814..aa5f81997f49 100644 --- a/net/samba411/Makefile +++ b/net/samba411/Makefile @@ -23,7 +23,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.11.7 +SAMBA4_VERSION= 4.11.8 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} diff --git a/net/samba411/distinfo b/net/samba411/distinfo index 9586f3910cd1..6492c9c43362 100644 --- a/net/samba411/distinfo +++ b/net/samba411/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586645355 -SHA256 (samba-4.11.7.tar.gz) = 79b6f9ebc357373f885153e2d5d26dc6def9f4511ee4bcbe8a8e2622acc42143 -SIZE (samba-4.11.7.tar.gz) = 18541292 +TIMESTAMP = 1588122982 +SHA256 (samba-4.11.8.tar.gz) = bb140caa37d2bbbb1f15f849aa86b1d5f787729443099139936f0ea06a5100ca +SIZE (samba-4.11.8.tar.gz) = 18571308 diff --git a/net/samba411/files/patch-bind b/net/samba411/files/patch-bind index b98f2338319b..fb025e404642 100644 --- a/net/samba411/files/patch-bind +++ b/net/samba411/files/patch-bind @@ -49,7 +49,7 @@ + + bind9_dlz = ( + ' # For %s\n' -+ ' %sdatabase %s/bind9/dlz_bind%s.so";' ++ ' %sdatabase "dlopen %s/bind9/dlz_bind%s.so";' + ) % ( + bind9_version, bind9_disabled, samba.param.modules_dir(), bind9_dlz_version + ) diff --git a/net/samba411/pkg-plist b/net/samba411/pkg-plist index b72e8e685e94..fb339e0b4ee9 100644 --- a/net/samba411/pkg-plist +++ b/net/samba411/pkg-plist @@ -965,6 +965,7 @@ man/man8/winbindd.8.gz %%PYTHON_SITELIBDIR%%/samba/tests/kcc/kcc_utils.py %%PYTHON_SITELIBDIR%%/samba/tests/kcc/ldif_import_export.py %%PYTHON_SITELIBDIR%%/samba/tests/krb5_credentials.py +%%PYTHON_SITELIBDIR%%/samba/tests/ldap_raw.py %%PYTHON_SITELIBDIR%%/samba/tests/ldap_referrals.py %%PYTHON_SITELIBDIR%%/samba/tests/libsmb.py %%PYTHON_SITELIBDIR%%/samba/tests/loadparm.py |