snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

uwsgi: update to 2.0.13.

This commit is contained in:
Michael Gehring 2016-05-10 18:18:05 +02:00
parent 0a40f1a17f
commit 360b0681a6
5 changed files with 2 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
srcpkgs/uwsgi/patches/0001-use-portable-pthread-functions-instead-of-the-non-po.patch
View File

@ -1,40 +0,0 @@
From 1a09a7264026339d8e0c4899a2f9ff488c0bd97d Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 10 Feb 2014 12:13:00 +0000
Subject: [PATCH 1/4] use portable pthread functions instead of the
non-portable
The pthread functions pthread_mutexattr_setrobust and
pthread_mutex_consistent are in posix nowdays. Use those instead of their
non-portable synonyms.
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
core/lock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/lock.c b/core/lock.c
index d368148..f806b2c 100644
--- core/lock.c
+++ core/lock.c
@@ -99,7 +99,7 @@ retry:
exit(1);
}
if (uwsgi_pthread_robust_mutexes_enabled) {
- if (pthread_mutexattr_setrobust_np(&attr, PTHREAD_MUTEX_ROBUST)) {
+ if (pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST)) {
uwsgi_log("unable to make the mutex 'robust'\n");
exit(1);
}
@@ -161,7 +161,7 @@ void uwsgi_lock_fast(struct uwsgi_lock_item *uli) {
#ifdef EOWNERDEAD
if (pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr) == EOWNERDEAD) {
uwsgi_log("[deadlock-detector] a process holding a robust mutex died. recovering...\n");
- pthread_mutex_consistent_np((pthread_mutex_t *) uli->lock_ptr);
+ pthread_mutex_consistent((pthread_mutex_t *) uli->lock_ptr);
}
#else
pthread_mutex_lock((pthread_mutex_t *) uli->lock_ptr);
--
1.8.5.3

31
srcpkgs/uwsgi/patches/0002-Check-for-GNU-libc-instead-of-linux-for-use-of-execi.patch
View File

@ -1,31 +0,0 @@
From ab68dc90d3a6e3ae660adb65cf8a020d91eb8f09 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 10 Feb 2014 12:17:18 +0000
Subject: [PATCH 2/4] Check for GNU libc instead of linux for use of execinfo.h
Since execinfo.h is a GNU extension it makes more sense to check for GNU
than to assume that linux is GNU.
This is needed for building on linux with musl libc.
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
core/uwsgi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/uwsgi.c b/core/uwsgi.c
index 67b175b..b3b25ae 100644
--- core/uwsgi.c
+++ core/uwsgi.c
@@ -1690,7 +1690,7 @@ void uwsgi_plugins_atexit(void) {
void uwsgi_backtrace(int depth) {
-#if defined(__linux__) || (defined(__APPLE__) && !defined(NO_EXECINFO)) || defined(UWSGI_HAS_EXECINFO)
+#if defined(__GLIBC__) || (defined(__APPLE__) && !defined(NO_EXECINFO)) || defined(UWSGI_HAS_EXECINFO)
#include <execinfo.h>
--
1.8.5.3

64
srcpkgs/uwsgi/patches/0003-always-define-_GNU_SOURCE-for-linux.patch
View File

@ -1,64 +0,0 @@
From c6ddb3e4ca72f6ec8662f8a18674eb4d861561b8 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 10 Feb 2014 13:03:50 +0000
Subject: [PATCH 3/4] always define _GNU_SOURCE for linux
We are using various extenstions that the spec say depends on _GNU_SOURCE,
for example unshare, CPU_SET, CPU_ZERO, cpu_set_t. We enable those always
for linux and we never unset it.
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
uwsgi.h | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/uwsgi.h b/uwsgi.h
index b3ce4f7..3131a0f 100644
--- uwsgi.h
+++ uwsgi.h
@@ -149,29 +149,22 @@ extern "C" {
#endif
#endif
+#ifdef __linux__
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
-#include <stdio.h>
-#ifdef __UCLIBC__
-#include <sched.h>
+#ifndef __USE_GNU
+#define __USE_GNU
+#endif
#endif
-#undef _GNU_SOURCE
+#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <signal.h>
#include <math.h>
#include <sys/types.h>
-#ifdef __linux__
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#ifndef __USE_GNU
-#define __USE_GNU
-#endif
-#endif
#include <sys/socket.h>
#include <net/if.h>
#ifdef __linux__
@@ -179,7 +172,6 @@ extern "C" {
#define MSG_FASTOPEN 0x20000000
#endif
#endif
-#undef _GNU_SOURCE
#include <netinet/in.h>
#include <termios.h>
--
1.8.5.3

34
srcpkgs/uwsgi/patches/0004-define-WAIT_ANY-if-missing.patch
View File

@ -1,34 +0,0 @@
From 393de27d01710718ffedf46cbbe20c5a1d559c9e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 10 Feb 2014 13:15:07 +0000
Subject: [PATCH 4/4] define WAIT_ANY if missing
POSIX uses -1 and does not define WAIT_ANY so we need to define it if
needed.
See:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/waitpid.html
http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_wait.h.html
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
uwsgi.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/uwsgi.h b/uwsgi.h
index 3131a0f..7a0d93e 100644
--- uwsgi.h
+++ uwsgi.h
@@ -257,6 +257,9 @@ extern int pivot_root(const char *new_root, const char *put_old);
#include <stdint.h>
#include <sys/wait.h>
+#ifndef WAIT_ANY
+#define WAIT_ANY (-1)
+#endif
#ifdef __APPLE__
#ifndef MAC_OS_X_VERSION_MIN_REQUIRED
--
1.8.5.3

4
srcpkgs/uwsgi/template
View File

@ -1,6 +1,6 @@
# Template file for 'uwsgi'
pkgname=uwsgi
version=2.0.12
version=2.0.13
revision=1
hostmakedepends="python python3.4"
makedepends="python-devel python3.4-devel"
@ -9,7 +9,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="GPL-2"
homepage="http://projects.unbit.it/uwsgi"
distfiles="http://projects.unbit.it/downloads/uwsgi-$version.tar.gz"
checksum=306b51db97648d6d23bb7eacd76e5a413434575f220dac1de231c8c26d33e409
checksum=038ba9c21ad71ab02a5b966b95ee8627af0aa4966e066865f7063a0ab1c0305e
_libdir=usr/lib/uwsgi