diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-26 13:51:19 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-26 13:54:42 +0000 |
| commit | 4351491c6b7798d51fc297ea2d2c2b8799da355a (patch) | |
| tree | ca5716416c8433802bb7ef2b825d7551a517558d | |
| parent | 0675036dd9c00ae637e063c5abcea1dcff6ee52b (diff) | |
| download | aports-4351491c6b7798d51fc297ea2d2c2b8799da355a.tar.bz2 aports-4351491c6b7798d51fc297ea2d2c2b8799da355a.tar.xz | |
main/ldb: upgrade to 1.1.24
| -rw-r--r-- | main/ldb/APKBUILD | 13 | ||||
| -rw-r--r-- | main/ldb/fix-libreplace.patch | 84 |
2 files changed, 5 insertions, 92 deletions
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD index b8dedbfa32..900edb0ba5 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.24 pkgrel=0 pkgdesc="A schema-less, ldap like, API and database" url="http://ldb.samba.org/" @@ -12,7 +12,7 @@ makedepends="$depends_dev tevent-dev tdb-dev talloc-dev python-dev popt-dev" install="" subpackages="$pkgname-dev py-$pkgname:_py $pkgname-tools" source="http://samba.org/ftp/ldb/ldb-$pkgver.tar.gz - fix-libreplace.patch" + " _builddir="$srcdir"/ldb-$pkgver prepare() { @@ -63,9 +63,6 @@ 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="152f061422de5b90f8ce51e0ea316292 ldb-1.1.24.tar.gz" +sha256sums="45e9f52473f0d013f0ea090cce35d6836a6e67e8d4dcdd7077dabdf8b1314b21 ldb-1.1.24.tar.gz" +sha512sums="7b574d1a832fb19a4e8506a1bd702fddf3610b94e170999c9d7b5f3047a4667fb701fa0d367fd19febc2b3e70d1325a1944081ce1067d88271e70f8370aeb278 ldb-1.1.24.tar.gz" diff --git a/main/ldb/fix-libreplace.patch b/main/ldb/fix-libreplace.patch deleted file mode 100644 index cfe24757ec..0000000000 --- a/main/ldb/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 |