CVS commit: pkgsrc/www/py-scgi

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Feb  6 13:49:19 UTC 2025

Modified Files:
        pkgsrc/www/py-scgi: Makefile PLIST distinfo

Log Message:
py-scgi: updated to 2.2

2.2.

Add the SCGI protocol document.

Make scgi_server reap_children() more robust.

It is possible that a child has already been removed from the list of
children so handle that case gracefully.  Change the session_server
reap_children() to check if self.children is non-empty, for small
efficiency gain and to match the scgi_server version.

v2.1

Use setuptools.

Modernize setup.py, add dist.sh script.

v2.0

Modernize setup.py, add dist.sh script.

Limit retries in delegate_request().

If we continuously fail to pass a request to a child, give up after a
certain number of attempts (30).  Otherwise, delegate_request() will
never return.  If this happens, something is seriously wrong with the
SCGI application but it seems slightly better to start dropping incoming
requests in that case rather than never making progress.

Improve exception handling in Child.process().

Since Python 3.5, EINTR is no longer returned to user code.  So, remove
handling of it.  In Python 3, socket.error is OSError.  So, use OSError
directly rather than socket.error.

If an exception occurs inside Child.process(), close the connection to
the child.  That will cause the child to exit and be reaped.  The
previous behavior of raising an exception from process() could cause the
master SCGI process to exit in some cases.  We want to avoid that.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/py-scgi/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-scgi/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/py-scgi/distinfo

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

Modified files:

Index: pkgsrc/www/py-scgi/Makefile
diff -u pkgsrc/www/py-scgi/Makefile:1.20 pkgsrc/www/py-scgi/Makefile:1.21
--- pkgsrc/www/py-scgi/Makefile:1.20    Mon Jan 10 22:46:42 2022
+++ pkgsrc/www/py-scgi/Makefile Thu Feb  6 13:49:19 2025
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2022/01/10 22:46:42 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2025/02/06 13:49:19 adam Exp $
 
-DISTNAME=      scgi-1.15
+DISTNAME=      scgi-2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    www python
-MASTER_SITES=  http://python.ca/scgi/releases/
+MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scgi/}
 
 MAINTAINER=    manu%NetBSD.org@localhost
 HOMEPAGE=      https://python.ca/scgi/
 COMMENT=       Simple Common Gateway Interface
 LICENSE=       cnri-license
 
-DEPENDS+=      ${PYPKGPREFIX}-quixote-[0-9]*:../../devel/py-quixote
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
-PYTHON_VERSIONS_ACCEPTED=      27 # py-quixote
-
-CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
-
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-scgi/PLIST
diff -u pkgsrc/www/py-scgi/PLIST:1.7 pkgsrc/www/py-scgi/PLIST:1.8
--- pkgsrc/www/py-scgi/PLIST:1.7        Sat Jan 22 14:17:46 2022
+++ pkgsrc/www/py-scgi/PLIST    Thu Feb  6 13:49:19 2025
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2022/01/22 14:17:46 wiz Exp $
-${PYSITELIB}/${EGG_INFODIR}
+@comment $NetBSD: PLIST,v 1.8 2025/02/06 13:49:19 adam Exp $
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/scgi/__init__.py
 ${PYSITELIB}/scgi/__init__.pyc
 ${PYSITELIB}/scgi/__init__.pyo
@@ -10,12 +14,15 @@ ${PYSITELIB}/scgi/quixote_handler.pyo
 ${PYSITELIB}/scgi/scgi_server.py
 ${PYSITELIB}/scgi/scgi_server.pyc
 ${PYSITELIB}/scgi/scgi_server.pyo
-${PYSITELIB}/scgi/scgi_session_server.py
-${PYSITELIB}/scgi/scgi_session_server.pyc
-${PYSITELIB}/scgi/scgi_session_server.pyo
+${PYSITELIB}/scgi/session_server.py
+${PYSITELIB}/scgi/session_server.pyc
+${PYSITELIB}/scgi/session_server.pyo
+${PYSITELIB}/scgi/systemd_socket.py
+${PYSITELIB}/scgi/systemd_socket.pyc
+${PYSITELIB}/scgi/systemd_socket.pyo
 ${PYSITELIB}/scgi/test_passfd.py
 ${PYSITELIB}/scgi/test_passfd.pyc
 ${PYSITELIB}/scgi/test_passfd.pyo
-${PYSITELIB}/scgi/wsgi_handler.py
-${PYSITELIB}/scgi/wsgi_handler.pyc
-${PYSITELIB}/scgi/wsgi_handler.pyo
+${PYSITELIB}/scgi/util.py
+${PYSITELIB}/scgi/util.pyc
+${PYSITELIB}/scgi/util.pyo

Index: pkgsrc/www/py-scgi/distinfo
diff -u pkgsrc/www/py-scgi/distinfo:1.6 pkgsrc/www/py-scgi/distinfo:1.7
--- pkgsrc/www/py-scgi/distinfo:1.6     Tue Oct 26 11:30:47 2021
+++ pkgsrc/www/py-scgi/distinfo Thu Feb  6 13:49:19 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:30:47 nia Exp $
+$NetBSD: distinfo,v 1.7 2025/02/06 13:49:19 adam Exp $
 
-BLAKE2s (scgi-1.15.tar.gz) = 74dd1918bffaf7fe97d98a8edfa14d35bc0e57c6ccca05a2f678332530528e4d
-SHA512 (scgi-1.15.tar.gz) = 6d4d9938dcd18d38d397e49aa27cc1dcf764dd81cff7df3ba7531c298a521712b39c3c6743369f04a78d702b79559c5ce9a14d2069235224562f3bce912882f4
-Size (scgi-1.15.tar.gz) = 32984 bytes
+BLAKE2s (scgi-2.2.tar.gz) = 4b4db33c737c9a6f18447123a68f5248b5d4843f5c693002904aa09dab348ea8
+SHA512 (scgi-2.2.tar.gz) = 5af72e45cea7a088f258273b5c7f6c820376d331f1223b52b5a0542aefbbd4523f98e07cf72531b5d08b1813f44181eef7a3ac8b0fa60785b995488635c871a4
+Size (scgi-2.2.tar.gz) = 35052 bytes