mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #6241 from heitbaum/samba416
[le11] samba: update to 4.16.0
This commit is contained in:
CvH
GitHub
commit
9390f49b64
11
packages/devel/asn1c/package.mk
Normal file
11
packages/devel/asn1c/package.mk
Normal file
@ -0,0 +1,11 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="asn1c"
|
||||
PKG_VERSION="0.9.28"
|
||||
PKG_SHA256="8007440b647ef2dd9fb73d931c33ac11764e6afb2437dbe638bb4e5fc82386b9"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://lionet.info/asn1c/blog/"
|
||||
PKG_URL="https://github.com/vlm/asn1c/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_HOST="ccache:host"
|
||||
PKG_LONGDESC="The ASN.1 Compiler"
|
||||
@ -3,12 +3,12 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="heimdal"
|
||||
PKG_VERSION="7.7.0"
|
||||
PKG_SHA256="f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c"
|
||||
PKG_VERSION="5dd29ecd2cc794144de059014a5cbc9c92c3d8bb"
|
||||
PKG_SHA256="727a436ebb0e50d176132da516c74a6ce5f07e0f4c9b7463f99ea5a77df88936"
|
||||
PKG_LICENSE="BSD-3c"
|
||||
PKG_SITE="http://www.h5l.org/"
|
||||
PKG_URL="https://github.com/heimdal/heimdal/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_HOST="toolchain:host Python3:host ncurses:host"
|
||||
PKG_URL="https://github.com/heimdal/heimdal/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_HOST="toolchain:host Python3:host ncurses:host asn1c:host"
|
||||
PKG_LONGDESC="Kerberos 5, PKIX, CMS, GSS-API, SPNEGO, NTLM, Digest-MD5 and, SASL implementation."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
PKG_BUILD_FLAGS="-parallel"
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
From 872222db35384f343a8a566a56a28c4eb73d38ed Mon Sep 17 00:00:00 2001
|
||||
From: Damir Franusic <df@release14.org>
|
||||
Date: Sun, 9 Dec 2018 19:50:47 +0100
|
||||
Subject: [PATCH] AC_FIND_FUNC_NO_LIBS should check libtinfo for tgetent
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
lib/libedit/config.h.in | 3 +++
|
||||
lib/libedit/configure.ac | 3 ++-
|
||||
3 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f1e8d7b15e..f98a3c555e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -456,7 +456,7 @@ AC_FIND_FUNC_NO_LIBS(openpty, util,[
|
||||
#endif
|
||||
],[0,0,0,0,0])
|
||||
|
||||
-AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[
|
||||
+AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses tinfo,[
|
||||
#ifdef HAVE_TERMCAP_H
|
||||
#include <termcap.h>
|
||||
#endif
|
||||
diff --git a/lib/libedit/config.h.in b/lib/libedit/config.h.in
|
||||
index ba283cc39f..059e5abc6a 100644
|
||||
--- a/lib/libedit/config.h.in
|
||||
+++ b/lib/libedit/config.h.in
|
||||
@@ -42,6 +42,9 @@
|
||||
/* Define to 1 if you have the `ncurses' library (-lncurses). */
|
||||
#undef HAVE_LIBNCURSES
|
||||
|
||||
+/* Define to 1 if you have the `tinfo' library (-ltinfo). */
|
||||
+#undef HAVE_LIBTINFO
|
||||
+
|
||||
/* Define to 1 if you have the <limits.h> header file. */
|
||||
#undef HAVE_LIMITS_H
|
||||
|
||||
diff --git a/lib/libedit/configure.ac b/lib/libedit/configure.ac
|
||||
index 90c8ca57d7..89a9376b06 100644
|
||||
--- a/lib/libedit/configure.ac
|
||||
+++ b/lib/libedit/configure.ac
|
||||
@@ -36,7 +36,8 @@ EL_MANTYPE
|
||||
|
||||
AC_CHECK_LIB(curses, tgetent,,
|
||||
[AC_CHECK_LIB(ncurses, tgetent,,
|
||||
- [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )
|
||||
+ [AC_CHECK_LIB(tinfo, tgetent,,
|
||||
+ [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )] )
|
||||
|
||||
|
||||
# Checks for header files.
|
||||
@ -1,24 +0,0 @@
|
||||
From 5e7bc8d8811fa401fa14adb9787504c0b460c7df Mon Sep 17 00:00:00 2001
|
||||
From: Earl Chew <earl_chew@yahoo.com>
|
||||
Date: Wed, 20 May 2020 09:46:28 -0700
|
||||
Subject: [PATCH] [libedit/configure.ac] Refactor tgetent message to reflect
|
||||
libraries searched
|
||||
|
||||
Signed-off-by: Earl Chew <earl_chew@yahoo.com>
|
||||
---
|
||||
lib/libedit/configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/libedit/configure.ac b/lib/libedit/configure.ac
|
||||
index 89a9376b06..b94bafc6b9 100644
|
||||
--- a/lib/libedit/configure.ac
|
||||
+++ b/lib/libedit/configure.ac
|
||||
@@ -37,7 +37,7 @@ EL_MANTYPE
|
||||
AC_CHECK_LIB(curses, tgetent,,
|
||||
[AC_CHECK_LIB(ncurses, tgetent,,
|
||||
[AC_CHECK_LIB(tinfo, tgetent,,
|
||||
- [AC_MSG_ERROR([libcurses or libncurses are required!])] )] )] )
|
||||
+ [AC_MSG_ERROR([libcurses, libncurses, or tinfo are required!])] )] )] )
|
||||
|
||||
|
||||
# Checks for header files.
|
||||
@ -1,29 +0,0 @@
|
||||
From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Wed, 17 Mar 2021 17:49:18 +0100
|
||||
Subject: [PATCH] autoconf-2.70 fix
|
||||
|
||||
autoconf-2.70 and newer are more strict with quoting etc. and thus generate
|
||||
a broken configure file:
|
||||
|
||||
configure: 20855: Syntax error: ")" unexpected (expecting "fi")
|
||||
|
||||
Gentoo-bug: https://bugs.gentoo.org/776241
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
cf/check-var.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cf/check-var.m4 b/cf/check-var.m4
|
||||
index 2fd7bca6f0..71d6f70ca8 100644
|
||||
--- a/cf/check-var.m4
|
||||
+++ b/cf/check-var.m4
|
||||
@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
|
||||
if test "$ac_foo" = yes; then
|
||||
AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1,
|
||||
[Define if you have the `]$1[' variable.])
|
||||
- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
|
||||
+ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
|
||||
fi
|
||||
])
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
From c4cff6859d183a40fb35a76e2bc1ce084b3a6d67 Mon Sep 17 00:00:00 2001
|
||||
From: Luke Howard <lukeh@padl.com>
|
||||
Date: Mon, 24 Dec 2018 02:21:32 +0000
|
||||
Subject: [PATCH] hx509: fix dependency, hxtool requires ASN.1 headers
|
||||
|
||||
---
|
||||
lib/hx509/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
|
||||
index c7ef53182d..b21d85202c 100644
|
||||
--- a/lib/hx509/Makefile.am
|
||||
+++ b/lib/hx509/Makefile.am
|
||||
@@ -164,7 +164,7 @@ hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
|
||||
dist_hxtool_SOURCES = hxtool.c
|
||||
nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
|
||||
|
||||
-$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h
|
||||
+$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS)
|
||||
|
||||
hxtool_LDADD = \
|
||||
libhx509.la \
|
||||
@ -1,22 +0,0 @@
|
||||
From cc6a3f337bac0411d0bb1c924fd857603a258d2f Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Williams <nico@twosigma.com>
|
||||
Date: Tue, 17 Mar 2020 19:46:37 -0500
|
||||
Subject: [PATCH] hcrypto: Fix Makefile build race
|
||||
|
||||
---
|
||||
lib/hcrypto/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
|
||||
index 195117d174..3c6ee3ca84 100644
|
||||
--- a/lib/hcrypto/Makefile.am
|
||||
+++ b/lib/hcrypto/Makefile.am
|
||||
@@ -298,7 +298,7 @@ ltmsources = \
|
||||
libtommath/bn_mp_to_unsigned_bin_n.c
|
||||
|
||||
|
||||
-$(libhcrypto_la_OBJECTS): hcrypto-link
|
||||
+$(libhcrypto_la_OBJECTS) $(test_rand_OBJECTS): hcrypto-link
|
||||
|
||||
libhcrypto_la_CPPFLAGS = -DBUILD_HCRYPTO_LIB $(AM_CPPFLAGS)
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
From 79b8337d54b2d85f73eff2d033ca592447ac5fce Mon Sep 17 00:00:00 2001
|
||||
From: heitbaum <rudi@heitbaum.com>
|
||||
Date: Fri, 10 Sep 2021 00:28:16 +1000
|
||||
Subject: [PATCH] yyerror: update to POSIX standard
|
||||
|
||||
To comply with the latest POSIX standard, in Yacc compatibility mode
|
||||
(options `-y`/`--yacc`) Bison now generates prototypes for yyerror and
|
||||
yylex. In some situations, this is breaking compatibility: if the user
|
||||
has already declared these functions but with some differences (e.g., to
|
||||
declare them as static, or to use specific attributes), the generated
|
||||
parser will fail to compile. To disable these prototypes, #define yyerror
|
||||
(to `yyerror`), and likewise for yylex.
|
||||
|
||||
refer: https://git.savannah.gnu.org/cgit/bison.git/tree/NEWS
|
||||
|
||||
GNU Bison 3.8
|
||||
---
|
||||
lib/asn1/asn1parse.y | 1 +
|
||||
lib/com_err/parse.y | 5 +++--
|
||||
lib/sl/slc-lex.l | 2 +-
|
||||
lib/sl/slc.h | 3 ++-
|
||||
4 files changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/asn1/asn1parse.y b/lib/asn1/asn1parse.y
|
||||
index 9d8b76f582..91b163a28b 100644
|
||||
--- a/lib/asn1/asn1parse.y
|
||||
+++ b/lib/asn1/asn1parse.y
|
||||
@@ -65,6 +65,7 @@ static void validate_object_set(IOSObjectSet *);
|
||||
static struct constraint_spec *new_constraint_spec(enum ctype);
|
||||
static Type *new_tag(int tagclass, int tagvalue, int tagenv, Type *oldtype);
|
||||
void yyerror (const char *);
|
||||
+#define yyerror yyerror
|
||||
static struct objid *new_objid(const char *label, int value);
|
||||
static void add_oid_to_tail(struct objid *, struct objid *);
|
||||
static void fix_labels(Symbol *s);
|
||||
diff --git a/lib/com_err/parse.y b/lib/com_err/parse.y
|
||||
index 0c2e5084b5..bcb9b05204 100644
|
||||
--- a/lib/com_err/parse.y
|
||||
+++ b/lib/com_err/parse.y
|
||||
@@ -35,7 +35,8 @@
|
||||
#include "compile_et.h"
|
||||
#include "lex.h"
|
||||
|
||||
-void yyerror (char *s);
|
||||
+void yyerror (const char *s);
|
||||
+#define yyerror yyerror
|
||||
static long name2number(const char *str);
|
||||
|
||||
extern char *yytext;
|
||||
@@ -168,7 +169,7 @@ name2number(const char *str)
|
||||
}
|
||||
|
||||
void
|
||||
-yyerror (char *s)
|
||||
+yyerror (const char *s)
|
||||
{
|
||||
_lex_error_message ("%s\n", s);
|
||||
}
|
||||
diff --git a/lib/sl/slc-lex.l b/lib/sl/slc-lex.l
|
||||
index 50965bccd7..3a37302336 100644
|
||||
--- a/lib/sl/slc-lex.l
|
||||
+++ b/lib/sl/slc-lex.l
|
||||
@@ -78,7 +78,7 @@ error_message (const char *format, ...)
|
||||
}
|
||||
|
||||
void
|
||||
-yyerror (char *s)
|
||||
+yyerror (const char *s)
|
||||
{
|
||||
error_message("%s\n", s);
|
||||
}
|
||||
diff --git a/lib/sl/slc.h b/lib/sl/slc.h
|
||||
index 6e45ed2f15..e4dc2cba6b 100644
|
||||
--- a/lib/sl/slc.h
|
||||
+++ b/lib/sl/slc.h
|
||||
@@ -51,5 +51,6 @@ extern char *filename;
|
||||
extern int error_flag;
|
||||
void error_message (const char *format, ...);
|
||||
int yylex(void);
|
||||
-void yyerror (char *s);
|
||||
+void yyerror (const char *s);
|
||||
+#define yyerror yyerror
|
||||
extern unsigned lineno;
|
||||
@ -43,4 +43,6 @@ Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK
|
||||
Checking value of GNUTLS_MAC_AES_CMAC_128: OK
|
||||
Checking whether fcntl supports flags to send direct I/O availability signals: OK
|
||||
Checking whether fcntl supports setting/geting hints: OK
|
||||
Checking for gnutls fips mode support: NO
|
||||
Checking for readlink breakage: NO
|
||||
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="samba"
|
||||
PKG_VERSION="4.13.17"
|
||||
PKG_SHA256="17bdb9ea60d30af22851c8e134d67b43a22fb1e20f159152a647c69dc2a58a68"
|
||||
PKG_VERSION="4.16.0"
|
||||
PKG_SHA256="97c47de35915d1637b254f02643c3230c3e73617851700edc7a2a8c958a3310c"
|
||||
PKG_LICENSE="GPLv3+"
|
||||
PKG_SITE="https://www.samba.org"
|
||||
PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
@ -61,7 +61,6 @@ configure_package() {
|
||||
--without-ad-dc \
|
||||
--without-automount \
|
||||
--without-cluster-support \
|
||||
--without-dnsupdate \
|
||||
--without-fam \
|
||||
--without-gettext \
|
||||
--without-gpgme \
|
||||
|
||||
@ -41,8 +41,10 @@ diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_hei
|
||||
index 8c55ae2..4fdae80 100644
|
||||
--- a/wscript_configure_embedded_heimdal
|
||||
+++ b/wscript_configure_embedded_heimdal
|
||||
@@ -1 +1,12 @@
|
||||
conf.RECURSE('source4/heimdal_build')
|
||||
@@ -6,3 +6,14 @@
|
||||
|
||||
conf.define('USING_EMBEDDED_HEIMDAL', 1)
|
||||
conf.RECURSE('third_party/heimdal_build')
|
||||
+
|
||||
+def check_system_heimdal_binary(name):
|
||||
+ if conf.LIB_MAY_BE_BUNDLED(name):
|
||||
@ -73,14 +75,14 @@ index 235fa19..4f4a83cd 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 +88,4 @@ finally:
|
||||
@@ -86,7 +78,4 @@ finally:
|
||||
#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.define('USING_SYSTEM_KRB5', 1)
|
||||
conf.env.KRB5_VENDOR = 'heimdal'
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
11
packages/network/samba/patches/samba-210-4.16-gssapi-h.patch
Normal file
11
packages/network/samba/patches/samba-210-4.16-gssapi-h.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/third_party/heimdal/lib/gssapi/gssapi/gssapi_krb5.h 2022-03-08 14:53:05.742089500 +0000
|
||||
+++ b/third_party/heimdal/lib/gssapi/gssapi/gssapi_krb5.h 2022-03-08 14:53:05.742089500 +0000
|
||||
@@ -36,7 +36,7 @@
|
||||
#ifndef GSSAPI_KRB5_H_
|
||||
#define GSSAPI_KRB5_H_
|
||||
|
||||
-#include <gssapi.h>
|
||||
+#include <gssapi/gssapi/gssapi.h>
|
||||
#include <gssapi/gssapi_oid.h>
|
||||
|
||||
GSSAPI_CPP_START
|
||||
@ -1,7 +1,7 @@
|
||||
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
|
||||
--- a/docs-xml/wscript_build 2020-12-05 09:01:19.652459634 +0000
|
||||
+++ b/docs-xml/wscript_build 2020-12-05 09:10:10.639446971 +0000
|
||||
@@ -153,28 +153,3 @@
|
||||
@@ -154,31 +154,3 @@
|
||||
target=parameter_all,
|
||||
rule=smbdotconf_generate_parameter_list,
|
||||
dep_vars=bld.dynconfig_varnames())
|
||||
@ -27,6 +27,9 @@ diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
|
||||
- if conf.env.build_winexe == True:
|
||||
- bld.SAMBAMANPAGES(winexe_manpages)
|
||||
-
|
||||
- if bld.CONFIG_SET('ENABLE_SELFTEST'):
|
||||
- bld.SAMBAMANPAGES('manpages/vfstest.1')
|
||||
-
|
||||
- for manpage in vfs_module_manpages:
|
||||
- if bld.SAMBA3_IS_ENABLED_MODULE(manpage):
|
||||
- bld.SAMBAMANPAGES('manpages/%s.8' % manpage)
|
||||
Loading…
x
Reference in New Issue
Block a user