From c980b0a0a6175c82e85bad48f21d13d9555bf624 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Tue, 28 Sep 2021 07:30:40 +0300
Subject: [PATCH] main/memcached: upgrade to 1.6.11
---
main/memcached/APKBUILD | 11 +++++++----
main/memcached/fix-bsd-headers.patch | 22 ++++++++++++++++++++++
2 files changed, 29 insertions(+), 4 deletions(-)
create mode 100644 main/memcached/fix-bsd-headers.patch
diff --git a/main/memcached/APKBUILD b/main/memcached/APKBUILD
index 6e6ad60e09f1..95eacf90cf65 100644
--- a/main/memcached/APKBUILD
+++ b/main/memcached/APKBUILD
@@ -1,19 +1,21 @@
# Contributor: Jeff Bilyk <jbilyk@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=memcached
-pkgver=1.6.10
+pkgver=1.6.11
pkgrel=0
pkgdesc="Distributed memory object caching system"
url="https://memcached.org/"
arch="all"
license="BSD-3-Clause"
depends_dev="$pkgname=$pkgver-r$pkgrel"
-makedepends="$depends_dev cyrus-sasl-dev libevent-dev libseccomp-dev linux-headers"
+makedepends="$depends_dev cyrus-sasl-dev libevent-dev libseccomp-dev linux-headers bsd-compat-headers"
install="$pkgname.pre-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
source="https://www.memcached.org/files/memcached-$pkgver.tar.gz
$pkgname.confd
- $pkgname.initd"
+ $pkgname.initd
+ fix-bsd-headers.patch
+ "
build() {
./configure \
@@ -39,7 +41,8 @@ package() {
}
sha512sums="
-46d41c87afd0fb3a15bd418d757a25f93bee7d052653a488b4bc29a795826b9c238590cd9ee602ca4e5f645ece74685c644a9bb12bb58ff79b098c4fcf5b3835 memcached-1.6.10.tar.gz
+0c60933a73ae76d829a8fc5655797a348771b7975dc3ba0672d71541eeb5caf54214c9a7094397285fdd07a1ab3086f2ba181852a0917406b116e471ccbb27f8 memcached-1.6.11.tar.gz
31bd788433b8021ed332f86d291e7f03222ae234520e52ba673b581d5da2adf5656e8f73e8b985df73258dea9b2a1b8ef36195163fe47a92fda59825deedfed4 memcached.confd
11566ce544c3feedbbcca7f87cf21c9d7f7e47c8a0ebdbc0e833ac18a858211c5b00d4128457f957401f6f20453f0cbe902570488133a503c79ee01c102a7c18 memcached.initd
+5b1ea6b0be30ca82b914532f698eea9c05eded06b45385b0fc565ee1c241836df36d421e0b86f8fe15876519d5d2e9661e30f8af0d1485b71be3f0896aedf9dd fix-bsd-headers.patch
"
diff --git a/main/memcached/fix-bsd-headers.patch b/main/memcached/fix-bsd-headers.patch
new file mode 100644
index 000000000000..03d00e3a68d7
--- /dev/null
+++ b/main/memcached/fix-bsd-headers.patch
@@ -0,0 +1,22 @@
+--- a/thread.c
++++ b/thread.c
+@@ -16,7 +16,7 @@
+ #include <string.h>
+ #include <pthread.h>
+
+-#include "queue.h"
++#include <sys/queue.h>
+
+ #ifdef __sun
+ #include <atomic.h>
+--- a/cache.h
++++ b/cache.h
+@@ -2,7 +2,7 @@
+ #ifndef CACHE_H
+ #define CACHE_H
+ #include <pthread.h>
+-#include "queue.h"
++#include <sys/queue.h>
+
+ #ifndef NDEBUG
+ /* may be used for debug purposes */
--
GitLab