mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-17 08:01:36 +00:00
Code Issues Releases Activity

Update net/samba46 to 4.6.12 version.

Browse Source
This commit is contained in:
Timur I. Bakeyev 2017-12-24 04:26:17 +00:00
parent cf2955982d
commit 565d8c392e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=457124
6 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/samba46/Makefile
View File

@ -21,7 +21,7 @@ CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-57-9]-4.* p5-Parse-Pidl-4.*
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
SAMBA4_VERSION= 4.6.11
SAMBA4_VERSION= 4.6.12
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
@ -327,7 +327,7 @@ SAMBA_MAN8+= cifsdd.8 eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \
vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \
vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \
vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \
vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8
vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8 vfs_zfsacl.8
PORTDOCS= README.FreeBSD

6
net/samba46/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1511283638
SHA256 (samba-4.6.11.tar.gz) = 051b7ab0fa088d77dc0df039ff5d6b8fd998372f0c29ecb455b149457c20ed1d
SIZE (samba-4.6.11.tar.gz) = 21157318
TIMESTAMP = 1514070924
SHA256 (samba-4.6.12.tar.gz) = 18f1c89bb6687b94080f5ec8aa73c14acdad1106425403945a32928a4b1e54a1
SIZE (samba-4.6.12.tar.gz) = 21160637

11
net/samba46/files/patch-buildtools__wafsamba__samba_autoconf.py Normal file
View File

@ -0,0 +1,11 @@
--- buildtools/wafsamba/samba_autoconf.py.orig 2017-07-04 10:05:25 UTC
+++ buildtools/wafsamba/samba_autoconf.py
@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
- if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup']):
+ if conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS):
conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
@conf

20
net/samba46/files/patch-source3__libads__kerberos_keytab.c Normal file
View File

@ -0,0 +1,20 @@
--- source3/libads/kerberos_keytab.c.orig 2017-12-23 14:23:53.247467000 +0100
+++ source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100
@@ -32,8 +32,6 @@
#ifdef HAVE_KRB5
-#ifdef HAVE_ADS
-
/* This MAX_NAME_LEN is a constant defined in krb5.h */
#ifndef MAX_KEYTAB_NAME_LEN
#define MAX_KEYTAB_NAME_LEN 1100
@@ -85,6 +83,8 @@
return ret;
}
+#ifdef HAVE_ADS
+
/**********************************************************************
Adds a single service principal, i.e. 'host' to the system keytab
***********************************************************************/

39
net/samba46/files/patch-source3__modules__vfs_zfsacl.c
View File

@ -1,39 +0,0 @@
From 6a95f51f5ea1c60b5c11e8dd7e4a03ca5ef8049f Mon Sep 17 00:00:00 2001
From: Ralph Boehme <slow@samba.org>
Date: Sat, 28 Oct 2017 16:13:16 +0200
Subject: [PATCH] WIP: vfs_zfsacl: fix compilation error
Bug: https://bugzilla.samba.org/show_bug.cgi?id=6133
--- source3/modules/vfs_zfsacl.c.orig 2017-10-25 10:55:08 UTC
+++ source3/modules/vfs_zfsacl.c
@@ -51,6 +51,7 @@ static NTSTATUS zfs_get_nt_acl_common(st
SMB_STRUCT_STAT sbuf;
const SMB_STRUCT_STAT *psbuf = NULL;
int ret;
+ bool is_dir;
if (VALID_STAT(smb_fname->st)) {
psbuf = &smb_fname->st;
@@ -65,10 +66,7 @@ static NTSTATUS zfs_get_nt_acl_common(st
}
psbuf = &sbuf;
}
-
- if (S_ISDIR(psbuf->st_ex_mode) && (ace->aceMask & SMB_ACE4_ADD_FILE)) {
- ace->aceMask |= SMB_ACE4_DELETE_CHILD;
- }
+ is_dir = S_ISDIR(psbuf->st_ex_mode);
/* read the number of file aces */
if((naces = acl(smb_fname->base_name, ACE_GETACLCNT, 0, NULL)) == -1) {
@@ -115,6 +113,10 @@ static NTSTATUS zfs_get_nt_acl_common(st
aceprop.aceMask |= SMB_ACE4_SYNCHRONIZE;
}
+ if (is_dir && (aceprop.aceMask & SMB_ACE4_ADD_FILE)) {
+ aceprop.aceMask |= SMB_ACE4_DELETE_CHILD;
+ }
+
if(aceprop.aceFlags & ACE_OWNER) {
aceprop.flags = SMB_ACE4_ID_SPECIAL;
aceprop.who.special_id = SMB_ACE4_WHO_OWNER;

1
net/samba46/pkg-plist
View File

@ -832,6 +832,7 @@ man/man8/vfs_tsmsm.8.gz
man/man8/vfs_unityed_media.8.gz
man/man8/vfs_worm.8.gz
man/man8/vfs_xattr_tdb.8.gz
man/man8/vfs_zfsacl.8.gz
man/man8/winbindd.8.gz
@dir /var/run/samba4
@dir /var/log/samba4