main/redis: upgrade to 3.0.0

3 files changed, 107 insertions, 23 deletions

diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD
index a10865828d..0aee4273bd 100644
--- a/main/redis/APKBUILD
+++ b/main/redis/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: V.Krishn <vkrishn4@gmail.com>
 # Maintainer: Eivind Uggedal <eivind@uggedal.com>
 pkgname=redis
-pkgver=2.8.19
+pkgver=3.0.0
 pkgrel=0
 pkgdesc="Advanced key-value store"
 url="http://redis.io/"
@@ -15,10 +15,11 @@ subpackages=""
 pkgusers="redis"
 pkggroups="redis"
 source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz
+	fix-musl-stdint.patch
 		redis.initd
 		redis.logrotate
 		redis.confd
-		redis-no-backtrace.patch"
+		"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -39,7 +40,6 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	make PREFIX=/usr \
 		INSTALL_BIN="$pkgdir"/usr/bin \
 		MALLOC=libc \
@@ -72,18 +72,18 @@ package() {
 }
 
 
-md5sums="3794107224043465603f48941f5c86a7  redis-2.8.19.tar.gz
+md5sums="cd8487159459d7575ba2664cb2a4819e  redis-3.0.0.tar.gz
+0a1a0419c833a3686a50570a8ecc6e91  fix-musl-stdint.patch
 6910862d7f07d5655c3d827a7fdddd6e  redis.initd
 ed0a5e40633e82c52c50f8bf0ed93ae0  redis.logrotate
-bf204d560e41b854297c60aff8d862d5  redis.confd
-b05226a52976efe40a23117d0b1fd9fa  redis-no-backtrace.patch"
-sha256sums="29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145  redis-2.8.19.tar.gz
+bf204d560e41b854297c60aff8d862d5  redis.confd"
+sha256sums="654c95c6236692dcb916fccba9a34d0877cc91338c8b6a372511e6eb080e34bf  redis-3.0.0.tar.gz
+ba2cce83d0e3f8fd055b3d645700e70c7f1ba324132e7e549ac87d7f8ee40c02  fix-musl-stdint.patch
 573f75738c6e9526550334552a160b5e1fdb13fad0dbd859aaafdb2fa0f49310  redis.initd
 aa078c4757fc426710310a0688cc1ab728acb7a2afa648e28b2ecbd57d003c0d  redis.logrotate
-97d50b2bee2df995317b505d459c31fe4abe74e670028f0335febdd6e4e31486  redis.confd
-595306f5ecd12530ef80914aef48020e2683cd6bb774aa167c3c3146c1b66907  redis-no-backtrace.patch"
-sha512sums="34997b45815cfdec9fbb06cd6664ed6ddf71baf064fd9ac155b7b969fd5945f78927cd5dfde83b043dc8ff1d7e35b172b9403cdf6115b8ca7bdf80c581ee9cdd  redis-2.8.19.tar.gz
+97d50b2bee2df995317b505d459c31fe4abe74e670028f0335febdd6e4e31486  redis.confd"
+sha512sums="c7403eaa58dcdb8c85d53531b262a07099fc38ecb5e4e41622ad9355d356ecd269d691f15ef65da9fb9241395c2a3cb72eea27325d632b7cd8eaf3c4d2e3fe72  redis-3.0.0.tar.gz
+2134b5df538eda5140214b0ba720ddd5a3a612d6856d01140001bbb787ce1242d3c847c5ab553cf690ca780078cded527a25fe3a0e4afd3c953719fe04e390e4  fix-musl-stdint.patch
 35f10b9cfcc19ebcffb418d031bdc5bcf613d5e12d601c04ad1475b0e805950cb3a2304ba6137432b0a1d9bbc788aa2d8246d036f9f96f3b9c1f7a76ffaad845  redis.initd
 6d17d169b40a7e23a0a2894eff0f3e2fe8e4461b36f2a9d45468f0abd84ea1035d679b4c0a34029bce093147f9c7bb697e843c113c17769d38c934d4a78a5848  redis.logrotate
-d87aad6185300c99cc9b6a478c83bf62c450fb2c225592d74cc43a3adb93e19d8d2a42cc279907b385aa73a7b9c77b66828dbfb001009edc16a604abb2087e99  redis.confd
-c2ff78d0c161ef63661e09d860887d35c74049a2ae3bd00ced755fb848dfe2ae60b1f0a2b435f5c028638db5502de1475f8355bb097d8180a4d2c76def36a1cc  redis-no-backtrace.patch"
+d87aad6185300c99cc9b6a478c83bf62c450fb2c225592d74cc43a3adb93e19d8d2a42cc279907b385aa73a7b9c77b66828dbfb001009edc16a604abb2087e99  redis.confd"
diff --git a/main/redis/fix-musl-stdint.patch b/main/redis/fix-musl-stdint.patch
new file mode 100644
index 0000000000..5914e5688b
--- /dev/null
+++ b/main/redis/fix-musl-stdint.patch
@@ -0,0 +1,95 @@
+From 6056a76392b52a5b38e57aec2c7ca46b748df298 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 2 Apr 2015 08:27:16 +0200
+Subject: [PATCH] sha1: use standard uint32_t integer type
+
+Use the C99 standard uint32_t type instead of the implementation
+specific u_int32_t.
+
+This fixes the following compile error when building with musl libc:
+
+  In file included from sha1.c:28:0:
+  sha1.h:11:5: error: unknown type name 'u_int32_t'
+       u_int32_t state[5];
+       ^
+---
+ src/sha1.c | 14 +++++++-------
+ src/sha1.h | 10 ++++++----
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/src/sha1.c b/src/sha1.c
+index 7f73b40..e65b59b 100644
+--- a/src/sha1.c
++++ b/src/sha1.c
+@@ -23,7 +23,7 @@ A million repetitions of "a"
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <sys/types.h>	/* for u_int*_t */
++#include <stdint.h>	/* for uint*_t */
+ #include "solarisfixes.h"
+ #include "sha1.h"
+ #include "config.h"
+@@ -53,12 +53,12 @@ A million repetitions of "a"
+ 
+ /* Hash a single 512-bit block. This is the core of the algorithm. */
+ 
+-void SHA1Transform(u_int32_t state[5], const unsigned char buffer[64])
++void SHA1Transform(uint32_t state[5], const unsigned char buffer[64])
+ {
+-    u_int32_t a, b, c, d, e;
++    uint32_t a, b, c, d, e;
+     typedef union {
+         unsigned char c[64];
+-        u_int32_t l[16];
++        uint32_t l[16];
+     } CHAR64LONG16;
+ #ifdef SHA1HANDSOFF
+     CHAR64LONG16 block[1];  /* use array to appear as a pointer */
+@@ -128,9 +128,9 @@ void SHA1Init(SHA1_CTX* context)
+ 
+ /* Run your data through this. */
+ 
+-void SHA1Update(SHA1_CTX* context, const unsigned char* data, u_int32_t len)
++void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len)
+ {
+-    u_int32_t i, j;
++    uint32_t i, j;
+ 
+     j = context->count[0];
+     if ((context->count[0] += len << 3) < j)
+@@ -168,7 +168,7 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
+ 
+     for (i = 0; i < 2; i++)
+        {
+-        u_int32_t t = context->count[i];
++        uint32_t t = context->count[i];
+         int j;
+ 
+         for (j = 0; j < 4; t >>= 8, j++)
+diff --git a/src/sha1.h b/src/sha1.h
+index 4c76d19..92e3528 100644
+--- a/src/sha1.h
++++ b/src/sha1.h
+@@ -7,15 +7,17 @@ By Steve Reid <steve@edmweb.com>
+ 100% Public Domain
+ */
+ 
++#include <stdint.h>
++
+ typedef struct {
+-    u_int32_t state[5];
+-    u_int32_t count[2];
++    uint32_t state[5];
++    uint32_t count[2];
+     unsigned char buffer[64];
+ } SHA1_CTX;
+ 
+-void SHA1Transform(u_int32_t state[5], const unsigned char buffer[64]);
++void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]);
+ void SHA1Init(SHA1_CTX* context);
+-void SHA1Update(SHA1_CTX* context, const unsigned char* data, u_int32_t len);
++void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len);
+ void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
+ 
+ #ifdef REDIS_TEST
diff --git a/main/redis/redis-no-backtrace.patch b/main/redis/redis-no-backtrace.patch
deleted file mode 100644
index 809e924f20..0000000000
--- a/main/redis/redis-no-backtrace.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/config.h
-+++ b/src/config.h
-@@ -54,7 +54,7 @@
- #endif
- 
- /* Test for backtrace() */
--#if defined(__APPLE__) || defined(__linux__)
-+#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__))
- #define HAVE_BACKTRACE 1
- #endif
-