CVS commit: pkgsrc/chat/py-xmpppy

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Nov 24 00:52:59 UTC 2024

Modified Files:
        pkgsrc/chat/py-xmpppy: Makefile distinfo
        pkgsrc/chat/py-xmpppy/patches: patch-xmpp_transports.py

Log Message:
chat/py-xmpppy: Improve TLS python calls

Based on a suggested from felixfontein@github, use
ssl.create_default_context, which also sets other more modern defaults
(e.g. no SSLv3) and loads system trust anchors by default.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/chat/py-xmpppy/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/chat/py-xmpppy/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/chat/py-xmpppy/patches/patch-xmpp_transports.py

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

Modified files:

Index: pkgsrc/chat/py-xmpppy/Makefile
diff -u pkgsrc/chat/py-xmpppy/Makefile:1.33 pkgsrc/chat/py-xmpppy/Makefile:1.34
--- pkgsrc/chat/py-xmpppy/Makefile:1.33 Fri Nov 22 14:20:02 2024
+++ pkgsrc/chat/py-xmpppy/Makefile      Sun Nov 24 00:52:59 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2024/11/22 14:20:02 gdt Exp $
+# $NetBSD: Makefile,v 1.34 2024/11/24 00:52:59 gdt Exp $
 
 DISTNAME=      xmpppy-0.7.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    chat python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=xmpppy/}
 GITHUB_PROJECT=        xmpppy

Index: pkgsrc/chat/py-xmpppy/distinfo
diff -u pkgsrc/chat/py-xmpppy/distinfo:1.11 pkgsrc/chat/py-xmpppy/distinfo:1.12
--- pkgsrc/chat/py-xmpppy/distinfo:1.11 Fri Nov 22 14:20:02 2024
+++ pkgsrc/chat/py-xmpppy/distinfo      Sun Nov 24 00:52:59 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2024/11/22 14:20:02 gdt Exp $
+$NetBSD: distinfo,v 1.12 2024/11/24 00:52:59 gdt Exp $
 
 BLAKE2s (xmpppy-0.7.1.tar.gz) = e394d2554c38736ed35eb93823e11b02a87f719ab6e980d88327326b65660286
 SHA512 (xmpppy-0.7.1.tar.gz) = d7dc536282c5214007037bacc0c2d24bc64d1ea10441472a5ab23b14fe076b65f945e966a6255519e8ddca41c6d4c343ebe99b50bf1764f6775e58a3ab1b2266
 Size (xmpppy-0.7.1.tar.gz) = 191428 bytes
 SHA1 (patch-xmpp_debug.py) = a410b7abd534f37bba583ca9f15bf05252bc55a0
-SHA1 (patch-xmpp_transports.py) = d8cb097d8f239dd275a9f7595ebeb49bb800f0e0
+SHA1 (patch-xmpp_transports.py) = 1e7b3f30bcbb7ac3ad5f3719adfc6a5ccb43519f

Index: pkgsrc/chat/py-xmpppy/patches/patch-xmpp_transports.py
diff -u pkgsrc/chat/py-xmpppy/patches/patch-xmpp_transports.py:1.4 pkgsrc/chat/py-xmpppy/patches/patch-xmpp_transports.py:1.5
--- pkgsrc/chat/py-xmpppy/patches/patch-xmpp_transports.py:1.4  Fri Nov 22 14:20:02 2024
+++ pkgsrc/chat/py-xmpppy/patches/patch-xmpp_transports.py      Sun Nov 24 00:52:59 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-xmpp_transports.py,v 1.4 2024/11/22 14:20:02 gdt Exp $
+$NetBSD: patch-xmpp_transports.py,v 1.5 2024/11/24 00:52:59 gdt Exp $
 
 Adapt to ssl usage in python 3.12 and up.
 
@@ -14,12 +14,11 @@ See
 
 --- xmpp/transports.py.orig    2022-04-10 18:25:44.000000000 +0000
 +++ xmpp/transports.py
-@@ -383,8 +383,14 @@ class TLS(PlugIn):
+@@ -383,8 +383,13 @@ class TLS(PlugIn):
      def _startSSL(self):
          """ Immidiatedly switch socket to TLS mode. Used internally."""
          """ Here we should switch pending_data to hint mode."""
-+        context=ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-+        context.set_default_verify_paths()
++        context=ssl.create_default_context()
 +        # Uncomment if you need to work around trust anchor configuration.
 +        #context.check_hostname = False
 +        #context.verify_mode = ssl.CERT_NONE