uwsgi/uwsgi-2.0.12-no-LD_RUN_PATH.patch

65 lines
2.7 KiB
Diff
Raw Normal View History

Index: uwsgi-2.0.13/plugins/jvm/uwsgiplugin.py
===================================================================
--- uwsgi-2.0.13.orig/plugins/jvm/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/jvm/uwsgiplugin.py
@@ -65,11 +65,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
- Deprecated init script and sysconfig file in favor of systemd service and a default configuration file /etc/uwsgi/uwsgi.ini - Update README to describe important changes - Removed separate packages for plugins that have no uncommon requirements - Update to 1.9.11 * Fixed Python 3 stdout/stderr buffering * Fixed mule messages (@mulefunc is now reliable) * Fixed SCRIPT_NAME handling in dynamic mode * Fixed X-Sendfile with gzip static mode * Fixed cache item maximum size with custom block size * Fixed cache path handling * Added the new high-performance PyPy plugin * You can now avoid overlapping crons using --unique-cron. The uWSGI master will track death of a single task, and until its death the same cron will not be triggered * A key/value variant of the --cron option is now available * When using the cron2 option you are allowed to set a harakiri timeout for a cron task. Just add harakiri=n to the options * Added support for GNU Hurd * A new offload engine named "memory" allows to offload memory transfers. The cache router automatically supports it. To enable it just add --offload-threads <n> * An example websocket chat using Redis has been added to the repository * You can now define a routing table to be executed as soon as you set the HTTP status code in your plugin * Generally the wsgi.file_wrapper callable expects a file-like object. PEP 333/3333 reports a special pattern when the object is not a file (call read() until the object is consumed). uWSGI now supports this pattern (even if in a hacky way) * When using --http-keepalive you can now hold the connection open even if OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=5
2013-05-31 20:42:21 +02:00
GCC_LIST = ['jvm_plugin']
-if 'LD_RUN_PATH' in os.environ:
- os.environ['LD_RUN_PATH'] += ':' + JVM_LIBPATH[0][2:]
-else:
- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:]
-
def post_build(config):
if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
os._exit(1)
Index: uwsgi-2.0.13/plugins/php/uwsgiplugin.py
===================================================================
--- uwsgi-2.0.13.orig/plugins/php/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/php/uwsgiplugin.py
@@ -19,7 +19,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags
- Disable v8 on unsupported architectures, and on distributions with newer versions of v8, as it seems that upstream is not maintaining it - Update to 1.9.17 * Bugfixes * the pty client is now blocking (safer approach) * removed strtok() usage (substituted by a new uwsgi api function on top of strtok_r()) * fixed --pty-exec (Credits: C Anthony Risinger) * listen_queue/somaxconn linux check is now done even for UNIX sockets * New features * https://uwsgi-docs.readthedocs.org/en/latest/Changelog-1.9.17.html * The Master FIFO: a new management way in addition to UNIX signals * A new hook, named asap has been added. It will be run soon after the options are parsed * The TCC (libtcc) plugin: TCC is an embeddable c compiler. It includes a shared library (libtcc) you can use to compile strings of c code on the fly. The libtcc uWSGI plugins allows compiling strings of c to process symbols. Currently the "tcc" hook engine has been implemented: * The forkptyrouter gateway: While work on Linux containers/namespaces continues to improve we have added this special router/gateway allowing dynamic allocation of pseodoterminals in uWSGI instances. To access the sockets created by the forkptyrouter you can use the --pty-connect option exposed by the pty plugin. * added a new magic var for ANSI escaping. It allows you to define ANSI sequences in your logs * Routable log encoders: You can now attach log encoders to specific log routes * --vassals-include: This is like --vassal-inherit but the parsing will be "immediate" (so you can use placeholders) * The Emperor heartbeat system is now mercyless. The old approach for the OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=18
2013-09-24 01:42:48 +02:00
- Deprecated init script and sysconfig file in favor of systemd service and a default configuration file /etc/uwsgi/uwsgi.ini - Update README to describe important changes - Removed separate packages for plugins that have no uncommon requirements - Update to 1.9.11 * Fixed Python 3 stdout/stderr buffering * Fixed mule messages (@mulefunc is now reliable) * Fixed SCRIPT_NAME handling in dynamic mode * Fixed X-Sendfile with gzip static mode * Fixed cache item maximum size with custom block size * Fixed cache path handling * Added the new high-performance PyPy plugin * You can now avoid overlapping crons using --unique-cron. The uWSGI master will track death of a single task, and until its death the same cron will not be triggered * A key/value variant of the --cron option is now available * When using the cron2 option you are allowed to set a harakiri timeout for a cron task. Just add harakiri=n to the options * Added support for GNU Hurd * A new offload engine named "memory" allows to offload memory transfers. The cache router automatically supports it. To enable it just add --offload-threads <n> * An example websocket chat using Redis has been added to the repository * You can now define a routing table to be executed as soon as you set the HTTP status code in your plugin * Generally the wsgi.file_wrapper callable expects a file-like object. PEP 333/3333 reports a special pattern when the object is not a file (call read() until the object is consumed). uWSGI now supports this pattern (even if in a hacky way) * When using --http-keepalive you can now hold the connection open even if OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=5
2013-05-31 20:42:21 +02:00
if ld_run_path:
LDFLAGS.append('-L%s' % ld_run_path)
- os.environ['LD_RUN_PATH'] = ld_run_path
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version]
- Deprecated init script and sysconfig file in favor of systemd service and a default configuration file /etc/uwsgi/uwsgi.ini - Update README to describe important changes - Removed separate packages for plugins that have no uncommon requirements - Update to 1.9.11 * Fixed Python 3 stdout/stderr buffering * Fixed mule messages (@mulefunc is now reliable) * Fixed SCRIPT_NAME handling in dynamic mode * Fixed X-Sendfile with gzip static mode * Fixed cache item maximum size with custom block size * Fixed cache path handling * Added the new high-performance PyPy plugin * You can now avoid overlapping crons using --unique-cron. The uWSGI master will track death of a single task, and until its death the same cron will not be triggered * A key/value variant of the --cron option is now available * When using the cron2 option you are allowed to set a harakiri timeout for a cron task. Just add harakiri=n to the options * Added support for GNU Hurd * A new offload engine named "memory" allows to offload memory transfers. The cache router automatically supports it. To enable it just add --offload-threads <n> * An example websocket chat using Redis has been added to the repository * You can now define a routing table to be executed as soon as you set the HTTP status code in your plugin * Generally the wsgi.file_wrapper callable expects a file-like object. PEP 333/3333 reports a special pattern when the object is not a file (call read() until the object is consumed). uWSGI now supports this pattern (even if in a hacky way) * When using --http-keepalive you can now hold the connection open even if OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=5
2013-05-31 20:42:21 +02:00
Index: uwsgi-2.0.13/plugins/python/uwsgiplugin.py
===================================================================
--- uwsgi-2.0.13.orig/plugins/python/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/python/uwsgiplugin.py
@@ -58,8 +58,6 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro
LDFLAGS.append("-L%s" % libdir)
LDFLAGS.append("-Wl,-rpath,%s" % libdir)
- Deprecated init script and sysconfig file in favor of systemd service and a default configuration file /etc/uwsgi/uwsgi.ini - Update README to describe important changes - Removed separate packages for plugins that have no uncommon requirements - Update to 1.9.11 * Fixed Python 3 stdout/stderr buffering * Fixed mule messages (@mulefunc is now reliable) * Fixed SCRIPT_NAME handling in dynamic mode * Fixed X-Sendfile with gzip static mode * Fixed cache item maximum size with custom block size * Fixed cache path handling * Added the new high-performance PyPy plugin * You can now avoid overlapping crons using --unique-cron. The uWSGI master will track death of a single task, and until its death the same cron will not be triggered * A key/value variant of the --cron option is now available * When using the cron2 option you are allowed to set a harakiri timeout for a cron task. Just add harakiri=n to the options * Added support for GNU Hurd * A new offload engine named "memory" allows to offload memory transfers. The cache router automatically supports it. To enable it just add --offload-threads <n> * An example websocket chat using Redis has been added to the repository * You can now define a routing table to be executed as soon as you set the HTTP status code in your plugin * Generally the wsgi.file_wrapper callable expects a file-like object. PEP 333/3333 reports a special pattern when the object is not a file (call read() until the object is consumed). uWSGI now supports this pattern (even if in a hacky way) * When using --http-keepalive you can now hold the connection open even if OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=5
2013-05-31 20:42:21 +02:00
- os.environ['LD_RUN_PATH'] = "%s" % libdir
-
- Deprecated init script and sysconfig file in favor of systemd service and a default configuration file /etc/uwsgi/uwsgi.ini - Update README to describe important changes - Removed separate packages for plugins that have no uncommon requirements - Update to 1.9.11 * Fixed Python 3 stdout/stderr buffering * Fixed mule messages (@mulefunc is now reliable) * Fixed SCRIPT_NAME handling in dynamic mode * Fixed X-Sendfile with gzip static mode * Fixed cache item maximum size with custom block size * Fixed cache path handling * Added the new high-performance PyPy plugin * You can now avoid overlapping crons using --unique-cron. The uWSGI master will track death of a single task, and until its death the same cron will not be triggered * A key/value variant of the --cron option is now available * When using the cron2 option you are allowed to set a harakiri timeout for a cron task. Just add harakiri=n to the options * Added support for GNU Hurd * A new offload engine named "memory" allows to offload memory transfers. The cache router automatically supports it. To enable it just add --offload-threads <n> * An example websocket chat using Redis has been added to the repository * You can now define a routing table to be executed as soon as you set the HTTP status code in your plugin * Generally the wsgi.file_wrapper callable expects a file-like object. PEP 333/3333 reports a special pattern when the object is not a file (call read() until the object is consumed). uWSGI now supports this pattern (even if in a hacky way) * When using --http-keepalive you can now hold the connection open even if OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=5
2013-05-31 20:42:21 +02:00
LIBS.append('-lpython%s' % get_python_version())
else:
LIBS = []
Index: uwsgi-2.0.13/plugins/rack/uwsgiplugin.py
===================================================================
--- uwsgi-2.0.13.orig/plugins/rack/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/rack/uwsgiplugin.py
@@ -46,7 +46,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir
- Deprecated init script and sysconfig file in favor of systemd service and a default configuration file /etc/uwsgi/uwsgi.ini - Update README to describe important changes - Removed separate packages for plugins that have no uncommon requirements - Update to 1.9.11 * Fixed Python 3 stdout/stderr buffering * Fixed mule messages (@mulefunc is now reliable) * Fixed SCRIPT_NAME handling in dynamic mode * Fixed X-Sendfile with gzip static mode * Fixed cache item maximum size with custom block size * Fixed cache path handling * Added the new high-performance PyPy plugin * You can now avoid overlapping crons using --unique-cron. The uWSGI master will track death of a single task, and until its death the same cron will not be triggered * A key/value variant of the --cron option is now available * When using the cron2 option you are allowed to set a harakiri timeout for a cron task. Just add harakiri=n to the options * Added support for GNU Hurd * A new offload engine named "memory" allows to offload memory transfers. The cache router automatically supports it. To enable it just add --offload-threads <n> * An example websocket chat using Redis has been added to the repository * You can now define a routing table to be executed as soon as you set the HTTP status code in your plugin * Generally the wsgi.file_wrapper callable expects a file-like object. PEP 333/3333 reports a special pattern when the object is not a file (call read() until the object is consumed). uWSGI now supports this pattern (even if in a hacky way) * When using --http-keepalive you can now hold the connection open even if OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=5
2013-05-31 20:42:21 +02:00
if has_shared == 'yes':
LDFLAGS.append('-L' + libpath )
- os.environ['LD_RUN_PATH'] = libpath
LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
else:
- Disable v8 on unsupported architectures, and on distributions with newer versions of v8, as it seems that upstream is not maintaining it - Update to 1.9.17 * Bugfixes * the pty client is now blocking (safer approach) * removed strtok() usage (substituted by a new uwsgi api function on top of strtok_r()) * fixed --pty-exec (Credits: C Anthony Risinger) * listen_queue/somaxconn linux check is now done even for UNIX sockets * New features * https://uwsgi-docs.readthedocs.org/en/latest/Changelog-1.9.17.html * The Master FIFO: a new management way in addition to UNIX signals * A new hook, named asap has been added. It will be run soon after the options are parsed * The TCC (libtcc) plugin: TCC is an embeddable c compiler. It includes a shared library (libtcc) you can use to compile strings of c code on the fly. The libtcc uWSGI plugins allows compiling strings of c to process symbols. Currently the "tcc" hook engine has been implemented: * The forkptyrouter gateway: While work on Linux containers/namespaces continues to improve we have added this special router/gateway allowing dynamic allocation of pseodoterminals in uWSGI instances. To access the sockets created by the forkptyrouter you can use the --pty-connect option exposed by the pty plugin. * added a new magic var for ANSI escaping. It allows you to define ANSI sequences in your logs * Routable log encoders: You can now attach log encoders to specific log routes * --vassals-include: This is like --vassal-inherit but the parsing will be "immediate" (so you can use placeholders) * The Emperor heartbeat system is now mercyless. The old approach for the OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=18
2013-09-24 01:42:48 +02:00
rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
Index: uwsgi-2.0.13/plugins/ruby19/uwsgiplugin.py
===================================================================
--- uwsgi-2.0.13.orig/plugins/ruby19/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/ruby19/uwsgiplugin.py
- Deprecated init script and sysconfig file in favor of systemd service and a default configuration file /etc/uwsgi/uwsgi.ini - Update README to describe important changes - Removed separate packages for plugins that have no uncommon requirements - Update to 1.9.11 * Fixed Python 3 stdout/stderr buffering * Fixed mule messages (@mulefunc is now reliable) * Fixed SCRIPT_NAME handling in dynamic mode * Fixed X-Sendfile with gzip static mode * Fixed cache item maximum size with custom block size * Fixed cache path handling * Added the new high-performance PyPy plugin * You can now avoid overlapping crons using --unique-cron. The uWSGI master will track death of a single task, and until its death the same cron will not be triggered * A key/value variant of the --cron option is now available * When using the cron2 option you are allowed to set a harakiri timeout for a cron task. Just add harakiri=n to the options * Added support for GNU Hurd * A new offload engine named "memory" allows to offload memory transfers. The cache router automatically supports it. To enable it just add --offload-threads <n> * An example websocket chat using Redis has been added to the repository * You can now define a routing table to be executed as soon as you set the HTTP status code in your plugin * Generally the wsgi.file_wrapper callable expects a file-like object. PEP 333/3333 reports a special pattern when the object is not a file (call read() until the object is consumed). uWSGI now supports this pattern (even if in a hacky way) * When using --http-keepalive you can now hold the connection open even if OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=5
2013-05-31 20:42:21 +02:00
@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req
libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()
LDFLAGS.append('-L' + libpath )
-os.environ['LD_RUN_PATH'] = libpath
LIBS = os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip().split()