CVS commit: pkgsrc/lang/python39

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan 20 13:06:33 UTC 2022

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/python39/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/python39/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/lang/python39/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/python39/Makefile
diff -u pkgsrc/lang/python39/Makefile:1.14 pkgsrc/lang/python39/Makefile:1.15
--- pkgsrc/lang/python39/Makefile:1.14  Sat Jan 15 16:21:26 2022
+++ pkgsrc/lang/python39/Makefile       Thu Jan 20 13:06:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/01/15 16:21:26 adam Exp $
+# $NetBSD: Makefile,v 1.15 2022/01/20 13:06:33 jperkin Exp $
 
 .include "dist.mk"
 
@@ -43,8 +43,17 @@ PKG_CC=                      clang
 PKG_CXX=               clang++
 .endif
 
+# 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.9
 

Index: pkgsrc/lang/python39/distinfo
diff -u pkgsrc/lang/python39/distinfo:1.23 pkgsrc/lang/python39/distinfo:1.24
--- pkgsrc/lang/python39/distinfo:1.23  Sat Jan 15 16:21:26 2022
+++ pkgsrc/lang/python39/distinfo       Thu Jan 20 13:06:33 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2022/01/15 16:21:26 adam Exp $
+$NetBSD: distinfo,v 1.24 2022/01/20 13:06:33 jperkin Exp $
 
 BLAKE2s (Python-3.9.10.tar.xz) = 1ce51e66e2c7d865aafbf7cee216436f3c814f7b8d8565f328cfd140cc2b8f3d
 SHA512 (Python-3.9.10.tar.xz) = 09cb942f84bf362df88999ffa6faf89b4ad12302e67cda4a11547828ebe410c7c93a3dc96cd66fd9c5c7d9a1abe5b8e259e7ec47c10273b42d212270aca5ecba
@@ -12,7 +12,7 @@ SHA1 (patch-Makefile.pre.in) = dd5ff571a
 SHA1 (patch-Modules___ssl.c) = f241ba148e4c244a641386be5ac07817b03f04f7
 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
 SHA1 (patch-Modules_nismodule.c) = 1bafe9b06359586d027a77011b103877590d947d
-SHA1 (patch-Modules_socketmodule.c) = 98882462db1b1fe3141219206980aa9ae56ffce2
+SHA1 (patch-Modules_socketmodule.c) = 5c894f2291cdf0dd355671a1878863e0342207de
 SHA1 (patch-Modules_socketmodule.h) = 8761c7238bc74e45adefb6e647dc3b39b7bdd81c
 SHA1 (patch-Python_thread__pthread.h) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
 SHA1 (patch-configure) = d44439b22e8444141e2632b9fd9b1f343b38b712

Index: pkgsrc/lang/python39/patches/patch-Modules_socketmodule.c
diff -u pkgsrc/lang/python39/patches/patch-Modules_socketmodule.c:1.2 pkgsrc/lang/python39/patches/patch-Modules_socketmodule.c:1.3
--- pkgsrc/lang/python39/patches/patch-Modules_socketmodule.c:1.2       Sat May 22 11:36:01 2021
+++ pkgsrc/lang/python39/patches/patch-Modules_socketmodule.c   Thu Jan 20 13:06:33 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-Modules_socketmodule.c,v 1.2 2021/05/22 11:36:01 bouyer Exp $
+$NetBSD: patch-Modules_socketmodule.c,v 1.3 2022/01/20 13:06:33 jperkin Exp $
 
 Support NetBSD's socketcan implementation
 
---- Modules/socketmodule.c.orig        2021-05-03 16:54:42.000000000 +0200
-+++ Modules/socketmodule.c     2021-05-22 12:11:03.509965978 +0200
-@@ -2157,7 +2157,7 @@
+--- Modules/socketmodule.c.orig        2022-01-13 21:21:23.000000000 +0000
++++ Modules/socketmodule.c
+@@ -2154,7 +2154,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,
-@@ -7827,6 +7827,20 @@
+@@ -5489,7 +5489,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
+@@ -7824,6 +7824,20 @@ PyInit__socket(void)
  
      PyModule_AddIntMacro(m, J1939_FILTER_MAX);
  #endif