[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/

2024-06-02 Thread Sam James 
commit: b8e9a26577a8ed86a17991d0b3608122bc6af4a5
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  3 02:37:51 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  3 02:38:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e9a265

www-servers/uwsgi: drop 2.0.21-r1, 2.0.21-r2

Signed-off-by: Sam James  gentoo.org>

 www-servers/uwsgi/Manifest |   1 -
 www-servers/uwsgi/files/uwsgi-2.0.21-php82.patch   |  41 ---
 .../uwsgi/files/uwsgi-2.0.21-python-unicode.patch  |  21 --
 www-servers/uwsgi/metadata.xml |   1 -
 www-servers/uwsgi/uwsgi-2.0.21-r1.ebuild   | 385 -
 www-servers/uwsgi/uwsgi-2.0.21-r2.ebuild   | 377 
 6 files changed, 826 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 8e06a90e7d29..52d0cd6cbe37 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,2 +1 @@
-DIST uwsgi-2.0.21.tar.gz 808494 BLAKE2B 
3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532b3e8b537db80acc908fc26121b752e35ebc0bf9a542678843fd02ff54
 SHA512 
36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177a077338ec8af3ef0b8f8e220bc4fc7f8311dab8066e13cbcbb616f736c795
 DIST uwsgi-2.0.23.tar.gz 810116 BLAKE2B 
be4353ac71a5282233b0a996e74e49bff66f4c460eb2640058c7028cfeae41214661785de78cdd4aa35415bcc4595e1e340ba48db87bee413754b13d8b24a7d8
 SHA512 
4060dd66f8c6309497b52a961c36a58fe2b3b3afc7e11b97cfa464757c614d1d44ccc561b18500a394b5d95e5660eae48759003a30ec07379a6f079f63f3899b

diff --git a/www-servers/uwsgi/files/uwsgi-2.0.21-php82.patch 
b/www-servers/uwsgi/files/uwsgi-2.0.21-php82.patch
deleted file mode 100644
index 8a830389b989..
--- a/www-servers/uwsgi/files/uwsgi-2.0.21-php82.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://github.com/unbit/uwsgi/commit/6fba62a3ad947b656bb4379f8f903e90c7b01346
-
-From 6fba62a3ad947b656bb4379f8f903e90c7b01346 Mon Sep 17 00:00:00 2001
-From: Alexandre Rossi 
-Date: Tue, 10 Jan 2023 10:01:05 +
-Subject: [PATCH] plugins/php: fix build with PHP >= 8.2
-
-from https://raw.githubusercontent.com/php/php-src/PHP-8.2/UPGRADING.INTERNALS:
-
- 5. SAPI changes 
-
-* The signature of php_module_startup() has changed from
-
-int php_module_startup(sapi_module_struct *sf, zend_module_entry 
*additional_modules, uint32_t num_additional_modules)
-
-to
-
-zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry 
*additional_module)
-
-as only one additional module was ever provided.

- plugins/php/php_plugin.c | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
-index 9bb8befad..4d3930b82 100644
 a/plugins/php/php_plugin.c
-+++ b/plugins/php/php_plugin.c
-@@ -607,7 +607,11 @@ static void activate_user_config(const char *filename, 
const char *doc_root, siz
- static int php_uwsgi_startup(sapi_module_struct *sapi_module)
- {
- 
-+#if ((PHP_MAJOR_VERSION >= 8) && (PHP_MINOR_VERSION >= 2))
-+  if (php_module_startup(_sapi_module, 
_module_entry)==FAILURE) {
-+#else
-   if (php_module_startup(_sapi_module, _module_entry, 
1)==FAILURE) {
-+#endif
-   return FAILURE;
-   } else {
-   return SUCCESS;
-

diff --git a/www-servers/uwsgi/files/uwsgi-2.0.21-python-unicode.patch 
b/www-servers/uwsgi/files/uwsgi-2.0.21-python-unicode.patch
deleted file mode 100644
index b346c2655175..
--- a/www-servers/uwsgi/files/uwsgi-2.0.21-python-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/unbit/uwsgi/commit/509104eaff6f6ecde656c20fdd65a0b98b371c8d
-
-From 509104eaff6f6ecde656c20fdd65a0b98b371c8d Mon Sep 17 00:00:00 2001
-From: Nicolas Evrard 
-Date: Thu, 17 Nov 2022 09:47:39 +0100
-Subject: [PATCH] plugins/python: Use "backslashreplace" on stderr
- initialization
-
-Failing to use this value will result in enconding errors when logging
-unicode characters to stderr
 a/plugins/python/python_plugin.c
-+++ b/plugins/python/python_plugin.c
-@@ -554,7 +554,7 @@ void init_uwsgi_vars() {
- #ifdef HAS_NO_ERRORS_IN_PyFile_FromFd
-   PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, 
NULL, NULL, 0);
- #else
--  PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, 
NULL, NULL, NULL, 0);
-+  PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, 
NULL, "backslashreplace", NULL, 0);
- #endif
-   PyDict_SetItemString(pysys_dict, "stdout", new_stdprint);
-   PyDict_SetItemString(pysys_dict, "__stdout__", new_stdprint);

diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 84453cdb8a75..3ddb3d62a7b8 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/metadata.xml
@@ -8,7 +8,6 @@
Embed plugins instead of building them as 
real plugins. When disabling this

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/

2024-03-04 Thread Alexys Jacob 
commit: 328e4997a35aca0e7bb51179cf79805fa2781138
Author: Anthony Ryan  gmail  com>
AuthorDate: Thu Feb 29 23:13:21 2024 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Mon Mar  4 13:50:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328e4997

www-servers/uwsgi: OpenRC init.d stop timeout should reflect the default 
shutdown time

If we don't wait long enough for uwsgi to shut down all it's workers properly
OpenRC can lose track of the pid or think the daemon has crashed if shutdown
finishes after OpenRC has given up.

Signed-off-by: Anthony Ryan  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35582
Signed-off-by: Alexys Jacob  gentoo.org>

 www-servers/uwsgi/files/uwsgi.initd-r7 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r7 
b/www-servers/uwsgi/files/uwsgi.initd-r7
index 64dfc7a736ff..a6b99edf1b38 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r7
+++ b/www-servers/uwsgi/files/uwsgi.initd-r7
@@ -128,7 +128,8 @@ stop() {
else
ebegin "Stopping uWSGI application ${PROGNAME}"
fi
-   start-stop-daemon --stop --signal QUIT --pidfile "${PIDFILE}"
+   # retry should be set higher than uwsgi worker-reload-mercy (default 60)
+   start-stop-daemon --stop --signal QUIT --retry 90 --pidfile "${PIDFILE}"
eend $?
 }

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/

2023-06-23 Thread Sam James 
commit: 014a2f3e4e2aedc32affb349800d7a78b2932493
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 23 09:06:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 23 09:37:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=014a2f3e

www-servers/uwsgi: drop 2.0.19.1-r109

Signed-off-by: Sam James  gentoo.org>

 www-servers/uwsgi/Manifest |   1 -
 .../uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch   |  23 --
 .../uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch |  36 --
 .../files/uwsgi-2.0.19.1-pynode-compile.patch  | 123 ---
 www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild   | 373 -
 5 files changed, 556 deletions(-)

diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 2c94a02b32c1..f91dcee8eab5 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,2 +1 @@
-DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 
73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2
 SHA512 
34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
 DIST uwsgi-2.0.21.tar.gz 808494 BLAKE2B 
3c5fc3ce3a6a7f8f915bb302c0b775a75227f859dd2b141034e8b1aa5cb867b447ed532b3e8b537db80acc908fc26121b752e35ebc0bf9a542678843fd02ff54
 SHA512 
36a9c1b87a4c3d08482b9045d2227f56b006acb53f38ddf1b510880ae5fc24c0177a077338ec8af3ef0b8f8e220bc4fc7f8311dab8066e13cbcbb616f736c795

diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch 
b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch
deleted file mode 100644
index d175a99c65fb..
--- a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/unbit/uwsgi/commit/94b28b156c26d5b0b4ba93fedb057e9aebf59545.patch
-
-From 94b28b156c26d5b0b4ba93fedb057e9aebf59545 Mon Sep 17 00:00:00 2001
-From: Thea Flowers 
-Date: Tue, 2 Nov 2021 16:29:36 -0400
-Subject: [PATCH] Add PY_SSIZE_T_CLEAN define for Python 3.10 support
-

- plugins/python/uwsgi_python.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h
-index aca1f83b7..ec64ad80c 100644
 a/plugins/python/uwsgi_python.h
-+++ b/plugins/python/uwsgi_python.h
-@@ -1,4 +1,6 @@
- #include 
-+/* See https://docs.python.org/3.10/whatsnew/3.10.html#id2 */
-+#define PY_SSIZE_T_CLEAN
- #include 
- 
- #include 
-

diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch 
b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch
deleted file mode 100644
index 8fe64d1b3d3b..
--- a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/unbit/uwsgi/commit/c8c4bd1b5439217f2cb2f146caf162de69638bc1
-
-From c8c4bd1b5439217f2cb2f146caf162de69638bc1 Mon Sep 17 00:00:00 2001
-From: Cyrille Pontvieux 
-Date: Thu, 1 Jul 2021 12:45:29 +0200
-Subject: [PATCH] Allow to compile on Python versions with more that two digits
- (Python 3.10)
-

- plugins/python/pyloader.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c
-index d8ab6fe35..3a1465d67 100644
 a/plugins/python/pyloader.c
-+++ b/plugins/python/pyloader.c
-@@ -22,7 +22,7 @@ PyMethodDef uwsgi_eventfd_write_method[] = { 
{"uwsgi_eventfd_write", py_eventfd_
- void set_dyn_pyhome(char *home, uint16_t pyhome_len) {
- 
- 
--  char venv_version[15];
-+  char venv_version[30];
-   PyObject *site_module;
- 
-   PyObject *pysys_dict = get_uwsgi_pydict("sys");
-@@ -45,8 +45,8 @@ void set_dyn_pyhome(char *home, uint16_t pyhome_len) {
- PyDict_SetItemString(pysys_dict, "prefix", venv_path);
- PyDict_SetItemString(pysys_dict, "exec_prefix", venv_path);
- 
--venv_version[14] = 0;
--if (snprintf(venv_version, 15, "/lib/python%d.%d", 
PY_MAJOR_VERSION, PY_MINOR_VERSION) == -1) {
-+bzero(venv_version, 30);
-+if (snprintf(venv_version, 30, "/lib/python%d.%d", 
PY_MAJOR_VERSION, PY_MINOR_VERSION) == -1) {
- return;
- }
- 

diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-pynode-compile.patch 
b/www-servers/uwsgi/files/uwsgi-2.0.19.1-pynode-compile.patch
deleted file mode 100644
index 6bcf04ae2bc3..
--- a/www-servers/uwsgi/files/uwsgi-2.0.19.1-pynode-compile.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-https://github.com/unbit/uwsgi/commit/8c890c84604a0477b46a66eab8a620733f596cc8
-
-From 8c890c84604a0477b46a66eab8a620733f596cc8 Mon Sep 17 00:00:00 2001
-From: Riccardo Magliocchetti 
-Date: Sun, 22 Nov 2020 18:20:19 +0100
-Subject: [PATCH] plugins/python: use Py_CompileString
-
-Instead of the deprecated PyParser_SimpleParseString, PyParser_SimpleParseFile
-and PyNode_Compile.
-While at it fixup a

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/

2020-06-25 Thread Conrad Kostecki 
commit: 1698b86acb449b5758104da2b25b7fd40a7d1879
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun 24 18:08:58 2020 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Jun 25 07:30:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1698b86a

www-servers/uwsgi: remove unused patch/file

Closes: https://github.com/gentoo/gentoo/pull/16401
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-servers/uwsgi/files/2.0.14-php-plugin.patch | 22 --
 www-servers/uwsgi/files/42_mod_uwsgi-r2.conf|  9 -
 2 files changed, 31 deletions(-)

diff --git a/www-servers/uwsgi/files/2.0.14-php-plugin.patch 
b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
deleted file mode 100644
index f60a6553cfd..000
--- a/www-servers/uwsgi/files/2.0.14-php-plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6b332e6f7e6fc3c267a91ce5b5591684575ea271 Mon Sep 17 00:00:00 2001
-From: Damjan Georgievski 
-Date: Thu, 13 Oct 2016 00:55:35 +0200
-Subject: [PATCH] fix issue #1380 - compiling with llvm/freebsd
-

- plugins/php/php_plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
-index 536ec1a..ef30180 100644
 a/plugins/php/php_plugin.c
-+++ b/plugins/php/php_plugin.c
-@@ -232,7 +232,7 @@ static void sapi_uwsgi_register_variables(zval 
*track_vars_array TSRMLS_DC)
-   size_t name_len = equal-usl->value;
-   char *name = estrndup(usl->value, name_len);
-   char *strval = equal+1;
--  zend_register_string_constant(name, name_len, strval, 
CONST_CS, 0);
-+  zend_register_string_constant(name, name_len, strval, 
CONST_CS, 0 TSRMLS_CC);
-   }
-   usl = usl->next;
-   }

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf 
b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
deleted file mode 100644
index 85ede87b037..000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-
-
-LoadModule uwsgi_module modules/mod_Ruwsgi.so
-
-
-LoadModule uwsgi_module modules/mod_uwsgi.so
-

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/

2017-04-12 Thread Zac Medico 
commit: 575f84cd1a8b85f1b14b4965e3fe3943916d28d7
Author: Zac Medico  gentoo  org>
AuthorDate: Wed Apr 12 20:12:43 2017 +
Commit: Zac Medico  gentoo  org>
CommitDate: Wed Apr 12 20:15:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=575f84cd

www-servers/uwsgi: remove unused 42_mod_uwsgi.conf

Note that 42_mod_uwsgi.conf in the APACHE2_MOD_CONF variable is
actually the destination argument of a newins call.

Fixes: c8973f428af3 ("www-servers/uwsgi: re-add files referenced by 
APACHE2_MOD_CONF (bug 611300)")
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 www-servers/uwsgi/files/42_mod_uwsgi.conf | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf 
b/www-servers/uwsgi/files/42_mod_uwsgi.conf
deleted file mode 100644
index a619baeafee..000
--- a/www-servers/uwsgi/files/42_mod_uwsgi.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-LoadModule uwsgi_module modules/mod_uwsgi.so
-
-
-LoadModule uwsgi_module modules/mod_Ruwsgi.so
-
-

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/

2017-02-18 Thread David Seifert 
commit: a023bde895bd1edd0f52350b004fc5e067caeee5
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Thu Feb 16 16:35:36 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 18 22:06:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a023bde8

www-servers/uwsgi: remove unused patches/files

Closes: https://github.com/gentoo/gentoo/pull/3989

 www-servers/uwsgi/files/1.1.2-threaded-php.patch |  40 ---
 www-servers/uwsgi/files/1.2.3-pyerl.patch|  31 -
 www-servers/uwsgi/files/42_mod_uwsgi-r1.conf |   9 --
 www-servers/uwsgi/files/42_mod_uwsgi-r2.conf |   9 --
 www-servers/uwsgi/files/42_mod_uwsgi.conf|   7 --
 www-servers/uwsgi/files/uwsgi.confd-r1   |  53 -
 www-servers/uwsgi/files/uwsgi.confd-r3   |  63 --
 www-servers/uwsgi/files/uwsgi.initd-r1   | 138 --
 www-servers/uwsgi/files/uwsgi.initd-r2   | 142 --
 www-servers/uwsgi/files/uwsgi.initd-r3   | 144 ---
 www-servers/uwsgi/files/uwsgi.initd-r4   | 144 ---
 www-servers/uwsgi/files/uwsgi.initd-r5   | 144 ---
 www-servers/uwsgi/files/uwsgi.initd-r6   | 144 ---
 13 files changed, 1068 deletions(-)

diff --git a/www-servers/uwsgi/files/1.1.2-threaded-php.patch 
b/www-servers/uwsgi/files/1.1.2-threaded-php.patch
deleted file mode 100644
index ed75ad9b2f..00
--- a/www-servers/uwsgi/files/1.1.2-threaded-php.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -r a6dd30e36bc0 plugins/php/php_plugin.c
 a/plugins/php/php_plugin.c Fri Apr 20 16:27:00 2012 +0200
-+++ b/plugins/php/php_plugin.c Sun Apr 22 11:54:49 2012 +0200
-@@ -116,7 +116,7 @@
- }
- 
- 
--static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers)
-+static int sapi_uwsgi_send_headers(sapi_headers_struct *sapi_headers 
TSRMLS_DC)
- {
-   sapi_header_struct *h;
-   zend_llist_position pos;
-@@ -237,7 +237,7 @@
- }
- 
- 
--static char *sapi_uwsgi_read_cookies(void)
-+static char *sapi_uwsgi_read_cookies(TSRMLS_D)
- {
-   uint16_t len = 0;
-   struct wsgi_request *wsgi_req = (struct wsgi_request *) 
SG(server_context);
-@@ -624,6 +624,10 @@
-   struct uwsgi_string_list *pset = uphp.set;
-   struct uwsgi_string_list *append_config = uphp.append_config;
- 
-+#ifdef ZTS
-+  tsrm_startup(1, 1, 0, NULL);
-+#endif
-+
-   sapi_startup(_sapi_module);
- 
-   // applying custom options
-@@ -721,6 +725,7 @@
- 
-   zend_file_handle file_handle;
- 
-+  TSRMLS_FETCH(); // fetch the threading state in case PHP is built with 
threading
-   SG(server_context) = (void *) wsgi_req;
- 
-   if (uwsgi_parse_vars(wsgi_req)) {

diff --git a/www-servers/uwsgi/files/1.2.3-pyerl.patch 
b/www-servers/uwsgi/files/1.2.3-pyerl.patch
deleted file mode 100644
index 1d4794d8f6..00
--- a/www-servers/uwsgi/files/1.2.3-pyerl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/plugins/pyerl/pyerl.c b/plugins/pyerl/pyerl.c
-index a335f03..aee98e2 100644
 a/plugins/pyerl/pyerl.c
-+++ b/plugins/pyerl/pyerl.c
-@@ -537,7 +537,7 @@ void pyerl_init() {
- }
- 
- struct uwsgi_plugin pyerl_plugin = {
--
-+.name = "pyerl",
- .post_init = pyerl_init,
- };
- 
-diff --git a/plugins/pyerl/uwsgiplugin.py b/plugins/pyerl/uwsgiplugin.py
-index 161d722..ae9c68d 100644
 a/plugins/pyerl/uwsgiplugin.py
-+++ b/plugins/pyerl/uwsgiplugin.py
-@@ -1,7 +1,12 @@
- from distutils import sysconfig
-+import os
- 
- NAME='pyerl'
--CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + 
sysconfig.get_python_inc(plat_specific=True)]
-+
-+ERLANGPATH = os.environ.get('UWSGICONFIG_ERLANGPATH', 'erl')
-+includedir = os.popen(ERLANGPATH + " -noshell -noinput -eval 
\"io:format('~s~n', [code:lib_dir(erl_interface, include)])\" -s erlang 
halt").read().rstrip()
-+
-+CFLAGS = ['-I' + sysconfig.get_python_inc(), '-I' + 
sysconfig.get_python_inc(plat_specific=True),  '-I' + includedir ]
- LDFLAGS = []
- LIBS = []
- 

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf 
b/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf
deleted file mode 100644
index bcb383ee3a..00
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r1.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-LoadModule uwsgi_module modules/mod_proxy_uwsgi.so
-
-
-LoadModule uwsgi_module modules/mod_Ruwsgi.so
-
-
-LoadModule uwsgi_module modules/mod_uwsgi.so
-

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf 
b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
deleted file mode 100644
index 85ede87b03..00
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
-LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-
-
-LoadModule uwsgi_module modules/mod_Ruwsgi.so
-
-
-LoadModule uwsgi_module modules/mod_uwsgi.so
-

diff --git a/www-servers/uwsgi/files/42_mod_uwsgi.conf

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/

2016-12-12 Thread Mike Gilbert 
commit: 9301cbd868a978f9e4024c91a079d04c17028153
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Dec 12 20:20:00 2016 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Dec 12 20:21:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9301cbd8

www-servers/uwsgi: fix build with php5.6

Bug: https://bugs.gentoo.org/598730

Package-Manager: Portage-2.3.3_p7, Repoman-2.3.1

 www-servers/uwsgi/files/2.0.14-php-plugin.patch | 22 ++
 www-servers/uwsgi/uwsgi-2.0.14.ebuild   |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/www-servers/uwsgi/files/2.0.14-php-plugin.patch 
b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
new file mode 100644
index ..f60a655
--- /dev/null
+++ b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
@@ -0,0 +1,22 @@
+From 6b332e6f7e6fc3c267a91ce5b5591684575ea271 Mon Sep 17 00:00:00 2001
+From: Damjan Georgievski 
+Date: Thu, 13 Oct 2016 00:55:35 +0200
+Subject: [PATCH] fix issue #1380 - compiling with llvm/freebsd
+
+---
+ plugins/php/php_plugin.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
+index 536ec1a..ef30180 100644
+--- a/plugins/php/php_plugin.c
 b/plugins/php/php_plugin.c
+@@ -232,7 +232,7 @@ static void sapi_uwsgi_register_variables(zval 
*track_vars_array TSRMLS_DC)
+   size_t name_len = equal-usl->value;
+   char *name = estrndup(usl->value, name_len);
+   char *strval = equal+1;
+-  zend_register_string_constant(name, name_len, strval, 
CONST_CS, 0);
++  zend_register_string_constant(name, name_len, strval, 
CONST_CS, 0 TSRMLS_CC);
+   }
+   usl = usl->next;
+   }

diff --git a/www-servers/uwsgi/uwsgi-2.0.14.ebuild 
b/www-servers/uwsgi/uwsgi-2.0.14.ebuild
index f54848b..404a756 100644
--- a/www-servers/uwsgi/uwsgi-2.0.14.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.14.ebuild
@@ -144,6 +144,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+   epatch "${FILESDIR}/2.0.14-php-plugin.patch"
+
sed -i \
-e "s|'-O2', ||" \
-e "s|'-Werror', ||" \

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/

2016-05-20 Thread Alexys Jacob 
commit: c2ed3dec911a78f5340b0d0edad0c7f52e5e209c
Author: Ultrabug  gentoo  org>
AuthorDate: Fri May 20 10:19:40 2016 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Fri May 20 10:19:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ed3dec

www-servers/uwsgi: revbump, fix default values on init script

Package-Manager: portage-2.2.27

 www-servers/uwsgi/files/uwsgi.initd-r7| 2 ++
 www-servers/uwsgi/{uwsgi-2.0.13.1.ebuild => uwsgi-2.0.13.1-r1.ebuild} | 0
 2 files changed, 2 insertions(+)

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r7 
b/www-servers/uwsgi/files/uwsgi.initd-r7
index 01c2219..5f38e67 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r7
+++ b/www-servers/uwsgi/files/uwsgi.initd-r7
@@ -32,6 +32,7 @@ start_emperor() {
[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+   [ -z "${UWSGI_EMPEROR_PIDPATH_MODE}" ] && 
UWSGI_EMPEROR_PIDPATH_MODE=0770
 
if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
@@ -60,6 +61,7 @@ start_app() {
[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+   [ -z "${UWSGI_PIDPATH_MODE}" ] && UWSGI_PIDPATH_MODE=0750
 
if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"

diff --git a/www-servers/uwsgi/uwsgi-2.0.13.1.ebuild 
b/www-servers/uwsgi/uwsgi-2.0.13.1-r1.ebuild
similarity index 100%
rename from www-servers/uwsgi/uwsgi-2.0.13.1.ebuild
rename to www-servers/uwsgi/uwsgi-2.0.13.1-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: www-servers/uwsgi/files/

2016-05-18 Thread Austin English 
commit: ccbf72a4fe83a86246482fea38dd8e57229b008a
Author: Austin English  gentoo  org>
AuthorDate: Wed May 18 06:35:25 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed May 18 06:38:34 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccbf72a4

www-servers/uwsgi: use #!/sbin/openrc-run instead of #!/sbin/runscript

 www-servers/uwsgi/files/uwsgi.initd-r1 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r2 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r3 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r4 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r5 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r6 | 2 +-
 www-servers/uwsgi/files/uwsgi.initd-r7 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r1 
b/www-servers/uwsgi/files/uwsgi.initd-r1
index 9b3af69..67a8009 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r1
+++ b/www-servers/uwsgi/files/uwsgi.initd-r1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r2 
b/www-servers/uwsgi/files/uwsgi.initd-r2
index f535dd2..4b202d4 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r2
+++ b/www-servers/uwsgi/files/uwsgi.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r3 
b/www-servers/uwsgi/files/uwsgi.initd-r3
index efa3150..28f03d0 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r3
+++ b/www-servers/uwsgi/files/uwsgi.initd-r3
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r4 
b/www-servers/uwsgi/files/uwsgi.initd-r4
index 856fdb9..146355b 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r4
+++ b/www-servers/uwsgi/files/uwsgi.initd-r4
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r5 
b/www-servers/uwsgi/files/uwsgi.initd-r5
index d673daa..42381ca 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r5
+++ b/www-servers/uwsgi/files/uwsgi.initd-r5
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r6 
b/www-servers/uwsgi/files/uwsgi.initd-r6
index ab550aa..a0c7ad6 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r6
+++ b/www-servers/uwsgi/files/uwsgi.initd-r6
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

diff --git a/www-servers/uwsgi/files/uwsgi.initd-r7 
b/www-servers/uwsgi/files/uwsgi.initd-r7
index f7cff44..01c2219 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r7
+++ b/www-servers/uwsgi/files/uwsgi.initd-r7
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$