From c1f4154428d18587fb046e4170a20353ccb29e94 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Wed, 13 Sep 2023 16:06:15 +0000 Subject: [PATCH 1/3] curl - update from 8.1.2 to 8.3.0 --- build/curl/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/curl/build.sh b/build/curl/build.sh index 40e671b7d3..c9ef5df10f 100755 --- a/build/curl/build.sh +++ b/build/curl/build.sh @@ -18,7 +18,7 @@ . ../../lib/build.sh PROG=curl -VER=8.1.2 +VER=8.3.0 PKG=web/curl SUMMARY="Command line tool for transferring data with URL syntax" DESC="Curl is a command line tool for transferring data with URL syntax, " From 1c3ed1877d0d8c72031269bfa4b26185f30ef7da Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Wed, 13 Sep 2023 14:22:22 +0000 Subject: [PATCH 2/3] openjdk11 - update from 11.0.20+8 to 11.0.20.1+1 --- build/openjdk11/build.sh | 37 ++++++++++++------- build/openjdk11/patches/omnios-headless.patch | 2 +- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/build/openjdk11/build.sh b/build/openjdk11/build.sh index 96681ffe39..f40ae6e568 100755 --- a/build/openjdk11/build.sh +++ b/build/openjdk11/build.sh @@ -17,21 +17,34 @@ . ../../lib/build.sh PROG=openjdk -VER=11 -UPDATE=20 -BUILD=8 +VER=11.0.20.1+1 PKG=runtime/java/openjdk11 -SUMMARY="openjdk $VER" +SUMMARY="openjdk ${VER%%.*}" DESC="Open-source implementation of the eleventh edition of the " DESC+="Java SE Platform" +# The full jdk version string is: +# feature.interim.update.patch.extra1.extra2.extra3-pre+build-opt +# We pass 'opt' explicitly to configure (see below) and currently don't parse +# the 'extra' values out of the version string. +if [[ $VER =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?\+([0-9]+)$ ]] +then + V_FEATURE=${BASH_REMATCH[1]} + V_INTERIM=${BASH_REMATCH[3]} + V_UPDATE=${BASH_REMATCH[5]} + V_PATCH=${BASH_REMATCH[7]} + V_BUILD=${BASH_REMATCH[8]} +else + logerr "Could not parse openjdk version $VER" +fi + # check ooce/fonts/liberation for current version LIBERATIONFONTSVER=2.1.5 SKIP_LICENCES="SILv1.1" set_arch 64 -set_builddir "jdk${VER}u-jdk-$VER.0.$UPDATE-$BUILD" +set_builddir "jdk${V_FEATURE}u-jdk-${VER//+/-}" BMI_EXPECTED=1 SKIP_RTIME_CHECK=1 @@ -47,8 +60,8 @@ BUILD_DEPENDS_IPS=" RUN_DEPENDS_IPS="runtime/java/jexec" -VERHUMAN=jdk${VER}u${UPDATE}-b$BUILD -IVER=${VER}.0 +VERHUMAN="jdk${V_FEATURE}u${V_UPDATE}${V_PATCH:+.}$V_PATCH-b$V_BUILD" +IVER="$V_FEATURE.$V_INTERIM" IROOT=usr/jdk/instances IFULL=$IROOT/$PROG$IVER @@ -56,7 +69,7 @@ IFULL=$IROOT/$PROG$IVER OOCEPREFIX=/opt/ooce XFORM_ARGS=" - -DVER=$VER + -DVER=$V_FEATURE -DIVER=$IVER -DIROOT=$IROOT -DIFULL=$IFULL @@ -67,9 +80,7 @@ XFORM_ARGS=" NO_PARALLEL_MAKE=1 CONFIGURE_OPTS=" - --with-version-update=$UPDATE - --with-version-build=$BUILD - --with-version-pre= + --with-version-string=$VER --with-version-opt=omnios-$RELVER --with-toolchain-type=gcc --with-boot-jdk=/$IFULL @@ -108,7 +119,7 @@ make_install() { } init -download_source $PROG "jdk-$VER.0.$UPDATE+$BUILD" +download_source $PROG "jdk-$VER" patch_source # Also download the liberation fonts archive. Fonts from here will be @@ -119,7 +130,7 @@ BUILDDIR=$LFDIR download_source liberation-fonts $LFDIR prep_build autoconf-like -oot chmod +x $CONFIGURE_CMD build -noctf -VER=$IVER.$UPDATE DASHREV=$BUILD make_package +VER=${VER%%+*} DASHREV=$V_BUILD make_package clean_up # Vim hints diff --git a/build/openjdk11/patches/omnios-headless.patch b/build/openjdk11/patches/omnios-headless.patch index 2b868a7db5..e2bd1b4738 100644 --- a/build/openjdk11/patches/omnios-headless.patch +++ b/build/openjdk11/patches/omnios-headless.patch @@ -1,7 +1,7 @@ diff -wpruN --no-dereference '--exclude=*.orig' a~/make/lib/Awt2dLibraries.gmk a/make/lib/Awt2dLibraries.gmk --- a~/make/lib/Awt2dLibraries.gmk 1970-01-01 00:00:00 +++ a/make/lib/Awt2dLibraries.gmk 1970-01-01 00:00:00 -@@ -734,11 +734,9 @@ else # not windows +@@ -735,11 +735,9 @@ else # not windows JAWT_LIBS += -lawt_xawt else JAWT_LIBS += -lawt_headless From 4b12079a55b46e11388adafedc69c54486c5de49 Mon Sep 17 00:00:00 2001 From: Andy Fiddaman Date: Wed, 13 Sep 2023 14:23:08 +0000 Subject: [PATCH 3/3] openjdk17 - updated from 17.0.8+7 to 17.0.8.1+1 --- build/openjdk17/build.sh | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/build/openjdk17/build.sh b/build/openjdk17/build.sh index 70ef32833f..7efb084e20 100755 --- a/build/openjdk17/build.sh +++ b/build/openjdk17/build.sh @@ -17,21 +17,34 @@ . ../../lib/build.sh PROG=openjdk -VER=17 -UPDATE=8 -BUILD=7 +VER=17.0.8.1+1 PKG=runtime/java/openjdk17 -SUMMARY="openjdk $VER" +SUMMARY="openjdk ${VER%%.*}" DESC="Open-source implementation of the seventeenth edition of the " DESC+="Java SE Platform" +# The full jdk version string is: +# feature.interim.update.patch.extra1.extra2.extra3-pre+build-opt +# We pass 'opt' explicitly to configure (see below) and currently don't parse +# the 'extra' values out of the version string. +if [[ $VER =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?\+([0-9]+)$ ]] +then + V_FEATURE=${BASH_REMATCH[1]} + V_INTERIM=${BASH_REMATCH[3]} + V_UPDATE=${BASH_REMATCH[5]} + V_PATCH=${BASH_REMATCH[7]} + V_BUILD=${BASH_REMATCH[8]} +else + logerr "Could not parse openjdk version $VER" +fi + # check ooce/fonts/liberation for current version LIBERATIONFONTSVER=2.1.5 SKIP_LICENCES="SILv1.1" set_arch 64 -set_builddir "jdk${VER}u-jdk-$VER.0.$UPDATE-$BUILD" +set_builddir "jdk${V_FEATURE}u-jdk-${VER//+/-}" BMI_EXPECTED=1 SKIP_RTIME_CHECK=1 @@ -47,8 +60,8 @@ BUILD_DEPENDS_IPS=" RUN_DEPENDS_IPS="runtime/java/jexec" -VERHUMAN=jdk${VER}u${UPDATE}-b$BUILD -IVER=${VER}.0 +VERHUMAN="jdk${V_FEATURE}u${V_UPDATE}${V_PATCH:+.}$V_PATCH-b$V_BUILD" +IVER="$V_FEATURE.$V_INTERIM" IROOT=usr/jdk/instances IFULL=$IROOT/$PROG$IVER @@ -56,7 +69,7 @@ IFULL=$IROOT/$PROG$IVER OOCEPREFIX=/opt/ooce XFORM_ARGS=" - -DVER=$VER + -DVER=$V_FEATURE -DIVER=$IVER -DIROOT=$IROOT -DIFULL=$IFULL @@ -67,8 +80,7 @@ XFORM_ARGS=" NO_PARALLEL_MAKE=1 CONFIGURE_OPTS=" - --with-version-build=$BUILD - --with-version-pre= + --with-version-string=$VER --with-version-opt=omnios-$RELVER --with-toolchain-type=gcc --with-boot-jdk=/$IFULL @@ -111,7 +123,7 @@ make_install() { } init -download_source $PROG "jdk-$VER.0.$UPDATE+$BUILD" +download_source $PROG "jdk-$VER" patch_source # Also download the liberation fonts archive. Fonts from here will be @@ -122,7 +134,7 @@ BUILDDIR=$LFDIR download_source liberation-fonts $LFDIR prep_build autoconf-like -oot chmod +x $CONFIGURE_CMD build -noctf -VER=$IVER.$UPDATE DASHREV=$BUILD make_package +VER=${VER%%+*} DASHREV=$V_BUILD make_package clean_up # Vim hints