Bump buildroot to 2019.02
This commit is contained in:
@@ -9,17 +9,17 @@ 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)
|
||||
[Bernd: rebased for versions 4.7.3, 4.8.0 & 4.8.5]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
lib/replace/wscript | 12 ------------
|
||||
1 file changed, 12 deletions(-)
|
||||
lib/replace/wscript | 15 ---------------
|
||||
1 file changed, 15 deletions(-)
|
||||
|
||||
diff --git a/lib/replace/wscript b/lib/replace/wscript
|
||||
index 1dfd902..456be9b 100644
|
||||
index 6c7de5953f0..ac230d719f7 100644
|
||||
--- a/lib/replace/wscript
|
||||
+++ b/lib/replace/wscript
|
||||
@@ -296,21 +296,6 @@
|
||||
@@ -304,21 +304,6 @@ def configure(conf):
|
||||
|
||||
strlcpy_in_bsd = False
|
||||
|
||||
@@ -42,5 +42,5 @@ index 1dfd902..456be9b 100644
|
||||
struct ucred cred;
|
||||
socklen_t cred_len;
|
||||
--
|
||||
2.7.3
|
||||
2.18.0
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 3d91847322eba55e97adc76c5c95570382af7059 Mon Sep 17 00:00:00 2001
|
||||
From 5627ea3826a00c149ff3d49c40706217043a014d 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
|
||||
@@ -21,18 +21,36 @@ 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]
|
||||
https://lists.samba.org/archive/samba-technical/2018-August/129732.html,
|
||||
updated for samba-4.9.1]
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
lib/ldb/tests/ldb_kv_ops_test.c | 1 +
|
||||
lib/ldb/tests/ldb_mod_op_test.c | 1 +
|
||||
lib/ldb/tests/ldb_msg.c | 1 +
|
||||
lib/ldb/tests/ldb_tdb_test.c | 1 +
|
||||
lib/ldb/tests/test_ldb_qsort.c | 1 +
|
||||
lib/util/tests/test_ms_fnmatch.c | 1 +
|
||||
libcli/auth/tests/ntlm_check.c | 1 +
|
||||
libcli/smb/test_smb1cli_session.c | 1 +
|
||||
4 files changed, 4 insertions(+)
|
||||
source3/lib/test_tldap.c | 1 +
|
||||
9 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c
|
||||
index 30ce019fac8..3ac7763b307 100644
|
||||
--- a/lib/ldb/tests/ldb_kv_ops_test.c
|
||||
+++ b/lib/ldb/tests/ldb_kv_ops_test.c
|
||||
@@ -46,6 +46,7 @@
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
|
||||
index c8b9c1aa9ff..4893dc3b38b 100644
|
||||
index 01667af3865..a1a20d38f28 100644
|
||||
--- a/lib/ldb/tests/ldb_mod_op_test.c
|
||||
+++ b/lib/ldb/tests/ldb_mod_op_test.c
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -55,6 +73,42 @@ index f8de418e0dc..31786a9a318 100644
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/lib/ldb/tests/ldb_tdb_test.c b/lib/ldb/tests/ldb_tdb_test.c
|
||||
index 686a35104ea..2e312e60a3c 100644
|
||||
--- a/lib/ldb/tests/ldb_tdb_test.c
|
||||
+++ b/lib/ldb/tests/ldb_tdb_test.c
|
||||
@@ -40,6 +40,7 @@
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c
|
||||
index 06e80d94379..663cf0e7564 100644
|
||||
--- a/lib/ldb/tests/test_ldb_qsort.c
|
||||
+++ b/lib/ldb/tests/test_ldb_qsort.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/lib/util/tests/test_ms_fnmatch.c b/lib/util/tests/test_ms_fnmatch.c
|
||||
index 7fe8ed05e28..d11c7bed4be 100644
|
||||
--- a/lib/util/tests/test_ms_fnmatch.c
|
||||
+++ b/lib/util/tests/test_ms_fnmatch.c
|
||||
@@ -19,6 +19,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
|
||||
@@ -78,6 +132,18 @@ index d1e21d5431e..6a526c96b61 100644
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
diff --git a/source3/lib/test_tldap.c b/source3/lib/test_tldap.c
|
||||
index a6c2f2117cb..659c5a7371a 100644
|
||||
--- a/source3/lib/test_tldap.c
|
||||
+++ b/source3/lib/test_tldap.c
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
+#include <stdint.h>
|
||||
#include <setjmp.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@@ -19,12 +19,13 @@ 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
|
||||
|
||||
[Bernd: rebased for samba-4.8.5]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
buildtools/wafsamba/wafsamba.py | 10 +++++-----
|
||||
docs-xml/wscript_build | 34 +++++++++++++++++-----------------
|
||||
buildtools/wafsamba/wafsamba.py | 10 ++++-----
|
||||
docs-xml/wscript_build | 40 ++++++++++++++++-----------------
|
||||
source4/scripting/wscript_build | 4 ++--
|
||||
3 files changed, 24 insertions(+), 24 deletions(-)
|
||||
3 files changed, 27 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
|
||||
index 4bb19d070e2..a255d841111 100644
|
||||
@@ -55,10 +56,10 @@ index 4bb19d070e2..a255d841111 100644
|
||||
Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
|
||||
|
||||
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
|
||||
index 954c62a29bc..1169158fd57 100644
|
||||
index ec5d28fc62a..f81c125bcd4 100644
|
||||
--- a/docs-xml/wscript_build
|
||||
+++ b/docs-xml/wscript_build
|
||||
@@ -147,20 +147,20 @@ bld.SAMBA_GENERATOR(parameter_all,
|
||||
@@ -148,23 +148,23 @@ bld.SAMBA_GENERATOR(parameter_all,
|
||||
rule=smbdotconf_generate_parameter_list,
|
||||
dep_vars=bld.dynconfig_varnames())
|
||||
|
||||
@@ -77,6 +78,9 @@ index 954c62a29bc..1169158fd57 100644
|
||||
- if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
|
||||
- bld.SAMBAMANPAGES(krb5_locator_manpages)
|
||||
-
|
||||
- if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
|
||||
- bld.SAMBAMANPAGES(krb5_localauth_manpages)
|
||||
-
|
||||
- if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
|
||||
- bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
|
||||
+#def SMBDOTCONF_MANPAGE(bld, target):
|
||||
@@ -94,6 +98,9 @@ index 954c62a29bc..1169158fd57 100644
|
||||
+# if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
|
||||
+# bld.SAMBAMANPAGES(krb5_locator_manpages)
|
||||
+#
|
||||
+# if bld.CONFIG_SET('HAVE_KRB5_LOCALAUTH_PLUGIN_H'):
|
||||
+# bld.SAMBAMANPAGES(krb5_localauth_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
|
||||
@@ -112,5 +119,5 @@ index 2f53cce12b7..9841ae0a116 100644
|
||||
if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
|
||||
bld.INSTALL_FILES('${BINDIR}',
|
||||
--
|
||||
2.14.4
|
||||
2.18.0
|
||||
|
||||
|
||||
@@ -30,6 +30,7 @@ if BR2_PACKAGE_SAMBA4
|
||||
config BR2_PACKAGE_SAMBA4_AD_DC
|
||||
bool "AD DC"
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
select BR2_PACKAGE_JANSSON
|
||||
help
|
||||
Enable Active Directory Domain Controller functionality.
|
||||
|
||||
|
||||
@@ -39,3 +39,4 @@ Checking value of SIGRTMAX: "64"
|
||||
Checking value of SIGRTMIN: "34"
|
||||
Checking errno of iconv for illegal multibyte sequence: "0"
|
||||
checking for clnt_create(): OK
|
||||
Checking for a 64-bit host to support lmdb: NO
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# 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
|
||||
# https://download.samba.org/pub/samba/stable/samba-4.9.4.tar.asc
|
||||
sha256 6d98a8d8bcccbe788e4bbb406362e6676311aca711a3f3cc9b3a404bb9ff0b4f samba-4.9.4.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SAMBA4_VERSION = 4.8.4
|
||||
SAMBA4_VERSION = 4.9.4
|
||||
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
|
||||
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
|
||||
SAMBA4_INSTALL_STAGING = YES
|
||||
@@ -69,6 +69,13 @@ else
|
||||
SAMBA4_CONF_OPTS += --disable-gnutls
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
|
||||
SAMBA4_CONF_OPTS += --with-libarchive
|
||||
SAMBA4_DEPENDENCIES += libarchive
|
||||
else
|
||||
SAMBA4_CONF_OPTS += --without-libarchive
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)"
|
||||
SAMBA4_DEPENDENCIES += ncurses
|
||||
@@ -108,6 +115,8 @@ define SAMBA4_CONFIGURE_CMDS
|
||||
--disable-iprint \
|
||||
--without-pam \
|
||||
--without-dmapi \
|
||||
--without-gpgme \
|
||||
--without-ldb-lmdb \
|
||||
--disable-glusterfs \
|
||||
--with-cluster-support \
|
||||
--bundled-libraries='!asn1_compile,!compile_et' \
|
||||
@@ -127,8 +136,10 @@ define SAMBA4_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SAMBA4_AD_DC),)
|
||||
SAMBA4_CONF_OPTS += --without-ad-dc
|
||||
ifeq ($(BR2_PACKAGE_SAMBA4_AD_DC),y)
|
||||
SAMBA4_DEPENDENCIES += jansson
|
||||
else
|
||||
SAMBA4_CONF_OPTS += --without-ad-dc --without-json-audit
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SAMBA4_ADS),y)
|
||||
|
||||
Reference in New Issue
Block a user