On 2024/09/10 17:22, Stuart Henderson wrote:
> On 2024/09/10 16:32, Theo Buehler wrote:
> > Couple of security/reliability fixes. Nothing earth shattering:
> >
> > https://www.python.org/downloads/release/python-31110/
> >
> > (The list is confusing, e.g., the ssl fixes were already in 3.11.9)
> >
> > Ran this through a bulk on amd64 and checked that it packages on sparc64.
> > Unsurprisingly there were no surprises.
>
> Looks good to me with some testing on amd64 and aarch64.
>
> If we want this for 7.5-stable too then -current will need a couple
> of changes - REVISION=0, to keep the version numbers higher (due to
> the PKGPATH and some other changes), and also the second @conflict
> line in PLIST-main and -idle will need to change, I can send a diff
> for that when it's in.
>
> OK sthen@
>
Or if we want to do as one-shot, here are the diffs (I also took the
opportunity to merge the python3 meta package in to lang/python/3 since
the reason for it has now gone).
Index: meta/python3/Makefile
===================================================================
RCS file: meta/python3/Makefile
diff -N meta/python3/Makefile
--- meta/python3/Makefile 6 May 2024 12:23:45 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-COMMENT = meta-package to install the current version of python 3
-
-PKGNAME = python3-${MODPY_DEFAULT_VERSION_3}
-REVISION = 3
-
-MODULES = lang/python
-MODPY_BUILDDEP = No
-
-.include <bsd.port.mk>
Index: meta/python3/pkg/DESCR
===================================================================
RCS file: meta/python3/pkg/DESCR
diff -N meta/python3/pkg/DESCR
--- meta/python3/pkg/DESCR 7 Jan 2020 20:01:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-This is simply a meta-package which depends on the current version of
-Python 3, allowing easy installation with "pkg_add python3" without
-having to worry about the particular version number.
Index: meta/python3/pkg/PLIST
===================================================================
RCS file: meta/python3/pkg/PLIST
diff -N meta/python3/pkg/PLIST
Index: lang/python/3/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3/Makefile,v
diff -u -p -r1.6 Makefile
--- lang/python/3/Makefile 20 May 2024 19:16:00 -0000 1.6
+++ lang/python/3/Makefile 10 Sep 2024 16:51:28 -0000
@@ -3,12 +3,12 @@
# requirement of the PSF license, if it constitutes a change to
# Python itself.
-FULL_VERSION = 3.11.9
+FULL_VERSION = 3.11.10
SHARED_LIBS = python3.11 0.0
VERSION_SPEC = >=3.11,<3.12
PORTROACH = limit:^3\.11
-REVISION = 3
+REVISION = 0
CONFIGURE_ENV += ac_cv_working_openssl_hashlib=yes \
TCLTK_CFLAGS="-I${MODTCL_INCDIR} -I${MODTK_INCDIR}
-I${X11BASE}/include" \
Index: lang/python/3/distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3/distinfo,v
diff -u -p -r1.1 distinfo
--- lang/python/3/distinfo 6 May 2024 12:19:33 -0000 1.1
+++ lang/python/3/distinfo 10 Sep 2024 16:51:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.9.tgz) = 594yQKi8Kx4bpcgb+UPwaGH/SUtp/amQzicipQTGFT0=
-SIZE (Python-3.11.9.tgz) = 26521757
+SHA256 (Python-3.11.10.tgz) = kvL68kJoG/pAbVOlHhfULFNzr/4joTDNlpfhMu9XRwY=
+SIZE (Python-3.11.10.tgz) = 26532827
Index: lang/python/3/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3/pkg/PLIST-main,v
diff -u -p -r1.5 PLIST-main
--- lang/python/3/pkg/PLIST-main 20 May 2024 19:16:00 -0000 1.5
+++ lang/python/3/pkg/PLIST-main 10 Sep 2024 16:51:28 -0000
@@ -12,6 +12,7 @@
@pkgpath lang/python/3.9,-main
@pkgpath lang/python/3.10,-main
@pkgpath lang/python/3.11,-main
+@pkgpath meta/python3
bin/2to3
bin/2to3-3.11
@comment bin/pip3
Index: lang/python/3.11/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.11/Attic/Makefile,v
diff -u -p -r1.14.2.1 Makefile
--- lang/python/3.11/Makefile 13 Apr 2024 16:57:09 -0000 1.14.2.1
+++ lang/python/3.11/Makefile 10 Sep 2024 16:50:29 -0000
@@ -3,7 +3,7 @@
# requirement of the PSF license, if it constitutes a change to
# Python itself.
-FULL_VERSION = 3.11.9
+FULL_VERSION = 3.11.10
SHARED_LIBS = python3.11 0.0
VERSION_SPEC = >=3.11,<3.12
PORTROACH = limit:^3\.11
Index: lang/python/3.11/distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.11/Attic/distinfo,v
diff -u -p -r1.8.2.1 distinfo
--- lang/python/3.11/distinfo 13 Apr 2024 16:57:09 -0000 1.8.2.1
+++ lang/python/3.11/distinfo 10 Sep 2024 16:50:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.9.tgz) = 594yQKi8Kx4bpcgb+UPwaGH/SUtp/amQzicipQTGFT0=
-SIZE (Python-3.11.9.tgz) = 26521757
+SHA256 (Python-3.11.10.tgz) = kvL68kJoG/pAbVOlHhfULFNzr/4joTDNlpfhMu9XRwY=
+SIZE (Python-3.11.10.tgz) = 26532827
