svn commit: r413163 - in head/net: samba42 samba42/files samba43 samba43/files
Timur I. Bakeyev
timur at FreeBSD.org
Tue Apr 12 22:44:05 UTC 2016
Author: timur
Date: Tue Apr 12 22:44:03 2016
New Revision: 413163
URL: https://svnweb.freebsd.org/changeset/ports/413163
Log:
Update Samba ports to versions 4.2.11 and 4.3.8 respectivelly, to address BadLock vulnerability(http://badlock.org).
Security: CVE-2016-2118
Added:
head/net/samba43/files/extra-patch-progress (contents, props changed)
Deleted:
head/net/samba42/files/extra-patch-security
head/net/samba43/files/extra-patch-security
Modified:
head/net/samba42/Makefile
head/net/samba42/distinfo
head/net/samba42/pkg-plist
head/net/samba43/Makefile
head/net/samba43/distinfo
head/net/samba43/pkg-plist
Modified: head/net/samba42/Makefile
==============================================================================
--- head/net/samba42/Makefile Tue Apr 12 22:40:36 2016 (r413162)
+++ head/net/samba42/Makefile Tue Apr 12 22:44:03 2016 (r413163)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}42
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 2
+PORTREVISION?= 0
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -15,11 +15,11 @@ LICENSE= GPLv3
CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.*
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
+#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.2.7
+SAMBA4_VERSION= 4.2.11
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
Modified: head/net/samba42/distinfo
==============================================================================
--- head/net/samba42/distinfo Tue Apr 12 22:40:36 2016 (r413162)
+++ head/net/samba42/distinfo Tue Apr 12 22:44:03 2016 (r413163)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.2.7.tar.gz) = f586ab3166ce4c663360f15b1de24ef083816a5471856e3ad49bc26b35f0104a
-SIZE (samba-4.2.7.tar.gz) = 20741971
+SHA256 (samba-4.2.11.tar.gz) = 75bce53c922e51352933c9846f2c4b1e251fabb80927adb426a773a321ee01f8
+SIZE (samba-4.2.11.tar.gz) = 20875348
Modified: head/net/samba42/pkg-plist
==============================================================================
--- head/net/samba42/pkg-plist Tue Apr 12 22:40:36 2016 (r413162)
+++ head/net/samba42/pkg-plist Tue Apr 12 22:44:03 2016 (r413163)
@@ -1,4 +1,3 @@
-bin/async_connect_send_test
bin/cifsdd
bin/dbwrap_tool
bin/eventlogadm
@@ -672,6 +671,7 @@ lib/shared-modules/vfs/zfsacl.so
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/bare.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py
+%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
@@ -683,7 +683,7 @@ lib/shared-modules/vfs/zfsacl.so
%%PYTHON_SITELIBDIR%%/samba/tests/docs.py
%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py
%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py
-%%PYTHON_SITELIBDIR%%/samba/tests/getopt.py
+%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py
%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py
%%PYTHON_SITELIBDIR%%/samba/tests/libsmb_samba_internal.py
%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py
Modified: head/net/samba43/Makefile
==============================================================================
--- head/net/samba43/Makefile Tue Apr 12 22:40:36 2016 (r413162)
+++ head/net/samba43/Makefile Tue Apr 12 22:44:03 2016 (r413163)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}43
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 2
+PORTREVISION?= 0
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -15,11 +15,11 @@ LICENSE= GPLv3
CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.*
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
+EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.3.3
+SAMBA4_VERSION= 4.3.8
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
@@ -430,7 +430,7 @@ SAMBA_MAN7+= samba.7 winbind_krb5_locat
SAMBA_MAN8+= eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \
idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \
- samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \
+ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 smbspool_krb5_wrapper.8 \
smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \
vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \
vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \
Modified: head/net/samba43/distinfo
==============================================================================
--- head/net/samba43/distinfo Tue Apr 12 22:40:36 2016 (r413162)
+++ head/net/samba43/distinfo Tue Apr 12 22:44:03 2016 (r413163)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.3.3.tar.gz) = e62d21313acbb29e24b0b80aaf2b63fdd1ccce4cfb741f333deca95a1a3a70df
-SIZE (samba-4.3.3.tar.gz) = 20427281
+SHA256 (samba-4.3.8.tar.gz) = 379dc66c3a0a483bf5bed37be6e5d182934db7c4102b21929a6c4602b32b2b10
+SIZE (samba-4.3.8.tar.gz) = 20568773
Added: head/net/samba43/files/extra-patch-progress
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/samba43/files/extra-patch-progress Tue Apr 12 22:44:03 2016 (r413163)
@@ -0,0 +1,31 @@
+diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
+index c65fb08..13713fc 100644
+--- a/source3/passdb/pdb_ldap.c
++++ b/source3/passdb/pdb_ldap.c
+@@ -1005,7 +1005,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
+ entry,
+ "gecos",
+ ctx);
+- if (unix_pw.pw_gecos) {
++ if (unix_pw.pw_gecos==NULL) {
+ unix_pw.pw_gecos = fullname;
+ }
+ unix_pw.pw_dir = smbldap_talloc_single_attribute(
+@@ -1013,7 +1013,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
+ entry,
+ "homeDirectory",
+ ctx);
+- if (unix_pw.pw_dir) {
++ if (unix_pw.pw_dir==NULL) {
+ unix_pw.pw_dir = discard_const_p(char, "");
+ }
+ unix_pw.pw_shell = smbldap_talloc_single_attribute(
+@@ -1021,7 +1021,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
+ entry,
+ "loginShell",
+ ctx);
+- if (unix_pw.pw_shell) {
++ if (unix_pw.pw_shell==NULL) {
+ unix_pw.pw_shell = discard_const_p(char, "");
+ }
+
Modified: head/net/samba43/pkg-plist
==============================================================================
--- head/net/samba43/pkg-plist Tue Apr 12 22:40:36 2016 (r413162)
+++ head/net/samba43/pkg-plist Tue Apr 12 22:44:03 2016 (r413163)
@@ -1,4 +1,3 @@
-bin/async_connect_send_test
bin/cifsdd
bin/dbwrap_tool
bin/eventlogadm
@@ -625,6 +624,7 @@ lib/shared-modules/vfs/zfsacl.so
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/dnsserver.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/integer.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/misc.py
+%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/raw_protocol.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/registry.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpc_talloc.py
%%PYTHON_SITELIBDIR%%/samba/tests/dcerpc/rpcecho.py
@@ -636,7 +636,7 @@ lib/shared-modules/vfs/zfsacl.so
%%PYTHON_SITELIBDIR%%/samba/tests/docs.py
%%PYTHON_SITELIBDIR%%/samba/tests/dsdb.py
%%PYTHON_SITELIBDIR%%/samba/tests/gensec.py
-%%PYTHON_SITELIBDIR%%/samba/tests/getopt.py
+%%PYTHON_SITELIBDIR%%/samba/tests/get_opt.py
%%PYTHON_SITELIBDIR%%/samba/tests/hostconfig.py
%%PYTHON_SITELIBDIR%%/samba/tests/kcc/__init__.py
%%PYTHON_SITELIBDIR%%/samba/tests/kcc/graph.py
@@ -839,8 +839,9 @@ man/man8/samba-tool.8.gz
man/man8/samba.8.gz
man/man8/smbd.8.gz
man/man8/smbpasswd.8.gz
-man/man8/smbspool.8.gz
man/man8/smbta-util.8.gz
+man/man8/smbspool_krb5_wrapper.8.gz
+man/man8/smbspool.8.gz
man/man8/vfs_acl_tdb.8.gz
man/man8/vfs_acl_xattr.8.gz
man/man8/vfs_aio_fork.8.gz
More information about the svn-ports-all
mailing list