mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity
openwrt-packages/lang/python/python3/patches/016-adjust-config-paths.patch

81 lines
3.8 KiB
Diff
Raw Normal View History

python3: upgrade to version 3.6.0 Python 3.6 comes with some new cross-compilation logic that generates filenames/paths with arch, abiflags and mach included (in filename & path). Problem is that the generated paths/filenames are not consistent across archs (noticed on x86_64 & ar71xx), so patch `016-adjust-config-paths.patch` was added to mitigate this (by removing extra stuff in paths). Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-01 00:53:14 +01:00
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
python3: Update to version 3.7.4 - Update setuptools to 40.8.0 - Update pip to 19.0.3 - Refreshed patches - Removed 4 patches (2 of them was included in 3.7.3 and other two are included in this release) Makefile python3: - Move PKG_MAINTAINER above PKG_LICENSE Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> (cherry-picked from ce769db0077f3ace8ef691cf33b827a10e0613a5)
2019-07-09 20:56:33 +02:00
@@ -446,6 +446,7 @@ def _init_posix():
python3: upgrade to version 3.6.0 Python 3.6 comes with some new cross-compilation logic that generates filenames/paths with arch, abiflags and mach included (in filename & path). Problem is that the generated paths/filenames are not consistent across archs (noticed on x86_64 & ar71xx), so patch `016-adjust-config-paths.patch` was added to mitigate this (by removing extra stuff in paths). Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-01 00:53:14 +01:00
platform=sys.platform,
multiarch=getattr(sys.implementation, '_multiarch', ''),
))
+ name = '_sysconfigdata'
_temp = __import__(name, globals(), locals(), ['build_time_vars'], 0)
build_time_vars = _temp.build_time_vars
global _config_vars
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
python3: Update to version 3.7.4 - Update setuptools to 40.8.0 - Update pip to 19.0.3 - Refreshed patches - Removed 4 patches (2 of them was included in 3.7.3 and other two are included in this release) Makefile python3: - Move PKG_MAINTAINER above PKG_LICENSE Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> (cherry-picked from ce769db0077f3ace8ef691cf33b827a10e0613a5)
2019-07-09 20:56:33 +02:00
@@ -344,6 +344,7 @@ def get_makefile_filename():
python3: upgrade to version 3.6.0 Python 3.6 comes with some new cross-compilation logic that generates filenames/paths with arch, abiflags and mach included (in filename & path). Problem is that the generated paths/filenames are not consistent across archs (noticed on x86_64 & ar71xx), so patch `016-adjust-config-paths.patch` was added to mitigate this (by removing extra stuff in paths). Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-01 00:53:14 +01:00
def _get_sysconfigdata_name():
+ return '_sysconfigdata'
return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME',
'_sysconfigdata_{abi}_{platform}_{multiarch}'.format(
abi=sys.abiflags,
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
python3: Update to 3.7.16, refresh patches Includes fixes: * 3.7.14: * CVE-2020-10735: Prevent DoS by large int<->str conversions * CVE-2021-28861: http.server: Open Redirection if the URL path starts with // * 3.7.16: * CVE-2022-45061: Slow IDNA decoding with large strings * CVE-2022-37454: Buffer overflow in the _sha3 module * CVE-2015-20107: mailcap.findmatch: document shell command Injection danger in filename parameter Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2023-03-16 08:05:35 +01:00
@@ -1416,7 +1416,7 @@ libinstall: build_all $(srcdir)/Modules/
python3: upgrade to version 3.6.0 Python 3.6 comes with some new cross-compilation logic that generates filenames/paths with arch, abiflags and mach included (in filename & path). Problem is that the generated paths/filenames are not consistent across archs (noticed on x86_64 & ar71xx), so patch `016-adjust-config-paths.patch` was added to mitigate this (by removing extra stuff in paths). Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-01 00:53:14 +01:00
esac; \
done; \
done
- $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
+ $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \
$(DESTDIR)$(LIBDEST); \
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
python3: bump to version 3.6.4 Re-worked patch `003-do-not-run-distutils-tests.patch` to reduce patch-size. Removed `011-fix-ncursesw-definition-colisions.patch` it is fixed upstream. Refreshed with `make package/python3/refresh` Resetting PKG_RELEASE to 1. This variable was never used for pip3 & setuptools, since VERSION is specified in the package definitions. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-12-31 16:53:20 +01:00
ifeq (@COMPILE_ALL_TESTS@,yes)
python3: Update to 3.7.16, refresh patches Includes fixes: * 3.7.14: * CVE-2020-10735: Prevent DoS by large int<->str conversions * CVE-2021-28861: http.server: Open Redirection if the URL path starts with // * 3.7.16: * CVE-2022-45061: Slow IDNA decoding with large strings * CVE-2022-37454: Buffer overflow in the _sha3 module * CVE-2015-20107: mailcap.findmatch: document shell command Injection danger in filename parameter Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2023-03-16 08:05:35 +01:00
@@ -1561,7 +1561,7 @@ sharedinstall: sharedmods
python3: upgrade to version 3.6.0 Python 3.6 comes with some new cross-compilation logic that generates filenames/paths with arch, abiflags and mach included (in filename & path). Problem is that the generated paths/filenames are not consistent across archs (noticed on x86_64 & ar71xx), so patch `016-adjust-config-paths.patch` was added to mitigate this (by removing extra stuff in paths). Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-01 00:53:14 +01:00
--install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \
--root=$(DESTDIR)/
- -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
+ -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata*.py
-rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
# Here are a couple of targets for MacOSX again, to install a full
--- a/configure
+++ b/configure
python3: Use default _PYTHON_HOST_PLATFORM This lets the Python build process set _PYTHON_HOST_PLATFORM instead of forcing an explicit value. Also: * Save the target _PYTHON_HOST_PLATFORM value during Build/InstallDev for use when building target Python packages (in python3-package.mk). * Use the (mostly) default PYTHON_FOR_BUILD value, instead patch configure to remove the platform triplet from the sysconfigdata file name. * Remove the "CROSS_COMPILE=yes" make variable (there is no indication that this variable is necessary). * Force host pip to build packages from source instead of downloading binary wheels. Previously, host pip can download universal (platform-independent) wheels but not platform-specific wheels, because of the custom _PYTHON_HOST_PLATFORM value. (Packages that do not have universal wheels would be compiled from source.) With a correct _PYTHON_HOST_PLATFORM, host pip can install platform-specific wheels as well. However, the pre-built shared object (.so) files in these wheels will have the host's platform triplet in their file names. When target Python packages are built (using the target's _PYTHON_HOST_PLATFORM), Python will not use these shared object files. By forcing host pip to build packages from source, the built shared object files will not have the platform triplet in their file names. (Host Python has been patched to remove the platform triplet from file names.) This allows these packages to be used when building target Python packages. (The net effect of this complete change is that platform-dependent packages will continue to be compiled from source, while platform-independent packages will now also be compiled from source.) Fixes https://github.com/openwrt/packages/issues/12680. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-07-08 11:10:14 +02:00
@@ -2936,7 +2936,7 @@ $as_echo_n "checking for python interpre
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
$as_echo "$interp" >&6; }
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
fi
elif test "$cross_compiling" = maybe; then
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
python3: Update to 3.7.13, refresh patches Includes fixes for: * Windows builds updated to bzip2 1.0.8 to mitigate CVE-2016-3189 and CVE-2019-12900 * CVE-2022-26488: Escalation of privilege via Windows Installer Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2022-03-21 19:16:36 +01:00
@@ -15296,7 +15296,7 @@ LDVERSION='$(VERSION)$(ABIFLAGS)'
python3: upgrade to version 3.6.0 Python 3.6 comes with some new cross-compilation logic that generates filenames/paths with arch, abiflags and mach included (in filename & path). Problem is that the generated paths/filenames are not consistent across archs (noticed on x86_64 & ar71xx), so patch `016-adjust-config-paths.patch` was added to mitigate this (by removing extra stuff in paths). Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-01 00:53:14 +01:00
$as_echo "$LDVERSION" >&6; }
-if test x$PLATFORM_TRIPLET = x; then
+if true ; then
LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
else
LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
--- a/configure.ac
+++ b/configure.ac
python3: Use default _PYTHON_HOST_PLATFORM This lets the Python build process set _PYTHON_HOST_PLATFORM instead of forcing an explicit value. Also: * Save the target _PYTHON_HOST_PLATFORM value during Build/InstallDev for use when building target Python packages (in python3-package.mk). * Use the (mostly) default PYTHON_FOR_BUILD value, instead patch configure to remove the platform triplet from the sysconfigdata file name. * Remove the "CROSS_COMPILE=yes" make variable (there is no indication that this variable is necessary). * Force host pip to build packages from source instead of downloading binary wheels. Previously, host pip can download universal (platform-independent) wheels but not platform-specific wheels, because of the custom _PYTHON_HOST_PLATFORM value. (Packages that do not have universal wheels would be compiled from source.) With a correct _PYTHON_HOST_PLATFORM, host pip can install platform-specific wheels as well. However, the pre-built shared object (.so) files in these wheels will have the host's platform triplet in their file names. When target Python packages are built (using the target's _PYTHON_HOST_PLATFORM), Python will not use these shared object files. By forcing host pip to build packages from source, the built shared object files will not have the platform triplet in their file names. (Host Python has been patched to remove the platform triplet from file names.) This allows these packages to be used when building target Python packages. (The net effect of this complete change is that platform-dependent packages will continue to be compiled from source, while platform-independent packages will now also be compiled from source.) Fixes https://github.com/openwrt/packages/issues/12680. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-07-08 11:10:14 +02:00
@@ -75,7 +75,7 @@ if test "$cross_compiling" = yes; then
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
fi
elif test "$cross_compiling" = maybe; then
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
python3: Update to 3.7.13, refresh patches Includes fixes for: * Windows builds updated to bzip2 1.0.8 to mitigate CVE-2016-3189 and CVE-2019-12900 * CVE-2022-26488: Escalation of privilege via Windows Installer Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2022-03-21 19:16:36 +01:00
@@ -4776,7 +4776,7 @@ AC_MSG_RESULT($LDVERSION)
python3: upgrade to version 3.6.0 Python 3.6 comes with some new cross-compilation logic that generates filenames/paths with arch, abiflags and mach included (in filename & path). Problem is that the generated paths/filenames are not consistent across archs (noticed on x86_64 & ar71xx), so patch `016-adjust-config-paths.patch` was added to mitigate this (by removing extra stuff in paths). Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-01 00:53:14 +01:00
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED)
-if test x$PLATFORM_TRIPLET = x; then
+if true ; then
LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
else
LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"