Skip to contentSkip to conversation

package/ntp: add CPE variables

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 12, 2021 – Jan 14, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/ntp: add CPE variables

cpe:2.3:a:ntp:ntp is a valid CPE identifier for this package:

https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Antp%3Antp

Also add NTP_CPE_ID_VERSION and NTP_CPE_ID_VERSION_MINOR

---
 package/ntp/ntp.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/ntp/ntp.mk +5 -2
index f82eeae9b4..1a86b49758 100644
@@ -4,12 +4,15 @@
 #
 ################################################################################
 
-NTP_VERSION_MAJOR = 4.2
-NTP_VERSION = $(NTP_VERSION_MAJOR).8p15
+NTP_VERSION_MAJOR = 4.2.8
+NTP_VERSION = $(NTP_VERSION_MAJOR)p15
 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
 NTP_DEPENDENCIES = host-pkgconf libevent
 NTP_LICENSE = NTP
 NTP_LICENSE_FILES = COPYRIGHT
+NTP_CPE_ID_VENDOR = $(NTP_NAME)
+NTP_CPE_ID_VERSION = $(NTP_VERSION_MAJOR)
+NTP_CPE_ID_VERSION_MINOR = p15
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no POSIX_SHELL=/bin/sh
 NTP_CONF_OPTS = \
 	--with-shared \
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/ntp: add CPE variables

Hello,

Quoted 16 lines · On Tue, 12 Jan 2021 08:12:13 +0100 Fabrice Fontaine…

cpe:2.3:a:ntp:ntp is a valid CPE identifier for this package:

https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Antp%3Antp

Also add NTP_CPE_ID_VERSION and NTP_CPE_ID_VERSION_MINOR

---
 package/ntp/ntp.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
package/ntp/ntp.mk +0 -0
index f82eeae9b4..1a86b49758 100644

package/ntp/ntp.mk line 7

Quoted 6 lines
package/ntp/ntp.mk +1 -2
@@ -4,12 +4,15 @@
 #
 ################################################################################
 
-NTP_VERSION_MAJOR = 4.2
-NTP_VERSION = $(NTP_VERSION_MAJOR).8p15
+NTP_VERSION_MAJOR = 4.2.8

This...

package/ntp/ntp.mk line 9

Quoted 2 lines
package/ntp/ntp.mk +1 -0
+NTP_VERSION = $(NTP_VERSION_MAJOR)p15
 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)

... badly breaks that. Indeed the download URL really needs ntp-4.2 and not ntp-4.2.8.

So I've changed the logic a bit to:

NTP_VERSION_MAJOR = 4.2
-NTP_VERSION = $(NTP_VERSION_MAJOR).8p15
+NTP_VERSION_MINOR = 8
+NTP_VERSION_POINT = 15
+NTP_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR)p$(NTP_VERSION_POINT)
NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
NTP_DEPENDENCIES = host-pkgconf libevent
NTP_LICENSE = NTP
NTP_LICENSE_FILES = COPYRIGHT
+NTP_CPE_ID_VENDOR = ntp
+NTP_CPE_ID_VERSION = $(NTP_VERSION_MAJOR).$(NTP_VERSION_MINOR) +NTP_CPE_ID_VERSION_MINOR = p$(NTP_VERSION_POINT)
NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no POSIX_SHELL=/bin/sh

 NTP_CONF_OPTS = \
        --with-shared \

Hopefully that does the trick!

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com