samba4: bump to version 4.5.4

Drop libbsd support, it's problematic and doesn't bring in any greater
benefit.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2017-01-24 07:39:39 -03:00 committed by Peter Korsgaard
parent 61df194ad3
commit 51e771dc4d
3 changed files with 25 additions and 11 deletions

View File

@ -1,16 +1,25 @@
From fc0304ba92ec7ae9a2f75fbc31d97fee39d19665 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 7 Sep 2016 23:03:43 -0300
Subject: [PATCH] libreplace: disable libbsd support
Disable libbsd support, samba4 uses a global config.h for its own Disable libbsd support, samba4 uses a global config.h for its own
codebase and that of heimdal (when building with builtin). codebase and that of heimdal (when building with builtin).
This causes redefinition conflicts for link(2) when both standard unistd.h This causes redefinition conflicts for link(2) when both standard
and bsd/unistd.h get included. unistd.h and bsd/unistd.h get included.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
lib/replace/wscript | 12 ------------
1 file changed, 12 deletions(-)
diff -Nura samba-4.2.0rc1.orig/lib/replace/wscript samba-4.2.0rc1/lib/replace/wscript diff --git a/lib/replace/wscript b/lib/replace/wscript
--- samba-4.2.0rc1.orig/lib/replace/wscript 2014-10-01 06:17:32.000000000 -0300 index 1dfd902..456be9b 100644
+++ samba-4.2.0rc1/lib/replace/wscript 2014-10-01 07:21:13.559498987 -0300 --- a/lib/replace/wscript
@@ -282,15 +282,6 @@ +++ b/lib/replace/wscript
conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq memalign posix_memalign') @@ -248,18 +248,6 @@ def configure(conf):
conf.CHECK_FUNCS('prctl')
conf.CHECK_FUNCS('prctl dirname basename')
- # libbsd on some platforms provides strlcpy and strlcat - # libbsd on some platforms provides strlcpy and strlcat
- if not conf.CHECK_FUNCS('strlcpy strlcat'): - if not conf.CHECK_FUNCS('strlcpy strlcat'):
@ -20,7 +29,13 @@ diff -Nura samba-4.2.0rc1.orig/lib/replace/wscript samba-4.2.0rc1/lib/replace/ws
- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') - conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): - if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') - conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
-
- if not conf.CHECK_FUNCS('closefrom'):
- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
- -
conf.CHECK_CODE(''' conf.CHECK_CODE('''
struct ucred cred; struct ucred cred;
socklen_t cred_len; socklen_t cred_len;
--
2.7.3

View File

@ -1,2 +1,2 @@
# Locally calculated # Locally calculated
sha256 10f76fa113213ae512db4a4823351178c93fb6bc95d98d0ebc72e3a74d43386f samba-4.4.9.tar.gz sha256 1800d10ea14cabef67c83cc56a0f37f4f30ba5df218b3a1e7c874069a08c0f40 samba-4.5.4.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
SAMBA4_VERSION = 4.4.9 SAMBA4_VERSION = 4.5.4
SAMBA4_SITE = http://ftp.samba.org/pub/samba/stable SAMBA4_SITE = http://ftp.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES SAMBA4_INSTALL_STAGING = YES
@ -14,7 +14,6 @@ SAMBA4_DEPENDENCIES = \
host-e2fsprogs host-heimdal host-python \ host-e2fsprogs host-heimdal host-python \
e2fsprogs popt python zlib \ e2fsprogs popt python zlib \
$(if $(BR2_PACKAGE_LIBAIO),libaio) \ $(if $(BR2_PACKAGE_LIBAIO),libaio) \
$(if $(BR2_PACKAGE_LIBBSD),libbsd) \
$(if $(BR2_PACKAGE_LIBCAP),libcap) \ $(if $(BR2_PACKAGE_LIBCAP),libcap) \
$(if $(BR2_PACKAGE_READLINE),readline) $(if $(BR2_PACKAGE_READLINE),readline)