Merge pull request #3354 from citrus-it/bpr38

Package updates (r151038)
omniosorg · Sep 17, 2023 · ce1d6a8 · ce1d6a8
2 parents 0371840 + f6a75f2
commit ce1d6a8
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 27 deletions.
diff --git a/build/curl/build.sh b/build/curl/build.sh
@@ -18,7 +18,7 @@
 . ../../lib/functions.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, "

diff --git a/build/openjdk11/build.sh b/build/openjdk11/build.sh
@@ -17,21 +17,34 @@
 . ../../lib/functions.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
@@ -44,16 +57,16 @@ BUILD_DEPENDS_IPS="
     ooce/print/cups
 "
 
-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
 
 OOCEPREFIX=/opt/ooce
 
 XFORM_ARGS="
-    -DVER=$VER
+    -DVER=$V_FEATURE
     -DIVER=$IVER
     -DIROOT=$IROOT
     -DIFULL=$IFULL
@@ -64,9 +77,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
@@ -103,7 +114,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
@@ -114,7 +125,7 @@ BUILDDIR=$LFDIR download_source liberation-fonts $LFDIR
 prep_build autoconf -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
@@ -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

diff --git a/build/openjdk17/build.sh b/build/openjdk17/build.sh
@@ -17,21 +17,34 @@
 . ../../lib/functions.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
@@ -45,16 +58,16 @@ BUILD_DEPENDS_IPS="
     ooce/print/cups
 "
 
-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
 
 OOCEPREFIX=/opt/ooce
 
 XFORM_ARGS="
-    -DVER=$VER
+    -DVER=$V_FEATURE
     -DIVER=$IVER
     -DIROOT=$IROOT
     -DIFULL=$IFULL
@@ -65,8 +78,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
@@ -107,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
@@ -118,7 +130,7 @@ BUILDDIR=$LFDIR download_source liberation-fonts $LFDIR
 prep_build autoconf -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