Subject: [alpine-aports] v3.3 main/memcached: fix 6447, security upgrade

From: Sergey Lukin <[email-masked]>
Date: Wed, 30 Nov 2016 14:54:51 +0200

>From efdadbceb75d8a4523dee55a7f6e6759858805b5 Mon Sep 17 00:00:00 2001
From: Sergey Lukin <[email-masked]>
Date: Wed, 30 Nov 2016 12:27:06 +0000
Subject: [PATCH] main/memcached: security upgrade to 1.4.33 - fixes: #6447

(CVE-2016-8704, CVE-2016-8705, CVE-2016-8706)
---
 main/memcached/APKBUILD            | 12 ++++------
 main/memcached/musl-includes.patch | 47 --------------------------------------
 2 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 main/memcached/musl-includes.patch

diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD
index 6b655d5..41fce02 100644
--- a/main/memcached/APKBUILD
+++ b/main/memcached/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeff Bilyk <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=memcached
-pkgver=1.4.25
+pkgver=1.4.33
 pkgrel=0
 pkgdesc="Distributed memory object caching system"
 url="http://memcached.org"
@@ -13,7 +13,6 @@ makedepends="$depends_dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.memcached.org/files/memcached-$pkgver.tar.gz
-	musl-includes.patch
 	$pkgname.confd
 	$pkgname.initd"
 
@@ -48,15 +47,12 @@ package() {
 		"$pkgdir/etc/conf.d/$pkgname" || return 1
 }
 
-md5sums="55ca94e02639365fef3eac2b3f96de7c  memcached-1.4.25.tar.gz
-4b2e8c5e3ad147ed514ad7fcf1b2222a  musl-includes.patch
+md5sums="2d7f6476283cd36e21e521d901d37a8f  memcached-1.4.33.tar.gz
 a7aa37e91d4237448124b79bd99a2649  memcached.confd
 220c0331832edcef6a72601143d3172d  memcached.initd"
-sha256sums="f058437b3c224d321919a9a6bb4e3eedb2312ed718c0caf087ff2f04ab795dda  memcached-1.4.25.tar.gz
-1b1df3a3b70469722a89135b361cf2c2a4b9835d3c9f3029aa73342fd4619cf5  musl-includes.patch
+sha256sums="83726c8d68258c56712373072abb25a449c257398075a39ec0867fd8ba69771d  memcached-1.4.33.tar.gz
 c8f03585eeeb0e0acf4e8bb3c0f7062c2c7da5f89e763cf91a856bec4991a2c7  memcached.confd
 da8a0e9a580d2df053941f01ce430aa5b678270891b481c710758b81fb4d831c  memcached.initd"
-sha512sums="e037c3bbb68c4077f814f855663501af418ce3b1f8bc20f8e7eba3249aea378e55b3291457952fa4511779ec3702496fdaab5799edae7d59bc64eb6fd54ee14e  memcached-1.4.25.tar.gz
-80c8719c254bc8b8d3d4256e9850c17f5e9ee9a76787b2d0fd7c6bb7780ee132257ff65d8397dc023216b3f541050295c4e1d7e675b12ab6dcc50d07c5e067b3  musl-includes.patch
+sha512sums="00af5a2f46702fb8e606b1035cdaad125445d8eb701927a3ccccd7cd6c12e0811efb3ad917e3118043fd993b5c313f1aa0c4b2a471218e971a21fed7c896e136  memcached-1.4.33.tar.gz
 31bd788433b8021ed332f86d291e7f03222ae234520e52ba673b581d5da2adf5656e8f73e8b985df73258dea9b2a1b8ef36195163fe47a92fda59825deedfed4  memcached.confd
 9615769b14175a25b50c9871b48c0635b5397ebe45231b43ee29a603eceb7b16bfc5ac744017b89b19082209c09597b3038a03ed0d5d9b45c60454d5b2717a55  memcached.initd"
diff --git a/main/memcached/musl-includes.patch b/main/memcached/musl-includes.patch
deleted file mode 100644
index 558931e..0000000
--- a/main/memcached/musl-includes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- memcached-1.4.15.orig/assoc.c
-+++ memcached-1.4.15/assoc.c
-@@ -14,8 +14,8 @@
- #include "memcached.h"
- #include <sys/stat.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
- #include <sys/resource.h>
-+#include <signal.h>
- #include <fcntl.h>
- #include <netinet/in.h>
- #include <errno.h>
---- memcached-1.4.15.orig/items.c
-+++ memcached-1.4.15/items.c
-@@ -2,13 +2,13 @@
- #include "memcached.h"
- #include <sys/stat.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
- #include <sys/resource.h>
- #include <fcntl.h>
- #include <netinet/in.h>
- #include <errno.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <signal.h>
- #include <string.h>
- #include <time.h>
- #include <assert.h>
---- memcached-1.4.15.orig/slabs.c
-+++ memcached-1.4.15/slabs.c
-@@ -10,7 +10,6 @@
- #include "memcached.h"
- #include <sys/stat.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
- #include <sys/resource.h>
- #include <fcntl.h>
- #include <netinet/in.h>
-@@ -18,6 +17,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <signal.h>
- #include <assert.h>
- #include <pthread.h>
- 
-- 
2.6.6