From 1dc0b5bf3e50500658c8a61e89f57a98dfc0468d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 22 Mar 2022 01:48:46 +0000 Subject: [PATCH] heimdal: update to 5dd29ec 2022-03-22 (8.0pre) This supports the build of required host cross compiler binaries: - heimdal_asn1_compile - heimdal_compile_et The update to 5dd29ec 2022-03-22 (8.0pre) is required for Samba 4.16.0 add asn1c:host dependancy --- packages/devel/heimdal/package.mk | 8 +- ...-upstream-check-libtinfo-for-tgetent.patch | 52 ------------ .../0002-upstream-fix-configure-err-msg.patch | 24 ------ ...2b90e78e2d162b98b5ef6c84672c397be40a.patch | 29 ------- ...f6859d183a40fb35a76e2bc1ce084b3a6d67.patch | 22 ----- ...3f337bac0411d0bb1c924fd857603a258d2f.patch | 22 ----- .../yyerror-match-posix-standard.patch | 83 ------------------- 7 files changed, 4 insertions(+), 236 deletions(-) delete mode 100644 packages/devel/heimdal/patches/0001-upstream-check-libtinfo-for-tgetent.patch delete mode 100644 packages/devel/heimdal/patches/0002-upstream-fix-configure-err-msg.patch delete mode 100644 packages/devel/heimdal/patches/22352b90e78e2d162b98b5ef6c84672c397be40a.patch delete mode 100644 packages/devel/heimdal/patches/c4cff6859d183a40fb35a76e2bc1ce084b3a6d67.patch delete mode 100644 packages/devel/heimdal/patches/cc6a3f337bac0411d0bb1c924fd857603a258d2f.patch delete mode 100644 packages/devel/heimdal/patches/yyerror-match-posix-standard.patch diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk index bff71ff3e2..ad44e256bf 100644 --- a/packages/devel/heimdal/package.mk +++ b/packages/devel/heimdal/package.mk @@ -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" diff --git a/packages/devel/heimdal/patches/0001-upstream-check-libtinfo-for-tgetent.patch b/packages/devel/heimdal/patches/0001-upstream-check-libtinfo-for-tgetent.patch deleted file mode 100644 index df80a4a8e9..0000000000 --- a/packages/devel/heimdal/patches/0001-upstream-check-libtinfo-for-tgetent.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 872222db35384f343a8a566a56a28c4eb73d38ed Mon Sep 17 00:00:00 2001 -From: Damir Franusic -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 - #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 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. diff --git a/packages/devel/heimdal/patches/0002-upstream-fix-configure-err-msg.patch b/packages/devel/heimdal/patches/0002-upstream-fix-configure-err-msg.patch deleted file mode 100644 index 64b203f06d..0000000000 --- a/packages/devel/heimdal/patches/0002-upstream-fix-configure-err-msg.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5e7bc8d8811fa401fa14adb9787504c0b460c7df Mon Sep 17 00:00:00 2001 -From: Earl Chew -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 ---- - 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. diff --git a/packages/devel/heimdal/patches/22352b90e78e2d162b98b5ef6c84672c397be40a.patch b/packages/devel/heimdal/patches/22352b90e78e2d162b98b5ef6c84672c397be40a.patch deleted file mode 100644 index 0dcc310262..0000000000 --- a/packages/devel/heimdal/patches/22352b90e78e2d162b98b5ef6c84672c397be40a.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001 -From: Lars Wendler -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 ---- - 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 - ]) - diff --git a/packages/devel/heimdal/patches/c4cff6859d183a40fb35a76e2bc1ce084b3a6d67.patch b/packages/devel/heimdal/patches/c4cff6859d183a40fb35a76e2bc1ce084b3a6d67.patch deleted file mode 100644 index 826c7fb517..0000000000 --- a/packages/devel/heimdal/patches/c4cff6859d183a40fb35a76e2bc1ce084b3a6d67.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c4cff6859d183a40fb35a76e2bc1ce084b3a6d67 Mon Sep 17 00:00:00 2001 -From: Luke Howard -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 \ diff --git a/packages/devel/heimdal/patches/cc6a3f337bac0411d0bb1c924fd857603a258d2f.patch b/packages/devel/heimdal/patches/cc6a3f337bac0411d0bb1c924fd857603a258d2f.patch deleted file mode 100644 index 15a6161fec..0000000000 --- a/packages/devel/heimdal/patches/cc6a3f337bac0411d0bb1c924fd857603a258d2f.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cc6a3f337bac0411d0bb1c924fd857603a258d2f Mon Sep 17 00:00:00 2001 -From: Nicolas Williams -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) - diff --git a/packages/devel/heimdal/patches/yyerror-match-posix-standard.patch b/packages/devel/heimdal/patches/yyerror-match-posix-standard.patch deleted file mode 100644 index 07b84c3555..0000000000 --- a/packages/devel/heimdal/patches/yyerror-match-posix-standard.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 79b8337d54b2d85f73eff2d033ca592447ac5fce Mon Sep 17 00:00:00 2001 -From: heitbaum -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;