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

Accepting request 978246 from home:marxin:branches:server:http

Browse Source 
- Add uwsgi-ld-noexecstack.patch in order to fix gh#unbit/uwsgi#2436.

OBS-URL: https://build.opensuse.org/request/show/978246
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=105
This commit is contained in:
James Oakley 2022-05-20 10:37:39 +00:00 committed by Git OBS Bridge
parent b86cc08904
commit f258c4021f
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
uwsgi-ld-noexecstack.patch Normal file
View File

@ -0,0 +1,49 @@
diff --git a/uwsgiconfig.py b/uwsgiconfig.py
index 9998bc5..abb44e4 100644
--- a/uwsgiconfig.py
+++ b/uwsgiconfig.py
@@ -539,7 +539,7 @@ def build_uwsgi(uc, print_only=False, gcll=None):
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 os.system(binary_link_cmd) != 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)
os.system(binary_link_cmd)
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)
os.system(binary_link_cmd)
if symbase:
@@ -1175,7 +1175,7 @@ class uConf(object):
os.system(objcopy_cmd)
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)
os.system(binary_link_cmd)
binary_list.append(binarize(ef))
@@ -1465,7 +1465,7 @@ def build_plugin(path, uc, cflags, ldflags, libs, name = None):
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 os.system(binary_link_cmd) != 0:
raise Exception('unable to link binary file')

5
uwsgi.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 12 07:28:54 UTC 2022 - Martin Liška <mliska@suse.cz>
- Add uwsgi-ld-noexecstack.patch in order to fix gh#unbit/uwsgi#2436.
-------------------------------------------------------------------
Sun Dec 5 14:20:26 UTC 2021 - Michael Ströder <michael@stroeder.com>

5
uwsgi.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package uwsgi
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,6 +43,8 @@ Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch
Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch
# PATCH-FIX-OPENSUSE uwsgi-2.0.18-postgresql-config.patch - Use pkg-config instead of pg_config
Patch4: uwsgi-2.0.18-postgresql-config.patch
# PATCH-FIX-UPSTREAM uwsgi-ld-noexecstack.patch - Do not create executable stack
Patch5: uwsgi-ld-noexecstack.patch
BuildRequires: apache-rpm-macros
%if 0%{suse_version} < 1500
BuildRequires: apache2-devel
@ -397,6 +399,7 @@ This package contains support for PHP version 7.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
# Generate a config that builds all plugins except for examples and stuff we
# can't satisfy the requirements for or are just broken
excluded_plugins=""