Re: updating py-setuptools

[Kurt Mosiejczuk]

On Mon, Oct 07, 2024 at 02:23:11PM +0100, Stuart Henderson wrote:
> On 2024/10/05 17:22, Theo Buehler wrote:
> > > Updating to 69.5.1 seems simpler (I fixed persistent breakage in a
> > > couple of ports) and at least gets us beyond the current patches.

> > I saw no fallout in an amd64 bulk. I can't recall having seen this
> > spidermonkey issue ever.

> > ok tb

> Thanks.

> Kurt, does this look alright to you? Thanks.
> (https://marc.info/?l=openbsd-ports&m=172795282306681&w=2)

Yes. This looks great and is the best way to move forward.

ok kmos

--Kurt

Re: [update] python 3.11.10

[Kurt Mosiejczuk]

On Tue, Sep 10, 2024 at 04:32:30PM +0200, 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.

ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/python/3/Makefile,v
> diff -u -p -r1.6 Makefile
> --- Makefile  20 May 2024 19:16:00 -  1.6
> +++ Makefile  8 Sep 2024 07:16:30 -
> @@ -3,12 +3,10 @@
>  # 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
>  
>  CONFIGURE_ENV += ac_cv_working_openssl_hashlib=yes \
>   TCLTK_CFLAGS="-I${MODTCL_INCDIR} -I${MODTK_INCDIR} 
> -I${X11BASE}/include" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/python/3/distinfo,v
> diff -u -p -r1.1 distinfo
> --- distinfo  6 May 2024 12:19:33 -   1.1
> +++ distinfo  8 Sep 2024 07:16:57 -
> @@ -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

Re: libstdthreads on sparc64/base-gcc archs

[Kurt Mosiejczuk]

On Sun, Sep 01, 2024 at 09:57:40PM +0200, Jeremie Courreges-Anglas wrote:

> The diff below lets libstdthreads build on sparc64.  Making this build
> with base-gcc look more convoluted.  Should this code move to base one
> day, we'd probably build it with clang anyway.

> FWIW __has_extension has been introduced in gcc >= 14.

> ok?

Excellent. ok kmos

--Kurt

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libstdthreads/Makefile,v
> diff -u -p -r1.2 Makefile
> --- Makefile  21 Sep 2023 09:49:59 -  1.2
> +++ Makefile  1 Sep 2024 19:50:30 -
> @@ -13,6 +13,8 @@ SHARED_LIBS +=  stdthreads  
>  PERMIT_PACKAGE = Yes
>  
>  WANTLIB =pthread
> +COMPILER =   base-clang ports-gcc
> +COMPILER_LANGS = c
>  
>  FAKE_FLAGS = LIBDIR=${TRUEPREFIX}/lib \
>   MANDIR=${TRUEPREFIX}/man/man
> Index: patches/patch-threads_h
> ===
> RCS file: patches/patch-threads_h
> diff -N patches/patch-threads_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-threads_h   1 Sep 2024 19:50:30 -
> @@ -0,0 +1,16 @@
> +__has_extension support added in gcc >= 14
> +
> +Index: threads.h
> +--- threads.h.orig
>  threads.h
> +@@ -45,6 +45,10 @@
> +  * held.
> +  */
> + 
> ++#ifndef __has_extension
> ++#define __has_extension(_e) 0
> ++#endif
> ++
> + #if __has_extension(c_thread_safety_attributes)
> + #define __lock_annotate(x)  __attribute__((x))
> + #else
> 
> -- 
> jca

[maintainer update] graphics/glfw 3.3.9 -> 3.4

[Kurt Mosiejczuk]

Update to version 3.4

https://www.glfw.org/docs/latest/news.html

The biggest change is GLFW can support multiple backends, so one package can
support X11 and Wayland.

No deleted symbols that I can tell.

Tested with Blockgame/Minecraft and everything is happy.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/graphics/glfw/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile18 Feb 2024 22:03:58 -  1.12
+++ Makefile3 Aug 2024 18:35:18 -
@@ -1,10 +1,10 @@
 COMMENT =  open source, multi-platform library for creating windows
 
-V =3.3.9
+V =3.4
 DISTNAME = glfw-${V}
 CATEGORIES =   graphics x11
 
-SHARED_LIBS +=  glfw  1.1 # 3.1
+SHARED_LIBS +=  glfw  1.2 # 3.4
 
 HOMEPAGE = https://www.glfw.org/
 MAINTAINER =   Kurt Mosiejczuk 
@@ -23,6 +23,9 @@ CONFIGURE_ARGS =  -DBUILD_SHARED_LIBS=ON 
-DGLFW_BUILD_TESTS=OFF
 
 CFLAGS +=  -I${X11BASE}/include
+
+BUILD_DEPENDS =wayland/libinput-openbsd \
+   wayland/wayland
 
 NO_TEST =  Yes
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/glfw/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo18 Feb 2024 22:03:58 -  1.8
+++ distinfo3 Aug 2024 18:35:18 -
@@ -1,2 +1,2 @@
-SHA256 (glfw-3.3.9.zip) = VSYUEPjDqcxHzoMDRoqQ9AplPNjyX7losSRAYk+ybQg=
-SIZE (glfw-3.3.9.zip) = 1465859
+SHA256 (glfw-3.4.zip) = tewASycS/Qjohh3CcUKPBId1IAot9xnM9XUUO6dJo+k=
+SIZE (glfw-3.4.zip) = 1653725

Re: update: www/py-responses

[Kurt Mosiejczuk]

On Tue, Apr 16, 2024 at 10:54:23AM +0100, Stuart Henderson wrote:
> this one is rather old, ok to update? it's used by tests in a few ports,
> those tests still seem happy.

ok kmos, although probably worth dropping the commented
MODPY_PYTEST_ARGS.

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-responses/Makefile,v
> diff -u -p -r1.14 Makefile
> --- Makefile  22 Jan 2024 23:05:53 -  1.14
> +++ Makefile  16 Apr 2024 09:44:30 -
> @@ -1,10 +1,9 @@
>  COMMENT =utility library for mocking out the `requests` Python
>  
> -MODPY_EGG_VERSION =  0.17.0
> +MODPY_EGG_VERSION =  0.25.0
>  
>  DISTNAME =   responses-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   3
>  
>  CATEGORIES = www
>  
> @@ -19,17 +18,24 @@ MODULES = lang/python
>  
>  MODPY_PI =   Yes
>  MODPY_PYBUILD =  setuptools
> -MODPY_PYTEST_ARGS =  responses/test_responses.py
> +#MODPY_PYTEST_ARGS = responses/test_responses.py
>  
> -RUN_DEPENDS =devel/py-six${MODPY_FLAVOR} \
> - www/py-requests${MODPY_FLAVOR}
> +RUN_DEPENDS =textproc/py-yaml${MODPY_FLAVOR} \
> + www/py-requests${MODPY_FLAVOR} \
> + www/py-urllib3${MODPY_FLAVOR}
>  TEST_DEPENDS =   devel/flake8 \
>   devel/py-coverage${MODPY_FLAVOR} \
>   devel/py-mock${MODPY_FLAVOR} \
> + devel/py-mypy${MODPY_FLAVOR} \
> + devel/py-test-asyncio${MODPY_FLAVOR} \
>   devel/py-test-cov${MODPY_FLAVOR} \
> - devel/py-test-localserver${MODPY_FLAVOR}
> + devel/py-test-httpserver${MODPY_FLAVOR} \
> + textproc/py-tomli${MODPY_FLAVOR} \
> + textproc/py-tomli_w${MODPY_FLAVOR}
>  
>  FLAVORS =python3
>  FLAVOR = python3
> +
> +#"types-PyYAML""types-requests"
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-responses/distinfo,v
> diff -u -p -r1.7 distinfo
> --- distinfo  30 Jan 2022 14:16:48 -  1.7
> +++ distinfo  16 Apr 2024 09:44:30 -
> @@ -1,2 +1,2 @@
> -SHA256 (responses-0.17.0.tar.gz) = 
> 7GdeCA0Gv40fteWmih5c0N9GsJx4IwMV9lCvXkA2vsc=
> -SIZE (responses-0.17.0.tar.gz) = 45064
> +SHA256 (responses-0.25.0.tar.gz) = 
> Aa5qArTzTjm//OsPxnhrZ6JerpGcY2jQXqvI2VdsKmY=
> +SIZE (responses-0.25.0.tar.gz) = 77681
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/py-responses/pkg/PLIST,v
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 25 Nov 2022 21:11:41 -  1.7
> +++ pkg/PLIST 16 Apr 2024 09:44:30 -
> @@ -8,21 +8,36 @@ lib/python${MODPY_VERSION}/site-packages
>  
> lib/python${MODPY_VERSION}/site-packages/responses-${MODPY_EGG_VERSION}.dist-info/WHEEL
>  
> lib/python${MODPY_VERSION}/site-packages/responses-${MODPY_EGG_VERSION}.dist-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/responses/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/responses/__init__.pyi
>  
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}/
>  
> lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  
> lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}_recorder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}_recorder.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}matchers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  
> lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}matchers.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}registries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>  
> lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}registries.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}test_matchers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}test_matchers.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}test_responses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/responses/${MODPY_PYCACHE}test_responses.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/responses/_recorder.py
>  lib/python${MODPY_VERSION}/site-packages/responses/matchers.py
> -lib/python${MODPY_VERSION}/site-packages/responses/matchers.pyi
> +lib/python${MOD

Re: python 3.11 update

[Kurt Mosiejczuk]

On Sat, Feb 10, 2024 at 08:12:19PM -0500, Daniel Dickman wrote:
> Here's an update of Python 3.11 to include the latest 2 point updates.

> ok?

Looks good.

ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/python/3.11/Makefile,v
> diff -u -p -u -r1.13 Makefile
> --- Makefile  14 Nov 2023 12:33:56 -  1.13
> +++ Makefile  11 Feb 2024 01:05:40 -
> @@ -3,8 +3,7 @@
>  # requirement of the PSF license, if it constitutes a change to
>  # Python itself.
>  
> -FULL_VERSION =   3.11.6
> -REVISION =   0
> +FULL_VERSION =   3.11.8
>  SHARED_LIBS =python3.11 0.0
>  VERSION_SPEC =   >=3.11,<3.12
>  PORTROACH =  limit:^3\.11
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/python/3.11/distinfo,v
> diff -u -p -u -r1.7 distinfo
> --- distinfo  20 Oct 2023 09:18:48 -  1.7
> +++ distinfo  11 Feb 2024 01:05:40 -
> @@ -1,2 +1,2 @@
> -SHA256 (Python-3.11.6.tgz) = wEm/MX6HfL+fzow6+QJDZ3Ts71JJop0QmEyjo39/RzY=
> -SIZE (Python-3.11.6.tgz) = 26590303
> +SHA256 (Python-3.11.8.tgz) = 0wGaYTueh2HSYNnr471N9jl23jBGTlwBiVZuGuP2GIk=
> +SIZE (Python-3.11.8.tgz) = 26477136
> Index: patches/patch-configure_ac
> ===
> RCS file: /cvs/ports/lang/python/3.11/patches/patch-configure_ac,v
> diff -u -p -u -r1.3 patch-configure_ac
> --- patches/patch-configure_ac20 Oct 2023 09:18:48 -  1.3
> +++ patches/patch-configure_ac11 Feb 2024 01:05:40 -
> @@ -16,7 +16,7 @@ Index: configure.ac
>   
>   # The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
>   # certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
> -@@ -1096,6 +1096,7 @@ AC_MSG_CHECKING([for multiarch])
> +@@ -1104,6 +1104,7 @@ AC_MSG_CHECKING([for multiarch])
>   AS_CASE([$ac_sys_system],
> [Darwin*], [MULTIARCH=""],
> [FreeBSD*], [MULTIARCH=""],
> @@ -24,7 +24,7 @@ Index: configure.ac
> [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
>   )
>   AC_SUBST([MULTIARCH])
> -@@ -1835,13 +1836,13 @@ esac
> +@@ -1843,13 +1844,13 @@ esac
>   [AC_MSG_RESULT(no)])
>   if test "$Py_LTO" = 'true' ; then
> case $CC in
> @@ -40,7 +40,7 @@ Index: configure.ac
> AC_SUBST(LLVM_AR_FOUND)
> if test -n "${LLVM_AR}" -a -x "${LLVM_AR}"
> then
> -@@ -1956,7 +1957,7 @@ then
> +@@ -1964,7 +1965,7 @@ then
>   fi
>   LLVM_PROF_ERR=no
>   case $CC in
> @@ -49,7 +49,7 @@ Index: configure.ac
>   # Any changes made here should be reflected in the GCC+Darwin case below
>   PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
>   PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
> -@@ -3880,11 +3881,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
> +@@ -3888,11 +3889,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
>   dnl
>   found_tcltk=no
>   for _QUERY in \
> Index: pkg/PLIST-idle
> ===
> RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-idle,v
> diff -u -p -u -r1.1.1.1 PLIST-idle
> --- pkg/PLIST-idle31 Oct 2022 22:05:44 -  1.1.1.1
> +++ pkg/PLIST-idle11 Feb 2024 01:05:41 -
> @@ -23,8 +23,8 @@ lib/python3.11/idlelib/Icons/openfolder.
>  lib/python3.11/idlelib/Icons/plusnode.gif
>  lib/python3.11/idlelib/Icons/python.gif
>  lib/python3.11/idlelib/Icons/tk.gif
> -lib/python3.11/idlelib/NEWS.txt
>  lib/python3.11/idlelib/NEWS2x.txt
> +lib/python3.11/idlelib/News3.txt
>  lib/python3.11/idlelib/README.txt
>  lib/python3.11/idlelib/TODO.txt
>  lib/python3.11/idlelib/__init__.py
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-main,v
> diff -u -p -u -r1.7 PLIST-main
> --- pkg/PLIST-main20 Oct 2023 09:18:48 -  1.7
> +++ pkg/PLIST-main11 Feb 2024 01:05:44 -
> @@ -1870,7 +1870,7 @@ lib/python3.11/ensurepip/__pycache__/_un
>  lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.opt-2.pyc
>  lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.pyc
>  lib/python3.11/ensurepip/_bundled/
> -lib/python3.11/ensurepip/_bundled/pip-23.2.1-py3-none-any.whl
> +lib/python3.11/ensurepip/_bundled/pip-24.0-py3-none-any.whl
>  lib/python3.11/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
>  lib/python3.11/ensurepip/_uninstall.py
>  lib/python3.11/enum.py
> @@ -1926,6 +1926,7 @@ lib/python3.11/http/client.py
>  lib/python3.11/http/cookiejar.py
>  lib/python3.11/http/cookies.py
>  lib/python3.11/http/server.py
> +lib/python3.11/idlelib/News3.txt
>  lib/python3.11/imaplib.py
>  lib/python3.11/imghdr.py
>  lib/python3.11/imp.py
> @@ -2633,16 +2634,16 @@ lib/python3.11/site-packages/_distutils_
>  lib/python3.11/site-packages/_distutils_hack/override.py
>  lib/python3.11/site-packages/distutils-precedence.pth
>  lib/pytho

[maintainer update] graphics/glfw 3.3.9

[Kurt Mosiejczuk]

https://www.glfw.org/changelog.html

Various bugfixes.

Tested with Minecraft via Blockgames. No regressions that I've seen.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/graphics/glfw/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile26 Sep 2023 11:39:04 -  1.11
+++ Makefile6 Feb 2024 03:30:56 -
@@ -1,6 +1,6 @@
 COMMENT =  open source, multi-platform library for creating windows
 
-V =3.3.8
+V =3.3.9
 DISTNAME = glfw-${V}
 CATEGORIES =   graphics x11
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/glfw/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo23 Aug 2022 16:53:25 -  1.7
+++ distinfo6 Feb 2024 03:30:56 -
@@ -1,2 +1,2 @@
-SHA256 (glfw-3.3.8.zip) = TQJQg8xKPdH5Grm5uk9YBxk4I+Vlpbz0viAmadmRHqY=
-SIZE (glfw-3.3.8.zip) = 1495490
+SHA256 (glfw-3.3.9.zip) = VSYUEPjDqcxHzoMDRoqQ9AplPNjyX7losSRAYk+ybQg=
+SIZE (glfw-3.3.9.zip) = 1465859
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/graphics/glfw/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt8 May 2022 22:29:59 -   1.6
+++ patches/patch-CMakeLists_txt6 Feb 2024 03:30:56 -
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -168,13 +168,6 @@ endif()
+@@ -167,13 +167,6 @@ endif()
  # Find and add Unix math and time libraries
  #
  if (UNIX AND NOT APPLE)

Re: [maintainer update] Python 3.11.6

[Kurt Mosiejczuk]

On Sun, Oct 15, 2023 at 05:32:13AM -0400, Kurt Mosiejczuk wrote:
> https://docs.python.org/release/3.11.6/whatsnew/changelog.html#python-3-11-6

> No security fixes but a number of other fixes. The majority in the tests
> or on other OSes (not all though).

> Regenerated patches although they applied clean with only a little slop.

> ok?

daniel@ pointed out I hadn't updated the PLISTs. Here is the version with
the updated PLIST-tests (the others did not change)

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.11/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile1 Sep 2023 18:49:43 -   1.11
+++ Makefile16 Oct 2023 10:49:00 -
@@ -3,7 +3,7 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.11.5
+FULL_VERSION = 3.11.6
 SHARED_LIBS =  python3.11 0.0
 VERSION_SPEC = >=3.11,<3.12
 PORTROACH =limit:^3\.11
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.11/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo1 Sep 2023 18:49:43 -   1.6
+++ distinfo16 Oct 2023 10:49:00 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.5.tgz) = oSoKATowuEbHhsAQ8sGd02tymNiI98S9FYHZDOGLXlg=
-SIZE (Python-3.11.5.tgz) = 26571003
+SHA256 (Python-3.11.6.tgz) = wEm/MX6HfL+fzow6+QJDZ3Ts71JJop0QmEyjo39/RzY=
+SIZE (Python-3.11.6.tgz) = 26590303
Index: patches/patch-Makefile_pre_in
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-Makefile_pre_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_pre_in
--- patches/patch-Makefile_pre_in   31 Oct 2022 22:05:43 -  1.1.1.1
+++ patches/patch-Makefile_pre_in   16 Oct 2023 10:49:00 -
@@ -3,7 +3,7 @@ Make bsd make happy
 Index: Makefile.pre.in
 --- Makefile.pre.in.orig
 +++ Makefile.pre.in
-@@ -533,8 +533,6 @@ LIBMPDEC_OBJS= \
+@@ -534,8 +534,6 @@ LIBMPDEC_OBJS= \
Modules/_decimal/libmpdec/numbertheory.o \
Modules/_decimal/libmpdec/sixstep.o \
Modules/_decimal/libmpdec/transpose.o
Index: patches/patch-Modules__hashopenssl_c
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-Modules__hashopenssl_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Modules__hashopenssl_c
--- patches/patch-Modules__hashopenssl_c15 May 2023 10:45:59 -  
1.3
+++ patches/patch-Modules__hashopenssl_c16 Oct 2023 10:49:00 -
@@ -51,7 +51,7 @@ Index: Modules/_hashopenssl.c
  PY_HASH_ENTRY(NULL, NULL, NULL, 0),
  };
  
-@@ -873,11 +889,15 @@ py_evp_fromname(PyObject *module, const char *digestna
+@@ -874,11 +890,15 @@ py_evp_fromname(PyObject *module, const char *digestna
  goto exit;
  }
  
Index: patches/patch-Python_fileutils_c
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-Python_fileutils_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Python_fileutils_c
--- patches/patch-Python_fileutils_c12 Apr 2023 19:45:41 -  1.2
+++ patches/patch-Python_fileutils_c16 Oct 2023 10:49:00 -
@@ -1,7 +1,7 @@
 Index: Python/fileutils.c
 --- Python/fileutils.c.orig
 +++ Python/fileutils.c
-@@ -2599,9 +2599,9 @@ done:
+@@ -2614,9 +2614,9 @@ done:
   *non-opened fd in the middle.
   * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
   */
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_ac
--- patches/patch-configure_ac  20 Dec 2022 23:55:22 -  1.2
+++ patches/patch-configure_ac  16 Oct 2023 10:49:00 -
@@ -49,7 +49,7 @@ Index: configure.ac
  # Any changes made here should be reflected in the GCC+Darwin case below
  PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
  PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
-@@ -3876,11 +3877,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
+@@ -3880,11 +3881,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
  dnl
  found_tcltk=no
  for _QUERY in \
Index: pkg/PLIST-tests
===
RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-tests,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-tests
--- pkg/PLIST-tests 1 Sep 2023 18:49:43 -   1.5
+++ pkg/PLIST-tests 16 Oct 2023 10:49:01 -
@@ -502,30 +502,6 @@ lib/python3.11/test/__pycache__/_test_ve
 lib/python3.11/test/__pycache__/_typed_dict_helper.cpython-311.opt-1.pyc
 lib/python3.11/test/__pycache__/_typed_dict_helper.cpy

[maintainer update] Python 3.11.6

[Kurt Mosiejczuk]

https://docs.python.org/release/3.11.6/whatsnew/changelog.html#python-3-11-6

No security fixes but a number of other fixes. The majority in the tests
or on other OSes (not all though).

Regenerated patches although they applied clean with only a little slop.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.11/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile1 Sep 2023 18:49:43 -   1.11
+++ Makefile15 Oct 2023 09:28:44 -
@@ -3,7 +3,7 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.11.5
+FULL_VERSION = 3.11.6
 SHARED_LIBS =  python3.11 0.0
 VERSION_SPEC = >=3.11,<3.12
 PORTROACH =limit:^3\.11
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.11/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo1 Sep 2023 18:49:43 -   1.6
+++ distinfo15 Oct 2023 09:28:44 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.5.tgz) = oSoKATowuEbHhsAQ8sGd02tymNiI98S9FYHZDOGLXlg=
-SIZE (Python-3.11.5.tgz) = 26571003
+SHA256 (Python-3.11.6.tgz) = wEm/MX6HfL+fzow6+QJDZ3Ts71JJop0QmEyjo39/RzY=
+SIZE (Python-3.11.6.tgz) = 26590303
Index: patches/patch-Makefile_pre_in
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-Makefile_pre_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_pre_in
--- patches/patch-Makefile_pre_in   31 Oct 2022 22:05:43 -  1.1.1.1
+++ patches/patch-Makefile_pre_in   15 Oct 2023 09:28:44 -
@@ -3,7 +3,7 @@ Make bsd make happy
 Index: Makefile.pre.in
 --- Makefile.pre.in.orig
 +++ Makefile.pre.in
-@@ -533,8 +533,6 @@ LIBMPDEC_OBJS= \
+@@ -534,8 +534,6 @@ LIBMPDEC_OBJS= \
Modules/_decimal/libmpdec/numbertheory.o \
Modules/_decimal/libmpdec/sixstep.o \
Modules/_decimal/libmpdec/transpose.o
Index: patches/patch-Modules__hashopenssl_c
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-Modules__hashopenssl_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Modules__hashopenssl_c
--- patches/patch-Modules__hashopenssl_c15 May 2023 10:45:59 -  
1.3
+++ patches/patch-Modules__hashopenssl_c15 Oct 2023 09:28:44 -
@@ -51,7 +51,7 @@ Index: Modules/_hashopenssl.c
  PY_HASH_ENTRY(NULL, NULL, NULL, 0),
  };
  
-@@ -873,11 +889,15 @@ py_evp_fromname(PyObject *module, const char *digestna
+@@ -874,11 +890,15 @@ py_evp_fromname(PyObject *module, const char *digestna
  goto exit;
  }
  
Index: patches/patch-Python_fileutils_c
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-Python_fileutils_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Python_fileutils_c
--- patches/patch-Python_fileutils_c12 Apr 2023 19:45:41 -  1.2
+++ patches/patch-Python_fileutils_c15 Oct 2023 09:28:44 -
@@ -1,7 +1,7 @@
 Index: Python/fileutils.c
 --- Python/fileutils.c.orig
 +++ Python/fileutils.c
-@@ -2599,9 +2599,9 @@ done:
+@@ -2614,9 +2614,9 @@ done:
   *non-opened fd in the middle.
   * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
   */
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_ac
--- patches/patch-configure_ac  20 Dec 2022 23:55:22 -  1.2
+++ patches/patch-configure_ac  15 Oct 2023 09:28:44 -
@@ -49,7 +49,7 @@ Index: configure.ac
  # Any changes made here should be reflected in the GCC+Darwin case below
  PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
  PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
-@@ -3876,11 +3877,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
+@@ -3880,11 +3881,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
  dnl
  found_tcltk=no
  for _QUERY in \

Re: [maintainer update] Python 3.9.16 -> 3.9.17

[Kurt Mosiejczuk]

On Wed, Jun 21, 2023 at 07:28:47PM +0200, Theo Buehler wrote:
> On Wed, Jun 14, 2023 at 10:37:27PM -0400, Kurt Mosiejczuk wrote:
> > https://docs.python.org/release/3.9.17/whatsnew/changelog.html#changelog
> > 
> > Security fixes for Python 3.9.x

> > I do plan on removing Python 3.9 soon, but in the meantime, there are
> > these security fixes.

> Does not package on two machines here. When I regen plist I get this
> (these were added in this update). Any idea what these are about?

I'm unsure what they are. I've seen similar in the past. While I am
positive it packaged before, I'm seeing similar now when I build from 
scratch.

--Kurt

> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v
> retrieving revision 1.23
> diff -u -p -r1.23 PLIST-main
> --- pkg/PLIST-main19 Jun 2023 19:47:26 -  1.23
> +++ pkg/PLIST-main21 Jun 2023 17:27:14 -
> @@ -910,10 +910,6 @@ lib/python3.9/config-3.9/
>  lib/python3.9/config-3.9/Makefile
>  lib/python3.9/config-3.9/Setup
>  lib/python3.9/config-3.9/Setup.local
> -lib/python3.9/config-3.9/__pycache__/
> -lib/python3.9/config-3.9/__pycache__/python-config.cpython-39.opt-1.pyc
> -lib/python3.9/config-3.9/__pycache__/python-config.cpython-39.opt-2.pyc
> -lib/python3.9/config-3.9/__pycache__/python-config.cpython-39.pyc
>  lib/python3.9/config-3.9/config.c
>  lib/python3.9/config-3.9/config.c.in
>  lib/python3.9/config-3.9/install-sh
> 

Re: [maintainer update] Python 3.10.11 -> 3.10.12

[Kurt Mosiejczuk]

On Thu, Jun 15, 2023 at 08:32:05AM +0100, Stuart Henderson wrote:
> On 2023/06/14 22:28, Kurt Mosiejczuk wrote:
> > https://www.python.org/downloads/release/python-31012/

> > Several security fixes

> > ok?

> no diff for 3.10.

> While you're there anyway, can you add USE_NOBTCFI=Yes for ../Makefile.inc
> please? (or I could do it separately, but it saves another bump).

> similar to USE_WXNEEDED, Python itself doesn't need it, but it could
> load a module which needs it (e.g. linked to a library with native asm
> code which doesn't have the correct instructions to mark valid "branch
> target landing points".

Here's the diff.

I can add USE_NOBTCFI=YEs too.

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile24 Apr 2023 11:15:43 -  1.34
+++ Makefile12 Jun 2023 15:27:14 -
@@ -3,11 +3,10 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.11
+FULL_VERSION = 3.10.12
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
-REVISION-main =0
 
 # This is the MODPY_DEFAULT_VERSION_3 version of Python:
 # - override "@comment" setting so that bin/python3 etc are installed
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo12 Apr 2023 19:45:09 -  1.10
+++ distinfo12 Jun 2023 15:27:14 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.11.tgz) = 89sxtmjvqYNQi9Z7VxKJiqQkeJmjRvLrdFc0aZzNOFk=
-SIZE (Python-3.10.11.tgz) = 26085141
+SHA256 (Python-3.10.12.tgz) = pDzTg/OZmm9KfbIGKy/JWU/vpz4XWzrtr6KVpRp7tlw=
+SIZE (Python-3.10.12.tgz) = 26103005

[maintainer update] Python 3.9.16 -> 3.9.17

[Kurt Mosiejczuk]

https://docs.python.org/release/3.9.17/whatsnew/changelog.html#changelog

Security fixes for Python 3.9.x

I do plan on removing Python 3.9 soon, but in the meantime, there are
these security fixes.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile25 Dec 2022 13:42:05 -  1.40
+++ Makefile12 Jun 2023 16:08:10 -
@@ -3,12 +3,9 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.9.16
+FULL_VERSION = 3.9.17
 SHARED_LIBS =  python3.9 0.0
 VERSION_SPEC = >=3.9,<3.10
 PORTROACH =limit:^3\.9
-
-REVISION = 0
-REVISION-main =1
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo16 Dec 2022 17:02:25 -  1.13
+++ distinfo12 Jun 2023 16:08:10 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.16.tgz) = GtU56dvStC33FLaXJuBpO8a50tLI6RwuQyBAJmBRQMU=
-SIZE (Python-3.9.16.tgz) = 26333525
+SHA256 (Python-3.9.17.tgz) = jq1Y9mn34Z13fDVWti+uKagdfwanEi/5vFf33YLX4BQ=
+SIZE (Python-3.9.17.tgz) = 26291543
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v
retrieving revision 1.22
diff -u -p -r1.22 PLIST-main
--- pkg/PLIST-main  13 Nov 2022 15:26:02 -  1.22
+++ pkg/PLIST-main  12 Jun 2023 16:08:11 -
@@ -910,6 +910,10 @@ lib/python3.9/config-3.9/
 lib/python3.9/config-3.9/Makefile
 lib/python3.9/config-3.9/Setup
 lib/python3.9/config-3.9/Setup.local
+lib/python3.9/config-3.9/__pycache__/
+lib/python3.9/config-3.9/__pycache__/python-config.cpython-39.opt-1.pyc
+lib/python3.9/config-3.9/__pycache__/python-config.cpython-39.opt-2.pyc
+lib/python3.9/config-3.9/__pycache__/python-config.cpython-39.pyc
 lib/python3.9/config-3.9/config.c
 lib/python3.9/config-3.9/config.c.in
 lib/python3.9/config-3.9/install-sh
@@ -1862,7 +1866,7 @@ lib/python3.9/ensurepip/_bundled/__pycac
 lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-1.pyc
 lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-2.pyc
 lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.pyc
-lib/python3.9/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/pip-23.0.1-py3-none-any.whl
 lib/python3.9/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
 lib/python3.9/ensurepip/_uninstall.py
 lib/python3.9/enum.py
@@ -2539,20 +2543,22 @@ lib/python3.9/site-packages/_distutils_h
 lib/python3.9/site-packages/_distutils_hack/override.py
 lib/python3.9/site-packages/distutils-precedence.pth
 lib/python3.9/site-packages/pip/
-lib/python3.9/site-packages/pip-22.0.4.dist-info/
-lib/python3.9/site-packages/pip-22.0.4.dist-info/INSTALLER
-lib/python3.9/site-packages/pip-22.0.4.dist-info/LICENSE.txt
-lib/python3.9/site-packages/pip-22.0.4.dist-info/METADATA
-lib/python3.9/site-packages/pip-22.0.4.dist-info/RECORD
-lib/python3.9/site-packages/pip-22.0.4.dist-info/REQUESTED
-lib/python3.9/site-packages/pip-22.0.4.dist-info/WHEEL
-lib/python3.9/site-packages/pip-22.0.4.dist-info/entry_points.txt
-lib/python3.9/site-packages/pip-22.0.4.dist-info/top_level.txt
+lib/python3.9/site-packages/pip-23.0.1.dist-info/
+lib/python3.9/site-packages/pip-23.0.1.dist-info/INSTALLER
+lib/python3.9/site-packages/pip-23.0.1.dist-info/LICENSE.txt
+lib/python3.9/site-packages/pip-23.0.1.dist-info/METADATA
+lib/python3.9/site-packages/pip-23.0.1.dist-info/RECORD
+lib/python3.9/site-packages/pip-23.0.1.dist-info/REQUESTED
+lib/python3.9/site-packages/pip-23.0.1.dist-info/WHEEL
+lib/python3.9/site-packages/pip-23.0.1.dist-info/entry_points.txt
+lib/python3.9/site-packages/pip-23.0.1.dist-info/top_level.txt
 lib/python3.9/site-packages/pip/__init__.py
 lib/python3.9/site-packages/pip/__main__.py
+lib/python3.9/site-packages/pip/__pip-runner__.py
 lib/python3.9/site-packages/pip/__pycache__/
 lib/python3.9/site-packages/pip/__pycache__/__init__.cpython-39.pyc
 lib/python3.9/site-packages/pip/__pycache__/__main__.cpython-39.pyc
+lib/python3.9/site-packages/pip/__pycache__/__pip-runner__.cpython-39.pyc
 lib/python3.9/site-packages/pip/_internal/
 lib/python3.9/site-packages/pip/_internal/__init__.py
 lib/python3.9/site-packages/pip/_internal/__pycache__/
@@ -2607,6 +2613,7 @@ lib/python3.9/site-packages/pip/_interna
 
lib/python3.9/site-packages/pip/_internal/commands/__pycache__/hash.cpython-39.pyc
 
lib/python3.9/site-packages/pip/_internal/commands/__pycache__/help.cpython-39.pyc
 
lib/python3.9/site-packages/pip/_internal/commands/__pycache__/index.cpython-39.pyc
+lib/python3.9/site-packages/pip/_internal/commands/__pycache__/inspect.cpython-39.pyc
 
lib/python3.9/site-packages/

[maintainer update] Python 3.11.3 -> 3.11.4

[Kurt Mosiejczuk]

https://docs.python.org/release/3.11.4/whatsnew/changelog.html#python-3-11-4

Some similar security fixes along with a number of non-security bug fixes.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.11/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile24 Apr 2023 11:18:57 -  1.9
+++ Makefile15 Jun 2023 02:21:11 -
@@ -3,11 +3,10 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.11.3
+FULL_VERSION = 3.11.4
 SHARED_LIBS =  python3.11 0.0
 VERSION_SPEC = >=3.11,<3.12
 PORTROACH =limit:^3\.11
-REVISION-main =0
 
 CONFIGURE_ENV +=   ac_cv_working_openssl_hashlib=yes \
TCLTK_CFLAGS="-I${MODTCL_INCDIR} -I${MODTK_INCDIR} 
-I${X11BASE}/include" \
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.11/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo12 Apr 2023 19:45:41 -  1.4
+++ distinfo15 Jun 2023 02:21:11 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.3.tgz) = Gnnz3zImXZ5mJfGgsxwo6xWU35EUA9EfMyDuHaGz4Eg=
-SIZE (Python-3.11.3.tgz) = 26455738
+SHA256 (Python-3.11.4.tgz) = hcN6Jl5cndn3WzX5VOMfv8EDgxYkFyheMK0lzAc6DWM=
+SIZE (Python-3.11.4.tgz) = 26526163
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main  27 Feb 2023 15:09:46 -  1.4
+++ pkg/PLIST-main  15 Jun 2023 02:21:12 -
@@ -1879,7 +1879,7 @@ lib/python3.11/ensurepip/__pycache__/_un
 lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.opt-2.pyc
 lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.pyc
 lib/python3.11/ensurepip/_bundled/
-lib/python3.11/ensurepip/_bundled/pip-22.3.1-py3-none-any.whl
+lib/python3.11/ensurepip/_bundled/pip-23.1.2-py3-none-any.whl
 lib/python3.11/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
 lib/python3.11/ensurepip/_uninstall.py
 lib/python3.11/enum.py
@@ -2642,15 +2642,16 @@ lib/python3.11/site-packages/_distutils_
 lib/python3.11/site-packages/_distutils_hack/override.py
 lib/python3.11/site-packages/distutils-precedence.pth
 lib/python3.11/site-packages/pip/
-lib/python3.11/site-packages/pip-22.3.1.dist-info/
-lib/python3.11/site-packages/pip-22.3.1.dist-info/INSTALLER
-lib/python3.11/site-packages/pip-22.3.1.dist-info/LICENSE.txt
-lib/python3.11/site-packages/pip-22.3.1.dist-info/METADATA
-lib/python3.11/site-packages/pip-22.3.1.dist-info/RECORD
-lib/python3.11/site-packages/pip-22.3.1.dist-info/REQUESTED
-lib/python3.11/site-packages/pip-22.3.1.dist-info/WHEEL
-lib/python3.11/site-packages/pip-22.3.1.dist-info/entry_points.txt
-lib/python3.11/site-packages/pip-22.3.1.dist-info/top_level.txt
+lib/python3.11/site-packages/pip-23.1.2.dist-info/
+lib/python3.11/site-packages/pip-23.1.2.dist-info/AUTHORS.txt
+lib/python3.11/site-packages/pip-23.1.2.dist-info/INSTALLER
+lib/python3.11/site-packages/pip-23.1.2.dist-info/LICENSE.txt
+lib/python3.11/site-packages/pip-23.1.2.dist-info/METADATA
+lib/python3.11/site-packages/pip-23.1.2.dist-info/RECORD
+lib/python3.11/site-packages/pip-23.1.2.dist-info/REQUESTED
+lib/python3.11/site-packages/pip-23.1.2.dist-info/WHEEL
+lib/python3.11/site-packages/pip-23.1.2.dist-info/entry_points.txt
+lib/python3.11/site-packages/pip-23.1.2.dist-info/top_level.txt
 lib/python3.11/site-packages/pip/__init__.py
 lib/python3.11/site-packages/pip/__main__.py
 lib/python3.11/site-packages/pip/__pip-runner__.py
@@ -2867,10 +2868,8 @@ lib/python3.11/site-packages/pip/_intern
 lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/
 
lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/__init__.cpython-311.pyc
 
lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/editable_legacy.cpython-311.pyc
-lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/legacy.cpython-311.pyc
 
lib/python3.11/site-packages/pip/_internal/operations/install/__pycache__/wheel.cpython-311.pyc
 
lib/python3.11/site-packages/pip/_internal/operations/install/editable_legacy.py
-lib/python3.11/site-packages/pip/_internal/operations/install/legacy.py
 lib/python3.11/site-packages/pip/_internal/operations/install/wheel.py
 lib/python3.11/site-packages/pip/_internal/operations/prepare.py
 lib/python3.11/site-packages/pip/_internal/pyproject.py
@@ -2925,6 +2924,7 @@ lib/python3.11/site-packages/pip/_intern
 lib/python3.11/site-packages/pip/_internal/utils/__init__.py
 lib/python3.11/site-packages/pip/_internal/utils/__pycache__/
 
lib/python3.11/site-packages/pip/_internal/utils/__pycache__/__init__.cpython-311.pyc
+lib/python3.11/site-packages/pip/_internal/utils/__pycache__/_jaraco_text.cpython-311.pyc
 

[maintainer update] Python 3.10.11 -> 3.10.12

[Kurt Mosiejczuk]

https://www.python.org/downloads/release/python-31012/

Several security fixes

ok?

--Kurt

[maintainer update] games/lwjgl3 3.2.4alpha2 -> 3.3.1.0

[Kurt Mosiejczuk]

Here's an overdue update of lwjgl3 to a newer release.  This release will
allow playing Minecraft versions > 1.19.2 along with the older lwjgl3
playable releases.

If I don't hear anything in a day or two I'll go ahead and commit this.

lwjgl3 moved from dyncall to FFI for this release. They also dropped support
for bullet.

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/games/lwjgl3/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile11 Mar 2022 19:04:38 -  1.9
+++ Makefile12 Jun 2023 00:32:53 -
@@ -2,10 +2,10 @@ COMMENT = lightweight game library for j
 
 BROKEN-i386 =  ld: error: undefined symbol: __stack_smash_handler
 
-V =3.2.4alpha2
+V =3.3.1.0
 DISTNAME = lwjgl3-${V}
 
-KOTLIN_V = 1.3.61
+KOTLIN_V = 1.6.20-M1
 
 .if ${MACHINE_ARCH} == "i386"
 M_ARCH =   ""
@@ -32,11 +32,11 @@ MAINTAINER =Kurt Mosiejczuk 

Re: [maintainer update] Python 3.11.2 -> 3.11.3

[Kurt Mosiejczuk]

On Wed, Apr 12, 2023 at 10:31:14AM -0400, Kurt Mosiejczuk wrote:
> https://docs.python.org/release/3.11.3/whatsnew/changelog.html#python-3-11-3

> The security fixes don't seem to apply to us, but there are a number of
> other fixes.

> REVISION put at 0 since I plan to commit it to 7.3-stable also.

> ok?

> --Kurt

Now with the _correct_ diff for 3.11

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.11/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile27 Feb 2023 15:09:46 -  1.7
+++ Makefile10 Apr 2023 19:36:50 -
@@ -3,10 +3,12 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.11.2
+FULL_VERSION = 3.11.3
 SHARED_LIBS =  python3.11 0.0
 VERSION_SPEC = >=3.11,<3.12
 PORTROACH =limit:^3\.11
+
+REVISION = 0
 
 CONFIGURE_ENV +=   ac_cv_working_openssl_hashlib=yes \
TCLTK_CFLAGS="-I${MODTCL_INCDIR} -I${MODTK_INCDIR} 
-I${X11BASE}/include" \
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.11/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo27 Feb 2023 15:09:46 -  1.3
+++ distinfo10 Apr 2023 19:36:50 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.2.tgz) = JBHHS9pbvPzdr0Ux9m0a3HPyR/UprumBsClROu/b+Ek=
-SIZE (Python-3.11.2.tgz) = 26437858
+SHA256 (Python-3.11.3.tgz) = Gnnz3zImXZ5mJfGgsxwo6xWU35EUA9EfMyDuHaGz4Eg=
+SIZE (Python-3.11.3.tgz) = 26455738
Index: patches/patch-Python_fileutils_c
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-Python_fileutils_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Python_fileutils_c
--- patches/patch-Python_fileutils_c31 Oct 2022 22:05:43 -  1.1.1.1
+++ patches/patch-Python_fileutils_c10 Apr 2023 19:36:50 -
@@ -1,7 +1,7 @@
 Index: Python/fileutils.c
 --- Python/fileutils.c.orig
 +++ Python/fileutils.c
-@@ -2595,9 +2595,9 @@ done:
+@@ -2599,9 +2599,9 @@ done:
   *non-opened fd in the middle.
   * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop.
   */

[maintainer update] Python 3.10.10 -> 3.10.11

[Kurt Mosiejczuk]

https://docs.python.org/release/3.10.11/whatsnew/changelog.html#python-3-10-11-final

The security fixes don't seem to apply to us, but there are a number of
other fixes.

REVISION put at 0 since I plan to commit it to 7.3-stable also.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile18 Mar 2023 08:05:05 -  1.32
+++ Makefile10 Apr 2023 19:11:43 -
@@ -3,13 +3,12 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.10
+FULL_VERSION = 3.10.11
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
 
-REVISION-main =0
-REVISION-idle =0
+REVISION = 0
 
 # This is the MODPY_DEFAULT_VERSION_3 version of Python:
 # - override "@comment" setting so that bin/python3 etc are installed
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo27 Feb 2023 15:09:01 -  1.9
+++ distinfo10 Apr 2023 19:11:43 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.10.tgz) = +6ZFWd3iHr3JU+RWXnMVc7thFZ3o5NTO3ucPsRlvYQ0=
-SIZE (Python-3.10.10.tgz) = 26071329
+SHA256 (Python-3.10.11.tgz) = 89sxtmjvqYNQi9Z7VxKJiqQkeJmjRvLrdFc0aZzNOFk=
+SIZE (Python-3.10.11.tgz) = 26085141
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.10/pkg/PLIST-main,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST-main
--- pkg/PLIST-main  18 Mar 2023 08:05:05 -  1.16
+++ pkg/PLIST-main  10 Apr 2023 19:11:44 -
@@ -1848,7 +1848,7 @@ lib/python3.10/ensurepip/_bundled/__pyca
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-1.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-2.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.pyc
-lib/python3.10/ensurepip/_bundled/pip-22.3.1-py3-none-any.whl
+lib/python3.10/ensurepip/_bundled/pip-23.0.1-py3-none-any.whl
 lib/python3.10/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
 lib/python3.10/ensurepip/_uninstall.py
 lib/python3.10/enum.py

[maintainer update] Python 3.11.2 -> 3.11.3

[Kurt Mosiejczuk]

https://docs.python.org/release/3.11.3/whatsnew/changelog.html#python-3-11-3

The security fixes don't seem to apply to us, but there are a number of
other fixes.

REVISION put at 0 since I plan to commit it to 7.3-stable also.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile18 Mar 2023 08:05:05 -  1.32
+++ Makefile10 Apr 2023 19:11:43 -
@@ -3,13 +3,12 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.10
+FULL_VERSION = 3.10.11
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
 
-REVISION-main =0
-REVISION-idle =0
+REVISION = 0
 
 # This is the MODPY_DEFAULT_VERSION_3 version of Python:
 # - override "@comment" setting so that bin/python3 etc are installed
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo27 Feb 2023 15:09:01 -  1.9
+++ distinfo10 Apr 2023 19:11:43 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.10.tgz) = +6ZFWd3iHr3JU+RWXnMVc7thFZ3o5NTO3ucPsRlvYQ0=
-SIZE (Python-3.10.10.tgz) = 26071329
+SHA256 (Python-3.10.11.tgz) = 89sxtmjvqYNQi9Z7VxKJiqQkeJmjRvLrdFc0aZzNOFk=
+SIZE (Python-3.10.11.tgz) = 26085141
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.10/pkg/PLIST-main,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST-main
--- pkg/PLIST-main  18 Mar 2023 08:05:05 -  1.16
+++ pkg/PLIST-main  10 Apr 2023 19:11:44 -
@@ -1848,7 +1848,7 @@ lib/python3.10/ensurepip/_bundled/__pyca
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-1.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-2.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.pyc
-lib/python3.10/ensurepip/_bundled/pip-22.3.1-py3-none-any.whl
+lib/python3.10/ensurepip/_bundled/pip-23.0.1-py3-none-any.whl
 lib/python3.10/ensurepip/_bundled/setuptools-65.5.0-py3-none-any.whl
 lib/python3.10/ensurepip/_uninstall.py
 lib/python3.10/enum.py

Re: sparc64 bulk build report

[Kurt Mosiejczuk]

On Fri, Mar 17, 2023 at 02:23:02PM +0100, Theo Buehler wrote:

> > > http://build-failures.rhaalovely.net/sparc64/2023-03-13/lang/guile2.log

> > no idea why it hanged :/

> I think these guild compile steps just take forever to complete, so it
> hits the time limit. I started a build 90 minutes ago on a machine that
> is about as fast as the machines in kmos's cluster and it is now ten
> minutes into building psyntax-pp.scm

The timeout is 8 hours. I know the steps take a long time, but yikes.

--Kurt

Re: [NEW] py3-gssapi-1.8.2

[Kurt Mosiejczuk]

On Tue, Feb 21, 2023 at 03:34:02PM +0100, Antoine Jacoutot wrote:
> Hi.

> Here's a port for py3-gssapi-1.8.2.

> Python-GSSAPI provides both low-level and high level wrappers around the 
> GSSAPI
> C libraries.  While it focuses on the Kerberos mechanism, it should also be
> useable with other GSSAPI mechanisms.

> OK to import?

ok kmos to import

--Kurt

[maintainer update] Python 3.11.2

[Kurt Mosiejczuk]

https://docs.python.org/release/3.11.2/whatsnew/changelog.html#python-3-11-2-final

A bunch of fixes here, again none labelled as security

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.11/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile25 Dec 2022 13:42:05 -  1.6
+++ Makefile15 Feb 2023 19:06:07 -
@@ -3,12 +3,10 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.11.1
+FULL_VERSION = 3.11.2
 SHARED_LIBS =  python3.11 0.0
 VERSION_SPEC = >=3.11,<3.12
 PORTROACH =limit:^3\.11
-
-REVISION-main =0
 
 CONFIGURE_ENV +=   ac_cv_working_openssl_hashlib=yes \
TCLTK_CFLAGS="-I${MODTCL_INCDIR} -I${MODTK_INCDIR} 
-I${X11BASE}/include" \
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.11/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo20 Dec 2022 23:55:22 -  1.2
+++ distinfo15 Feb 2023 19:06:07 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.1.tgz) = uu1RjiazN9TYEFZ5yvaMXDJjDXAmFPwXTpjLlcRr36Q=
-SIZE (Python-3.11.1.tgz) = 26394378
+SHA256 (Python-3.11.2.tgz) = JBHHS9pbvPzdr0Ux9m0a3HPyR/UprumBsClROu/b+Ek=
+SIZE (Python-3.11.2.tgz) = 26437858
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main  20 Dec 2022 23:55:22 -  1.3
+++ pkg/PLIST-main  15 Feb 2023 19:06:09 -
@@ -2113,6 +2113,7 @@ lib/python3.11/lib-dynload/
 @so lib/python3.11/lib-dynload/_struct.cpython-311.so
 @so lib/python3.11/lib-dynload/_testbuffer.cpython-311.so
 @so lib/python3.11/lib-dynload/_testcapi.cpython-311.so
+@so lib/python3.11/lib-dynload/_testclinic.cpython-311.so
 @so lib/python3.11/lib-dynload/_testimportmultiple.cpython-311.so
 @so lib/python3.11/lib-dynload/_testinternalcapi.cpython-311.so
 @so lib/python3.11/lib-dynload/_testmultiphase.cpython-311.so

[maintainer update] Python 3.10.10

[Kurt Mosiejczuk]

https://docs.python.org/release/3.10.10/whatsnew/changelog.html#python-3-10-10-final

A number of fixes. None labelled as security.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile16 Dec 2022 17:03:28 -  1.30
+++ Makefile15 Feb 2023 17:59:32 -
@@ -3,12 +3,10 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.9
+FULL_VERSION = 3.10.10
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
-
-REVISION = 0
 
 # This is the MODPY_DEFAULT_VERSION_3 version of Python:
 # - override "@comment" setting so that bin/python3 etc are installed
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo16 Dec 2022 17:03:28 -  1.8
+++ distinfo15 Feb 2023 17:59:32 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.9.tgz) = TM1+RsiJj0x4YpEKFwOqDmNSWROlGauy9V4mIgqRTYg=
-SIZE (Python-3.10.9.tgz) = 26044345
+SHA256 (Python-3.10.10.tgz) = +6ZFWd3iHr3JU+RWXnMVc7thFZ3o5NTO3ucPsRlvYQ0=
+SIZE (Python-3.10.10.tgz) = 26071329
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/lang/python/3.10/patches/patch-setup_py,v
retrieving revision 1.7
diff -u -p -r1.7 patch-setup_py
--- patches/patch-setup_py  29 Aug 2022 12:23:42 -  1.7
+++ patches/patch-setup_py  15 Feb 2023 17:59:32 -
@@ -1,7 +1,7 @@
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -1872,7 +1872,7 @@ class PyBuildExt(build_ext):
+@@ -1875,7 +1875,7 @@ class PyBuildExt(build_ext):
  uuid_h = sysconfig.get_config_var("HAVE_UUID_H")
  uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H")
  if uuid_h or uuid_uuid_h:
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.10/pkg/PLIST-main,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST-main
--- pkg/PLIST-main  16 Dec 2022 17:03:28 -  1.14
+++ pkg/PLIST-main  15 Feb 2023 17:59:32 -
@@ -2056,6 +2056,7 @@ lib/python3.10/lib-dynload/
 @so lib/python3.10/lib-dynload/_struct.cpython-310.so
 @so lib/python3.10/lib-dynload/_testbuffer.cpython-310.so
 @so lib/python3.10/lib-dynload/_testcapi.cpython-310.so
+@so lib/python3.10/lib-dynload/_testclinic.cpython-310.so
 @so lib/python3.10/lib-dynload/_testimportmultiple.cpython-310.so
 @so lib/python3.10/lib-dynload/_testinternalcapi.cpython-310.so
 @so lib/python3.10/lib-dynload/_testmultiphase.cpython-310.so

[maintainer update] converters/ruby-oj 3.13.23 -> 3.14.1

[Kurt Mosiejczuk]

https://github.com/ohler55/oj/blob/master/CHANGELOG.md#3141---2023-02-01

3.14.1 - 2023-02-01
Fixed issue with uninitialized handler for Oj::Parser::Saj.
Fixed hang on unterminated string with a \0 byte in parse.c.

3.14.0 - 2023-01-30
Tracing is now a compile time option giving a 15 to 20% performance boost.
Some cleanup in teh fast parser.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/converters/ruby-oj/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile19 Nov 2022 00:57:59 -  1.3
+++ Makefile6 Feb 2023 20:58:47 -
@@ -1,7 +1,7 @@
 
 COMMENT =  fast JSON parser and serializer
 
-DISTNAME = oj-3.13.23
+DISTNAME = oj-3.14.1
 
 CATEGORIES =   converters
 
Index: distinfo
===
RCS file: /cvs/ports/converters/ruby-oj/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo19 Nov 2022 00:57:59 -  1.3
+++ distinfo6 Feb 2023 20:58:47 -
@@ -1,2 +1,2 @@
-SHA256 (oj-3.13.23.gem) = IG39xAIK2ZdHBQN/Jpz7ohHWG3ZipYxxfM53GCnM71E=
-SIZE (oj-3.13.23.gem) = 268288
+SHA256 (oj-3.14.1.gem) = xy6wQ/7cH+QVeB0JcYFPdgxumqmtG8M1zwYe8q1581k=
+SIZE (oj-3.14.1.gem) = 268288
Index: pkg/PLIST
===
RCS file: /cvs/ports/converters/ruby-oj/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   18 Aug 2022 00:24:13 -  1.1.1.1
+++ pkg/PLIST   6 Feb 2023 20:58:47 -
@@ -23,6 +23,7 @@ ${GEM_LIB}/gems/${DISTNAME}/pages/Advanc
 ${GEM_LIB}/gems/${DISTNAME}/pages/Compatibility.md
 ${GEM_LIB}/gems/${DISTNAME}/pages/Custom.md
 ${GEM_LIB}/gems/${DISTNAME}/pages/Encoding.md
+${GEM_LIB}/gems/${DISTNAME}/pages/InstallOptions.md
 ${GEM_LIB}/gems/${DISTNAME}/pages/JsonGem.md
 ${GEM_LIB}/gems/${DISTNAME}/pages/Modes.md
 ${GEM_LIB}/gems/${DISTNAME}/pages/Options.md

Fix hiawatha build on sparc64 (was Re: Mark www/hiawatha ONLY_FOR_ARCHS = LLD_ARCHS)

[Kurt Mosiejczuk]

On Mon, Jan 30, 2023 at 03:09:49PM -0500, Kurt Mosiejczuk wrote:
> hiawatha is specifying DWARF-4 debug format and ld.bfd only understands up
> to version 2. So mark it ONLY_FOR_ARCHS = ${LLD_ARCHS}

Brad Smith pointed out he has submitted a change upstream to not hardcode
the debug format. So I've used that here instead for use prior to the
next release.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/www/hiawatha/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile27 Jan 2023 11:38:55 -  1.70
+++ Makefile31 Jan 2023 04:06:36 -
@@ -1,6 +1,7 @@
 COMMENT =  secure webserver
 DISTNAME = hiawatha-11.3
 CATEGORIES =   www net
+REVISION = 0
 
 HOMEPAGE = https://www.hiawatha-webserver.org/
 
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/www/hiawatha/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt27 Jan 2023 11:38:55 -  1.4
+++ patches/patch-CMakeLists_txt31 Jan 2023 04:06:36 -
@@ -1,9 +1,20 @@
 Don't install Let's Encrypt script, which relies on PHP. We have acme-client(1)
 in base, and several alternatives in ports.
 
+Remove hardcoded dwarf-4 debug format that ld.bfd doesn't handle
+
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
+ project(Hiawatha VERSION 11.3 LANGUAGES C)
+ 
+ # Compiler
+-set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS} -gdwarf-4")
++set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS} -g")
+ set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+ 
+ # Options
 @@ -171,15 +171,15 @@ endforeach()
  
  install(FILES extra/index.html DESTINATION ${WEBROOT_DIR})

Mark www/hiawatha ONLY_FOR_ARCHS = LLD_ARCHS

[Kurt Mosiejczuk]

hiawatha is specifying DWARF-4 debug format and ld.bfd only understands up
to version 2. So mark it ONLY_FOR_ARCHS = ${LLD_ARCHS}

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/www/hiawatha/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile27 Jan 2023 11:38:55 -  1.70
+++ Makefile30 Jan 2023 20:07:47 -
@@ -2,6 +2,8 @@ COMMENT =   secure webserver
 DISTNAME = hiawatha-11.3
 CATEGORIES =   www net
 
+ONLY_FOR_ARCHS =   ${LLD_ARCHS}
+
 HOMEPAGE = https://www.hiawatha-webserver.org/
 
 # GPLv2 only

[maintainer update] sysutils/ruby-servengine 2.3.0 -> 2.3.1

[Kurt Mosiejczuk]

https://github.com/treasure-data/serverengine/blob/v2.3.1/Changelog

2022-12-22 version 2.3.1

* Don't treat as error when worker shuts down with exit status 0

Minor tweaks in code. No PLIST changes.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/sysutils/ruby-serverengine/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile20 Sep 2022 16:18:53 -  1.1.1.1
+++ Makefile29 Dec 2022 21:58:51 -
@@ -1,7 +1,7 @@
 
 COMMENT =  multiprocess server framework for Ruby
 
-DISTNAME = serverengine-2.3.0
+DISTNAME = serverengine-2.3.1
 
 CATEGORIES =   sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ruby-serverengine/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo20 Sep 2022 16:18:53 -  1.1.1.1
+++ distinfo29 Dec 2022 21:58:51 -
@@ -1,2 +1,2 @@
-SHA256 (serverengine-2.3.0.gem) = EmPnOYIPJOXgZuyg01lTuQ+JDW0vCYMUi+32Wmd13eo=
-SIZE (serverengine-2.3.0.gem) = 42496
+SHA256 (serverengine-2.3.1.gem) = 3qWTfDxITn1nzFqfcQVcqm/gj6aWLt/FM/nb83Tqehc=
+SIZE (serverengine-2.3.1.gem) = 43008

[update] audio/py-audio 0.2.11 -> 0.2.12

[Kurt Mosiejczuk]

Update to 0.2.12. Includes various small fixes including updates for 
compatibility with Python 3.10+

Tests for only test consumer, audio/py-speechrecognition, pass the
same before and after.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/audio/py-audio/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile22 Dec 2022 00:54:32 -  1.17
+++ Makefile22 Dec 2022 01:09:15 -
@@ -1,10 +1,9 @@
 COMMENT =  Python bindings for PortAudio
 
-MODPY_EGG_VERSION =0.2.11
+MODPY_EGG_VERSION =0.2.12
 DISTNAME = PyAudio-${MODPY_EGG_VERSION}
 PKGNAME =  py-audio-${MODPY_EGG_VERSION}
 CATEGORIES =   audio devel
-REVISION = 3
 
 HOMEPAGE = http://people.csail.mit.edu/hubert/pyaudio/
 
Index: distinfo
===
RCS file: /cvs/ports/audio/py-audio/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Aug 2021 15:41:23 -   1.3
+++ distinfo22 Dec 2022 01:09:15 -
@@ -1,2 +1,2 @@
-SHA256 (PyAudio-0.2.11.tar.gz) = k7/eMOC2TmOkby/XfoXEH9URgqSjQT2e36+f+qJu+3Q=
-SIZE (PyAudio-0.2.11.tar.gz) = 37428
+SHA256 (PyAudio-0.2.12.tar.gz) = Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54=
+SIZE (PyAudio-0.2.12.tar.gz) = 42944
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/audio/py-audio/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py  11 Mar 2022 18:20:27 -  1.4
+++ patches/patch-setup_py  22 Dec 2022 01:09:15 -
@@ -1,12 +1,12 @@
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -56,7 +56,7 @@ portaudio_path = os.environ.get("PORTAUDIO_PATH", "./p
- mac_sysroot_path = os.environ.get("SYSROOT_PATH", None)
+@@ -49,7 +49,7 @@ WIN_VCPKG_PATH = os.environ.get("VCPKG_PATH", None)
  
- pyaudio_module_sources = ['src/_portaudiomodule.c']
--include_dirs = []
-+include_dirs = [os.path.join(os.environ.get('LOCALBASE'), 'include'),]
- external_libraries = []
- extra_compile_args = []
- extra_link_args = []
+ def setup_extension():
+ pyaudio_module_sources = ['src/_portaudiomodule.c']
+-include_dirs = []
++include_dirs = [os.path.join(os.environ.get('LOCALBASE'), 'include'),]
+ external_libraries = ["portaudio"]
+ external_libraries_path = []
+ extra_compile_args = []
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/py-audio/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   9 Sep 2022 19:12:13 -   1.7
+++ pkg/PLIST   22 Dec 2022 01:09:15 -
@@ -1,5 +1,6 @@
 @pkgpath audio/py-audio
 
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
 
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/METADATA
 
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/RECORD
 
lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}.dist-info/WHEEL

[update] archiver/py-zopfli 0.2.1 -> 0.2.2

[Kurt Mosiejczuk]

Update to 0.2.2

Added pyproject.toml to source distribution
Published precompiled wheels for Python 3.11

print/py-fonttools tests don't work, but the only other consumer,
print/weasyprint passes all tests with this new version.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/archivers/py-zopfli/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile13 Nov 2022 15:27:35 -  1.2
+++ Makefile22 Dec 2022 00:34:41 -
@@ -1,10 +1,9 @@
 COMMENT =  cPython bindings for the zopfli compression library
 
-MODPY_EGG_VERSION =0.2.1
+MODPY_EGG_VERSION =0.2.2
 DISTNAME = zopfli-${MODPY_EGG_VERSION}
 PKGNAME =  py-zopfli-${MODPY_EGG_VERSION}
 EXTRACT_SUFX = .zip
-REVISION = 0
 
 CATEGORIES =   archivers
 
Index: distinfo
===
RCS file: /cvs/ports/archivers/py-zopfli/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo13 Oct 2022 15:37:00 -  1.1.1.1
+++ distinfo22 Dec 2022 00:34:41 -
@@ -1,2 +1,2 @@
-SHA256 (zopfli-0.2.1.zip) = 5SY9KAbiwcyyP1KylyojXTHULyLz+jAyzJre1R6b8sY=
-SIZE (zopfli-0.2.1.zip) = 205086
+SHA256 (zopfli-0.2.2.zip) = LUnbdUDZmRl2r0ZOvBue0SmIwE2QaRvLUdxKNzqeKvw=
+SIZE (zopfli-0.2.2.zip) = 205320

[maintainer update] devel/ruby-rbtree 0.4.5 -> 0.4.6

[Kurt Mosiejczuk]

== Changes
=== 0.4.6
* Make it work with clang 15.

Essentially a no-op for us currently until we get clang 15.

No PLIST changes.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/ruby-rbtree/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile22 Jun 2022 01:35:38 -  1.1.1.1
+++ Makefile21 Dec 2022 18:01:11 -
@@ -1,6 +1,6 @@
 COMMENT =  sorted associative collection
 
-DISTNAME = rbtree-0.4.5
+DISTNAME = rbtree-0.4.6
 
 CATEGORIES =   devel
 
Index: distinfo
===
RCS file: /cvs/ports/devel/ruby-rbtree/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo22 Jun 2022 01:35:38 -  1.1.1.1
+++ distinfo21 Dec 2022 18:01:11 -
@@ -1,2 +1,2 @@
-SHA256 (rbtree-0.4.5.gem) = wRUkQfQFX5Qih7Ra/SgGzXVZN/R+ZDwc9oebKL99ifg=
-SIZE (rbtree-0.4.5.gem) = 30208
+SHA256 (rbtree-0.4.6.gem) = FO6kRpsk/SRyVC5fPrEF1jRMjM828LVtVf3P604PEPw=
+SIZE (rbtree-0.4.6.gem) = 30720

[maintainer update] security/ruby-rotp 6.2.1 -> 6.2.2

[Kurt Mosiejczuk]

6.2.2
Removed rjust from generate_otp in favor of more time constant version

No PLIST updates. Minor update.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/security/ruby-rotp/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile19 Nov 2022 00:58:42 -  1.2
+++ Makefile21 Dec 2022 17:49:21 -
@@ -1,7 +1,7 @@
 
 COMMENT =  Ruby library for generating and verifying one time passwords
 
-DISTNAME = rotp-6.2.1
+DISTNAME = rotp-6.2.2
 
 CATEGORIES =   security
 
Index: distinfo
===
RCS file: /cvs/ports/security/ruby-rotp/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo19 Nov 2022 00:58:42 -  1.2
+++ distinfo21 Dec 2022 17:49:21 -
@@ -1,2 +1,2 @@
-SHA256 (rotp-6.2.1.gem) = 5+JbM2DmwDlyg+GsYyFpD6TGOmcJVimqeOwka8Mz0YE=
-SIZE (rotp-6.2.1.gem) = 20480
+SHA256 (rotp-6.2.2.gem) = L97BSX6AafByl5cLbYPF6Bg+fbMGFciiblYdXxD7tYI=
+SIZE (rotp-6.2.2.gem) = 20480

Re: maintainer update productivity/py-tasklib to 2.5.1

[Kurt Mosiejczuk]

On Tue, Dec 20, 2022 at 06:10:43PM +0100, Paco Esteban wrote:
> Hi ports@,

> This is an update of productivity/py-tasklib to its latest version 2.5.1
> All tests pass and works for me on amd64.

> Ok to commit ?

ok kmos

--Kurt

> diff /usr/ports
> commit - 098e393787f2c24397af66355476160b7673e97b
> path + /usr/ports
> blob - a6a8866ecab7723498f5ab419d2c681a409beaa3
> file + productivity/py-tasklib/Makefile
> --- productivity/py-tasklib/Makefile
> +++ productivity/py-tasklib/Makefile
> @@ -1,14 +1,13 @@
>  COMMENT =Python library to interact with Task Warrior
>  
> -MODPY_EGG_VERSION =  2.4.3
> +MODPY_EGG_VERSION =  2.5.1
>  
>  DISTNAME =   tasklib-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   1
>  
>  CATEGORIES = productivity
>  
> -HOMEPAGE =   https://github.com/robgolding/tasklib
> +HOMEPAGE =   https://github.com/GothenburgBitFactory/tasklib
>  MAINTAINER = Paco Esteban 
>  
>  # BSD
> blob - ac29bd251679fc2218968436532c735ee7365ff5
> file + productivity/py-tasklib/distinfo
> --- productivity/py-tasklib/distinfo
> +++ productivity/py-tasklib/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (tasklib-2.4.3.tar.gz) = tSO8Eok9JsgXOmuNhLFiWcmpxayq+JMrwBgRf5B7O8U=
> -SIZE (tasklib-2.4.3.tar.gz) = 23781
> +SHA256 (tasklib-2.5.1.tar.gz) = XM1zG1JjbdEEV6i42FjLDQJv+qsePnUbr3kb+APjfXs=
> +SIZE (tasklib-2.5.1.tar.gz) = 23805
> blob - 9d5575292954e3af0001a420fb1a0daf5e0aafd1
> file + productivity/py-tasklib/pkg/PLIST
> --- productivity/py-tasklib/pkg/PLIST
> +++ productivity/py-tasklib/pkg/PLIST
> @@ -1,5 +1,6 @@
>  lib/python${MODPY_VERSION}/site-packages/tasklib/
>  
> lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/AUTHORS
>  
> lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/LICENSE
>  
> lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/METADATA
>  
> lib/python${MODPY_VERSION}/site-packages/tasklib-${MODPY_EGG_VERSION}.dist-info/RECORD
> 
> -- 
> Paco Esteban.
> 0x5818130B8A6DBC03
> 

[maintainer update] Python 3.11.0 -> 3.11.1

[Kurt Mosiejczuk]

https://docs.python.org/release/3.11.1/whatsnew/changelog.html#python-3-11-1

This pulls the workaround for Python 3.11 from python.port.mk. They seem to
have fixed the problem where pip3.10 shows up (although the issue is still
open...)

Tests pass and it builds fine on amd64 and sparc64.

ok?

--Kurt

Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.154
diff -u -p -r1.154 Makefile.inc
--- Makefile.inc6 Dec 2022 15:55:58 -   1.154
+++ Makefile.inc16 Dec 2022 23:43:39 -
@@ -198,9 +198,6 @@ post-install:
 .else
rm -f ${PREFIX}/bin/pip3 # in devel/py-pip for default Python version
 .endif
-.if ${VERSION} == "3.11"
-   rm ${PREFIX}/bin/pip3.10 # 
https://github.com/python/cpython/issues/98682
-.endif
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/python${VERSION}
${INSTALL_DATA} ${FILESDIR}/CHANGES.OpenBSD \
${PREFIX}/share/doc/python${VERSION}/CHANGES.OpenBSD
Index: 3.11/Makefile
===
RCS file: /cvs/ports/lang/python/3.11/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- 3.11/Makefile   6 Dec 2022 15:58:08 -   1.4
+++ 3.11/Makefile   16 Dec 2022 23:43:39 -
@@ -3,11 +3,10 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.11.0
+FULL_VERSION = 3.11.1
 SHARED_LIBS =  python3.11 0.0
 VERSION_SPEC = >=3.11,<3.12
 PORTROACH =limit:^3\.11
-REVISION-main =1
 
 CONFIGURE_ENV +=   ac_cv_working_openssl_hashlib=yes \
TCLTK_CFLAGS="-I${MODTCL_INCDIR} -I${MODTK_INCDIR} 
-I${X11BASE}/include" \
Index: 3.11/distinfo
===
RCS file: /cvs/ports/lang/python/3.11/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- 3.11/distinfo   31 Oct 2022 22:05:43 -  1.1.1.1
+++ 3.11/distinfo   16 Dec 2022 23:43:39 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.11.0.tgz) = ZEJOluJFerusiZuQ+VMJhbUe7ykFlR/r2TXw5zQUyus=
-SIZE (Python-3.11.0.tgz) = 26333656
+SHA256 (Python-3.11.1.tgz) = uu1RjiazN9TYEFZ5yvaMXDJjDXAmFPwXTpjLlcRr36Q=
+SIZE (Python-3.11.1.tgz) = 26394378
Index: 3.11/patches/patch-configure_ac
===
RCS file: /cvs/ports/lang/python/3.11/patches/patch-configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure_ac
--- 3.11/patches/patch-configure_ac 31 Oct 2022 22:05:43 -  1.1.1.1
+++ 3.11/patches/patch-configure_ac 16 Dec 2022 23:43:39 -
@@ -16,7 +16,7 @@ Index: configure.ac
  
  # The later definition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
  # certain features on NetBSD, so we need _NETBSD_SOURCE to re-enable
-@@ -1086,6 +1086,7 @@ AC_MSG_CHECKING([for multiarch])
+@@ -1096,6 +1096,7 @@ AC_MSG_CHECKING([for multiarch])
  AS_CASE([$ac_sys_system],
[Darwin*], [MULTIARCH=""],
[FreeBSD*], [MULTIARCH=""],
@@ -24,21 +24,23 @@ Index: configure.ac
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
  )
  AC_SUBST([MULTIARCH])
-@@ -1799,11 +1800,11 @@ esac
+@@ -1835,13 +1836,13 @@ esac
  [AC_MSG_RESULT(no)])
  if test "$Py_LTO" = 'true' ; then
case $CC in
 -*clang*)
 +*clang*|cc)
-   dnl flag to disable lto during linking
LDFLAGS_NOLTO="-fno-lto"
+   dnl Clang linker requires -flto in order to link objects with LTO 
information.
+   dnl Thin LTO is faster and works for object files with full LTO 
information, too.
+   
AX_CHECK_COMPILE_FLAG([-flto=thin],[LDFLAGS_NOLTO="-flto=thin"],[LDFLAGS_NOLTO="-flto"])
AC_SUBST(LLVM_AR)
 -  AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path})
 +  AC_PATH_TOOL(LLVM_AR, ar, '', ${llvm_path})
AC_SUBST(LLVM_AR_FOUND)
if test -n "${LLVM_AR}" -a -x "${LLVM_AR}"
then
-@@ -1918,7 +1919,7 @@ then
+@@ -1956,7 +1957,7 @@ then
  fi
  LLVM_PROF_ERR=no
  case $CC in
@@ -47,7 +49,7 @@ Index: configure.ac
  # Any changes made here should be reflected in the GCC+Darwin case below
  PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
  PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
-@@ -3838,11 +3839,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
+@@ -3876,11 +3877,7 @@ dnl Detect Tcl/Tk. Use pkg-config if available.
  dnl
  found_tcltk=no
  for _QUERY in \
Index: 3.11/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.11/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- 3.11/pkg/PLIST-main 1 Nov 2022 16:18:22 -   1.2
+++ 3.11/pkg/PLIST-main 16 Dec 2022 23:43:40 -
@@ -1879,7 +1879,7 @@ lib/python3.11/ensurepip/__pycache__/_un
 lib/python3.11/ensurepip/__pycache__/_uninstall.cpython-311.opt-2.pyc
 lib/python3.11/ensurepip/__pycache__/_

Re: [maintainer update] Python 3.9.15 -> 3.9.16

[Kurt Mosiejczuk]

On Tue, Dec 13, 2022 at 12:41:40PM -0500, Kurt Mosiejczuk wrote:
> https://docs.python.org/release/3.9.16/whatsnew/changelog.html#python-3-9-16-final

> This is an update for Python 3.9.16

> I've tested it on amd64 and sparc64

> (You can't see it in the diff, but I've left REVISION-tkinter=0 for -stable
> purposes)

> I dropped the sha3 patch since upstream has integrated it.

> ok?

This takes into account the changes suggested in the 3.10 thread and
the needed change for CHANGES.OpenBSD.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile6 Dec 2022 15:55:58 -   1.38
+++ Makefile16 Dec 2022 00:09:08 -
@@ -3,16 +3,11 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.9.15
+FULL_VERSION = 3.9.16
 SHARED_LIBS =  python3.9 0.0
 VERSION_SPEC = >=3.9,<3.10
 PORTROACH =limit:^3\.9
-REVISION-main =4
-REVISION-idle =0
 
-# -tkinter in 7.2-stable must be kept a higher version than 7.1-stable
-# due to dep changes (Tcl/Tk 8.5 -> 8.6); 7.2-current must be kept at same
-# or higher version than 7.2-stable.
-REVISION-tkinter = 0
+REVISION = 0
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo14 Oct 2022 15:12:13 -  1.12
+++ distinfo16 Dec 2022 00:09:08 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.15.tgz) = SNHMsp1fuvH7j5EicdCfdFDkJtTf6Vl472qq2nDs5Ng=
-SIZE (Python-3.9.15.tgz) = 26334056
+SHA256 (Python-3.9.16.tgz) = GtU56dvStC33FLaXJuBpO8a50tLI6RwuQyBAJmBRQMU=
+SIZE (Python-3.9.16.tgz) = 26333525
Index: files/CHANGES.OpenBSD
===
RCS file: /cvs/ports/lang/python/3.9/files/CHANGES.OpenBSD,v
retrieving revision 1.13
diff -u -p -r1.13 CHANGES.OpenBSD
--- files/CHANGES.OpenBSD   5 Nov 2022 20:46:24 -   1.13
+++ files/CHANGES.OpenBSD   16 Dec 2022 00:09:08 -
@@ -19,8 +19,5 @@ compiler as passed to ports builds is /u
 6.  Use closefrom(2) instead of looping through all the file descriptors
 and calling close(2) on them.
 
-7.  Fix broken keccak implementation by pulling in the applicable part
-of the fix of CVE-2022-37454. 
-
 These changes are available in the OpenBSD CVS repository
 <http://www.openbsd.org/anoncvs.html> in ports/lang/python/3.9.
Index: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
===
RCS file: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
diff -N patches/patch-Modules__sha3_kcp_KeccakSponge_inc
--- patches/patch-Modules__sha3_kcp_KeccakSponge_inc21 Oct 2022 16:04:47 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,52 +0,0 @@
-SHA-3 buffer overflows (CVE-2022-37454)
-https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a
-https://github.com/python/cpython/pull/98519
-
-Index: Modules/_sha3/kcp/KeccakSponge.inc
 Modules/_sha3/kcp/KeccakSponge.inc.orig
-+++ Modules/_sha3/kcp/KeccakSponge.inc
-@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- i = 0;
- curData = data;
- while(i < dataByteLen) {
--if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + 
rateInBytes))) {
-+if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) {
- #ifdef SnP_FastLoop_Absorb
- /* processing full blocks first */
- 
-@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- }
- else {
- /* normal lane: using the message queue */
--
--partialBlock = (unsigned int)(dataByteLen - i);
--if (partialBlock+instance->byteIOIndex > rateInBytes)
-+if (dataByteLen-i > rateInBytes-instance->byteIOIndex)
- partialBlock = rateInBytes-instance->byteIOIndex;
-+else
-+partialBlock = (unsigned int)(dataByteLen - i);
- #ifdef KeccakReference
- displayBytes(1, "Block to be absorbed (part)", curData, 
partialBlock);
- #endif
-@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned c
- i = 0;
- curData = data;
- while(i < dataByteLen) {
--if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + 
rateInBytes))) {
-+if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= 
rateInBytes)) {
- for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) {
- SnP_Permute(instance->state);
- 

Re: [maintainer update] Python 3.10.8 -> 3.10.9

[Kurt Mosiejczuk]

On Tue, Dec 13, 2022 at 06:54:02PM +, Stuart Henderson wrote:

> The new versions don't need REVISION in 7.2-stable because the
> upstream versions are already higher than the existing 7.1-stable and
> 7.2-stable packages.

> However in -current, REVISION for all subpackages of both python-3.9
> and python-3.10 needs to be higher than in 7.2-stable otherwise we'll
> have problems when 7.2 users update to -current or 7.3.

> So for 3.9.16/3.10.9 I would go with REVISION=0 in -current (which
> sets it for all subpackages in one go), and no REVISION or
> REVISION-anything for 7.2-stable.

> I've not yet tested build/run but not expecting problems there and
> there's nothing that concerns me in changelogs, other than REVISION
> it all LGTM. (I'll try to test, but not sure I will get to it this
> evening).

That makes sense.

This is an updated patch taking that into account and ditching the entry
in CHANGES.OpenBSD mentioning the now-discarded SHA3 patch.

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile6 Dec 2022 15:55:58 -   1.29
+++ Makefile16 Dec 2022 00:08:50 -
@@ -3,18 +3,12 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.8
+FULL_VERSION = 3.10.9
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
-REVISION = 3
-REVISION-main =4
-REVISION-tests =   4
 
-# -tkinter in 7.2-stable must be kept a higher version than 7.1-stable
-# due to dep changes (Tcl/Tk 8.5 -> 8.6); 7.2-current must be kept at same
-# or higher version than 7.2-stable.
-REVISION-tkinter = 3
+REVISION = 0
 
 # This is the MODPY_DEFAULT_VERSION_3 version of Python:
 # - override "@comment" setting so that bin/python3 etc are installed
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo14 Oct 2022 15:11:26 -  1.7
+++ distinfo16 Dec 2022 00:08:50 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.8.tgz) = 9ADD+zlLi+8SkvbcEpLF+tw1MwOaW8DD6IXz4Wc4Apo=
-SIZE (Python-3.10.8.tgz) = 26015299
+SHA256 (Python-3.10.9.tgz) = TM1+RsiJj0x4YpEKFwOqDmNSWROlGauy9V4mIgqRTYg=
+SIZE (Python-3.10.9.tgz) = 26044345
Index: files/CHANGES.OpenBSD
===
RCS file: /cvs/ports/lang/python/3.10/files/CHANGES.OpenBSD,v
retrieving revision 1.11
diff -u -p -r1.11 CHANGES.OpenBSD
--- files/CHANGES.OpenBSD   5 Nov 2022 20:46:24 -   1.11
+++ files/CHANGES.OpenBSD   16 Dec 2022 00:08:50 -
@@ -19,8 +19,5 @@ compiler as passed to ports builds is /u
 6.  Use closefrom(2) instead of looping through all the file descriptors
 and calling close(2) on them.
 
-7.  Fix broken keccak implementation by pulling in the applicable part
-of the fix of CVE-2022-37454. 
-
 These changes are available in the OpenBSD CVS repository
  in ports/lang/python/3.10.
Index: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
===
RCS file: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
diff -N patches/patch-Modules__sha3_kcp_KeccakSponge_inc
--- patches/patch-Modules__sha3_kcp_KeccakSponge_inc21 Oct 2022 16:04:46 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,52 +0,0 @@
-SHA-3 buffer overflows (CVE-2022-37454)
-https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a
-https://github.com/python/cpython/pull/98519
-
-Index: Modules/_sha3/kcp/KeccakSponge.inc
 Modules/_sha3/kcp/KeccakSponge.inc.orig
-+++ Modules/_sha3/kcp/KeccakSponge.inc
-@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- i = 0;
- curData = data;
- while(i < dataByteLen) {
--if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + 
rateInBytes))) {
-+if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) {
- #ifdef SnP_FastLoop_Absorb
- /* processing full blocks first */
- 
-@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- }
- else {
- /* normal lane: using the message queue */
--
--partialBlock = (unsigned int)(dataByteLen - i);
--if (partialBlock+instance->byteIOIndex > rateInBytes)
-+if (dataByteLen-i > rateInBytes-instance->byteIOIndex)
- partialBlock = rateInBytes-instance->byteIOIndex;
-+else
-+partialBlock = (unsigned int)(dataByteLen - i);
- #ifdef KeccakReference
- displayBytes(1, "Block to be absorbed (part)", curData, 
partialBlock);
- #endif
-@@ -

[maintainer update] Python 3.9.15 -> 3.9.16

[Kurt Mosiejczuk]

https://docs.python.org/release/3.9.16/whatsnew/changelog.html#python-3-9-16-final

This is an update for Python 3.9.16

I've tested it on amd64 and sparc64

(You can't see it in the diff, but I've left REVISION-tkinter=0 for -stable
purposes)

I dropped the sha3 patch since upstream has integrated it.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile6 Dec 2022 15:55:58 -   1.38
+++ Makefile9 Dec 2022 18:35:58 -
@@ -3,12 +3,10 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.9.15
+FULL_VERSION = 3.9.16
 SHARED_LIBS =  python3.9 0.0
 VERSION_SPEC = >=3.9,<3.10
 PORTROACH =limit:^3\.9
-REVISION-main =4
-REVISION-idle =0
 
 # -tkinter in 7.2-stable must be kept a higher version than 7.1-stable
 # due to dep changes (Tcl/Tk 8.5 -> 8.6); 7.2-current must be kept at same
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo14 Oct 2022 15:12:13 -  1.12
+++ distinfo9 Dec 2022 18:35:58 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.15.tgz) = SNHMsp1fuvH7j5EicdCfdFDkJtTf6Vl472qq2nDs5Ng=
-SIZE (Python-3.9.15.tgz) = 26334056
+SHA256 (Python-3.9.16.tgz) = GtU56dvStC33FLaXJuBpO8a50tLI6RwuQyBAJmBRQMU=
+SIZE (Python-3.9.16.tgz) = 26333525
Index: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
===
RCS file: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
diff -N patches/patch-Modules__sha3_kcp_KeccakSponge_inc
--- patches/patch-Modules__sha3_kcp_KeccakSponge_inc21 Oct 2022 16:04:47 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,52 +0,0 @@
-SHA-3 buffer overflows (CVE-2022-37454)
-https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a
-https://github.com/python/cpython/pull/98519
-
-Index: Modules/_sha3/kcp/KeccakSponge.inc
 Modules/_sha3/kcp/KeccakSponge.inc.orig
-+++ Modules/_sha3/kcp/KeccakSponge.inc
-@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- i = 0;
- curData = data;
- while(i < dataByteLen) {
--if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + 
rateInBytes))) {
-+if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) {
- #ifdef SnP_FastLoop_Absorb
- /* processing full blocks first */
- 
-@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- }
- else {
- /* normal lane: using the message queue */
--
--partialBlock = (unsigned int)(dataByteLen - i);
--if (partialBlock+instance->byteIOIndex > rateInBytes)
-+if (dataByteLen-i > rateInBytes-instance->byteIOIndex)
- partialBlock = rateInBytes-instance->byteIOIndex;
-+else
-+partialBlock = (unsigned int)(dataByteLen - i);
- #ifdef KeccakReference
- displayBytes(1, "Block to be absorbed (part)", curData, 
partialBlock);
- #endif
-@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned c
- i = 0;
- curData = data;
- while(i < dataByteLen) {
--if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + 
rateInBytes))) {
-+if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= 
rateInBytes)) {
- for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) {
- SnP_Permute(instance->state);
- SnP_ExtractBytes(instance->state, curData, 0, rateInBytes);
-@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned c
- SnP_Permute(instance->state);
- instance->byteIOIndex = 0;
- }
--partialBlock = (unsigned int)(dataByteLen - i);
--if (partialBlock+instance->byteIOIndex > rateInBytes)
-+if (dataByteLen-i > rateInBytes-instance->byteIOIndex)
- partialBlock = rateInBytes-instance->byteIOIndex;
-+else
-+partialBlock = (unsigned int)(dataByteLen - i);
- i += partialBlock;
- 
- SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, 
partialBlock);

[maintainer update] Python 3.10.8 -> 3.10.9

[Kurt Mosiejczuk]

https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-9-final

Below is an update to Python 3.10.9.

I've tested it on both amd64 and sparc64

(I left in REVISION-tkinter=0 for -stable purposes)

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile6 Dec 2022 15:55:58 -   1.29
+++ Makefile9 Dec 2022 18:06:25 -
@@ -3,18 +3,15 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.8
+FULL_VERSION = 3.10.9
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
-REVISION = 3
-REVISION-main =4
-REVISION-tests =   4
 
 # -tkinter in 7.2-stable must be kept a higher version than 7.1-stable
 # due to dep changes (Tcl/Tk 8.5 -> 8.6); 7.2-current must be kept at same
 # or higher version than 7.2-stable.
-REVISION-tkinter = 3
+REVISION-tkinter = 0
 
 # This is the MODPY_DEFAULT_VERSION_3 version of Python:
 # - override "@comment" setting so that bin/python3 etc are installed
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo14 Oct 2022 15:11:26 -  1.7
+++ distinfo9 Dec 2022 18:06:25 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.8.tgz) = 9ADD+zlLi+8SkvbcEpLF+tw1MwOaW8DD6IXz4Wc4Apo=
-SIZE (Python-3.10.8.tgz) = 26015299
+SHA256 (Python-3.10.9.tgz) = TM1+RsiJj0x4YpEKFwOqDmNSWROlGauy9V4mIgqRTYg=
+SIZE (Python-3.10.9.tgz) = 26044345
Index: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
===
RCS file: patches/patch-Modules__sha3_kcp_KeccakSponge_inc
diff -N patches/patch-Modules__sha3_kcp_KeccakSponge_inc
--- patches/patch-Modules__sha3_kcp_KeccakSponge_inc21 Oct 2022 16:04:46 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,52 +0,0 @@
-SHA-3 buffer overflows (CVE-2022-37454)
-https://github.com/XKCP/XKCP/commit/fdc6fef075f4e81d6b1bc38364248975e08e340a
-https://github.com/python/cpython/pull/98519
-
-Index: Modules/_sha3/kcp/KeccakSponge.inc
 Modules/_sha3/kcp/KeccakSponge.inc.orig
-+++ Modules/_sha3/kcp/KeccakSponge.inc
-@@ -171,7 +171,7 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- i = 0;
- curData = data;
- while(i < dataByteLen) {
--if ((instance->byteIOIndex == 0) && (dataByteLen >= (i + 
rateInBytes))) {
-+if ((instance->byteIOIndex == 0) && (dataByteLen-i >= rateInBytes)) {
- #ifdef SnP_FastLoop_Absorb
- /* processing full blocks first */
- 
-@@ -199,10 +199,10 @@ int SpongeAbsorb(SpongeInstance *instance, const unsig
- }
- else {
- /* normal lane: using the message queue */
--
--partialBlock = (unsigned int)(dataByteLen - i);
--if (partialBlock+instance->byteIOIndex > rateInBytes)
-+if (dataByteLen-i > rateInBytes-instance->byteIOIndex)
- partialBlock = rateInBytes-instance->byteIOIndex;
-+else
-+partialBlock = (unsigned int)(dataByteLen - i);
- #ifdef KeccakReference
- displayBytes(1, "Block to be absorbed (part)", curData, 
partialBlock);
- #endif
-@@ -281,7 +281,7 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned c
- i = 0;
- curData = data;
- while(i < dataByteLen) {
--if ((instance->byteIOIndex == rateInBytes) && (dataByteLen >= (i + 
rateInBytes))) {
-+if ((instance->byteIOIndex == rateInBytes) && (dataByteLen-i >= 
rateInBytes)) {
- for(j=dataByteLen-i; j>=rateInBytes; j-=rateInBytes) {
- SnP_Permute(instance->state);
- SnP_ExtractBytes(instance->state, curData, 0, rateInBytes);
-@@ -299,9 +299,10 @@ int SpongeSqueeze(SpongeInstance *instance, unsigned c
- SnP_Permute(instance->state);
- instance->byteIOIndex = 0;
- }
--partialBlock = (unsigned int)(dataByteLen - i);
--if (partialBlock+instance->byteIOIndex > rateInBytes)
-+if (dataByteLen-i > rateInBytes-instance->byteIOIndex)
- partialBlock = rateInBytes-instance->byteIOIndex;
-+else
-+partialBlock = (unsigned int)(dataByteLen - i);
- i += partialBlock;
- 
- SnP_ExtractBytes(instance->state, curData, instance->byteIOIndex, 
partialBlock);
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.10/pkg/PLIST-main,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-main
--- pkg/PLIST-main  13 Nov 2022 15:26:02 -  1.13
+++ pkg/PLIST-main  9 Dec 2022 18:06:26 -
@@ -18

[update] devel/ruby-tilt 2.0.8 -> 2.0.11

[Kurt Mosiejczuk]

https://github.com/rtomayko/tilt/blob/master/CHANGELOG.md#2011-2022-07-22

2.0.11 (2022-07-22)

Fix #extensions_for for RedcarpetTemplate (judofyr)
Support the new sass-embedded gem (#367, ntkme)
Add Tilt::EmacsOrg support (#366, hacktivista)
Improve rendering of BasicObject instances (#348, jeremyevans)
Fix Ruby 3.0 compatibility (#360, voxik)

2.0.10 (2019-09-23)

Remove test files from bundled gem (#339, greysteil)
Fix warning when using yield in templates on ruby 2.7 (#343, jeremyevans)

2.0.9 (2018-11-28)

Use new ERB API in Ruby 2.6 (#329, koic)
Support the new sassc gem (#336, jdickey, judofyr)

Dropped MODRUBY_TEST since the tests were dropped from the gem.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/ruby-tilt/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile11 Mar 2022 18:53:21 -  1.16
+++ Makefile1 Dec 2022 23:22:41 -
@@ -1,17 +1,17 @@
 COMMENT =  generic interface to multiple Ruby template engines
 
-DISTNAME = tilt-2.0.8
+DISTNAME = tilt-2.0.11
 CATEGORIES =   devel textproc
 
 HOMEPAGE = https://github.com/rtomayko/tilt
 
+MAINTAINER =   Kurt Mosiejczuk 
+
 # MIT
 PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/ruby
 
 CONFIGURE_STYLE =  ruby gem
-
-MODRUBY_TEST = testrb
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/ruby-tilt/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo14 Nov 2017 17:07:00 -  1.4
+++ distinfo1 Dec 2022 23:22:41 -
@@ -1,2 +1,2 @@
-SHA256 (tilt-2.0.8.gem) = KjvmxWqMxjOCA8ApEOIOhYZktjOttVDhEDgE116uQAA=
-SIZE (tilt-2.0.8.gem) = 54784
+SHA256 (tilt-2.0.11.gem) = exgPxHLL3rGGyF0xwPLR5hosDXfh2f0MooSCqdly1qA=
+SIZE (tilt-2.0.11.gem) = 23040
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/ruby-tilt/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   11 Mar 2022 18:53:21 -  1.6
+++ pkg/PLIST   1 Dec 2022 23:22:41 -
@@ -1,17 +1,9 @@
 ${GEM_BIN}/tilt${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
 ${GEM_LIB}/gems/${DISTNAME}/COPYING
-${GEM_LIB}/gems/${DISTNAME}/Gemfile
-${GEM_LIB}/gems/${DISTNAME}/HACKING
-${GEM_LIB}/gems/${DISTNAME}/README.md
-${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/bin/
 ${GEM_LIB}/gems/${DISTNAME}/bin/tilt
-${GEM_LIB}/gems/${DISTNAME}/docs/
-${GEM_LIB}/gems/${DISTNAME}/docs/TEMPLATES.md
-${GEM_LIB}/gems/${DISTNAME}/docs/common.css
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt.rb
@@ -53,61 +45,4 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/tem
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/typescript.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/wikicloth.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/tilt/yajl.rb
-${GEM_LIB}/gems/${DISTNAME}/man/
-${GEM_LIB}/gems/${DISTNAME}/man/index.txt
-${GEM_LIB}/gems/${DISTNAME}/man/tilt.1.ronn
-${GEM_LIB}/gems/${DISTNAME}/test/
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/locals.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/markaby.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/markaby_other_static.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/render_twice.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/scope.mab
-${GEM_LIB}/gems/${DISTNAME}/test/markaby/yielding.mab
-${GEM_LIB}/gems/${DISTNAME}/test/mytemplate.rb
-${GEM_LIB}/gems/${DISTNAME}/test/test_helper.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_asciidoctor_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_babeltemplate.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_blueclothtemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_buildertemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_cache_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_coffeescripttemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_commonmarkertemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_compilesite_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_creoletemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_csv_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_erbtemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_erubistemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_erubitemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_etannitemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_hamltemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_kramdown_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_lesstemplate_test.less
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_lesstemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_liquidtemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_livescripttemplate_test.rb
-${GEM_LIB}/gems/${DISTNAME}/test/tilt_mapping_test.rb
-${GEM_LIB}/gems

Re: [maintainer update] converters/ruby-oj 3.13.21 -> 3.13.23

[Kurt Mosiejczuk]

On Thu, Nov 17, 2022 at 04:21:37PM -0500, Kurt Mosiejczuk wrote:
> https://github.com/ohler55/oj/blob/master/CHANGELOG.md

> 3.13.23 - 2022-11-06

> Fixed issue with Oj::Parser extension regarding GC timeing.

> 3.13.22 - 2022-11-01

> Reorganized Oj::Parser code to allow for parser extensions in C.

> Minor updates. No PLIST changes.

> ok?

The changes aren't so minor as to not have a diff XD

Caught by tb@

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/converters/ruby-oj/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile26 Aug 2022 20:25:30 -  1.2
+++ Makefile17 Nov 2022 21:18:19 -
@@ -1,7 +1,7 @@
 
 COMMENT =  fast JSON parser and serializer
 
-DISTNAME = oj-3.13.21
+DISTNAME = oj-3.13.23
 
 CATEGORIES =   converters
 
Index: distinfo
===
RCS file: /cvs/ports/converters/ruby-oj/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo26 Aug 2022 20:25:30 -  1.2
+++ distinfo17 Nov 2022 21:18:19 -
@@ -1,2 +1,2 @@
-SHA256 (oj-3.13.21.gem) = rvMajcxvC5tLtcx6xsxScrLYUd6xGhgEwu1rVQG1DkY=
-SIZE (oj-3.13.21.gem) = 267776
+SHA256 (oj-3.13.23.gem) = IG39xAIK2ZdHBQN/Jpz7ohHWG3ZipYxxfM53GCnM71E=
+SIZE (oj-3.13.23.gem) = 268288

[maintainer update] security/ruby-rotp 6.2.0 -> 6.2.1

[Kurt Mosiejczuk]

https://github.com/mdp/rotp/blob/main/CHANGELOG.md#621

6.2.1
Removed old rdoc folder that was triggering a security warning due
to an old version of JQuery being included in the HTML docs. This
has no impact on the Ruby library.

Only some additional commented out entries in the PLIST. No actual code
changes.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/security/ruby-rotp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile20 Sep 2022 16:09:19 -  1.1.1.1
+++ Makefile17 Nov 2022 21:31:35 -
@@ -1,7 +1,7 @@
 
 COMMENT =  Ruby library for generating and verifying one time passwords
 
-DISTNAME = rotp-6.2.0
+DISTNAME = rotp-6.2.1
 
 CATEGORIES =   security
 
Index: distinfo
===
RCS file: /cvs/ports/security/ruby-rotp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo20 Sep 2022 16:09:19 -  1.1.1.1
+++ distinfo17 Nov 2022 21:31:35 -
@@ -1,2 +1,2 @@
-SHA256 (rotp-6.2.0.gem) = I5ou77pvG9QVeyxzXQ+XVZjg75SCPuovNdED0uXMB4c=
-SIZE (rotp-6.2.0.gem) = 63488
+SHA256 (rotp-6.2.1.gem) = 5+JbM2DmwDlyg+GsYyFpD6TGOmcJVimqeOwka8Mz0YE=
+SIZE (rotp-6.2.1.gem) = 20480
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/ruby-rotp/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   20 Sep 2022 16:09:19 -  1.1.1.1
+++ pkg/PLIST   17 Nov 2022 21:31:35 -
@@ -1,13 +1,19 @@
 ${GEM_BIN}/rotp${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
+@comment ${GEM_LIB}/gems/${DISTNAME}/.travis.yml
+@comment ${GEM_LIB}/gems/${DISTNAME}/.devcontainer/
+@comment ${GEM_LIB}/gems/${DISTNAME}/.devcontainer/Dockerfile
+@comment ${GEM_LIB}/gems/${DISTNAME}/.devcontainer/devcontainer.json
 @comment ${GEM_LIB}/gems/${DISTNAME}/.dockerignore
+@comment ${GEM_LIB}/gems/${DISTNAME}/.github/
+@comment ${GEM_LIB}/gems/${DISTNAME}/.github/workflows/
+@comment ${GEM_LIB}/gems/${DISTNAME}/.github/workflows/test.yaml
 @comment ${GEM_LIB}/gems/${DISTNAME}/.gitignore
-@comment ${GEM_LIB}/gems/${DISTNAME}/.travis.yml
 ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.md
-@comment ${GEM_LIB}/gems/${DISTNAME}/Dockerfile-2.3
 @comment ${GEM_LIB}/gems/${DISTNAME}/Dockerfile-2.5
 @comment ${GEM_LIB}/gems/${DISTNAME}/Dockerfile-2.6
+@comment ${GEM_LIB}/gems/${DISTNAME}/Dockerfile-2.3
 @comment ${GEM_LIB}/gems/${DISTNAME}/Dockerfile-2.7
 @comment ${GEM_LIB}/gems/${DISTNAME}/Dockerfile-3.0-rc
 ${GEM_LIB}/gems/${DISTNAME}/Gemfile
@@ -16,28 +22,6 @@ ${GEM_LIB}/gems/${DISTNAME}/LICENSE
 ${GEM_LIB}/gems/${DISTNAME}/README.md
 ${GEM_LIB}/gems/${DISTNAME}/bin/
 ${GEM_LIB}/gems/${DISTNAME}/bin/rotp
-${GEM_LIB}/gems/${DISTNAME}/doc/
-${GEM_LIB}/gems/${DISTNAME}/doc/ROTP/
-${GEM_LIB}/gems/${DISTNAME}/doc/ROTP/HOTP.html
-${GEM_LIB}/gems/${DISTNAME}/doc/ROTP/OTP.html
-${GEM_LIB}/gems/${DISTNAME}/doc/ROTP/TOTP.html
-${GEM_LIB}/gems/${DISTNAME}/doc/Rotp.html
-${GEM_LIB}/gems/${DISTNAME}/doc/_index.html
-${GEM_LIB}/gems/${DISTNAME}/doc/class_list.html
-${GEM_LIB}/gems/${DISTNAME}/doc/css/
-${GEM_LIB}/gems/${DISTNAME}/doc/css/common.css
-${GEM_LIB}/gems/${DISTNAME}/doc/css/full_list.css
-${GEM_LIB}/gems/${DISTNAME}/doc/css/style.css
-${GEM_LIB}/gems/${DISTNAME}/doc/file.README.html
-${GEM_LIB}/gems/${DISTNAME}/doc/file_list.html
-${GEM_LIB}/gems/${DISTNAME}/doc/frames.html
-${GEM_LIB}/gems/${DISTNAME}/doc/index.html
-${GEM_LIB}/gems/${DISTNAME}/doc/js/
-${GEM_LIB}/gems/${DISTNAME}/doc/js/app.js
-${GEM_LIB}/gems/${DISTNAME}/doc/js/full_list.js
-${GEM_LIB}/gems/${DISTNAME}/doc/js/jquery.js
-${GEM_LIB}/gems/${DISTNAME}/doc/method_list.html
-${GEM_LIB}/gems/${DISTNAME}/doc/top-level-namespace.html
 @comment ${GEM_LIB}/gems/${DISTNAME}/docker-compose.yml
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/rotp/

[maintainer update] converters/ruby-oj 3.13.21 -> 3.13.23

[Kurt Mosiejczuk]

https://github.com/ohler55/oj/blob/master/CHANGELOG.md

3.13.23 - 2022-11-06

Fixed issue with Oj::Parser extension regarding GC timeing.

3.13.22 - 2022-11-01

Reorganized Oj::Parser code to allow for parser extensions in C.

Minor updates. No PLIST changes.

ok?

--Kurt

Re: fix net/irssi on ld.bfd arches

[Kurt Mosiejczuk]

On Thu, Nov 03, 2022 at 09:32:10PM +1000, Jonathan Matthew wrote:
> On Thu, Nov 03, 2022 at 06:00:00AM -0600, k...@openbsd.org wrote:
> > http://build-failures.rhaalovely.net/sparc64/2022-10-31/net/irssi.log

> Now that this uses meson, it needs -Wl,--as-needed disabled to build on ld.bfd
> arches.  I copied this bit from another port.

> ok?

This fixes the build on sparc64 for me. Thank you.

ok kmos

--Kurt

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/irssi/Makefile,v
> retrieving revision 1.99
> diff -u -p -r1.99 Makefile
> --- Makefile  2 Nov 2022 01:18:42 -   1.99
> +++ Makefile  3 Nov 2022 11:35:01 -
> @@ -34,6 +34,13 @@ MODMESON_CONFIGURE_ARGS += -Ddisable-utf
>   -Dwith-perl=yes \
>   -Dwith-proxy=yes
>  
> +# disable meson's default of using "-Wl,--as-needed" on ld.bfd arches;
> +# build failures due to undefined references are often seen.
> +.include 
> +.if !${PROPERTIES:Mlld}
> +MODMESON_CONFIGURE_ARGS +=  -Db_asneeded=false
> +.endif
> +
>  RUN_DEPENDS-otr =net/irssi,-main
>  LIB_DEPENDS-otr =devel/glib2>=2.28.0 \
>   security/libgcrypt>=1.2.0 \
> 

Re: [new] math/ministat: small statistic utility

[Kurt Mosiejczuk]

On Tue, Nov 01, 2022 at 12:14:34AM +0100, Jeremie Courreges-Anglas wrote:

> tl;dr : the pledge(2) promises looks reasonable to me.  While
> I initially found that three pledge(2) was too much, I must admit
> that all of them tighten the program execution before looking at
> untrusted data.  For the first call pledge(2), one could argue that the
> program environment is hardly untrusted data, but past problems like
> shellshock have proved this assumption wrong.  The second pledge(2) call
> is the least useful IMO, since it only drops "tty" before reading data
> from files.  But I feel strongly about dropping it.

> As suspected ministat fails to build on sparc64 (base-gcc) because it
> uses math.h functions but doesn't link against libm.  Thanks kmos@ for
> confirming, suggesting the fix and testing it!

> This looks ready to import.  ok?

ok kmos to import

--Kurt

Python 3.10+ readline issue (was Re: [New(ish)] Python 3.11.0)

[Kurt Mosiejczuk]

On Mon, Oct 31, 2022 at 10:04:30PM +, Stuart Henderson wrote:

> If anyone has an idea what's up with readline, I'd love to hear it,
> it's a bit of a blocker for switching to 3.10 by default and I don't find
> the build system particularly easy to work with.

> There's one fairly obvious issue (tb and I both found this one), the
> newer build system wants a libreadline.so symlink; putting that in place
> temporarily in /usr/lib works around that but doesn't fix the problem.

Further details:

Up until Python 3.8.x the readline module built just fine. Starting with
3.9, it complained about the readline module not working, but a working
module _does_ get built anyway. So looking into what changed between 3.8,
3.9, and 3.10 for the build system may yield something.

--Kurt

Re: [new] math/ministat: small statistic utility

[Kurt Mosiejczuk]

On Mon, Oct 31, 2022 at 05:52:27PM +0100, Omar Polo wrote:

> forgot to reply to this, sorry.  Agree with sthen@ suggestion and your
> latest tarball it's ok for me to import

It should have 'm' in WANTLIB and also add '-lm' to CFLAGS. That makes it
build on sparc64.

With those two changes, ok kmos to import

--Kurt

[New(ish)] Python 3.11.0

[Kurt Mosiejczuk]

Here's the initial port for Python 3.11.0

I've tested on amd64 and sparc64.

Python upstream switched a number of autoconf things from command line
switches to environment variables. We may see it show up in later releases
of the other 3.x versions, but for now we'll just set what we need in the
3.11 Makefile.

This still suffers from the same problem 3.10 does where the readline module
does not build properly. (3.9 makes the same complaint, but somehow a
working version of the module gets built).

ok?

--Kurt

Index: python.port.mk
===
RCS file: /cvs/ports/lang/python/python.port.mk,v
retrieving revision 1.169
diff -u -p -r1.169 python.port.mk
--- python.port.mk  23 Oct 2022 10:14:04 -  1.169
+++ python.port.mk  31 Oct 2022 21:22:01 -
@@ -74,7 +74,8 @@ MODPY_VERSION ?=  ${MODPY_DEFAULT_VERSION
 # verify if MODPY_VERSION found is correct
 .if ${MODPY_VERSION} != "2.7" && \
   ${MODPY_VERSION} != "3.9" && \
-  ${MODPY_VERSION} != "3.10"
+  ${MODPY_VERSION} != "3.10" && \
+  ${MODPY_VERSION} != "3.11"
 ERRORS += "Fatal: unknown or unsupported MODPY_VERSION: ${MODPY_VERSION}"
 .endif
 
Index: Makefile
===
RCS file: /cvs/ports/lang/python/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- Makefile11 Aug 2022 02:15:02 -  1.77
+++ Makefile31 Oct 2022 21:22:01 -
@@ -2,5 +2,6 @@ SUBDIR =
 SUBDIR +=  2.7
 SUBDIR +=  3.9
 SUBDIR +=  3.10
+SUBDIR +=  3.11
 
 .include 


python-3.11.tgz
Description: application/tar-gz

config.site - We do not have ctermid_r

[Kurt Mosiejczuk]

Python 3.11 wouldn't compiler because it decided we have ctermid_r, which
we don't. So boom.

Except, it didn't decide it. It took our word for it. Our config.site
has ac_cv_func_ctermid_r=yes in it. The new version of the Python check
just uses the cached result, which is wrong.

So this rectifies that. With that, the Python 3.11 check works properly.

ok?

--Kurt

Index: config.site
===
RCS file: /cvs/ports/infrastructure/db/config.site,v
retrieving revision 1.30
diff -u -p -r1.30 config.site
--- config.site 10 Nov 2017 07:10:02 -  1.30
+++ config.site 25 Oct 2022 18:06:40 -
@@ -140,7 +140,7 @@ ac_cv_func_connect=${ac_cv_func_connect=
 ac_cv_func_crc32=${ac_cv_func_crc32=yes}   
 ac_cv_func_crypt=${ac_cv_func_crypt=yes}
 ac_cv_func_ctermid=${ac_cv_func_ctermid=yes}   
-ac_cv_func_ctermid_r=${ac_cv_func_ctermid_r=yes}   
+ac_cv_func_ctermid_r=${ac_cv_func_ctermid_r=no}
 ac_cv_func_ctime=${ac_cv_func_ctime=yes}   
 ac_cv_func_ctime_r=${ac_cv_func_ctime_r=yes}   
 ac_cv_func_daemon=${ac_cv_func_daemon=yes} 

Re: [NEW] www/py-requests-file-1.5.1

[Kurt Mosiejczuk]

On Fri, Oct 07, 2022 at 10:42:58AM +0200, Omar Polo wrote:
> On 2022/10/06 22:44:22 -0400, George Rosamond  
> wrote:
> > from pkg/DESCR:

> > Requests-File is a transport adapter for use with the Requests
> > Python library to allow local filesystem access via file:// URLs.

> > from `make test`

> > 9 passed, 2 skipped in 0.26s

> > thanks.

> looks fine to me, ok op@

imported. Thanks George!

--Kurt

[maintainer update] Python 3.9.15

[Kurt Mosiejczuk]

https://docs.python.org/release/3.9.15/whatsnew/changelog.html

gh-97616: Fix multiplying a list by an integer (list *= int): detect the
  integer overflow when the new allocated length is close to the
  maximum size. Issue reported by Jordan Limor. Patch by Victor
  Stinner.

gh-97612: Fix a shell code injection vulnerability in the
  get-remote-certificate.py example script. The script no longer
  uses a shell to run openssl commands. Issue reported and
  initial fix by Caleb Shortt. Patch by Victor Stinner.

Also a couple non-security fixes.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile8 Sep 2022 19:35:46 -   1.31
+++ Makefile13 Oct 2022 18:02:45 -
@@ -3,7 +3,7 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.9.14
+FULL_VERSION = 3.9.15
 SHARED_LIBS =  python3.9 0.0
 VERSION_SPEC = >=3.9,<3.10
 PORTROACH =limit:^3\.9
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo8 Sep 2022 19:35:46 -   1.11
+++ distinfo13 Oct 2022 18:02:45 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.14.tgz) = kgGDbiwWNhsrdAhoBQI5NzfUTyJzM/4uVynH1fYEFnU=
-SIZE (Python-3.9.14.tgz) = 26365055
+SHA256 (Python-3.9.15.tgz) = SNHMsp1fuvH7j5EicdCfdFDkJtTf6Vl472qq2nDs5Ng=
+SIZE (Python-3.9.15.tgz) = 26334056
Index: patches/patch-Modules_posixmodule_c
===
RCS file: /cvs/ports/lang/python/3.9/patches/patch-Modules_posixmodule_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Modules_posixmodule_c
--- patches/patch-Modules_posixmodule_c 22 Jun 2022 09:44:27 -  1.2
+++ patches/patch-Modules_posixmodule_c 13 Oct 2022 18:02:45 -
@@ -1,7 +1,7 @@
 Index: Modules/posixmodule.c
 --- Modules/posixmodule.c.orig
 +++ Modules/posixmodule.c
-@@ -9219,7 +9219,7 @@ os_closerange_impl(PyObject *module, int fd_low, int f
+@@ -9223,7 +9223,7 @@ os_closerange_impl(PyObject *module, int fd_low, int f
  fdwalk(_fdwalk_close_func, lohi);
  #else
  fd_low = Py_MAX(fd_low, 0);

[maintainer update] Python 3.10.8

[Kurt Mosiejczuk]

https://docs.python.org/3.10/whatsnew/changelog.html#changelog

gh-97616: Fix multiplying a list by an integer (list *= int): detect the
  integer overflow when the new allocated length is close to the
  maximum size. Issue reported by Jordan Limor. Patch by Victor
  Stinner.

gh-97612: Fix a shell code injection vulnerability in the 
  get-remote-certificate.py example script. The script no longer
  uses a shell to run openssl commands. Issue reported and
  initial fix by Caleb Shortt. Patch by Victor Stinner.

gh-68966: The deprecated mailcap module now refuses to inject unsafe text
  (filenames, MIME types, parameters) into shell
  commands. Instead of using such text, it will warn and act as
  if a match was not found (or for test commands, as if the test
  failed).

About a dozen other non-security fixes.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile8 Sep 2022 19:36:23 -   1.21
+++ Makefile13 Oct 2022 17:32:36 -
@@ -3,7 +3,7 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.7
+FULL_VERSION = 3.10.8
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo8 Sep 2022 19:36:23 -   1.6
+++ distinfo13 Oct 2022 17:32:36 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.7.tgz) = Gy5OLfaXxS02cxZml55ki+7aWUHQ+VdAqvv0Fj5cwSY=
-SIZE (Python-3.10.7.tgz) = 26006589
+SHA256 (Python-3.10.8.tgz) = 9ADD+zlLi+8SkvbcEpLF+tw1MwOaW8DD6IXz4Wc4Apo=
+SIZE (Python-3.10.8.tgz) = 26015299
Index: pkg/PLIST-tests
===
RCS file: /cvs/ports/lang/python/3.10/pkg/PLIST-tests,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-tests
--- pkg/PLIST-tests 18 Jun 2022 20:22:41 -  1.6
+++ pkg/PLIST-tests 13 Oct 2022 17:32:38 -
@@ -3928,6 +3928,16 @@ lib/python3.10/test/tracedmodules/__pyca
 lib/python3.10/test/tracedmodules/__pycache__/testmod.cpython-310.opt-2.pyc
 lib/python3.10/test/tracedmodules/__pycache__/testmod.cpython-310.pyc
 lib/python3.10/test/tracedmodules/testmod.py
+lib/python3.10/test/typinganndata/
+lib/python3.10/test/typinganndata/__init__.py
+lib/python3.10/test/typinganndata/__pycache__/
+lib/python3.10/test/typinganndata/__pycache__/__init__.cpython-310.opt-1.pyc
+lib/python3.10/test/typinganndata/__pycache__/__init__.cpython-310.opt-2.pyc
+lib/python3.10/test/typinganndata/__pycache__/__init__.cpython-310.pyc
+lib/python3.10/test/typinganndata/__pycache__/ann_module9.cpython-310.opt-1.pyc
+lib/python3.10/test/typinganndata/__pycache__/ann_module9.cpython-310.opt-2.pyc
+lib/python3.10/test/typinganndata/__pycache__/ann_module9.cpython-310.pyc
+lib/python3.10/test/typinganndata/ann_module9.py
 lib/python3.10/test/win_console_handler.py
 lib/python3.10/test/xmltestdata/
 lib/python3.10/test/xmltestdata/c14n-20/

Tweak license detection in portgen(1)

[Kurt Mosiejczuk]

I tweaked portgen's License.pm module a bit. There were common licenses
that it would spit out as "Unknown". So I modified the munging a little
and added more entries to its list of good licenses.

Now something that states its license is "The MIT License" will no
longer stump it.

ok?

--Kurt

Index: License.pm
===
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/License.pm,v
retrieving revision 1.5
diff -u -p -r1.5 License.pm
--- License.pm  13 May 2019 00:21:29 -  1.5
+++ License.pm  9 Oct 2022 00:07:08 -
@@ -28,28 +28,38 @@ our @EXPORT_OK = qw(
 
 # Add licenses not recognized here.
 my %good_licenses = (
-   agpl_3  => 'AGPL 3',
-   apache_1_1  => 'Apache 1.1',
-   apache_2_0  => 'Apache 2.0',
-   artistic_1  => 'Artistic 1.0',
-   artistic_2  => 'Artistic 2.0',
-   bsd => 'BSD',
-   freebsd => 'FreeBSD',
-   gpl_2   => 'GPLv2',
-   gpl_2_0 => 'GPLv2',
-   gpl_3   => 'GPLv3',
-   gpl_3_0 => 'GPLv3',
-   isc => 'ISC',
-   lgpl=> 'LGPL',
-   lgpl_2_1=> 'LGPL v2.1',
-   'lgpl_2_1+' => 'LGPL v2.1',
-   mit => 'MIT',
-   mpl_v2  => 'MPL 2.0',
-   new_bsd => 'BSD-3',
-   perl_5  => 'Perl',
-   ruby=> 'Ruby',
-   qpl_1_0 => 'QPLv1',
-   zlib=> 'zlib',
+   agpl_3  => 'AGPL 3',
+   apache_1_1  => 'Apache 1.1',
+   apache_2_0  => 'Apache 2.0',
+   artistic_1  => 'Artistic 1.0',
+   artistic_1_0=> 'Artistic 1.0',
+   artistic_2  => 'Artistic 2.0',
+   artistic_2_0=> 'Artistic 2.0',
+   bsd => 'BSD',
+   cc0 => 'CC0',
+   cc_by_nc_sa_3_0 => 'CC BY-NC-SA 3.0',
+   cmu => 'CMU',
+   freebsd => 'FreeBSD',
+   gpl_2   => 'GPLv2',
+   gpl_2_0 => 'GPLv2',
+   'gpl_2+'=> 'GPLv2+',
+   gpl_3   => 'GPLv3',
+   gpl_3_0 => 'GPLv3',
+   'gpl_3+'=> 'GPLv3+',
+   isc => 'ISC',
+   lgpl=> 'LGPL',
+   lgpl_2_1=> 'LGPL v2.1',
+   'lgpl_2_1+' => 'LGPL v2.1+',
+   lgpl_3  => 'LGPL v3',
+   'lgpl_3+'   => 'LGPL v3+',
+   mit => 'MIT',
+   mpl_v2  => 'MPL 2.0',
+   new_bsd => 'BSD-3',
+   perl_5  => 'Perl',
+   public_domain   => 'Public Domain',
+   ruby=> 'Ruby',
+   qpl_1_0 => 'QPLv1',
+   zlib=> 'zlib',
 );
 
 sub is_good
@@ -75,6 +85,8 @@ sub _munge
 
$license = lc $license;
$license =~ s/[,-\.\s]/_/g;
+   $license =~ s/the_//;
+   $license =~ s/gnu_public_license/gpl/;
$license =~ s/_license//;
$license =~ s/_version//;
$license =~ s/_{2,}/_/g;

Re: [big-endian] unbreak games/mvdsv

[Kurt Mosiejczuk]

On Thu, Sep 22, 2022 at 11:22:08PM -0400, George Koehler wrote:
> About mvdsv, the QuakeWorld server,

> I don't play this game, but I want to fix an error in CMakeLists.txt,
> which broke this package on big-endian platforms.  kmos had added
> BROKEN-sparc64, but I got the same error on powerpc.  This diff adds
> the missing PRIVATE keyword, so I can package mvdsv on powerpc.

> I didn't bump REVISION.
> ok to commit?

I can confirm it fixes sparc64.

ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/games/mvdsv/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  12 Sep 2022 00:29:05 -  1.7
> +++ Makefile  22 Sep 2022 18:40:01 -
> @@ -1,5 +1,3 @@
> -BROKEN-sparc64 = target_compile_definitions called with invalid arguments 
> BIG_ENDIAN
> -
>  COMMENT =QuakeWorld server
>  
>  GH_ACCOUNT = QW-Group
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/games/mvdsv/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt  24 Aug 2022 03:24:32 -  1.1
> +++ patches/patch-CMakeLists_txt  22 Sep 2022 18:40:01 -
> @@ -1,5 +1,6 @@
>  Remove link to dl as it is in OpenBSD's libc
>  Have Cmake find and link to devel/pcre if installed, otherwise fall back to 
> bundled pcre.
> +Prevent error in target_compile_definitions when big-endian
>  Index: CMakeLists.txt
>  --- CMakeLists.txt.orig
>  +++ CMakeLists.txt
> @@ -63,6 +64,15 @@ Index: CMakeLists.txt
>   else()
>   target_link_libraries(${PROJECT_NAME} ws2_32)
>   target_link_libraries(${PROJECT_NAME} winmm)
> +@@ -135,7 +152,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE USE
> + include (TestBigEndian)
> + TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
> + if(IS_BIG_ENDIAN)
> +-target_compile_definitions(${PROJECT_NAME} __BIG_ENDIAN__Q__)
> ++target_compile_definitions(${PROJECT_NAME} PRIVATE __BIG_ENDIAN__Q__)
> + message(STATUS "BIG_ENDIAN")
> + else()
> + target_compile_definitions(${PROJECT_NAME} PRIVATE __LITTLE_ENDIAN__Q__)
>  @@ -147,6 +164,9 @@ if(CURL_FOUND)
>   target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES})
>   endif()

Re: [new] print/ocrmypdf

[Kurt Mosiejczuk]

On Tue, Sep 20, 2022 at 05:43:27PM +0100, Stuart Henderson wrote:
> ok to import this? (probably for post-release now)

ok kmos for import

--Kurt

> -
> Information for inst:ocrmypdf-13.7.0
> 
> Comment:
> add an OCR text layer to scanned PDF files
> 
> Description:
> OCRmyPDF adds an OCR text layer to scanned PDF files, allowing them to
> be searched or copy+pasted.
> 
> - Generates a searchable PDF/A file from a regular PDF
> - Places OCR text accurately below the image to ease copy / paste
> - Keeps the exact resolution of the original embedded images
> - When possible, inserts OCR information as a "lossless" operation
>   without disrupting any other content
> - Optimizes PDF images, often producing files smaller than the input file
> - If requested, deskews and/or cleans the image before performing OCR
> - Validates input and output files
> - Distributes work across all available CPU cores
> - Uses Tesseract OCR engine to recognize more than 100 languages
>   (use "pkg_info -Q tesseract" to locate language packs to install)
> - Keeps your private data private
> - Scales properly to handle files with thousands of pages
> - Battle-tested on millions of PDFs
> 
> ocrmypdf  # it's a scriptable command line program
>-l eng+fra # it supports multiple languages
>--rotate-pages # it can fix pages that are misrotated
>--deskew   # it can deskew crooked PDFs!
>--title "My PDF"   # it can change output metadata
>--jobs 4   # it uses multiple cores by default
>--output-type pdfa # it produces PDF/A by default
>input_scanned.pdf  # takes PDF input (or images)
>output_searchable.pdf  # produces validated PDF output
> 
> Maintainer: The OpenBSD ports mailing-list 
> 
> WWW: https://ocrmypdf.readthedocs.io/
> -
> 

[new] security/ruby-rbnacl

[Kurt Mosiejczuk]

The Networking and Cryptography (NaCl) library provides a high-level
toolkit for building cryptographic systems and protocols. rbnacl
provides a ruby interface to libsodium/NaCl.

Theoretically it supports jruby but it needs ruby-ffi and ruby-ffi doesn't
have a jruby FLAVOR.

ok to import?

--Kurt


ruby-rbnacl.tgz
Description: application/tar-gz

[new] security/ruby-rotp

[Kurt Mosiejczuk]

Ruby OTP library that Works for both HOTP and TOTP. It includes QR
Code provisioning.

ok to import?

--Kurt


ruby-rotp.tgz
Description: application/tar-gz

[new] sysutils/ruby-serverengine and sysutils/ruby-sigdump

[Kurt Mosiejczuk]

ruby-serverengine:

A Ruby framework to implement robust multiprocess servers like
Unicorn

ruby-sigdump is needed as a dependency for ruby-serverengine

ok to import?

--Kurt



ruby-sigdump.tgz
Description: application/tar-gz


ruby-serverengine.tgz
Description: application/tar-gz

Re: [NEW] math/py-datedelta 1.4

[Kurt Mosiejczuk]

On Tue, Sep 13, 2022 at 07:10:57AM -0400, George Rosamond wrote:
> ping

imported. Thanks George!

--Kurt

> On 9/6/22 16:15, Stuart Henderson wrote:
> > On 2022/09/05 21:10, George Rosamond wrote:
> > > Attached is py-datedelta... useful tool for doing date deltas/math.
> > > 
> > >  From pkg/DESCR:
> > > 
> > > datedelta.datedelta is datetime.timedelta for date arithmetic.
> > > 
> > > It accounts for oddities of the Gregorian calendar.
> > > 
> > > It's convenient for computing yearly, monthly, or weekly subscriptions
> > > periods.
> > > 
> > > g
> > 
> > This is OK sthen@
> 

Re: Outdated games/multimc port

[Kurt Mosiejczuk]

On Sun, Sep 11, 2022 at 01:26:09PM +, Ibrahim Kaikaa wrote:
> Hey there, I see that games/multimc is outdated, the latest version is 0.6.14 
> while the ports have 0.6.12
> Is there anyone working on updating this port?

You'll want blockgame. multimc updated their license and dont allow others
to use the multimc name.

--Kurt

Re: [update] devel/py-algorithm-munkres 1.1.2 -> 1.1.4

[Kurt Mosiejczuk]

On Wed, Jul 20, 2022 at 01:25:02AM -0400, Kurt Mosiejczuk wrote:
> https://github.com/bmc/munkres/blob/master/CHANGELOG.md

> Upstream integrated the patch I made to the tests, so removed the patch.
> Includes a fix.

> All tests pass on amd64.  The only consumer is audio/beets which passes its
> tested identically for both the old version and this new one.

> ok?

ping.

New version that switches to using MODPY-PEP517

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-algorithm-munkres/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile11 Mar 2022 18:52:31 -  1.12
+++ Makefile11 Sep 2022 05:17:50 -
@@ -1,9 +1,8 @@
 COMMENT =  munkres algorithm for the Assignment Problem
 
-MODPY_EGG_VERSION =1.1.2
+MODPY_EGG_VERSION =1.1.4
 DISTNAME = munkres-${MODPY_EGG_VERSION}
 PKGNAME =  py-algorithm-${DISTNAME}
-REVISION =  2
 
 CATEGORIES =   devel
 
@@ -14,8 +13,7 @@ PERMIT_PACKAGE =  Yes
 
 MODULES =  lang/python
 MODPY_PI = Yes
-MODPY_SETUPTOOLS = Yes
-MODPY_PYTEST = Yes
+MODPY_PEP517 = setuptools
 
 FLAVORS =  python3
 FLAVOR =   python3
Index: distinfo
===
RCS file: /cvs/ports/devel/py-algorithm-munkres/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2019 21:45:47 -  1.5
+++ distinfo11 Sep 2022 05:17:50 -
@@ -1,2 +1,2 @@
-SHA256 (munkres-1.1.2.tar.gz) = genO1Aw9D/xIvkttpc/fqkkEH6qrqAdbFZl07EeSauo=
-SIZE (munkres-1.1.2.tar.gz) = 10860
+SHA256 (munkres-1.1.4.tar.gz) = /ES/PDl52tpLa2M93uuP++g4julAnk1OgxDC2heS2wM=
+SIZE (munkres-1.1.4.tar.gz) = 14047
Index: patches/patch-test_test_munkres_py
===
RCS file: patches/patch-test_test_munkres_py
diff -N patches/patch-test_test_munkres_py
--- patches/patch-test_test_munkres_py  11 Mar 2022 18:52:32 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,97 +0,0 @@
-Move tests from nose to pytest
-https://github.com/bmc/munkres/pull/32
-
-Index: test/test_munkres.py
 test/test_munkres.py.orig
-+++ test/test_munkres.py
-@@ -1,6 +1,6 @@
- from munkres import Munkres, DISALLOWED, UnsolvableMatrix
- import munkres
--from nose.tools import assert_equals, raises
-+import pytest
- 
- m = Munkres()
- 
-@@ -16,7 +16,7 @@ def test_documented_example():
-   [10, 3, 2],
-   [8, 7, 4]]
- cost = _get_cost(matrix)
--assert_equals(cost, 12)
-+assert cost == 12
- 
- def test_5_x_5():
- matrix = [[12, 9, 27, 10, 23],
-@@ -25,7 +25,7 @@ def test_5_x_5():
-   [9, 28, 26, 23, 13],
-   [16, 16, 24, 6, 9]]
- cost = _get_cost(matrix)
--assert_equals(cost, 51)
-+assert cost == 51
- 
- def test_10_x_10():
- matrix = [[37, 34, 29, 26, 19, 8, 9, 23, 19, 29],
-@@ -39,7 +39,7 @@ def test_10_x_10():
-   [21, 25, 23, 39, 31, 37, 32, 33, 38, 1],
-   [17, 34, 40, 10, 29, 37, 40, 3, 25, 3]]
- cost = _get_cost(matrix)
--assert_equals(cost, 66)
-+assert cost == 66
- 
- def test_20_x_20():
- matrix = [[5, 4, 3, 9, 8, 9, 3, 5, 6, 9, 4, 10, 3, 5, 6, 6, 1, 8, 10, 2],
-@@ -63,14 +63,14 @@ def test_20_x_20():
-   [9, 6, 3, 1, 8, 5, 7, 8, 7, 2, 1, 8, 2, 8, 3, 7, 4, 8, 7, 7],
-   [8, 4, 4, 9, 7, 10, 6, 2, 1, 5, 8, 5, 1, 1, 1, 9, 1, 3, 5, 3]]
- cost = _get_cost(matrix)
--assert_equals(cost, 22)
-+assert cost == 22
- 
- def test_disallowed():
- matrix = [[5, 9, DISALLOWED],
-   [10, DISALLOWED, 2],
-   [8, DISALLOWED, 4]]
- cost = _get_cost(matrix)
--assert_equals(cost, 19)
-+assert cost == 19
- 
- def test_profit():
- profit_matrix = [[94, 66, 100, 18, 48],
-@@ -84,7 +84,7 @@ def test_profit():
- )
- indices = m.compute(cost_matrix)
- profit = sum([profit_matrix[row][column] for row, column in indices])
--assert_equals(profit, 392)
-+assert profit == 392
- 
- def test_irregular():
- matrix = [[12, 26, 17],
-@@ -94,7 +94,7 @@ def test_irregular():
-   [15, 93, 55, 80]]
- 
- cost = _get_cost(matrix)
--assert_equals(cost, 43)
-+assert cost == 43
- 
- def test_rectangular():
- matrix = [[34, 26, 17, 12],
-@@ -106,13 +106,13 @@ def test_rectangular():
- padded_matrix = m.pad_matrix(matrix, 0)
- padded_cost = _get_cost(padded_matrix)
- cost = _get_cost(matrix)
--assert_equals(padded_cost, cost)
--assert_equals(cost, 70)
-+assert padded_cost == cost
-+assert cost == 70
- 
--@raises(UnsolvableMatrix)
- def test_unsolvable():
--matrix = [[5, 9, DISALLOWED],
--  [10, DISALLOWED, 2],
--  [DISALLOWED, DISALLOWED, DISALLOWED]]
--m.compute(matrix)
-+

Re: d

[Kurt Mosiejczuk]

On Fri, Sep 09, 2022 at 11:07:01PM +0200, Antoine Jacoutot wrote:
> Hi folks.

> Remove message:
> "*** Python 2.7 is end-of-life and no longer receives security updates."

> I don't have time to handle people sending me emails about what
> they should do about it because they installed gimp which pulls
> x11/py-gtk2 which pulls python2 (and as soon as there's gtk in the
> name, people contact me).  I don't care about outdated py2 gimp
> plugins but according to espie, these py2 plugins are essential to
> gimp even though linux moved away from it.

Having folks pester you was definitely not the intention.

> OK?

ok kmos (maintainer)

--Kurt

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/python/2.7/Makefile,v
> retrieving revision 1.79
> diff -u -p -r1.79 Makefile
> --- Makefile  2 Sep 2022 16:49:03 -   1.79
> +++ Makefile  9 Sep 2022 21:02:31 -
> @@ -8,7 +8,7 @@ SHARED_LIBS = python2.7 0.0
>  VERSION_SPEC =   >=2.7,<2.8
>  PORTROACH =  limit:^2\.7
>  
> -REVISION-main =  10
> +REVISION-main =  11
>  REVISION-idle =  1
>  REVISION-tests = 1
>  REVISION-bsddb = 0
> Index: pkg/MESSAGE-main
> ===
> RCS file: pkg/MESSAGE-main
> diff -N pkg/MESSAGE-main
> --- pkg/MESSAGE-main  23 Mar 2022 11:20:05 -  1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1 +0,0 @@
> -*** Python 2.7 is end-of-life and no longer receives security updates.
> 
> 
> -- 
> Antoine
> 

[maintainer update] Python 3.10.7

[Kurt Mosiejczuk]

https://www.python.org/downloads/release/python-3107/

* gh-95778: Converting between int and str in bases other than 2
(binary), 4, 8 (octal), 16 (hexadecimal), or 32 such as base 10
(decimal) now raises a ValueError if the number of digits in string form
is above a limit to avoid potential denial of service attacks due to the
algorithmic complexity. This is a mitigation for CVE-2020-10735.

This new limit can be configured or disabled by environment variable,
command line flag, or sys APIs. See the integer string conversion length
limitation documentation. The default limit is 4300 digits in string
form.

Patch by Gregory P. Smith [Google] and Christian Heimes [Red Hat] with
feedback from Victor Stinner, Thomas Wouters, Steve Dower, Ned Deily,
and Mark Dickinson.

ok?

(Probably also should be backports to 7.1)

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile2 Sep 2022 16:53:49 -   1.20
+++ Makefile7 Sep 2022 20:24:08 -
@@ -3,11 +3,9 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.6
+FULL_VERSION = 3.10.7
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
-
-REVISION = 1
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo11 Aug 2022 14:01:18 -  1.5
+++ distinfo7 Sep 2022 20:24:08 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.6.tgz) = hIywalyqhdpcRb16kiG7gh4z/CvcugiMEnxY+tROY0M=
-SIZE (Python-3.10.6.tgz) = 25986768
+SHA256 (Python-3.10.7.tgz) = Gy5OLfaXxS02cxZml55ki+7aWUHQ+VdAqvv0Fj5cwSY=
+SIZE (Python-3.10.7.tgz) = 26006589
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.10/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main  11 Aug 2022 14:01:18 -  1.10
+++ pkg/PLIST-main  7 Sep 2022 20:24:10 -
@@ -1848,7 +1848,7 @@ lib/python3.10/ensurepip/_bundled/__pyca
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-1.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-2.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.pyc
-lib/python3.10/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
+lib/python3.10/ensurepip/_bundled/pip-22.2.2-py3-none-any.whl
 lib/python3.10/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
 lib/python3.10/ensurepip/_uninstall.py
 lib/python3.10/enum.py
@@ -2562,15 +2562,15 @@ lib/python3.10/site-packages/_distutils_
 lib/python3.10/site-packages/_distutils_hack/override.py
 lib/python3.10/site-packages/distutils-precedence.pth
 lib/python3.10/site-packages/pip/
-lib/python3.10/site-packages/pip-22.2.1.dist-info/
-lib/python3.10/site-packages/pip-22.2.1.dist-info/INSTALLER
-lib/python3.10/site-packages/pip-22.2.1.dist-info/LICENSE.txt
-lib/python3.10/site-packages/pip-22.2.1.dist-info/METADATA
-lib/python3.10/site-packages/pip-22.2.1.dist-info/RECORD
-lib/python3.10/site-packages/pip-22.2.1.dist-info/REQUESTED
-lib/python3.10/site-packages/pip-22.2.1.dist-info/WHEEL
-lib/python3.10/site-packages/pip-22.2.1.dist-info/entry_points.txt
-lib/python3.10/site-packages/pip-22.2.1.dist-info/top_level.txt
+lib/python3.10/site-packages/pip-22.2.2.dist-info/
+lib/python3.10/site-packages/pip-22.2.2.dist-info/INSTALLER
+lib/python3.10/site-packages/pip-22.2.2.dist-info/LICENSE.txt
+lib/python3.10/site-packages/pip-22.2.2.dist-info/METADATA
+lib/python3.10/site-packages/pip-22.2.2.dist-info/RECORD
+lib/python3.10/site-packages/pip-22.2.2.dist-info/REQUESTED
+lib/python3.10/site-packages/pip-22.2.2.dist-info/WHEEL
+lib/python3.10/site-packages/pip-22.2.2.dist-info/entry_points.txt
+lib/python3.10/site-packages/pip-22.2.2.dist-info/top_level.txt
 lib/python3.10/site-packages/pip/__init__.py
 lib/python3.10/site-packages/pip/__main__.py
 lib/python3.10/site-packages/pip/__pip-runner__.py

[maintainer update] Python 3.9.14

[Kurt Mosiejczuk]

https://www.python.org/downloads/release/python-3914/

* CVE-2020-10735: converting between int and str in bases other than
2 (binary), 4, 8 (octal), 16 (hexadecimal), or 32 such as base 10
(decimal) now raises a ValueError if the number of digits in string form
is above a limit to avoid potential denial of service attacks due to the
algorithmic complexity.

* gh-87389: http.server: Fix an open redirection vulnerability in the
HTTP server when an URI path starts with //.

* gh-93065: Fix contextvars HAMT implementation to handle iteration over
deep trees to avoid a potential crash of the interpreter.

* gh-90355: Fix ensurepip environment isolation for the subprocess
running pip.

ok?

(Should probably backport to 7.1 also...)

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile29 Aug 2022 12:23:42 -  1.30
+++ Makefile7 Sep 2022 19:46:00 -
@@ -3,12 +3,10 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.9.13
+FULL_VERSION = 3.9.14
 SHARED_LIBS =  python3.9 0.0
 VERSION_SPEC = >=3.9,<3.10
 PORTROACH =limit:^3\.9
-
-REVISION = 3
 
 # This is the MODPY_DEFAULT_VERSION_3 version of Python:
 # - override "@comment" setting so that bin/python3 etc are installed
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo26 May 2022 16:28:19 -  1.10
+++ distinfo7 Sep 2022 19:46:00 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.13.tgz) = gpsNJgcqRGiaawgQ9bSjkz7ioLikv8mdfFiT/9T5fEQ=
-SIZE (Python-3.9.13.tgz) = 26355887
+SHA256 (Python-3.9.14.tgz) = kgGDbiwWNhsrdAhoBQI5NzfUTyJzM/4uVynH1fYEFnU=
+SIZE (Python-3.9.14.tgz) = 26365055
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST-main
--- pkg/PLIST-main  11 Aug 2022 02:15:02 -  1.19
+++ pkg/PLIST-main  7 Sep 2022 19:46:01 -
@@ -101,6 +101,7 @@ include/python3.9/internal/pycore_hashta
 include/python3.9/internal/pycore_import.h
 include/python3.9/internal/pycore_initconfig.h
 include/python3.9/internal/pycore_interp.h
+include/python3.9/internal/pycore_long.h
 include/python3.9/internal/pycore_object.h
 include/python3.9/internal/pycore_pathconfig.h
 include/python3.9/internal/pycore_pyerrors.h

Re: lapack: set DPB_PROPERTIES=parallel?

[Kurt Mosiejczuk]

On Tue, Aug 30, 2022 at 07:56:39PM +0100, Stuart Henderson wrote:
> lapack seems happy with a parallel build, and there's quite a time
> saving compared to a single-process build. ok to add DPB_PROPERTIES
> to tell DPB that it's alright to do that?

ok kmos

> Index: Makefile
> ===
> RCS file: /cvs/ports/math/lapack/Makefile,v
> retrieving revision 1.33
> diff -u -p -r1.33 Makefile
> --- Makefile  11 Mar 2022 19:36:17 -  1.33
> +++ Makefile  30 Aug 2022 18:52:49 -
> @@ -1,4 +1,5 @@
>  COMMENT= library of Fortran linear algebra subroutines
> +DPB_PROPERTIES=  parallel
>  
>  VERSION= 3.8.0
>  DISTNAME=lapack-${VERSION}
> 

[maintainer update] textproc/ruby-oj 3.13.20 -> 3.13.21

[Kurt Mosiejczuk]

New release that fixes a bug parsing big numbers fixed in the SAJ parser.

https://github.com/ohler55/oj/blob/develop/CHANGELOG.md

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/converters/ruby-oj/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile18 Aug 2022 00:24:13 -  1.1.1.1
+++ Makefile26 Aug 2022 19:59:16 -
@@ -1,7 +1,7 @@
 
 COMMENT =  fast JSON parser and serializer
 
-DISTNAME = oj-3.13.20
+DISTNAME = oj-3.13.21
 
 CATEGORIES =   converters
 
Index: distinfo
===
RCS file: /cvs/ports/converters/ruby-oj/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo18 Aug 2022 00:24:13 -  1.1.1.1
+++ distinfo26 Aug 2022 19:59:16 -
@@ -1,2 +1,2 @@
-SHA256 (oj-3.13.20.gem) = lRjVAIH0RfJu1rahl/MFxtaNELNcXyH9TnvM1CnfKsY=
-SIZE (oj-3.13.20.gem) = 267264
+SHA256 (oj-3.13.21.gem) = rvMajcxvC5tLtcx6xsxScrLYUd6xGhgEwu1rVQG1DkY=
+SIZE (oj-3.13.21.gem) = 267776

Re: Fwd: [NEW] security/py-in-toto

[Kurt Mosiejczuk]

On Tue, Aug 23, 2022 at 04:12:14PM -0400, George Rosamond wrote:
> Oops.  That second email had the correct tarball but with the wrong
> forwarded email.

> https://marc.info/?l=openbsd-ports&m=166012227330190&w=2

> Again, here's sthen@'s email and his tarball attached.

This and py-securesystemslib imported.

Thanks George!

--Kurt

Re: [update] devel/py-argcomplete 1.9.3 -> 2.0.0

[Kurt Mosiejczuk]

On Tue, Jul 19, 2022 at 03:30:50AM -0400, Kurt Mosiejczuk wrote:
> https://github.com/kislyuk/argcomplete/blob/develop/Changes.rst

> Update to 2.0.0

> Brings fish shell support and Python 3.10 support

> Tests for all TEST_DEPENDS consumers complete the same before and after.

> ok?

ping

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-argcomplete/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile11 Mar 2022 18:52:32 -  1.18
+++ Makefile22 Aug 2022 20:30:39 -
@@ -1,10 +1,9 @@
 COMMENT =  bash tab completion for argparse
 
-MODPY_EGG_VERSION =1.9.3
+MODPY_EGG_VERSION =2.0.0
 DISTNAME = argcomplete-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
-REVISION = 5
 
 # GPLv3+
 PERMIT_PACKAGE=Yes
@@ -17,10 +16,16 @@ MODPY_SETUPTOOLS =  Yes
 FLAVORS =  python3
 FLAVOR =   python3
 
-TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS =test/test.py
+
+TEST_DEPENDS = devel/flake8 \
+   devel/py-coverage${MODPY_FLAVOR} \
devel/py-pexpect${MODPY_FLAVOR} \
+   devel/py-pip${MODPY_FLAVOR} \
devel/py-wheel${MODPY_FLAVOR} \
shells/bash \
+   shells/fish \
shells/tcsh
 
 pre-test:
Index: distinfo
===
RCS file: /cvs/ports/devel/py-argcomplete/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo9 Feb 2018 08:52:29 -   1.6
+++ distinfo22 Aug 2022 20:30:39 -
@@ -1,2 +1,2 @@
-SHA256 (argcomplete-1.9.3.tar.gz) = 
2Xt/PPqk5JStWe1tBMk4/F7Wm1kL2PUydOJY+xEZvRs=
-SIZE (argcomplete-1.9.3.tar.gz) = 46788
+SHA256 (argcomplete-2.0.0.tar.gz) = 
Y3KteMidZiA1EBQYriU2aERbORdVz+lOpS8bnSJCWyA=
+SIZE (argcomplete-2.0.0.tar.gz) = 54164
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  11 Mar 2022 18:52:32 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -4,7 +4,7 @@ import glob
- from setuptools import setup, find_packages
- 
- install_requires = []
--tests_require = ["coverage", "flake8", "pexpect", "wheel"]
-+tests_require = ["coverage", "pexpect", "wheel"]
- 
- setup(
- name='argcomplete',
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-argcomplete/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   11 Mar 2022 18:52:32 -  1.7
+++ pkg/PLIST   22 Aug 2022 20:30:39 -
@@ -1,5 +1,5 @@
-@pkgpath devel/py-argcomplete
 @conflict py-argcomplete-<1.9.3p2
+@pkgpath devel/py-argcomplete
 bin/activate-global-python-argcomplete
 bin/python-argcomplete-check-easy-install-script
 bin/python-argcomplete-tcsh
@@ -15,15 +15,17 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/argcomplete/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}_check_console_script.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}_check_module.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}completers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}my_argparse.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}my_shlex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}shell_integration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/argcomplete/_check_console_script.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/_check_module.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/bash_completion.d/
-lib/python${MODPY_VERSION}/site-packages/argcomplete/bash_completion.d/python-argcomplete.sh
-lib/python${MODPY_VERSION}/site-packages/argcomplete/compat.py
+lib/python${MODPY_VERSION}/site-packages/argcomplete/bash_completion.d/python-argcomplete
 lib/python${MODPY_VERSION}/site-packages/argcomplete/completers.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/my_argparse.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/my_shlex.py
+lib/python${MODPY_VERSION}/site-packages/argcomplete/shell_integration.py

Re: sparc64 bulk build report

[Kurt Mosiejczuk]

On Fri, Aug 19, 2022 at 01:32:53AM +0200, Jeremie Courreges-Anglas wrote:

> Here's a diff for samba.  It would be possible to just ditch __thread in
> the embedded heimdal source code since base-gcc doesn't support TLS
> emulation.  But samba is moving fast and I suspect that other parts
> will start requiring features not supported by base-gcc.

> Does this fix the build on sparc64?  ok?

It fixes sparc64. ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/samba/Makefile,v
> retrieving revision 1.316
> diff -u -p -r1.316 Makefile
> --- Makefile  29 Jul 2022 10:43:01 -  1.316
> +++ Makefile  18 Aug 2022 23:20:17 -
> @@ -61,6 +61,9 @@ MASTER_SITES =  https://download.samba.o
>  MULTI_PACKAGES = -main -docs
>  DEBUG_PACKAGES = ${BUILD_PACKAGES}
>  
> +COMPILER =   base-clang ports-gcc
> +COMPILER_LANGS = c
> +
>  MODULES =lang/python perl
>  
>  BUILD_DEPENDS =  converters/p5-JSON \
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

Re: NEW: sysutils/py-command_runner

[Kurt Mosiejczuk]

On Sat, Aug 20, 2022 at 02:12:41PM +0100, Stuart Henderson wrote:
> ok to import? librenms wants this for some things.

ok kmos to import

--Kurt

> -
> command_runner's purpose is to run external commands from Python, just
> like "subprocess" on which it relies, while solving various problems a
> developer may face, including:
> 
> - Handling of all possible subprocess.popen / subprocess.check_output
> scenarios / python versions in one handy function without encoding /
> timeout hassle.
> 
> - Allow stdout/stderr stream output to be redirected to callback
> functions / output queues / files so you get to handle output in your
> application while commands are running.
> 
> - Callback to optional stop check so we can stop execution from outside
> command_runner.
> 
> - Callback with optional process information so we get to control the
> process from outside command_runner.
> -

Re: NEW: devel/py-hatch-fancy-pypi-readme

[Kurt Mosiejczuk]

On Fri, Aug 19, 2022 at 01:24:44PM +0100, Stuart Henderson wrote:
> Bit annoying that it's a BDEP of ports which use it, but there you go...
> Needed to update py-jsonschema.  OK to import?

One test fails with python saying it cannot find the module itself, but
otherwise looks great. The one test may not matter.

ok kmos to import

--Kurt

> ---
> hatch-fancy-pypi-readme is a Hatch metadata plugin which allows you to
> define your PyPI project description in terms of concatenated fragments
> that are based on static strings, files, and most importantly: parts of
> files defined using cut-off points or regular expressions.
> ---

Re: virtualenv update, new ports needed

[Kurt Mosiejczuk]

On Thu, Aug 18, 2022 at 05:33:59PM +0100, Stuart Henderson wrote:
> ok to import the deps for this?

> devel/py-hatch-vcs
> sysutils/py-distlib
> sysutils/py-platformdirs

The tests on py-platformdirs wants a self-DEPENDS for the tests to run.
It's also missing py-test-mock from TEST_DEPENDS

Otherwise, ok kmos on all 3

> while virtualenv moves to py3-only, it can still be used to create a
> py2 environment:
> 
> $ virtualenv -p python2 test_py2env
> created virtual environment CPython2.7.18.final.0-64 in 491ms
>   creator CPython2Posix(dest=/tmp/test_py2env, clear=False, 
> no_vcs_ignore=False, global=False)
>   seeder FromAppData(download=False, pip=bundle, setuptools=bundle, 
> wheel=bundle, via=copy, app_data_dir=/home/sthen/.local/share/virtualenv)
> added seed packages: pip==20.3.4, setuptools==44.1.1, wheel==0.37.1
>   activators 
> BashActivator,CShellActivator,FishActivator,NushellActivator,PowerShellActivator,PythonActivator
> 
> (there's a BDEP in tor-browser on the python 2 version of virtualenv
> but it doesn't actually use virtualenv from packages at all anyway;
> diff pending with caspar@ to drop that).

This also needs a self-DEPENDS for the tests to run.
Otherwise ok kmos

(There should be a way to fix this, but the methods I remember aren't working
so it requires more investigation)

--Kurt

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-virtualenv/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- Makefile  18 Mar 2022 22:15:24 -  1.41
> +++ Makefile  18 Aug 2022 16:29:05 -
> @@ -1,7 +1,6 @@
>  COMMENT =virtual Python environment builder
>  
> -# more current virtualenv versions need additional py2 RDEPs
> -MODPY_EGG_VERSION =  16.7.10
> +MODPY_EGG_VERSION =  20.16.3
>  DISTNAME =   virtualenv-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
>  CATEGORIES = devel
> @@ -16,19 +15,23 @@ MODULES = lang/python
>  MODPY_PI =   Yes
>  MODPY_PYTEST =   Yes
>  MODPY_PYTEST_ARGS =  tests
> -MODPY_SETUPTOOLS =   Yes
> +MODPY_PEP517 =   setuptools
>  
>  # messes up naming of packaged wheels
>  UPDATE_PLIST_ARGS =  -i MODPY_PY_PREFIX
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>  
> -.if ${FLAVOR:Mpython3}
> -TEST_DEPENDS =   devel/py-mock${MODPY_FLAVOR}
> -.endif
> -
> -post-install:
> - mv ${PREFIX}/bin/virtualenv{,${MODPY_BIN_SUFFIX}}
> +BUILD_DEPENDS =  devel/py-setuptools_scm${MODPY_FLAVOR}
> +RUN_DEPENDS =sysutils/py-distlib${MODPY_FLAVOR} \
> + sysutils/py-filelock${MODPY_FLAVOR} \
> + sysutils/py-platformdirs${MODPY_FLAVOR}
> +TEST_DEPENDS =   devel/py-coverage${MODPY_FLAVOR} \
> + devel/py-flaky${MODPY_FLAVOR} \
> + devel/py-mock${MODPY_FLAVOR} \
> + devel/py-test-mock${MODPY_FLAVOR} \
> + devel/py-test-timeout${MODPY_FLAVOR} \
> + sysutils/py-packaging${MODPY_FLAVOR}
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/py-virtualenv/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- distinfo  25 Feb 2022 12:00:15 -  1.15
> +++ distinfo  18 Aug 2022 16:29:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (virtualenv-16.7.10.tar.gz) = 
> 6I/csIsOyxHal4aPRj3QYnWSP1DYf0uciy/AmU7sQPQ=
> -SIZE (virtualenv-16.7.10.tar.gz) = 5121882
> +SHA256 (virtualenv-20.16.3.tar.gz) = 
> 2G6gu1DgYlLXnmwkFQfLkE/NZgkMMnE4E3LWIho5cPk=
> +SIZE (virtualenv-20.16.3.tar.gz) = 12219368
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/py-virtualenv/pkg/PLIST,v
> retrieving revision 1.23
> diff -u -p -r1.23 PLIST
> --- pkg/PLIST 11 Mar 2022 18:53:02 -  1.23
> +++ pkg/PLIST 18 Aug 2022 16:29:05 -
> @@ -1,21 +1,377 @@
>  @conflict py-virtualenv-<16.0.0p5
>  bin/virtualenv${MODPY_BIN_SUFFIX}
> -lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
> -lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}virtualenv.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/virtualenv-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> -lib/python${MODPY_VERSION}/site-packages/virtualenv-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> -lib/python${MODPY_VERSION}/site-packages/virtualenv-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
> -lib/python${MODPY_VERSION}/site-packages/virtualenv-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> -lib/python${MODPY_VERSION}/site-packages/virtualenv-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
> -lib/python${MODPY_VERSION}/site-packages/virtualenv-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.

Re: retire net/honeyd?

[Kurt Mosiejczuk]

On Thu, Aug 18, 2022 at 03:27:55PM +0100, Stuart Henderson wrote:
> "Honeyd is a small daemon that creates virtual hosts on a network. The
> hosts can be configured to run arbitrary services, and their personality
> can be adapted so that they appear to be running certain operating
> systems. Honeyd enables a single host to claim multiple addresses -
> I have tested up to 65536 - on a LAN for network simulation. Honeyd
> improves cyber security by providing mechanisms for threat detection and
> assessment. It also deters adversaries by hiding real systems in the
> middle of virtual systems. "

> Not updated since 2007 and it says, "Because Honeyd interacts with
> potentially malicious adversaries, you should sandbox it with Systrace".

Yikes.

> Is there any reason to keep it?

Not that I can see. ok kmos to remove.

--Kurt

Re: retrie devel/pyrex?

[Kurt Mosiejczuk]

On Thu, Aug 18, 2022 at 03:31:18PM +0100, Stuart Henderson wrote:
> "Pyrex lets you write code that mixes Python and C data types any way
> you want, and compiles it into a C extension for Python."

> From 2010, unused in ports, and people doing this today use Cython.
> Any reason to keep it?

I say let it go. ok kmos to remove

--Kurt

Re: NEW: devel/py-poetry-core

[Kurt Mosiejczuk]

On Wed, Aug 17, 2022 at 11:55:56PM +0100, Stuart Henderson wrote:
> New port for another PEP517 build backend attached, OK?

> Here's the python.port.mk bit to go with it.

ok kmos on both parts

--Kurt

> Index: lang/python/python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.159
> diff -u -p -r1.159 python.port.mk
> --- lang/python/python.port.mk16 Aug 2022 12:10:28 -  1.159
> +++ lang/python/python.port.mk17 Aug 2022 17:01:26 -
> @@ -203,6 +203,8 @@ BUILD_DEPENDS +=  devel/py-flit_core${MOD
>  BUILD_DEPENDS += devel/py-flit${MODPY_FLAVOR}
>  .  elif ${MODPY_PEP517} == hatchling
>  BUILD_DEPENDS += devel/py-hatchling${MODPY_FLAVOR}
> +.  elif ${MODPY_PEP517} == poetry-core
> +BUILD_DEPENDS += devel/py-poetry-core${MODPY_FLAVOR}
>  .  elif ${MODPY_PEP517} == setuptools
>  BUILD_DEPENDS += devel/py-setuptools${MODPY_FLAVOR} \
>   devel/py-wheel${MODPY_FLAVOR}

[new] converters/ruby-oj

[Kurt Mosiejczuk]

A fast JSON parser and Object marshaller as a Ruby gem.

ok to import?

--Kurt


ruby-oj.tgz
Description: application/tar-gz

Re: Fwd: [NEW] net/py-websockets

[Kurt Mosiejczuk]

On Wed, Aug 17, 2022 at 02:45:26PM +0100, Stuart Henderson wrote:
> OK sthen@ to import.

Imported.

Thanks George!

--Kurt

Fix build of comms/gammu for sparc64

[Kurt Mosiejczuk]

The switch to MODCMAKE_LDFLAGS doesn't work as intended. Nothing gets
passed through to the command line.

Switching it just to LDFLAGS fixes the build on sparc64 and doesn't break
build no amd64.

ok?

(cc MAINTAINER)

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/comms/gammu/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile28 May 2022 06:19:58 -  1.17
+++ Makefile15 Aug 2022 17:01:46 -
@@ -35,7 +35,7 @@ CONFIGURE_ARGS += -DINSTALL_MAN_DIR:STRI
-Wno-dev
 
 CFLAGS +=  -I${LOCALBASE}/include
-MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -liconv -lintl
+LDFLAGS =  -L${LOCALBASE}/lib -liconv -lintl
 
 FLAVORS += mysql pgsql
 FLAVOR ?=

Re: sparc64 bulk build report

[Kurt Mosiejczuk]

On Fri, Aug 12, 2022 at 10:21:18AM +0100, Stuart Henderson wrote:
> I think that wants "COMPILER_LANGS= c" as well

Nope. It uses C++ as well. ok kmos for Martin's version. It fixed the build
for sparc64

--Kurt

> On 12 August 2022 08:03:28 Martin Reindl  wrote:
> 
> > On Thu, Aug 11, 2022 at 11:55:46PM -0600, k...@openbsd.org wrote:
> > > Bulk build on sparc64-0a.ports.openbsd.org
> > > 
> > > http://build-failures.rhaalovely.net/sparc64/2022-08-09/math/arpack.log
> > 
> > Can anyone test please?
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/math/arpack/Makefile,v
> > retrieving revision 1.24
> > diff -u -p -u -p -r1.24 Makefile
> > --- Makefile24 May 2022 19:28:58 -  1.24
> > +++ Makefile12 Aug 2022 06:51:28 -
> > @@ -7,7 +7,7 @@ PKGNAME =   arpack-${GH_TAGNAME}
> > GH_ACCOUNT =opencollab
> > GH_PROJECT =arpack-ng
> > EPOCH = 0
> > -REVISION = 0
> > +REVISION = 1
> > 
> > MULTI_PACKAGES =-main -mpi
> > FLAVORS =   no_mpi
> > @@ -22,6 +22,8 @@ HOMEPAGE =https://github.com/opencollab
> > 
> > # BSD 3-Clause
> > PERMIT_PACKAGE =Yes
> > +
> > +COMPILER = base-clang ports-gcc
> > 
> > MODULES =   fortran \
> > devel/cmake
> 

Re: arm bulk build report

[Kurt Mosiejczuk]

On Sun, Aug 14, 2022 at 10:31:01PM +0200, Jeremie Courreges-Anglas wrote:

> >> These take out a huge amount of the ports tree on armv7, and it would be
> >> great if someone can look at them.  They all have the same error, and
> >> presumably would have the same/similar fixes.

> > I think this is due to the enabling of optimization on lld arches. 
> > powerpc has already opted out, it seems arm should be added to that list.

> Something like this?

Yes. Something _exactly_ like that. :)

ok kmos

--Kurt

> Index: Makefile.inc
> ===
> RCS file: /home/cvs/ports/lang/python/Makefile.inc,v
> retrieving revision 1.150
> diff -u -p -p -u -r1.150 Makefile.inc
> --- Makefile.inc  7 Aug 2022 17:00:43 -   1.150
> +++ Makefile.inc  14 Aug 2022 20:29:51 -
> @@ -123,7 +123,8 @@ CONFIGURE_ARGS += --with-fpectl \
>  CONFIGURE_ARGS +=--enable-loadable-sqlite-extensions
>  .  if ${PROPERTIES:Mlld}
>  CONFIGURE_ARGS +=--with-lto
> -.if ${MACHINE_ARCH} != "powerpc"
> +.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "powerpc"
> +# On armv7, clang errors out due to lack of memory.
>  # On powerpc, the python binary would crash by "Segmentation fault".
>  CONFIGURE_ARGS +=--enable-optimizations
>  .endif
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

Re: arm bulk build report

[Kurt Mosiejczuk]

On Sun, Aug 14, 2022 at 03:45:03PM +0200, Peter Hessler wrote:
> On 2022 Aug 13 (Sat) at 11:19:34 -0600 (-0600), phess...@openbsd.org wrote:
> :http://build-failures.rhaalovely.net/arm/2022-08-01/lang/go.log

> bootstrap problem, presumably fixed after all of the recent bootstrap
> juggling.

> :http://build-failures.rhaalovely.net/arm/2022-08-01/lang/python/3.10,-gdbm.log
> :http://build-failures.rhaalovely.net/arm/2022-08-01/lang/python/3.8,-gdbm.log
> :http://build-failures.rhaalovely.net/arm/2022-08-01/lang/python/3.9.log

>   LLVM ERROR: out of memory

> These take out a huge amount of the ports tree on armv7, and it would be
> great if someone can look at them.  They all have the same error, and
> presumably would have the same/similar fixes.

I think this is due to the enabling of optimization on lld arches. 
powerpc has already opted out, it seems arm should be added to that list.

--Kurt

Disable python/PyPI module of portgen

[Kurt Mosiejczuk]

portgen's Python/PyPI module has been rotting. At this point it does not
generate a port that is usable. These diffs disable the functionality and
pull metion of it from the portgen(1) man page.

It doesn't delete the modules yet, in case someone wants to whip it back
into shape.

ok?

--Kurt
Index: portgen.1
===
RCS file: /cvs/src/share/man/man1/portgen.1,v
retrieving revision 1.8
diff -u -p -r1.8 portgen.1
--- portgen.1   13 Jan 2022 18:39:14 -  1.8
+++ portgen.1   12 Aug 2022 20:15:54 -
@@ -63,8 +63,6 @@ values:
 .Bl -inset -offset indent -compact
 .It Cm p5
 for Perl modules on CPAN.
-.It Cm py
-for Python modules on PyPI.
 .It Cm ruby
 for Ruby gems.
 .It Cm go
Index: portgen
===
RCS file: /cvs/ports/infrastructure/bin/portgen,v
retrieving revision 1.5
diff -u -p -r1.5 portgen
--- portgen 5 Jan 2022 09:12:50 -   1.5
+++ portgen 12 Aug 2022 20:17:54 -
@@ -43,7 +43,6 @@ my ( $type, $module ) = @ARGV;
 
 my $map = {
p5 => 'CPAN',
-   py => 'PyPI',
ruby => 'Ruby',
go => 'Go',
 };

Re: WIP, RFC: handling python ports with pyproject.toml and various backends (pep517)

[Kurt Mosiejczuk]

On Fri, Aug 12, 2022 at 03:43:32PM +0100, Stuart Henderson wrote:

> Updated to add a missing BUILD_DEPENDS, fix a copy+paste error that
> jca@ spotted, and use grep to show the build backend if pyproject.toml
> is present and MODPY_PEP517 isn't set (as an aid to port maintainers;
> I may tweak how that's done when I have more experience using it).

> I'd like to start using it to clean up some of the pep517-based ports
> in tree already and iterate further from there, does anyone have
> concerns?

> Using "MODPY_PEP517=hatchling" requires the 2 ports I've just sent
> separately.

This looks sane to me. ok kmos

--Kurt

> Index: python.port.mk
> ===
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.147
> diff -u -p -r1.147 python.port.mk
> --- python.port.mk4 Aug 2022 19:15:59 -   1.147
> +++ python.port.mk12 Aug 2022 14:20:15 -
> @@ -147,8 +147,23 @@ RUN_DEPENDS +=   ${MODPY_RUN_DEPENDS}
>  TEST_DEPENDS +=  ${MODPY_TEST_DEPENDS}
>  .endif
>  
> +MODPY_SETUPTOOLS ?=
> +MODPY_SETUPUTILS ?=
> +MODPY_PEP517 ?=  No
> +MODPY_PI ?=
> +
>  _MODPY_PRE_BUILD_STEPS = :
> -.if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
> +
> +.if ${MODPY_PEP517:L} == "no"
> +_MODPY_PRE_BUILD_STEPS += ; if [ -e ${WRKSRC}/pyproject.toml ] && \
> + ! grep -q ^build-backend.*setuptools ${WRKSRC}/pyproject.toml; then \
> + printf "\n***\n\nOpenBSD ports: should this use MODPY_PEP517?\n"; \
> + grep ^build-backend ${WRKSRC}/pyproject.toml || true; \
> + printf "\n***\n\n"; fi
> +.endif
> +
> +
> +.if ${MODPY_SETUPTOOLS:L} == "yes"
>  # The setuptools module provides a package locator (site.py) that is
>  # required at runtime for the pkg_resources stuff to work
>  .  if ${MODPY_MAJOR_VERSION} == 2
> @@ -160,6 +175,7 @@ MODPY_SETUPUTILS_DEPEND ?= devel/py-setu
>  MODPY_RUN_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
>  BUILD_DEPENDS += ${MODPY_SETUPUTILS_DEPEND}
>  MODPY_SETUPUTILS =   Yes
> +
>  # The setuptools uses test target
>  TEST_TARGET ?=   test
>  _MODPY_USERBASE =
> @@ -174,6 +190,16 @@ _MODPY_PRE_BUILD_STEPS += ;${MODPY_CMD} 
>  # that plugin will cause failure at the end of build.
>  # In the absence of a targetted means of disabling this, use a big hammer:
>  DPB_PROPERTIES +=nojunk
> +.elif ${MODPY_PEP517:L} != no
> +BUILD_DEPENDS += devel/py-installer${MODPY_FLAVOR} \
> + devel/py-pip${MODPY_FLAVOR}
> +.  if ${MODPY_PEP517:L:Mflit_core}
> +BUILD_DEPENDS += devel/py-flit_core${MODPY_FLAVOR}
> +.  elif ${MODPY_PEP517:L:Mflit}
> +BUILD_DEPENDS += devel/py-flit${MODPY_FLAVOR}
> +.  elif ${MODPY_PEP517:L:Mhatch}
> +BUILD_DEPENDS += devel/py-hatchling${MODPY_FLAVOR}
> +.  endif
>  .else
>  # Try to detect the case where a port will build regardless of setuptools
>  # but the final plist will be different if it's present.
> @@ -192,7 +218,7 @@ MODPY_SETUPUTILS =No
>  _MODPY_USERBASE =${WRKDIR}
>  .endif
>  
> -.if defined(MODPY_PI) && ${MODPY_PI:L} == "yes"
> +.if ${MODPY_PI:L} == "yes"
>  _MODPY_EGG_NAME =${DISTNAME:S/-${MODPY_EGG_VERSION}//}
>  MODPY_PI_DIR ?=  
> ${DISTNAME:C/^([a-zA-Z0-9]).*/\1/}/${_MODPY_EGG_NAME}
>  MASTER_SITES =   ${MASTER_SITE_PYPI:=${MODPY_PI_DIR}/}
> @@ -268,6 +294,17 @@ MODPY_ADJ_FILES ?=
>  MODPYTHON_pre-configure += cd ${WRKSRC} && ${MODPY_BIN_ADJ} 
> ${MODPY_ADJ_FILES}
>  .endif
>  
> +.if ${MODPY_PEP517:L} != no
> +MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
> + cd ${WRKSRC} && pip wheel -v --no-index --no-cache --no-deps 
> --no-build-isolation .
> +MODPY_INSTALL_TARGET = \
> + ${INSTALL_DATA_DIR} ${WRKINST}${MODPY_LIBDIR}; \
> + ${MODPY_BIN} -m installer -d ${WRKINST} ${WRKSRC}/*.whl
> +MODPY_TEST_TARGET =  ${MODPY_TEST_CMD}
> +.  if ${MODPY_PYTEST:L} == "yes"
> +MODPY_TEST_TARGET += ${MODPY_PYTEST_ARGS}
> +.  endif
> +.else
>  MODPY_BUILD_TARGET = ${_MODPY_PRE_BUILD_STEPS}; \
>   ${MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS}
>  MODPY_INSTALL_TARGET = \
> @@ -275,10 +312,11 @@ MODPY_INSTALL_TARGET = \
>   ${MODPY_DISTUTILS_INSTALL} ${MODPY_DISTUTILS_INSTALLARGS}
>  
>  MODPY_TEST_TARGET =  ${MODPY_TEST_CMD}
> -.if ${MODPY_PYTEST:L} == "yes"
> +.  if ${MODPY_PYTEST:L} == "yes"
>  MODPY_TEST_TARGET += ${MODPY_PYTEST_ARGS}
> -.elif ${MODPY_SETUPUTILS:L} == "yes"
> +.  elif ${MODPY_SETUPUTILS:L} == "yes"
>  MODPY_TEST_TARGET += ${TEST_TARGET}
> +.  endif
>  .endif
>  
>  # dirty way to do it with no modifications in bsd.port.mk
> 

Re: devel/py-hatchling, devel/py-editables

[Kurt Mosiejczuk]

On Fri, Aug 12, 2022 at 03:42:18PM +0100, Stuart Henderson wrote:
> Software using Python PEP517 builds use various backends, one is the old
> familiar setuptools, another is flit_core which we have in ports, here's
> a port for another one, Hatchling, plus a required dependency.

> OK to import?  (the do-build/do-install mess in py-hatchling will go away
> with the python.port.mk changes I'm sending separately).

ok kmos to import

(I am about to ok the python.port.mk change too, so if you want to
commit that first and then just import the cleaned up version, ok)

--Kurt

> py-hatchling:

> Hatchling is the extensible, standards compliant build backend used by Hatch.

> py-editables:

> This library supports the building of wheels which, when installed, will
> expose packages in a local directory on sys.path in "editable mode".
> In other words, changes to the package source will be reflected in the
> package visible to Python, without needing a reinstall.

[maintainer update] glfw 3.3.7 -> 3.3.8

[Kurt Mosiejczuk]

https://www.glfw.org/changelog.html

A number of bugfixes but no symbol changes.

I used it with lwjgl3 (via Blockgame) with no issues.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/graphics/glfw/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile28 May 2022 06:20:01 -  1.9
+++ Makefile11 Aug 2022 17:03:44 -
@@ -1,6 +1,6 @@
 COMMENT =  open source, multi-platform library for creating windows
 
-V =3.3.7
+V =3.3.8
 DISTNAME = glfw-${V}
 CATEGORIES =   graphics x11
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/glfw/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo8 May 2022 22:29:59 -   1.6
+++ distinfo11 Aug 2022 17:03:44 -
@@ -1,2 +1,2 @@
-SHA256 (glfw-3.3.7.zip) = TvDFRKis6abNDgrvglAJD4n+ob+W6fwdnW92OGwpDJw=
-SIZE (glfw-3.3.7.zip) = 1468890
+SHA256 (glfw-3.3.8.zip) = TQJQg8xKPdH5Grm5uk9YBxk4I+Vlpbz0viAmadmRHqY=
+SIZE (glfw-3.3.8.zip) = 1495490

[NEW] graphics/ruby-rqrcode

[Kurt Mosiejczuk]

rqrcode is a library for encoding QR Codes. The simple interface
allows you to create QR Code data structures and then render them
in the way you choose.

This needs the graphics/ruby-chunky_png port I just sent out.

ok to import?

--Kurt


ruby-rqrcode.tgz
Description: application/tar-gz

[NEW] graphics/ruby-chunky_png

[Kurt Mosiejczuk]

This pure Ruby library can read and write PNG images without depending
on an external image library, like RMagick. It tries to be memory
efficient and reasonably fast.  It supports reading and writing all
PNG variants that are defined in the specification, with one
limitation: only 8-bit color depth is supported.

ok to import?

--Kurt


ruby-chunky_png.tgz
Description: application/tar-gz

[maintainer update] Python 3.10.6

[Kurt Mosiejczuk]

https://docs.python.org/release/3.10.6/whatsnew/changelog.html#python-3-10-6-final

Two security fixes among many others.

gh-87389: http.server: Fix an open redirection vulnerability in the HTTP
server when an URI path starts with //. Vulnerability discovered, and
initial fix proposed, by Hamza Avvan.

gh-92888: Fix memoryview use after free when accessing the backing
buffer in certain cases.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/lang/python/3.10/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile27 Jul 2022 06:20:10 -  1.17
+++ Makefile10 Aug 2022 21:06:04 -
@@ -3,11 +3,9 @@
 # requirement of the PSF license, if it constitutes a change to
 # Python itself.
 
-FULL_VERSION = 3.10.5
+FULL_VERSION = 3.10.6
 SHARED_LIBS =  python3.10 0.0
 VERSION_SPEC = >=3.10,<3.11
 PORTROACH =limit:^3\.10
-
-REVISION = 2
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/lang/python/3.10/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jun 2022 20:22:41 -  1.4
+++ distinfo10 Aug 2022 21:06:04 -
@@ -1,2 +1,2 @@
-SHA256 (Python-3.10.5.tgz) = GPVxgqLeOwvnbfw5/c/SgVa7bdI+Xwhpb3SS6ePQvy0=
-SIZE (Python-3.10.5.tgz) = 25628472
+SHA256 (Python-3.10.6.tgz) = hIywalyqhdpcRb16kiG7gh4z/CvcugiMEnxY+tROY0M=
+SIZE (Python-3.10.6.tgz) = 25986768
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/lang/python/3.10/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-setup_py
--- patches/patch-setup_py  9 Jun 2022 14:49:29 -   1.5
+++ patches/patch-setup_py  10 Aug 2022 21:06:04 -
@@ -1,7 +1,7 @@
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -1151,6 +1151,8 @@ class PyBuildExt(build_ext):
+@@ -1150,6 +1150,8 @@ class PyBuildExt(build_ext):
   'termcap'):
  readline_libs.append('termcap')
  self.add(Extension('readline', ['readline.c'],
@@ -10,7 +10,7 @@ Index: setup.py
 library_dirs=['/usr/lib/termcap'],
 extra_link_args=readline_extra_link_args,
 libraries=readline_libs))
-@@ -1870,7 +1872,7 @@ class PyBuildExt(build_ext):
+@@ -1872,7 +1874,7 @@ class PyBuildExt(build_ext):
  uuid_h = sysconfig.get_config_var("HAVE_UUID_H")
  uuid_uuid_h = sysconfig.get_config_var("HAVE_UUID_UUID_H")
  if uuid_h or uuid_uuid_h:
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/python/3.10/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main  8 Jun 2022 14:50:04 -   1.9
+++ pkg/PLIST-main  10 Aug 2022 21:06:05 -
@@ -1848,8 +1848,8 @@ lib/python3.10/ensurepip/_bundled/__pyca
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-1.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-2.pyc
 lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.pyc
-lib/python3.10/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
-lib/python3.10/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl
+lib/python3.10/ensurepip/_bundled/pip-22.2.1-py3-none-any.whl
+lib/python3.10/ensurepip/_bundled/setuptools-63.2.0-py3-none-any.whl
 lib/python3.10/ensurepip/_uninstall.py
 lib/python3.10/enum.py
 lib/python3.10/filecmp.py
@@ -2562,20 +2562,22 @@ lib/python3.10/site-packages/_distutils_
 lib/python3.10/site-packages/_distutils_hack/override.py
 lib/python3.10/site-packages/distutils-precedence.pth
 lib/python3.10/site-packages/pip/
-lib/python3.10/site-packages/pip-22.0.4.dist-info/
-lib/python3.10/site-packages/pip-22.0.4.dist-info/INSTALLER
-lib/python3.10/site-packages/pip-22.0.4.dist-info/LICENSE.txt
-lib/python3.10/site-packages/pip-22.0.4.dist-info/METADATA
-lib/python3.10/site-packages/pip-22.0.4.dist-info/RECORD
-lib/python3.10/site-packages/pip-22.0.4.dist-info/REQUESTED
-lib/python3.10/site-packages/pip-22.0.4.dist-info/WHEEL
-lib/python3.10/site-packages/pip-22.0.4.dist-info/entry_points.txt
-lib/python3.10/site-packages/pip-22.0.4.dist-info/top_level.txt
+lib/python3.10/site-packages/pip-22.2.1.dist-info/
+lib/python3.10/site-packages/pip-22.2.1.dist-info/INSTALLER
+lib/python3.10/site-packages/pip-22.2.1.dist-info/LICENSE.txt
+lib/python3.10/site-packages/pip-22.2.1.dist-info/METADATA
+lib/python3.10/site-packages/pip-22.2.1.dist-info/RECORD
+lib/python3.10/site-packages/pip-22.2.1.dist-info/REQUESTED
+lib/python3.10/site-packages/pip-22.2.1.dist-info/WHEEL
+lib/python3.10/site-packages/pip-22.2.1.dist-info/entry_points.txt
+lib/python3.10/site-packages/pip-22.2.1.dist-info/top_level.txt
 lib/python3.10/

Re: [macppc] unbreak lang/python, segfault in PGO

[Kurt Mosiejczuk]

On Sat, Aug 06, 2022 at 11:59:33PM -0400, George Koehler wrote:
> We recently added --enable-optimizations in lang/python/3.* for PGO
> (Profile Guided Optimization), on all platforms where the linker is
> lld.  Turns out, this breaks on macppc (powerpc).  The build segfaults
> as soon as it tries to run the linked python binary,

> cc -pthread -L/usr/local/lib/  -flto -g 
> -L/usr/obj/ports/Python-3.9.13/Python-3.
> 9.13 -L/usr/local/lib/ -fprofile-instr-generate -Wl,--export-dynamic -o 
> python P
> rograms/python.o -L. -lpython3.9 -lintl -lpthread  -lutil -lm   -lm 
> LD_LIBRARY_PATH=/usr/obj/ports/Python-3.9.13/Python-3.9.13 ./python -E -S -m 
> sys
> config --generate-posix-vars ; if test $? -ne 0 ; then  echo 
> "generate-posix-var
> s failed" ;  rm -f ./pybuilddir.txt ;  exit 1 ;  fi
> Segmentation fault (core dumped) 
> *** Error 139 in . (Makefile:623 'pybuilddir.txt')

> There is no problem on powerpc64; this seems to be a bug in clang or
> lld specific to 32-bit powerpc.  I don't know how to reproduce this
> bug outside of python.  All of python 3.8, 3.9, 3.10 are broken; they
> all get packaged after I remove --enable-optimizations.

> May I commit this diff, which removes --enable-optimizations on
> powerpc?--George

Looks reasonable. ok kmos@

--Kurt

> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/lang/python/Makefile.inc,v
> retrieving revision 1.149
> diff -u -p -r1.149 Makefile.inc
> --- Makefile.inc  27 Jul 2022 06:20:10 -  1.149
> +++ Makefile.inc  6 Aug 2022 21:35:35 -
> @@ -122,7 +122,11 @@ CONFIGURE_ARGS +=--with-fpectl \
>  .if ${VERSION} != "2.7"
>  CONFIGURE_ARGS +=--enable-loadable-sqlite-extensions
>  .  if ${PROPERTIES:Mlld}
> -CONFIGURE_ARGS +=--with-lto --enable-optimizations
> +CONFIGURE_ARGS +=--with-lto
> +.if ${MACHINE_ARCH} != "powerpc"
> +# On powerpc, the python binary would crash by "Segmentation fault".
> +CONFIGURE_ARGS +=--enable-optimizations
> +.endif
>  .  endif
>  TEST_IS_INTERACTIVE =Yes
>  .endif

Re: sparc64 bulk build report

[Kurt Mosiejczuk]

On Tue, Jul 26, 2022 at 10:32:15PM +0200, Rafael Sadowski wrote:

> > http://build-failures.rhaalovely.net/sparc64/2022-07-22/x11/qt6/qtdeclarative.log

> https://bugreports.qt.io/browse/QTBUG-100125?gerritReviewStatus=All

> OpenSUSE confirmed that with following patch they can build Qt on SPARC:

> https://github.com/bmwiedemann/openSUSE/blob/934d586b71984cbf31d8ecb30dc8ac7f90369929/packages/q/qt6-shadertools/0001-Fix-encoding-decoding-of-string-literals-for-big-end.patch

> OK?

ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt6/qtshadertools/Makefile,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile
> --- Makefile  12 May 2022 09:40:33 -  1.4
> +++ Makefile  26 Jul 2022 20:27:24 -
> @@ -1,6 +1,7 @@
>  QT6NAME =QtShaderTools
>  
>  COMMENT =Qt6 shader tools module
> +REVISION =   0
>  
>  PKGSPEC =qt6-qtshadertools-${QT6_PKGSPEC}
>  
> Index: patches/patch-src_3rdparty_glslang_SPIRV_SPVRemapper_cpp
> ===
> RCS file: patches/patch-src_3rdparty_glslang_SPIRV_SPVRemapper_cpp
> diff -N patches/patch-src_3rdparty_glslang_SPIRV_SPVRemapper_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_3rdparty_glslang_SPIRV_SPVRemapper_cpp  26 Jul 2022 
> 20:27:24 -
> @@ -0,0 +1,39 @@
> +Per SPIR-V spec, a string literal's UTF-8 octets are encoded packed into
> +words with little-endian convention. Explicitly perform that encoding
> +instead of assuming that the host system is little-endian.
> +
> +Note that this change requires corresponding fixes in SPIRV-Tools.
> +
> +Fixes #202
> +https://bugreports.qt.io/browse/QTBUG-100125?gerritReviewStatus=All
> +Index: src/3rdparty/glslang/SPIRV/SPVRemapper.cpp
> +--- src/3rdparty/glslang/SPIRV/SPVRemapper.cpp.orig
>  src/3rdparty/glslang/SPIRV/SPVRemapper.cpp
> +@@ -297,15 +297,21 @@ namespace spv {
> + std::string spirvbin_t::literalString(unsigned word) const
> + {
> + std::string literal;
> ++const spirword_t * pos = spv.data() + word;
> + 
> + literal.reserve(16);
> + 
> +-const char* bytes = reinterpret_cast(spv.data() + 
> word);
> +-
> +-while (bytes && *bytes)
> +-literal += *bytes++;
> +-
> +-return literal;
> ++do {
> ++spirword_t word = *pos;
> ++for (int i = 0; i < 4; i++) {
> ++char c = word & 0xff;
> ++if (c == '\0')
> ++return literal;
> ++literal += c;
> ++word >>= 8;
> ++}
> ++pos++;
> ++} while (true);
> + }
> + 
> + void spirvbin_t::applyMap()
> Index: patches/patch-src_3rdparty_glslang_SPIRV_disassemble_cpp
> ===
> RCS file: patches/patch-src_3rdparty_glslang_SPIRV_disassemble_cpp
> diff -N patches/patch-src_3rdparty_glslang_SPIRV_disassemble_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_3rdparty_glslang_SPIRV_disassemble_cpp  26 Jul 2022 
> 20:27:24 -
> @@ -0,0 +1,104 @@
> +Per SPIR-V spec, a string literal's UTF-8 octets are encoded packed into
> +words with little-endian convention. Explicitly perform that encoding
> +instead of assuming that the host system is little-endian.
> +
> +Note that this change requires corresponding fixes in SPIRV-Tools.
> +
> +Fixes #202
> +https://bugreports.qt.io/browse/QTBUG-100125?gerritReviewStatus=All
> +Index: src/3rdparty/glslang/SPIRV/disassemble.cpp
> +--- src/3rdparty/glslang/SPIRV/disassemble.cpp.orig
>  src/3rdparty/glslang/SPIRV/disassemble.cpp
> +@@ -43,6 +43,7 @@
> + #include 
> + #include 
> + #include 
> ++#include 
> + 
> + #include "disassemble.h"
> + #include "doc.h"
> +@@ -100,6 +101,7 @@ class SpirvStream { (protected)
> + void outputMask(OperandClass operandClass, unsigned mask);
> + void disassembleImmediates(int numOperands);
> + void disassembleIds(int numOperands);
> ++std::pair decodeString();
> + int disassembleString();
> + void disassembleInstruction(Id resultId, Id typeId, Op opCode, int 
> numOperands);
> + 
> +@@ -290,31 +292,44 @@ void SpirvStream::disassembleIds(int numOperands)
> + }
> + }
> + 
> +-// return the number of operands consumed by the string
> +-int SpirvStream::disassembleString()
> ++// decode string from words at current position (non-consuming)
> ++std::pair SpirvStream::decodeString()
> + {
> +-int startWord = word;
> +-
> +-out << " \"";
> +-
> +-const char* wordString;
> ++std::string res;
> ++int wordPos = word;
> ++char c;
> + bool done = false;
> ++
> + do {
> +-unsigned int content = stream[word];
> +-wordString = (const char*)&content;
> ++unsigned int content = stream[wordPos];
> + for (int charCount = 0; charCount < 4; +

Re: sparc64 bulk build report

[Kurt Mosiejczuk]

On Tue, Jul 26, 2022 at 10:39:09PM +0200, Rafael Sadowski wrote:

> > http://build-failures.rhaalovely.net/sparc64/2022-07-22/x11/qt5/qttranslations.log

> "Project ERROR: failed to parse default search paths from compiler output"

> Bulk build issue?

I don't know. Lots of ports that use qmake are failing with that error.
Off the top of my head textproc/xxdiff is another example.

--Kurt

[update] devel/py-algorithm-munkres 1.1.2 -> 1.1.4

[Kurt Mosiejczuk]

https://github.com/bmc/munkres/blob/master/CHANGELOG.md

Upstream integrated the patch I made to the tests, so removed the patch.
Includes a fix.

All tests pass on amd64.  The only consumer is audio/beets which passes its
tested identically for both the old version and this new one.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-algorithm-munkres/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile11 Mar 2022 18:52:31 -  1.12
+++ Makefile20 Jul 2022 05:06:51 -
@@ -1,9 +1,8 @@
 COMMENT =  munkres algorithm for the Assignment Problem
 
-MODPY_EGG_VERSION =1.1.2
+MODPY_EGG_VERSION =1.1.4
 DISTNAME = munkres-${MODPY_EGG_VERSION}
 PKGNAME =  py-algorithm-${DISTNAME}
-REVISION =  2
 
 CATEGORIES =   devel
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-algorithm-munkres/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2019 21:45:47 -  1.5
+++ distinfo20 Jul 2022 05:06:51 -
@@ -1,2 +1,2 @@
-SHA256 (munkres-1.1.2.tar.gz) = genO1Aw9D/xIvkttpc/fqkkEH6qrqAdbFZl07EeSauo=
-SIZE (munkres-1.1.2.tar.gz) = 10860
+SHA256 (munkres-1.1.4.tar.gz) = /ES/PDl52tpLa2M93uuP++g4julAnk1OgxDC2heS2wM=
+SIZE (munkres-1.1.4.tar.gz) = 14047
Index: patches/patch-test_test_munkres_py
===
RCS file: patches/patch-test_test_munkres_py
diff -N patches/patch-test_test_munkres_py
--- patches/patch-test_test_munkres_py  11 Mar 2022 18:52:32 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,97 +0,0 @@
-Move tests from nose to pytest
-https://github.com/bmc/munkres/pull/32
-
-Index: test/test_munkres.py
 test/test_munkres.py.orig
-+++ test/test_munkres.py
-@@ -1,6 +1,6 @@
- from munkres import Munkres, DISALLOWED, UnsolvableMatrix
- import munkres
--from nose.tools import assert_equals, raises
-+import pytest
- 
- m = Munkres()
- 
-@@ -16,7 +16,7 @@ def test_documented_example():
-   [10, 3, 2],
-   [8, 7, 4]]
- cost = _get_cost(matrix)
--assert_equals(cost, 12)
-+assert cost == 12
- 
- def test_5_x_5():
- matrix = [[12, 9, 27, 10, 23],
-@@ -25,7 +25,7 @@ def test_5_x_5():
-   [9, 28, 26, 23, 13],
-   [16, 16, 24, 6, 9]]
- cost = _get_cost(matrix)
--assert_equals(cost, 51)
-+assert cost == 51
- 
- def test_10_x_10():
- matrix = [[37, 34, 29, 26, 19, 8, 9, 23, 19, 29],
-@@ -39,7 +39,7 @@ def test_10_x_10():
-   [21, 25, 23, 39, 31, 37, 32, 33, 38, 1],
-   [17, 34, 40, 10, 29, 37, 40, 3, 25, 3]]
- cost = _get_cost(matrix)
--assert_equals(cost, 66)
-+assert cost == 66
- 
- def test_20_x_20():
- matrix = [[5, 4, 3, 9, 8, 9, 3, 5, 6, 9, 4, 10, 3, 5, 6, 6, 1, 8, 10, 2],
-@@ -63,14 +63,14 @@ def test_20_x_20():
-   [9, 6, 3, 1, 8, 5, 7, 8, 7, 2, 1, 8, 2, 8, 3, 7, 4, 8, 7, 7],
-   [8, 4, 4, 9, 7, 10, 6, 2, 1, 5, 8, 5, 1, 1, 1, 9, 1, 3, 5, 3]]
- cost = _get_cost(matrix)
--assert_equals(cost, 22)
-+assert cost == 22
- 
- def test_disallowed():
- matrix = [[5, 9, DISALLOWED],
-   [10, DISALLOWED, 2],
-   [8, DISALLOWED, 4]]
- cost = _get_cost(matrix)
--assert_equals(cost, 19)
-+assert cost == 19
- 
- def test_profit():
- profit_matrix = [[94, 66, 100, 18, 48],
-@@ -84,7 +84,7 @@ def test_profit():
- )
- indices = m.compute(cost_matrix)
- profit = sum([profit_matrix[row][column] for row, column in indices])
--assert_equals(profit, 392)
-+assert profit == 392
- 
- def test_irregular():
- matrix = [[12, 26, 17],
-@@ -94,7 +94,7 @@ def test_irregular():
-   [15, 93, 55, 80]]
- 
- cost = _get_cost(matrix)
--assert_equals(cost, 43)
-+assert cost == 43
- 
- def test_rectangular():
- matrix = [[34, 26, 17, 12],
-@@ -106,13 +106,13 @@ def test_rectangular():
- padded_matrix = m.pad_matrix(matrix, 0)
- padded_cost = _get_cost(padded_matrix)
- cost = _get_cost(matrix)
--assert_equals(padded_cost, cost)
--assert_equals(cost, 70)
-+assert padded_cost == cost
-+assert cost == 70
- 
--@raises(UnsolvableMatrix)
- def test_unsolvable():
--matrix = [[5, 9, DISALLOWED],
--  [10, DISALLOWED, 2],
--  [DISALLOWED, DISALLOWED, DISALLOWED]]
--m.compute(matrix)
-+with pytest.raises(UnsolvableMatrix):
-+matrix = [[5, 9, DISALLOWED],
-+  [10, DISALLOWED, 2],
-+  [DISALLOWED, DISALLOWED, DISALLOWED]]
-+m.compute(matrix)
- 
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-algorithm-munkres/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   11 Mar 2022 18:52:32 -

Fix build of devel/json-c on sparc64

[Kurt Mosiejczuk]

json-c 0.16 has the attribute 'cold' used in json_object.c

ports-gcc doesn't understand this and so the use of -Werror makes the
build abort.

This diff adds a patch to strip out 'cold' since it is documented as an
optimization anyway.

The other possible approach would be to turn off '-Werror', but I figured
this is probably more palatable.

ok?

--Kurt

Index: patches/patch-json_object_c
===
RCS file: patches/patch-json_object_c
diff -N patches/patch-json_object_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-json_object_c 20 Jul 2022 04:14:06 -
@@ -0,0 +1,17 @@
+This optimization breaks for ports-gcc. Patch it out.
+
+Index: json_object.c
+--- json_object.c.orig
 json_object.c
+@@ -145,10 +145,7 @@ static json_object_to_json_string_fn _json_object_user
+ #elif defined(__OS400__)
+ #define JSON_NORETURN
+ #else
+-/* 'cold' attribute is for optimization, telling the computer this code
+- * path is unlikely.
+- */
+-#define JSON_NORETURN __attribute__((noreturn, cold))
++#define JSON_NORETURN __attribute__((noreturn))
+ #endif
+ #endif
+ /**

[update] devel/py-crc32c 2.2 -> 2.3

[Kurt Mosiejczuk]

>From https://github.com/ICRAR/crc32c/blob/master/CHANGELOG.md

Improved macro definition logic and platform detection to enable
building universal2 binary wheels for macOS, alongside arm64
and x86_64 ones; added step to GitHub Actions to generate and
publish them (#28).

Mention explicit support for Python 3.10.

Fixed minor compilation warning in ARM64 builds.

All tests pass before and after on amd64

Only consumer is security/boofuzz, which doesn't have any working tests.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-crc32c/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2022 18:52:38 -  1.7
+++ Makefile20 Jul 2022 03:37:44 -
@@ -1,6 +1,6 @@
 COMMENT =  implemention of the crc32c algorithm in hardware
 
-MODPY_EGG_VERSION =2.2
+MODPY_EGG_VERSION =2.3
 
 DISTNAME = crc32c-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
Index: distinfo
===
RCS file: /cvs/ports/devel/py-crc32c/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo28 Feb 2022 11:31:39 -  1.2
+++ distinfo20 Jul 2022 03:37:44 -
@@ -1,2 +1,2 @@
-SHA256 (crc32c-2.2.tar.gz) = JkP2Pck1Jg8BeIkBCZjKy306U1tAFk1oikKElDliibg=
-SIZE (crc32c-2.2.tar.gz) = 38417
+SHA256 (crc32c-2.3.tar.gz) = F85sWWrQ1T31Lc1y3vtmmErqvZj77+p7qEimtr3s42o=
+SIZE (crc32c-2.3.tar.gz) = 38525

[update] databases/py-ldap 3.4.0 -> 3.4.2

[Kurt Mosiejczuk]

https://github.com/python-ldap/python-ldap/blob/python-ldap-3.4.2/CHANGES

The biggest change deals with the merge of libldap and libldap_r, which
obsoletes out patches.

Tests pass the same as for 3.4.0 on amd64.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- Makefile14 May 2022 15:35:07 -  1.61
+++ Makefile20 Jul 2022 02:40:53 -
@@ -1,7 +1,6 @@
 COMMENT=   LDAP client API for Python
 
-MODPY_EGG_VERSION =3.4.0
-REVISION=  0
+MODPY_EGG_VERSION =3.4.2
 DISTNAME=  python-ldap-${MODPY_EGG_VERSION}
 PKGNAME=   py-ldap-${MODPY_EGG_VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/databases/py-ldap/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo28 Feb 2022 11:38:00 -  1.22
+++ distinfo20 Jul 2022 02:40:53 -
@@ -1,2 +1,2 @@
-SHA256 (python-ldap-3.4.0.tar.gz) = 
YEZMj8JeceD9QESaJOrkgtzQ+3/Pgj595iemUls+DRI=
-SIZE (python-ldap-3.4.0.tar.gz) = 376169
+SHA256 (python-ldap-3.4.2.tar.gz) = 
sWRwoJg6rwmgD/uPQLaaJEbz0L5jmiKSVrzjgfyyaPc=
+SIZE (python-ldap-3.4.2.tar.gz) = 378058
Index: patches/patch-setup_cfg
===
RCS file: patches/patch-setup_cfg
diff -N patches/patch-setup_cfg
--- patches/patch-setup_cfg 14 May 2022 15:35:07 -  1.11
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: setup.cfg
 setup.cfg.orig
-+++ setup.cfg
-@@ -5,7 +5,7 @@ license_file = LICENCE
- defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
- extra_compile_args = 
- extra_objects = 
--libs = ldap_r lber
-+libs = ldap lber
- 
- [install]
- compile = 1
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  14 May 2022 15:35:07 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -132,7 +132,7 @@ setup(
-   extra_objects = LDAP_CLASS.extra_objects,
-   runtime_library_dirs = (not 
sys.platform.startswith("win"))*LDAP_CLASS.library_dirs,
-   define_macros = LDAP_CLASS.defines + \
--('ldap_r' in LDAP_CLASS.libs or 'oldap_r' in 
LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
-+('ldap' in LDAP_CLASS.libs or 'oldap_r' in 
LDAP_CLASS.libs)*[('HAVE_LIBLDAP_R',None)] + \
- ('sasl' in LDAP_CLASS.libs or 'sasl2' in LDAP_CLASS.libs or 'libsasl' 
in LDAP_CLASS.libs)*[('HAVE_SASL',None)] + \
- ('ssl' in LDAP_CLASS.libs and 'crypto' in 
LDAP_CLASS.libs)*[('HAVE_TLS',None)] + \
- [
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST   11 Mar 2022 18:31:39 -  1.12
+++ pkg/PLIST   20 Jul 2022 02:40:53 -
@@ -99,9 +99,12 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}dds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}dds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}disconnection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}disconnection.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}passwd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}passwd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ldap/extop/dds.py
+lib/python${MODPY_VERSION}/site-packages/ldap/extop/disconnection.py
 lib/python${MODPY_VERSION}/site-packages/ldap/extop/passwd.py
 lib/python${MODPY_VERSION}/site-packages/ldap/filter.py
 lib/python${MODPY_VERSION}/site-packages/ldap/functions.py

[New] net/ruby-net-telnet 0.2.0

[Kurt Mosiejczuk]

Before Ruby 3.0, net/telnet was bundled as part of the language. For 3.0+
it is a separate gem.

It provides telnet, netcat-like, and pop email checking capabilities.

ok to import?

--Kurt


ruby-net-telnet.tgz
Description: application/tar-gz

Re: [new] sysutils/py-zabbix-api

[Kurt Mosiejczuk]

On Mon, Jul 18, 2022 at 09:55:24AM +0300, Pavel Korovin wrote:
> zabbix-api python package is used by community.zabbix ansible collection.
> OK?

ok kmos

--Kurt

[update] devel/py-argcomplete 1.9.3 -> 2.0.0

[Kurt Mosiejczuk]

https://github.com/kislyuk/argcomplete/blob/develop/Changes.rst

Update to 2.0.0

Brings fish shell support and Python 3.10 support

Tests for all TEST_DEPENDS consumers complete the same before and after.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-argcomplete/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile11 Mar 2022 18:52:32 -  1.18
+++ Makefile19 Jul 2022 07:28:31 -
@@ -1,10 +1,9 @@
 COMMENT =  bash tab completion for argparse
 
-MODPY_EGG_VERSION =1.9.3
+MODPY_EGG_VERSION =2.0.0
 DISTNAME = argcomplete-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
-REVISION = 5
 
 # GPLv3+
 PERMIT_PACKAGE=Yes
@@ -17,10 +16,16 @@ MODPY_SETUPTOOLS =  Yes
 FLAVORS =  python3
 FLAVOR =   python3
 
-TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
+MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS =test/test.py
+
+TEST_DEPENDS = devel/flake8 \
+   devel/py-coverage${MODPY_FLAVOR} \
devel/py-pexpect${MODPY_FLAVOR} \
+   devel/py-pip${MODPY_FLAVOR} \
devel/py-wheel${MODPY_FLAVOR} \
shells/bash \
+   shells/fish \
shells/tcsh
 
 pre-test:
Index: distinfo
===
RCS file: /cvs/ports/devel/py-argcomplete/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo9 Feb 2018 08:52:29 -   1.6
+++ distinfo19 Jul 2022 07:28:31 -
@@ -1,2 +1,2 @@
-SHA256 (argcomplete-1.9.3.tar.gz) = 
2Xt/PPqk5JStWe1tBMk4/F7Wm1kL2PUydOJY+xEZvRs=
-SIZE (argcomplete-1.9.3.tar.gz) = 46788
+SHA256 (argcomplete-2.0.0.tar.gz) = 
Y3KteMidZiA1EBQYriU2aERbORdVz+lOpS8bnSJCWyA=
+SIZE (argcomplete-2.0.0.tar.gz) = 54164
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  11 Mar 2022 18:52:32 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -4,7 +4,7 @@ import glob
- from setuptools import setup, find_packages
- 
- install_requires = []
--tests_require = ["coverage", "flake8", "pexpect", "wheel"]
-+tests_require = ["coverage", "pexpect", "wheel"]
- 
- setup(
- name='argcomplete',
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-argcomplete/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   11 Mar 2022 18:52:32 -  1.7
+++ pkg/PLIST   19 Jul 2022 07:28:31 -
@@ -1,5 +1,5 @@
-@pkgpath devel/py-argcomplete
 @conflict py-argcomplete-<1.9.3p2
+@pkgpath devel/py-argcomplete
 bin/activate-global-python-argcomplete
 bin/python-argcomplete-check-easy-install-script
 bin/python-argcomplete-tcsh
@@ -15,15 +15,17 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/argcomplete/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}_check_console_script.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}_check_module.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}completers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}my_argparse.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}my_shlex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/argcomplete/${MODPY_PYCACHE}shell_integration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/argcomplete/_check_console_script.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/_check_module.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/bash_completion.d/
-lib/python${MODPY_VERSION}/site-packages/argcomplete/bash_completion.d/python-argcomplete.sh
-lib/python${MODPY_VERSION}/site-packages/argcomplete/compat.py
+lib/python${MODPY_VERSION}/site-packages/argcomplete/bash_completion.d/python-argcomplete
 lib/python${MODPY_VERSION}/site-packages/argcomplete/completers.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/my_argparse.py
 lib/python${MODPY_VERSION}/site-packages/argcomplete/my_shlex.py
+lib/python${MODPY_VERSION}/site-packages/argcomplete/shell_integration.py

Re: [NEW] sysutils/py-duo_client-4.4.0

[Kurt Mosiejczuk]

On Mon, Jul 18, 2022 at 02:47:07PM +0100, Stuart Henderson wrote:
> Still OK :)

Imported. Thanks!

--Kurt

[update] audio/py-mediafile 0.8.1 -> 0.9.0

[Kurt Mosiejczuk]

Update to 0.9.0

Tests all pass.

Tests for the only consumer (audio/beets) pass the same before and after
(2 failures)

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/audio/py-mediafile/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile11 Mar 2022 18:20:28 -  1.2
+++ Makefile17 Jul 2022 04:19:08 -
@@ -1,6 +1,6 @@
 COMMENT =  read and write audio files' tags in Python
 
-MODPY_EGG_VERSION =0.8.1
+MODPY_EGG_VERSION =0.9.0
 
 DISTNAME = mediafile-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
Index: distinfo
===
RCS file: /cvs/ports/audio/py-mediafile/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo16 Nov 2021 16:18:24 -  1.1.1.1
+++ distinfo17 Jul 2022 04:19:08 -
@@ -1,2 +1,2 @@
-SHA256 (mediafile-0.8.1.tar.gz) = h4zMN4t38tbBdavqE16iVjHyjHIuAeGgUZJNli6+oWU=
-SIZE (mediafile-0.8.1.tar.gz) = 551910
+SHA256 (mediafile-0.9.0.tar.gz) = k8zvP7t9RVSg52idQSNs1WhqLy8XSTCYYiuDRM+D35o=
+SIZE (mediafile-0.9.0.tar.gz) = 561866

[update] archivers/py-lz4 3.1.10 -> 4.0.1

[Kurt Mosiejczuk]

This updates py-lz4 to 4.0.1

Changes:
https://github.com/python-lz4/python-lz4/releases

The only consumer is plaso, whose tests pass the same before and after

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/archivers/py-lz4/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2022 18:16:23 -  1.7
+++ Makefile10 Jul 2022 08:23:54 -
@@ -1,6 +1,6 @@
 COMMENT =  lz4 bindings for Python
 
-MODPY_EGG_VERSION =3.1.10
+MODPY_EGG_VERSION =4.0.1
 
 DISTNAME = lz4-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
@@ -19,6 +19,7 @@ MODULES = lang/python
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
+MODPY_PYTEST_ARGS =tests/block tests/frame
 
 FLAVORS =  python3
 FLAVOR =   python3
Index: distinfo
===
RCS file: /cvs/ports/archivers/py-lz4/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo27 Nov 2021 08:51:23 -  1.4
+++ distinfo10 Jul 2022 08:23:54 -
@@ -1,2 +1,2 @@
-SHA256 (lz4-3.1.10.tar.gz) = Q55XXs+p7P/L1jz+2Zuu++Qiq5ZFsegieAJNiiHZcgs=
-SIZE (lz4-3.1.10.tar.gz) = 162886
+SHA256 (lz4-4.0.1.tar.gz) = 79/sIXVxW/LYFO1yp6GFQG80VkZOs/ND2xuH7YE+A5w=
+SIZE (lz4-4.0.1.tar.gz) = 164309
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/archivers/py-lz4/patches/patch-setup_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-setup_py
--- patches/patch-setup_py  11 Mar 2022 18:16:23 -  1.4
+++ patches/patch-setup_py  10 Jul 2022 08:23:54 -
@@ -3,7 +3,7 @@ remove -O3
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -102,7 +102,6 @@ elif compiler in ('unix', 'mingw32'):
+@@ -111,7 +111,6 @@ elif compiler in ('unix', 'mingw32'):
  extension_kwargs = pkgconfig_parse('liblz4')
  else:
  extension_kwargs['extra_compile_args'] = [
Index: pkg/PLIST
===
RCS file: /cvs/ports/archivers/py-lz4/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   11 Mar 2022 18:16:23 -  1.3
+++ pkg/PLIST   10 Jul 2022 08:23:54 -
@@ -20,9 +20,4 @@ lib/python${MODPY_VERSION}/site-packages
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lz4/frame/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/lz4/frame/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 @so 
lib/python${MODPY_VERSION}/site-packages/lz4/frame/_frame.${MODPY_PYC_MAGIC_TAG}so
-lib/python${MODPY_VERSION}/site-packages/lz4/stream/
-lib/python${MODPY_VERSION}/site-packages/lz4/stream/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lz4/stream/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/lz4/stream/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-@so 
lib/python${MODPY_VERSION}/site-packages/lz4/stream/_stream.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/lz4/version.py

[update] devel/py-anytree 2.4.3 -> 2.8.0

[Kurt Mosiejczuk]

https://github.com/c0fec0de/anytree/releases

Various fixes and improvements

I fixed the testing, moving it to MODPY_TEST and adding the needed
graphics/py-dot to TEST_DEPENDS.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-anytree/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile11 Mar 2022 18:52:32 -  1.8
+++ Makefile9 Jul 2022 22:21:48 -
@@ -1,9 +1,8 @@
 COMMENT=   powerful and lightweight Python tree data structure
 
-MODPY_EGG_VERSION= 2.4.3
+MODPY_EGG_VERSION= 2.8.0
 DISTNAME=  anytree-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
-REVISION=  4
 
 CATEGORIES=devel
 
@@ -15,10 +14,15 @@ MODULES=lang/python
 MODPY_PI=  Yes
 
 MODPY_SETUPTOOLS=  Yes
+MODPY_PYTEST = Yes
 
 FLAVORS =  python3
 FLAVOR =   python3
 
-TEST_DEPENDS=  devel/py-nose${MODPY_FLAVOR}
+TEST_DEPENDS=  graphics/py-dot${MODPY_FLAVOR}
+
+post-install:
+   mv ${PREFIX}/LICENSE \
+   
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/anytree-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-anytree/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo30 Mar 2018 13:53:31 -  1.1.1.1
+++ distinfo9 Jul 2022 22:21:48 -
@@ -1,2 +1,2 @@
-SHA256 (anytree-2.4.3.tar.gz) = m0Npnqz9P6sVNDOrvGmMdOPI+IPAUF/eLCatOBY9k/o=
-SIZE (anytree-2.4.3.tar.gz) = 18181
+SHA256 (anytree-2.8.0.tar.gz) = Pw+T81WpG8PmJFMZv0wdUONBbMejXMETPB/zgwa7zKs=
+SIZE (anytree-2.8.0.tar.gz) = 189484
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-anytree/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   11 Mar 2022 18:52:32 -  1.3
+++ pkg/PLIST   9 Jul 2022 22:21:48 -
@@ -1,6 +1,7 @@
 @pkgpath devel/py-anytree
 lib/python${MODPY_VERSION}/site-packages/anytree/
 
lib/python${MODPY_VERSION}/site-packages/anytree-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/anytree-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/LICENSE
 
lib/python${MODPY_VERSION}/site-packages/anytree-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/anytree-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/anytree-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
@@ -9,11 +10,13 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/anytree/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}cachedsearch.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}dotexport.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}render.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/${MODPY_PYCACHE}walker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/anytree/cachedsearch.py
 lib/python${MODPY_VERSION}/site-packages/anytree/dotexport.py
 lib/python${MODPY_VERSION}/site-packages/anytree/exporter/
 lib/python${MODPY_VERSION}/site-packages/anytree/exporter/__init__.py
@@ -57,13 +60,21 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/anytree/node/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/node/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/node/${MODPY_PYCACHE}nodemixin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/anytree/node/${MODPY_PYCACHE}symlinknode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/anytree/node/${MODPY_PYCACHE}symlinknodemixin.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/anytree/node/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/anytree/node/anynode.py
 lib/python${MODPY_VERSION}/site-packages/anytree/node/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/anytree/node/node.py
 lib/python${MODPY_VERSION}/site-packages/anytree/node/nodemixin.py
+lib/python${MODPY_VERSION}/site-packages/anytree/node/symlinknode.py
+lib/python${MODPY_VERSION}/site-packages/anytree/node/sy

Re: [NEW] security/py-duo_universal_python-2.0.1

[Kurt Mosiejczuk]

On Fri, Jul 08, 2022 at 04:02:52PM -0400, George Rosamond wrote:
> On 7/8/22 15:54, Kurt Mosiejczuk wrote:
> > On Thu, Jul 07, 2022 at 08:24:39PM -0400, George Rosamond wrote:

> > So 2.0.3 is out on PyPI. So I reworked the port to use PyPI.

> That works.

> Builds and tests fine for me.

> Thanks Kurt.

> g

Imported. Thanks for you work!

--Kurt