Merge branch 'freebsd/main' into hardenedbsd/main

HardenedBSD · Jul 7, 2024 · 3643cc0 · 3643cc0
2 parents b829fe8 + 291cba0
commit 3643cc0
Show file tree

Hide file tree

Showing 39 changed files with 433 additions and 343 deletions.
diff --git a/audio/shairport-sync/Makefile b/audio/shairport-sync/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	shairport-sync
-DISTVERSION=	4.3.3
+DISTVERSION=	4.3.4
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org

diff --git a/audio/shairport-sync/distinfo b/audio/shairport-sync/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717351382
-SHA256 (mikebrady-shairport-sync-4.3.3_GH0.tar.gz) = 444bf77fe495d11d0c3b8212ea7a6ae44d6b2084c3600cea0629497a3e5f0209
-SIZE (mikebrady-shairport-sync-4.3.3_GH0.tar.gz) = 562278
+TIMESTAMP = 1720293012
+SHA256 (mikebrady-shairport-sync-4.3.4_GH0.tar.gz) = 3173cc54d06f6186a04509947697b56c7eac09c48153d7dea5f702042620a2df
+SIZE (mikebrady-shairport-sync-4.3.4_GH0.tar.gz) = 562541
diff --git a/databases/postgis32/Makefile b/databases/postgis32/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgdal.so:graphics/gdal
 
 USES=		alias compiler:c++14-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
-		localbase perl5 pkgconfig pgsql:11-15 shebangfix
+		localbase perl5 pkgconfig pgsql shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
@@ -69,6 +69,10 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
 
 .include <bsd.port.pre.mk>
 
+.if ${PGSQL_VER} > 15
+IGNORE=		Only supported up to pgsql 15
+.endif
+
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \

diff --git a/databases/postgresql-promscale/Makefile b/databases/postgresql-promscale/Makefile
@@ -15,7 +15,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64
 RUN_DEPENDS=	timescaledb>=2.9.1:databases/timescaledb
 BUILD_DEPENDS=	bash>0:shells/bash
 
-USES=		cargo gmake pgsql:12-15
+USES=		cargo gmake pgsql
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	timescale
@@ -43,4 +43,10 @@ do-build:
 do-install:
 	cd ${WRKSRC}/target/release/promscale-pg${PGSQL_VER} && ${PAX} -rw . ${STAGEDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PGSQL_VER} > 15
+IGNORE=		Only supported up to pgsql 15
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/timescaledb/Makefile b/databases/timescaledb/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	timescaledb
-PORTVERSION=	2.15.2
+PORTVERSION=	2.15.3
 CATEGORIES=	databases
 
 MAINTAINER=	kbowling@FreeBSD.org

diff --git a/databases/timescaledb/distinfo b/databases/timescaledb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717905914
-SHA256 (timescale-timescaledb-2.15.2_GH0.tar.gz) = 7cecf4c19ec23c8017c5d2524fc565757f85ce6698253afc9dcca0c53b59664e
-SIZE (timescale-timescaledb-2.15.2_GH0.tar.gz) = 7440309
+TIMESTAMP = 1720293337
+SHA256 (timescale-timescaledb-2.15.3_GH0.tar.gz) = 7b8a32d267f2183e012157ac928c7a835aaa29334a586b2ff9fdd291ac26998d
+SIZE (timescale-timescaledb-2.15.3_GH0.tar.gz) = 7441097
diff --git a/databases/timescaledb/pkg-plist b/databases/timescaledb/pkg-plist
@@ -41,5 +41,6 @@ share/postgresql/extension/timescaledb--2.14.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.14.2--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.15.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.15.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.15.2--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb.control
diff --git a/devel/py-itertree/Makefile b/devel/py-itertree/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	itertree
-DISTVERSION=	1.1.2
+DISTVERSION=	1.1.3
 CATEGORIES=	devel
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,9 +19,13 @@ USE_PYTHON=	pep517 autoplist pytest # 1 test fails, see https://github.com/BR1py
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BR1py
+GH_TAGNAME=	1,1,3
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S/./-/g}
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+TEST_WRKSRC=	${WRKSRC}/tests
 
 .include <bsd.port.mk>
diff --git a/devel/py-itertree/distinfo b/devel/py-itertree/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716610500
-SHA256 (BR1py-itertree-1.1.2_GH0.tar.gz) = 828a7f23811320ced9397c93688e914d0b1da454c473afae267cf256370a8c86
-SIZE (BR1py-itertree-1.1.2_GH0.tar.gz) = 2822286
+TIMESTAMP = 1720296848
+SHA256 (BR1py-itertree-1.1.3-1,1,3_GH0.tar.gz) = e1abf4c4639dcdde0552cc2be3b230c7503491350a5d4d33e63bae897abf9ec5
+SIZE (BR1py-itertree-1.1.3-1,1,3_GH0.tar.gz) = 2832088
diff --git a/devel/py-pyTooling/Makefile b/devel/py-pyTooling/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pyTooling
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.3.0
+DISTVERSION=	6.4.0
 CATEGORIES=	devel
 #MASTER_SITES=	PYPI # requirements.txt is missing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -28,7 +28,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anytree>=2.8.0:devel/py-anytree@${PY_FLAVOR
 		${PYTHON_PKGNAMEPREFIX}treelib>0:devel/py-treelib@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	pep517 autoplist pytest # 104 tests fail, see https://github.com/pyTooling/pyTooling/issues/123
+USE_PYTHON=	pep517 autoplist pytest # 98 tests fail, see https://github.com/pyTooling/pyTooling/issues/123
 USE_GITHUB=	yes
 
 NO_ARCH=	yes

diff --git a/devel/py-pyTooling/distinfo b/devel/py-pyTooling/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718766146
-SHA256 (pyTooling-pyTooling-v6.3.0_GH0.tar.gz) = 4a19e510730dfab96ebc1ec5b712ac9f1604de91f384f497a07e2430761c4233
-SIZE (pyTooling-pyTooling-v6.3.0_GH0.tar.gz) = 683304
+TIMESTAMP = 1720224103
+SHA256 (pyTooling-pyTooling-v6.4.0_GH0.tar.gz) = 790a7df3067275ab461f1deadc1c6cedaa0584354d4781a64ca888f58464ea95
+SIZE (pyTooling-pyTooling-v6.4.0_GH0.tar.gz) = 686129
diff --git a/devel/py-pyTooling/files/patch-pyproject.toml b/devel/py-pyTooling/files/patch-pyproject.toml
@@ -1,12 +1,12 @@
---- pyproject.toml.orig	2024-06-02 00:20:04 UTC
+--- pyproject.toml.orig	2024-07-04 18:23:08 UTC
 +++ pyproject.toml
 @@ -1,7 +1,7 @@ requires = [
  [build-system]
  requires = [
--  "setuptools ~= 69.5",
--  "wheel ~= 0.40.0",
+-  "setuptools ~= 70.0",
+-  "wheel ~= 0.43",
 +  "setuptools",
 +  "wheel",
-   "pyTooling ~= 6.1"
+   "pyTooling ~= 6.3"
  ]
  build-backend = "setuptools.build_meta"
diff --git a/lang/nim/Makefile b/lang/nim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nim
-DISTVERSION=	2.0.6
+DISTVERSION=	2.0.8
 CATEGORIES=	lang
 MASTER_SITES=	https://nim-lang.org/download/
 

diff --git a/lang/nim/distinfo b/lang/nim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718761713
-SHA256 (nim-2.0.6.tar.xz) = fbcd5d731743adec2b3bb9bcf6f5fd993ed11b250f957166bebf328f307cba6a
-SIZE (nim-2.0.6.tar.xz) = 7668088
+TIMESTAMP = 1720184077
+SHA256 (nim-2.0.8.tar.xz) = 5702da844700d3129db73170b5c606adbdfb87e82b816c0d91107ea20a65df16
+SIZE (nim-2.0.8.tar.xz) = 7617556
diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim
@@ -1,6 +1,19 @@
---- koch.nim.orig	2024-06-18 13:26:19 UTC
+--- koch.nim.orig	2024-07-05 12:55:45 UTC
 +++ koch.nim
-@@ -146,30 +146,30 @@ proc csource(args: string) =
+@@ -11,9 +11,9 @@ const
+
+ const
+   # examples of possible values for repos: Head, ea82b54
+-  NimbleStableCommit = "be2f1309b35a6189ff5eb34a007793e6d3f94157" # master
+-  AtlasStableCommit = "5faec3e9a33afe99a7d22377dd1b45a5391f5504"
+-  ChecksumsStableCommit = "025bcca3915a1b9f19878cea12ad68f9884648fc"
++  NimbleStableCommit = "f8bd7b5fa6ea7a583b411b5959b06e6b5eb23667" # master
++  AtlasStableCommit = "7b780811a168f3f32bff4822369dda46a7f87f9a"
++  ChecksumsStableCommit = "b4c73320253f78e3a265aec6d9e8feb83f97c77b"
+   SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01"
+
+   # examples of possible values for fusion: #head, #ea82b54, 1.2.3
+@@ -146,32 +146,32 @@ proc csource(args: string) =
             "--main:compiler/nim.nim compiler/installer.ini $1") %
         [args, VersionAsString, compileNimInst])
 
@@ -40,20 +53,24 @@
 -  let commit = if latest: "HEAD" else: AtlasStableCommit
 -  cloneDependency(distDir, "https://github.com/nim-lang/atlas.git",
 -                  commit = commit, allowBundled = true)
+-  cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git",
+-                commit = SatStableCommit, allowBundled = true)
 -  # installer.ini expects it under $nim/bin
 -  nimCompile("dist/atlas/src/atlas.nim",
--             options = "-d:release --noNimblePath " & args)
+-             options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args)
 +#proc bundleAtlasExe(latest: bool, args: string) =
 +#  let commit = if latest: "HEAD" else: AtlasStableCommit
 +#  cloneDependency(distDir, "https://github.com/nim-lang/atlas.git",
 +#                  commit = commit, allowBundled = true)
++#  cloneDependency(distDir / "atlas" / distDir, "https://github.com/nim-lang/sat.git",
++#                commit = SatStableCommit, allowBundled = true)
 +#  # installer.ini expects it under $nim/bin
 +#  nimCompile("dist/atlas/src/atlas.nim",
-+#             options = "-d:release --noNimblePath " & args)
++#             options = "-d:release --noNimblePath -d:nimAtlasBootstrap " & args)
 
  proc bundleNimsuggest(args: string) =
    nimCompileFold("Compile nimsuggest", "nimsuggest/nimsuggest.nim",
-@@ -206,8 +206,8 @@ proc zip(latest: bool; args: string) =
+@@ -208,8 +208,8 @@ proc zip(latest: bool; args: string) =
 
  proc zip(latest: bool; args: string) =
    bundleChecksums(latest)
@@ -64,7 +81,7 @@
    bundleNimsuggest(args)
    bundleNimpretty(args)
    bundleWinTools(args)
-@@ -216,15 +216,15 @@ proc zip(latest: bool; args: string) =
+@@ -218,15 +218,15 @@ proc zip(latest: bool; args: string) =
    exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" %
         ["tools/niminst/niminst".exe, VersionAsString])
 
@@ -87,7 +104,7 @@
    nimexec("cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" %
         [VersionAsString, compileNimInst])
    exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim xz compiler/installer.ini" %
-@@ -260,8 +260,8 @@ proc nsis(latest: bool; args: string) =
+@@ -262,8 +262,8 @@ proc nsis(latest: bool; args: string) =
 
  proc nsis(latest: bool; args: string) =
    bundleChecksums(latest)
@@ -98,7 +115,7 @@
    bundleNimsuggest(args)
    bundleWinTools(args)
    # make sure we have generated the niminst executables:
-@@ -524,43 +524,43 @@ proc icTest(args: string) =
+@@ -526,43 +526,43 @@ proc icTest(args: string) =
      exec(cmd)
      inc i
 
@@ -173,7 +190,7 @@
 
  proc runCI(cmd: string) =
    doAssert cmd.len == 0, cmd # avoid silently ignoring
-@@ -682,18 +682,18 @@ proc showHelp(success: bool) =
+@@ -684,18 +684,18 @@ proc showHelp(success: bool) =
    quit(HelpText % [VersionAsString & spaces(44-len(VersionAsString)),
                     CompileDate, CompileTime], if success: QuitSuccess else: QuitFailure)
 
@@ -199,7 +216,7 @@
      localDocsOut = ""
      skipIntegrityCheck = false
    while true:
-@@ -729,34 +729,34 @@ when isMainModule:
+@@ -731,34 +731,34 @@ when isMainModule:
        of "distrohelper": geninstall()
        of "install": install(op.cmdLineRest)
        of "testinstall": testUnixInstall(op.cmdLineRest)

diff --git a/math/lean4/Makefile b/math/lean4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	lean4
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.8.0
+DISTVERSION=	4.9.0
 CATEGORIES=	math lang devel # lean4 is primarily a math theorem prover, but it is also a language and a development environment
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/math/lean4/distinfo b/math/lean4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717688258
-SHA256 (leanprover-lean4-v4.8.0_GH0.tar.gz) = 3bb46c24b4f5ad1fee38163bf466d8f60a334bb64a19c9801a42f76162580f9c
-SIZE (leanprover-lean4-v4.8.0_GH0.tar.gz) = 20345135
+TIMESTAMP = 1720249428
+SHA256 (leanprover-lean4-v4.9.0_GH0.tar.gz) = f59b7a782bd7e918b35a133a954094f0e39e344ffef06689a1c53ae97ae8d769
+SIZE (leanprover-lean4-v4.9.0_GH0.tar.gz) = 22768229