teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

talloc: update to 2.1.5.

Browse Source
This commit is contained in:
Michael Gehring 2016-02-23 06:20:08 +01:00
parent 6456637281
commit dbe02f2f04
2 changed files with 3 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
srcpkgs/talloc/patches/fix-libreplace.patch
View File

@ -1,88 +0,0 @@
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

6
srcpkgs/talloc/template
View File

@ -1,7 +1,7 @@
# Template build file for 'talloc'.
pkgname=talloc
version=2.1.2
revision=2
version=2.1.5
revision=1
build_style=configure
hostmakedepends="pkg-config python libxslt docbook-xsl"
short_desc="Hierarchical pool based memory allocator with destructors"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://talloc.samba.org/"
license="GPL-3"
distfiles="http://samba.org/ftp/$pkgname/$pkgname-$version.tar.gz"
checksum=230d78a3fca75a15ab0f5d76d7bbaeadd3c1e695adcbb085932d227f5c31838d
checksum=3833e750cf0b8c3439186cba38800cba9e26adfbce10ee98ba709c24eb1cdddd
do_configure() {
if [ "$CROSS_BUILD" ]; then