From 875cc7bbf18f7878d9f32d3af9e02575703c3719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Damstedt=20Rasmussen?= Date: Sat, 3 Oct 2026 19:36:57 +0200 Subject: [PATCH] package/openjdk: CPE ID for openjdk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CPE ID on version 21.0.2 in NVD: https://nvd.nist.gov/products/cpe/search/results?keyword=cpe:2.3:a:oracle:openjdk:21.0.2:*:*:*:*:*:*:* The automatically generated OPENJDK_CPE_ID_VERSION cannot be used because OPENJDK_VERSION includes a '+', e.g. "21.0.2+10". NVD will not accept a version number with '+'. Signed-off-by: Bjørn Damstedt Rasmussen Signed-off-by: Thomas Petazzoni --- package/openjdk/openjdk.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index fbc860019c..e1d68e9a45 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -17,9 +17,14 @@ OPENJDK_VERSION_MAJOR = 17 OPENJDK_VERSION_MINOR = 0.18 OPENJDK_VERSION_BUILD = 8 endif + OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)+$(OPENJDK_VERSION_BUILD) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) +OPENJDK_CPE_ID_VENDOR = oracle +# Override automatic CPE ID because '+' in $(OPENJDK_VERSION) is not alphanumeric or ._- +OPENJDK_CPE_ID_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) + OPENJDK_LICENSE = GPL-2.0+ with exception OPENJDK_LICENSE_FILES = LICENSE OPENJDK_INSTALL_STAGING = YES