Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177791086
D61764.1795293110.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D61764.1795293110.diff
View Options
Index: Mk/Uses/cpe.mk
===================================================================
--- Mk/Uses/cpe.mk
+++ Mk/Uses/cpe.mk
@@ -19,19 +19,30 @@
.if !defined(_INCLUDE_USES_CPE_MK)
_INCLUDE_USES_CPE_MK= yes
+# Default values for each attribute of the Well-Formed Name
CPE_PART ?= a
CPE_PRODUCT ?= ${PORTNAME:tl}
CPE_VENDOR ?= ${CPE_PRODUCT}
CPE_VERSION ?= ${PORTVERSION:tl}
-CPE_UPDATE ?=
-CPE_EDITION ?=
-CPE_LANG ?=
-CPE_SW_EDITION ?=
+CPE_UPDATE ?= # unspecified
+CPE_EDITION ?= # unspecified
+CPE_LANG ?= # unspecified
+CPE_SW_EDITION ?= # unspecified
CPE_TARGET_SW ?= ${OPSYS:tl}${OSREL:C/\..*//}
-CPE_TARGET_HW ?= ${ARCH:S/i386/x86/:S/amd64/x64/}
+CPE_TARGET_HW ?= ${empty(NO_ARCH):?${ARCH:S/i386/x86/:S/amd64/x64/}:}
CPE_OTHER ?= ${PORTREVISION:N0}
-_CPE_STR = cpe:2.3:${CPE_PART}:${CPE_VENDOR}:${CPE_PRODUCT}:${CPE_VERSION}:${CPE_UPDATE}:${CPE_EDITION}:${CPE_LANG}:${CPE_SW_EDITION}:${CPE_TARGET_SW}:${CPE_TARGET_HW}:${CPE_OTHER}
-CPE_STR ?= ${_CPE_STR:C/:+$//}
+
+# For each attribute,
+# - Any character other than alphanumeric, hyphen, period, and
+# underscore must be quoted.
+# - Unspecified attributes default to ANY, expressed as an asterisk.
+_B := \\ # workaround for bmake bug
+. for __part in PART PRODUCT VENDOR VERSION UPDATE EDITION LANG SW_EDITION TARGET_SW TARGET_HW OTHER
+_CPE_${__part} = ${CPE_${__part}:C/([^-.0-9A-Z_a-z])/${_B}\1/g:C/^$/*/}
+. endfor
+
+# Finally, assemble into a Formatted String
+CPE_STR = cpe:2.3:${_CPE_PART}:${_CPE_VENDOR}:${_CPE_PRODUCT}:${_CPE_VERSION}:${_CPE_UPDATE}:${_CPE_EDITION}:${_CPE_LANG}:${_CPE_SW_EDITION}:${_CPE_TARGET_SW}:${_CPE_TARGET_HW}:${_CPE_OTHER}
PKG_NOTES += cpe
PKG_NOTE_cpe = ${CPE_STR}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Nov 21, 8:31 PM (6 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41895435
Default Alt Text
D61764.1795293110.diff (1 KB)
Attached To
Mode
D61764: Mk/Uses: Improve CPE 2.3 compliance
Attached
Detach File
Event Timeline