commit: fba8f121a2011f0547c1d597eaaed1132ce59d5a
parent 7e9f24994eebbe89a6d08c2f9b9ac5f6d32a23ea
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 12 Apr 2018 14:11:00 -0700
python: Update to 3.6.5
Diffstat:
8 files changed, 211 insertions(+), 14 deletions(-)
diff --git a/pkg/python/.gitignore b/pkg/python/.gitignore
@@ -1,2 +1,2 @@
-/Python-3.6.3.tar.xz
+/Python-3.6.5.tar.xz
/src
diff --git a/pkg/python/gen.lua b/pkg/python/gen.lua
@@ -2,7 +2,6 @@ cflags{
'-fwrapv',
'-D NDEBUG',
'-D Py_BUILD_CORE',
- '-I include',
'-I $dir',
'-I $srcdir/Include',
}
@@ -55,7 +54,7 @@ build('makesetup', '$outdir/config.c', {
})
cc('Modules/getbuildinfo.c', nil, {
- cflags=[[$cflags -D 'DATE="Oct 3 2017"' -D 'TIME="01:52:02"']]
+ cflags=[[$cflags -D 'DATE="Mar 28 2018"' -D 'TIME="05:19:59"']]
})
cc('Modules/getpath.c', nil, {
cflags={
diff --git a/pkg/python/patch/0001-Fix-build-with-libressl-2.7.0.patch b/pkg/python/patch/0001-Fix-build-with-libressl-2.7.0.patch
@@ -1,4 +1,4 @@
-From ce8a3ec6f269d0d44ecf83669b5567ca9c934bc4 Mon Sep 17 00:00:00 2001
+From b7f437785aa3616066e5c5845e466f49b50db263 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 22 Mar 2018 23:42:12 -0700
Subject: [PATCH] Fix build with libressl-2.7.0
@@ -8,10 +8,10 @@ Subject: [PATCH] Fix build with libressl-2.7.0
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
-index df8c6a7d96..0e18cd887f 100644
+index c54e43c2b4..93e15c91d0 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
-@@ -99,7 +99,7 @@ struct py_ssl_library_code {
+@@ -104,7 +104,7 @@ struct py_ssl_library_code {
/* Include generated data (error codes) */
#include "_ssl_data.h"
@@ -21,5 +21,5 @@ index df8c6a7d96..0e18cd887f 100644
#endif
--
-2.16.3
+2.17.0
diff --git a/pkg/python/pyconfig.h b/pkg/python/pyconfig.h
@@ -1,5 +1,3 @@
-#include <config-posix.h>
-
#ifndef Py_PYCONFIG_H
#define Py_PYCONFIG_H
/* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -13,11 +11,15 @@
/* #undef GETPGRP_HAVE_ARG */
/* #undef GETTIMEOFDAY_NO_TZ */
#define HAVE_ACCEPT4 1
+#define HAVE_ACOSH 1
#define HAVE_ADDRINFO 1
+#define HAVE_ALARM 1
/* #undef HAVE_ALIGNED_REQUIRED */
#define HAVE_ALLOCA_H 1
/* #undef HAVE_ALTZONE */
+#define HAVE_ASINH 1
#define HAVE_ASM_TYPES_H 1
+#define HAVE_ATANH 1
#define HAVE_BIND_TEXTDOMAIN_CODESET 1
/* #undef HAVE_BLUETOOTH_BLUETOOTH_H */
/* #undef HAVE_BLUETOOTH_H */
@@ -31,18 +33,35 @@
/* #undef HAVE_BROKEN_UNSETENV */
#define HAVE_BUILTIN_ATOMIC 1
/* #undef HAVE_CHFLAGS */
+#define HAVE_CHOWN 1
#define HAVE_CHROOT 1
+#define HAVE_CLOCK 1
+#define HAVE_CLOCK_GETRES 1
+#define HAVE_CLOCK_GETTIME 1
+#define HAVE_CLOCK_SETTIME 1
#define HAVE_COMPUTED_GOTOS 1
+#define HAVE_CONFSTR 1
/* #undef HAVE_CONIO_H */
+#define HAVE_COPYSIGN 1
+#define HAVE_CRYPT_H 1
+#define HAVE_CTERMID 1
/* #undef HAVE_CTERMID_R */
+/* #undef HAVE_CURSES_FILTER */
/* #undef HAVE_CURSES_H */
+/* #undef HAVE_CURSES_HAS_KEY */
+/* #undef HAVE_CURSES_IMMEDOK */
+/* #undef HAVE_CURSES_IS_PAD */
/* #undef HAVE_CURSES_IS_TERM_RESIZED */
/* #undef HAVE_CURSES_RESIZETERM */
/* #undef HAVE_CURSES_RESIZE_TERM */
+/* #undef HAVE_CURSES_SYNCOK */
+/* #undef HAVE_CURSES_TYPEAHEAD */
+/* #undef HAVE_CURSES_USE_ENV */
+/* #undef HAVE_CURSES_WCHGAT */
#define HAVE_DECL_ISFINITE 1
#define HAVE_DECL_ISINF 1
#define HAVE_DECL_ISNAN 1
-/* #undef HAVE_DECL_RTLD_DEEPBIND */
+#define HAVE_DECL_RTLD_DEEPBIND 0
#define HAVE_DECL_RTLD_GLOBAL 1
#define HAVE_DECL_RTLD_LAZY 1
#define HAVE_DECL_RTLD_LOCAL 1
@@ -55,52 +74,106 @@
#define HAVE_DEV_PTMX 1
/* #undef HAVE_DIRECT_H */
#define HAVE_DIRENT_D_TYPE 1
+#define HAVE_DIRENT_H 1
+#define HAVE_DIRFD 1
+#define HAVE_DLFCN_H 1
+/* #undef HAVE_DLOPEN */
+#define HAVE_DUP2 1
#define HAVE_DUP3 1
/* #undef HAVE_DYNAMIC_LOADING */
#define HAVE_ENDIAN_H 1
#define HAVE_EPOLL 1
#define HAVE_EPOLL_CREATE1 1
+#define HAVE_ERF 1
+#define HAVE_ERFC 1
+#define HAVE_ERRNO_H 1
+#define HAVE_EXECV 1
+#define HAVE_EXPM1 1
+#define HAVE_FACCESSAT 1
+#define HAVE_FCHDIR 1
+#define HAVE_FCHMOD 1
+#define HAVE_FCHMODAT 1
+#define HAVE_FCHOWN 1
+#define HAVE_FCHOWNAT 1
+#define HAVE_FCNTL_H 1
+#define HAVE_FDATASYNC 1
+#define HAVE_FDOPENDIR 1
+#define HAVE_FEXECVE 1
#define HAVE_FINITE 1
#define HAVE_FLOCK 1
+#define HAVE_FORK 1
#define HAVE_FORKPTY 1
+#define HAVE_FPATHCONF 1
/* #undef HAVE_FSEEK64 */
+#define HAVE_FSEEKO 1
+#define HAVE_FSTATAT 1
+#define HAVE_FSTATVFS 1
+#define HAVE_FSYNC 1
/* #undef HAVE_FTELL64 */
+#define HAVE_FTELLO 1
#define HAVE_FTIME 1
+#define HAVE_FTRUNCATE 1
+#define HAVE_FUTIMENS 1
#define HAVE_FUTIMES 1
#define HAVE_FUTIMESAT 1
+#define HAVE_GAI_STRERROR 1
/* #undef HAVE_GAMMA */
/* #undef HAVE_GCC_ASM_FOR_MC68881 */
#define HAVE_GCC_ASM_FOR_X64 1
#define HAVE_GCC_ASM_FOR_X87 1
#define HAVE_GCC_UINT128_T 1
+#define HAVE_GETADDRINFO 1
+#define HAVE_GETC_UNLOCKED 1
/* #undef HAVE_GETENTROPY */
#define HAVE_GETGROUPLIST 1
+#define HAVE_GETGROUPS 1
/* #undef HAVE_GETHOSTBYNAME */
#define HAVE_GETHOSTBYNAME_R 1
/* #undef HAVE_GETHOSTBYNAME_R_3_ARG */
/* #undef HAVE_GETHOSTBYNAME_R_5_ARG */
#define HAVE_GETHOSTBYNAME_R_6_ARG 1
+#define HAVE_GETITIMER 1
#define HAVE_GETLOADAVG 1
+#define HAVE_GETLOGIN 1
+#define HAVE_GETNAMEINFO 1
#define HAVE_GETPAGESIZE 1
+#define HAVE_GETPEERNAME 1
+#define HAVE_GETPGID 1
+#define HAVE_GETPGRP 1
+#define HAVE_GETPID 1
+#define HAVE_GETPRIORITY 1
+#define HAVE_GETPWENT 1
/* #undef HAVE_GETRANDOM */
#define HAVE_GETRANDOM_SYSCALL 1
#define HAVE_GETRESGID 1
#define HAVE_GETRESUID 1
+#define HAVE_GETSID 1
#define HAVE_GETSPENT 1
#define HAVE_GETSPNAM 1
+#define HAVE_GETTIMEOFDAY 1
/* #undef HAVE_GETWD */
/* #undef HAVE_GLIBC_MEMMOVE_BUG */
+#define HAVE_GRP_H 1
#define HAVE_HSTRERROR 1
#define HAVE_HTOLE64 1
+#define HAVE_HYPOT 1
/* #undef HAVE_IEEEFP_H */
+#define HAVE_IF_NAMEINDEX 1
#define HAVE_INET_ATON 1
+#define HAVE_INET_PTON 1
#define HAVE_INITGROUPS 1
+#define HAVE_INTTYPES_H 1
/* #undef HAVE_IO_H */
/* #undef HAVE_IPA_PURE_CONST_BUG */
+#define HAVE_KILL 1
+#define HAVE_KILLPG 1
/* #undef HAVE_KQUEUE */
+#define HAVE_LANGINFO_H 1
/* #undef HAVE_LARGEFILE_SUPPORT */
/* #undef HAVE_LCHFLAGS */
#define HAVE_LCHMOD 1
+#define HAVE_LCHOWN 1
+#define HAVE_LGAMMA 1
#define HAVE_LIBDL 1
/* #undef HAVE_LIBDLD */
/* #undef HAVE_LIBIEEE */
@@ -109,6 +182,8 @@
/* #undef HAVE_LIBRESOLV */
/* #undef HAVE_LIBSENDFILE */
/* #undef HAVE_LIBUTIL_H */
+#define HAVE_LINK 1
+#define HAVE_LINKAT 1
#define HAVE_LINUX_CAN_BCM_H 1
#define HAVE_LINUX_CAN_H 1
#define HAVE_LINUX_CAN_RAW_FD_FRAMES 1
@@ -116,24 +191,58 @@
#define HAVE_LINUX_NETLINK_H 1
#define HAVE_LINUX_RANDOM_H 1
#define HAVE_LINUX_TIPC_H 1
+#define HAVE_LOCKF 1
+#define HAVE_LOG1P 1
+#define HAVE_LOG2 1
#define HAVE_LONG_DOUBLE 1
+#define HAVE_LSTAT 1
#define HAVE_LUTIMES 1
#define HAVE_MAKEDEV 1
+#define HAVE_MBRTOWC 1
+#define HAVE_MEMMOVE 1
#define HAVE_MEMORY_H 1
#define HAVE_MEMRCHR 1
+#define HAVE_MKDIRAT 1
+#define HAVE_MKFIFO 1
+#define HAVE_MKFIFOAT 1
+#define HAVE_MKNOD 1
+#define HAVE_MKNODAT 1
+#define HAVE_MKTIME 1
+#define HAVE_MMAP 1
#define HAVE_MREMAP 1
/* #undef HAVE_NCURSES_H */
/* #undef HAVE_NDIR_H */
#define HAVE_NETPACKET_PACKET_H 1
+#define HAVE_NET_IF_H 1
+#define HAVE_NICE 1
+#define HAVE_OPENAT 1
#define HAVE_OPENPTY 1
+#define HAVE_PATHCONF 1
+#define HAVE_PAUSE 1
#define HAVE_PIPE2 1
/* #undef HAVE_PLOCK */
+#define HAVE_POLL 1
+#define HAVE_POLL_H 1
+#define HAVE_POSIX_FADVISE 1
+#define HAVE_POSIX_FALLOCATE 1
+#define HAVE_PREAD 1
#define HAVE_PRLIMIT 1
/* #undef HAVE_PROCESS_H */
#define HAVE_PROTOTYPES 1
+#define HAVE_PTHREAD_ATFORK 1
/* #undef HAVE_PTHREAD_DESTRUCTOR */
+#define HAVE_PTHREAD_H 1
/* #undef HAVE_PTHREAD_INIT */
+#define HAVE_PTHREAD_KILL 1
+#define HAVE_PTHREAD_SIGMASK 1
#define HAVE_PTY_H 1
+#define HAVE_PUTENV 1
+#define HAVE_PWRITE 1
+#define HAVE_READLINK 1
+#define HAVE_READLINKAT 1
+#define HAVE_READV 1
+#define HAVE_REALPATH 1
+#define HAVE_RENAMEAT 1
/* #undef HAVE_RL_APPEND_HISTORY */
/* #undef HAVE_RL_CALLBACK */
/* #undef HAVE_RL_CATCH_SIGNAL */
@@ -143,21 +252,66 @@
/* #undef HAVE_RL_COMPLETION_SUPPRESS_APPEND */
/* #undef HAVE_RL_PRE_INPUT_HOOK */
/* #undef HAVE_RL_RESIZE_TERMINAL */
+#define HAVE_ROUND 1
+#define HAVE_SCHED_GET_PRIORITY_MAX 1
+#define HAVE_SCHED_H 1
+#define HAVE_SCHED_RR_GET_INTERVAL 1
#define HAVE_SCHED_SETAFFINITY 1
+#define HAVE_SCHED_SETPARAM 1
+#define HAVE_SCHED_SETSCHEDULER 1
+#define HAVE_SELECT 1
+#define HAVE_SEM_GETVALUE 1
+#define HAVE_SEM_OPEN 1
+#define HAVE_SEM_TIMEDWAIT 1
+#define HAVE_SEM_UNLINK 1
#define HAVE_SENDFILE 1
+#define HAVE_SETEGID 1
+#define HAVE_SETEUID 1
+#define HAVE_SETGID 1
#define HAVE_SETGROUPS 1
#define HAVE_SETHOSTNAME 1
+#define HAVE_SETITIMER 1
+#define HAVE_SETLOCALE 1
+#define HAVE_SETPGID 1
+#define HAVE_SETPGRP 1
+#define HAVE_SETPRIORITY 1
+#define HAVE_SETREGID 1
#define HAVE_SETRESGID 1
#define HAVE_SETRESUID 1
+#define HAVE_SETREUID 1
+#define HAVE_SETSID 1
+#define HAVE_SETUID 1
+#define HAVE_SETVBUF 1
#define HAVE_SHADOW_H 1
+#define HAVE_SIGACTION 1
+#define HAVE_SIGALTSTACK 1
+#define HAVE_SIGINTERRUPT 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_SIGPENDING 1
+#define HAVE_SIGRELSE 1
+#define HAVE_SIGTIMEDWAIT 1
+#define HAVE_SIGWAIT 1
+#define HAVE_SIGWAITINFO 1
+#define HAVE_SNPRINTF 1
#define HAVE_SOCKADDR_ALG 1
/* #undef HAVE_SOCKADDR_SA_LEN */
#define HAVE_SOCKADDR_STORAGE 1
+#define HAVE_SOCKETPAIR 1
+#define HAVE_SPAWN_H 1
+#define HAVE_SSIZE_T 1
+#define HAVE_STATVFS 1
#define HAVE_STAT_TV_NSEC 1
/* #undef HAVE_STAT_TV_NSEC2 */
#define HAVE_STDARG_PROTOTYPES 1
+#define HAVE_STDINT_H 1
+#define HAVE_STDLIB_H 1
#define HAVE_STD_ATOMIC 1
+#define HAVE_STRDUP 1
+#define HAVE_STRFTIME 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
#define HAVE_STRLCPY 1
+#define HAVE_STROPTS_H 1
#define HAVE_STRUCT_PASSWD_PW_GECOS 1
#define HAVE_STRUCT_PASSWD_PW_PASSWD 1
/* #undef HAVE_STRUCT_STAT_ST_BIRTHTIME */
@@ -165,7 +319,12 @@
#define HAVE_STRUCT_STAT_ST_BLOCKS 1
/* #undef HAVE_STRUCT_STAT_ST_FLAGS */
/* #undef HAVE_STRUCT_STAT_ST_GEN */
+#define HAVE_STRUCT_STAT_ST_RDEV 1
#define HAVE_STRUCT_TM_TM_ZONE 1
+#define HAVE_SYMLINK 1
+#define HAVE_SYMLINKAT 1
+#define HAVE_SYNC 1
+#define HAVE_SYSCONF 1
#define HAVE_SYSEXITS_H 1
/* #undef HAVE_SYS_AUDIOIO_H */
/* #undef HAVE_SYS_BSDTTY_H */
@@ -185,22 +344,59 @@
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_POLL_H 1
/* #undef HAVE_SYS_RANDOM_H */
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1
#define HAVE_SYS_SENDFILE_H 1
+#define HAVE_SYS_SOCKET_H 1
+#define HAVE_SYS_STATVFS_H 1
+#define HAVE_SYS_STAT_H 1
#define HAVE_SYS_SYSCALL_H 1
#define HAVE_SYS_SYSMACROS_H 1
/* #undef HAVE_SYS_SYS_DOMAIN_H */
/* #undef HAVE_SYS_TERMIO_H */
+#define HAVE_SYS_TIMES_H 1
+#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_UIO_H 1
+#define HAVE_SYS_UN_H 1
+#define HAVE_SYS_UTSNAME_H 1
+#define HAVE_SYS_WAIT_H 1
#define HAVE_SYS_XATTR_H 1
+#define HAVE_TCGETPGRP 1
+#define HAVE_TCSETPGRP 1
+#define HAVE_TEMPNAM 1
+#define HAVE_TERMIOS_H 1
/* #undef HAVE_TERM_H */
+#define HAVE_TGAMMA 1
#define HAVE_TIMEGM 1
+#define HAVE_TIMES 1
+#define HAVE_TMPFILE 1
+#define HAVE_TMPNAM 1
/* #undef HAVE_TMPNAM_R */
#define HAVE_TM_ZONE 1
+#define HAVE_TRUNCATE 1
+/* #undef HAVE_TZNAME */
/* #undef HAVE_UCS4_TCL */
+#define HAVE_UNAME 1
+#define HAVE_UNISTD_H 1
+#define HAVE_UNLINKAT 1
+#define HAVE_UNSETENV 1
/* #undef HAVE_USABLE_WCHAR_T */
/* #undef HAVE_UTIL_H */
+#define HAVE_UTIMENSAT 1
+#define HAVE_UTIMES 1
+#define HAVE_UTIME_H 1
#define HAVE_WAIT3 1
#define HAVE_WAIT4 1
+#define HAVE_WAITID 1
+#define HAVE_WAITPID 1
+#define HAVE_WCHAR_H 1
+#define HAVE_WCSCOLL 1
+#define HAVE_WCSFTIME 1
+#define HAVE_WCSXFRM 1
+#define HAVE_WMEMCMP 1
#define HAVE_WORKING_TZSET 1
+#define HAVE_WRITEV 1
#define HAVE_ZLIB_COPY 1
/* #undef HAVE__GETPTY */
/* #undef LOG1P_DROPS_ZERO_SIGN */
@@ -220,6 +416,7 @@
/* #undef Py_DEBUG */
/* #undef Py_ENABLE_SHARED */
/* #undef Py_HASH_ALGORITHM */
+#define RETSIGTYPE void
/* #undef SETPGRP_HAVE_ARG */
/* #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS */
#define SIZEOF_DOUBLE 8
@@ -239,6 +436,7 @@
#define SIZEOF_VOID_P 8
#define SIZEOF_WCHAR_T 4
#define SIZEOF__BOOL 1
+#define STDC_HEADERS 1
#define SYS_SELECT_WITH_SYS_TIME 1
#define TANH_PRESERVES_ZERO_SIGN 1
/* #undef TIMEMODULE_LIB */
diff --git a/pkg/python/pylibs.txt b/pkg/python/pylibs.txt
@@ -333,6 +333,7 @@ http/cookies.py
http/server.py
idlelib/__init__.py
idlelib/__main__.py
+idlelib/_pyclbr.py
idlelib/autocomplete.py
idlelib/autocomplete_w.py
idlelib/autoexpand.py
@@ -382,7 +383,6 @@ idlelib/searchbase.py
idlelib/searchengine.py
idlelib/stackviewer.py
idlelib/statusbar.py
-idlelib/tabbedpages.py
idlelib/textview.py
idlelib/tooltip.py
idlelib/tree.py
diff --git a/pkg/python/rev b/pkg/python/rev
@@ -1 +1 @@
-7
+8
diff --git a/pkg/python/sha256 b/pkg/python/sha256
@@ -1 +1 @@
-cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da Python-3.6.3.tar.xz
+f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6 Python-3.6.5.tar.xz
diff --git a/pkg/python/url b/pkg/python/url
@@ -1 +1 @@
-url = "https://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz"
+url = "https://www.python.org/ftp/python/3.6.5/Python-3.6.5.tar.xz"