CVS commit: pkgsrc/lang/python310

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan 20 13:07:50 UTC 2022

Modified Files:
        pkgsrc/lang/python310: Makefile distinfo
        pkgsrc/lang/python310/patches: patch-Modules_socketmodule.c

Log Message:
python310: Solaris 10 fixes, from pekdon via IRC.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/python310/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/python310/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/python310/patches/patch-Modules_socketmodule.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python310/Makefile
diff -u pkgsrc/lang/python310/Makefile:1.7 pkgsrc/lang/python310/Makefile:1.8
--- pkgsrc/lang/python310/Makefile:1.7  Sat Jan 15 16:23:47 2022
+++ pkgsrc/lang/python310/Makefile      Thu Jan 20 13:07:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/15 16:23:47 adam Exp $
+# $NetBSD: Makefile,v 1.8 2022/01/20 13:07:50 jperkin Exp $
 
 .include "dist.mk"
 
@@ -43,8 +43,17 @@ PKG_CC=                      clang
 PKG_CXX=               clang++
 .endif
 
-# fdatasync()
-LIBS.SunOS+=           -lrt
+# Used in socketmodule.c to determine if a sethostname declaration is required
+CPPFLAGS.SunOS+=       -DPKGSRC_OPSYS_VERSION=${OPSYS_VERSION}
+LIBS.SunOS+=           -lrt    # fdatasync()
+LIBS.SunOS+=           -luuid
+.if ${OPSYS} == "SunOS" && ${OPSYS_VERSION} < 051100
+SUBST_CLASSES+=                setup
+SUBST_MESSAGE.setup=   Replacing crypt with crypt_i
+SUBST_STAGE.setup=     pre-configure
+SUBST_FILES.setup=     setup.py
+SUBST_SED.setup=       -e "s,'crypt','crypt_i',"
+.endif
 
 PY_VER_SUFFIX=         3.10
 

Index: pkgsrc/lang/python310/distinfo
diff -u pkgsrc/lang/python310/distinfo:1.11 pkgsrc/lang/python310/distinfo:1.12
--- pkgsrc/lang/python310/distinfo:1.11 Sat Jan 15 16:23:47 2022
+++ pkgsrc/lang/python310/distinfo      Thu Jan 20 13:07:50 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2022/01/15 16:23:47 adam Exp $
+$NetBSD: distinfo,v 1.12 2022/01/20 13:07:50 jperkin Exp $
 
 BLAKE2s (Python-3.10.2.tar.xz) = 38eefd209fa18acd20ad16743fcc8a6140af2fdb0203e95b099f52b8eb2e5051
 SHA512 (Python-3.10.2.tar.xz) = 215a7159face84788fe547c1e2689b8d0ae510275157cf01636bef2902d0ff465f844eb0328c9f39fd1cd03a1d1736d4cf258992f2788e492a801a372032c08b
@@ -8,7 +8,7 @@ SHA1 (patch-Lib_distutils_unixccompiler.
 SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = 593c4e93c5653ab400f0a98b91db92630c0a7390
 SHA1 (patch-Lib_sysconfig.py) = bc6d91bf8f7121456b26ea7f080f588c96f2596f
 SHA1 (patch-Makefile.pre.in) = 932a89313e8f26c435675f2487eb2141876a5f5a
-SHA1 (patch-Modules_socketmodule.c) = 4529c487b33d19b87106a0c006520cc5c45b9dfd
+SHA1 (patch-Modules_socketmodule.c) = 3e2db474b4ef08edd25528465605fff1d3d0f61b
 SHA1 (patch-Modules_socketmodule.h) = 8761c7238bc74e45adefb6e647dc3b39b7bdd81c
 SHA1 (patch-Python_thread__pthread.h) = bf1aeab011b3afedc02e68fcf5cef091b3e0aefa
 SHA1 (patch-configure) = b238289b98d85128d0b0ad02ce926e36c0febc02

Index: pkgsrc/lang/python310/patches/patch-Modules_socketmodule.c
diff -u pkgsrc/lang/python310/patches/patch-Modules_socketmodule.c:1.1 pkgsrc/lang/python310/patches/patch-Modules_socketmodule.c:1.2
--- pkgsrc/lang/python310/patches/patch-Modules_socketmodule.c:1.1      Tue Oct  5 19:07:13 2021
+++ pkgsrc/lang/python310/patches/patch-Modules_socketmodule.c  Thu Jan 20 13:07:50 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-Modules_socketmodule.c,v 1.1 2021/10/05 19:07:13 adam Exp $
+$NetBSD: patch-Modules_socketmodule.c,v 1.2 2022/01/20 13:07:50 jperkin Exp $
 
 Support NetBSD's socketcan implementation
 
---- Modules/socketmodule.c.orig        2021-07-10 00:51:07.000000000 +0000
+--- Modules/socketmodule.c.orig        2022-01-13 18:52:14.000000000 +0000
 +++ Modules/socketmodule.c
-@@ -2115,7 +2115,7 @@ getsockaddrarg(PySocketSockObject *s, Py
+@@ -2112,7 +2112,7 @@ getsockaddrarg(PySocketSockObject *s, Py
              PyObject *interfaceName;
              struct ifreq ifr;
              Py_ssize_t len;
@@ -13,7 +13,16 @@ Support NetBSD's socketcan implementatio
  
              if (!PyTuple_Check(args)) {
                  PyErr_Format(PyExc_TypeError,
-@@ -7785,6 +7785,20 @@ PyInit__socket(void)
+@@ -5440,7 +5440,7 @@ socket_sethostname(PyObject *self, PyObj
+     Py_buffer buf;
+     int res, flag = 0;
+ 
+-#ifdef _AIX
++#if defined(_AIX) || (defined(__sun) && PKGSRC_OPSYS_VERSION < 051100)
+ /* issue #18259, not declared in any useful header file */
+ extern int sethostname(const char *, size_t);
+ #endif
+@@ -7782,6 +7782,20 @@ PyInit__socket(void)
  
      PyModule_AddIntMacro(m, J1939_FILTER_MAX);
  #endif