Accepting request 396901 from server:http

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/396901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uwsgi?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2016-05-23 14:39:08 +00:00 committed by Git OBS Bridge
commit d8f873a4d0
6 changed files with 52 additions and 19 deletions

View File

@ -1,11 +1,13 @@
--- a/uwsgiconfig.py Index: uwsgi-2.0.13/uwsgiconfig.py
+++ b/uwsgiconfig.py ===================================================================
@@ -1192,10 +1192,7 @@ def build_plugin(path, uc, cflags, ldfla --- uwsgi-2.0.13.orig/uwsgiconfig.py
+++ uwsgi-2.0.13/uwsgiconfig.py
@@ -1420,10 +1420,7 @@ def build_plugin(path, uc, cflags, ldfla
except: except:
pass pass
- if uc: - if uc:
- plugin_dest = uc.get('plugin_dir') + '/' + name + '_plugin' - plugin_dest = uc.get('plugin_build_dir', uc.get('plugin_dir')) + '/' + name + '_plugin'
- else: - else:
- plugin_dest = name + '_plugin' - plugin_dest = name + '_plugin'
+ plugin_dest = name + '_plugin' + plugin_dest = name + '_plugin'

View File

@ -1,5 +1,7 @@
--- a/plugins/jvm/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 Index: uwsgi-2.0.13/plugins/jvm/uwsgiplugin.py
+++ b/plugins/jvm/uwsgiplugin.py 2016-01-07 14:35:31.212291749 +0100 ===================================================================
--- 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: @@ -65,11 +65,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
GCC_LIST = ['jvm_plugin'] GCC_LIST = ['jvm_plugin']
@ -12,8 +14,10 @@
def post_build(config): def post_build(config):
if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0:
os._exit(1) os._exit(1)
--- a/plugins/php/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 Index: uwsgi-2.0.13/plugins/php/uwsgiplugin.py
+++ b/plugins/php/uwsgiplugin.py 2016-01-07 14:36:47.403974902 +0100 ===================================================================
--- 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 @@ -19,7 +19,6 @@ LDFLAGS = os.popen(PHPPATH + ' --ldflags
if ld_run_path: if ld_run_path:
@ -22,19 +26,23 @@
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version] LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version]
--- a/plugins/python/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 Index: uwsgi-2.0.13/plugins/python/uwsgiplugin.py
+++ b/plugins/python/uwsgiplugin.py 2016-01-07 14:39:06.071398672 +0100 ===================================================================
--- 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 @@ -58,8 +58,6 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro
LDFLAGS.append("-L%s" % libdir) LDFLAGS.append("-L%s" % libdir)
LDFLAGS.append("-Wl,-rpath=%s" % libdir) LDFLAGS.append("-Wl,-rpath,%s" % libdir)
- os.environ['LD_RUN_PATH'] = "%s" % libdir - os.environ['LD_RUN_PATH'] = "%s" % libdir
- -
LIBS.append('-lpython%s' % get_python_version()) LIBS.append('-lpython%s' % get_python_version())
else: else:
LIBS = [] LIBS = []
--- a/plugins/rack/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 Index: uwsgi-2.0.13/plugins/rack/uwsgiplugin.py
+++ b/plugins/rack/uwsgiplugin.py 2016-01-07 14:40:18.623097398 +0100 ===================================================================
--- 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 @@ -46,7 +46,6 @@ LIBS = os.popen(RUBYPATH + " -e \"requir
if has_shared == 'yes': if has_shared == 'yes':
@ -43,8 +51,10 @@
LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip()) LIBS.append(os.popen(RUBYPATH + " -e \"require 'rbconfig';print '-l' + %s::CONFIG['RUBY_SO_NAME']\"" % rbconfig).read().rstrip())
else: else:
rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip() rubylibdir = os.popen(RUBYPATH + " -e \"require 'rbconfig';print RbConfig::CONFIG['rubylibdir']\"").read().rstrip()
--- a/plugins/ruby19/uwsgiplugin.py 2015-12-30 10:08:49.000000000 +0100 Index: uwsgi-2.0.13/plugins/ruby19/uwsgiplugin.py
+++ b/plugins/ruby19/uwsgiplugin.py 2016-01-07 14:40:51.614960446 +0100 ===================================================================
--- uwsgi-2.0.13.orig/plugins/ruby19/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/ruby19/uwsgiplugin.py
@@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req @@ -40,6 +40,5 @@ LDFLAGS = os.popen(RUBYPATH + " -e \"req
libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip() libpath = os.popen(RUBYPATH + " -e \"require 'rbconfig';print %s::CONFIG['libdir']\"" % rbconfig).read().rstrip()

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:306b51db97648d6d23bb7eacd76e5a413434575f220dac1de231c8c26d33e409
size 784048

3
uwsgi-2.0.13.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:038ba9c21ad71ab02a5b966b95ee8627af0aa4966e066865f7063a0ab1c0305e
size 784960

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Thu May 12 04:43:00 UTC 2016 - jfunk@funktronics.ca
- Update to 2.0.13:
* Fix compilation with GCC 6
* Remote rpc fixes (Darvame)
* Musl support! (Natanael Copa, Matt Dainty, Riccardo Magliocchetti)
* Create the spooler directory if it does not exist (Alexandre Bonnetain)
* Fix compilation on big endian linux (Riccardo Magliocchetti)
* A ton of cache fixes (Darvame)
* Make it easier to compile plugins on a different directory (Jakub
Jirutka)
* Add wheel package machinery (Matt Robenolt)
* Use EPOLLEXCLUSIVE for reading, helps with the thundering herd problem
(on linux 4.5+) (INADA Naoki)
* Fix apache 2.4 integration with unix sockets (Alexandre Rossi)
* Add HTTP/2 support to apache 2 proxy (Michael Fladischer, OGAWA Hirofumi)
* Fix apache mod proxy compilation with apache 2.4.20 (Mathieu Arnold)
* Default to clang as default compiler on MacOS X (Riccardo Magliocchetti)
* Added --cgi-close-stdin-on-eof (Roberto De Ioris)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 7 13:50:57 UTC 2016 - buschmann23@opensuse.org Thu Jan 7 13:50:57 UTC 2016 - buschmann23@opensuse.org

View File

@ -17,7 +17,7 @@
Name: uwsgi Name: uwsgi
Version: 2.0.12 Version: 2.0.13
Release: 0 Release: 0
Summary: Application Container Server for Networked/Clustered Web Applications Summary: Application Container Server for Networked/Clustered Web Applications
License: GPL-2.0-with-GCC-exception License: GPL-2.0-with-GCC-exception