diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-09 08:52:50 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-12-09 08:53:03 +0000 |
| commit | deb5bb9e4f042f905421bfd5b6530b6bd98e6dd5 (patch) | |
| tree | 6338033c655ddcb9551e2875696a6ca0e9d00f18 /main | |
| parent | bed92b0e0ee6ee536bd20d8543f865df5f9867c7 (diff) | |
| download | aports-deb5bb9e4f042f905421bfd5b6530b6bd98e6dd5.tar.bz2 aports-deb5bb9e4f042f905421bfd5b6530b6bd98e6dd5.tar.xz | |
main/tdb: upgrade to 1.3.8
Diffstat (limited to 'main')
| -rw-r--r-- | main/tdb/APKBUILD | 12 | ||||
| -rw-r--r-- | main/tdb/fix-libreplace.patch | 55 |
2 files changed, 4 insertions, 63 deletions
diff --git a/main/tdb/APKBUILD b/main/tdb/APKBUILD index da579d7161..e2c9ab72d2 100644 --- a/main/tdb/APKBUILD +++ b/main/tdb/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tdb -pkgver=1.3.7 +pkgver=1.3.8 pkgrel=0 pkgdesc="The tdb library" url="http://tdb.samba.org/" @@ -12,7 +12,6 @@ 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 " _builddir="$srcdir"/tdb-$pkgver @@ -59,9 +58,6 @@ libs() { replaces="tdb" } -md5sums="e3741a19c427255acd1e92c5e09d9df7 tdb-1.3.7.tar.gz -f4d7a813003048db39160daa0d232b92 fix-libreplace.patch" -sha256sums="a64d95ca0cc06a28fed24c6e952aed7660cae04983108735d6bc30b925136412 tdb-1.3.7.tar.gz -a5575ca417fa5d13feb7c52429e1a9f618c0b8640462ba780777be5000499b87 fix-libreplace.patch" -sha512sums="661404df8328a2e7bbb0d7865759e299edafee186f3798c11034c36b2076402a826306007986d6cdd5bf8774d2af7ebf4312a501ca9d9e62a26e504bc13652e4 tdb-1.3.7.tar.gz -9035bfe86b95b11e1a2cfc5a2950b72916faf721667bf813fa7fad482e815ce57cb1cd94504df0e30a0e699a0afe921e6e564d4d284dac6e446f947d63235793 fix-libreplace.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-libreplace.patch b/main/tdb/fix-libreplace.patch deleted file mode 100644 index e922be0f1a..0000000000 --- a/main/tdb/fix-libreplace.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- talloc-2.1.0.orig/lib/replace/replace.c -+++ talloc-2.1.0/lib/replace/replace.c -@@ -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 |