From cbf055ae8f2fb67e00df9ea122e64a67f930f576 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Jun 2023 13:24:24 +0100 Subject: gentoo auto-resync : 23:06:2023 - 13:24:24 --- www-servers/uwsgi/Manifest | 5 - .../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, 560 deletions(-) delete mode 100644 www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch delete mode 100644 www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix.patch delete mode 100644 www-servers/uwsgi/files/uwsgi-2.0.19.1-pynode-compile.patch delete mode 100644 www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild (limited to 'www-servers/uwsgi') diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest index 5fb9c9aaaa42..24ecee9c7672 100644 --- a/www-servers/uwsgi/Manifest +++ b/www-servers/uwsgi/Manifest @@ -1,14 +1,9 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3530be9d177bff755779251ea880d98addacf5476e3aae20145c95fad4d7baf594e58b9ebcaf2b0dde SHA512 d5bdc136374aed58ce206ea72cc45c72750f60117eef98960356b5cd64e2152c454af6b5aebb28f03ad46b42ea95a16fbf1e4a6f976ae78744550803ac775fe2 -AUX uwsgi-2.0.19.1-py310-fix-2.patch 731 BLAKE2B 401b03e888b8a081cddf34ab16197fd728cfbfb5c877206c0b1f65f1b1e5ef335fa3d45bf1e7786b555fc4dbbe1a9b0fd29a4bcce0be70e605bf20ca2f0e3c3c SHA512 303b25095db88a1e84a9b212c0381f8e6025f2b9bc1913882b7e376fce300575c10ceb7666fbb9622536950ee0a0c2496fca5aea20f532d7e2f3fb299e17bbbb -AUX uwsgi-2.0.19.1-py310-fix.patch 1457 BLAKE2B 35859fabde74604a67d0fe71dbf2889465ffc4a3de7ded343c44e9accbb49daa6d45992b7b824e6fc6c0be1a84884e13ed31cc2846ccafc659ef3be06d703f62 SHA512 42fa8fd537385dcb2cf088291d249c584cce2965c4131e45ee58c7cb6d0789b5f84bc9473925700bd55a5f75667cbc361130684c28d44b597e8e66246a63b2d2 -AUX uwsgi-2.0.19.1-pynode-compile.patch 3950 BLAKE2B 4ec0f5357b7b99f3365ddfbc8643ecd8c96eb227ccc8bee78948170a00d4bce89cdaeeff3de5d2be25c428e5a7e4da220d023daff8b783deea421dc0bc67e972 SHA512 de076448c43195de0ca7fd198787de60bf29d3966ff3f6c8f0b2bacc6d29a50e4b622aeba6de56489ecae808648b099cb6bfa5322aa1d30c31d607debd6f9c6b AUX uwsgi-2.0.21-libphp-version.patch 399 BLAKE2B 274a099c3745533c4817f10d3d10524237cc05cfecf965c88251169b684969c55ea0340f6389cd54ed59bec070b2c1d2f20445a5f70f0124109774ec7c33f3a7 SHA512 7f11c6544bae789ec9cf08d3ca3c84a083a23b0da69cf4c577e5e13f7a1635a59e4f81a7005262d85c88ac97465ce08dd6a12f81a917d0aa81bc925fc7bfd05a AUX uwsgi-2.0.21-php82.patch 1457 BLAKE2B 89a31c86050fe1c94f1077e534d75f32d191f2b6402f72488f6fa50960b9ed44b1a39f80c05d2b5bbaf387e6cb8434951fd5092b70bad1f329ce43c87c5e13c1 SHA512 35b7e0f62cf18093aa1dcb8dda6158b3f2ab73c600d95fff048ded51ae91d442620c615c60597f67133f615998331e50e4ae592c7fdf66292f8efa4932cab867 AUX uwsgi-2.0.21-python-unicode.patch 978 BLAKE2B 8014a39e6f29e38bb88cb5fe517c8656c80cd9aaed20ecb5ab56f526355f9b3616a5ac19635abb4514613b1e5c198364f8ab339292a8f282e1bd3f15ffd35a5a SHA512 9da61901ec176423bc14db8c58fac19305c2c5a4dc68f42d858376e65ca7399ddc6fe0665c3bd1f2ba379b6dd60a39d496a4b52c61c7dcf7d48ae47cddf555df AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5 -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 -EBUILD uwsgi-2.0.19.1-r109.ebuild 11213 BLAKE2B 0355b1cf1d3db7d56dc8964bee2e1dc1018a79cc9cd6b907f667d6d6050f302d112a4e78cb1350c846ea3d2e956e23b43eadfb9ddc736c8435f9b997fb651821 SHA512 0b316e49f3dad87c8ea82124269e46c114e66b7ec1d5fe5d1599588e78f672860a2d8d7f09df8ad6f1db1114bd43ec7c0acef2d0c12eab58960119f355ec6dfb EBUILD uwsgi-2.0.21.ebuild 11380 BLAKE2B 0d70736207d8b0dae2a24f919078e58c74f6b575842d6b29b786df7c5aeaaf559cd7c4d2d2e4edd9beaf9835cc3339974b5f1a32f1785f5c2fae5ac310cb93a7 SHA512 717330ff687c43d491773a8a5d90a6d0c1396d1bb3ac5c0722addf6a77a42b989f38db465f5a904f51f352f1ec1b9c43cc770e7b9a5b3fd33c7dc16d0a871a10 MISC metadata.xml 1245 BLAKE2B 3254a0e0211101ad9c353f6247424bb44df9ddb56bb152414b9fac2b515fe163e5163d2119bc040da1676b4d941afedf4a331a19e4cdbf794a7816d012abd328 SHA512 4e3dc2b9c9d7386ed6f132da703af971789c73af567f5333faca65e3194567ead794a84c28b5382eadb149ae4dcc7847e07bc02e3d84391b3b6cccc11e08e232 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..000000000000 --- 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..000000000000 --- 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..000000000000 --- 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 possible null pointer dereference when uwsgi_open_and_read -returns an empty string. - -See https://bugs.python.org/issue40939 ---- - plugins/python/pyloader.c | 12 +----------- - plugins/python/python_plugin.c | 36 ++++++++++++++-------------------- - 2 files changed, 16 insertions(+), 32 deletions(-) - -diff --git a/plugins/python/pyloader.c b/plugins/python/pyloader.c -index a63c375b5..d8ab6fe35 100644 ---- a/plugins/python/pyloader.c -+++ b/plugins/python/pyloader.c -@@ -757,25 +757,15 @@ PyObject *uwsgi_eval_loader(void *arg1) { - - PyObject *wsgi_eval_module, *wsgi_eval_callable = NULL; - -- struct _node *wsgi_eval_node = NULL; - PyObject *wsgi_compiled_node; - -- wsgi_eval_node = PyParser_SimpleParseString(code, Py_file_input); -- if (!wsgi_eval_node) { -- PyErr_Print(); -- uwsgi_log( "failed to parse code\n"); -- exit(UWSGI_FAILED_APP_CODE); -- } -- -- wsgi_compiled_node = (PyObject *) PyNode_Compile(wsgi_eval_node, "uwsgi_eval_config"); -- -+ wsgi_compiled_node = Py_CompileString(code, "uwsgi_eval_config", Py_file_input); - if (!wsgi_compiled_node) { - PyErr_Print(); - uwsgi_log( "failed to compile eval code\n"); - exit(UWSGI_FAILED_APP_CODE); - } - -- - wsgi_eval_module = PyImport_ExecCodeModule("uwsgi_eval_config", wsgi_compiled_node); - if (!wsgi_eval_module) { - PyErr_Print(); -diff --git a/plugins/python/python_plugin.c b/plugins/python/python_plugin.c -index 37d0b7bbf..79f29d43c 100644 ---- a/plugins/python/python_plugin.c -+++ b/plugins/python/python_plugin.c -@@ -473,8 +473,7 @@ UWSGI_RELEASE_GIL - - PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) { - -- FILE *pyfile; -- struct _node *py_file_node = NULL; -+ char *pycontent; - PyObject *py_compiled_node, *py_file_module; - int is_a_package = 0; - struct stat pystat; -@@ -483,7 +482,7 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) { - - if (!uwsgi_check_scheme(filename)) { - -- pyfile = fopen(filename, "r"); -+ FILE *pyfile = fopen(filename, "r"); - if (!pyfile) { - uwsgi_log("failed to open python file %s\n", filename); - return NULL; -@@ -507,37 +506,32 @@ PyObject *uwsgi_pyimport_by_filename(char *name, char *filename) { - } - } - -- py_file_node = PyParser_SimpleParseFile(pyfile, real_filename, Py_file_input); -- if (!py_file_node) { -- PyErr_Print(); -- uwsgi_log("failed to parse file %s\n", real_filename); -- if (is_a_package) -+ fclose(pyfile); -+ pycontent = uwsgi_simple_file_read(real_filename); -+ -+ if (!pycontent) { -+ if (is_a_package) { - free(real_filename); -- fclose(pyfile); -+ } -+ uwsgi_log("no data read from file %s\n", real_filename); - return NULL; - } - -- fclose(pyfile); - } - else { - size_t pycontent_size = 0; -- char *pycontent = uwsgi_open_and_read(filename, &pycontent_size, 1, NULL); -+ pycontent = uwsgi_open_and_read(filename, &pycontent_size, 1, NULL); - -- if (pycontent) { -- py_file_node = PyParser_SimpleParseString(pycontent, Py_file_input); -- if (!py_file_node) { -- PyErr_Print(); -- uwsgi_log("failed to parse url %s\n", real_filename); -- return NULL; -- } -+ if (!pycontent) { -+ uwsgi_log("no data read from url %s\n", real_filename); -+ return NULL; - } - } - -- py_compiled_node = (PyObject *) PyNode_Compile(py_file_node, real_filename); -- -+ py_compiled_node = Py_CompileString(pycontent, real_filename, Py_file_input); - if (!py_compiled_node) { - PyErr_Print(); -- uwsgi_log("failed to compile python file %s\n", real_filename); -+ uwsgi_log("failed to compile %s\n", real_filename); - return NULL; - } - diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild deleted file mode 100644 index 1b390388d3d1..000000000000 --- a/www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild +++ /dev/null @@ -1,373 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-1 ) -PYTHON_COMPAT=( python3_{9..10} ) -PYTHON_REQ_USE="threads(+)" - -RUBY_OPTIONAL="yes" -USE_RUBY="ruby25 ruby26 ruby27 ruby30" - -PHP_EXT_INI="no" -PHP_EXT_NAME="dummy" -PHP_EXT_OPTIONAL_USE="php" -USE_PHP="php7-3 php7-4" # deps must be registered separately below - -MY_P="${P/_/-}" - -inherit lua-single pax-utils php-ext-source-r3 python-r1 ruby-ng - -DESCRIPTION="uWSGI server for Python web applications" -HOMEPAGE="https://uwsgi-docs.readthedocs.io/en/latest/" -SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux" - -UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool - http ugreen signal syslog rsyslog - router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics} - {core,fast,raw,ssl}router - redislog mongodblog log{file,socket} - spooler cheaper_busyness symcall - transformation_{chunked,gzip,offload,tofile} - zergpool ) -UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron - dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter - geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam - rados router_{access,radius,spnego,xmldir} - sqlite ssi stats_pusher_statsd - systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix ) - -LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process -LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio ruby ) - -# plugins to be ignored (for now): -# cheaper_backlog2: example plugin -# coroae: TODO -# cplusplus: partially example code, needs explicit class -# dummy: no idea -# example: example plugin -# exception_log: example plugin -# *java*: TODO -# v8: TODO -# matheval: TODO -IUSE="apache2 +caps debug +embedded expat jemalloc json +pcre +routing selinux +ssl +xml yajl yaml zeromq" - -for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done -for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done -IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}" - -REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} ) - uwsgi_plugins_logcrypto? ( ssl ) - uwsgi_plugins_sslrouter? ( ssl ) - routing? ( pcre ) - uwsgi_plugins_emperor_zeromq? ( zeromq ) - uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter ) - uwsgi_plugins_router_xmldir? ( xml !expat ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) - python-asyncio? ( python ) - expat? ( xml )" - -# util-linux is required for libuuid when requesting zeromq support -# Order: -# 1. Unconditional -# 2. General features -# 3. Plugins -# 4. Language/app support -CDEPEND=" - sys-libs/zlib - virtual/libcrypt:= - caps? ( sys-libs/libcap ) - json? ( - !yajl? ( dev-libs/jansson:= ) - yajl? ( dev-libs/yajl ) - ) - pcre? ( dev-libs/libpcre:3 ) - ssl? ( dev-libs/openssl:0= ) - xml? ( - !expat? ( dev-libs/libxml2 ) - expat? ( dev-libs/expat ) - ) - yaml? ( dev-libs/libyaml ) - zeromq? ( net-libs/zeromq sys-apps/util-linux ) - uwsgi_plugins_alarm_curl? ( net-misc/curl ) - uwsgi_plugins_alarm_xmpp? ( net-libs/gloox ) - uwsgi_plugins_curl_cron? ( net-misc/curl ) - uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= ) - uwsgi_plugins_geoip? ( dev-libs/geoip ) - uwsgi_plugins_ldap? ( net-nds/openldap:= ) - uwsgi_plugins_pam? ( sys-libs/pam ) - uwsgi_plugins_sqlite? ( dev-db/sqlite:3 ) - uwsgi_plugins_rados? ( sys-cluster/ceph ) - uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers ) - uwsgi_plugins_router_spnego? ( virtual/krb5 ) - uwsgi_plugins_systemd_logger? ( sys-apps/systemd ) - uwsgi_plugins_webdav? ( dev-libs/libxml2 ) - uwsgi_plugins_xslt? ( dev-libs/libxslt ) - go? ( sys-devel/gcc:=[go] ) - lua? ( ${LUA_DEPS} ) - mono? ( dev-lang/mono:= ) - perl? ( dev-lang/perl:= ) - php? ( - php_targets_php7-3? ( dev-lang/php:7.3[embed] ) - php_targets_php7-4? ( dev-lang/php:7.4[embed] ) - ) - python? ( ${PYTHON_DEPS} ) - python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] ) - ruby? ( $(ruby_implementations_depend) )" -DEPEND="${CDEPEND}" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-uwsgi ) - uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-py310-fix.patch" - "${FILESDIR}/${P}-pynode-compile.patch" - "${FILESDIR}/${P}-py310-fix-2.patch" -) - -S="${WORKDIR}/${MY_P}" - -src_unpack() { - echo ${PYTHON_USEDEP} - default -} - -pkg_setup() { - python_setup - use lua && lua-single_pkg_setup - use ruby && ruby-ng_pkg_setup -} - -src_prepare() { - default - - sed -i \ - -e "s|'-O2', ||" \ - -e "s|'-Werror', ||" \ - -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \ - uwsgiconfig.py || die "sed failed" - - sed -i \ - -e "s|/lib|/$(get_libdir)|" \ - plugins/php/uwsgiplugin.py || die "sed failed" -} - -src_configure() { - local embedded_plugins=() - local plugins=() - local malloc_impl="libc" - local json="false" - local xml="false" - - for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do - use uwsgi_plugins_${p} && embedded_plugins+=("${p}") - done - for p in ${LANG_SUPPORT_SIMPLE[@]} ; do - use ${p} && plugins+=("${p}") - done - - # do not embed any plugins - if ! use embedded; then - plugins=( ${plugins[@]} ${embedded_plugins[@]} ) - embedded_plugins=() - fi - - # flatten the arrays - plugins=${plugins[@]} - embedded_plugins=${embedded_plugins[@]} - - # rename some of the use flags, language plugins are always real plugins - plugins="${plugins/perl/psgi}" - plugins="${plugins/sqlite/sqlite3}" - embedded_plugins="${embedded_plugins/sqlite/sqlite3}" - - # override defaults as requested by the user - if use xml; then - use expat && xml="expat" || xml="libxml2" - fi - if use json; then - use yajl && json="yajl" || json="jansson" - fi - use jemalloc && malloc_impl="jemalloc" - - # prepare the buildconf for gentoo - cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die - sed -i \ - -e "s|VAR_XML|${xml}|" \ - -e "s|VAR_YAML|$(usex yaml libyaml true)|" \ - -e "s|VAR_JSON|${json}|" \ - -e "s|VAR_SSL|$(usex ssl true false)|" \ - -e "s|VAR_PCRE|$(usex pcre true false)|" \ - -e "s|VAR_ZMQ|$(usex zeromq true false)|" \ - -e "s|VAR_ROUTING|$(usex routing true false)|" \ - -e "s|VAR_DEBUG|$(usex debug true false)|" \ - -e "s|VAR_MALLOC|${malloc_impl}|" \ - -e "s|VAR_PLUGINS|${plugins// /, }|" \ - -e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \ - -e "s|VAR_BUILD_DIR|${T}/plugins|" \ - -e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \ - buildconf/gentoo.ini || die "sed failed" - - if ! use caps; then - sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed" - fi - - if ! use zeromq; then - sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed" - fi - - if use uwsgi_plugins_emperor_pg ; then - PGPV="$(best_version dev-db/postgresql)" - PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})" - sed -i \ - -e "s|pg_config|pg_config${PGSLOT/.}|" \ - plugins/emperor_pg/uwsgiplugin.py || die "sed failed" - fi -} - -each_ruby_compile() { - cd "${WORKDIR}/${MY_P}" || die "sed failed" - - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed" - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed" - UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed" -} - -python_compile_plugins() { - local EPYV - local PYV - EPYV=${EPYTHON/.} - PYV=${EPYV/python} - - ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed" - - if use python-asyncio ; then - if [[ "${PYV}" != "27" ]] ; then - ${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed" - fi - fi - - if use python-asyncio; then - ${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed" - fi -} - -python_install_symlinks() { - dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.} -} - -src_compile() { - mkdir -p "${T}/plugins" || die - - CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed" - - if use go ; then - python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed" - fi - - if use lua ; then - # setting the name for the pkg-config file to lua, since that is the name - # provided by the wrapper from Lua eclasses - UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed" - fi - - if use php ; then - for s in $(php_get_slots); do - UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed" - done - fi - - if use python ; then - python_foreach_impl python_compile_plugins - fi - - if use ruby ; then - ruby-ng_src_compile - fi -} - -src_install() { - dobin uwsgi - pax-mark m "${D}"/usr/bin/uwsgi - - insinto /usr/$(get_libdir)/uwsgi - doins "${T}/plugins"/*.so - - use cgi && dosym uwsgi /usr/bin/uwsgi_cgi - use go && dosym uwsgi /usr/bin/uwsgi_go - use lua && dosym uwsgi /usr/bin/uwsgi_lua - use mono && dosym uwsgi /usr/bin/uwsgi_mono - use perl && dosym uwsgi /usr/bin/uwsgi_psgi - - if use php ; then - for s in $(php_get_slots); do - dosym uwsgi /usr/bin/uwsgi_${s/.} - done - fi - - if use python ; then - python_foreach_impl python_install_symlinks - python_foreach_impl python_domodule uwsgidecorators.py - fi - - newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi - newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi - keepdir /etc/"${PN}".d - use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}" -} - -pkg_postinst() { - if use apache2 ; then - ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi" - ewarn "is being transferred to upstream Apache since 2.4.30, see [2]." - ewarn "We therefore do not build them any more." - ewarn " [1] https://bugs.gentoo.org/650776" - ewarn " [2] https://github.com/unbit/uwsgi/issues/1636" - fi - - elog "Append the following options to the uwsgi call to load the respective language plugin:" - use cgi && elog " '--plugins cgi' for cgi" - use lua && elog " '--plugins lua' for lua" - use mono && elog " '--plugins mono' for mono" - use perl && elog " '--plugins psgi' for perl" - - if use php ; then - for s in $(php_get_slots); do - elog " '--plugins ${s/.}' for ${s}" - done - fi - - python_pkg_postinst() { - local EPYV - local PYV - EPYV=${EPYTHON/.} - PYV=${EPYV/python} - - elog " " - elog " '--plugins ${EPYV}' for ${EPYTHON}" - if use python-asyncio ; then - if [[ ${EPYV} == python34 ]] ; then - elog " '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}" - else - elog " (asyncio is only supported in python3.4)" - fi - fi - } - - use python && python_foreach_impl python_pkg_postinst - - if use ruby ; then - for ruby in $(ruby_get_use_implementations) ; do - elog " '--plugins rack_${ruby/.}' for ${ruby}" - elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" - elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" - done - fi -} -- cgit v1.2.3