217d8618ea
- 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
50 lines
3.2 KiB
Diff
50 lines
3.2 KiB
Diff
Index: uwsgi-2.0.21/uwsgiconfig.py
|
|
===================================================================
|
|
--- uwsgi-2.0.21.orig/uwsgiconfig.py
|
|
+++ uwsgi-2.0.21/uwsgiconfig.py
|
|
@@ -539,7 +539,7 @@ def build_uwsgi(uc, print_only=False, gc
|
|
gcc_list.append('%s/%s' % (path, cfile))
|
|
for bfile in up.get('BINARY_LIST', []):
|
|
try:
|
|
- 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])
|
|
print(binary_link_cmd)
|
|
if subprocess.call(binary_link_cmd, shell=True) != 0:
|
|
raise Exception('unable to link binary file')
|
|
@@ -1146,7 +1146,7 @@ class uConf(object):
|
|
if not self.embed_config:
|
|
self.embed_config = self.get('embed_config')
|
|
if 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)
|
|
print(binary_link_cmd)
|
|
subprocess.call(binary_link_cmd, shell=True)
|
|
self.cflags.append("-DUWSGI_EMBED_CONFIG=_binary_%s_start" % binarize(self.embed_config))
|
|
@@ -1165,7 +1165,7 @@ class uConf(object):
|
|
for directory, directories, files in os.walk(ef):
|
|
for f in files:
|
|
fname = "%s/%s" % (directory, f)
|
|
- 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)
|
|
print(binary_link_cmd)
|
|
subprocess.call(binary_link_cmd, shell=True)
|
|
if symbase:
|
|
@@ -1175,7 +1175,7 @@ class uConf(object):
|
|
subprocess.call(objcopy_cmd, shell=True)
|
|
binary_list.append(binarize(fname))
|
|
else:
|
|
- 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)
|
|
print(binary_link_cmd)
|
|
subprocess.call(binary_link_cmd, shell=True)
|
|
binary_list.append(binarize(ef))
|
|
@@ -1460,7 +1460,7 @@ def build_plugin(path, uc, cflags, ldfla
|
|
gcc_list.append(path + '/' + cfile)
|
|
for bfile in up.get('BINARY_LIST', []):
|
|
try:
|
|
- 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])
|
|
print(binary_link_cmd)
|
|
if subprocess.call(binary_link_cmd, shell=True) != 0:
|
|
raise Exception('unable to link binary file')
|