Index: Mk/Uses/python.mk =================================================================== --- Mk/Uses/python.mk +++ Mk/Uses/python.mk @@ -324,7 +324,7 @@ # What Python version and what Python interpreters are currently supported? # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -_PYTHON_VERSIONS= 3.11 3.12 3.10 3.9 2.7 # preferred first +_PYTHON_VERSIONS= 3.11 3.12 3.13 3.10 3.9 2.7 # preferred first _PYTHON_PORTBRANCH= 3.11 # ${_PYTHON_VERSIONS:[1]} _PYTHON_BASECMD= ${LOCALBASE}/bin/python _PYTHON_RELPORTDIR= lang/python Index: lang/Makefile =================================================================== --- lang/Makefile +++ lang/Makefile @@ -311,6 +311,7 @@ SUBDIR += python310 SUBDIR += python311 SUBDIR += python312 + SUBDIR += python313 SUBDIR += python39 SUBDIR += qmasm SUBDIR += quickjs Index: lang/python313/Makefile =================================================================== --- /dev/null +++ lang/python313/Makefile @@ -0,0 +1,152 @@ +PORTNAME= python +DISTVERSION= ${PYTHON_DISTVERSION} +CATEGORIES= lang python +MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} +PKGNAMESUFFIX= ${PYTHON_SUFFIX} +DISTNAME= Python-${DISTVERSION} +DIST_SUBDIR= python + +MAINTAINER= python@FreeBSD.org +COMMENT= Interpreted object-oriented programming language +WWW= https://www.python.org/ + +LICENSE= PSFL + +LIB_DEPENDS= libffi.so:devel/libffi + +USES= compiler:c11 cpe ncurses pathfix pkgconfig \ + python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz +PATHFIX_MAKEFILEIN= Makefile.pre.in +USE_LDCONFIG= yes +GNU_CONFIGURE= yes +python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R} +SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py +SHEBANG_FILES+= Lib/test/archivetestdata/exe_with_z64 \ + Lib/test/archivetestdata/exe_with_zip \ + Lib/test/archivetestdata/header.sh + +DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm +CONFIGURE_ARGS+= --enable-shared --without-ensurepip +CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations + +INSTALL_TARGET= altinstall # Don't want cloberring of unprefixed files + +TEST_TARGET= buildbottest +TEST_ARGS= TESTOPTS=-j${MAKE_JOBS_NUMBER} + +MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library + +SUB_FILES= pkg-message +SUB_LIST= PYTHON_SUFFIX=${PYTHON_SUFFIX} + +PLIST_SUB= ABI=${ABIFLAGS} \ + DISTVERSION=${DISTVERSION} \ + OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} # For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554 + +OPTIONS_DEFINE= DEBUG IPV6 LIBMPDEC LTO NLS PYMALLOC +OPTIONS_DEFAULT= LIBMPDEC LTO PYMALLOC +OPTIONS_EXCLUDE_riscv64= LTO +OPTIONS_EXCLUDE_powerpc64le= LTO +OPTIONS_RADIO= HASH +OPTIONS_RADIO_HASH= FNV SIPHASH +OPTIONS_SUB= yes + +LIBMPDEC_DESC= Use libmpdec from ports instead of bundled version +NLS_DESC= Enable gettext support for the locale module +PYMALLOC_DESC= Enable specialized mallocs + +HASH_DESC= Hash Algorithm (PEP-456) +FNV_DESC= Modified Fowler-Noll-Vo Algorithm +SIPHASH_DESC= SipHash24 Algorithm + +FNV_CONFIGURE_ON= --with-hash-algorithm=fnv +SIPHASH_CONFIGURE_ON= --with-hash-algorithm=siphash24 + +DEBUG_CONFIGURE_WITH= pydebug +IPV6_CONFIGURE_ENABLE= ipv6 + +LIBMPDEC_CONFIGURE_ON= --with-system-libmpdec +LIBMPDEC_LIB_DEPENDS= libmpdec.so:math/mpdecimal + +LTO_CONFIGURE_ON= --with-lto + +# Use CPPFLAGS over CFLAGS due to -I ordering, causing elementtree and pyexpat +# to break in Python 2.7, or preprocessor complaints in Python >= 3.3 +# Upstream Issue: https://bugs.python.org/issue6299 +NLS_USES= gettext +NLS_CPPFLAGS= -I${LOCALBASE}/include +NLS_LIBS= -L${LOCALBASE}/lib -lintl +NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no + +PYMALLOC_CONFIGURE_WITH= pymalloc + +.include "${.CURDIR}/Makefile.version" +.include + +.if ${PORT_OPTIONS:MDEBUG} +ABIFLAGS:= d${ABIFLAGS} +.endif + +.if !empty(ABIFLAGS) +PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS} +.endif +PLIST_FILES+= bin/python${PYTHON_VER}${ABIFLAGS}-config \ + libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}.pc \ + libdata/pkgconfig/python-${PYTHON_VER}${ABIFLAGS}-embed.pc + +.if ${SSL_DEFAULT:Mlibressl*} +EXTRA_PATCHES+= ${PATCHDIR}/libressl +CONFIGURE_ENV+= ac_cv_working_openssl_hashlib=yes +.endif + +.include + +# llvm17 with -flto=thin makes Programs/_freeze_module crash on armv7; workaround +# cf. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276249 +.if ${ARCH} == armv7 && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 170 && \ + ${COMPILER_VERSION} < 180 +CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N${LTO_CONFIGURE_ON}} +.endif + +post-patch: +# disable the detection of includes and library from e2fsprogs-libuuid, +# which introduces hidden dependency and breaks build + @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure + +# disable detection of multiarch as it breaks with clang >= 13, which adds a +# major.minor version number in -print-multiarch output, confusing Python + @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure +# Apply DISABLED_EXTENSIONS + @${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local +. for _module in ${DISABLED_EXTENSIONS} + @${ECHO_CMD} ${_module} >> ${WRKSRC}/Modules/Setup.local +. endfor + +post-install: +.if ! ${PORT_OPTIONS:MDEBUG} + ${RM} ${STAGEDIR}${PREFIX}/lib/libpython3.so # Upstream Issue: https://bugs.python.org/issue17975 +.endif + ${LN} -sf libpython${PYTHON_VER}${ABIFLAGS}.so.1.0 ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1 +# This code block exists for the qemu-user enabled cross build environment. +# When using this environment in poudriere, CC is not set to the default +# of /usr/bin/cc and a cross-compile toolchain is used. We need to hand +# edit this so that the run time configuration for python matches what the +# FreeBSD base system provides. sbruno 02Aug2017 +.if ${CC} == /nxb-bin/usr/bin/cc + @${REINPLACE_CMD} -e 's=/nxb-bin==' \ + ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py + @cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \ + ./python -E -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py + @cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \ + ./python -E -O -m compileall -d ${PREFIX}/lib/python${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/_sysconfigdata_${ABIFLAGS}_freebsd${OSREL:R}_.py + @${REINPLACE_CMD} -e 's=/nxb-bin==' \ + ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/config-${PYTHON_VER}${ABIFLAGS}/Makefile +.endif + for i in ${STAGEDIR}${PREFIX}/lib/python${PYTHON_VER}/lib-dynload/*.so; do \ + ${STRIP_CMD} $$i; done # Strip shared extensions + ${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \ + ${STAGEDIR}${PREFIX}/lib/libpython${PYTHON_VER}${ABIFLAGS}.so.1.0-gdb.py + +.include Index: lang/python313/Makefile.version =================================================================== --- /dev/null +++ lang/python313/Makefile.version @@ -0,0 +1,7 @@ +# Mk/Uses/python.mk includes this file, don't remove it! + +# Do not forget to +# 1. Update python documentation (lang/python-doc-*) +# Run "make -C lang/python-doc-html makesum" +# 2. Remove PORTREVISION in Makefile +PYTHON_DISTVERSION= 3.13.4 Index: lang/python313/distinfo =================================================================== --- /dev/null +++ lang/python313/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1749273825 +SHA256 (python/Python-3.13.4.tar.xz) = 27b15a797562a2971dce3ffe31bb216042ce0b995b39d768cf15f784cc757365 +SIZE (python/Python-3.13.4.tar.xz) = 22672472 Index: lang/python313/files/libressl/patch-Modules___hashopenssl.c =================================================================== --- /dev/null +++ lang/python313/files/libressl/patch-Modules___hashopenssl.c @@ -0,0 +1,26 @@ +--- Modules/_hashopenssl.c.orig 2024-12-03 18:42:41 UTC ++++ Modules/_hashopenssl.c +@@ -44,7 +44,9 @@ + + #define MUNCH_SIZE INT_MAX + ++#ifndef LIBRESSL_VERSION_NUMBER + #define PY_OPENSSL_HAS_SCRYPT 1 ++#endif + #if defined(NID_sha3_224) && defined(NID_sha3_256) && defined(NID_sha3_384) && defined(NID_sha3_512) + #define PY_OPENSSL_HAS_SHA3 1 + #endif +@@ -922,9 +924,12 @@ py_evp_fromname(PyObject *module, const char *digestna + goto exit; + } + ++#ifdef PY_OPENSSL_HAS_SHAKE + if ((EVP_MD_flags(digest) & EVP_MD_FLAG_XOF) == EVP_MD_FLAG_XOF) { + type = get_hashlib_state(module)->EVPXOFtype; +- } else { ++ } else ++#endif ++ { + type = get_hashlib_state(module)->EVPtype; + } + Index: lang/python313/files/libressl/patch-Modules___ssl.c =================================================================== --- /dev/null +++ lang/python313/files/libressl/patch-Modules___ssl.c @@ -0,0 +1,11 @@ +--- Modules/_ssl.c.orig 2024-12-03 18:42:41 UTC ++++ Modules/_ssl.c +@@ -4469,7 +4469,7 @@ set_sni_callback(PySSLContext *self, PyObject *arg, vo + return 0; + } + +-#if OPENSSL_VERSION_NUMBER < 0x30300000L ++#if OPENSSL_VERSION_NUMBER < 0x30300000L && !defined(LIBRESSL_VERSION_NUMBER) + static X509_OBJECT *x509_object_dup(const X509_OBJECT *obj) + { + int ok; Index: lang/python313/files/patch-Misc__python-config.sh.in =================================================================== --- /dev/null +++ lang/python313/files/patch-Misc__python-config.sh.in @@ -0,0 +1,11 @@ +--- Misc/python-config.sh.in.orig 2018-07-13 21:07:16 UTC ++++ Misc/python-config.sh.in +@@ -15,7 +15,7 @@ fi + # Returns the actual prefix where this script was installed to. + installed_prefix () + { +- RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) ++ RESULT=$(dirname $(cd $(dirname $(realpath "$1")) && pwd -P)) + if which readlink >/dev/null 2>&1 ; then + if readlink -f "$RESULT" >/dev/null 2>&1; then + RESULT=$(readlink -f "$RESULT") Index: lang/python313/files/patch-configure =================================================================== --- /dev/null +++ lang/python313/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2024-06-07 07:39:54 UTC ++++ configure +@@ -8328,7 +8328,7 @@ if test "$Py_LTO" = 'true' ; then + + if test "$Py_LTO" = 'true' ; then + case $CC in +- *clang*) ++ *clang*|cc) + LDFLAGS_NOLTO="-fno-lto" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -flto=thin" >&5 + printf %s "checking whether C compiler accepts -flto=thin... " >&6; } Index: lang/python313/files/pkg-message.in =================================================================== --- /dev/null +++ lang/python313/files/pkg-message.in @@ -0,0 +1,12 @@ +[ +{ type: install + message: <