iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

bump version to 2022.02.9

Browse Source 
add miyoo_defconfig
This commit is contained in:
tiopex
2023-01-31 13:11:45 +01:00
parent 1fa746c353
commit dcdaa3599c
8423 changed files with 184305 additions and 91107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch
View File

@@ -75,13 +75,15 @@ index 0ff6dad2f55..f77c177442f 100644
check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h")
if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"):
@@ -96,7 +96,4 @@
@@ -96,9 +88,6 @@
#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
# conf.define('USING_SYSTEM_TOMMATH', 1)
-check_system_heimdal_binary("compile_et")
-check_system_heimdal_binary("asn1_compile")
-
conf.env.KRB5_VENDOR = 'heimdal'
conf.define('USING_SYSTEM_KRB5', 1)
conf.define('USING_SYSTEM_HEIMDAL', 1)
--
2.20.1

38
package/samba4/0003-Fix-unistd.h-include.patch
View File

@@ -1,38 +0,0 @@
From 85c33f89df8607ace0707e1360ff0f79f3e8f5f3 Mon Sep 17 00:00:00 2001
From: Andy Walsh <andy.walsh44+github@gmail.com>
Date: Wed, 6 Nov 2019 19:28:30 +0100
Subject: [PATCH] Fix unistd.h include
Fixes build error
source4/heimdal/lib/asn1/asn1_err.c:47:23: error: 'link' redeclared as different kind of symbol
static struct et_list link = { 0, 0 };
Downloaded from
https://github.com/Andy2244/openwrt-extra/blob/samba-4.10/samba4/patches/006-samba-4-10-musl_rm_unistd_incl.patch
Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13856
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
lib/replace/replace.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 1658465866e..e6768c4ae51 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -168,10 +168,6 @@
#include <bsd/unistd.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#ifdef HAVE_STRING_H
#include <string.h>
#endif
--
2.20.1

40
package/samba4/0003-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch Normal file
View File

@@ -0,0 +1,40 @@
From b2ea5dc3639d68b878c6534f4992da446dbbf2d4 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 16 May 2020 18:15:38 +0200
Subject: [PATCH] ldap_message_test.c: include stdint.h before cmoka.h
This fix the following build failure on uclibc:
In file included from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/lib/gcc/mips64el-buildroot-linux-uclibc/5.5.0/include/stdint.h:9:0,
from /home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/inttypes.h:27,
from ../../lib/replace/../replace/replace.h:64,
from ../../source4/include/includes.h:23,
from ../../libcli/ldap/tests/ldap_message_test.c:41:
/home/giuliobenetti/autobuild/run/instance-1/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27: error: conflicting types for 'uintptr_t'
typedef unsigned long int uintptr_t;
^
Fixes:
- http://autobuild.buildroot.org/results/09e84d15efe755bdefa9f8c6b8355c49ddbc2f65
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet]
---
libcli/ldap/tests/ldap_message_test.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libcli/ldap/tests/ldap_message_test.c b/libcli/ldap/tests/ldap_message_test.c
index c5aacd4bc6b..51331e5c600 100644
--- a/libcli/ldap/tests/ldap_message_test.c
+++ b/libcli/ldap/tests/ldap_message_test.c
@@ -34,6 +34,7 @@
*/
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
--
2.26.2

37
package/samba4/0004-lib-util-Add-signal.h-include.patch Normal file
View File

@@ -0,0 +1,37 @@
From d1732a79dbf30c41802245909d0250ebe2b9d92e Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 12 Dec 2021 10:27:42 +0100
Subject: [PATCH] lib/util: Add signal.h include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes build error with samba-4.15.3 and uClibc:
../../source3/printing/samba-bgqd.c: In function ‘main’:
../../source3/printing/samba-bgqd.c:340:21: error: ‘SIGPIPE’ undeclared (first use in this function); did you mean ‘EPIPE’?
../../source3/printing/samba-bgqd.c:384:14: error: ‘SIGTERM’ undeclared (first use in this function)
Patch sent upstream:
https://gitlab.com/samba-team/samba/-/merge_requests/2296
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
lib/util/signal.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/util/signal.h b/lib/util/signal.h
index 0663af6ab94..f662ee110d6 100644
--- a/lib/util/signal.h
+++ b/lib/util/signal.h
@@ -21,6 +21,7 @@
#ifndef _SAMBA_UTIL_SIGNAL_H_
#define _SAMBA_UTIL_SIGNAL_H_
+#include <signal.h>
#include <stdbool.h>
/**
--
2.30.2

34
package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch Normal file
View File

@@ -0,0 +1,34 @@
# Gentoo bug 855047
Fixes uClibc build when uClibc was build without netgroup support.
Upstream enables netgroup support based on getdomainname() being
present:
https://github.com/samba-team/samba/commit/f179184a2be2ddd38f463fcc12252f8d24e529f8#diff-b8d1bc25b89846e70ecb61cb296a8f5c50c9a0a1b62e46790fae81aa9d5bfaaeR632
Downloaded from
https://gitweb.gentoo.org/repo/gentoo.git/tree/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
--- a/lib/util/access.c
+++ b/lib/util/access.c
@@ -115,7 +115,7 @@ static bool string_match(const char *tok,const char *s)
return true;
}
} else if (tok[0] == '@') { /* netgroup: look it up */
-#ifdef HAVE_NETGROUP
+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR)
DATA_BLOB tmp;
char *mydomain = NULL;
char *hostname = NULL;
--- a/source3/auth/user_util.c
+++ b/source3/auth/user_util.c
@@ -135,7 +135,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char
bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname)
{
-#ifdef HAVE_NETGROUP
+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR)
char nis_domain_buf[256];
const char *nis_domain = NULL;
char *lowercase_user = NULL;

4
package/samba4/Config.in
View File

@@ -16,6 +16,7 @@ config BR2_PACKAGE_SAMBA4
select BR2_PACKAGE_CMOCKA
select BR2_PACKAGE_E2FSPROGS
select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_PACKAGE_POPT
select BR2_PACKAGE_ZLIB
@@ -32,6 +33,9 @@ config BR2_PACKAGE_SAMBA4_AD_DC
bool "AD DC"
depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_JANSSON
select BR2_PACKAGE_PYTHON_DNSPYTHON
select BR2_PACKAGE_PYTHON_MARKDOWN
select BR2_PACKAGE_SAMBA4_ADS
help
Enable Active Directory Domain Controller functionality.

5
package/samba4/samba4-cache.txt
View File

@@ -40,3 +40,8 @@ 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
Checking value of GNUTLS_CIPHER_AES_128_CFB8: 29
Checking value of GNUTLS_MAC_AES_CMAC_128: 203
Checking whether fcntl supports flags to send direct I/O availability signals: OK
Checking for gnutls fips mode support: NO
Checking for readlink breakage: NO

4
package/samba4/samba4.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
# https://download.samba.org/pub/samba/stable/samba-4.11.13.tar.asc
sha256 e71ed29ae01c5ce7be8cee1f53e0530db86dd19b911accb08fae60224e686ba1 samba-4.11.13.tar.gz
# https://download.samba.org/pub/samba/stable/samba-4.15.12.tar.asc
sha256 5889493d69dc7723be6c3154387fbed38c1cddf93a16da8670d99b7cca33b15e samba-4.15.12.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING

35
package/samba4/samba4.mk
View File

@@ -4,17 +4,23 @@
#
################################################################################
SAMBA4_VERSION = 4.11.13
SAMBA4_VERSION = 4.15.12
SAMBA4_SITE = https://download.samba.org/pub/samba/stable
SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
SAMBA4_INSTALL_STAGING = YES
SAMBA4_LICENSE = GPL-3.0+
SAMBA4_LICENSE_FILES = COPYING
SAMBA4_CPE_ID_VENDOR = samba
SAMBA4_CPE_ID_PRODUCT = samba
SAMBA4_SELINUX_MODULES = samba
SAMBA4_DEPENDENCIES = \
host-e2fsprogs host-heimdal host-nfs-utils host-python3 \
host-e2fsprogs host-flex host-heimdal host-nfs-utils \
host-perl host-perl-parse-yapp host-python3 \
cmocka e2fsprogs gnutls popt zlib \
$(if $(BR2_PACKAGE_ICU),icu) \
$(if $(BR2_PACKAGE_LIBAIO),libaio) \
$(if $(BR2_PACKAGE_LIBCAP),libcap) \
$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
$(if $(BR2_PACKAGE_READLINE),readline) \
$(TARGET_NLS_DEPENDENCIES)
SAMBA4_CFLAGS = $(TARGET_CFLAGS)
@@ -33,6 +39,11 @@ else
SAMBA4_CONF_OPTS += --disable-python
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
SAMBA4_DEPENDENCIES += libiconv
SAMBA4_LDFLAGS += -liconv
endif
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
SAMBA4_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
SAMBA4_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`
@@ -56,6 +67,9 @@ endif
ifeq ($(BR2_PACKAGE_DBUS),y)
SAMBA4_DEPENDENCIES += dbus
SAMBA4_SHARED_MODULES += vfs_snapper
else
SAMBA4_SHARED_MODULES += !vfs_snapper
endif
ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_AVAHI_DAEMON),yy)
@@ -97,11 +111,13 @@ SAMBA4_POST_INSTALL_TARGET_HOOKS += SAMBA4_REMOVE_CTDB_TESTS
define SAMBA4_CONFIGURE_CMDS
$(INSTALL) -m 0644 package/samba4/samba4-cache.txt $(@D)/cache.txt;
echo 'Checking whether fcntl supports setting/geting hints: $(if $(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13),OK,NO)' >>$(@D)/cache.txt;
echo 'Checking uname machine type: $(BR2_ARCH)' >>$(@D)/cache.txt;
(cd $(@D); \
$(SAMBA4_PYTHON) \
python_LDFLAGS="" \
python_LIBDIR="" \
PERL="$(HOST_DIR)/bin/perl" \
$(TARGET_CONFIGURE_OPTS) \
$(SAMBA4_CONF_ENV) \
./buildtools/bin/waf configure \
@@ -123,6 +139,7 @@ define SAMBA4_CONFIGURE_CMDS
--disable-glusterfs \
--with-cluster-support \
--bundled-libraries='!asn1_compile,!compile_et' \
--with-shared-modules=$(subst $(space),$(comma),$(strip $(SAMBA4_SHARED_MODULES))) \
$(SAMBA4_CONF_OPTS) \
)
endef
@@ -140,16 +157,26 @@ define SAMBA4_INSTALL_TARGET_CMDS
endef
ifeq ($(BR2_PACKAGE_SAMBA4_AD_DC),y)
SAMBA4_DEPENDENCIES += jansson
# host-python-dnspython and host-python-markdown are not strictly
# needed on the host, but on the target. however, samba's configure
# tests for their availability on the host.
SAMBA4_DEPENDENCIES += \
jansson \
host-python-dnspython \
host-python-markdown \
python-dnspython \
python-markdown
else
SAMBA4_CONF_OPTS += --without-ad-dc --without-json
endif
ifeq ($(BR2_PACKAGE_SAMBA4_ADS),y)
SAMBA4_CONF_OPTS += --with-ads --with-ldap --with-shared-modules=idmap_ad
SAMBA4_CONF_OPTS += --with-ads --with-ldap
SAMBA4_DEPENDENCIES += openldap
SAMBA4_SHARED_MODULES += idmap_ad
else
SAMBA4_CONF_OPTS += --without-ads --without-ldap
SAMBA4_SHARED_MODULES += !idmap_ad
endif
ifeq ($(BR2_PACKAGE_SAMBA4_SMBTORTURE),)