Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/
Date: Thu, 25 Jun 2020 07:30:59
Message-Id: 1593070237.1698b86acb449b5758104da2b25b7fd40a7d1879.conikost@gentoo
1 commit: 1698b86acb449b5758104da2b25b7fd40a7d1879
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jun 24 18:08:58 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 25 07:30:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1698b86a
7
8 www-servers/uwsgi: remove unused patch/file
9
10 Closes: https://github.com/gentoo/gentoo/pull/16401
11 Package-Manager: Portage-2.3.101, Repoman-2.3.22
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 www-servers/uwsgi/files/2.0.14-php-plugin.patch | 22 ----------------------
16 www-servers/uwsgi/files/42_mod_uwsgi-r2.conf | 9 ---------
17 2 files changed, 31 deletions(-)
18
19 diff --git a/www-servers/uwsgi/files/2.0.14-php-plugin.patch b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
20 deleted file mode 100644
21 index f60a6553cfd..00000000000
22 --- a/www-servers/uwsgi/files/2.0.14-php-plugin.patch
23 +++ /dev/null
24 @@ -1,22 +0,0 @@
25 -From 6b332e6f7e6fc3c267a91ce5b5591684575ea271 Mon Sep 17 00:00:00 2001
26 -From: Damjan Georgievski <gdamjan@×××××.com>
27 -Date: Thu, 13 Oct 2016 00:55:35 +0200
28 -Subject: [PATCH] fix issue #1380 - compiling with llvm/freebsd
29 -
30 ----
31 - plugins/php/php_plugin.c | 2 +-
32 - 1 file changed, 1 insertion(+), 1 deletion(-)
33 -
34 -diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
35 -index 536ec1a..ef30180 100644
36 ---- a/plugins/php/php_plugin.c
37 -+++ b/plugins/php/php_plugin.c
38 -@@ -232,7 +232,7 @@ static void sapi_uwsgi_register_variables(zval *track_vars_array TSRMLS_DC)
39 - size_t name_len = equal-usl->value;
40 - char *name = estrndup(usl->value, name_len);
41 - char *strval = equal+1;
42 -- zend_register_string_constant(name, name_len, strval, CONST_CS, 0);
43 -+ zend_register_string_constant(name, name_len, strval, CONST_CS, 0 TSRMLS_CC);
44 - }
45 - usl = usl->next;
46 - }
47
48 diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
49 deleted file mode 100644
50 index 85ede87b037..00000000000
51 --- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
52 +++ /dev/null
53 @@ -1,9 +0,0 @@
54 -<IfDefine PROXY_UWSGI>
55 - LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
56 -</IfDefine>
57 -<IfDefine RUWSGI>
58 - LoadModule uwsgi_module modules/mod_Ruwsgi.so
59 -</IfDefine>
60 -<IfDefine UWSGI>
61 - LoadModule uwsgi_module modules/mod_uwsgi.so
62 -</IfDefine>