rpm/uwsgi
SHA256
1
0
Fork 0
forked from pool/uwsgi
Code Pull Requests Activity

Accepting request 1056693 from home:dirkmueller:Factory

Browse Source 
- update to 2.0.21:
  * Python 3.10 support
  * Python 3.11 support
  * add tests for worker deadlocks
  * fix memory corruption in uwsgi_cache
  * Fix segfault from GEVENT_SWITCH
  * Support php 8.1
  * Use parenthesis in print() statement 
- switch to pkgconfig(zlib) so that alternative providers can be
  used

OBS-URL: https://build.opensuse.org/request/show/1056693
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=114
This commit is contained in:
James Oakley 2023-01-07 18:41:26 +00:00 committed by Git OBS Bridge
parent 6e7928265a
commit 217d8618ea
6 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
2.0.21.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9
size 808494

36
uwsgi-2.0.12-no-LD_RUN_PATH.patch
View File

@ -1,8 +1,8 @@
Index: uwsgi-2.0.13/plugins/jvm/uwsgiplugin.py Index: uwsgi-2.0.21/plugins/jvm/uwsgiplugin.py
=================================================================== ===================================================================
--- uwsgi-2.0.13.orig/plugins/jvm/uwsgiplugin.py --- uwsgi-2.0.21.orig/plugins/jvm/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/jvm/uwsgiplugin.py +++ uwsgi-2.0.21/plugins/jvm/uwsgiplugin.py
@@ -65,11 +65,6 @@ if "-framework JavaVM" in JVM_LIBPATH: @@ -66,11 +66,6 @@ if "-framework JavaVM" in JVM_LIBPATH:
GCC_LIST = ['jvm_plugin'] GCC_LIST = ['jvm_plugin']
@ -12,12 +12,12 @@ Index: uwsgi-2.0.13/plugins/jvm/uwsgiplugin.py
- os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:] - os.environ['LD_RUN_PATH'] = JVM_LIBPATH[0][2:]
- -
def post_build(config): def post_build(config):
if os.system("javac %s/plugins/jvm/uwsgi.java" % os.getcwd()) != 0: if subprocess.call("javac %s/plugins/jvm/uwsgi.java" % os.getcwd(), shell=True) != 0:
os._exit(1) os._exit(1)
Index: uwsgi-2.0.13/plugins/php/uwsgiplugin.py Index: uwsgi-2.0.21/plugins/php/uwsgiplugin.py
=================================================================== ===================================================================
--- uwsgi-2.0.13.orig/plugins/php/uwsgiplugin.py --- uwsgi-2.0.21.orig/plugins/php/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/php/uwsgiplugin.py +++ uwsgi-2.0.21/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:
@ -26,11 +26,11 @@ Index: uwsgi-2.0.13/plugins/php/uwsgiplugin.py
LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version] LIBS = [os.popen(PHPPATH + ' --libs').read().rstrip(), '-lphp' + php_version]
Index: uwsgi-2.0.13/plugins/python/uwsgiplugin.py Index: uwsgi-2.0.21/plugins/python/uwsgiplugin.py
=================================================================== ===================================================================
--- uwsgi-2.0.13.orig/plugins/python/uwsgiplugin.py --- uwsgi-2.0.21.orig/plugins/python/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/python/uwsgiplugin.py +++ uwsgi-2.0.21/plugins/python/uwsgiplugin.py
@@ -58,8 +58,6 @@ if not 'UWSGI_PYTHON_NOLIB' in os.enviro @@ -64,8 +64,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)
@ -39,10 +39,10 @@ Index: uwsgi-2.0.13/plugins/python/uwsgiplugin.py
LIBS.append('-lpython%s' % get_python_version()) LIBS.append('-lpython%s' % get_python_version())
else: else:
LIBS = [] LIBS = []
Index: uwsgi-2.0.13/plugins/rack/uwsgiplugin.py Index: uwsgi-2.0.21/plugins/rack/uwsgiplugin.py
=================================================================== ===================================================================
--- uwsgi-2.0.13.orig/plugins/rack/uwsgiplugin.py --- uwsgi-2.0.21.orig/plugins/rack/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/rack/uwsgiplugin.py +++ uwsgi-2.0.21/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':
@ -51,10 +51,10 @@ Index: uwsgi-2.0.13/plugins/rack/uwsgiplugin.py
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()
Index: uwsgi-2.0.13/plugins/ruby19/uwsgiplugin.py Index: uwsgi-2.0.21/plugins/ruby19/uwsgiplugin.py
=================================================================== ===================================================================
--- uwsgi-2.0.13.orig/plugins/ruby19/uwsgiplugin.py --- uwsgi-2.0.21.orig/plugins/ruby19/uwsgiplugin.py
+++ uwsgi-2.0.13/plugins/ruby19/uwsgiplugin.py +++ uwsgi-2.0.21/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()

3
uwsgi-2.0.20.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
size 804906

24
uwsgi-ld-noexecstack.patch
View File

@ -1,15 +1,15 @@
diff --git a/uwsgiconfig.py b/uwsgiconfig.py Index: uwsgi-2.0.21/uwsgiconfig.py
index 9998bc5..abb44e4 100644 ===================================================================
--- a/uwsgiconfig.py --- uwsgi-2.0.21.orig/uwsgiconfig.py
+++ b/uwsgiconfig.py +++ uwsgi-2.0.21/uwsgiconfig.py
@@ -539,7 +539,7 @@ def build_uwsgi(uc, print_only=False, gcll=None): @@ -539,7 +539,7 @@ def build_uwsgi(uc, print_only=False, gc
gcc_list.append('%s/%s' % (path, cfile)) gcc_list.append('%s/%s' % (path, cfile))
for bfile in up.get('BINARY_LIST', []): for bfile in up.get('BINARY_LIST', []):
try: try:
- binary_link_cmd = "ld -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1]) - binary_link_cmd = "ld -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1])
+ binary_link_cmd = "ld -z noexecstack -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1]) + binary_link_cmd = "ld -z noexecstack -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1])
print(binary_link_cmd) print(binary_link_cmd)
if os.system(binary_link_cmd) != 0: if subprocess.call(binary_link_cmd, shell=True) != 0:
raise Exception('unable to link binary file') raise Exception('unable to link binary file')
@@ -1146,7 +1146,7 @@ class uConf(object): @@ -1146,7 +1146,7 @@ class uConf(object):
if not self.embed_config: if not self.embed_config:
@ -18,7 +18,7 @@ index 9998bc5..abb44e4 100644
- binary_link_cmd = "ld -r -b binary -o %s.o %s" % (binarize(self.embed_config), self.embed_config) - binary_link_cmd = "ld -r -b binary -o %s.o %s" % (binarize(self.embed_config), self.embed_config)
+ binary_link_cmd = "ld -z noexecstack -r -b binary -o %s.o %s" % (binarize(self.embed_config), self.embed_config) + binary_link_cmd = "ld -z noexecstack -r -b binary -o %s.o %s" % (binarize(self.embed_config), self.embed_config)
print(binary_link_cmd) print(binary_link_cmd)
os.system(binary_link_cmd) subprocess.call(binary_link_cmd, shell=True)
self.cflags.append("-DUWSGI_EMBED_CONFIG=_binary_%s_start" % binarize(self.embed_config)) self.cflags.append("-DUWSGI_EMBED_CONFIG=_binary_%s_start" % binarize(self.embed_config))
@@ -1165,7 +1165,7 @@ class uConf(object): @@ -1165,7 +1165,7 @@ class uConf(object):
for directory, directories, files in os.walk(ef): for directory, directories, files in os.walk(ef):
@ -27,23 +27,23 @@ index 9998bc5..abb44e4 100644
- binary_link_cmd = "ld -r -b binary -o %s.o %s" % (binarize(fname), fname) - binary_link_cmd = "ld -r -b binary -o %s.o %s" % (binarize(fname), fname)
+ binary_link_cmd = "ld -z noexecstack -r -b binary -o %s.o %s" % (binarize(fname), fname) + binary_link_cmd = "ld -z noexecstack -r -b binary -o %s.o %s" % (binarize(fname), fname)
print(binary_link_cmd) print(binary_link_cmd)
os.system(binary_link_cmd) subprocess.call(binary_link_cmd, shell=True)
if symbase: if symbase:
@@ -1175,7 +1175,7 @@ class uConf(object): @@ -1175,7 +1175,7 @@ class uConf(object):
os.system(objcopy_cmd) subprocess.call(objcopy_cmd, shell=True)
binary_list.append(binarize(fname)) binary_list.append(binarize(fname))
else: else:
- binary_link_cmd = "ld -r -b binary -o %s.o %s" % (binarize(ef), ef) - binary_link_cmd = "ld -r -b binary -o %s.o %s" % (binarize(ef), ef)
+ binary_link_cmd = "ld -z noexecstack -r -b binary -o %s.o %s" % (binarize(ef), ef) + binary_link_cmd = "ld -z noexecstack -r -b binary -o %s.o %s" % (binarize(ef), ef)
print(binary_link_cmd) print(binary_link_cmd)
os.system(binary_link_cmd) subprocess.call(binary_link_cmd, shell=True)
binary_list.append(binarize(ef)) binary_list.append(binarize(ef))
@@ -1465,7 +1465,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None): @@ -1460,7 +1460,7 @@ def build_plugin(path, uc, cflags, ldfla
gcc_list.append(path + '/' + cfile) gcc_list.append(path + '/' + cfile)
for bfile in up.get('BINARY_LIST', []): for bfile in up.get('BINARY_LIST', []):
try: try:
- binary_link_cmd = "ld -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1]) - binary_link_cmd = "ld -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1])
+ binary_link_cmd = "ld -z noexecstack -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1]) + binary_link_cmd = "ld -z noexecstack -r -b binary -o %s/%s.o %s/%s" % (path, bfile[1], path, bfile[1])
print(binary_link_cmd) print(binary_link_cmd)
if os.system(binary_link_cmd) != 0: if subprocess.call(binary_link_cmd, shell=True) != 0:
raise Exception('unable to link binary file') raise Exception('unable to link binary file')

18
uwsgi.changes
View File

@ -1,8 +1,14 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller <dmueller@suse.com> Fri Jan 6 20:36:08 UTC 2023 - Dirk Müller <dmueller@suse.com>
- switch to pkgconfig(zlib) so that alternative providers can be - update to 2.0.21:
used * Python 3.10 support
* Python 3.11 support
* add tests for worker deadlocks
* fix memory corruption in uwsgi_cache
* Fix segfault from GEVENT_SWITCH
* Support php 8.1
* Use parenthesis in print() statement
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 13 19:44:00 UTC 2022 - sven@uebelacker.net Tue Dec 13 19:44:00 UTC 2022 - sven@uebelacker.net
@ -10,6 +16,12 @@ Tue Dec 13 19:44:00 UTC 2022 - sven@uebelacker.net
- fixing uwsgi-php[78] package description - fixing uwsgi-php[78] package description
- rpmlint: removing obsolete specfile condition for python which is included in python-rpm-macros - rpmlint: removing obsolete specfile condition for python which is included in python-rpm-macros
-------------------------------------------------------------------
Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
- switch to pkgconfig(zlib) so that alternative providers can be
used
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 15 10:58:25 UTC 2022 - pgajdos@suse.com Tue Nov 15 10:58:25 UTC 2022 - pgajdos@suse.com

6
uwsgi.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package uwsgi # spec file for package uwsgi
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,13 +28,13 @@
%endif %endif
Name: uwsgi Name: uwsgi
Version: 2.0.20 Version: 2.0.21
Release: 0 Release: 0
Summary: Application Container Server for Networked/Clustered Web Applications Summary: Application Container Server for Networked/Clustered Web Applications
License: Apache-2.0 AND GPL-2.0-only WITH GCC-exception-2.0 License: Apache-2.0 AND GPL-2.0-only WITH GCC-exception-2.0
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
URL: https://uwsgi-docs.readthedocs.io/en/latest/ URL: https://uwsgi-docs.readthedocs.io/en/latest/
Source: https://projects.unbit.it/downloads/uwsgi-%{version}.tar.gz Source: https://github.com/unbit/uwsgi/archive/refs/tags/%{version}.tar.gz
Source1: opensuse.ini.in Source1: opensuse.ini.in
Source2: uwsgi.service Source2: uwsgi.service
Source3: django.ini.example Source3: django.ini.example