Date: Sat, 7 May 2016 00:28: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: r414751 - in head/net: samba42 samba42/files samba43 samba43/files Message-ID: <201605070028.u470SP2i072553@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Sat May 7 00:28:25 2016 New Revision: 414751 URL: https://svnweb.freebsd.org/changeset/ports/414751 Log: Update samba42 and samba43 to the latest versions. A lot of fixes are made to fix the fixes in the previous security fixes :) * BUG 11841: Fix NT_STATUS_ACCESS_DENIED when accessing Windows public share. * BUG 11847: Only validate MIC if "map to guest" is not being used. * BUG 11849: auth/ntlmssp: Add ntlmssp_{client,server}:force_old_spnego option for testing. * BUG 11850: NetAPP SMB servers don't negotiate NTLMSSP_SIGN. * BUG 11858: Allow anonymous smb connections. * BUG 11870: Fix ads_sasl_spnego_gensec_bind(KRB5). * BUG 11872: Fix 'wbinfo -u' and 'net ads search'. Added: head/net/samba42/files/extra-patch-progress (contents, props changed) head/net/samba42/files/patch-source3_client_smbspool_krb5_wrapper.c (contents, props changed) Deleted: head/net/samba43/files/extra-patch-talloc Modified: head/net/samba42/Makefile head/net/samba42/distinfo head/net/samba42/files/patch-source3__wscript_build head/net/samba42/pkg-plist head/net/samba43/Makefile head/net/samba43/distinfo head/net/samba43/files/patch-source3__wscript_build Modified: head/net/samba42/Makefile ============================================================================== --- head/net/samba42/Makefile Sat May 7 00:17:37 2016 (r414750) +++ head/net/samba42/Makefile Sat May 7 00:28:25 2016 (r414751) @@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC serve LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* samba44-4.4.* -#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.2.11 +SAMBA4_VERSION= 4.2.12 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -75,10 +75,7 @@ PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR LIB_DEPENDS+= libpopt.so:devel/popt # inotify LIB_DEPENDS+= libinotify.so:devel/libinotify -# SASL -LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 # GNUTLS -LIB_DEPENDS+= libgcrypt.so:security/libgcrypt LIB_DEPENDS+= libgnutls.so:security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl @@ -97,8 +94,8 @@ BUILD_DEPENDS+= talloc>=2.1.5:devel/tal RUN_DEPENDS+= talloc>=2.1.5:devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent -BUILD_DEPENDS+= tevent>=0.9.25:devel/tevent -RUN_DEPENDS+= tevent>=0.9.25:devel/tevent +BUILD_DEPENDS+= tevent>=0.9.28:devel/tevent +RUN_DEPENDS+= tevent>=0.9.28:devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.3.8:databases/tdb @@ -281,8 +278,10 @@ CONFIGURE_ARGS+= --disable-dnssd .if ${PORT_OPTIONS:MCUPS} LIB_DEPENDS+= libcups.so:print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint +PLIST_SUB+= CUPS="" .else CONFIGURE_ARGS+= --disable-cups --disable-iprint +PLIST_SUB+= CUPS="@comment " .endif .if ${PORT_OPTIONS:MDNSUPDATE} @@ -433,7 +432,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 \ + idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 smbspool_krb5_wrapper.8 \ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.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 \ Modified: head/net/samba42/distinfo ============================================================================== --- head/net/samba42/distinfo Sat May 7 00:17:37 2016 (r414750) +++ head/net/samba42/distinfo Sat May 7 00:28:25 2016 (r414751) @@ -1,2 +1,2 @@ -SHA256 (samba-4.2.11.tar.gz) = 75bce53c922e51352933c9846f2c4b1e251fabb80927adb426a773a321ee01f8 -SIZE (samba-4.2.11.tar.gz) = 20875348 +SHA256 (samba-4.2.12.tar.gz) = b334a86a92a1c2759c0b3dce20965e7fe820f0abafee38e6fd82eb9c5cd80514 +SIZE (samba-4.2.12.tar.gz) = 20878216 Added: head/net/samba42/files/extra-patch-progress ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba42/files/extra-patch-progress Sat May 7 00:28:25 2016 (r414751) @@ -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/samba42/files/patch-source3__wscript_build ============================================================================== --- head/net/samba42/files/patch-source3__wscript_build Sat May 7 00:17:37 2016 (r414750) +++ head/net/samba42/files/patch-source3__wscript_build Sat May 7 00:28:25 2016 (r414751) @@ -1,6 +1,6 @@ ---- source3/wscript_build.orig 2015-02-24 18:59:51.000000000 +0000 -+++ source3/wscript_build 2015-03-25 01:00:04.143487619 +0000 -@@ -601,6 +601,7 @@ +--- source3/wscript_build.orig 2016-05-02 07:48:32.000000000 +0000 ++++ source3/wscript_build 2016-05-05 08:40:07.413511000 +0000 +@@ -619,6 +619,7 @@ smbd_conn param_service AVAHI @@ -8,7 +8,7 @@ PRINTBASE PROFILE LOCKING -@@ -1043,6 +1044,7 @@ +@@ -1072,6 +1073,7 @@ msrpc3 RPC_NDR_SRVSVC cli_smb_common @@ -16,12 +16,3 @@ ''' + bld.env['archive_lib']) bld.SAMBA3_BINARY('net', -@@ -1457,7 +1459,7 @@ - - bld.SAMBA3_PYTHON('pylibsmb', - source='libsmb/pylibsmb.c', -- deps='smbclient samba-credentials', -+ deps='smbclient samba-credentials libsmb errors', - realname='samba/samba3/libsmb_samba_internal.so' - ) - Added: head/net/samba42/files/patch-source3_client_smbspool_krb5_wrapper.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba42/files/patch-source3_client_smbspool_krb5_wrapper.c Sat May 7 00:28:25 2016 (r414751) @@ -0,0 +1,11 @@ +--- source3/client/smbspool_krb5_wrapper.c.orig 2016-04-21 00:26:35.874203000 +0000 ++++ source3/client/smbspool_krb5_wrapper.c 2016-04-21 00:47:23.148722000 +0000 +@@ -195,7 +195,7 @@ + * Make sure we do not have LD_PRELOAD or other security relevant + * environment variables set. + */ +- clearenv(); ++ environ = NULL; + + CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc); + setenv("KRB5CCNAME", gen_cc, 1); Modified: head/net/samba42/pkg-plist ============================================================================== --- head/net/samba42/pkg-plist Sat May 7 00:17:37 2016 (r414750) +++ head/net/samba42/pkg-plist Sat May 7 00:28:25 2016 (r414751) @@ -25,6 +25,7 @@ bin/smbcontrol bin/smbcquotas bin/smbget bin/smbpasswd +%%CUPS%%bin/smbspool_krb5_wrapper bin/smbspool bin/smbstatus bin/smbta-util @@ -868,6 +869,7 @@ man/man8/samba-tool.8.gz man/man8/samba.8.gz man/man8/smbd.8.gz man/man8/smbpasswd.8.gz +man/man8/smbspool_krb5_wrapper.8.gz man/man8/smbspool.8.gz man/man8/smbta-util.8.gz man/man8/vfs_acl_tdb.8.gz Modified: head/net/samba43/Makefile ============================================================================== --- head/net/samba43/Makefile Sat May 7 00:17:37 2016 (r414750) +++ head/net/samba43/Makefile Sat May 7 00:28:25 2016 (r414751) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}43 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +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.* samba44-4.4.* -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 ${PATCHDIR}/extra-patch-talloc:-p1 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.3.8 +SAMBA4_VERSION= 4.3.9 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -75,10 +75,7 @@ PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR LIB_DEPENDS+= libpopt.so:devel/popt # inotify LIB_DEPENDS+= libinotify.so:devel/libinotify -# SASL -LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 # GNUTLS -LIB_DEPENDS+= libgcrypt.so:security/libgcrypt LIB_DEPENDS+= libgnutls.so:security/gnutls # NFS4 ACL glue LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl @@ -97,8 +94,8 @@ BUILD_DEPENDS+= talloc>=2.1.5:devel/tal RUN_DEPENDS+= talloc>=2.1.5:devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent -BUILD_DEPENDS+= tevent>=0.9.25:devel/tevent -RUN_DEPENDS+= tevent>=0.9.25:devel/tevent +BUILD_DEPENDS+= tevent>=0.9.28:devel/tevent +RUN_DEPENDS+= tevent>=0.9.28:devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.3.8:databases/tdb Modified: head/net/samba43/distinfo ============================================================================== --- head/net/samba43/distinfo Sat May 7 00:17:37 2016 (r414750) +++ head/net/samba43/distinfo Sat May 7 00:28:25 2016 (r414751) @@ -1,2 +1,2 @@ -SHA256 (samba-4.3.8.tar.gz) = 379dc66c3a0a483bf5bed37be6e5d182934db7c4102b21929a6c4602b32b2b10 -SIZE (samba-4.3.8.tar.gz) = 20568773 +SHA256 (samba-4.3.9.tar.gz) = 1f22c61a7f24c5357a9ef4d10833a2cd161f40f3db03bcbe586d7cd3a56139f3 +SIZE (samba-4.3.9.tar.gz) = 20570849 Modified: head/net/samba43/files/patch-source3__wscript_build ============================================================================== --- head/net/samba43/files/patch-source3__wscript_build Sat May 7 00:17:37 2016 (r414750) +++ head/net/samba43/files/patch-source3__wscript_build Sat May 7 00:28:25 2016 (r414751) @@ -1,6 +1,6 @@ ---- source3/wscript_build.orig 2015-02-24 18:59:51.000000000 +0000 -+++ source3/wscript_build 2015-03-25 01:00:04.143487619 +0000 -@@ -601,6 +601,7 @@ +--- source3/wscript_build.orig 2016-05-02 07:48:32.000000000 +0000 ++++ source3/wscript_build 2016-05-05 08:40:07.413511000 +0000 +@@ -619,6 +619,7 @@ smbd_conn param_service AVAHI @@ -8,7 +8,7 @@ PRINTBASE PROFILE LOCKING -@@ -1043,6 +1044,7 @@ +@@ -1072,6 +1073,7 @@ msrpc3 RPC_NDR_SRVSVC cli_smb_common @@ -16,12 +16,3 @@ ''' + bld.env['archive_lib']) bld.SAMBA3_BINARY('net', -@@ -1457,7 +1459,7 @@ - - bld.SAMBA3_PYTHON('pylibsmb', - source='libsmb/pylibsmb.c', -- deps='smbclient samba-credentials', -+ deps='smbclient samba-credentials libsmb errors', - realname='samba/samba3/libsmb_samba_internal.so' - ) -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605070028.u470SP2i072553>