Attachment #242744 for bug #271962

View | Details | Raw Unified | Return to bug 271962
Collapse All | Expand All




# -- Olivier Certner <olce.freebsd.ports@certner.fr>
PORTNAME=	tauthon
DISTVERSIONPREFIX=	v
DISTVERSION=	2.8.5
PORTREVISION=	1
CATEGORIES=	lang python

MAINTAINER=	olce.freebsd.ports@certner.fr


DEPRECATED=	Uses Python 2.7 codebase

USES=		pathfix shebangfix autoreconf ncurses pkgconfig readline ssl \
		tar:xz compiler
PATHFIX_MAKEFILEIN=	Makefile.pre.in

USE_GITHUB=	yes


PLIST_SUB=		ABI=${ABIFLAGS} \
			DISTVERSION=${DISTVERSION} \
			TAUTHON_VERSION=${TAUTHON_VERSION} \
			VERSION_LONG=${VERSION_LONG} \
			VERSION_NOMICRO=${VERSION_NOMICRO} \
			OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}		# For plat-freebsd* in pkg-plist. https://bugs.python.org/issue19554

OPTIONS_SUB=		yes

LIBFFI_DESC=	Use libffi from ports instead of bundled version
LTO_DESC=	Apply Link-Time Optimizations (implies OPTIMIZATIONS)
NLS_DESC=	Enable gettext support for the locale module
OPTIMIZATIONS_DESC=	Enable code optimizations (notably PGO)
UCS2_DESC=	Enable UCS2 Unicode Strings
UCS4_DESC=	Enable UCS4 Unicode Strings
PYMALLOC_DESC=	Enable specialized mallocs

NLS_CONFIGURE_ENV_OFF=	ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no

OPTIMIZATIONS_CONFIGURE_ENABLE=	optimizations
OPTIMIZATIONS_BROKEN=	Please disable OPTIMIZATIONS option for now\
			(some tests fail and no PGO profile is computed)

PYMALLOC_CONFIGURE_WITH=pymalloc


UCS2_CONFIGURE_ENABLE=	unicode=ucs2
UCS4_CONFIGURE_ENABLE=	unicode=ucs4

TAUTHON_VERSION=	${DISTVERSION:C/-.*\$//}
VERSION_LONG=		${TAUTHON_VERSION}.final.0
VERSION_NOMICRO=	${TAUTHON_VERSION:R}
NAME_VERSION=		tauthon${VERSION_NOMICRO}

DISABLED_MODULES=	_bsddb _sqlite3 _tkinter gdbm

.include <bsd.port.pre.mk>

.if !empty(PORT_OPTIONS:MLTO) && ${CC:T} == "cc"
# Tauthon's configure and Makefile recognize which compiler we are using based
# on the executable name.
.  if ${CC:T} == ${CC}
CC:=${COMPILER_TYPE}
.  else
CC:=${CC:H}/${COMPILER_TYPE}
.  endif
.endif

# https://bugs.python.org/issue22521
# https://bugs.python.org/issue23042

	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
		${STAGEDIR}${PREFIX}/lib/lib${NAME_VERSION}.so.1-gdb.py

.include <bsd.port.post.mk>

.if !empty(PORT_OPTIONS:MLTO) && ${COMPILER_TYPE} == gcc
# These have to be appended after bsd.port.mk appends to them, because we are
# basically overriding what it did on seeing USE_BINUTILS (pulled by USE_GCC).
CONFIGURE_ENV+=	AR=${CC:S/^gcc/gcc-ar/} RANLIB=${CC:S/^gcc/gcc-ranlib/}
MAKE_ENV+=	AR=${CC:S/^gcc/gcc-ar/} RANLIB=${CC:S/^gcc/gcc-ranlib/}
.endif

Lines 1-3 Link Here

(-)b/lang/tauthon/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1622652756	1	TIMESTAMP = 1685108476
2	SHA256 (naftaliharris-tauthon-v2.8.3_GH0.tar.gz) = 09a14777b5e7bf503bdc1959a5e9fabbf09781266689213adfc8c535ea4a7c17	2	SHA256 (naftaliharris-tauthon-v2.8.5_GH0.tar.gz) = 0d0f2ffd3a912768c138ee7b66e8163df3674f407c92152d09304c3240557dbf
3	SIZE (naftaliharris-tauthon-v2.8.3_GH0.tar.gz) = 17718271	3	SIZE (naftaliharris-tauthon-v2.8.5_GH0.tar.gz) = 18465302

Lines 1-6 Link Here

(-)b/lang/tauthon/files/patch-Doc__library__fcntl.rst (-3 / +3 lines)
1	--- ./Doc/library/fcntl.rst.orig 2014-07-03 21:53:41.473098625 +1000	1	--- Doc/library/fcntl.rst.orig 2023-02-04 10:09:53 UTC
2	+++ ./Doc/library/fcntl.rst 2014-07-03 21:54:04.342833056 +1000	2	+++ Doc/library/fcntl.rst
3	@@ -50,7 +50,6 @@ The module defines the following functio	3	@@ -52,7 +52,6 @@ The module defines the following functions:
4	operations are typically defined in the library module :mod:`termios` and the	4	operations are typically defined in the library module :mod:`termios` and the
5	argument handling is even more complicated.	5	argument handling is even more complicated.
6		6

Lines 3-10 Link Here

(-)b/lang/tauthon/files/patch-Lib_distutils_command_build__scripts.py (-2 / +2 lines)
3	# installation.	3	# installation.
4	# Submitted by: mva	4	# Submitted by: mva
5		5
6	--- Lib/distutils/command/build_scripts.py.orig 2014-07-26 09:52:20.000000000 UTC	6	--- Lib/distutils/command/build_scripts.py.orig 2023-02-04 10:09:53 UTC
7	+++ Lib/distutils/command/build_scripts.py 2014-07-26 09:52:56.000000000 UTC	7	+++ Lib/distutils/command/build_scripts.py
8	@@ -126,6 +126,9 @@ class build_scripts (Command):	8	@@ -126,6 +126,9 @@ class build_scripts (Command):
9	file, oldmode, newmode)	9	file, oldmode, newmode)
10	os.chmod(file, newmode)	10	os.chmod(file, newmode)




Should solve issue 20397, where using the --record argument results
in files that failed to generate bytecode files are added to the
record file nonetheless.
--- Lib/distutils/command/install_lib.py.orig	2023-02-04 10:09:53 UTC
 Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
 Lib/distutils/tests/test_install_lib.py |  8 ++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

--- Lib/distutils/command/install_lib.py.orig	2015-12-05 19:46:56 UTC
+++ Lib/distutils/command/install_lib.py
@@ -168,10 +168,14 @@ class install_lib(Command):
             ext = os.path.splitext(os.path.normcase(py_file))[1]




Should solve issue 20397, where using the --record argument results
in files that failed to generate bytecode files are added to the
record file nonetheless.
--- Lib/distutils/tests/test_install_lib.py.orig	2023-02-04 10:09:53 UTC
 Lib/distutils/command/install_lib.py    | 17 +++++++++++++----
 Lib/distutils/tests/test_install_lib.py |  8 ++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

--- Lib/distutils/tests/test_install_lib.py.orig	2015-12-05 19:46:57 UTC
+++ Lib/distutils/tests/test_install_lib.py
@@ -64,8 +64,12 @@ class InstallLibTestCase(support.TempdirManager,
         cmd.distribution.packages = [pkg_dir]
         cmd.distribution.script_name = 'setup.py'
 




# Description: Link scripts in the same way Python3 does
# Submitted by: mva

--- Makefile.pre.in.orig	2023-05-26 13:41:44 UTC
+++ Makefile.pre.in
@@ -1003,6 +1003,12 @@ bininstall:	altbininstall
 	(cd $(DESTDIR)$(LIBPC); $(LN) -s tauthon-$(VERSION).pc tauthon2.pc)
 	-rm -f $(DESTDIR)$(LIBPC)/tauthon.pc
 	(cd $(DESTDIR)$(LIBPC); $(LN) -s tauthon2.pc tauthon.pc)
+	-rm -f $(DESTDIR)$(BINDIR)/idle
+	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2)
+	-rm -f $(DESTDIR)$(BINDIR)/pydoc




# pythonx.y-config --ldflags out of /usr and missing -L<install_lib_dir>
# https://bugs.python.org/issue7352

--- Misc/python-config.in.orig	2023-02-04 10:09:53 UTC
+++ Misc/python-config.in
@@ -21,6 +21,7 @@ except getopt.error:
 if not opts:

 pyver = sysconfig.get_config_var('VERSION')
 getvar = sysconfig.get_config_var
 
@@ -48,6 +49,7 @@ for opt in opt_flags:
         libs += getvar('LIBS').split()
         libs += getvar('SYSLIBS').split()
         if opt == '--ldflags':
+            libs.insert(0, '-L' + libdir)
             if not getvar('Py_ENABLE_SHARED'):
                 libs.insert(0, '-L' + getvar('LIBPL'))
             if not getvar('PYTHONFRAMEWORK'):
                 libs.extend(getvar('LINKFORSHARED').split())
         print ' '.join(libs)




--- Modules/fcntlmodule.c.orig	2023-02-04 10:09:53 UTC
+++ Modules/fcntlmodule.c
@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *args)
 {
 #define IOCTL_BUFSZ 1024
     int fd;

     int arg;
     int ret;
     char *str;
@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
     int mutate_arg = 1;
     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */
 

                          conv_descriptor, &fd, &code,
                          &str, &len, &mutate_arg)) {
         char *arg;
@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
     }
 
     PyErr_Clear();

                          conv_descriptor, &fd, &code, &str, &len)) {
         if (len > IOCTL_BUFSZ) {
             PyErr_SetString(PyExc_ValueError,
@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *args)
     PyErr_Clear();
     arg = 0;
     if (!PyArg_ParseTuple(args,




# https://bugs.python.org/issue38061
# TODO: Upstream

--- Modules/posixmodule.c.orig	2023-02-04 10:09:53 UTC
+++ Modules/posixmodule.c
@@ -6812,11 +6812,18 @@ posix_closerange(PyObject *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "ii:closerange", &fd_from, &fd_to))
         return NULL;
     Py_BEGIN_ALLOW_THREADS
     _Py_BEGIN_SUPPRESS_IPH
-    for (i = fd_from; i < fd_to; i++)
-        if (_PyVerify_fd(i)) {
-            errno = 0;
-            close(i);
-        }
+#ifdef __FreeBSD__
+    if (fd_to >= sysconf(_SC_OPEN_MAX)) {
+        closefrom(fd_from);

+#endif
+    {
+        for (i = fd_from; i < fd_to; i++)
+            if (_PyVerify_fd(i)) {
+                errno = 0;
+                close(i);
+            }
+    }
     _Py_END_SUPPRESS_IPH
     Py_END_ALLOW_THREADS
     Py_RETURN_NONE;
 }




--- configure.orig	2023-02-04 10:09:53 UTC
+++ configure
@@ -3394,13 +3394,6 @@ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
 
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
-# them.
-
-printf "%s\n" "#define __BSD_VISIBLE 1" >>confdefs.h
-
-
-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
 # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
 
 printf "%s\n" "#define _BSD_TYPES 1" >>confdefs.h
@@ -3785,9 +3778,8 @@ printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h
   # but used in struct sockaddr.sa_family. Reported by Tim Rice.
   SCO_SV/3.2)
     define_xopen_source=no;;
-  # On FreeBSD 4, the math functions C89 does not cover are never defined
-  # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
-  FreeBSD/4.*)
+  # On FreeBSD, defining _XOPEN_SOURCE to 600 requests a strict environment.
+  FreeBSD/*)
     define_xopen_source=no;;
   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if
   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which




# Description: do not define __BSD_VISIBLE/_XOPEN_SOURCE/_POSIX_C_SOURCE
# in include/python2.7/pyconfig.h
# Submitted by: antoine

--- configure.orig	2014-09-06 14:42:50 UTC
+++ configure
@@ -2919,13 +2919,6 @@
 
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
-# them.
-
-$as_echo "#define __BSD_VISIBLE 1" >>confdefs.h
-
-
-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
 # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
 
 $as_echo "#define _BSD_TYPES 1" >>confdefs.h
@@ -3293,9 +3286,8 @@
   # but used in struct sockaddr.sa_family. Reported by Tim Rice.
   SCO_SV/3.2)
     define_xopen_source=no;;
-  # On FreeBSD 4, the math functions C89 does not cover are never defined
-  # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
-  FreeBSD/4.*)
+  # On FreeBSD,  defining _XOPEN_SOURCE to 600 requests a strict environment.
+  FreeBSD/*)
     define_xopen_source=no;;
   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if
   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
--- configure.ac.orig	2014-09-06 14:42:50 UTC
+++ configure.ac
@@ -88,11 +88,6 @@
 AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])
 
 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
-# them.
-AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])
-
-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
 # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
 AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
 
@@ -426,9 +421,8 @@
   # but used in struct sockaddr.sa_family. Reported by Tim Rice.
   SCO_SV/3.2)
     define_xopen_source=no;;
-  # On FreeBSD 4, the math functions C89 does not cover are never defined
-  # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
-  FreeBSD/4.*)
+  # On FreeBSD,  defining _XOPEN_SOURCE to 600 requests a strict environment.
+  FreeBSD/*)
     define_xopen_source=no;;
   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if 
   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which

Return to bug 271962

Lines 6-13 Link Here

(-)b/lang/tauthon/Makefile (-11 / +28 lines)
6	# -- Olivier Certner <olce.freebsd.ports@certner.fr>	6	# -- Olivier Certner <olce.freebsd.ports@certner.fr>
7	PORTNAME= tauthon	7	PORTNAME= tauthon
8	DISTVERSIONPREFIX= v	8	DISTVERSIONPREFIX= v
9	DISTVERSION= 2.8.3	9	DISTVERSION= 2.8.5
10	PORTREVISION= 1
11	CATEGORIES= lang python	10	CATEGORIES= lang python
12		11
13	MAINTAINER= olce.freebsd.ports@certner.fr	12	MAINTAINER= olce.freebsd.ports@certner.fr
Lines 18-24 LICENSE= PSFL Link Here
18		17
19	DEPRECATED= Uses Python 2.7 codebase	18	DEPRECATED= Uses Python 2.7 codebase
20		19
21	USES= pathfix shebangfix autoreconf ncurses pkgconfig readline ssl tar:xz	20	USES= pathfix shebangfix autoreconf ncurses pkgconfig readline ssl \
		21	tar:xz compiler
22	PATHFIX_MAKEFILEIN= Makefile.pre.in	22	PATHFIX_MAKEFILEIN= Makefile.pre.in
23		23
24	USE_GITHUB= yes	24	USE_GITHUB= yes
Lines 54-59 MAKE_ARGS+= INSTALL_SHARED="${INSTALL_LIB}" # Strip shared library Link Here
54		54
55	PLIST_SUB= ABI=${ABIFLAGS} \	55	PLIST_SUB= ABI=${ABIFLAGS} \
56	DISTVERSION=${DISTVERSION} \	56	DISTVERSION=${DISTVERSION} \
		57	TAUTHON_VERSION=${TAUTHON_VERSION} \
57	VERSION_LONG=${VERSION_LONG} \	58	VERSION_LONG=${VERSION_LONG} \
58	VERSION_NOMICRO=${VERSION_NOMICRO} \	59	VERSION_NOMICRO=${VERSION_NOMICRO} \
59	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554	60	OSMAJOR=${OSVERSION:C/([0-9])[0-9]{5}/\1/} # For plat-freebsd in pkg-plist. https://bugs.python.org/issue19554
Lines 65-73 OPTIONS_SINGLE_UNICODE= UCS2 UCS4 Link Here
65	OPTIONS_SUB= yes	66	OPTIONS_SUB= yes
66		67
67	LIBFFI_DESC= Use libffi from ports instead of bundled version	68	LIBFFI_DESC= Use libffi from ports instead of bundled version
68	LTO_DESC= Apply Link-Time Optimizations (needs OPTIMIZATIONS)	69	LTO_DESC= Apply Link-Time Optimizations (implies OPTIMIZATIONS)
69	NLS_DESC= Enable gettext support for the locale module	70	NLS_DESC= Enable gettext support for the locale module
70	OPTIMIZATIONS_DESC= Enable code optimizations and PGO (BROKEN)	71	OPTIMIZATIONS_DESC= Enable code optimizations (notably PGO)
71	UCS2_DESC= Enable UCS2 Unicode Strings	72	UCS2_DESC= Enable UCS2 Unicode Strings
72	UCS4_DESC= Enable UCS4 Unicode Strings	73	UCS4_DESC= Enable UCS4 Unicode Strings
73	PYMALLOC_DESC= Enable specialized mallocs	74	PYMALLOC_DESC= Enable specialized mallocs
Lines 89-96 NLS_LIBS= -L${LOCALBASE}/lib -lintl Link Here
89	NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no	90	NLS_CONFIGURE_ENV_OFF= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no
90		91
91	OPTIMIZATIONS_CONFIGURE_ENABLE= optimizations	92	OPTIMIZATIONS_CONFIGURE_ENABLE= optimizations
92	OPTIMIZATIONS_BROKEN= Please disable OPTIMIZATIONS option for now\
93	(some tests fail and no PGO profile is computed)
94		93
95	PYMALLOC_CONFIGURE_WITH=pymalloc	94	PYMALLOC_CONFIGURE_WITH=pymalloc
96		95
Lines 100-112 THREADS_LDFLAGS= -lpthread Link Here
100	UCS2_CONFIGURE_ENABLE= unicode=ucs2	99	UCS2_CONFIGURE_ENABLE= unicode=ucs2
101	UCS4_CONFIGURE_ENABLE= unicode=ucs4	100	UCS4_CONFIGURE_ENABLE= unicode=ucs4
102		101
103	VERSION_LONG= ${DISTVERSION:S/a/.alpha./:S/b/.beta./:C/^([^a-z]*)\$/\1.final.0/}	102	TAUTHON_VERSION= ${DISTVERSION:C/-.*\$//}
104	VERSION_NOMICRO= ${DISTVERSION:R}	103	VERSION_LONG= ${TAUTHON_VERSION}.final.0
		104	VERSION_NOMICRO= ${TAUTHON_VERSION:R}
105	NAME_VERSION= tauthon${VERSION_NOMICRO}	105	NAME_VERSION= tauthon${VERSION_NOMICRO}
106		106
107	DISABLED_MODULES= _bsddb _sqlite3 _tkinter gdbm	107	DISABLED_MODULES= _bsddb _sqlite3 _tkinter gdbm
108		108
109	.include <bsd.port.options.mk>	109	.include <bsd.port.pre.mk>
		110
		111	.if !empty(PORT_OPTIONS:MLTO) && ${CC:T} == "cc"
		112	# Tauthon's configure and Makefile recognize which compiler we are using based
		113	# on the executable name.
		114	. if ${CC:T} == ${CC}
		115	CC:=${COMPILER_TYPE}
		116	. else
		117	CC:=${CC:H}/${COMPILER_TYPE}
		118	. endif
		119	.endif
110		120
111	# https://bugs.python.org/issue22521	121	# https://bugs.python.org/issue22521
112	# https://bugs.python.org/issue23042	122	# https://bugs.python.org/issue23042
Lines 177-180 post-install: Link Here
177	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \	187	${INSTALL_DATA} ${WRKSRC}/Tools/gdb/libpython.py \
178	${STAGEDIR}${PREFIX}/lib/lib${NAME_VERSION}.so.1-gdb.py	188	${STAGEDIR}${PREFIX}/lib/lib${NAME_VERSION}.so.1-gdb.py
179		189
180	.include <bsd.port.mk>	190	.include <bsd.port.post.mk>
		191
		192	.if !empty(PORT_OPTIONS:MLTO) && ${COMPILER_TYPE} == gcc
		193	# These have to be appended after bsd.port.mk appends to them, because we are
		194	# basically overriding what it did on seeing USE_BINUTILS (pulled by USE_GCC).
		195	CONFIGURE_ENV+= AR=${CC:S/^gcc/gcc-ar/} RANLIB=${CC:S/^gcc/gcc-ranlib/}
		196	MAKE_ENV+= AR=${CC:S/^gcc/gcc-ar/} RANLIB=${CC:S/^gcc/gcc-ranlib/}
		197	.endif

Lines 6-17 Subject: [PATCH] Check bytecode file actually exists and tests Link Here

(-)b/lang/tauthon/files/patch-Lib_distutils_command_install__lib.py (-6 / +1 lines)
6	Should solve issue 20397, where using the --record argument results	6	Should solve issue 20397, where using the --record argument results
7	in files that failed to generate bytecode files are added to the	7	in files that failed to generate bytecode files are added to the
8	record file nonetheless.	8	record file nonetheless.
9	---	9	--- Lib/distutils/command/install_lib.py.orig 2023-02-04 10:09:53 UTC
10	Lib/distutils/command/install_lib.py \| 17 +++++++++++++----
11	Lib/distutils/tests/test_install_lib.py \| 8 ++++++--
12	2 files changed, 19 insertions(+), 6 deletions(-)
13
14	--- Lib/distutils/command/install_lib.py.orig 2015-12-05 19:46:56 UTC
15	+++ Lib/distutils/command/install_lib.py	10	+++ Lib/distutils/command/install_lib.py
16	@@ -168,10 +168,14 @@ class install_lib(Command):	11	@@ -168,10 +168,14 @@ class install_lib(Command):
17	ext = os.path.splitext(os.path.normcase(py_file))[1]	12	ext = os.path.splitext(os.path.normcase(py_file))[1]

Lines 2-13 Link Here

(-)b/lang/tauthon/files/patch-Makefile.pre.in (-6 / +6 lines)
2	# Description: Link scripts in the same way Python3 does	2	# Description: Link scripts in the same way Python3 does
3	# Submitted by: mva	3	# Submitted by: mva
4		4
5	--- Makefile.pre.in.orig 2014-06-30 04:05:39.000000000 +0200	5	--- Makefile.pre.in.orig 2023-05-26 13:41:44 UTC
6	+++ Makefile.pre.in 2014-07-26 11:09:46.000000000 +0200	6	+++ Makefile.pre.in
7	@@ -900,6 +900,12 @@ bininstall: altbininstall	7	@@ -1003,6 +1003,12 @@ bininstall: altbininstall
8	(cd $(DESTDIR)$(LIBPC); $(LN) -s tauthon-$(VERSION).pc tauthon2.pc)	8	(cd $(DESTDIR)$(LIBPC); $(LN) -s tauthon-$(VERSION).pc tauthon2.pc)
9	-rm -f $(DESTDIR)$(LIBPC)/tauthon.pc	9	-rm -f $(DESTDIR)$(LIBPC)/tauthon.pc
10	(cd $(DESTDIR)$(LIBPC); $(LN) -s tauthon2.pc tauthon.pc)	10	(cd $(DESTDIR)$(LIBPC); $(LN) -s tauthon2.pc tauthon.pc)
11	+ -rm -f $(DESTDIR)$(BINDIR)/idle	11	+ -rm -f $(DESTDIR)$(BINDIR)/idle
12	+ (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2)	12	+ (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle2)
13	+ -rm -f $(DESTDIR)$(BINDIR)/pydoc	13	+ -rm -f $(DESTDIR)$(BINDIR)/pydoc

Lines 1-7 Link Here

(-)b/lang/tauthon/files/patch-Misc_python-config.in (-6 / +6 lines)
1	# pythonx.y-config --ldflags out of /usr and missing -L<install_lib_dir>	1	# pythonx.y-config --ldflags out of /usr and missing -L<install_lib_dir>
2	# https://bugs.python.org/issue7352	2	# https://bugs.python.org/issue7352
3		3
4	--- Misc/python-config.in.orig 2015-10-18 07:24:01 UTC	4	--- Misc/python-config.in.orig 2023-02-04 10:09:53 UTC
5	+++ Misc/python-config.in	5	+++ Misc/python-config.in
6	@@ -21,6 +21,7 @@ except getopt.error:	6	@@ -21,6 +21,7 @@ except getopt.error:
7	if not opts:	7	if not opts:
Lines 11-21 Link Here
11	pyver = sysconfig.get_config_var('VERSION')	11	pyver = sysconfig.get_config_var('VERSION')
12	getvar = sysconfig.get_config_var	12	getvar = sysconfig.get_config_var
13		13
14	@@ -50,6 +51,7 @@ for opt in opt_flags:	14	@@ -48,6 +49,7 @@ for opt in opt_flags:
15	# add the prefix/lib/pythonX.Y/config dir, but only if there is no	15	libs += getvar('LIBS').split()
16	# shared library in prefix/lib/.	16	libs += getvar('SYSLIBS').split()
17	if opt == '--ldflags':	17	if opt == '--ldflags':
18	+ libs.insert(0, '-L' + libdir)	18	+ libs.insert(0, '-L' + libdir)
19	if not getvar('Py_ENABLE_SHARED'):
20	libs.insert(0, '-L' + getvar('LIBPL'))
21	if not getvar('PYTHONFRAMEWORK'):	19	if not getvar('PYTHONFRAMEWORK'):
		20	libs.extend(getvar('LINKFORSHARED').split())
		21	print ' '.join(libs)

Lines 1-6 Link Here

(-)b/lang/tauthon/files/patch-Modules__fcntlmodule.c (-6 / +6 lines)
1	--- ./Modules/fcntlmodule.c.orig 2014-07-03 21:57:10.429953240 +1000	1	--- Modules/fcntlmodule.c.orig 2023-02-04 10:09:53 UTC
2	+++ ./Modules/fcntlmodule.c 2014-07-03 21:59:36.517210444 +1000	2	+++ Modules/fcntlmodule.c
3	@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject self, PyObject ar	3	@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject self, PyObject args)
4	{	4	{
5	#define IOCTL_BUFSZ 1024	5	#define IOCTL_BUFSZ 1024
6	int fd;	6	int fd;
Lines 24-30 Link Here
24	int arg;	24	int arg;
25	int ret;	25	int ret;
26	char *str;	26	char *str;
27	@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject self, PyObject ar	27	@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject self, PyObject args)
28	int mutate_arg = 1;	28	int mutate_arg = 1;
29	char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */	29	char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */
30		30
Lines 33-39 Link Here
33	conv_descriptor, &fd, &code,	33	conv_descriptor, &fd, &code,
34	&str, &len, &mutate_arg)) {	34	&str, &len, &mutate_arg)) {
35	char *arg;	35	char *arg;
36	@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject self, PyObject ar	36	@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject self, PyObject args)
37	}	37	}
38		38
39	PyErr_Clear();	39	PyErr_Clear();
Lines 42-48 Link Here
42	conv_descriptor, &fd, &code, &str, &len)) {	42	conv_descriptor, &fd, &code, &str, &len)) {
43	if (len > IOCTL_BUFSZ) {	43	if (len > IOCTL_BUFSZ) {
44	PyErr_SetString(PyExc_ValueError,	44	PyErr_SetString(PyExc_ValueError,
45	@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject self, PyObject ar	45	@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject self, PyObject args)
46	PyErr_Clear();	46	PyErr_Clear();
47	arg = 0;	47	arg = 0;
48	if (!PyArg_ParseTuple(args,	48	if (!PyArg_ParseTuple(args,

Lines 3-17 Link Here

(-)b/lang/tauthon/files/patch-Modules_posixmodule.c (-6 / +10 lines)
3	# https://bugs.python.org/issue38061	3	# https://bugs.python.org/issue38061
4	# TODO: Upstream	4	# TODO: Upstream
5		5
6	--- Modules/posixmodule.c.orig 2019-10-19 18:38:44 UTC	6	--- Modules/posixmodule.c.orig 2023-02-04 10:09:53 UTC
7	+++ Modules/posixmodule.c	7	+++ Modules/posixmodule.c
8	@@ -6676,9 +6676,16 @@ posix_closerange(PyObject self, PyObject args)	8	@@ -6812,11 +6812,18 @@ posix_closerange(PyObject self, PyObject args)
9	if (!PyArg_ParseTuple(args, "ii:closerange", &fd_from, &fd_to))
10	return NULL;	9	return NULL;
11	Py_BEGIN_ALLOW_THREADS	10	Py_BEGIN_ALLOW_THREADS
		11	_Py_BEGIN_SUPPRESS_IPH
12	- for (i = fd_from; i < fd_to; i++)	12	- for (i = fd_from; i < fd_to; i++)
13	- if (_PyVerify_fd(i))	13	- if (_PyVerify_fd(i)) {
		14	- errno = 0;
14	- close(i);	15	- close(i);
		16	- }
15	+#ifdef __FreeBSD__	17	+#ifdef __FreeBSD__
16	+ if (fd_to >= sysconf(_SC_OPEN_MAX)) {	18	+ if (fd_to >= sysconf(_SC_OPEN_MAX)) {
17	+ closefrom(fd_from);	19	+ closefrom(fd_from);
Lines 19-27 Link Here
19	+#endif	21	+#endif
20	+ {	22	+ {
21	+ for (i = fd_from; i < fd_to; i++)	23	+ for (i = fd_from; i < fd_to; i++)
22	+ if (_PyVerify_fd(i))	24	+ if (_PyVerify_fd(i)) {
		25	+ errno = 0;
23	+ close(i);	26	+ close(i);
		27	+ }
24	+ }	28	+ }
		29	_Py_END_SUPPRESS_IPH
25	Py_END_ALLOW_THREADS	30	Py_END_ALLOW_THREADS
26	Py_RETURN_NONE;	31	Py_RETURN_NONE;
27	}

Added Link Here

(-)b/lang/tauthon/files/patch-configure (+28 lines)
1	--- configure.orig 2023-02-04 10:09:53 UTC
2	+++ configure
3	@@ -3394,13 +3394,6 @@ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
4
5
6	# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
7	-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
8	-# them.
9	-
10	-printf "%s\n" "#define __BSD_VISIBLE 1" >>confdefs.h
11	-
12	-
13	-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
14	# u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
15
16	printf "%s\n" "#define _BSD_TYPES 1" >>confdefs.h
17	@@ -3785,9 +3778,8 @@ printf "%s\n" "#define _BSD_SOURCE 1" >>confdefs.h
18	# but used in struct sockaddr.sa_family. Reported by Tim Rice.
19	SCO_SV/3.2)
20	define_xopen_source=no;;
21	- # On FreeBSD 4, the math functions C89 does not cover are never defined
22	- # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
23	- FreeBSD/4.*)
24	+ # On FreeBSD, defining _XOPEN_SOURCE to 600 requests a strict environment.
25	+ FreeBSD/*)
26	define_xopen_source=no;;
27	# On MacOS X 10.2, a bug in ncurses.h means that it craps out if
28	# _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which

Removed Link Here

(-)a/lang/tauthon/files/patch-pr192365 (-58 lines)
1	# Description: do not define __BSD_VISIBLE/_XOPEN_SOURCE/_POSIX_C_SOURCE
2	# in include/python2.7/pyconfig.h
3	# Submitted by: antoine
4
5	--- configure.orig 2014-09-06 14:42:50 UTC
6	+++ configure
7	@@ -2919,13 +2919,6 @@
8
9
10	# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
11	-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
12	-# them.
13	-
14	-$as_echo "#define __BSD_VISIBLE 1" >>confdefs.h
15	-
16	-
17	-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
18	# u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
19
20	$as_echo "#define _BSD_TYPES 1" >>confdefs.h
21	@@ -3293,9 +3286,8 @@
22	# but used in struct sockaddr.sa_family. Reported by Tim Rice.
23	SCO_SV/3.2)
24	define_xopen_source=no;;
25	- # On FreeBSD 4, the math functions C89 does not cover are never defined
26	- # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
27	- FreeBSD/4.*)
28	+ # On FreeBSD, defining _XOPEN_SOURCE to 600 requests a strict environment.
29	+ FreeBSD/*)
30	define_xopen_source=no;;
31	# On MacOS X 10.2, a bug in ncurses.h means that it craps out if
32	# _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
33	--- configure.ac.orig 2014-09-06 14:42:50 UTC
34	+++ configure.ac
35	@@ -88,11 +88,6 @@
36	AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])
37
38	# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
39	-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable
40	-# them.
41	-AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])
42	-
43	-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
44	# u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
45	AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
46
47	@@ -426,9 +421,8 @@
48	# but used in struct sockaddr.sa_family. Reported by Tim Rice.
49	SCO_SV/3.2)
50	define_xopen_source=no;;
51	- # On FreeBSD 4, the math functions C89 does not cover are never defined
52	- # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
53	- FreeBSD/4.*)
54	+ # On FreeBSD, defining _XOPEN_SOURCE to 600 requests a strict environment.
55	+ FreeBSD/*)
56	define_xopen_source=no;;
57	# On MacOS X 10.2, a bug in ncurses.h means that it craps out if
58	# _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which

Lines 98-103 include/tauthon%%VERSION_NOMICRO%%/ucnhash.h Link Here

(-)b/lang/tauthon/pkg-plist (-6 / +12 lines)
98	include/tauthon%%VERSION_NOMICRO%%/unicodeobject.h	98	include/tauthon%%VERSION_NOMICRO%%/unicodeobject.h
99	include/tauthon%%VERSION_NOMICRO%%/warnings.h	99	include/tauthon%%VERSION_NOMICRO%%/warnings.h
100	include/tauthon%%VERSION_NOMICRO%%/weakrefobject.h	100	include/tauthon%%VERSION_NOMICRO%%/weakrefobject.h
		101	lib/libtauthon%%VERSION_NOMICRO%%.a
101	lib/libtauthon%%VERSION_NOMICRO%%.so	102	lib/libtauthon%%VERSION_NOMICRO%%.so
102	lib/libtauthon%%VERSION_NOMICRO%%.so.1	103	lib/libtauthon%%VERSION_NOMICRO%%.so.1
103	lib/libtauthon%%VERSION_NOMICRO%%.so.1-gdb.py	104	lib/libtauthon%%VERSION_NOMICRO%%.so.1-gdb.py
Lines 421-427 lib/tauthon%%VERSION_NOMICRO%%/config/Setup.local Link Here
421	lib/tauthon%%VERSION_NOMICRO%%/config/config.c	422	lib/tauthon%%VERSION_NOMICRO%%/config/config.c
422	lib/tauthon%%VERSION_NOMICRO%%/config/config.c.in	423	lib/tauthon%%VERSION_NOMICRO%%/config/config.c.in
423	lib/tauthon%%VERSION_NOMICRO%%/config/install-sh	424	lib/tauthon%%VERSION_NOMICRO%%/config/install-sh
424	lib/tauthon%%VERSION_NOMICRO%%/config/libtauthon%%VERSION_NOMICRO%%.a
425	lib/tauthon%%VERSION_NOMICRO%%/config/makesetup	425	lib/tauthon%%VERSION_NOMICRO%%/config/makesetup
426	lib/tauthon%%VERSION_NOMICRO%%/config/python.o	426	lib/tauthon%%VERSION_NOMICRO%%/config/python.o
427	lib/tauthon%%VERSION_NOMICRO%%/contextlib.py	427	lib/tauthon%%VERSION_NOMICRO%%/contextlib.py
Lines 662-667 lib/tauthon%%VERSION_NOMICRO%%/distutils/README Link Here
662	lib/tauthon%%VERSION_NOMICRO%%/distutils/__init__.py	662	lib/tauthon%%VERSION_NOMICRO%%/distutils/__init__.py
663	lib/tauthon%%VERSION_NOMICRO%%/distutils/__init__.pyc	663	lib/tauthon%%VERSION_NOMICRO%%/distutils/__init__.pyc
664	lib/tauthon%%VERSION_NOMICRO%%/distutils/__init__.pyo	664	lib/tauthon%%VERSION_NOMICRO%%/distutils/__init__.pyo
		665	lib/tauthon%%VERSION_NOMICRO%%/distutils/_msvccompiler.py
		666	lib/tauthon%%VERSION_NOMICRO%%/distutils/_msvccompiler.pyc
		667	lib/tauthon%%VERSION_NOMICRO%%/distutils/_msvccompiler.pyo
665	lib/tauthon%%VERSION_NOMICRO%%/distutils/archive_util.py	668	lib/tauthon%%VERSION_NOMICRO%%/distutils/archive_util.py
666	lib/tauthon%%VERSION_NOMICRO%%/distutils/archive_util.pyc	669	lib/tauthon%%VERSION_NOMICRO%%/distutils/archive_util.pyc
667	lib/tauthon%%VERSION_NOMICRO%%/distutils/archive_util.pyo	670	lib/tauthon%%VERSION_NOMICRO%%/distutils/archive_util.pyo
Lines 744-749 lib/tauthon%%VERSION_NOMICRO%%/distutils/command/sdist.pyo Link Here
744	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/upload.py	747	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/upload.py
745	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/upload.pyc	748	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/upload.pyc
746	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/upload.pyo	749	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/upload.pyo
		750	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-10.0-amd64.exe
		751	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-10.0.exe
		752	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-14.0-amd64.exe
		753	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-14.0.exe
747	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-6.0.exe	754	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-6.0.exe
748	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-7.1.exe	755	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-7.1.exe
749	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-8.0.exe	756	lib/tauthon%%VERSION_NOMICRO%%/distutils/command/wininst-8.0.exe
Lines 904-909 lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_install_scripts.pyo Link Here
904	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvc9compiler.py	911	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvc9compiler.py
905	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvc9compiler.pyc	912	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvc9compiler.pyc
906	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvc9compiler.pyo	913	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvc9compiler.pyo
		914	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvccompiler.py
		915	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvccompiler.pyc
		916	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_msvccompiler.pyo
907	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_register.py	917	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_register.py
908	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_register.pyc	918	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_register.pyc
909	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_register.pyo	919	lib/tauthon%%VERSION_NOMICRO%%/distutils/tests/test_register.pyo
Lines 1940-1946 lib/tauthon%%VERSION_NOMICRO%%/json/tool.pyo Link Here
1940	lib/tauthon%%VERSION_NOMICRO%%/keyword.py	1950	lib/tauthon%%VERSION_NOMICRO%%/keyword.py
1941	lib/tauthon%%VERSION_NOMICRO%%/keyword.pyc	1951	lib/tauthon%%VERSION_NOMICRO%%/keyword.pyc
1942	lib/tauthon%%VERSION_NOMICRO%%/keyword.pyo	1952	lib/tauthon%%VERSION_NOMICRO%%/keyword.pyo
1943	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/Python-%%DISTVERSION%%-py%%VERSION_NOMICRO%%.egg-info	1953	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/Python-%%TAUTHON_VERSION%%-py%%VERSION_NOMICRO%%.egg-info
1944	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_bisect.so	1954	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_bisect.so
1945	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_codecs_cn.so	1955	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_codecs_cn.so
1946	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_codecs_hk.so	1956	lib/tauthon%%VERSION_NOMICRO%%/lib-dynload/_codecs_hk.so
Lines 2016-2024 lib/tauthon%%VERSION_NOMICRO%%/lib-tk/Dialog.pyo Link Here
2016	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FileDialog.py	2026	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FileDialog.py
2017	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FileDialog.pyc	2027	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FileDialog.pyc
2018	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FileDialog.pyo	2028	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FileDialog.pyo
2019	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FixTk.py
2020	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FixTk.pyc
2021	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/FixTk.pyo
2022	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/ScrolledText.py	2029	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/ScrolledText.py
2023	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/ScrolledText.pyc	2030	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/ScrolledText.pyc
2024	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/ScrolledText.pyo	2031	lib/tauthon%%VERSION_NOMICRO%%/lib-tk/ScrolledText.pyo
2025	-