From 7bfda6616c00f4611e42c22b565dcb5b4f852b50 Mon Sep 17 00:00:00 2001
From: John Regan <jregan@mesonet.org>
Date: Thu, 30 Apr 2015 09:59:08 -0500
Subject: [PATCH] talloc: fix compilation on musl

---
 srcpkgs/talloc/patches/fix-libreplace.patch | 88 +++++++++++++++++++++
 srcpkgs/talloc/template                     |  2 +-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/talloc/patches/fix-libreplace.patch

diff --git a/srcpkgs/talloc/patches/fix-libreplace.patch b/srcpkgs/talloc/patches/fix-libreplace.patch
new file mode 100644
index 0000000000..cb3207437c
--- /dev/null
+++ b/srcpkgs/talloc/patches/fix-libreplace.patch
@@ -0,0 +1,88 @@
+diff --git lib/replace/replace.c lib/replace/replace.c
+index 2a9ca3e..ea02753 100644
+--- lib/replace/replace.c
++++ lib/replace/replace.c
+@@ -508,28 +508,6 @@ long long int rep_strtoll(const char *str, char **endptr, int base)
+ # error "You need a strtoll function"
+ #endif
+ }
+-#else
+-#ifdef HAVE_BSD_STRTOLL
+-#ifdef HAVE_STRTOQ
+-long long int rep_strtoll(const char *str, char **endptr, int base)
+-{
+-	long long int nb = strtoq(str, endptr, base);
+-	/* In linux EINVAL is only returned if base is not ok */
+-	if (errno == EINVAL) {
+-		if (base == 0 || (base >1 && base <37)) {
+-			/* Base was ok so it's because we were not
+-			 * able to make the convertion.
+-			 * Let's reset errno.
+-			 */
+-			errno = 0;
+-		}
+-	}
+-	return nb;
+-}
+-#else
+-#error "You need the strtoq function"
+-#endif /* HAVE_STRTOQ */
+-#endif /* HAVE_BSD_STRTOLL */
+ #endif /* HAVE_STRTOLL */
+ 
+ 
+@@ -546,28 +524,6 @@ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+ # error "You need a strtoull function"
+ #endif
+ }
+-#else
+-#ifdef HAVE_BSD_STRTOLL
+-#ifdef HAVE_STRTOUQ
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+-{
+-	unsigned long long int nb = strtouq(str, endptr, base);
+-	/* In linux EINVAL is only returned if base is not ok */
+-	if (errno == EINVAL) {
+-		if (base == 0 || (base >1 && base <37)) {
+-			/* Base was ok so it's because we were not
+-			 * able to make the convertion.
+-			 * Let's reset errno.
+-			 */
+-			errno = 0;
+-		}
+-	}
+-	return nb;
+-}
+-#else
+-#error "You need the strtouq function"
+-#endif /* HAVE_STRTOUQ */
+-#endif /* HAVE_BSD_STRTOLL */
+ #endif /* HAVE_STRTOULL */
+ 
+ #ifndef HAVE_SETENV
+diff --git lib/replace/replace.h lib/replace/replace.h
+index 3ff4e36..eb852f5 100644
+--- lib/replace/replace.h
++++ lib/replace/replace.h
+@@ -359,21 +359,11 @@ char *rep_strtok_r(char *s, const char *delim, char **save_ptr);
+ #ifndef HAVE_STRTOLL
+ #define strtoll rep_strtoll
+ long long int rep_strtoll(const char *str, char **endptr, int base);
+-#else
+-#ifdef HAVE_BSD_STRTOLL
+-#define strtoll rep_strtoll
+-long long int rep_strtoll(const char *str, char **endptr, int base);
+-#endif
+ #endif
+ 
+ #ifndef HAVE_STRTOULL
+ #define strtoull rep_strtoull
+ unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#else
+-#ifdef HAVE_BSD_STRTOLL /* yes, it's not HAVE_BSD_STRTOULL */
+-#define strtoull rep_strtoull
+-unsigned long long int rep_strtoull(const char *str, char **endptr, int base);
+-#endif
+ #endif
+ 
+ #ifndef HAVE_FTRUNCATE
diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template
index af54d103af..2e08c9764a 100644
--- a/srcpkgs/talloc/template
+++ b/srcpkgs/talloc/template
@@ -1,7 +1,7 @@
 # Template build file for 'talloc'.
 pkgname=talloc
 version=2.1.2
-revision=1
+revision=2
 build_style=configure
 hostmakedepends="pkg-config python libxslt docbook-xsl"
 short_desc="Hierarchical pool based memory allocator with destructors"