diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-17 10:01:48 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-17 10:01:48 +0000 |
| commit | 5b0822c236b3dabe1b9d32ff4ef7e512e63aff06 (patch) | |
| tree | 8712aa257e54f04d7d9041a779459a95ac18acc2 | |
| parent | 473ee080162838e7cf78455ce886dbeea5890829 (diff) | |
| download | aports-5b0822c236b3dabe1b9d32ff4ef7e512e63aff06.tar.bz2 aports-5b0822c236b3dabe1b9d32ff4ef7e512e63aff06.tar.xz | |
main/memcached: fix musl build
| -rw-r--r-- | main/memcached/APKBUILD | 6 | ||||
| -rw-r--r-- | main/memcached/musl-includes.patch | 47 |
2 files changed, 52 insertions, 1 deletions
diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD index 4751cc0457..d4f981ae21 100644 --- a/main/memcached/APKBUILD +++ b/main/memcached/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=memcached pkgver=1.4.15 -pkgrel=3 +pkgrel=4 pkgdesc="Distributed memory object caching system" url="http://memcached.org" arch="all" @@ -14,6 +14,7 @@ install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc" source="http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz CVE-2011-4971.patch + musl-includes.patch $pkgname.confd $pkgname.initd" @@ -51,13 +52,16 @@ package() { md5sums="36ea966f5a29655be1746bf4949f7f69 memcached-1.4.15.tar.gz e73c5651b37f54020bea00a4318cef2e CVE-2011-4971.patch +4b2e8c5e3ad147ed514ad7fcf1b2222a musl-includes.patch a7aa37e91d4237448124b79bd99a2649 memcached.confd cc344c9aead89042ca2fbf45cd3930a6 memcached.initd" sha256sums="169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4 memcached-1.4.15.tar.gz 0dbb2a8425e051f21a4f767055b82b6294ecf1d22082aeb24f6688bbc9870aed CVE-2011-4971.patch +1b1df3a3b70469722a89135b361cf2c2a4b9835d3c9f3029aa73342fd4619cf5 musl-includes.patch c8f03585eeeb0e0acf4e8bb3c0f7062c2c7da5f89e763cf91a856bec4991a2c7 memcached.confd e4b6415c5501963d2ce421aab9d595736091bc895b8f3762e746593f7d736792 memcached.initd" sha512sums="53a9d7c109db01c6d345c79bddcbffae4b5b113244782e869d16f2b704c07bee1d8d9270c54065c06ed878e641a68c666c02ba6d4e81f83d771ae27a2b91e511 memcached-1.4.15.tar.gz a1f6ece8e3b07509aadbd24c3420cb4400a47c6f046282243a6e295d041ff8f84ff2de86e657cb233199259cca63360e03b173a5abff0d67789eef91847be5eb CVE-2011-4971.patch +80c8719c254bc8b8d3d4256e9850c17f5e9ee9a76787b2d0fd7c6bb7780ee132257ff65d8397dc023216b3f541050295c4e1d7e675b12ab6dcc50d07c5e067b3 musl-includes.patch 31bd788433b8021ed332f86d291e7f03222ae234520e52ba673b581d5da2adf5656e8f73e8b985df73258dea9b2a1b8ef36195163fe47a92fda59825deedfed4 memcached.confd 65782982faaa8966ae0e1335ae367db1c65a94b5e218dfb1245e9d5e3b03ed42234c8023e6f6af13ba06bc6a5f25be5e34b4c84f4fd67805df280c94315c6a23 memcached.initd" diff --git a/main/memcached/musl-includes.patch b/main/memcached/musl-includes.patch new file mode 100644 index 0000000000..558931e4f5 --- /dev/null +++ b/main/memcached/musl-includes.patch @@ -0,0 +1,47 @@ +--- 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> + |