From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 2/3] python: Build libffi before python and link against it Date: Tue, 16 Jun 2015 17:57:53 +0200 Message-ID: <1434470274-31024-2-git-send-email-michael.tremer@ipfire.org> In-Reply-To: <1434470274-31024-1-git-send-email-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2784334344841828510==" List-Id: --===============2784334344841828510== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- lfs/python | 4 +- make.sh | 2 +- src/patches/python-2.7rc1-ctypes-noexecmem.patch | 85 ++++++++++++++++++++++= ++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 src/patches/python-2.7rc1-ctypes-noexecmem.patch diff --git a/lfs/python b/lfs/python index acd230c..cd47d7e 100644 --- a/lfs/python +++ b/lfs/python @@ -70,8 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_ms= vc,libffi_osx} cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch - cd $(DIR_APP) && OPT=3D"$(CFLAGS)" ./configure --prefix=3D/usr --enable-sha= red + cd $(DIR_APP) && OPT=3D"$(CFLAGS)" ./configure \ + --prefix=3D/usr --enable-shared --with-system-ffi cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 29245bc..b6217a7 100755 --- a/make.sh +++ b/make.sh @@ -476,6 +476,7 @@ buildipfire() { ipfiremake curl ipfiremake tcl ipfiremake sqlite + ipfiremake libffi ipfiremake python ipfiremake fireinfo ipfiremake libnet @@ -579,7 +580,6 @@ buildipfire() { ipfiremake python-mechanize ipfiremake python-feedparser ipfiremake python-rssdler - ipfiremake libffi ipfiremake glib ipfiremake GeoIP ipfiremake fwhits diff --git a/src/patches/python-2.7rc1-ctypes-noexecmem.patch b/src/patches/p= ython-2.7rc1-ctypes-noexecmem.patch new file mode 100644 index 0000000..ccc2e68 --- /dev/null +++ b/src/patches/python-2.7rc1-ctypes-noexecmem.patch @@ -0,0 +1,85 @@ +diff -up Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux Python-2.7rc1/Mod= ules/_ctypes/callbacks.c +--- Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux 2010-05-09 10:46:46.00= 0000000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/callbacks.c 2010-06-08 08:44:18.357366200 = -0400 +@@ -21,8 +21,8 @@ CThunkObject_dealloc(PyObject *_self) + Py_XDECREF(self->converters); + Py_XDECREF(self->callable); + Py_XDECREF(self->restype); +- if (self->pcl) +- _ctypes_free_closure(self->pcl); ++ if (self->pcl_write) ++ ffi_closure_free(self->pcl_write); + PyObject_GC_Del(self); + } +=20 +@@ -391,7 +391,8 @@ static CThunkObject* CThunkObject_new(Py + return NULL; + } +=20 +- p->pcl =3D NULL; ++ p->pcl_exec =3D NULL; ++ p->pcl_write =3D NULL; + memset(&p->cif, 0, sizeof(p->cif)); + p->converters =3D NULL; + p->callable =3D NULL; +@@ -421,8 +422,9 @@ CThunkObject *_ctypes_alloc_callback(PyO +=20 + assert(CThunk_CheckExact(p)); +=20 +- p->pcl =3D _ctypes_alloc_closure(); +- if (p->pcl =3D=3D NULL) { ++ p->pcl_write =3D ffi_closure_alloc(sizeof(ffi_closure), ++ &p->pcl_exec); ++ if (p->pcl_write =3D=3D NULL) { + PyErr_NoMemory(); + goto error; + } +@@ -467,7 +469,9 @@ CThunkObject *_ctypes_alloc_callback(PyO + "ffi_prep_cif failed with %d", result); + goto error; + } +- result =3D ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); ++ result =3D ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn, ++ p, ++ p->pcl_exec); + if (result !=3D FFI_OK) { + PyErr_Format(PyExc_RuntimeError, + "ffi_prep_closure failed with %d", result); +diff -up Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux Python-2.7rc1/Modul= es/_ctypes/_ctypes.c +--- Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux 2010-05-09 10:46:46.0000= 00000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/_ctypes.c 2010-06-07 23:19:39.950146038 -0= 400 +@@ -3463,7 +3463,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObj + self->callable =3D callable; +=20 + self->thunk =3D thunk; +- *(void **)self->b_ptr =3D (void *)thunk->pcl; ++ *(void **)self->b_ptr =3D (void *)thunk->pcl_exec; +=20 + Py_INCREF((PyObject *)thunk); /* for KeepRef */ + if (-1 =3D=3D KeepRef((CDataObject *)self, 0, (PyObject *)thunk)) { +diff -up Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux Python-2.7rc1/Module= s/_ctypes/ctypes.h +--- Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux 2010-05-09 10:46:46.00000= 0000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/ctypes.h 2010-06-07 23:19:39.950146038 -04= 00 +@@ -95,7 +95,8 @@ struct tagCDataObject { +=20 + typedef struct { + PyObject_VAR_HEAD +- ffi_closure *pcl; /* the C callable */ ++ ffi_closure *pcl_write; /* the C callable, writeable */ ++ void *pcl_exec; /* the C callable, executable */ + ffi_cif cif; + int flags; + PyObject *converters; +diff -up Python-2.7rc1/setup.py.selinux Python-2.7rc1/setup.py +--- Python-2.7rc1/setup.py.selinux 2010-06-07 23:19:39.922147795 -0400 ++++ Python-2.7rc1/setup.py 2010-06-07 23:19:39.951145942 -0400 +@@ -1864,8 +1864,7 @@ class PyBuildExt(build_ext): + '_ctypes/callbacks.c', + '_ctypes/callproc.c', + '_ctypes/stgdict.c', +- '_ctypes/cfield.c', +- '_ctypes/malloc_closure.c'] ++ '_ctypes/cfield.c'] + depends =3D ['_ctypes/ctypes.h'] +=20 + if sys.platform =3D=3D 'darwin': --=20 1.8.5.2 --===============2784334344841828510==--