From daec24cfb8fcbcca42371bc4077880b478d28472 Mon Sep 17 00:00:00 2001 From: David GOUARIN Date: Sun, 24 Jul 2022 16:26:15 +0200 Subject: [PATCH] package/libtalloc: bump version to 2.3.4 Version 2.3.4 of libtalloc needs to define PYTHONHASHSEED, as a check has been added to the configure script, and build will fail if it is not defined. This is originately a workaround by samba developpers meant to avoid rebuilding talloc with each call to make. Defining PYTHONHASHSEED would not be required in the context of builroot, if not for the check in the configure script. Signed-off-by: David GOUARIN Signed-off-by: Yann E. MORIN --- package/libtalloc/libtalloc.hash | 2 +- package/libtalloc/libtalloc.mk | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/libtalloc/libtalloc.hash b/package/libtalloc/libtalloc.hash index cbfd11e63b..0bc8edb695 100644 --- a/package/libtalloc/libtalloc.hash +++ b/package/libtalloc/libtalloc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa talloc-2.3.3.tar.gz +sha256 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505 talloc-2.3.4.tar.gz sha256 f8340c449dd64a55c6605b02fcad2aec6f473612ac6026739a22995380a8043c talloc.h diff --git a/package/libtalloc/libtalloc.mk b/package/libtalloc/libtalloc.mk index 8cba699ea1..75d3da263b 100644 --- a/package/libtalloc/libtalloc.mk +++ b/package/libtalloc/libtalloc.mk @@ -4,13 +4,19 @@ # ################################################################################ -LIBTALLOC_VERSION = 2.3.3 +LIBTALLOC_VERSION = 2.3.4 LIBTALLOC_SOURCE = talloc-$(LIBTALLOC_VERSION).tar.gz LIBTALLOC_SITE = https://www.samba.org/ftp/talloc LIBTALLOC_LICENSE = LGPL-3.0+ LIBTALLOC_LICENSE_FILES = talloc.h LIBTALLOC_INSTALL_STAGING = YES +# libtalloc is extracted from the samba source tree, and that has a workaround +# that requires PYTHONHASHSEED to be set, and to be set to 1. +# See https://gitlab.com/samba-team/samba/-/commit/420bbb1d92fd2a28725b53f425ba3d214831b660 +LIBTALLOC_CONF_ENV = PYTHONHASHSEED=1 +LIBTALLOC_MAKE_ENV = PYTHONHASHSEED=1 + # --with-libiconv= is unconditionally passed, even if libiconv is not # present. Indeed, waf will search for libiconv by default in # /usr/local. Because of a bug in some waf python script, /usr/local