From 43dddac4cec03868a6ea2839946c26eaaeae26c7 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Wed, 25 Dec 2019 22:39:46 +0200
Subject: [PATCH] libtalloc: update to 2.3.1

---
 packages/libtalloc/build.sh                  |  7 ++-
 packages/libtalloc/lib-replace-wscript.patch | 47 --------------------
 packages/libtalloc/wscript.patch             | 19 --------
 3 files changed, 3 insertions(+), 70 deletions(-)
 delete mode 100644 packages/libtalloc/lib-replace-wscript.patch
 delete mode 100644 packages/libtalloc/wscript.patch

diff --git a/packages/libtalloc/build.sh b/packages/libtalloc/build.sh
index d8310ed0a..f56562b58 100644
--- a/packages/libtalloc/build.sh
+++ b/packages/libtalloc/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://talloc.samba.org/talloc/doc/html/index.html
 TERMUX_PKG_DESCRIPTION="Hierarchical, reference counted memory pool system with destructors"
 TERMUX_PKG_LICENSE="GPL-3.0"
-TERMUX_PKG_VERSION=2.1.14
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_VERSION=2.3.1
 TERMUX_PKG_SRCURL=https://www.samba.org/ftp/talloc/talloc-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce
+TERMUX_PKG_SHA256=ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77
 TERMUX_PKG_BREAKS="libtalloc-dev"
 TERMUX_PKG_REPLACES="libtalloc-dev"
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -61,6 +60,6 @@ EOF
 
 termux_step_post_make_install() {
 	cd $TERMUX_PKG_SRCDIR/bin/default
-	$AR rcu libtalloc.a talloc_*.o
+	$AR rcu libtalloc.a talloc*.o
 	install -Dm600 libtalloc.a $TERMUX_PREFIX/lib/libtalloc.a
 }
diff --git a/packages/libtalloc/lib-replace-wscript.patch b/packages/libtalloc/lib-replace-wscript.patch
deleted file mode 100644
index a8570d9a8..000000000
--- a/packages/libtalloc/lib-replace-wscript.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -u -r ../talloc-2.1.14/lib/replace/wscript ./lib/replace/wscript
---- ../talloc-2.1.14/lib/replace/wscript	2018-07-12 05:51:30.000000000 +0000
-+++ ./lib/replace/wscript	2019-03-17 10:38:26.655881820 +0000
-@@ -32,7 +32,7 @@
-     conf.DEFINE('HAVE_LIBREPLACE', 1)
-     conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1)
- 
--    conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
-+    conf.CHECK_HEADERS('linux/types.h locale.h acl/libacl.h compat.h')
-     conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
-     conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
-     conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h')
-@@ -551,9 +551,6 @@
-              conf.CONFIG_SET('HAVE_PTHREAD_MUTEX_CONSISTENT_NP'))):
-             conf.DEFINE('HAVE_ROBUST_MUTEXES', 1)
- 
--    conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True)
--    conf.CHECK_FUNCS_IN('crypt_r', 'crypt', checklibc=True)
--
-     conf.CHECK_VARIABLE('rl_event_hook', define='HAVE_DECL_RL_EVENT_HOOK', always=True,
-                         headers='readline.h readline/readline.h readline/history.h')
- 
-@@ -761,7 +758,6 @@
-                 break
- 
-     extra_libs = ''
--    if bld.CONFIG_SET('HAVE_LIBBSD'): extra_libs += ' bsd'
- 
-     bld.SAMBA_SUBSYSTEM('LIBREPLACE_HOSTCC',
-         REPLACE_HOSTCC_SOURCE,
-@@ -775,7 +771,6 @@
-     REPLACE_SOURCE = REPLACE_HOSTCC_SOURCE
-     REPLACE_SOURCE += ' cwrap.c'
- 
--    if not bld.CONFIG_SET('HAVE_CRYPT'):         REPLACE_SOURCE += ' crypt.c'
-     if not bld.CONFIG_SET('HAVE_DLOPEN'):        REPLACE_SOURCE += ' dlfcn.c'
-     if not bld.CONFIG_SET('HAVE_POLL'):          REPLACE_SOURCE += ' poll.c'
- 
-@@ -802,7 +797,7 @@
-                       # at the moment:
-                       # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
-                       private_library=True,
--                      deps='crypt dl nsl socket rt attr' + extra_libs)
-+                      deps='dl nsl socket rt attr' + extra_libs)
- 
-     replace_test_cflags="-Wno-format-zero-length"
-     if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):
diff --git a/packages/libtalloc/wscript.patch b/packages/libtalloc/wscript.patch
deleted file mode 100644
index 8535ac588..000000000
--- a/packages/libtalloc/wscript.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r ../talloc-2.1.5/wscript ./wscript
---- ../talloc-2.1.5/wscript	2015-11-06 08:28:25.000000000 -0500
-+++ ./wscript	2016-01-08 19:19:24.233750343 -0500
-@@ -95,15 +95,6 @@
-         if bld.CONFIG_SET('HAVE_PTHREAD'):
-             testsuite_deps += ' pthread'
- 
--        bld.SAMBA_BINARY('talloc_testsuite',
--                         'testsuite_main.c testsuite.c',
--                         testsuite_deps,
--                         install=False)
--
--        bld.SAMBA_BINARY('talloc_test_magic_differs_helper',
--                         'test_magic_differs_helper.c',
--                         'talloc', install=False)
--
-     else:
-         private_library = True
-