From 8e33cc012e53a3964ff7144df1492b3c61c14948 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:17:55 +0200 Subject: [PATCH] package/heimdal: bump version Samba-4.16 bumped its internal heimdal code[1] which made it incompatible with asn1_compile built with heimdal-7.7.1: /home/user/buildroot/output/build/samba4-4.18.2/third_party/heimdal/lib/asn1/rfc2459.asn1:260: Ignoring char(_) /home/user/buildroot/output/build/samba4-4.18.2/third_party/heimdal/lib/asn1/rfc2459.asn1:260: syntax error Bump this package to the same version LibreELEC is using https://github.com/LibreELEC/LibreELEC.tv/commit/1dc0b5bf3e50500658c8a61e89f57a98dfc0468d https://github.com/LibreELEC/LibreELEC.tv/commit/1112a1879523fdff7f6dec5a083d4f2bc82e7017 https://github.com/LibreELEC/LibreELEC.tv/commit/763eddbab10f89da42a380624192cc4039eed086 to fix the build error. Removed HOST_HEIMDAL_MAKE_SYMLINK as asn1_compile is now installed in $(HOST_DIR)/bin/. [1] https://www.samba.org/samba/history/samba-4.16.0.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/heimdal/heimdal.hash | 4 +--- package/heimdal/heimdal.mk | 14 ++++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index cf822340da..250ddbbd4d 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,5 +1,3 @@ -# From https://github.com/heimdal/heimdal/releases -sha1 a33fdc957f84ab13f39f164b04fe1deeaab3179e heimdal-7.7.1.tar.gz -sha256 117cb1ede7848db24cf27311c46f7f735a99f9c836c22e80aec92b91efe56644 heimdal-7.7.1.tar.gz # Locally computed +sha256 2576c5e2d793db53c86e108fd117b278437bb02d6c6db2bec4d1b86958f1980a heimdal-f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17.tar.gz sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 21b6c0ccb3..59b64c358b 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,9 +4,10 @@ # ################################################################################ -HEIMDAL_VERSION = 7.7.1 -HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) +HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 +HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf +HOST_HEIMDAL_AUTORECONF = YES HEIMDAL_INSTALL_STAGING = YES # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ @@ -39,14 +40,7 @@ define HOST_HEIMDAL_INSTALL_COMPILE_ET $(HOST_DIR)/bin/compile_et endef -# We need asn1_compile in the PATH for samba4 -define HOST_HEIMDAL_MAKE_SYMLINK - ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \ - $(HOST_DIR)/bin/asn1_compile -endef - HOST_HEIMDAL_POST_INSTALL_HOOKS += \ - HOST_HEIMDAL_INSTALL_COMPILE_ET \ - HOST_HEIMDAL_MAKE_SYMLINK + HOST_HEIMDAL_INSTALL_COMPILE_ET $(eval $(host-autotools-package))