a8d6759329
- Set PORTNAME to python and add PKGNAMESUFFIX - Update Makefile and PLIST to be similar with python36 - Sort USES - Remove CPE_*: all of them are default values - Update PLIST_FILES: do not use %% - Fix shebang: - Update SHEBANG_FILES - Remove over-patched shebang fix of Lib/cgi.py - Update http:// links in Makefile comments and patch files Changes: https://docs.python.org/3.4/whatsnew/changelog.html Security: 0fe70bcd-2ce3-46c9-a64b-4a7da097db07 MFH: 2018Q1
68 lines
2.2 KiB
Text
68 lines
2.2 KiB
Text
# Backport patch 0001 from Issue #20210
|
|
# Issue: https://bugs.python.org/issue20210
|
|
# By: Thomas Petazzoni
|
|
|
|
--- ./Makefile.pre.in.orig 2014-03-24 22:45:17.908886504 +1100
|
|
+++ ./Makefile.pre.in 2014-03-24 22:47:55.503779805 +1100
|
|
@@ -172,6 +172,8 @@
|
|
# configure script arguments
|
|
CONFIG_ARGS= @CONFIG_ARGS@
|
|
|
|
+# disabled extensions
|
|
+DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@
|
|
|
|
# Subdirectories with code
|
|
SRCDIRS= @SRCDIRS@
|
|
@@ -555,6 +557,7 @@
|
|
esac; \
|
|
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
|
|
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
|
|
+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
|
|
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
|
|
|
|
# Build static library
|
|
@@ -1352,7 +1355,8 @@
|
|
# Install the dynamically loadable modules
|
|
# This goes into $(exec_prefix)
|
|
sharedinstall: sharedmods
|
|
- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
|
|
+ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
|
|
+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
|
|
--prefix=$(prefix) \
|
|
--install-scripts=$(BINDIR) \
|
|
--install-platlib=$(DESTSHARED) \
|
|
--- ./configure.ac.orig 2014-03-24 22:48:10.442551831 +1100
|
|
+++ ./configure.ac 2014-03-24 22:48:42.059827384 +1100
|
|
@@ -2331,6 +2331,8 @@
|
|
|
|
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
|
|
|
|
+AC_SUBST(DISABLED_EXTENSIONS)
|
|
+
|
|
# Check for use of the system expat library
|
|
AC_MSG_CHECKING(for --with-system-expat)
|
|
AC_ARG_WITH(system_expat,
|
|
--- configure.orig 2015-03-01 13:57:08.000000000 +0300
|
|
+++ configure 2015-03-01 13:57:30.000000000 +0300
|
|
@@ -650,6 +650,7 @@
|
|
TCLTK_LIBS
|
|
TCLTK_INCLUDES
|
|
LIBFFI_INCLUDEDIR
|
|
+DISABLED_EXTENSIONS
|
|
PKG_CONFIG_LIBDIR
|
|
PKG_CONFIG_PATH
|
|
PKG_CONFIG
|
|
--- ./setup.py.orig 2014-03-24 22:48:48.495472513 +1100
|
|
+++ ./setup.py 2014-03-24 22:49:20.076122201 +1100
|
|
@@ -33,7 +33,10 @@
|
|
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
|
|
|
|
# This global variable is used to hold the list of modules to be disabled.
|
|
-disabled_module_list = []
|
|
+try:
|
|
+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
|
|
+except KeyError:
|
|
+ disabled_module_list = list()
|
|
|
|
def add_dir_to_list(dirlist, dir):
|
|
"""Add the directory 'dir' to the list 'dirlist' (after any relative
|