From e30f0955fef8613132a9bac3432744ced03bd502612da3c22e0f3b0bcac33502 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 8 Feb 2016 11:22:47 +0000 Subject: [PATCH] Accepting request 352464 from home:buschmann23:Cutelyst Updated to uWSGI 2.0.12 OBS-URL: https://build.opensuse.org/request/show/352464 OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=46 --- uwsgi-2.0.11.1.tar.gz | 3 -- ...patch => uwsgi-2.0.12-no-LD_RUN_PATH.patch | 42 +++++++++---------- uwsgi-2.0.12.tar.gz | 3 ++ uwsgi.changes | 42 +++++++++++++++++++ uwsgi.spec | 6 +-- 5 files changed, 68 insertions(+), 28 deletions(-) delete mode 100644 uwsgi-2.0.11.1.tar.gz rename uwsgi-1.9.17-no-LD_RUN_PATH.patch => uwsgi-2.0.12-no-LD_RUN_PATH.patch (51%) create mode 100644 uwsgi-2.0.12.tar.gz diff --git a/uwsgi-2.0.11.1.tar.gz b/uwsgi-2.0.11.1.tar.gz deleted file mode 100644 index 6bc35e6..0000000 --- a/uwsgi-2.0.11.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75a7d3138cfa9cd81a760c2f8a43f3d80961edc8e4f27043dc1412206c926287 -size 782091 diff --git a/uwsgi-1.9.17-no-LD_RUN_PATH.patch b/uwsgi-2.0.12-no-LD_RUN_PATH.patch similarity index 51% rename from uwsgi-1.9.17-no-LD_RUN_PATH.patch rename to uwsgi-2.0.12-no-LD_RUN_PATH.patch index dd5ac69..ba69675 100644 --- a/uwsgi-1.9.17-no-LD_RUN_PATH.patch +++ b/uwsgi-2.0.12-no-LD_RUN_PATH.patch @@ -1,6 +1,6 @@ ---- a/plugins/jvm/uwsgiplugin.py -+++ b/plugins/jvm/uwsgiplugin.py -@@ -59,11 +59,6 @@ if "-framework JavaVM" in JVM_LIBPATH: +--- a/plugins/jvm/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 ++++ b/plugins/jvm/uwsgiplugin.py 2016-01-07 14:35:31.212291749 +0100 +@@ -65,11 +65,6 @@ if "-framework JavaVM" in JVM_LIBPATH: GCC_LIST = ['jvm_plugin'] @@ -12,32 +12,30 @@ def post_build(config): if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: os._exit(1) ---- a/plugins/php/uwsgiplugin.py -+++ b/plugins/php/uwsgiplugin.py -@@ -17,7 +17,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags +--- a/plugins/php/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 ++++ b/plugins/php/uwsgiplugin.py 2016-01-07 14:36:47.403974902 +0100 +@@ -19,7 +19,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags 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(), '-lphp5'] + LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version] ---- a/plugins/python/uwsgiplugin.py -+++ b/plugins/python/uwsgiplugin.py -@@ -44,10 +44,8 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro - else: - try: - LDFLAGS.append("-L%s" % sysconfig.get_config_var('LIBDIR')) -- os.environ['LD_RUN_PATH'] = "%s" % (sysconfig.get_config_var('LIBDIR')) - except: - LDFLAGS.append("-L%s/lib" % sysconfig.PREFIX) -- os.environ['LD_RUN_PATH'] = "%s/lib" % sysconfig.PREFIX +--- a/plugins/python/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 ++++ b/plugins/python/uwsgiplugin.py 2016-01-07 14:39:06.071398672 +0100 +@@ -58,8 +58,6 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro + LDFLAGS.append("-L%s" % libdir) + LDFLAGS.append("-Wl,-rpath=%s" % libdir) +- os.environ['LD_RUN_PATH'] = "%s" % libdir +- LIBS.append('-lpython%s' % get_python_version()) else: ---- a/plugins/rack/uwsgiplugin.py -+++ b/plugins/rack/uwsgiplugin.py -@@ -44,7 +44,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir + LIBS = [] +--- a/plugins/rack/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 ++++ b/plugins/rack/uwsgiplugin.py 2016-01-07 14:40:18.623097398 +0100 +@@ -46,7 +46,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir if has_shared == 'yes': LDFLAGS.append('-L' + libpath ) @@ -45,8 +43,8 @@ LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) else: rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip() ---- a/plugins/ruby19/uwsgiplugin.py -+++ b/plugins/ruby19/uwsgiplugin.py +--- a/plugins/ruby19/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 ++++ b/plugins/ruby19/uwsgiplugin.py 2016-01-07 14:40:51.614960446 +0100 @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() diff --git a/uwsgi-2.0.12.tar.gz b/uwsgi-2.0.12.tar.gz new file mode 100644 index 0000000..d929028 --- /dev/null +++ b/uwsgi-2.0.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:306b51db97648d6d23bb7eacd76e5a413434575f220dac1de231c8c26d33e409 +size 784048 diff --git a/uwsgi.changes b/uwsgi.changes index 5ac9c40..41aeffb 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Thu Jan 7 13:50:57 UTC 2016 - buschmann23@opensuse.org + +- Udate to version 2.0.12 + * Bugfixes + * ‘rpcvar’ routing action correctly returns NEXT on empty response + * uwsgiconfig: fix handling of empty keys in python3 (Simone Basso) + * plugins/alarm_speech: fix AppKit spelling to support + case-sensitive filesystems (Andrew Janke) + * Fix inheriting INET address 0.0.0.0 (INADA Naoki) + * core/xmlconf: correctly initialize libxml2 (Riccardo Magliocchetti) + * Pass LIBDIR to linker in python plugin (Borys Pierov) + * Platforms-related build fixes for pty, forkptyrouter and mono + plugins (Jonas Smedegaard and Riccardo Magliocchetti) + * New Features + * The custom worker api - Finally you are able to override the uWSGI + processing model to completeley get control of it. + https://github.com/unbit/uwsgi-docs/blob/master/WorkerOverride.rst + * --wsgi-disable-file-wrapper - This option disables the wsgi.file_wrapper + optimization of the WSGI standard. IN some corner case this is + the only trick to avoid errors. + * Official PHP7 support - PHP 7 is now officially supported in + the php plugin. + * uwsgi.spooler_get_task api (Credits: Alexandre Bonnetain) + This patch allows you to easily parse spooler files. + * --if-hostname-match (Credits: Alexandre Bonnetain) + This options for config logic allows you to define options only + when a regexp over the hostname machtes. +- Update patch 1 - uwsgi-1.9.17-no-LD_RUN_PATH.patch - renamed patch + file to uwsgi-2.0.12-no-LD_RUN_PATH.patch + +------------------------------------------------------------------- +Fri Nov 6 17:33:31 UTC 2015 - buschmann23@opensuse.org + +- Update to version 2.0.11.2 + * Bugfixes + * OSX 10.11 supports TCP_FASTOPEN + * fixed http-socket parser state after harakiri + * fixed threaded request logger + * fixed fastrouter subscriptions modifiers + * fixed alarm backlog + ------------------------------------------------------------------- Sat Sep 26 17:39:41 UTC 2015 - jfunk@funktronics.ca diff --git a/uwsgi.spec b/uwsgi.spec index 616e55a..2840412 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -1,7 +1,7 @@ # # spec file for package uwsgi # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: uwsgi -Version: 2.0.11.1 +Version: 2.0.12 Release: 0 Summary: Application Container Server for Networked/Clustered Web Applications License: GPL-2.0-with-GCC-exception @@ -35,7 +35,7 @@ Source8: uwsgi.ini # PATCH-FIX-OPENSUSE uwsgi-1.9.17-plugin_build_path.patch - Don't attempt to install plugins to target dest during build Patch0: uwsgi-1.9.17-plugin_build_path.patch # PATCH-FIX-OPENSUSE uwsgi-1.9.17-no-LD_RUN_PATH.patch - Disable invalid rpath in plugins -Patch1: uwsgi-1.9.17-no-LD_RUN_PATH.patch +Patch1: uwsgi-2.0.12-no-LD_RUN_PATH.patch # PATCH-FIX-OPENSUSE uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch - No -fobjc-gc in CFLAGS, which is incorrect in GNU Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch # PATCH-FIX-OPENSUSE uwsgi-1.9.11-systemd_logger-old_systemd.patch - Older systemd in 12.2 does not implicity include syslog.h