Bump Buildroot Version to buildroot 2019_02_6
This commit is contained in:
NADAL Jean-Baptiste
@@ -1,41 +0,0 @@
|
||||
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,38 @@
|
||||
From bed8720dce64181c188c23a28506a88cd2e1ee4f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 11 May 2019 00:07:50 +0200
|
||||
Subject: [PATCH] test_regfio.c: include stdint.h before cmoka.h
|
||||
|
||||
This fix the following build failure on mips64el:
|
||||
/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/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 ../source3/registry/tests/test_regfio.c:23:0:
|
||||
../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here
|
||||
typedef unsigned int uintptr_t;
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/bae0508e84c905dc23ad7cf1153cd1e9d8e4d734
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.com/samba-team/samba/merge_requests/442]
|
||||
---
|
||||
source3/registry/tests/test_regfio.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/source3/registry/tests/test_regfio.c b/source3/registry/tests/test_regfio.c
|
||||
index 86a217661f3..f945e653708 100644
|
||||
--- a/source3/registry/tests/test_regfio.c
|
||||
+++ b/source3/registry/tests/test_regfio.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
#include <setjmp.h>
|
||||
+#include <stdint.h>
|
||||
#include <cmocka.h>
|
||||
|
||||
#include <errno.h>
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,123 +0,0 @@
|
||||
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
|
||||
|
||||
[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 | 40 ++++++++++++++++-----------------
|
||||
source4/scripting/wscript_build | 4 ++--
|
||||
3 files changed, 27 insertions(+), 27 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 ec5d28fc62a..f81c125bcd4 100644
|
||||
--- a/docs-xml/wscript_build
|
||||
+++ b/docs-xml/wscript_build
|
||||
@@ -148,23 +148,23 @@ 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.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):
|
||||
+# ''' 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.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
|
||||
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.18.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://download.samba.org/pub/samba/stable/samba-4.9.6.tar.asc
|
||||
sha256 c9205a651a83d69e200fec9dd65e9fa360f0c75ab3275b3dcb74e5cbaec60807 samba-4.9.6.tar.gz
|
||||
# https://download.samba.org/pub/samba/stable/samba-4.9.13.tar.asc
|
||||
sha256 ab18331e37766b13dbb07d1f115bda3d794917baf502d0ca2b2b8fff014b88f2 samba-4.9.13.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SAMBA4_VERSION = 4.9.6
|
||||
SAMBA4_VERSION = 4.9.13
|
||||
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
|
||||
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
|
||||
SAMBA4_INSTALL_STAGING = YES
|
||||
@@ -21,7 +21,8 @@ SAMBA4_CFLAGS = $(TARGET_CFLAGS)
|
||||
SAMBA4_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||
SAMBA4_CONF_ENV = \
|
||||
CFLAGS="$(SAMBA4_CFLAGS)" \
|
||||
LDFLAGS="$(SAMBA4_LDFLAGS)"
|
||||
LDFLAGS="$(SAMBA4_LDFLAGS)" \
|
||||
XSLTPROC=false
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
SAMBA4_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
|
||||
|
||||
Reference in New Issue
Block a user