From da46a9300dae4cf999f22a70ee3dfe4792f5a341 Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Fri, 26 Feb 2016 15:09:29 +0000
Subject: main/tdb: upgrade to 1.3.8

---
 main/tdb/APKBUILD             | 18 +++-------
 main/tdb/fix-headers.patch    | 11 ------
 main/tdb/fix-libreplace.patch | 84 -------------------------------------------
 3 files changed, 5 insertions(+), 108 deletions(-)
 delete mode 100644 main/tdb/fix-headers.patch
 delete mode 100644 main/tdb/fix-libreplace.patch

diff --git a/main/tdb/APKBUILD b/main/tdb/APKBUILD
index 90d4113d50..ec777d0f7e 100644
--- a/main/tdb/APKBUILD
+++ b/main/tdb/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=tdb
-pkgver=1.3.1
+pkgver=1.3.8
 pkgrel=0
 pkgdesc="The tdb library"
 url="http://tdb.samba.org/"
@@ -11,9 +11,7 @@ depends_dev=""
 makedepends="$depends_dev python-dev"
 install=""
 subpackages="$pkgname-dev py-$pkgname:_py $pkgname-libs"
-source="http://samba.org/ftp/tdb/tdb-$pkgver.tar.gz
-	fix-libreplace.patch
-	fix-headers.patch"
+source="http://samba.org/ftp/tdb/tdb-$pkgver.tar.gz"
 
 _builddir="$srcdir"/tdb-$pkgver
 prepare() {
@@ -60,12 +58,6 @@ libs() {
 	replaces="tdb"
 }
 
-md5sums="f597190451d976fe013dfae9934fb9ad  tdb-1.3.1.tar.gz
-b8c06c1a37bce8a7feea3b6896483da0  fix-libreplace.patch
-2a126046e54e9aa28d2bb85e4b504281  fix-headers.patch"
-sha256sums="ff29985ae880c3906ddd7609664a94c64bfe87b2b2210250e3fdee532ca2ece3  tdb-1.3.1.tar.gz
-13617f691c648b44867c1a76d8be7c185021e8a8f3b695f8689a9f6244e65827  fix-libreplace.patch
-0925f585718c6c93cc328b41c1d193778ee6135480aedf2c5976bdf0c31debeb  fix-headers.patch"
-sha512sums="556dfab08853477be784956f5a89a1748b4d02bf02cbd114f63077888a7ce85080524dfc0ea4b85dad6a552e38a80edd466c409dee2d27df385802d4b20582ce  tdb-1.3.1.tar.gz
-4adbbeb75de6c55199e10f284e741ee252f403b7809251caf4baf378669770be01d469b23e12f8119ed5dca5080dd45bda1b5b78cc7a791be44c1eb6fb8c0fa2  fix-libreplace.patch
-79e45fe750a946674652081e221b9dc5f05d98411e07cfba6b67890fa78a98088a456bf938c9349c5e108b95d6872700497d323428aef829534c430d726cddb8  fix-headers.patch"
+md5sums="fa4c9e2f59fcf41441285bca5f5ab481  tdb-1.3.8.tar.gz"
+sha256sums="0605ac0427eac9c23bf61ebfd8206a07d5ece198498eab1769cd0cfb6e7de6b1  tdb-1.3.8.tar.gz"
+sha512sums="9a7040206bbaae419a296714fe14fcbd3b67c0cef2b0f33563d52336aac2fe814049f5136a148fb049a273bb36fe81e3d777df58869c93f45d6e42b4adf9970b  tdb-1.3.8.tar.gz"
diff --git a/main/tdb/fix-headers.patch b/main/tdb/fix-headers.patch
deleted file mode 100644
index f9014c01ec..0000000000
--- a/main/tdb/fix-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/tdb.h.orig
-+++ ./include/tdb.h
-@@ -31,6 +31,8 @@
- #endif
- 
- #include <signal.h>
-+#include <stdbool.h>
-+#include <sys/types.h>
- 
- /**
-  * @defgroup tdb The tdb API
diff --git a/main/tdb/fix-libreplace.patch b/main/tdb/fix-libreplace.patch
deleted file mode 100644
index cfe24757ec..0000000000
--- a/main/tdb/fix-libreplace.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- talloc-2.1.0.orig/lib/replace/replace.c
-+++ talloc-2.1.0/lib/replace/replace.c
-@@ -508,28 +508,6 @@
- # 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 @@
- # 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
---- talloc-2.1.0.orig/lib/replace/replace.h
-+++ talloc-2.1.0/lib/replace/replace.h
-@@ -355,21 +355,11 @@
- #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
-- 
cgit v1.2.3