diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-26 15:04:54 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-26 15:04:54 +0000 |
| commit | 86b421dd17ac99389aed8bb87e2eb0f89bcbe697 (patch) | |
| tree | c8918481a04d87d37a9674bfa757e53b92938249 /main | |
| parent | dc909b6939e05d916f20501d052194be85e118f8 (diff) | |
| download | aports-86b421dd17ac99389aed8bb87e2eb0f89bcbe697.tar.bz2 aports-86b421dd17ac99389aed8bb87e2eb0f89bcbe697.tar.xz | |
main/talloc: upgrade to 2.1.5
Diffstat (limited to 'main')
| -rw-r--r-- | main/talloc/APKBUILD | 18 | ||||
| -rw-r--r-- | main/talloc/fix-libreplace.patch | 84 |
2 files changed, 7 insertions, 95 deletions
diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD index 0d4e620b58..7231837591 100644 --- a/main/talloc/APKBUILD +++ b/main/talloc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=talloc -pkgver=2.1.1 +pkgver=2.1.5 pkgrel=0 pkgdesc="A memory pool management library" url="http://talloc.samba.org/" @@ -15,7 +15,6 @@ install="" subpackages="$pkgname-dev py-$pkgname:_py" source="http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz always-libs.patch - fix-libreplace.patch " _builddir="${srcdir}/${pkgname}-${pkgver}" @@ -61,12 +60,9 @@ _py() { "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -md5sums="5dffb86414218a91864ed4453ba9be07 talloc-2.1.1.tar.gz -10304afbc3b00346238bf5a969227c68 always-libs.patch -b8c06c1a37bce8a7feea3b6896483da0 fix-libreplace.patch" -sha256sums="3e29ce6c3ba3c4f7c2d57ce8cf0fbc24c86618c519f2b2fb6a459025488b6174 talloc-2.1.1.tar.gz -a0b3778ed751f9acb7a7e3cdd13d4f38762f497b35ce761359cc48d366f43318 always-libs.patch -13617f691c648b44867c1a76d8be7c185021e8a8f3b695f8689a9f6244e65827 fix-libreplace.patch" -sha512sums="92aac5e5a759c65733260152980f798a5bf06bcbe8a58c23cbae91dd741306c097499a063410c4fa01f1b25db7d965666f94e1c181922694ed3f638a312d809d talloc-2.1.1.tar.gz -dc7ce3fa5152c2e796b184bf2f7937f3424b9f1fece580195364d416ede47e655c04f1fa3ce33cd2a27d0764039ddbaec8d72c4bf3e96f6eac2c09743bed4b8c always-libs.patch -4adbbeb75de6c55199e10f284e741ee252f403b7809251caf4baf378669770be01d469b23e12f8119ed5dca5080dd45bda1b5b78cc7a791be44c1eb6fb8c0fa2 fix-libreplace.patch" +md5sums="f497cb42b3d9622b721b72146f1fa3be talloc-2.1.5.tar.gz +10304afbc3b00346238bf5a969227c68 always-libs.patch" +sha256sums="3833e750cf0b8c3439186cba38800cba9e26adfbce10ee98ba709c24eb1cdddd talloc-2.1.5.tar.gz +a0b3778ed751f9acb7a7e3cdd13d4f38762f497b35ce761359cc48d366f43318 always-libs.patch" +sha512sums="b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741 talloc-2.1.5.tar.gz +dc7ce3fa5152c2e796b184bf2f7937f3424b9f1fece580195364d416ede47e655c04f1fa3ce33cd2a27d0764039ddbaec8d72c4bf3e96f6eac2c09743bed4b8c always-libs.patch" diff --git a/main/talloc/fix-libreplace.patch b/main/talloc/fix-libreplace.patch deleted file mode 100644 index cfe24757ec..0000000000 --- a/main/talloc/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 |