diff options
Diffstat (limited to 'main/tevent')
| -rw-r--r-- | main/tevent/APKBUILD | 13 | ||||
| -rw-r--r-- | main/tevent/fix-libreplace.patch | 84 |
2 files changed, 5 insertions, 92 deletions
diff --git a/main/tevent/APKBUILD b/main/tevent/APKBUILD index ec2233d0e6..08c8b86c2d 100644 --- a/main/tevent/APKBUILD +++ b/main/tevent/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tevent -pkgver=0.9.25 +pkgver=0.9.26 pkgrel=0 pkgdesc="The tevent library" url="http://tevent.samba.org/" @@ -13,7 +13,7 @@ replaces="samba" install="" subpackages="$pkgname-dev py-$pkgname:_py" source="http://samba.org/ftp/tevent/tevent-$pkgver.tar.gz - fix-libreplace.patch" + " _builddir="$srcdir"/tevent-$pkgver prepare() { @@ -54,9 +54,6 @@ _py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -md5sums="8d01a2076cb8cd30cab40393d27043df tevent-0.9.25.tar.gz -b8c06c1a37bce8a7feea3b6896483da0 fix-libreplace.patch" -sha256sums="fedeb0d55a11b3593b562ec09b32e44bd67619ed10e5fa10d1868adb1649c669 tevent-0.9.25.tar.gz -13617f691c648b44867c1a76d8be7c185021e8a8f3b695f8689a9f6244e65827 fix-libreplace.patch" -sha512sums="5cc477bf7a67b2a80c5d663a8382c0006395b17396f5e7ac44ed24b40b58b8a498497b08ed050a2ea838140ad36d60ad3256552c60b3339bf307244f9de4704e tevent-0.9.25.tar.gz -4adbbeb75de6c55199e10f284e741ee252f403b7809251caf4baf378669770be01d469b23e12f8119ed5dca5080dd45bda1b5b78cc7a791be44c1eb6fb8c0fa2 fix-libreplace.patch" +md5sums="22c372f3d936d751271f588ab71f829b tevent-0.9.26.tar.gz" +sha256sums="262c14d78ede13f2c4fc5e61485ae7250a201782d94735a1d8412652453370bd tevent-0.9.26.tar.gz" +sha512sums="cc841e4267cdda52d4e236040a82852a29a29427d7d374170cc74b4ff8ec0652f521580a1f69a9b4f2a66d8b2a6e3fcd34f21b2e94d0512dae848d271c090ec1 tevent-0.9.26.tar.gz" diff --git a/main/tevent/fix-libreplace.patch b/main/tevent/fix-libreplace.patch deleted file mode 100644 index cfe24757ec..0000000000 --- a/main/tevent/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 |