Merge branch 'freebsd/main' into hardenedbsd/main

HardenedBSD · Jul 6, 2024 · 270b6ad · 270b6ad
2 parents 3fd7f46 + e76312c
commit 270b6ad
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 34 deletions.
diff --git a/lang/kotlin/Makefile b/lang/kotlin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	kotlin
-PORTVERSION=	1.9.23
+PORTVERSION=	2.0.0
 CATEGORIES=	lang java
 MASTER_SITES=	https://github.com/JetBrains/kotlin/releases/download/v${PORTVERSION}/
 DISTNAME=	kotlin-compiler-${PORTVERSION}

diff --git a/lang/kotlin/distinfo b/lang/kotlin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711655459
-SHA256 (kotlin-compiler-1.9.23.zip) = 93137d3aab9afa9b27cb06a824c2324195c6b6f6179d8a8653f440f5bd58be88
-SIZE (kotlin-compiler-1.9.23.zip) = 91045770
+TIMESTAMP = 1716315666
+SHA256 (kotlin-compiler-2.0.0.zip) = ef578730976154fd2c5968d75af8c2703b3de84a78dffe913f670326e149da3b
+SIZE (kotlin-compiler-2.0.0.zip) = 83767523
diff --git a/lang/kotlin/pkg-plist b/lang/kotlin/pkg-plist
@@ -46,12 +46,11 @@ bin/kotlinc-jvm
 %%DATADIR%%/lib/kotlin-stdlib-jdk8-sources.jar
 %%DATADIR%%/lib/kotlin-stdlib-jdk8.jar
 %%DATADIR%%/lib/kotlin-stdlib-js-sources.jar
-%%DATADIR%%/lib/kotlin-stdlib-js.jar
 %%DATADIR%%/lib/kotlin-stdlib-js.klib
 %%DATADIR%%/lib/kotlin-stdlib-sources.jar
 %%DATADIR%%/lib/kotlin-stdlib.jar
 %%DATADIR%%/lib/kotlin-test-js-sources.jar
-%%DATADIR%%/lib/kotlin-test-js.jar
+%%DATADIR%%/lib/kotlin-test-js.klib
 %%DATADIR%%/lib/kotlin-test-junit-sources.jar
 %%DATADIR%%/lib/kotlin-test-junit.jar
 %%DATADIR%%/lib/kotlin-test-junit5-sources.jar
@@ -67,6 +66,7 @@ bin/kotlinc-jvm
 %%DATADIR%%/lib/noarg-compiler-plugin.jar
 %%DATADIR%%/lib/parcelize-compiler.jar
 %%DATADIR%%/lib/parcelize-runtime.jar
+%%DATADIR%%/lib/power-assert-compiler-plugin.jar
 %%DATADIR%%/lib/sam-with-receiver-compiler-plugin.jar
 %%DATADIR%%/lib/scripting-compiler.jar
 %%DATADIR%%/lib/trove4j.jar
diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llama-cpp
 DISTVERSIONPREFIX=	b
-DISTVERSION=	3291
+DISTVERSION=	3306
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/misc/llama-cpp/distinfo b/misc/llama-cpp/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1720110181
-SHA256 (ggerganov-llama.cpp-b3291_GH0.tar.gz) = d089992ab617060f89cf82457050cfe445a416b19811fec89374266f51b9846e
-SIZE (ggerganov-llama.cpp-b3291_GH0.tar.gz) = 20666117
+TIMESTAMP = 1720221863
+SHA256 (ggerganov-llama.cpp-b3306_GH0.tar.gz) = 662004b09c778fad10326ab201470782a09a9b58a0eabfcf0920dff6ffe3edf5
+SIZE (ggerganov-llama.cpp-b3306_GH0.tar.gz) = 20716544
 SHA256 (nomic-ai-kompute-4565194_GH0.tar.gz) = 95b52d2f0514c5201c7838348a9c3c9e60902ea3c6c9aa862193a212150b2bfc
 SIZE (nomic-ai-kompute-4565194_GH0.tar.gz) = 13540496
diff --git a/misc/llama-cpp/pkg-plist b/misc/llama-cpp/pkg-plist
@@ -1,4 +1,4 @@
-%%EXAMPLES%%bin/convert-hf-to-gguf.py
+%%EXAMPLES%%bin/convert_hf_to_gguf.py
 %%EXAMPLES%%bin/llama-baby-llama
 %%EXAMPLES%%bin/llama-batched
 %%EXAMPLES%%bin/llama-batched-bench

diff --git a/misc/py-openai/Makefile b/misc/py-openai/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openai
-DISTVERSION=	1.35.9
+DISTVERSION=	1.35.10
 CATEGORIES=	misc # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

diff --git a/misc/py-openai/distinfo b/misc/py-openai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720134810
-SHA256 (openai-1.35.9.tar.gz) = 4f5c1b90526cf48eaedac7b32d11b5c92fa7064b82617ad8f5f3279cd9ef090d
-SIZE (openai-1.35.9.tar.gz) = 255000
+TIMESTAMP = 1720221697
+SHA256 (openai-1.35.10.tar.gz) = 85966949f4f960f3e4b239a659f9fd64d3a97ecc43c44dc0a044b5c7f11cccc6
+SIZE (openai-1.35.10.tar.gz) = 255093
diff --git a/misc/py-pytorch-lightning/Makefile b/misc/py-pytorch-lightning/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pytorch-lightning
-DISTVERSION=	2.3.0
+DISTVERSION=	2.3.2
 CATEGORIES=	misc python # machine-learning
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,11 +13,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.05.0:devel/py-fsspec@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2022.5.0:devel/py-fsspec@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lightning-utilities>=0.8.0:misc/py-lightning-utilities@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytorch>=1.13.0:misc/py-pytorch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytorch>=2.0.0:misc/py-pytorch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}torchmetrics>=0.7.0:misc/py-torchmetrics@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.57.0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.4.0:devel/py-typing-extensions@${PY_FLAVOR} \

diff --git a/misc/py-pytorch-lightning/distinfo b/misc/py-pytorch-lightning/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718932717
-SHA256 (pytorch-lightning-2.3.0.tar.gz) = 89caf90e3543b314508493f26e0eca8d5e10e43e3d9e6c143acd8ddceb584ce2
-SIZE (pytorch-lightning-2.3.0.tar.gz) = 624252
+TIMESTAMP = 1720221373
+SHA256 (pytorch-lightning-2.3.2.tar.gz) = ab578dd482221cf645bc9da6bfd1b4b164f368f129d669c9749684e965b597c6
+SIZE (pytorch-lightning-2.3.2.tar.gz) = 624427
diff --git a/sysutils/genimage/Makefile b/sysutils/genimage/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	genimage
 DISTVERSIONPREFIX=	v
-DISTVERSION=	17
+DISTVERSION=	18
 #MASTER_SITES=	https://github.com/pengutronix/genimage/releases/download/v${DISTVERSION}/
 CATEGORIES=	sysutils
 

diff --git a/sysutils/genimage/distinfo b/sysutils/genimage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705725786
-SHA256 (pengutronix-genimage-v17_GH0.tar.gz) = 466a243cd104720f956e5ea305a64322ba2722b239a1520a7481f8ea904c0d13
-SIZE (pengutronix-genimage-v17_GH0.tar.gz) = 94853
+TIMESTAMP = 1720221307
+SHA256 (pengutronix-genimage-v18_GH0.tar.gz) = af555b9d9f17301ab4cc2cda4849afd88d2b97ae4cc8badb9b8448299d6f6080
+SIZE (pengutronix-genimage-v18_GH0.tar.gz) = 98409
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	tomcat
-DISTVERSION=	11.0.0-M21
+DISTVERSION=	11.0.0-M22
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel

diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718746617
-SHA256 (apache-tomcat-11.0.0-M21.tar.gz) = 7ec1b7a8cd750b362b9bd320aecfce8208a09094c5d762381b54d29b12ff8e15
-SIZE (apache-tomcat-11.0.0-M21.tar.gz) = 13000189
+TIMESTAMP = 1720208688
+SHA256 (apache-tomcat-11.0.0-M22.tar.gz) = 5c2cf93c42f05dc06101d53d157a31a5c597b5265fdd078a594d49e6ed2a5839
+SIZE (apache-tomcat-11.0.0-M22.tar.gz) = 13026400
diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
@@ -27,7 +27,7 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.31.jar
+%%T%%/lib/ecj-4.32.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jakartaee-migration-1.0.8-shaded.jar
 %%T%%/lib/jasper-el.jar
@@ -36,6 +36,7 @@
 %%T%%/lib/jsp-api.jar
 %%T%%/lib/servlet-api.jar
 %%T%%/lib/tomcat-api.jar
+%%T%%/lib/tomcat-coyote-ffm.jar
 %%T%%/lib/tomcat-coyote.jar
 %%T%%/lib/tomcat-dbcp.jar
 %%NLS%%%%T%%/lib/tomcat-i18n-cs.jar

diff --git a/www/uwebsockets/Makefile b/www/uwebsockets/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uwebsockets
 DISTVERSIONPREFIX=	v
-DISTVERSION=	20.63.0
+DISTVERSION=	20.64.0
 CATEGORIES=	www devel
 
 MAINTAINER=	yuri@FreeBSD.org

diff --git a/www/uwebsockets/distinfo b/www/uwebsockets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718923409
-SHA256 (uNetworking-uWebSockets-v20.63.0_GH0.tar.gz) = 3bcb3fab4242d312e227b05f34e21d8468960e5eea59e12799aa21a94f1b2b1f
-SIZE (uNetworking-uWebSockets-v20.63.0_GH0.tar.gz) = 284913
+TIMESTAMP = 1720221248
+SHA256 (uNetworking-uWebSockets-v20.64.0_GH0.tar.gz) = bb81fa773dcbd6bc738904ad496554fd131a33269570e0e86fa09213d82ba9ef
+SIZE (uNetworking-uWebSockets-v20.64.0_GH0.tar.gz) = 284915