Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -9,6 +9,8 @@ This causes redefinition conflicts for link(2) when both standard
|
||||
unistd.h and bsd/unistd.h get included.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
(rebased for versions 4.7.3 & 4.8.0)
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
lib/replace/wscript | 12 ------------
|
||||
1 file changed, 12 deletions(-)
|
||||
@@ -17,18 +19,21 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript
|
||||
index 1dfd902..456be9b 100644
|
||||
--- a/lib/replace/wscript
|
||||
+++ b/lib/replace/wscript
|
||||
@@ -248,18 +248,6 @@ def configure(conf):
|
||||
@@ -296,21 +296,6 @@
|
||||
|
||||
conf.CHECK_FUNCS('prctl dirname basename')
|
||||
strlcpy_in_bsd = False
|
||||
|
||||
- # libbsd on some platforms provides strlcpy and strlcat
|
||||
- if not conf.CHECK_FUNCS('strlcpy strlcat'):
|
||||
- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
|
||||
- checklibc=True)
|
||||
- if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
|
||||
- checklibc=True):
|
||||
- strlcpy_in_bsd = True
|
||||
- if not conf.CHECK_FUNCS('getpeereid'):
|
||||
- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.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')
|
||||
- if not conf.CHECK_FUNCS('setproctitle_init'):
|
||||
- conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
|
||||
-
|
||||
- if not conf.CHECK_FUNCS('closefrom'):
|
||||
- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From da2f2cf8e7a1dfcb661b707e4649cec1e8a0e79c Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Thu, 9 Aug 2018 10:03:06 +0200
|
||||
Subject: [PATCH] Fix compilation of Samba 4.7.4 with disabled ADS
|
||||
|
||||
Downloaded from upstream mailinglist
|
||||
https://lists.samba.org/archive/samba-technical/2017-December/124629.html
|
||||
|
||||
Patch originates from FreeBSD:
|
||||
https://svnweb.freebsd.org/ports/head/net/samba47/files/patch-source3__libads__kerberos_keytab.c?revision=457119&view=markup
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
source3/libads/kerberos_keytab.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
|
||||
index 37ac7ba985e..71250962090 100644
|
||||
--- a/source3/libads/kerberos_keytab.c
|
||||
+++ b/source3/libads/kerberos_keytab.c
|
||||
@@ -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 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#ifdef HAVE_ADS
|
||||
+
|
||||
/**********************************************************************
|
||||
Adds a single service principal, i.e. 'host' to the system keytab
|
||||
***********************************************************************/
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
From 3d91847322eba55e97adc76c5c95570382af7059 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sun, 28 Jan 2018 11:57:11 +0100
|
||||
Subject: [PATCH] Fix uClibc build on 64bit platforms by including stdint.h
|
||||
|
||||
Fixes an error detected by buildroot autobuilders:
|
||||
http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log
|
||||
|
||||
/home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27:
|
||||
error: conflicting types for 'uintptr_t'
|
||||
typedef unsigned long int uintptr_t;
|
||||
^
|
||||
In file included from ../lib/ldb/tests/ldb_msg.c:17:0:
|
||||
../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here
|
||||
typedef unsigned int uintptr_t;
|
||||
|
||||
The define __WORDSIZE is missing when cmocka.h decides how to
|
||||
define uintptr_t, this patch includes stdint.h when needed.
|
||||
|
||||
Patch sent upstream:
|
||||
https://lists.samba.org/archive/samba-technical/2018-January/125306.html
|
||||
|
||||
[updated for samba-4.8.4, v2 sent upstream
|
||||
https://lists.samba.org/archive/samba-technical/2018-August/129732.html]
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
lib/ldb/tests/ldb_mod_op_test.c | 1 +
|
||||
lib/ldb/tests/ldb_msg.c | 1 +
|
||||
libcli/auth/tests/ntlm_check.c | 1 +
|
||||
libcli/smb/test_smb1cli_session.c | 1 +
|
||||
4 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
|
||||
index c8b9c1aa9ff..4893dc3b38b 100644
|
||||
--- a/lib/ldb/tests/ldb_mod_op_test.c
|
||||
+++ b/lib/ldb/tests/ldb_mod_op_test.c
|
||||
@@ -13,6 +13,7 @@
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c
|
||||
index f8de418e0dc..31786a9a318 100644
|
||||
--- a/lib/ldb/tests/ldb_msg.c
|
||||
+++ b/lib/ldb/tests/ldb_msg.c
|
||||
@@ -13,6 +13,7 @@
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c
|
||||
index e87a0a276d4..65c7b086008 100644
|
||||
--- a/libcli/auth/tests/ntlm_check.c
|
||||
+++ b/libcli/auth/tests/ntlm_check.c
|
||||
@@ -40,6 +40,7 @@
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/libcli/smb/test_smb1cli_session.c b/libcli/smb/test_smb1cli_session.c
|
||||
index d1e21d5431e..6a526c96b61 100644
|
||||
--- a/libcli/smb/test_smb1cli_session.c
|
||||
+++ b/libcli/smb/test_smb1cli_session.c
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@@ -0,0 +1,116 @@
|
||||
From 3cd608170b99492bdd5fe3b7b8e7db61af199845 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Thu, 9 Aug 2018 09:59:06 +0200
|
||||
Subject: [PATCH] Disable build of manpages and documentation
|
||||
|
||||
This patch fixes a bug described in an upstream bug report
|
||||
https://bugzilla.samba.org/show_bug.cgi?id=9515
|
||||
which was closed as WONTFIX by disabling the build of manpages and
|
||||
documentation.
|
||||
|
||||
If installed on the host, samba4 uses the docbook-xsl package to build
|
||||
parts of the documentation. This package is broken, on Debian for
|
||||
example the bug reported to samba4 was fixed in the docbook-xsl package:
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567
|
||||
|
||||
Since we do not provide a host version of docbook-xsl we need to disable
|
||||
the build of manpages and documentation.
|
||||
|
||||
Patch was downloaded from
|
||||
https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/network/samba/patches/samba-950-no-man.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
buildtools/wafsamba/wafsamba.py | 10 +++++-----
|
||||
docs-xml/wscript_build | 34 +++++++++++++++++-----------------
|
||||
source4/scripting/wscript_build | 4 ++--
|
||||
3 files changed, 24 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
|
||||
index 4bb19d070e2..a255d841111 100644
|
||||
--- a/buildtools/wafsamba/wafsamba.py
|
||||
+++ b/buildtools/wafsamba/wafsamba.py
|
||||
@@ -335,9 +335,9 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
else:
|
||||
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
|
||||
|
||||
- if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
|
||||
- bld.env['XSLTPROC_MANPAGES']):
|
||||
- bld.MANPAGES(manpages, install)
|
||||
+# if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
|
||||
+# bld.env['XSLTPROC_MANPAGES']):
|
||||
+# bld.MANPAGES(manpages, install)
|
||||
|
||||
|
||||
Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
|
||||
@@ -442,8 +442,8 @@ def SAMBA_BINARY(bld, binname, source,
|
||||
samba_ldflags = pie_ldflags
|
||||
)
|
||||
|
||||
- if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
|
||||
- bld.MANPAGES(manpages, install)
|
||||
+# if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
|
||||
+# bld.MANPAGES(manpages, install)
|
||||
|
||||
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
|
||||
|
||||
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
|
||||
index 954c62a29bc..1169158fd57 100644
|
||||
--- a/docs-xml/wscript_build
|
||||
+++ b/docs-xml/wscript_build
|
||||
@@ -147,20 +147,20 @@ bld.SAMBA_GENERATOR(parameter_all,
|
||||
rule=smbdotconf_generate_parameter_list,
|
||||
dep_vars=bld.dynconfig_varnames())
|
||||
|
||||
-def SMBDOTCONF_MANPAGE(bld, target):
|
||||
- ''' assemble and build smb.conf.5 manual page'''
|
||||
- bld.SAMBAMANPAGES(target, parameter_all)
|
||||
-
|
||||
-if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
|
||||
-
|
||||
- SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
|
||||
- bld.SAMBAMANPAGES(manpages)
|
||||
-
|
||||
- if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
|
||||
- bld.SAMBAMANPAGES(pam_winbind_manpages)
|
||||
-
|
||||
- if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
|
||||
- bld.SAMBAMANPAGES(krb5_locator_manpages)
|
||||
-
|
||||
- if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
|
||||
- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
|
||||
+#def SMBDOTCONF_MANPAGE(bld, target):
|
||||
+# ''' assemble and build smb.conf.5 manual page'''
|
||||
+# bld.SAMBAMANPAGES(target, parameter_all)
|
||||
+#
|
||||
+#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
|
||||
+#
|
||||
+# SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
|
||||
+# bld.SAMBAMANPAGES(manpages)
|
||||
+#
|
||||
+# if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
|
||||
+# bld.SAMBAMANPAGES(pam_winbind_manpages)
|
||||
+#
|
||||
+# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
|
||||
+# bld.SAMBAMANPAGES(krb5_locator_manpages)
|
||||
+#
|
||||
+# if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
|
||||
+# bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
|
||||
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
|
||||
index 2f53cce12b7..9841ae0a116 100644
|
||||
--- a/source4/scripting/wscript_build
|
||||
+++ b/source4/scripting/wscript_build
|
||||
@@ -12,8 +12,8 @@ if sbin_files:
|
||||
bld.INSTALL_FILES('${SBINDIR}',
|
||||
sbin_files,
|
||||
chmod=MODE_755, python_fixup=True, flat=True)
|
||||
- if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
|
||||
- bld.MANPAGES(man_files, True)
|
||||
+# if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
|
||||
+# bld.MANPAGES(man_files, True)
|
||||
|
||||
if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
|
||||
bld.INSTALL_FILES('${BINDIR}',
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
comment "samba4 needs a toolchain w/ RPC, wchar, dynamic library, NPTL"
|
||||
comment "samba4 needs a uClibc or glibc toolchain w/ wchar, dynamic library, NPTL"
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_NATIVE_RPC \
|
||||
depends on !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL \
|
||||
|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -8,12 +8,13 @@ config BR2_PACKAGE_SAMBA4
|
||||
bool "samba4"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_USE_WCHAR # python
|
||||
depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi
|
||||
depends on !BR2_STATIC_LIBS # python
|
||||
depends on !BR2_STATIC_LIBS # python, gnutls
|
||||
depends on !BR2_nios2 # binary too large, relocations don't fit
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
select BR2_PACKAGE_E2FSPROGS
|
||||
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
select BR2_PACKAGE_POPT
|
||||
select BR2_PACKAGE_PYTHON
|
||||
select BR2_PACKAGE_ZLIB
|
||||
|
||||
@@ -37,3 +37,5 @@ Checking value of NSIG: "65"
|
||||
Checking value of _NSIG: "65"
|
||||
Checking value of SIGRTMAX: "64"
|
||||
Checking value of SIGRTMIN: "34"
|
||||
Checking errno of iconv for illegal multibyte sequence: "0"
|
||||
checking for clnt_create(): OK
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 3a3356faab1694680e2ccd7fdf051ab1bbd3b0d058fc1f671e135dd2d1eae1aa samba-4.5.16.tar.gz
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://download.samba.org/pub/samba/stable/samba-4.8.4.tar.asc
|
||||
sha256 f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406 samba-4.8.4.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,18 +4,30 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SAMBA4_VERSION = 4.5.16
|
||||
SAMBA4_VERSION = 4.8.4
|
||||
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
|
||||
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
|
||||
SAMBA4_INSTALL_STAGING = YES
|
||||
SAMBA4_LICENSE = GPLv3+
|
||||
SAMBA4_LICENSE = GPL-3.0+
|
||||
SAMBA4_LICENSE_FILES = COPYING
|
||||
SAMBA4_DEPENDENCIES = \
|
||||
host-e2fsprogs host-heimdal host-python \
|
||||
host-e2fsprogs host-heimdal host-python host-nfs-utils \
|
||||
e2fsprogs popt python zlib \
|
||||
$(if $(BR2_PACKAGE_LIBAIO),libaio) \
|
||||
$(if $(BR2_PACKAGE_LIBCAP),libcap) \
|
||||
$(if $(BR2_PACKAGE_READLINE),readline)
|
||||
$(if $(BR2_PACKAGE_READLINE),readline) \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
SAMBA4_CFLAGS = $(TARGET_CFLAGS)
|
||||
SAMBA4_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
SAMBA4_CONF_ENV = \
|
||||
CFLAGS="$(SAMBA4_CFLAGS)" \
|
||||
LDFLAGS="$(SAMBA4_LDFLAGS)"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
SAMBA4_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
|
||||
SAMBA4_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`
|
||||
SAMBA4_DEPENDENCIES += libtirpc host-pkgconf
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ACL),y)
|
||||
SAMBA4_CONF_OPTS += --with-acl-support
|
||||
@@ -50,12 +62,6 @@ else
|
||||
SAMBA4_CONF_OPTS += --without-fam
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GETTEXT),y)
|
||||
SAMBA4_DEPENDENCIES += gettext
|
||||
else
|
||||
SAMBA4_CONF_OPTS += --without-gettext
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
SAMBA4_CONF_OPTS += --enable-gnutls
|
||||
SAMBA4_DEPENDENCIES += gnutls
|
||||
|
||||
Reference in New Issue
Block a user