From 02f86a0765279918b54d1d51fe1926db213aeb2a Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Tue, 19 Sep 2023 00:10:03 +0200
Subject: [PATCH] tools: assign PKG_CPE_ID

The PKG_CPE_ID links to NIST CPE version 2.2.
Assign PKG_CPE_ID to all remaining tools which have a CPE ID.
Not every tool has CPE id.

Related: https://github.com/openwrt/packages/issues/8534
Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
---
 tools/7z/Makefile        | 1 +
 tools/bison/Makefile     | 1 +
 tools/gmp/Makefile       | 1 +
 tools/liblzo/Makefile    | 1 +
 tools/llvm-bpf/Makefile  | 1 +
 tools/lz4/Makefile       | 1 +
 tools/mtd-utils/Makefile | 1 +
 tools/sed/Makefile       | 2 ++
 tools/zip/Makefile       | 1 +
 9 files changed, 10 insertions(+)

diff --git a/tools/7z/Makefile b/tools/7z/Makefile
index 351ae527ff..2d75d9059e 100644
--- a/tools/7z/Makefile
+++ b/tools/7z/Makefile
@@ -7,6 +7,7 @@ PKG_SOURCE_VERSION:=2301
 PKG_SOURCE:=$(PKG_NAME)$(PKG_SOURCE_VERSION)-src.tar.xz
 PKG_SOURCE_URL:=https://7-zip.org/a/
 PKG_HASH:=356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74
+PKG_CPE_ID:=cpe:/a:7-zip:7zip
 
 # This builds the 7zr variant which supports only 7z, so no non-LGPL code should be included
 PKG_LICENSE:=LGPL-2.1-or-later
diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index 30555541e6..0aa0969b20 100644
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -12,6 +12,7 @@ PKG_VERSION:=3.8.2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
 PKG_HASH:=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
+PKG_CPE_ID:=cpe:/a:gnu:bison
 
 HOST_BUILD_PARALLEL:=1
 
diff --git a/tools/gmp/Makefile b/tools/gmp/Makefile
index cfd6e30e04..c48069dd7b 100644
--- a/tools/gmp/Makefile
+++ b/tools/gmp/Makefile
@@ -12,6 +12,7 @@ PKG_VERSION:=6.2.1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gmp/
 PKG_HASH:=fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
+PKG_CPE_ID:=cpe:/a:gmplib:gmp
 
 HOST_FIXUP:=autoreconf
 
diff --git a/tools/liblzo/Makefile b/tools/liblzo/Makefile
index 4ebda0c333..9f60109135 100644
--- a/tools/liblzo/Makefile
+++ b/tools/liblzo/Makefile
@@ -17,6 +17,7 @@ PKG_HASH:=c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
+PKG_CPE_ID:=cpe:/a:lzo_project:lzo
 
 CMAKE_BINARY_SUBDIR:=openwrt-build
 
diff --git a/tools/llvm-bpf/Makefile b/tools/llvm-bpf/Makefile
index 71509511e7..bb3179016c 100644
--- a/tools/llvm-bpf/Makefile
+++ b/tools/llvm-bpf/Makefile
@@ -13,6 +13,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.xz
 PKG_SOURCE_URL:=https://github.com/llvm/llvm-project/releases/download/llvmorg-$(PKG_VERSION)
 PKG_HASH:=8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
+PKG_CPE_ID:=cpe:/a:llvm:llvm
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION).src
 
diff --git a/tools/lz4/Makefile b/tools/lz4/Makefile
index 8f12ca93e6..cf1738a52f 100644
--- a/tools/lz4/Makefile
+++ b/tools/lz4/Makefile
@@ -16,6 +16,7 @@ PKG_HASH:=0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b
 
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=LICENSE lib/LICENSE
+PKG_CPE_ID:=cpe:/a:lz4_project:lz4
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/meson.mk
diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 14f11acaf5..9010801976 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -13,6 +13,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://infraroot.at/pub/mtd/
 PKG_HASH:=386e27fd121699b6b729bc2e8e04dda987b31cca6b16e12fb6cc6dcf26449f46
+PKG_CPE_ID:=cpe:/a:mtd-utils_project:mtd-utils
 
 PKG_FIXUP:=autoreconf
 
diff --git a/tools/sed/Makefile b/tools/sed/Makefile
index 5cc15a3397..49cbc72e6e 100644
--- a/tools/sed/Makefile
+++ b/tools/sed/Makefile
@@ -12,6 +12,8 @@ PKG_VERSION:=4.9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
 PKG_HASH:=6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181
+PKG_CPE_ID:=cpe:/a:gnu:sed
+
 export SED:=
 
 HOST_BUILD_PARALLEL:=1
diff --git a/tools/zip/Makefile b/tools/zip/Makefile
index 6e83dafb40..5ad124d1c3 100644
--- a/tools/zip/Makefile
+++ b/tools/zip/Makefile
@@ -17,6 +17,7 @@ PKG_HASH:=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
 
 PKG_LICENSE:=BSD-4-Clause
 PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:zip_project:zip
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/zip$(PKG_REV)
 HOST_BUILD_PARALLEL:=1
-- 
2.30.2