CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/06/10 17:47:11 Modified files: math/bitwise : Makefile Log message: bitwise needs ports-gcc rather than base-gcc. Fixes sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/06/10 15:34:30 Modified files: editors/hyx: Makefile Log message: hyx needs ports-gcc on base-gcc arches. Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/06/10 15:33:23 Modified files: devel/orcania : Makefile Log message: orcania doesn't get along with base-gcc, shift to ports-gcc to fix build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/06/10 15:24:47 Modified files: audio/mpdscribble: Makefile Log message: mpdscribble uses C++, so ports-gcc must be used rather than base-gcc Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/06/10 15:22:49 Modified files: graphics/oxipng: Makefile Log message: Oxipng doesn't care for base-gcc, shift to ports-gcc to fix on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/06/10 14:16:28 Modified files: sysutils/e2fsprogs: Makefile Log message: e2fsprogs doesn't care for our base-gcc version. Shift to ports-gcc to fix the build on sparc64 ok jca@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/22 16:29:29 Modified files: mail/mlmmj : Makefile Log message: mlmmj no longer gets along with base-gcc so shift to ports-gcc to fix the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/15 10:30:57 Modified files: devel/jdk : java.port.mk Log message: Enable building jdk/11 ports on sparc64. okay sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/15 10:30:00 Modified files: devel/jdk/11 : Makefile distinfo Added files: devel/jdk/11/patches: patch-src_hotspot_share_gc_shared_gc_globals_hpp Removed files: devel/jdk/11/patches: patch-src_hotspot_os_bsd_os_bsd_cpp Log message: Add sparc64 support. okay sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/13 13:11:32 Modified files: sysutils/u-boot/rk3588: Makefile distinfo Log message: Update to 2024-04. okay kettenis@
[update] devel/jdk/11 add sparc64 support
I've been chipping away at adding sparc64 support to jdk/11 for
a while now. I made the push to finish it off and commit it
upstream. I believe it is ready for release now.
okay?
Index: java.port.mk
===
RCS file: /cvs/ports/devel/jdk/java.port.mk,v
retrieving revision 1.43
diff -u -p -u -r1.43 java.port.mk
--- java.port.mk11 Dec 2023 14:38:55 - 1.43
+++ java.port.mk8 May 2024 02:19:22 -
@@ -27,7 +27,7 @@ MODJAVA_VER?=
ERRORS+="with an optional + suffix."
.endif
-.if ${MODJAVA_VER:S/+//} == "1.8"
+.if ${MODJAVA_VER:S/+//} == "1.8" || ${MODJAVA_VER:S/+//} == "11"
ONLY_FOR_ARCHS?= i386 amd64 aarch64 sparc64
.else
ONLY_FOR_ARCHS?= i386 amd64 aarch64
Index: 11/Makefile
===
RCS file: /cvs/ports/devel/jdk/11/Makefile,v
retrieving revision 1.59
diff -u -p -u -r1.59 Makefile
--- 11/Makefile 1 May 2024 20:55:10 - 1.59
+++ 11/Makefile 8 May 2024 02:19:22 -
@@ -1,4 +1,4 @@
-ONLY_FOR_ARCHS=i386 amd64 aarch64
+ONLY_FOR_ARCHS=i386 amd64 aarch64 sparc64
USE_WXNEEDED= Yes
USE_NOBTCFI= Yes
DPB_PROPERTIES=parallel
@@ -6,7 +6,7 @@ DPB_PROPERTIES= parallel
COMMENT= OpenJDK Software Development Kit v${VERSION_STR}
BASE_VER= 11.0.23
PATCH_VER= 9
-BSD_PORT_REL= 1
+BSD_PORT_REL= 2
VERSION_STR= ${BASE_VER}+${PATCH_VER}-${BSD_PORT_REL}
PACKAGE_VER= ${BASE_VER}.${PATCH_VER}.${BSD_PORT_REL}
PKGNAME= jdk-${PACKAGE_VER}
@@ -44,7 +44,8 @@ NO_TEST= Yes
SUPDISTFILES.boot =\
openjdk-jdk11u-bootjdk-i386-${BOOTJDK_DATE}.tar.gz \
openjdk-jdk11u-bootjdk-amd64-${BOOTJDK_DATE}.tar.gz \
- openjdk-jdk11u-bootjdk-aarch64-${BOOTJDK_DATE}.tar.gz
+ openjdk-jdk11u-bootjdk-aarch64-${BOOTJDK_DATE}.tar.gz \
+ openjdk-jdk11u-bootjdk-sparc64-${BOOTJDK_DATE}.tar.gz
COMPILER= base-clang ports-gcc
@@ -59,7 +60,8 @@ BUILD_DEPENDS+= jdk->=11v0,<12v0:devel/j
BOOT_JDK= ${LOCALBASE}/jdk-11
.else
BOOT_JDK_DIST= openjdk-jdk11u-bootjdk-${MACHINE_ARCH}-${BOOTJDK_DATE}.tar.gz
-. if (${MACHINE_ARCH}==amd64) || (${MACHINE_ARCH}==i386) ||
(${MACHINE_ARCH}==aarch64)
+. if (${MACHINE_ARCH}==amd64) || (${MACHINE_ARCH}==i386) || \
+ (${MACHINE_ARCH}==aarch64) || (${MACHINE_ARCH}==sparc64)
DISTFILES.boot=${BOOT_JDK_DIST}
. endif
MAKE_ENV+= LD_LIBRARY_PATH=${WRKDIR}/bootjdk-libs
@@ -111,6 +113,7 @@ CONFIGURE_ARGS= DOT="" FLOCK="" GIT="" H
--with-giflib=system \
--with-giflib-include=${LOCALBASE}/include \
--with-giflib-lib=${LOCALBASE}/lib \
+ --with-stdc++lib=dynamic \
--disable-option-checking \
--disable-ccache \
--disable-hotspot-gtest \
@@ -150,7 +153,7 @@ PKG_ARGS+= -Dci=1
PKG_ARGS+= -Dci=0
.endif
-JVMARCH= ${MACHINE_ARCH:S/i386/x86/:S/amd64/x86_64/}
+JVMARCH= ${MACHINE_ARCH:S/i386/x86/:S/amd64/x86_64/:S/sparc64/sparcv9/}
BUILDDIR= ${WRKDIST}/build/bsd-${JVMARCH}-normal-server-release
IMAGEDIR= ${BUILDDIR}/images/jdk
WRKTMP=${WRKDIR}/tmp
Index: 11/distinfo
===
RCS file: /cvs/ports/devel/jdk/11/distinfo,v
retrieving revision 1.28
diff -u -p -u -r1.28 distinfo
--- 11/distinfo 1 May 2024 20:55:10 - 1.28
+++ 11/distinfo 8 May 2024 02:19:22 -
@@ -1,8 +1,10 @@
-SHA256 (jdk/jdk-11.0.23+9-1.tar.gz) =
VhXVLxIwL0yRoA2jtMwMjS17paibiY3H5ET6CEOQBAA=
+SHA256 (jdk/jdk-11.0.23+9-2.tar.gz) =
3StfPuSAq7KH17NtXsn6AtPUoTQYKNss4nA1JYyOEf8=
SHA256 (jdk/openjdk-jdk11u-bootjdk-aarch64-20240331.tar.gz) =
6skKydxPeLmFShPvL3bEFAhpQCZtABnsr3lZAQNLhBo=
SHA256 (jdk/openjdk-jdk11u-bootjdk-amd64-20240331.tar.gz) =
jL36o7kWGZ3V92z+P9iuwXjy7/sajPCO0hNQhmPpvfU=
SHA256 (jdk/openjdk-jdk11u-bootjdk-i386-20240331.tar.gz) =
B/UNqvHV7dTlo00uNzK1DZs1Pxftujj7O0ojDTi3sQ8=
-SIZE (jdk/jdk-11.0.23+9-1.tar.gz) = 116449887
+SHA256 (jdk/openjdk-jdk11u-bootjdk-sparc64-20240331.tar.gz) =
eU7fzUu7xWUcrkacuv25/18rzC/w7grqOL1rW3FzwdM=
+SIZE (jdk/jdk-11.0.23+9-2.tar.gz) = 116467928
SIZE (jdk/openjdk-jdk11u-bootjdk-aarch64-20240331.tar.gz) = 114820919
SIZE (jdk/openjdk-jdk11u-bootjdk-amd64-20240331.tar.gz) = 115315575
SIZE (jdk/openjdk-jdk11u-bootjdk-i386-20240331.tar.gz) = 104499540
+SIZE (jdk/openjdk-jdk11u-bootjdk-sparc64-20240331.tar.gz) = 107472498
Index: 11/patches/patch-src_hotspot_os_bsd_os_bsd_cpp
===
RCS file: 11/patches/patch-src_hotspot_os_bsd_os_bsd_cpp
diff -N 11/patches/patch-src_hotspot_os_bsd_os_bsd_cpp
--- 11/patches/patch-src_hotspot_os_bsd_os_bsd_cpp 2 May 2024 15:42:52
- 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-Use the correct number of cpus when hw.smt=0
-
-Index:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/02 09:42:52 Modified files: devel/jdk/1.8/patches: patch-hotspot_src_os_bsd_vm_os_bsd_cpp devel/jdk/11/patches: patch-src_hotspot_os_bsd_os_bsd_cpp devel/jdk/17/patches: patch-src_hotspot_os_bsd_os_bsd_cpp devel/jdk/21/patches: patch-src_hotspot_os_bsd_os_bsd_cpp Log message: Fix patch description to correctly describe the reason for the patch: Use the correct number of cpus when hw.smt=0 Pointed out by Kirill A. Korinsky and sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/02 07:33:48 Modified files: devel/jdk/21 : Makefile distinfo Added files: devel/jdk/21/patches: patch-src_hotspot_os_bsd_os_bsd_cpp Log message: Update to 21.0.3 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-04-16 * Take advantage of hyperthreading when hw.smt is enabled. Patch originally submitted by Kirill A. Korinsky
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/02 07:33:08 Modified files: devel/jdk/17 : Makefile distinfo Added files: devel/jdk/17/patches: patch-src_hotspot_os_bsd_os_bsd_cpp Log message: Update to 17.0.11 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-04-16 * Take advantage of hyperthreading when hw.smt is enabled. Patch originally submitted by Kirill A. Korinsky
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/01 14:55:10 Modified files: devel/jdk/11 : Makefile distinfo devel/jdk/11/patches: patch-make_common_NativeCompilation_gmk Added files: devel/jdk/11/patches: patch-src_hotspot_os_bsd_os_bsd_cpp Log message: Update to 11.0.23 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-04-16 * Take advantage of hyperthreading when hw.smt is enabled. Patch originally submitted by Kirill A. Korinsky
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/05/01 14:05:48 Modified files: devel/jdk/1.8 : Makefile distinfo Added files: devel/jdk/1.8/patches: patch-hotspot_src_os_bsd_vm_os_bsd_cpp patch-hotspot_src_os_cpu_bsd_sparc_vm_os_bsd_sparc_cpp Log message: Update to 8u412 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-04-16 * Fix implicit FPE exceptions on sparc64 * Take advantage of hyperthreading when hw.smt is enabled. Patch originally submitted by Kirill A. Korinsky .
Re: update: www/py-responses
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${MODP
[UPDATE] sysutils/u-boot/rk3588 to 2024-04
This updates rk3588 to 2024-04. Notable differences are; I can have
root installed on the nvme and rkdrm is now configured. u-boot
and boot messages at end.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/rk3588/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile14 Apr 2024 04:21:30 - 1.4
+++ Makefile14 Apr 2024 19:03:19 -
@@ -1,5 +1,4 @@
-VERSION= 2024.01-rc3
-REVISION= 2
+VERSION= 2024.04
SOC= rk3588
@@ -18,8 +17,8 @@ BUILD_DEPENDS+= devel/arm-none-eabi/gcc,
sysutils/e2fsprogs
CROSS_COMPILE= aarch64-none-elf-
-RK3588_TPL=rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin
-RK3588_BL31= rk3588_bl31_v1.40.elf
+RK3588_TPL=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin
+RK3588_BL31= rk3588_bl31_v1.45.elf
DISTFILES.rkbin= ${RK3588_TPL} ${RK3588_BL31}
SITES.rkbin= https://github.com/rockchip-linux/rkbin/raw/master/bin/rk35/
Index: distinfo
===
RCS file: /cvs/ports/sysutils/u-boot/rk3588/distinfo,v
retrieving revision 1.1
diff -u -p -u -r1.1 distinfo
--- distinfo26 Nov 2023 21:06:26 - 1.1
+++ distinfo14 Apr 2024 19:03:19 -
@@ -1,6 +1,6 @@
-SHA256 (rk3588_bl31_v1.40.elf) = KLye1YfQEWcJgihTDK0RRILh8w+qGm2XRL/HsFlE028=
-SHA256 (rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin) =
qyD6dtVTW7lcQnsReyQlEDFrjCeIljndDEwqRIMs+y8=
-SHA256 (u-boot-2024.01-rc3.tar.bz2) =
Amk3LQ2t5Yok2sHYK+Q/WSzIJi6tWpqaIsBupaf5geo=
-SIZE (rk3588_bl31_v1.40.elf) = 418592
-SIZE (rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.bin) = 72816
-SIZE (u-boot-2024.01-rc3.tar.bz2) = 19914182
+SHA256 (rk3588_bl31_v1.45.elf) = jEBNnPBVkRJ1Qq3sDrkrBmzxnTxqr/0Jf3ES4X6LMEQ=
+SHA256 (rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin) =
WqYnEZXkIqLDCo6AG6pk5KEMvGpfGWP5op5tyFCWx78=
+SHA256 (u-boot-2024.04.tar.bz2) = GKhT/jn6160DqQzC1Cda6u1tppc13vrDSSuAUIhD3Uo=
+SIZE (rk3588_bl31_v1.45.elf) = 430880
+SIZE (rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin) = 75480
+SIZE (u-boot-2024.04.tar.bz2) = 20228837
DDR 9fffbe1e78 cym 24/02/04-10:09:20,fwver: v1.16
LPDDR4X, 2112MHz
channel[0] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=16 Size=4096MB
channel[1] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=16 Size=4096MB
channel[2] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=16 Size=4096MB
channel[3] BW=16 Col=10 Bk=8 CS0 Row=17 CS1 Row=17 CS=2 Die BW=16 Size=4096MB
Manufacturer ID:0xff
CH0 RX Vref:26.7%, TX Vref:21.8%,20.8%
CH1 RX Vref:25.4%, TX Vref:21.8%,21.8%
CH2 RX Vref:26.7%, TX Vref:22.8%,22.8%
CH3 RX Vref:28.5%, TX Vref:22.8%,22.8%
change to F1: 528MHz
change to F2: 1068MHz
change to F3: 1560MHz
change to F0: 2112MHz
out
U-Boot SPL 2024.04 (Apr 13 2024 - 09:31:42 -0400)
Trying to boot from MMC2
## Checking hash(es) for config config-1 ... OK
## Checking hash(es) for Image atf-1 ... sha256+ OK
## Checking hash(es) for Image u-boot ... sha256+ OK
## Checking hash(es) for Image fdt-1 ... sha256+ OK
## Checking hash(es) for Image atf-2 ... sha256+ OK
## Checking hash(es) for Image atf-3 ... sha256+ OK
INFO:Preloader serial: 2
NOTICE: BL31: v2.3():v2.3-682-g4ca8a8422:derrick.huang, fwver: v1.45
NOTICE: BL31: Built : 10:11:21, Dec 27 2023
INFO:spec: 0x1
INFO:code: 0x88
INFO:ext 32k is not valid
INFO:ddr: stride-en 4CH
INFO:GICv3 without legacy support detected.
INFO:ARM GICv3 driver initialized in EL3
INFO:valid_cpu_msk=0xff bcore0_rst = 0x0, bcore1_rst = 0x0
INFO:l3 cache partition cfg-0
INFO:system boots from cpu-hwid-0
INFO:enable memory repair
INFO:idle_st=0x21fff, pd_st=0x11fff9, repair_st=0xfff70001
INFO:dfs DDR fsp_params[0].freq_mhz= 2112MHz
INFO:dfs DDR fsp_params[1].freq_mhz= 528MHz
INFO:dfs DDR fsp_params[2].freq_mhz= 1068MHz
INFO:dfs DDR fsp_params[3].freq_mhz= 1560MHz
INFO:BL31: Initialising Exception Handling Framework
INFO:BL31: Initializing runtime services
WARNING: No OPTEE provided by BL2 boot loader, Booting device without OPTEE
initialization. SMC`s destined for OPTEE will return SMC_UNK
ERROR: Error initializing runtime service opteed_fast
INFO:BL31: Preparing for EL3 exit to normal world
INFO:Entry point address = 0xa0
INFO:SPSR = 0x3c9
U-Boot 2024.04 (Apr 13 2024 - 09:31:42 -0400)
Model: Radxa ROCK 5 Model B
DRAM: 16 GiB (effective 15.7 GiB)
Core: 356 devices, 30 uclasses, devicetree: separate
MMC: mmc@fe2c: 1, mmc@fe2d: 2, mmc@fe2e: 0
Loading Environment from nowhere... OK
In:serial@feb5
Out: serial@feb5
Err: serial@feb5
Model: Radxa ROCK 5 Model B
Net: No ethernet found.
Hit any key to stop autoboot: 0
Scanning for bootflows in all bootdevs
Seq Method State UclassPart Name Filename
--- --- --
Scanning global bootmeth 'efi_mgr':
Card
Re: big-endian sysutils/u-boot/{rk356x,rk3588}
On Mar 21, 2024, at 1:16 PM, George Koehler wrote:
>
> I don't use u-boot, but I saw the powerpc bulk failing to package
> u-boot for rk356x and rk3588. This diff fixes the failures by adding
> 5 endian swaps. I don't know if my u-boot works, but I picked 2
> boards (1 from each package) and compared u-boot-rockchip.bin between
> powerpc and amd64: cmp -l|wc -l found 106 to 117 different bytes.
>
> Right now, powerpc is the only big-endian arch that can build this.
> mips64 and powerpc64 are missing devel/arm-none-eabi/gcc,aarch64; and
> sparc64 has BROKEN-sparc64 on u-boot. My 750 MHz PowerPC G4 takes
> over 3+1/2 hours to package rk3588 and over 7+1/2 hours for rk356x.
>
> May I get an ok from arm64 people?
> --gkoehler
George provided me the rock5b u-boot-rockchip.bin built on powerpc
to test. It boots fine and with no output differences.
I also built this on amd64 and tested the result on a rock5b. It
also boots fine and with no output differences.
okay kurt@
> Index: rk356x/Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/rk356x/Makefile,v
> diff -u -p -r1.4 Makefile
> --- rk356x/Makefile 17 Feb 2024 11:27:42 - 1.4
> +++ rk356x/Makefile 20 Mar 2024 22:34:34 -
> @@ -1,4 +1,5 @@
> VERSION= 2024.01
> +REVISION= 0
>
> SOC= rk356x
>
> Index: rk356x/files/rkbinpatch.c
> ===
> RCS file: /cvs/ports/sysutils/u-boot/rk356x/files/rkbinpatch.c,v
> diff -u -p -r1.1 rkbinpatch.c
> --- rk356x/files/rkbinpatch.c 17 Oct 2023 19:36:22 - 1.1
> +++ rk356x/files/rkbinpatch.c 20 Mar 2024 22:34:35 -
> @@ -16,6 +16,7 @@
>
> #include
> #include
> +#include
> #include
> #include
> #include
> @@ -43,12 +44,13 @@ main(int argc, char *argv[])
>
> end = (char *)start + st.st_size;
> for (word = start; (void *)word < end; word++) {
> - if (*word == 0x12345678 && (void *)(word + 10) < end) {
> - data = *(word + 9);
> + if (le32toh(*word) == 0x12345678 &&
> +(void *)(word + 10) < end) {
> + data = le32toh(*(word + 9));
> if ((data & 0xff) == 150) {
> data &= 0xff00;
> data |= 115200;
> - *(word + 9) = data;
> + *(word + 9) = htole32(data);
> close(fd);
> return 0;
> }
> Index: rk356x/patches/patch-tools_rkcommon_c
> ===
> RCS file: rk356x/patches/patch-tools_rkcommon_c
> diff -N rk356x/patches/patch-tools_rkcommon_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ rk356x/patches/patch-tools_rkcommon_c 20 Mar 2024 22:34:35 -
> @@ -0,0 +1,23 @@
> +Add endian swaps for BE_ARCHS.
> +
> +Index: tools/rkcommon.c
> +--- tools/rkcommon.c.orig
> tools/rkcommon.c
> +@@ -454,7 +454,7 @@ int rkcommon_verify_header(unsigned char *buf, int siz
> + int ret;
> +
> + /* spl_hdr is abandon on header_v2 */
> +- if ((*(uint32_t *)buf) == RK_MAGIC_V2)
> ++ if (le32_to_cpu(*(uint32_t *)buf) == RK_MAGIC_V2)
> + return 0;
> +
> + ret = rkcommon_parse_header(buf, , _spl_info);
> +@@ -489,7 +489,7 @@ void rkcommon_print_header(const void *buf, struct ima
> + uint8_t image_type;
> + int ret, boot_size, init_size;
> +
> +- if ((*(uint32_t *)buf) == RK_MAGIC_V2) {
> ++ if (le32_to_cpu(*(uint32_t *)buf) == RK_MAGIC_V2) {
> + ret = rkcommon_parse_header_v2(buf, _v2);
> +
> + if (ret < 0) {
> Index: rk3588/Makefile
> ===
> RCS file: /cvs/ports/sysutils/u-boot/rk3588/Makefile,v
> diff -u -p -r1.3 Makefile
> --- rk3588/Makefile 6 Mar 2024 10:19:30 - 1.3
> +++ rk3588/Makefile 20 Mar 2024 22:34:35 -
> @@ -1,5 +1,5 @@
> VERSION= 2024.01-rc3
> -REVISION= 1
> +REVISION= 2
>
> SOC= rk3588
>
> Index: rk3588/files/rkbinpatch.c
> ===
> RCS file: /cvs/ports/sysutils/u-boot/rk3588/files/rkbinpatch.c,v
> diff -u -p -r1.1 rkbinpatch.c
> --- rk3588/files/rkbinpatch.c 26 Nov 2023 21:06:26 - 1.1
> +++ rk3588/files/rkbinpatch.c 20 Mar 2024 22:34:35 -
> @@ -43,12 +43,13 @@ main(int argc, char *argv[])
>
> end = (char *)start + st.st_size;
> for (word = start; (void *)word < end; word++) {
> - if (*word == 0x12345678 && (void *)(word + 14) < end) {
> - data = *(word + 13);
> + if (le32toh(*word) == 0x12345678 &&
> +(void *)(word + 14) < end) {
> + data = le32toh(*(word + 13));
> if ((data & 0xff) == 150) {
> data &= 0xff00;
> data |= 115200;
> - *(word + 13) = data;
> + *(word + 13) = htole32(data);
> close(fd);
> return 0;
> }
&g
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/05 00:52:26 Modified files: mail/neomutt : Makefile Log message: Build was failing on sparc64 with "error: initializer element is not constant" Shift to ports-gcc and drop gnu99 clause at bottom Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/05 00:40:49 Modified files: sysutils/crust : Makefile Log message: crust uses C11, so must use ports-gcc on base-gcc arches Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/05 00:24:48 Modified files: textproc/libinih: Makefile Log message: libinih uses C++, so cannot use base-gcc Add COMPILER line to use ports-gcc on base-gcc arches Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/05 00:21:15 Modified files: archivers/libdeflate: Makefile Log message: libdeflate as of 1.20 refuses to build on anything older than gcc 4.9, so we need to use ports-gcc on base-gcc arches Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/03/31 20:06:56 Modified files: devel/jdk/1.8 : Makefile distinfo devel/jdk/11 : Makefile distinfo devel/jdk/17 : Makefile distinfo devel/jdk/21 : Makefile distinfo Log message: New bootstrap jdks because pinsysctls was removed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/18 15:03:58 Modified files: graphics/glfw : Makefile distinfo Removed files: graphics/glfw/patches: patch-CMakeLists_txt patch-deps_getopt_c Log message: Update to GLFW 3.3.9 Input from kn@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/17 22:03:49 Modified files: lang/ruby : ruby.port.mk Log message: ruby 3.3 ports of type "gem ext" need "base-clang ports-gcc" just like ruby 3.2 ports. Fixes the build of many many ruby33 ports on sparc64 Suggested by jeremy@
Re: python 3.11 update
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/ht
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/07 17:02:38 Modified files: devel/jdk/21 : Makefile distinfo Removed files: devel/jdk/21/patches: patch-make_modules_java_base_Lib_gmk patch-make_modules_java_desktop_lib_Awt2dLibraries_gmk Log message: Update to 21.0.2 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-01-16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/07 17:01:59 Modified files: devel/jdk/17 : Makefile distinfo Removed files: devel/jdk/17/patches: patch-make_hotspot_lib_JvmOverrideFiles_gmk patch-src_hotspot_os_cpu_bsd_aarch64_os_bsd_aarch64_cpp patch-src_hotspot_share_runtime_safefetch_static_hpp Log message: Update to 17.0.10 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-01-16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/07 17:00:58 Modified files: devel/jdk/11 : Makefile distinfo Removed files: devel/jdk/11/patches: patch-make_hotspot_lib_JvmOverrideFiles_gmk patch-make_lib_Awt2dLibraries_gmk patch-src_hotspot_share_code_nmethod_cpp patch-src_java_base_unix_native_libnet_DefaultProxySelector_c patch-src_java_desktop_unix_native_common_awt_awt_GraphicsEnv_h patch-src_java_desktop_unix_native_libawt_xawt_awt_gtk2_interface_c patch-src_java_desktop_unix_native_libawt_xawt_awt_gtk3_interface_c Log message: Update to 11.0.22 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-01-16
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/07 16:58:48 Modified files: devel/jdk/1.8 : Makefile distinfo Removed files: devel/jdk/1.8/patches: patch-common_autoconf_flags_m4 patch-common_autoconf_generated-configure_sh patch-common_autoconf_hotspot-spec_gmk_in patch-common_autoconf_jdk-options_m4 patch-hotspot_make_bsd_makefiles_aarch64_make patch-hotspot_make_bsd_makefiles_adlc_make patch-hotspot_make_bsd_makefiles_vm_make Log message: Update to 8u402 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2024-01-16
[maintainer update] graphics/glfw 3.3.9
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)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/03 01:06:25 Modified files: security/clamav: Makefile Log message: Mark BROKEN-sparc64 This hasn't built in some time because the rust part doesn't build. The memory safe language part dies with a SIGSEGV
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/03 00:39:29 Modified files: textproc/rapidjson: Makefile Log message: rapidjson uses C++, so ports-gcc is mandatory on base-gcc arches Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/03 00:22:51 Modified files: math/flintlib : Makefile Log message: flintlib doesn't build with base-gcc. Switch to ports-gcc for base-gcc arches Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/03 00:15:39 Modified files: audio/libsmackerdec: Makefile Log message: libsmackerdec uses C++ so cannot base-gcc. Move to ports-gcc on base-gcc arches Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/02/02 23:55:43 Modified files: net/iperf3 : Makefile Log message: iperf3 is unhappy with base-gcc. Shift to ports-gcc on base-gcc arches. Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/12/20 14:54:14 Modified files: devel/jdk/17 : Makefile Added files: devel/jdk/17/patches: patch-make_hotspot_lib_JvmOverrideFiles_gmk Log message: Reduce optimization on parse2.cpp due to multiple tests fail with assert(taken_cnt <= total_cnt) with fastdebug build on i386.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/12/11 07:39:45 Modified files: devel/jdk : Makefile Log message: Connect jdk-21 to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/12/11 07:38:55 Modified files: devel/jdk : java.port.mk Log message: Add support for jdk-21. okay ian@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/12/11 07:36:21 Log message: Import jdk-21. okay ian@ Status: Vendor Tag: kurt Release Tags: kurt_20231211 N ports/devel/jdk/21/Makefile N ports/devel/jdk/21/distinfo N ports/devel/jdk/21/patches/patch-make_common_NativeCompilation_gmk N ports/devel/jdk/21/patches/patch-make_modules_java_base_Lib_gmk N ports/devel/jdk/21/patches/patch-make_modules_java_desktop_lib_Awt2dLibraries_gmk N ports/devel/jdk/21/pkg/PFRAG.ci N ports/devel/jdk/21/pkg/DESCR N ports/devel/jdk/21/pkg/PLIST N ports/devel/jdk/21/pkg/README No conflicts created by this import
[NEW] devel/jdk/21
Attached is a port of jdk-21. I have already updated javaPathHelper
to support jdk-21. Below is the diff for java.port.mk to add
support for it as well.
okay for java.port.mk and to import devel/jdk/21?
Index: java.port.mk
===
RCS file: /cvs/ports/devel/jdk/java.port.mk,v
retrieving revision 1.42
diff -u -p -u -r1.42 java.port.mk
--- java.port.mk11 Mar 2022 18:50:14 - 1.42
+++ java.port.mk7 Dec 2023 18:28:15 -
@@ -1,4 +1,4 @@
-# Set MODJAVA_VER to 1.8, 11 or 17 based on the version of the jdk needed
+# Set MODJAVA_VER to 1.8, 11, 17 or 21 based on the version of the jdk needed
# for the port. Append a + (e.g., 11+) if any higher version is acceptable.
MODJAVA_VER?=
@@ -22,8 +22,9 @@ MODJAVA_VER?=
#
.if ${MODJAVA_VER:S/+//} != "1.8" && ${MODJAVA_VER:S/+//} != "11" && \
- ${MODJAVA_VER:S/+//} != "17"
-ERRORS+="Fatal: MODJAVA_VER must be one of 1.8, 11 or 17 with an optional
+ suffix."
+ ${MODJAVA_VER:S/+//} != "17" && ${MODJAVA_VER:S/+//} != "21"
+ERRORS+="Fatal: MODJAVA_VER must be one of 1.8, 11, 17 or 21"
+ERRORS+="with an optional + suffix."
.endif
.if ${MODJAVA_VER:S/+//} == "1.8"
@@ -38,9 +39,12 @@ MODJAVA_VER?=
.elif ${MODJAVA_VER:S/+//} == "11"
JAVA_HOME= ${LOCALBASE}/jdk-11
MODJAVA_BUILD_DEPENDS+= jdk->=11v0,<12v0:devel/jdk/11
-.else
+.elif ${MODJAVA_VER:S/+//} == "17"
JAVA_HOME= ${LOCALBASE}/jdk-17
MODJAVA_BUILD_DEPENDS+= jdk->=17v0,<18v0:devel/jdk/17
+.else
+JAVA_HOME= ${LOCALBASE}/jdk-21
+MODJAVA_BUILD_DEPENDS+= jdk->=21v0,<22v0:devel/jdk/21
.endif
.if ${MODJAVA_VER:M*+}
devel.jdk.21.tgz
Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/12/07 10:20:52 Modified files: java/javaPathHelper: Makefile distinfo Log message: Update to version 2.3 to add support for jdk-21
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/11/28 12:57:12 Modified files: devel/gobject-introspection: Makefile Log message: gobject-introspection no longer gets along with base-gcc. Shift to ports-gcc on base-gcc arches to fix build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/11/22 16:38:04 Modified files: devel/jdk/11 : Makefile Added files: devel/jdk/11/patches: patch-make_hotspot_lib_JvmOverrideFiles_gmk patch-make_lib_Awt2dLibraries_gmk patch-src_hotspot_share_code_nmethod_cpp patch-src_java_base_unix_native_libnet_DefaultProxySelector_c patch-src_java_desktop_unix_native_common_awt_awt_GraphicsEnv_h patch-src_java_desktop_unix_native_libawt_xawt_awt_gtk2_interface_c patch-src_java_desktop_unix_native_libawt_xawt_awt_gtk3_interface_c Log message: Various clang-16 fixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/11/20 11:31:14 Modified files: devel/jdk/1.8 : Makefile Added files: devel/jdk/1.8/patches: patch-common_autoconf_flags_m4 patch-common_autoconf_generated-configure_sh patch-common_autoconf_hotspot-spec_gmk_in patch-common_autoconf_jdk-options_m4 patch-hotspot_make_bsd_makefiles_aarch64_make patch-hotspot_make_bsd_makefiles_adlc_make patch-hotspot_make_bsd_makefiles_vm_make Log message: Fix clang 16 build: * Fix makefiles and autoconf to use CXXSTD_CXXFLAG correctly * Use -std=c++11 for clang builds. Note that gcc builds use gnu++98 but clang's gnu++98 is not fully compatible with gnu's - presumably what c++11 extensions are included varies. * Reduce optimization level for immediate_aarch64.cpp on aarch64 Also use âimagesâ for ALL_TARGET to skip building javadocs we are not installing.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/27 00:26:22 Modified files: x11/spectrwm : Makefile Log message: spectrwm's new version does not get along with base-gcc, move to ports-gcc Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/21 11:24:51 Modified files: devel/jdk/17 : Makefile distinfo devel/jdk/17/patches: patch-make_common_NativeCompilation_gmk Added files: devel/jdk/17/patches: patch-src_hotspot_os_cpu_bsd_aarch64_os_bsd_aarch64_cpp patch-src_hotspot_share_runtime_safefetch_static_hpp Removed files: devel/jdk/17/patches: patch-make_autoconf_flags-ldflags_m4 patch-src_hotspot_cpu_aarch64_templateInterpreterGenerator_aarch64_cpp patch-src_hotspot_os_bsd_os_bsd_cpp patch-src_hotspot_share_runtime_os_hpp patch-src_hotspot_share_runtime_stackOverflow_cpp patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_c patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_h Log message: Update to 17.0.9 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2023-10-17
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/21 07:58:55 Modified files: devel/jdk/11 : Makefile distinfo Removed files: devel/jdk/11/patches: patch-make_autoconf_flags-ldflags_m4 patch-src_hotspot_cpu_aarch64_templateInterpreterGenerator_aarch64_cpp patch-src_hotspot_os_bsd_os_bsd_cpp patch-src_hotspot_share_runtime_os_hpp patch-src_hotspot_share_runtime_thread_cpp patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_c patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_h Log message: Update to 11.0.21 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2023-10-17
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/20 20:58:19 Modified files: games/xmoto: Makefile Log message: xmoto always haangs for 8 hours and then gets killed when building on sparc64. Mark it BROKEN-sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/20 20:25:02 Modified files: devel/jdk/1.8 : Makefile distinfo Removed files: devel/jdk/1.8/patches: patch-common_autoconf_generated-configure_sh patch-common_autoconf_toolchain_m4 patch-hotspot_src_cpu_aarch64_vm_templateInterpreter_aarch64_cpp patch-hotspot_src_os_bsd_vm_os_bsd_cpp patch-hotspot_src_os_cpu_bsd_sparc_vm_os_bsd_sparc_cpp patch-hotspot_src_share_vm_runtime_os_hpp patch-hotspot_src_share_vm_runtime_thread_cpp Log message: Update to 8u392 GA: * Contains upstream bug and security fixes: https://openjdk.org/groups/vulnerability/advisories/2023-10-17
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/20 03:18:48 Modified files: lang/python/3.11: Makefile distinfo lang/python/3.11/patches: patch-Makefile_pre_in patch-Modules__hashopenssl_c patch-Python_fileutils_c patch-configure_ac lang/python/3.11/pkg: PLIST-main PLIST-tests Log message: https://docs.python.org/release/3.11.6/whatsnew/changelog.html#python-3-11-6 Update to Python 3.11.6 Input from and ok daniel@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/18 02:20:58 Modified files: security/xmlsec: Makefile Log message: xmlsec now uses many warning options base-gcc doesn't understand. Ditch the old base-gcc c99 dance and switch to ports-gcc Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/17 21:56:45 Modified files: graphics/libgexiv2: Makefile Log message: ports-gcc needs libstdc++fs linked in. Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/17 00:40:14 Modified files: games/crispy-doom: Makefile Log message: crispy-doom uses C99 constructs (for loop in particular) Do the C99 dance to fix the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/17 00:17:19 Modified files: devel/liburcu : Makefile Log message: liburcu uses C++ now, so we need to drop the COMPILER_LANGS=c line Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/16 23:13:16 Modified files: editors/nvi: Makefile Log message: base-gcc fails building with undefined reference to `__builtin_unreachable' Switching to ports-gcc fixes build for sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/16 22:55:10 Modified files: editors/litexl : Makefile Log message: litexl uses GNU11 extensions, so that requires ports-gcc, not base-gcc Fixes build on sparc64
Re: [maintainer update] Python 3.11.6
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.cpython-311.o
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/15 23:53:06 Modified files: audio/vgmstream: Makefile Log message: audio/vgmstream uses c99. Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/10/15 23:52:06 Modified files: devel/acpica : Makefile Log message: acpica needs ports-gcc rather than base-gcc to compile. Fixes the build on sparc64
[maintainer update] Python 3.11.6
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 \
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/09/29 17:54:24 Modified files: audio/milkytracker: Makefile Added files: audio/milkytracker/patches: patch-CMakeLists_txt Log message: port-gcc needs to use C++11 to use non-static initializers. Apparently LLVM doesn't care. Submitted upstream: https://github.com/milkytracker/MilkyTracker/pull/328 Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/14 08:31:09 Modified files: devel/jdk/1.8 : Makefile devel/jdk/1.8/patches: patch-common_autoconf_generated-configure_sh patch-hotspot_src_os_cpu_bsd_sparc_vm_os_bsd_sparc_cpp Log message: Support setting thread stack sizes on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/09 11:59:35 Modified files: devel/jdk/11 : Makefile Removed files: devel/jdk/11/files: cacerts Log message: Use the distributed cacerts Enable the Shenandoah GC
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/09 11:58:28 Modified files: devel/jdk/17 : Makefile Removed files: devel/jdk/17/files: cacerts Log message: Use the distributed cacerts
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/09 11:57:24 Modified files: devel/jdk/1.8 : Makefile Removed files: devel/jdk/1.8/files: cacerts Log message: Use the distributed cacerts.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/04 20:16:10 Modified files: games/lwjgl3 : Makefile distinfo games/lwjgl3/pkg: PFRAG.x86 PLIST Log message: Fix build on arm64. Diff from kurt@, but as I am upstream, I rolled a new release with the patch he was going to add to the port.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/01 19:12:13 Modified files: devel/jdk/17 : Makefile distinfo Log message: Update to 17.0.8 GA: * Contains upstream bug and security fixes: https://foojay.io/java-17/?version=17.0.8=072023=component https://openjdk.org/groups/vulnerability/advisories/2023-07-18
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/01 13:07:04 Modified files: devel/jdk/11 : Makefile distinfo Log message: Update to 11.0.20 GA: * Contains upstream bug and security fixes: https://foojay.io/java-11/?version=11.0.20=072023=component https://openjdk.org/groups/vulnerability/advisories/2023-07-18
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/08/01 09:32:16 Modified files: devel/jdk/1.8 : Makefile distinfo Log message: Update to 8u382 GA: * Contains upstream bug and security fixes: https://foojay.io/java-8/?version=openjdk8u382=072023=component https://openjdk.org/groups/vulnerability/advisories/2023-07-18
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/31 21:27:15 Modified files: devel/jdk/11 : Makefile Log message: Prevent configure from picking up pandoc as well.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/31 21:14:08 Modified files: devel/jdk/17 : Makefile Log message: Pass CONFIGURE_ARGS to ensure we don't pickup unwanted build depends. Fixes junking in bulk builds.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/27 19:53:00 Modified files: devel/jdk/1.8 : Makefile Log message: Pass CONFIGURE_ARGS/ENV to ensure we don't pickup unwanted build depends. Fixes junking in bulk builds.
Re: jdk fails to build (gmkdir)
On Jul 27, 2023, at 5:44 AM, Antoine Jacoutot wrote: > > Hi. > > It seems gmkdir is picked up if present at configure time. > If junked then the build fails with: Thanks. Fix committed. I’ll look over 1.8 and 17 for similar corrections as well.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/27 11:09:42 Modified files: devel/jdk/11 : Makefile Log message: Pass CONFIGURE_ARGS to ensure we don't pickup unwanted build depends. Fixes junking in bulk builds reported by ajacoutot@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/08 21:32:51 Modified files: textproc/raptor: Makefile Log message: This uses C++, so base-gcc arches must use ports-gcc Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/08 18:58:50 Modified files: devel/libtalloc: Makefile Log message: libtalloc wants thread-local storage now. Move to ports-gcc for base-gcc arches Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/08 18:46:35 Modified files: databases/tdb : Makefile Log message: tdb wants thread-local storage now. Move to ports-gcc for base-gcc arches Fixes the build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/07/02 04:26:09 Modified files: devel/jdk/11 : Makefile distinfo devel/jdk/17 : Makefile distinfo Log message: Update bootstraps with nobtcfi in prep for BTI okay sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/30 09:49:51 Modified files: devel/jdk/1.8 : Makefile distinfo Added files: devel/jdk/1.8/patches: patch-hotspot_src_os_cpu_bsd_sparc_vm_os_bsd_sparc_cpp patch-hotspot_src_share_vm_runtime_globals_hpp Log message: * Update bootstraps with nobtcfi in prep for BTI * Sync sparc64 signal handling code with linux updates * Work-around a stablilty issue on sparc64 okay sthen@
Re: JDKs and control-flow enforcement
On Jun 27, 2023, at 10:48 AM, Stuart Henderson wrote:
>
> On 2023/06/27 08:18, Kurt Miller wrote:
>> The CLA situation is no more. Greg and I have given up on getting
>> BSD support merged upstream. It became clear that Oracle would not
>> accept our code without a deep pocket corporation backing the
>> effort.
>>
>> If you have tested diffs already baked, please go ahead and commit
>> them. I can build new bootstraps after it lands.
>
> Not super-tidy, but this does the trick. I don't see how to tell
> for sure whether a binary is built with this or not (it's possible
> that it's "LOOS+5a3dbe8" in readelf -l) so I haven't made any
> extra checks like are done for wxneeded.
>
> Will commit it to move ahead, happy to test any tweaks if wanted.
This is fine for now. Okay kurt@
> Index: 1.8/Makefile
> ===
> RCS file: /cvs/ports/devel/jdk/1.8/Makefile,v
> retrieving revision 1.81
> diff -u -p -r1.81 Makefile
> --- 1.8/Makefile 19 May 2023 01:43:08 - 1.81
> +++ 1.8/Makefile 27 Jun 2023 14:11:22 -
> @@ -1,5 +1,6 @@
> ONLY_FOR_ARCHS= i386 amd64 aarch64 sparc64
> USE_WXNEEDED= Yes
> +USE_NOBTCFI= Yes
> DPB_PROPERTIES= parallel
>
> COMMENT= OpenJDK Software Development Kit v${V}
> @@ -11,7 +12,7 @@ V= ${BASE_VER}.${UPDATE_VER}.${BUILD_VE
> PKGNAME= jdk-${V}
> PKGSTEM= jdk-${BASE_VER}
> EPOCH= 0
> -REVISION= 0
> +REVISION= 1
>
> DIST_SUBDIR= jdk
> DISTNAME= jdk8u${UPDATE_VER}-${BUILD_VER}.${BSD_PORT_REL}
> Index: 1.8/patches/patch-common_autoconf_generated-configure_sh
> ===
> RCS file: 1.8/patches/patch-common_autoconf_generated-configure_sh
> diff -N 1.8/patches/patch-common_autoconf_generated-configure_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 1.8/patches/patch-common_autoconf_generated-configure_sh 27 Jun 2023
> 14:11:22 -
> @@ -0,0 +1,21 @@
> +Index: common/autoconf/generated-configure.sh
> +--- common/autoconf/generated-configure.sh.orig
> common/autoconf/generated-configure.sh
> +@@ -41202,7 +41202,7 @@ fi
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld requires -z
> wxneeded" >&5
> + $as_echo_n "checking if ld requires -z wxneeded... " >&6; }
> + PUSHED_LDFLAGS="$LDFLAGS"
> +-LDFLAGS="$LDFLAGS -Wl,-z,wxneeded"
> ++LDFLAGS="$LDFLAGS -Wl,-z,wxneeded -Wl,-z,nobtcfi"
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> + /* end confdefs.h. */
> + int main() { }
> +@@ -41212,7 +41212,7 @@ if ac_fn_cxx_try_link "$LINENO"; then :
> + if $READELF -l conftest$ac_exeext | $GREP OPENBSD_WXNEED >
> /dev/null; then
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> + $as_echo "yes" >&6; }
> +-LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded"
> ++LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded -Wl,-z,nobtcfi"
> + else
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
> + $as_echo "yes" >&6; }
> Index: 1.8/patches/patch-common_autoconf_toolchain_m4
> ===
> RCS file: 1.8/patches/patch-common_autoconf_toolchain_m4
> diff -N 1.8/patches/patch-common_autoconf_toolchain_m4
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 1.8/patches/patch-common_autoconf_toolchain_m4 27 Jun 2023 14:11:22 -
> @@ -0,0 +1,18 @@
> +Index: common/autoconf/toolchain.m4
> +--- common/autoconf/toolchain.m4.orig
> common/autoconf/toolchain.m4
> +@@ -855,12 +855,12 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
> + if test "`uname -s`" = "OpenBSD"; then
> + AC_MSG_CHECKING([if ld requires -z wxneeded])
> + PUSHED_LDFLAGS="$LDFLAGS"
> +-LDFLAGS="$LDFLAGS -Wl,-z,wxneeded"
> ++LDFLAGS="$LDFLAGS -Wl,-z,wxneeded -Wl,-z,nobtcfi"
> + AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { }]])],
> + [
> + if $READELF -l conftest$ac_exeext | $GREP OPENBSD_WXNEED >
> /dev/null; then
> + AC_MSG_RESULT([yes])
> +-LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded"
> ++LDFLAGS_JDK="${LDFLAGS_JDK} -Wl,-z,wxneeded -Wl,-z,nobtcfi"
> + else
> + AC_MSG_RESULT([yes])
> + fi
> Index: 11/Makefile
> ===
> RCS file: /cvs/ports/devel/jdk/11/Makefile,v
> retrieving revi
Re: JDKs and control-flow enforcement
On Jun 27, 2023, at 5:41 AM, Stuart Henderson wrote: > > On amd64 with a processor with IBT support running a kernel with the > control-flow enforcement diff that's being tried in snapshots, the > various Java-compiled binaries fail. > > Some information pasted below and hs log attached; I didn't bother with > the gdb backtrace as it just shows the signal handler in the lead-up to > VMError::report_and_die). > > There's a good chance aarch64 will have the same on CPUs which do > control-flow integrity too (I think that may just be M2, not sure). > > Bearing in mind the CLA situation I won't send a diff but adding > -Wl,-z,nobtcfi in the same place that -Wl,-z,wxneeded is added does > the trick to fix things (and while I think it won't matter for the > package it would be helpful to add USE_NOBTCFI=Yes to the port so > we can find it more easily). > > We'll need new bootstraps at some point (for people building jdk > themselves on newer machines) but that can be done later than > fixing the package binaries (I can help with bootstrap builds if > wanted). > Thanks for the in-depth explanation. The CLA situation is no more. Greg and I have given up on getting BSD support merged upstream. It became clear that Oracle would not accept our code without a deep pocket corporation backing the effort. If you have tested diffs already baked, please go ahead and commit them. I can build new bootstraps after it lands. > > $ dmesg | grep -B1 ,IBT | head -2 > cpu0: 12th Gen Intel(R) Core(TM) i5-1245U, 1575.89 MHz, 06-9a-04 > cpu0: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,SDBG,FMA3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,PT,SHA,UMIP,PKU,WAITPKG,PKS,MD_CLEAR,IBT,IBRS,IBPB,STIBP,L1DF,SSBD,SENSOR,ARAT,XSAVEOPT,XSAVEC,XGETBV1,XSAVES > > $ /usr/local/jdk-11/bin/java # > # A fatal error has been detected by the Java Runtime Environment: > # > # SIGILL (0x4) at pc=0x05fe614cdc20, pid=55171, tid=6586713654336 > # > # JRE version: (11.0.19+7) (build ) > # Java VM: OpenJDK 64-Bit Server VM (11.0.19+7-1, mixed mode, tiered, > compressed oops, g1 gc, bsd-amd64) > # Problematic frame: > # j java.lang.Object.()V+-289299944 java.base > # > # Core dump will be written. Default location: /home/sthen/java.core > # > # An error report file with more information is saved as: > # /home/sthen/hs_err_pid55171.log > Could not load hsdis-amd64.so; library not loadable; PrintAssembly is disabled > # > # > Abort trap (core dumped) >
Re: CVS: cvs.openbsd.org: ports
On Sun, Jun 25, 2023 at 08:52:37PM +0200, Solène Rapenne wrote:
> > Log message:
> > Update to Python 3.9.17
> > MFC
> > https://docs.python.org/release/3.9.17/whatsnew/changelog.html#changelog
> this doesn't package
I forgot to carry the fix for that from -current to -stable. Fixed now.
Sorry.
--Kurt
> ===> Building package for python-3.9.17
> Create /home/packages/amd64/all/python-3.9.17.tgz
> Creating package python-3.9.17
> checksumming|*
> | 22%
> Error: /build/tmp/pobj//Python-3.9.17/fake-
> amd64/usr/local/lib/python3.9/config-3.9/__pycache__/python-
> config.cpython-39.opt-1.pyc does not exist
> Error: /build/tmp/pobj//Python-3.9.17/fake-
> amd64/usr/local/lib/python3.9/config-3.9/__pycache__/python-
> config.cpython-39.opt-2.pyc does not exist
> Error: /build/tmp/pobj//Python-3.9.17/fake-
> amd64/usr/local/lib/python3.9/config-3.9/__pycache__/python-
> config.cpython-39.pyc does not exist
> pkg_create: can't continue
> *** Error 1 in lang/python/3.9
> (/home/ports//infrastructure/mk/bsd.port.mk:2140
> '/home/packages/amd64/all/python-3.9.17.tgz': @trap "cd /hom...)
> *** Error 2 in lang/python/3.9
> (/home/ports//infrastructure/mk/bsd.port.mk:2621 '_internal-package':
> @case X${_DEPENDS_CACHE} in X) _DEPEND...)
> *** Error 2 in lang/python/3.9
> (/home/ports//infrastructure/mk/bsd.port.mk:2600 'package':
> @lock=Python-3.9.17; export _LOCKS_HELD=" Python...)
> ===> Exiting lang/python/3.9 with an error
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/25 14:27:45 Modified files: lang/python/3.9/pkg: Tag: OPENBSD_7_3 PLIST-main Log message: Carry the same needed PLIST-main fix for 3.9 from -current to -stable
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/22 14:50:30 Modified files: mail/s-postgray: Makefile Log message: Fix sparc64 build by shifting to ports-gcc. base-gcc doesn't support all the warning options, and even patching those out throw other warnings about liberties the code takes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/22 14:33:46 Modified files: productivity/davical: Makefile Log message: Mark davical BROKEN-sparc64 since it wants PHP 8.1 and sparc64 is stuck with 8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/22 13:49:48 Modified files: lang/python/3.9/pkg: PLIST-main Log message: Remove extraneous lines in PLIST-main that keep Python 3.9 from packaging. Pointed out by tb@
Re: [maintainer update] Python 3.9.16 -> 3.9.17
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 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/19 13:56:06 Modified files: lang/python/3.11: Tag: OPENBSD_7_3 Makefile distinfo lang/python/3.11/pkg: Tag: OPENBSD_7_3 PLIST-main PLIST-tests Log message: Update to Python 3.11.4 MFC https://docs.python.org/release/3.11.4/whatsnew/changelog.html#python-3-11-4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/19 13:53:32 Modified files: lang/python/3.10: Tag: OPENBSD_7_3 Makefile distinfo Log message: Update to Python 3.10.12 MFC https://docs.python.org/release/3.10.12/whatsnew/changelog.html#python-3-10-12-final
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/19 13:52:01 Modified files: lang/python/3.9: Tag: OPENBSD_7_3 Makefile distinfo lang/python/3.9/pkg: Tag: OPENBSD_7_3 PLIST-main Log message: Update to Python 3.9.17 MFC https://docs.python.org/release/3.9.17/whatsnew/changelog.html#changelog
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/19 13:48:11 Modified files: lang/python/3.11: Makefile distinfo lang/python/3.11/pkg: PLIST-main PLIST-tests Log message: Update to Python 3.11.4 https://docs.python.org/release/3.11.4/whatsnew/changelog.html#python-3-11-4 ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/19 13:47:26 Modified files: lang/python/3.9: Makefile distinfo lang/python/3.9/pkg: PLIST-main Log message: Update to 3.9.17 https://docs.python.org/release/3.9.17/whatsnew/changelog.html#changelog ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/19 13:46:28 Modified files: lang/python: Makefile.inc lang/python/3.10: Makefile distinfo Log message: Update to Python 3.10.12 https://docs.python.org/release/3.10.12/whatsnew/changelog.html#python-3-10-12-final Add USE_NOBTCFI=Yes to Makefile.inc ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/17 23:09:21 Modified files: devel/gitsh: Makefile Log message: The transition to Ruby 3.2 means ports-gcc is needed to use its libraries. Fixes build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/17 22:46:33 Modified files: multimedia/mpv : Makefile multimedia/mpv/patches: patch-meson_build Log message: Fix build on sparc64 >From Brad Smith
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/17 22:30:45 Modified files: archivers/minizip: Makefile Log message: Fix for building minizip on sparc64 from Brad Smith
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/17 15:15:29 Modified files: devel/jdk/11 : Makefile devel/jdk/17 : Makefile Added files: devel/jdk/11/patches: patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_c patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_h devel/jdk/17/patches: patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_c patch-src_java_base_unix_native_libjava_ProcessHandleImpl_unix_h Log message: Start using waitid(2)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2023/06/16 22:35:54 Modified files: graphics/pstoedit: Makefile Log message: Add /usr/local/include to CPPFLAGS to fix build with ports-gcc Fixes build on sparc64
