From 2e3441455f342251353da9e655f7e363af34765e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 10 Sep 2015 08:51:44 +0200
Subject: main/ldb: upgrade to 1.1.21

---
 main/ldb/APKBUILD             | 14 +++++++-------
 main/ldb/fix-libreplace.patch | 29 -----------------------------
 2 files changed, 7 insertions(+), 36 deletions(-)

(limited to 'main/ldb')

diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD
index 8fa285ec8..d1f66509f 100644
--- a/main/ldb/APKBUILD
+++ b/main/ldb/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ldb
-pkgver=1.1.20
+pkgver=1.1.21
 pkgrel=0
 pkgdesc="A schema-less, ldap like, API and database"
 url="http://ldb.samba.org/"
@@ -64,9 +64,9 @@ tools() {
 	mv "$pkgdir"/usr/lib/ldb/libldb-cmdline.* "$subpkgdir"/usr/lib/ldb/
 }
 
-md5sums="3d9abbdc334e8dc43e52cf8619bb2c24  ldb-1.1.20.tar.gz
-b8c06c1a37bce8a7feea3b6896483da0  fix-libreplace.patch"
-sha256sums="ba493bab271fdaa6ba07960728ffca71c8f9da5240162e86f1e56694b7a377b2  ldb-1.1.20.tar.gz
-13617f691c648b44867c1a76d8be7c185021e8a8f3b695f8689a9f6244e65827  fix-libreplace.patch"
-sha512sums="432dfa1d64197a74638762bfdfc18b060c5e37890f2c8a21dc5c8f19fc0070123400ad835256b9c1a94631f80d9930d2a2a714e711a60d11af6ab587bc372155  ldb-1.1.20.tar.gz
-4adbbeb75de6c55199e10f284e741ee252f403b7809251caf4baf378669770be01d469b23e12f8119ed5dca5080dd45bda1b5b78cc7a791be44c1eb6fb8c0fa2  fix-libreplace.patch"
+md5sums="94ba09c7452fff68df3481686c56677e  ldb-1.1.21.tar.gz
+f4d7a813003048db39160daa0d232b92  fix-libreplace.patch"
+sha256sums="267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1  ldb-1.1.21.tar.gz
+a5575ca417fa5d13feb7c52429e1a9f618c0b8640462ba780777be5000499b87  fix-libreplace.patch"
+sha512sums="2ce35bfb2c8db22c87e7adea454ae05cb1234260d9beaaea564e76c5d83d8022610f18db70ad27e0d39d951b62cd17695e2f9f576213f9ac54f7e418416a5837  ldb-1.1.21.tar.gz
+9035bfe86b95b11e1a2cfc5a2950b72916faf721667bf813fa7fad482e815ce57cb1cd94504df0e30a0e699a0afe921e6e564d4d284dac6e446f947d63235793  fix-libreplace.patch"
diff --git a/main/ldb/fix-libreplace.patch b/main/ldb/fix-libreplace.patch
index cfe24757e..e922be0f1 100644
--- a/main/ldb/fix-libreplace.patch
+++ b/main/ldb/fix-libreplace.patch
@@ -1,34 +1,5 @@
 --- 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
-- 
cgit v1.2.3