Revert "docs/manual: replace LIBFOO_CPE_ID_PRODUCT"
PATCH v2 1/2 Revert "docs/manual: replace LIBFOO_CPE_ID_PRODUCT"
This reverts commit ff13cb94144cf2db3d019a32b82cbfa2168e4712.
--- docs/manual/adding-packages-generic.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
docs/manual/adding-packages-generic.txt +4 -4
@@ -515,7 +515,7 @@ LIBFOO_IGNORE_CVES += CVE-2020-54321 identifier. When not defined, the default value is +<pkgname>_project+. -** +LIBFOO_CPE_ID_NAME+, specifies the product part of the CPE +** +LIBFOO_CPE_ID_PRODUCT+, specifies the product part of the CPE identifier. When not defined, the default value is +<pkgname>+. ** +LIBFOO_CPE_ID_VERSION+, specifies the version part of the CPE
@@ -533,9 +533,9 @@ package infrastructure will define +LIBFOO_CPE_ID+. + Alternatively, a package can also explicitly set +LIBFOO_CPE_ID_VALID = YES+ if the default values for +LIBFOO_CPE_ID_PREFIX+, -+LIBFOO_CPE_ID_VENDOR+, +LIBFOO_CPE_ID_NAME+, +LIBFOO_CPE_ID_VERSION+, -+LIBFOO_CPE_ID_VERSION_MINOR+ are all correct for this package and -don't need to be explicitly overridden. ++LIBFOO_CPE_ID_VENDOR+, +LIBFOO_CPE_ID_PRODUCT+, ++LIBFOO_CPE_ID_VERSION+, +LIBFOO_CPE_ID_VERSION_MINOR+ are all correct +for this package and don't need to be explicitly overridden. + For a host package, if its +LIBFOO_CPE_ID_*+ variables are not defined, it inherits the value of those variables from the
Signature · 1 line
2.29.2
PATCH v2 2/2 Replace LIBFOO_CPE_ID_NAME by LIBFOO_CPE_ID_PRODUCT
Replace LIBFOO_CPE_ID_NAME by LIBFOO_CPE_ID_PRODUCT to better "comply" with the official "Well-Formed CPE Name Data Model" parameters:
- https://csrc.nist.gov/publications/detail/nistir/7695/final
- https://nvlpubs.nist.gov/nistpubs/Legacy/IR/nistir7695.pdf
It should be noted that the following parameters could also be replaced in following commits to increase compliance with above specification:
- LIBFOO_CPE_ID_VERSION_MINOR -> LIBFOO_CPE_ID_UPDATE
- LIBFOO_CPE_ID_PREFIX -> LIBFOO_CPE_VERSION (i.e. 2.3) and LIBFOO_CPE_ID_PART (a for applications, o for operating systems or h for hardware)
---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Add a commit message explaining the suggested change
boot/uboot/uboot.mk | 2 +- linux/linux.mk | 2 +- package/audit/audit.mk | 2 +- package/dbus/dbus.mk | 2 +- package/dropbear/dropbear.mk | 2 +- package/gesftpserver/gesftpserver.mk | 2 +- package/gtest/gtest.mk | 2 +- package/iperf/iperf.mk | 2 +- package/lcms2/lcms2.mk | 2 +- package/libcurl/libcurl.mk | 2 +- package/libfcgi/libfcgi.mk | 2 +- package/libglib2/libglib2.mk | 2 +- package/libopenssl/libopenssl.mk | 2 +- package/libsysfs/libsysfs.mk | 2 +- package/libzlib/libzlib.mk | 2 +- package/linux-headers/linux-headers.mk | 2 +- package/mtd/mtd.mk | 2 +- package/netsnmp/netsnmp.mk | 2 +- package/pkg-generic.mk | 16 ++++++++-------- package/pppd/pppd.mk | 2 +- package/python-lxml/python-lxml.mk | 2 +- package/python-setuptools/python-setuptools.mk | 2 +- package/quota/quota.mk | 2 +- package/tftpd/tftpd.mk | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- package/xerces/xerces.mk | 2 +- .../package/cpe-id-pkg4/cpe-id-pkg4.mk | 2 +- .../package/cpe-id-pkg5/cpe-id-pkg5.mk | 4 ++-- support/testing/tests/core/test_cpeid.py | 10 +++++----- 29 files changed, 41 insertions(+), 41 deletions(-)
boot/uboot/uboot.mk +1 -1
@@ -12,7 +12,7 @@ ifeq ($(BR2_TARGET_UBOOT_LATEST_VERSION),y) UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt endif UBOOT_CPE_ID_VENDOR = denx -UBOOT_CPE_ID_NAME = u-boot +UBOOT_CPE_ID_PRODUCT = u-boot UBOOT_INSTALL_IMAGES = YES
linux/linux.mk +1 -1
@@ -13,7 +13,7 @@ LINUX_LICENSE_FILES = \ LICENSES/exceptions/Linux-syscall-note endif LINUX_CPE_ID_VENDOR = linux -LINUX_CPE_ID_NAME = linux_kernel +LINUX_CPE_ID_PRODUCT = linux_kernel LINUX_CPE_ID_PREFIX = cpe:2.3:o define LINUX_HELP_CMDS
package/audit/audit.mk +1 -1
@@ -11,7 +11,7 @@ AUDIT_LICENSE_FILES = COPYING COPYING.LIB # 0002-Add-substitue-functions-for-strndupa-rawmemchr.patch AUDIT_AUTORECONF = YES AUDIT_CPE_ID_VENDOR = linux_audit_project -AUDIT_CPE_ID_NAME = linux_audit +AUDIT_CPE_ID_PRODUCT = linux_audit AUDIT_INSTALL_STAGING = YES
package/dbus/dbus.mk +1 -1
@@ -9,7 +9,7 @@ DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING DBUS_CPE_ID_VENDOR = d-bus_project -DBUS_CPE_ID_NAME = d-bus +DBUS_CPE_ID_PRODUCT = d-bus DBUS_INSTALL_STAGING = YES define DBUS_PERMISSIONS
package/dropbear/dropbear.mk +1 -1
@@ -12,7 +12,7 @@ DROPBEAR_LICENSE_FILES = LICENSE DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) DROPBEAR_CPE_ID_VENDOR = dropbear_ssh_project -DROPBEAR_CPE_ID_NAME = dropbear_ssh +DROPBEAR_CPE_ID_PRODUCT = dropbear_ssh # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This
package/gesftpserver/gesftpserver.mk +1 -1
@@ -13,7 +13,7 @@ GESFTPSERVER_LICENSE_FILES = COPYING # "Missing prototype" warning treated as error GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors GESFTPSERVER_CPE_ID_VENDOR = green_end -GESFTPSERVER_CPE_ID_NAME = sftpserver +GESFTPSERVER_CPE_ID_PRODUCT = sftpserver # forgets to link against pthread when cross compiling GESFTPSERVER_CONF_ENV = LIBS=-lpthread
package/gtest/gtest.mk +1 -1
@@ -11,7 +11,7 @@ GTEST_INSTALL_TARGET = NO GTEST_LICENSE = BSD-3-Clause GTEST_LICENSE_FILES = googletest/LICENSE GTEST_CPE_ID_VENDOR = google -GTEST_CPE_ID_NAME = google_test +GTEST_CPE_ID_PRODUCT = google_test ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) GTEST_DEPENDENCIES += host-gtest
package/iperf/iperf.mk +1 -1
@@ -9,7 +9,7 @@ IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 IPERF_LICENSE = MIT-like IPERF_LICENSE_FILES = COPYING IPERF_CPE_ID_VENDOR = iperf2_project -IPERF_CPE_ID_NAME = iperf2 +IPERF_CPE_ID_PRODUCT = iperf2 IPERF_CONF_OPTS = \ --disable-web100
package/lcms2/lcms2.mk +1 -1
@@ -9,7 +9,7 @@ LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) LCMS2_LICENSE = MIT LCMS2_LICENSE_FILES = COPYING LCMS2_CPE_ID_VENDOR = littlecms -LCMS2_CPE_ID_NAME = little_cms +LCMS2_CPE_ID_PRODUCT = little_cms LCMS2_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_JPEG),y)
package/libcurl/libcurl.mk +1 -1
@@ -13,7 +13,7 @@ LIBCURL_DEPENDENCIES = host-pkgconf \ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx -LIBCURL_CPE_ID_NAME = libcurl +LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES # We disable NTLM support because it uses fork(), which doesn't work
package/libfcgi/libfcgi.mk +1 -1
@@ -9,7 +9,7 @@ LIBFCGI_SITE = $(call github,FastCGI-Archives,fcgi2,$(LIBFCGI_VERSION)) LIBFCGI_LICENSE = OML LIBFCGI_LICENSE_FILES = LICENSE.TERMS LIBFCGI_CPE_ID_VENDOR = fastcgi -LIBFCGI_CPE_ID_NAME = fcgi +LIBFCGI_CPE_ID_PRODUCT = fcgi LIBFCGI_INSTALL_STAGING = YES LIBFCGI_AUTORECONF = YES
package/libglib2/libglib2.mk +1 -1
@@ -11,7 +11,7 @@ LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_M LIBGLIB2_LICENSE = LGPL-2.1+ LIBGLIB2_LICENSE_FILES = COPYING LIBGLIB2_CPE_ID_VENDOR = gnome -LIBGLIB2_CPE_ID_NAME = glib +LIBGLIB2_CPE_ID_PRODUCT = glib LIBGLIB2_INSTALL_STAGING = YES LIBGLIB2_CFLAGS = $(TARGET_CFLAGS)
package/libopenssl/libopenssl.mk +1 -1
@@ -16,7 +16,7 @@ LIBOPENSSL_TARGET_ARCH = $(call qstrip,$(BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH)) LIBOPENSSL_CFLAGS = $(TARGET_CFLAGS) LIBOPENSSL_PROVIDES = openssl LIBOPENSSL_CPE_ID_VENDOR = $(LIBOPENSSL_PROVIDES) -LIBOPENSSL_CPE_ID_NAME = $(LIBOPENSSL_PROVIDES) +LIBOPENSSL_CPE_ID_PRODUCT = $(LIBOPENSSL_PROVIDES) ifeq ($(BR2_m68k_cf),y) # relocation truncated to fit: R_68K_GOT16O
package/libsysfs/libsysfs.mk +1 -1
@@ -11,6 +11,6 @@ LIBSYSFS_INSTALL_STAGING = YES LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPL-2.1+ (library) LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL LIBSYSFS_CPE_ID_VENDOR = sysfsutils_project -LIBSYSFS_CPE_ID_NAME = sysfsutils +LIBSYSFS_CPE_ID_PRODUCT = sysfsutils $(eval $(autotools-package))
package/libzlib/libzlib.mk +1 -1
@@ -12,7 +12,7 @@ LIBZLIB_LICENSE_FILES = README LIBZLIB_INSTALL_STAGING = YES LIBZLIB_PROVIDES = zlib LIBZLIB_CPE_ID_VENDOR = gnu -LIBZLIB_CPE_ID_NAME = zlib +LIBZLIB_CPE_ID_PRODUCT = zlib # It is not possible to build only a shared version of zlib, so we build both # shared and static, unless we only want the static libs, and we eventually
package/linux-headers/linux-headers.mk +1 -1
@@ -103,7 +103,7 @@ LINUX_HEADERS_LICENSE_FILES = \ LICENSES/exceptions/Linux-syscall-note endif LINUX_HEADERS_CPE_ID_VENDOR = linux -LINUX_HEADERS_CPE_ID_NAME = linux_kernel +LINUX_HEADERS_CPE_ID_PRODUCT = linux_kernel LINUX_HEADERS_INSTALL_STAGING = YES
package/mtd/mtd.mk +1 -1
@@ -10,7 +10,7 @@ MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 MTD_LICENSE_FILES = COPYING MTD_CPE_ID_VENDOR = mtd-utils_project -MTD_CPE_ID_NAME = mtd-utils +MTD_CPE_ID_PRODUCT = mtd-utils MTD_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y)
package/netsnmp/netsnmp.mk +1 -1
@@ -10,7 +10,7 @@ NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz NETSNMP_LICENSE = Various BSD-like NETSNMP_LICENSE_FILES = COPYING NETSNMP_CPE_ID_VENDOR = net-snmp -NETSNMP_CPE_ID_NAME = $(NETSNMP_CPE_ID_VENDOR) +NETSNMP_CPE_ID_PRODUCT = $(NETSNMP_CPE_ID_VENDOR) NETSNMP_INSTALL_STAGING = YES NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=no NETSNMP_CONF_OPTS = \
package/pkg-generic.mk +8 -8
@@ -616,13 +616,13 @@ $(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2) # If any of the <pkg>_CPE_ID_* variables are set, we assume the CPE ID # information is valid for this package. -ifneq ($$($(2)_CPE_ID_VENDOR)$$($(2)_CPE_ID_NAME)$$($(2)_CPE_ID_VERSION)$$($(2)_CPE_ID_VERSION_MINOR)$$($(2)_CPE_ID_PREFIX),) +ifneq ($$($(2)_CPE_ID_VENDOR)$$($(2)_CPE_ID_PRODUCT)$$($(2)_CPE_ID_VERSION)$$($(2)_CPE_ID_VERSION_MINOR)$$($(2)_CPE_ID_PREFIX),) $(2)_CPE_ID_VALID = YES endif # When we're a host package, make sure to use the variables of the # corresponding target package, if any. -ifneq ($$($(3)_CPE_ID_VENDOR)$$($(3)_CPE_ID_NAME)$$($(3)_CPE_ID_VERSION)$$($(3)_CPE_ID_VERSION_MINOR)$$($(3)_CPE_ID_PREFIX),) +ifneq ($$($(3)_CPE_ID_VENDOR)$$($(3)_CPE_ID_PRODUCT)$$($(3)_CPE_ID_VERSION)$$($(3)_CPE_ID_VERSION_MINOR)$$($(3)_CPE_ID_PREFIX),) $(2)_CPE_ID_VALID = YES endif
@@ -644,12 +644,12 @@ ifeq ($$($(2)_CPE_ID_VALID),YES) endif endif - # CPE_ID_NAME - ifndef $(2)_CPE_ID_NAME - ifdef $(3)_CPE_ID_NAME - $(2)_CPE_ID_NAME = $$($(3)_CPE_ID_NAME) + # CPE_ID_PRODUCT + ifndef $(2)_CPE_ID_PRODUCT + ifdef $(3)_CPE_ID_PRODUCT + $(2)_CPE_ID_PRODUCT = $$($(3)_CPE_ID_PRODUCT) else - $(2)_CPE_ID_NAME = $$($(2)_RAWNAME) + $(2)_CPE_ID_PRODUCT = $$($(2)_RAWNAME) endif endif
@@ -681,7 +681,7 @@ ifeq ($$($(2)_CPE_ID_VALID),YES) endif # Calculate complete CPE ID - $(2)_CPE_ID = $$($(2)_CPE_ID_PREFIX):$$($(2)_CPE_ID_VENDOR):$$($(2)_CPE_ID_NAME):$$($(2)_CPE_ID_VERSION):$$($(2)_CPE_ID_VERSION_MINOR):*:*:*:*:*:* + $(2)_CPE_ID = $$($(2)_CPE_ID_PREFIX):$$($(2)_CPE_ID_VENDOR):$$($(2)_CPE_ID_PRODUCT):$$($(2)_CPE_ID_VERSION):$$($(2)_CPE_ID_VERSION_MINOR):*:*:*:*:*:* endif # ifeq ($$($(2)_CPE_ID_VALID),YES) # When a target package is a toolchain dependency set this variable to
package/pppd/pppd.mk +1 -1
@@ -11,7 +11,7 @@ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c PPPD_CPE_ID_VENDOR = samba -PPPD_CPE_ID_NAME = ppp +PPPD_CPE_ID_PRODUCT = ppp # 0001-pppd-Fix-bounds-check.patch PPPD_IGNORE_CVES += CVE-2020-8597
package/python-lxml/python-lxml.mk +1 -1
@@ -16,7 +16,7 @@ PYTHON_LXML_LICENSE_FILES = \ doc/licenses/elementtree.txt \ src/lxml/isoschematron/resources/rng/iso-schematron.rng PYTHON_LXML_CPE_ID_VENDOR = lxml -PYTHON_LXML_CPE_ID_NAME = lxml +PYTHON_LXML_CPE_ID_PRODUCT = lxml # python-lxml can use either setuptools, or distutils as a fallback. # So, we use setuptools.
package/python-setuptools/python-setuptools.mk +1 -1
@@ -12,7 +12,7 @@ PYTHON_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482a PYTHON_SETUPTOOLS_LICENSE = MIT PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE PYTHON_SETUPTOOLS_CPE_ID_VENDOR = python -PYTHON_SETUPTOOLS_CPE_ID_NAME = setuptools +PYTHON_SETUPTOOLS_CPE_ID_PRODUCT = setuptools PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools HOST_PYTHON_SETUPTOOLS_NEEDS_HOST_PYTHON = python2
package/quota/quota.mk +1 -1
@@ -10,7 +10,7 @@ QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils QUOTA_LICENSE = GPL-2.0+ QUOTA_LICENSE_FILES = COPYING QUOTA_CPE_ID_VENDOR = jan_kara -QUOTA_CPE_ID_NAME = linux_diskquota +QUOTA_CPE_ID_PRODUCT = linux_diskquota QUOTA_CONF_ENV = LIBS="$(TARGET_NLS_LIBS)" QUOTA_CONF_OPTS = --disable-pie
package/tftpd/tftpd.mk +1 -1
@@ -11,7 +11,7 @@ TFTPD_CONF_OPTS = --without-tcpwrappers TFTPD_LICENSE = BSD-4-Clause TFTPD_LICENSE_FILES = tftpd/tftpd.c TFTPD_CPE_ID_VENDOR = tftpd-hpa_project -TFTPD_CPE_ID_NAME = tftpd-hpa +TFTPD_CPE_ID_PRODUCT = tftpd-hpa define TFTPD_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp
package/uboot-tools/uboot-tools.mk +1 -1
@@ -10,7 +10,7 @@ UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt UBOOT_TOOLS_CPE_ID_VENDOR = denx -UBOOT_TOOLS_CPE_ID_NAME = u-boot +UBOOT_TOOLS_CPE_ID_PRODUCT = u-boot UBOOT_TOOLS_INSTALL_STAGING = YES # u-boot 2020.01+ needs make 4.0+
package/xerces/xerces.mk +1 -1
@@ -10,7 +10,7 @@ XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources XERCES_LICENSE = Apache-2.0 XERCES_LICENSE_FILES = LICENSE XERCES_CPE_ID_VENDOR = apache -XERCES_CPE_ID_NAME = xerces-c\+\+ +XERCES_CPE_ID_PRODUCT = xerces-c\+\+ XERCES_INSTALL_STAGING = YES define XERCES_DISABLE_SAMPLES
support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg4/cpe-id-pkg4.mk +1 -1
@@ -1,6 +1,6 @@ CPE_ID_PKG4_VERSION = 67 CPE_ID_PKG4_CPE_ID_VENDOR = foo -CPE_ID_PKG4_CPE_ID_NAME = bar +CPE_ID_PKG4_CPE_ID_PRODUCT = bar CPE_ID_PKG4_CPE_ID_VERSION = 42 CPE_ID_PKG4_CPE_ID_VERSION_MINOR = b2 CPE_ID_PKG4_CPE_ID_PREFIX = cpe:2.4:a
support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg5/cpe-id-pkg5.mk +2 -2
@@ -1,13 +1,13 @@ CPE_ID_PKG5_VERSION = 57 CPE_ID_PKG5_CPE_ID_VENDOR = foo -CPE_ID_PKG5_CPE_ID_NAME = bar +CPE_ID_PKG5_CPE_ID_PRODUCT = bar CPE_ID_PKG5_CPE_ID_VERSION = 42 CPE_ID_PKG5_CPE_ID_VERSION_MINOR = b2 CPE_ID_PKG5_CPE_ID_PREFIX = cpe:2.4:a HOST_CPE_ID_PKG5_CPE_ID_VENDOR = baz -HOST_CPE_ID_PKG5_CPE_ID_NAME = fuz +HOST_CPE_ID_PKG5_CPE_ID_PRODUCT = fuz HOST_CPE_ID_PKG5_CPE_ID_VERSION = 43 HOST_CPE_ID_PKG5_CPE_ID_VERSION_MINOR = b3 HOST_CPE_ID_PKG5_CPE_ID_PREFIX = cpe:2.5:a
support/testing/tests/core/test_cpeid.py +5 -5
@@ -22,7 +22,7 @@ class CpeIdTest(infra.basetest.BRConfigTest): # this package has no CPE ID information, it should not have # any CPE_ID variable defined. pkg_vars = self.get_vars("CPE_ID_PKG1_CPE_ID") - cpe_vars = ["CPE_ID_VALID", "CPE_ID_NAME", "CPE_ID_VERSION", "CPE_ID_VERSION_MINOR", + cpe_vars = ["CPE_ID_VALID", "CPE_ID_PRODUCT", "CPE_ID_VERSION", "CPE_ID_VERSION_MINOR", "CPE_ID_PREFIX", "CPE_ID"] for v in cpe_vars: self.assertNotIn("CPE_ID_PKG1_%s" % v, pkg_vars)
@@ -39,7 +39,7 @@ class CpeIdTest(infra.basetest.BRConfigTest): # this package has no CPE ID information, it should not have # any CPE_ID variable defined. pkg_vars = self.get_vars("HOST_CPE_ID_PKG2_CPE_ID") - cpe_vars = ["CPE_ID_VALID", "CPE_ID_NAME", "CPE_ID_VERSION", "CPE_ID_VERSION_MINOR", + cpe_vars = ["CPE_ID_VALID", "CPE_ID_PRODUCT", "CPE_ID_VERSION", "CPE_ID_VERSION_MINOR", "CPE_ID_PREFIX", "CPE_ID"] for v in cpe_vars: self.assertNotIn("HOST_CPE_ID_PKG2_%s" % v, pkg_vars)
@@ -68,7 +68,7 @@ class CpeIdTest(infra.basetest.BRConfigTest): def test_pkg4(self): # this package defines - # <pkg>_CPE_ID_{VENDOR,NAME,VERSION,VERSION_MINOR,PREFIX}, + # <pkg>_CPE_ID_{VENDOR,PRODUCT,VERSION,VERSION_MINOR,PREFIX}, # make sure we get the computed <pkg>_CPE_ID, and that it is # inherited by the host variant pkg_vars = self.get_vars("CPE_ID_PKG4_CPE_ID")
@@ -89,8 +89,8 @@ class CpeIdTest(infra.basetest.BRConfigTest): def test_pkg5(self): # this package defines - # <pkg>_CPE_ID_{VENDOR,NAME,VERSION,VERSION_MINOR,PREFIX} and - # HOST_<pkg>_CPE_ID_{VENDOR,NAME,VERSION,VERSION_MINOR,PREFIX} + # <pkg>_CPE_ID_{VENDOR,PRODUCT,VERSION,VERSION_MINOR,PREFIX} and + # HOST_<pkg>_CPE_ID_{VENDOR,PRODUCT,VERSION,VERSION_MINOR,PREFIX} # separately, with different values. Make sure we get the # right <pkg>_CPE_ID and HOST_<pkg>_CPE_ID values. pkg_vars = self.get_vars("CPE_ID_PKG5_CPE_ID")
Signature · 1 line
2.29.2
PATCH v2 2/2 Replace LIBFOO_CPE_ID_NAME by LIBFOO_CPE_ID_PRODUCT
Quoted 11 lines · On Mon, 18 Jan 2021 18:41:51 +0100 Fabrice Fontaine…
Replace
LIBFOO_CPE_ID_NAMEbyLIBFOO_CPE_ID_PRODUCTto better "comply" with the official "Well-Formed CPE Name Data Model" parameters:
- https://csrc.nist.gov/publications/detail/nistir/7695/final
- https://nvlpubs.nist.gov/nistpubs/Legacy/IR/nistir7695.pdfIt should be noted that the following parameters could also be replaced in following commits to increase compliance with above specification:
-LIBFOO_CPE_ID_VERSION_MINOR->LIBFOO_CPE_ID_UPDATE
-LIBFOO_CPE_ID_PREFIX->LIBFOO_CPE_VERSION(i.e. 2.3) andLIBFOO_CPE_ID_PART(a for applications, o for operating systems or h for hardware)
This second paragraph doesn't really belong to a commit log, as it talks about "other things that could be done".
So, I dropped this part of the commit, refreshed the patch to take into account other CPE_ID_NAME variables that were introduced since then, and applied.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH v2 1/2 Revert "docs/manual: replace LIBFOO_CPE_ID_PRODUCT"
In reply to Fabrice FontaineQuoted 6 lines · On Mon, 18 Jan 2021 18:41:50 +0100 Fabrice Fontaine…
This reverts commit
ff13cb94144cf2db3d019a32b82cbfa2168e4712.Signed-off-by Fabrice Fontaine <[email protected]>--- docs/manual/adding-packages-generic.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com