Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A354584CEB for ; Mon, 28 Aug 2023 09:47:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 9ijeZvapGbZc for ; Mon, 28 Aug 2023 09:47:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C788884CD8 for ; Mon, 28 Aug 2023 09:47:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BF0C5FBDB; Mon, 28 Aug 2023 09:47:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169321606676770" MIME-Version: 1.0 Date: Mon, 28 Aug 2023 09:47:46 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/www/ap2-python To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20230828094746.BF0C5FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169321606676770 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Mon Aug 28 09:47:46 UTC 2023 Modified Files: pkgsrc/www/ap2-python: Makefile PLIST distinfo pkgsrc/www/ap2-python/patches: patch-dist_version.sh Removed Files: pkgsrc/www/ap2-python: MESSAGE pkgsrc/www/ap2-python/patches: patch-src___apachemodule.c Log Message: www/ap2-python: Update to 3.5.0.1 Upstream has taggeed a pseudo-release at our request! packaging changes: - switch to github for distfiles and HOMEPAGE - remove explanation about non-threaded apache from MESSAGE, as there is no longer any such thing in pkgsrc - remove 3 hunks from MESSAGE that duplicate upstream documentation - remove empty MESSAGE Upstream NEWS: Aug 18 2023 - 3.5.0.1 released. It addresses compatibility issues with Python 3.11. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 pkgsrc/www/ap2-python/MESSAGE cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/ap2-python/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/ap2-python/PLIST cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/ap2-python/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ap2-python/patches/patch-dist_version.sh cvs rdiff -u -r1.1 -r0 \ pkgsrc/www/ap2-python/patches/patch-src___apachemodule.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169321606676770 Content-Disposition: inline Content-Length: 5379 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/ap2-python/Makefile diff -u pkgsrc/www/ap2-python/Makefile:1.42 pkgsrc/www/ap2-python/Makefile:1.43 --- pkgsrc/www/ap2-python/Makefile:1.42 Tue Aug 15 18:33:13 2023 +++ pkgsrc/www/ap2-python/Makefile Mon Aug 28 09:47:46 2023 @@ -1,22 +1,26 @@ -# $NetBSD: Makefile,v 1.42 2023/08/15 18:33:13 gdt Exp $ +# $NetBSD: Makefile,v 1.43 2023/08/28 09:47:46 gdt Exp $ -# Upstream has a policy against actually having releases, so one -# cannot believe the tags section of their site, or repology. +# Upstream tends to not have releases, so one must be cautious the +# tags section of their site, or repology. However, they did make a +# release on request: # https://github.com/grisha/mod_python/issues/126 -DISTNAME= mod_python-3.5.0 +DISTNAME= mod_python-3.5.0.1 PKGNAME= ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-${DISTNAME:S/mod_//} -PKGREVISION= 5 CATEGORIES= www python -MASTER_SITES= http://dist.modpython.org/dist/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ${MASTER_SITE_GITHUB:=grisha/} +GITHUB_PROJECT= mod_python + +# This release wrongly uses 3.5.0 as the egg name. MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.modpython.org/ +HOMEPAGE= https://github.com/grisha/mod_python +#HOMEPAGE+= http://www.modpython.org/ COMMENT= Apache module that embeds the Python interpreter LICENSE= apache-2.0 # HACK: This is not needed, but if it's installed, the PLIST differs # so just depend on it to make it consistently install the same files. +# \todo: With 3.5.0.1, this might no longer be necessary. TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools MAKE_JOBS_SAFE= no Index: pkgsrc/www/ap2-python/PLIST diff -u pkgsrc/www/ap2-python/PLIST:1.8 pkgsrc/www/ap2-python/PLIST:1.9 --- pkgsrc/www/ap2-python/PLIST:1.8 Mon Aug 14 07:40:41 2023 +++ pkgsrc/www/ap2-python/PLIST Mon Aug 28 09:47:46 2023 @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.8 2023/08/14 07:40:41 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2023/08/28 09:47:46 gdt Exp $ bin/mod_python lib/httpd/mod_python.so -${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO -${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt -${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt -${PYSITELIB}/mod_python-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt +${PYSITELIB}/mod_python-3.5.0-py${PYVERSSUFFIX}.egg-info/PKG-INFO +${PYSITELIB}/mod_python-3.5.0-py${PYVERSSUFFIX}.egg-info/SOURCES.txt +${PYSITELIB}/mod_python-3.5.0-py${PYVERSSUFFIX}.egg-info/dependency_links.txt +${PYSITELIB}/mod_python-3.5.0-py${PYVERSSUFFIX}.egg-info/top_level.txt ${PYSITELIB}/mod_python/Cookie.py ${PYSITELIB}/mod_python/Cookie.pyc ${PYSITELIB}/mod_python/Cookie.pyo Index: pkgsrc/www/ap2-python/distinfo diff -u pkgsrc/www/ap2-python/distinfo:1.12 pkgsrc/www/ap2-python/distinfo:1.13 --- pkgsrc/www/ap2-python/distinfo:1.12 Tue Oct 26 11:29:19 2021 +++ pkgsrc/www/ap2-python/distinfo Mon Aug 28 09:47:46 2023 @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.12 2021/10/26 11:29:19 nia Exp $ +$NetBSD: distinfo,v 1.13 2023/08/28 09:47:46 gdt Exp $ -BLAKE2s (mod_python-3.5.0.tgz) = 4936e86111e8b39cd50fad193ce35ee650b287df68175819c8a187e4ab9154df -SHA512 (mod_python-3.5.0.tgz) = a8838c807db36bd316e44c43c1b1db6d6565a30d1823664f3d44667f5843274ff5f77a849fcfa226fcfb6d399ef2dd983939ff0f6db8849a3e7d25ceafe0c765 -Size (mod_python-3.5.0.tgz) = 571403 bytes +BLAKE2s (mod_python-3.5.0.1.tar.gz) = c33c2b09c107accba9c629b70d242e007a3974fd43e276692df7b275543fee22 +SHA512 (mod_python-3.5.0.1.tar.gz) = 596c2927775f399338f563f56237ab34f940c33ea36082f52cba804dc12d1ca858b148e6a9ea13e2d83adcfdbf16fac7cf19fc5fdfe6dcf2aab36d73d60ee3f2 +Size (mod_python-3.5.0.1.tar.gz) = 313340 bytes SHA1 (patch-configure) = 721dc5200205889106c502247a4b4a4a6995b4e2 SHA1 (patch-configure.in) = 1c77f43224f3c9ae555f91ac4479c60121ad950b -SHA1 (patch-dist_version.sh) = 9f3dbf596238aa106e06ec1c8b27a90619ef4978 -SHA1 (patch-src___apachemodule.c) = 3f9bfe10c48a2f64e5528e77205d9bdbeaaded07 +SHA1 (patch-dist_version.sh) = d0e3ab6b37b7d8220731c81a7a7068bd798aeac4 Index: pkgsrc/www/ap2-python/patches/patch-dist_version.sh diff -u pkgsrc/www/ap2-python/patches/patch-dist_version.sh:1.1 pkgsrc/www/ap2-python/patches/patch-dist_version.sh:1.2 --- pkgsrc/www/ap2-python/patches/patch-dist_version.sh:1.1 Mon Feb 17 17:20:28 2014 +++ pkgsrc/www/ap2-python/patches/patch-dist_version.sh Mon Aug 28 09:47:46 2023 @@ -1,14 +1,22 @@ -$NetBSD: patch-dist_version.sh,v 1.1 2014/02/17 17:20:28 adam Exp $ +$NetBSD: patch-dist_version.sh,v 1.2 2023/08/28 09:47:46 gdt Exp $ Don't depend on 'git'. ---- dist/version.sh.orig 2014-02-17 13:35:44.000000000 +0000 +--- dist/version.sh.orig 2023-08-18 17:28:08.000000000 +0000 +++ dist/version.sh -@@ -5,6 +5,5 @@ MPV_PATH="`dirname $0`/../src/include/mp - MAJ=`awk '/MP_VERSION_MAJOR/ {print $3}' $MPV_PATH` +@@ -6,6 +6,8 @@ MAJ=`awk '/MP_VERSION_MAJOR/ {print $3}' MIN=`awk '/MP_VERSION_MINOR/ {print $3}' $MPV_PATH` PCH=`awk '/MP_VERSION_PATCH/ {print $3}' $MPV_PATH` --GIT=`git describe --always` --echo $MAJ.$MIN.$PCH-$GIT -+echo $MAJ.$MIN.$PCH ++if false; then ++ + # if git exists in path + if type git >/dev/null 2>&1; then + # and we are in a checkout +@@ -18,4 +20,6 @@ if type git >/dev/null 2>&1; then + fi + fi + ++fi ++ + echo $MAJ.$MIN.$PCH$GIT --_----------=_169321606676770--