package: don't set CPE_ID_VALID (branch yem/cpe-no-ID_VALID)
cover package: don't set CPE_ID_VALID (branch yem/cpe-no-ID_VALID)
Hello All!
Currently, packages have two ways to trigger a full SPE_ID defition:
- either set one or more of the actual CPE_ID variables: _PREFIX, _VENDOR, _PRODUCT, _VERSION, or _UPDATE,
- or set _CPE_ID_VALID=YES to use the defaults for all those variables.
But really, CPE_ID_VALID should be treated as an internal implementation detail, and packages should really set one of the actual CPE variables to trigger their full CPE defition.
Regards,
Yann E. MORIN.
----------------------------------------------------------------
Yann E. MORIN (3):
docs/manual: do not expose CPE_ID_VALID as package-settable package/sudo: cleanup the CPE_ID variables
package: drop _CPE_ID_VALID, use _CPE_ID_VENDOR
docs/manual/adding-packages-generic.txt | 6 ------ package/asn1c/asn1c.mk | 2 +- package/atftp/atftp.mk | 2 +- package/atop/atop.mk | 2 +- package/attr/attr.mk | 2 +- package/axel/axel.mk | 2 +- package/bdwgc/bdwgc.mk | 2 +- package/beecrypt/beecrypt.mk | 2 +- package/botan/botan.mk | 2 +- package/c-icap/c-icap.mk | 2 +- package/civetweb/civetweb.mk | 2 +- package/cjson/cjson.mk | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- package/dosfstools/dosfstools.mk | 2 +- package/e2fsprogs/e2fsprogs.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/file/file.mk | 2 +- package/flac/flac.mk | 2 +- package/flex/flex.mk | 2 +- package/fontconfig/fontconfig.mk | 2 +- package/giflib/giflib.mk | 2 +- package/gnuplot/gnuplot.mk | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- package/heimdal/heimdal.mk | 2 +- package/ipmitool/ipmitool.mk | 2 +- package/iucode-tool/iucode-tool.mk | 2 +- package/jansson/jansson.mk | 2 +- package/jasper/jasper.mk | 2 +- package/jhead/jhead.mk | 2 +- package/jq/jq.mk | 2 +- package/json-c/json-c.mk | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- package/lame/lame.mk | 2 +- package/lftp/lftp.mk | 2 +- package/libass/libass.mk | 2 +- package/libcap-ng/libcap-ng.mk | 2 +- package/libconfuse/libconfuse.mk | 2 +- package/libesmtp/libesmtp.mk | 2 +- package/libevent/libevent.mk | 2 +- package/libexif/libexif.mk | 2 +- package/libgit2/libgit2.mk | 2 +- package/libksba/libksba.mk | 2 +- package/librsync/librsync.mk | 2 +- package/libseccomp/libseccomp.mk | 2 +- package/libsndfile/libsndfile.mk | 2 +- package/libtirpc/libtirpc.mk | 2 +- package/libupnp/libupnp.mk | 2 +- package/libvncserver/libvncserver.mk | 2 +- package/logrotate/logrotate.mk | 2 +- package/lzo/lzo.mk | 2 +- package/matio/matio.mk | 2 +- package/minicom/minicom.mk | 2 +- package/ncmpc/ncmpc.mk | 2 +- package/netatalk/netatalk.mk | 2 +- package/netcat/netcat.mk | 2 +- package/nettle/nettle.mk | 2 +- package/oniguruma/oniguruma.mk | 2 +- package/openrc/openrc.mk | 2 +- package/p11-kit/p11-kit.mk | 2 +- package/polkit/polkit.mk | 2 +- package/powerpc-utils/powerpc-utils.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- package/rabbitmq-c/rabbitmq-c.mk | 2 +- package/rhash/rhash.mk | 2 +- package/rpcbind/rpcbind.mk | 2 +- package/rtmpdump/rtmpdump.mk | 2 +- package/sane-backends/sane-backends.mk | 2 +- package/spice/spice.mk | 2 +- package/squashfs/squashfs.mk | 2 +- package/strace/strace.mk | 2 +- package/sudo/sudo.mk | 9 +++++---- package/sysklogd/sysklogd.mk | 2 +- package/tmux/tmux.mk | 2 +- package/unzip/unzip.mk | 2 +- package/upx/upx.mk | 2 +- package/valijson/valijson.mk | 2 +- package/vsftpd/vsftpd.mk | 2 +- package/x11vnc/x11vnc.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/yaml-cpp/yaml-cpp.mk | 2 +- package/zziplib/zziplib.mk | 2 +- .../core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk | 2 +- 82 files changed, 85 insertions(+), 90 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/3 docs/manual: do not expose CPE_ID_VALID as package-settable
FOO_CPE_ID_VALID is an internal implementation detail. Packages should really define an actual CPE_ID variable to trigger their full CPE_ID definition.
Reported-by Peter Korsgaard <[email protected]>
Signed-off-by Yann E. MORIN <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Cc Matthew Weber <[email protected]>
Cc Fabrice Fontaine <[email protected]>
--- docs/manual/adding-packages-generic.txt | 6 ------ 1 file changed, 6 deletions(-)
docs/manual/adding-packages-generic.txt +0 -6
@@ -531,12 +531,6 @@ infrastructure assumes the package provides valid CPE information. In this case, +LIBFOO_CPE_ID_VALID = YES+ will be set, and the generic 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_PRODUCT+, -+LIBFOO_CPE_ID_VERSION+, +LIBFOO_CPE_ID_UPDATE+ 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 corresponding target package.
Signature · 1 line
2.25.1
PATCH 1/3 docs/manual: do not expose CPE_ID_VALID as package-settable
Quoted 21 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
FOO_CPE_ID_VALIDis an internal implementation detail. Packages should really define an actualCPE_IDvariable to trigger their fullCPE_IDdefinition.Reported-by Peter Korsgaard <[email protected]>Signed-off-by Yann E. MORIN <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Arnout Vandecappelle (Essensium/Mind) <[email protected]>Cc Matthew Weber <[email protected]>Cc Fabrice Fontaine <[email protected]>--- docs/manual/adding-packages-generic.txt | 6 ------ 1 file changed, 6 deletions(-)docs/manual/adding-packages-generic.txt +0
-0
docs/manual/adding-packages-generic.txt infrastructure assumes the package provides valid CPE information. In · line 532
Quoted 2 lines
docs/manual/adding-packages-generic.txt +0
-0@@ -531,12 +531,6 @@ infrastructure assumes the package provides valid CPE information. In this case, +LIBFOO_CPE_ID_VALID = YES+ will be set, and the generic package infrastructure will define +LIBFOO_CPE_ID+.
I would even drop the mention of the variable just here above. Committed with that changed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/3 package/sudo: cleanup the CPE_ID variables
In reply to Yann E. MORINThe CPE variables are derived from the package upstream values, so they must be set from the package values, not the other way around.
Also drop CPE_ID_VALID as it is implied as soon as at least one CPE variable is set.
Signed-off-by Yann E. MORIN <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Fabrice Fontaine <[email protected]>
--- package/sudo/sudo.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
package/sudo/sudo.mk +5 -4
@@ -4,13 +4,14 @@ # ################################################################################ -SUDO_VERSION = $(SUDO_CPE_ID_VERSION)$(SUDO_CPE_ID_UPDATE) +SUDO_VERSION_MAJOR = 1.9.5 +SUDO_VERSION_MINOR = p2 +SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause SUDO_LICENSE_FILES = doc/LICENSE -SUDO_CPE_ID_VALID = YES -SUDO_CPE_ID_VERSION = 1.9.5 -SUDO_CPE_ID_UPDATE = p2 +SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) +SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install SUDO_CONF_OPTS = \
Signature · 1 line
2.25.1
PATCH 2/3 package/sudo: cleanup the CPE_ID variables
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
The CPE variables are derived from the package upstream values, so they must be set from the package values, not the other way around.
Quoted 7 lines
Also drop
CPE_ID_VALIDas it is implied as soon as at least one CPE variable is set.Signed-off-by Yann E. MORIN <[email protected]>Cc Peter Korsgaard <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Fabrice Fontaine <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/3 package: drop _CPE_ID_VALID, use _CPE_ID_VENDOR
In reply to Yann E. MORINFOO_CPE_ID_VALID really ought to be an internal implementaion detail. Packages that really want to trigger their CPE defintitions really should set one of the actual variables to a meaningful value.
There are two CPE-related variables that we could chose to set to replace FOO_CPE_ID_VALID: FOO_CPE_ID_VENDOR and FOO_CPE_ID_PRODUCT. Between those two, _VENDOR more often diverges from the default than _PRODUCT does, so that's what we use.
Reported-by Peter Korsgaard <[email protected]>
Signed-off-by Yann E. MORIN <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Cc Matthew Weber <[email protected]>
Cc Fabrice Fontaine <[email protected]>
---8<------8<------8<------8<------8<---
#!/bin/bash
# Replace FOO_CPE_ID_VALID = YES with FOO_CPE_ID_VENDOR = foo_project
for i in $(git grep -l -E '[^)]_CPE_ID_VALID = YES' package support); do
pkg="$(basename "${i%/*}")"
sed -r -i -e "s/_CPE_ID_VALID = YES/_CPE_ID_VENDOR = ${pkg}_project/" "${i}"
done
---8<------8<------8<------8<------8<---
---
package/asn1c/asn1c.mk | 2 +-
package/atftp/atftp.mk | 2 +-
package/atop/atop.mk | 2 +-
package/attr/attr.mk | 2 +-
package/axel/axel.mk | 2 +-
package/bdwgc/bdwgc.mk | 2 +-
package/beecrypt/beecrypt.mk | 2 +-
package/botan/botan.mk | 2 +-
package/c-icap/c-icap.mk | 2 +-
package/civetweb/civetweb.mk | 2 +-
package/cjson/cjson.mk | 2 +-
package/cryptsetup/cryptsetup.mk | 2 +-
package/dosfstools/dosfstools.mk | 2 +-
package/e2fsprogs/e2fsprogs.mk | 2 +-
package/elfutils/elfutils.mk | 2 +-
package/file/file.mk | 2 +-
package/flac/flac.mk | 2 +-
package/flex/flex.mk | 2 +-
package/fontconfig/fontconfig.mk | 2 +-
package/giflib/giflib.mk | 2 +-
package/gnuplot/gnuplot.mk | 2 +-
package/harfbuzz/harfbuzz.mk | 2 +-
package/heimdal/heimdal.mk | 2 +-
package/ipmitool/ipmitool.mk | 2 +-
package/iucode-tool/iucode-tool.mk | 2 +-
package/jansson/jansson.mk | 2 +-
package/jasper/jasper.mk | 2 +-
package/jhead/jhead.mk | 2 +-
package/jq/jq.mk | 2 +-
package/json-c/json-c.mk | 2 +-
package/jsoncpp/jsoncpp.mk | 2 +-
package/lame/lame.mk | 2 +-
package/lftp/lftp.mk | 2 +-
package/libass/libass.mk | 2 +-
package/libcap-ng/libcap-ng.mk | 2 +-
package/libconfuse/libconfuse.mk | 2 +-
package/libesmtp/libesmtp.mk | 2 +-
package/libevent/libevent.mk | 2 +-
package/libexif/libexif.mk | 2 +-
package/libgit2/libgit2.mk | 2 +-
package/libksba/libksba.mk | 2 +-
package/librsync/librsync.mk | 2 +-
package/libseccomp/libseccomp.mk | 2 +-
package/libsndfile/libsndfile.mk | 2 +-
package/libtirpc/libtirpc.mk | 2 +-
package/libupnp/libupnp.mk | 2 +-
package/libvncserver/libvncserver.mk | 2 +-
package/logrotate/logrotate.mk | 2 +-
package/lzo/lzo.mk | 2 +-
package/matio/matio.mk | 2 +-
package/minicom/minicom.mk | 2 +-
package/ncmpc/ncmpc.mk | 2 +-
package/netatalk/netatalk.mk | 2 +-
package/netcat/netcat.mk | 2 +-
package/nettle/nettle.mk | 2 +-
package/oniguruma/oniguruma.mk | 2 +-
package/openrc/openrc.mk | 2 +-
package/p11-kit/p11-kit.mk | 2 +-
package/polkit/polkit.mk | 2 +-
package/powerpc-utils/powerpc-utils.mk | 2 +-
package/procps-ng/procps-ng.mk | 2 +-
package/rabbitmq-c/rabbitmq-c.mk | 2 +-
package/rhash/rhash.mk | 2 +-
package/rpcbind/rpcbind.mk | 2 +-
package/rtmpdump/rtmpdump.mk | 2 +-
package/sane-backends/sane-backends.mk | 2 +-
package/spice/spice.mk | 2 +-
package/squashfs/squashfs.mk | 2 +-
package/strace/strace.mk | 2 +-
package/sysklogd/sysklogd.mk | 2 +-
package/tmux/tmux.mk | 2 +-
package/unzip/unzip.mk | 2 +-
package/upx/upx.mk | 2 +-
package/valijson/valijson.mk | 2 +-
package/vsftpd/vsftpd.mk | 2 +-
package/x11vnc/x11vnc.mk | 2 +-
package/xscreensaver/xscreensaver.mk | 2 +-
package/yaml-cpp/yaml-cpp.mk | 2 +-
package/zziplib/zziplib.mk | 2 +-
.../core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk | 2 +-
80 files changed, 80 insertions(+), 80 deletions(-)package/asn1c/asn1c.mk +1 -1
@@ -8,6 +8,6 @@ ASN1C_VERSION = 0.9.28 ASN1C_SITE = https://github.com/vlm/asn1c/releases/download/v$(ASN1C_VERSION) ASN1C_LICENSE = BSD-2-Clause ASN1C_LICENSE_FILES = LICENSE -ASN1C_CPE_ID_VALID = YES +ASN1C_CPE_ID_VENDOR = asn1c_project $(eval $(host-autotools-package))
package/atftp/atftp.mk +1 -1
@@ -8,7 +8,7 @@ ATFTP_VERSION = 0.7.4 ATFTP_SITE = http://sourceforge.net/projects/atftp/files ATFTP_LICENSE = GPL-2.0+ ATFTP_LICENSE_FILES = LICENSE -ATFTP_CPE_ID_VALID = YES +ATFTP_CPE_ID_VENDOR = atftp_project ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp # For static we need to explicitly link against libpthread ATFTP_LIBS = -lpthread
package/atop/atop.mk +1 -1
@@ -8,7 +8,7 @@ ATOP_VERSION = 2.6.0 ATOP_SITE = http://www.atoptool.nl/download ATOP_LICENSE = GPL-2.0+ ATOP_LICENSE_FILES = COPYING -ATOP_CPE_ID_VALID = YES +ATOP_CPE_ID_VENDOR = atop_project ATOP_DEPENDENCIES = ncurses zlib ATOP_CFLAGS = $(TARGET_CFLAGS)
package/attr/attr.mk +1 -1
@@ -8,7 +8,7 @@ ATTR_VERSION = 2.4.48 ATTR_SITE = http://download.savannah.gnu.org/releases/attr ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL -ATTR_CPE_ID_VALID = YES +ATTR_CPE_ID_VENDOR = attr_project ATTR_INSTALL_STAGING = YES
package/axel/axel.mk +1 -1
@@ -9,7 +9,7 @@ AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/ AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz AXEL_LICENSE = GPL-2.0+ AXEL_LICENSE_FILES = COPYING -AXEL_CPE_ID_VALID = YES +AXEL_CPE_ID_VENDOR = axel_project AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) # ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test
package/bdwgc/bdwgc.mk +1 -1
@@ -10,7 +10,7 @@ BDWGC_SITE = http://www.hboehm.info/gc/gc_source BDWGC_INSTALL_STAGING = YES BDWGC_LICENSE = bdwgc license BDWGC_LICENSE_FILES = README.QUICK -BDWGC_CPE_ID_VALID = YES +BDWGC_CPE_ID_VENDOR = bdwgc_project BDWGC_DEPENDENCIES = libatomic_ops host-pkgconf HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf
package/beecrypt/beecrypt.mk +1 -1
@@ -10,7 +10,7 @@ BEECRYPT_AUTORECONF = YES BEECRYPT_INSTALL_STAGING = YES BEECRYPT_LICENSE = LGPL-2.1+ BEECRYPT_LICENSE_FILES = COPYING.LIB -BEECRYPT_CPE_ID_VALID = YES +BEECRYPT_CPE_ID_VENDOR = beecrypt_project BEECRYPT_CONF_OPTS = \ --disable-expert-mode \
package/botan/botan.mk +1 -1
@@ -9,7 +9,7 @@ BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz BOTAN_SITE = http://botan.randombit.net/releases BOTAN_LICENSE = BSD-2-Clause BOTAN_LICENSE_FILES = license.txt -BOTAN_CPE_ID_VALID = YES +BOTAN_CPE_ID_VENDOR = botan_project BOTAN_INSTALL_STAGING = YES
package/c-icap/c-icap.mk +1 -1
@@ -9,7 +9,7 @@ C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz C_ICAP_SITE = http://downloads.sourceforge.net/c-icap C_ICAP_LICENSE = LGPL-2.1+ C_ICAP_LICENSE_FILES = COPYING -C_ICAP_CPE_ID_VALID = YES +C_ICAP_CPE_ID_VENDOR = c-icap_project C_ICAP_INSTALL_STAGING = YES C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config C_ICAP_CONF_OPTS = \
package/civetweb/civetweb.mk +1 -1
@@ -8,7 +8,7 @@ CIVETWEB_VERSION = 1.13 CIVETWEB_SITE = $(call github,civetweb,civetweb,v$(CIVETWEB_VERSION)) CIVETWEB_LICENSE = MIT CIVETWEB_LICENSE_FILES = LICENSE.md -CIVETWEB_CPE_ID_VALID = YES +CIVETWEB_CPE_ID_VENDOR = civetweb_project CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 \ $(if $(BR2_INSTALL_LIBSTDCPP),WITH_CPP=1)
package/cjson/cjson.mk +1 -1
@@ -9,7 +9,7 @@ CJSON_SITE = $(call github,DaveGamble,cjson,v$(CJSON_VERSION)) CJSON_INSTALL_STAGING = YES CJSON_LICENSE = MIT CJSON_LICENSE_FILES = LICENSE -CJSON_CPE_ID_VALID = YES +CJSON_CPE_ID_VENDOR = cjson_project # Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable # -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP CJSON_CONF_OPTS += \
package/cryptsetup/cryptsetup.mk +1 -1
@@ -15,7 +15,7 @@ CRYPTSETUP_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL -CRYPTSETUP_CPE_ID_VALID = YES +CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project CRYPTSETUP_INSTALL_STAGING = YES CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
package/dosfstools/dosfstools.mk +1 -1
@@ -9,7 +9,7 @@ DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) DOSFSTOOLS_LICENSE = GPL-3.0+ DOSFSTOOLS_LICENSE_FILES = COPYING -DOSFSTOOLS_CPE_ID_VALID = YES +DOSFSTOOLS_CPE_ID_VENDOR = dosfstools_project DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/ HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks
package/e2fsprogs/e2fsprogs.mk +1 -1
@@ -9,7 +9,7 @@ E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h -E2FSPROGS_CPE_ID_VALID = YES +E2FSPROGS_CPE_ID_VENDOR = e2fsprogs_project E2FSPROGS_INSTALL_STAGING = YES # Use libblkid and libuuid from util-linux for host and target packages.
package/elfutils/elfutils.mk +1 -1
@@ -10,7 +10,7 @@ ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library) ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 -ELFUTILS_CPE_ID_VALID = YES +ELFUTILS_CPE_ID_VENDOR = elfutils_project ELFUTILS_DEPENDENCIES = host-pkgconf zlib $(TARGET_NLS_DEPENDENCIES) HOST_ELFUTILS_DEPENDENCIES = host-pkgconf host-zlib host-bzip2 host-xz
package/file/file.mk +1 -1
@@ -12,7 +12,7 @@ FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' FILE_INSTALL_STAGING = YES FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file) FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c -FILE_CPE_ID_VALID = YES +FILE_CPE_ID_VENDOR = file_project # We're patching configure.ac FILE_AUTORECONF = YES HOST_FILE_CONF_OPTS = --disable-libseccomp
package/flac/flac.mk +1 -1
@@ -11,7 +11,7 @@ FLAC_INSTALL_STAGING = YES FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries) FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL -FLAC_CPE_ID_VALID = YES +FLAC_CPE_ID_VENDOR = flac_project # patch touching configure.ac FLAC_AUTORECONF = YES
package/flex/flex.mk +1 -1
@@ -9,7 +9,7 @@ FLEX_SITE = https://github.com/westes/flex/files/981163 FLEX_INSTALL_STAGING = YES FLEX_LICENSE = FLEX FLEX_LICENSE_FILES = COPYING -FLEX_CPE_ID_VALID = YES +FLEX_CPE_ID_VENDOR = flex_project FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4 HOST_FLEX_DEPENDENCIES = host-m4
package/fontconfig/fontconfig.mk +1 -1
@@ -15,7 +15,7 @@ HOST_FONTCONFIG_DEPENDENCIES = \ host-freetype host-expat host-pkgconf host-gperf host-util-linux FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING -FONTCONFIG_CPE_ID_VALID = YES +FONTCONFIG_CPE_ID_VENDOR = fontconfig_project FONTCONFIG_CONF_OPTS = \ --with-arch=$(GNU_TARGET_NAME) \
package/giflib/giflib.mk +1 -1
@@ -9,7 +9,7 @@ GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING -GIFLIB_CPE_ID_VALID = YES +GIFLIB_CPE_ID_VENDOR = giflib_project ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib
package/gnuplot/gnuplot.mk +1 -1
@@ -8,7 +8,7 @@ GNUPLOT_VERSION = 5.4.1 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) GNUPLOT_LICENSE = gnuplot license (open source) GNUPLOT_LICENSE_FILES = Copyright -GNUPLOT_CPE_ID_VALID = YES +GNUPLOT_CPE_ID_VENDOR = gnuplot_project GNUPLOT_AUTORECONF = YES
package/harfbuzz/harfbuzz.mk +1 -1
@@ -9,7 +9,7 @@ HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZ HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING -HARFBUZZ_CPE_ID_VALID = YES +HARFBUZZ_CPE_ID_VENDOR = harfbuzz_project HARFBUZZ_INSTALL_STAGING = YES HARFBUZZ_CONF_OPTS = \ -Dfontconfig=disabled \
package/heimdal/heimdal.mk +1 -1
@@ -31,7 +31,7 @@ HOST_HEIMDAL_CONF_OPTS = \ HOST_HEIMDAL_CONF_ENV = MAKEINFO=true HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE -HEIMDAL_CPE_ID_VALID = YES +HEIMDAL_CPE_ID_VENDOR = heimdal_project # We need asn1_compile in the PATH for samba4 define HOST_HEIMDAL_MAKE_SYMLINK
package/ipmitool/ipmitool.mk +1 -1
@@ -9,7 +9,7 @@ IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2 IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION) IPMITOOL_LICENSE = BSD-3-Clause IPMITOOL_LICENSE_FILES = COPYING -IPMITOOL_CPE_ID_VALID = YES +IPMITOOL_CPE_ID_VENDOR = ipmitool_project # 0008-fru-Fix-buffer-overflow-vulnerabilities.patch # 0009-fru-Fix-buffer-overflow-in-ipmi_spd_print_fru.patch
package/iucode-tool/iucode-tool.mk +1 -1
@@ -12,7 +12,7 @@ IUCODE_TOOL_DEPENDENCIES = argp-standalone endif IUCODE_TOOL_LICENSE = GPL-2.0+ IUCODE_TOOL_LICENSE_FILES = COPYING -IUCODE_TOOL_CPE_ID_VALID = YES +IUCODE_TOOL_CPE_ID_VENDOR = iucode-tool_project define IUCODE_TOOL_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \
package/jansson/jansson.mk +1 -1
@@ -8,7 +8,7 @@ JANSSON_VERSION = 2.13.1 JANSSON_SITE = http://www.digip.org/jansson/releases JANSSON_LICENSE = MIT JANSSON_LICENSE_FILES = LICENSE -JANSSON_CPE_ID_VALID = YES +JANSSON_CPE_ID_VENDOR = jansson_project JANSSON_INSTALL_STAGING = YES JANSSON_CONF_ENV = LIBS="-lm"
package/jasper/jasper.mk +1 -1
@@ -9,7 +9,7 @@ JASPER_SITE = $(call github,jasper-software,jasper,version-$(JASPER_VERSION)) JASPER_INSTALL_STAGING = YES JASPER_LICENSE = JasPer-2.0 JASPER_LICENSE_FILES = LICENSE -JASPER_CPE_ID_VALID = YES +JASPER_CPE_ID_VENDOR = jasper_project JASPER_SUPPORTS_IN_SOURCE_BUILD = NO JASPER_CONF_OPTS = \ -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \
package/jhead/jhead.mk +1 -1
@@ -8,7 +8,7 @@ JHEAD_VERSION = 3.04 JHEAD_SITE = http://www.sentex.net/~mwandel/jhead JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt -JHEAD_CPE_ID_VALID = YES +JHEAD_CPE_ID_VENDOR = jhead_project define JHEAD_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
package/jq/jq.mk +1 -1
@@ -8,7 +8,7 @@ JQ_VERSION = a17dd3248a666d01be75f6b16be37e80e20b0954 JQ_SITE = $(call github,stedolan,jq,$(JQ_VERSION)) JQ_LICENSE = MIT (code), ICU (decNumber), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING -JQ_CPE_ID_VALID = YES +JQ_CPE_ID_VENDOR = jq_project JQ_INSTALL_STAGING = YES # currently using git version directly
package/json-c/json-c.mk +1 -1
@@ -9,7 +9,7 @@ JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases JSON_C_INSTALL_STAGING = YES JSON_C_LICENSE = MIT JSON_C_LICENSE_FILES = COPYING -JSON_C_CPE_ID_VALID = YES +JSON_C_CPE_ID_VENDOR = json-c_project $(eval $(cmake-package)) $(eval $(host-cmake-package))
package/jsoncpp/jsoncpp.mk +1 -1
@@ -8,7 +8,7 @@ JSONCPP_VERSION = 1.9.4 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE -JSONCPP_CPE_ID_VALID = YES +JSONCPP_CPE_ID_VENDOR = jsoncpp_project JSONCPP_INSTALL_STAGING = YES JSONCPP_CONF_OPTS = -Dtests=false
package/lame/lame.mk +1 -1
@@ -12,7 +12,7 @@ LAME_CONF_ENV = GTK_CONFIG=/bin/false LAME_CONF_OPTS = --enable-dynamic-frontends LAME_LICENSE = LGPL-2.0+ LAME_LICENSE_FILES = COPYING -LAME_CPE_ID_VALID = YES +LAME_CPE_ID_VENDOR = lame_project ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LAME_DEPENDENCIES += libsndfile
package/lftp/lftp.mk +1 -1
@@ -9,7 +9,7 @@ LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz LFTP_SITE = http://lftp.yar.ru/ftp LFTP_LICENSE = GPL-3.0+ LFTP_LICENSE_FILES = COPYING -LFTP_CPE_ID_VALID = YES +LFTP_CPE_ID_VENDOR = lftp_project LFTP_DEPENDENCIES = readline zlib host-pkgconf # Help lftp finding readline and zlib
package/libass/libass.mk +1 -1
@@ -12,7 +12,7 @@ LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSIO LIBASS_INSTALL_STAGING = YES LIBASS_LICENSE = ISC LIBASS_LICENSE_FILES = COPYING -LIBASS_CPE_ID_VALID = YES +LIBASS_CPE_ID_VENDOR = libass_project LIBASS_DEPENDENCIES = \ host-pkgconf \ freetype \
package/libcap-ng/libcap-ng.mk +1 -1
@@ -8,7 +8,7 @@ LIBCAP_NG_VERSION = 0.8.2 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB -LIBCAP_NG_CPE_ID_VALID = YES +LIBCAP_NG_CPE_ID_VENDOR = libcap-ng_project LIBCAP_NG_INSTALL_STAGING = YES LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
package/libconfuse/libconfuse.mk +1 -1
@@ -11,7 +11,7 @@ LIBCONFUSE_INSTALL_STAGING = YES LIBCONFUSE_CONF_OPTS = --disable-rpath LIBCONFUSE_LICENSE = ISC LIBCONFUSE_LICENSE_FILES = LICENSE -LIBCONFUSE_CPE_ID_VALID = YES +LIBCONFUSE_CPE_ID_VENDOR = libconfuse_project LIBCONFUSE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) $(eval $(autotools-package))
package/libesmtp/libesmtp.mk +1 -1
@@ -12,6 +12,6 @@ LIBESMTP_CONFIG_SCRIPTS = libesmtp-config LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library) LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB -LIBESMTP_CPE_ID_VALID = YES +LIBESMTP_CPE_ID_VENDOR = libesmtp_project $(eval $(autotools-package))
package/libevent/libevent.mk +1 -1
@@ -10,7 +10,7 @@ LIBEVENT_SOURCE = libevent-$(LIBEVENT_VERSION)-stable.tar.gz LIBEVENT_INSTALL_STAGING = YES LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_LICENSE_FILES = LICENSE -LIBEVENT_CPE_ID_VALID = YES +LIBEVENT_CPE_ID_VENDOR = libevent_project LIBEVENT_CONF_OPTS = \ --disable-libevent-regress \ --disable-samples
package/libexif/libexif.mk +1 -1
@@ -12,7 +12,7 @@ LIBEXIF_INSTALL_STAGING = YES LIBEXIF_DEPENDENCIES = host-pkgconf LIBEXIF_LICENSE = LGPL-2.1+ LIBEXIF_LICENSE_FILES = COPYING -LIBEXIF_CPE_ID_VALID = YES +LIBEXIF_CPE_ID_VENDOR = libexif_project # 0001-fixed-another-unsigned-integer-overflow.patch LIBEXIF_IGNORE_CVES += CVE-2020-0198 # 0002-fixed-a-incorrect-overflow-check.patch
package/libgit2/libgit2.mk +1 -1
@@ -8,7 +8,7 @@ LIBGIT2_VERSION = 1.1.0 LIBGIT2_SITE = https://github.com/libgit2/libgit2/releases/download/v$(LIBGIT2_VERSION) LIBGIT2_LICENSE = GPL-2.0 with linking exception, MIT (sha1), wildmatch license (wildmatch) LIBGIT2_LICENSE_FILES = COPYING -LIBGIT2_CPE_ID_VALID = YES +LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES LIBGIT2_CONF_OPTS = \
package/libksba/libksba.mk +1 -1
@@ -9,7 +9,7 @@ LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system) LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 -LIBKSBA_CPE_ID_VALID = YES +LIBKSBA_CPE_ID_VENDOR = libksba_project LIBKSBA_INSTALL_STAGING = YES LIBKSBA_DEPENDENCIES = libgpg-error LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr
package/librsync/librsync.mk +1 -1
@@ -8,7 +8,7 @@ LIBRSYNC_VERSION = 2.3.1 LIBRSYNC_SITE = $(call github,librsync,librsync,v$(LIBRSYNC_VERSION)) LIBRSYNC_LICENSE = LGPL-2.1+ LIBRSYNC_LICENSE_FILES = COPYING -LIBRSYNC_CPE_ID_VALID = YES +LIBRSYNC_CPE_ID_VENDOR = librsync_project LIBRSYNC_INSTALL_STAGING = YES LIBRSYNC_DEPENDENCIES = host-pkgconf zlib bzip2 popt
package/libseccomp/libseccomp.mk +1 -1
@@ -8,7 +8,7 @@ LIBSECCOMP_VERSION = 2.4.4 LIBSECCOMP_SITE = https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE -LIBSECCOMP_CPE_ID_VALID = YES +LIBSECCOMP_CPE_ID_VENDOR = libseccomp_project LIBSECCOMP_INSTALL_STAGING = YES $(eval $(autotools-package))
package/libsndfile/libsndfile.mk +1 -1
@@ -9,7 +9,7 @@ LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files LIBSNDFILE_INSTALL_STAGING = YES LIBSNDFILE_LICENSE = LGPL-2.1+ LIBSNDFILE_LICENSE_FILES = COPYING -LIBSNDFILE_CPE_ID_VALID = YES +LIBSNDFILE_CPE_ID_VENDOR = libsndfile_project # 0001-double64_init-Check-psf-sf.channels-against-upper-bo.patch LIBSNDFILE_IGNORE_CVES += CVE-2017-14634
package/libtirpc/libtirpc.mk +1 -1
@@ -9,7 +9,7 @@ LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) LIBTIRPC_LICENSE = BSD-3-Clause LIBTIRPC_LICENSE_FILES = COPYING -LIBTIRPC_CPE_ID_VALID = YES +LIBTIRPC_CPE_ID_VENDOR = libtirpc_project LIBTIRPC_DEPENDENCIES = host-nfs-utils LIBTIRPC_INSTALL_STAGING = YES
package/libupnp/libupnp.mk +1 -1
@@ -12,7 +12,7 @@ LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no LIBUPNP_INSTALL_STAGING = YES LIBUPNP_LICENSE = BSD-3-Clause LIBUPNP_LICENSE_FILES = COPYING -LIBUPNP_CPE_ID_VALID = YES +LIBUPNP_CPE_ID_VENDOR = libupnp_project LIBUPNP_DEPENDENCIES = host-pkgconf # Bind the internal miniserver socket with reuseaddr to allow clean restarts.
package/libvncserver/libvncserver.mk +1 -1
@@ -9,7 +9,7 @@ LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive LIBVNCSERVER_LICENSE = GPL-2.0+ LIBVNCSERVER_LICENSE_FILES = COPYING -LIBVNCSERVER_CPE_ID_VALID = YES +LIBVNCSERVER_CPE_ID_VENDOR = libvncserver_project LIBVNCSERVER_INSTALL_STAGING = YES LIBVNCSERVER_DEPENDENCIES = host-pkgconf lzo LIBVNCSERVER_CONF_OPTS = -DWITH_LZO=ON
package/logrotate/logrotate.mk +1 -1
@@ -9,7 +9,7 @@ LOGROTATE_SOURCE = logrotate-3.18.0.tar.xz LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING -LOGROTATE_CPE_ID_VALID = YES +LOGROTATE_CPE_ID_VENDOR = logrotate_project LOGROTATE_DEPENDENCIES = popt host-pkgconf LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`"
package/lzo/lzo.mk +1 -1
@@ -8,7 +8,7 @@ LZO_VERSION = 2.10 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_LICENSE = GPL-2.0+ LZO_LICENSE_FILES = COPYING -LZO_CPE_ID_VALID = YES +LZO_CPE_ID_VENDOR = lzo_project LZO_INSTALL_STAGING = YES LZO_SUPPORTS_IN_SOURCE_BUILD = NO
package/matio/matio.mk +1 -1
@@ -8,7 +8,7 @@ MATIO_VERSION = 1.5.18 MATIO_SITE = http://downloads.sourceforge.net/project/matio/matio/$(MATIO_VERSION) MATIO_LICENSE = BSD-2-Clause MATIO_LICENSE_FILES = COPYING -MATIO_CPE_ID_VALID = YES +MATIO_CPE_ID_VENDOR = matio_project MATIO_DEPENDENCIES = zlib MATIO_INSTALL_STAGING = YES
package/minicom/minicom.mk +1 -1
@@ -10,7 +10,7 @@ MINICOM_SITE = \ https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION) MINICOM_LICENSE = GPL-2.0+ MINICOM_LICENSE_FILES = COPYING -MINICOM_CPE_ID_VALID = YES +MINICOM_CPE_ID_VENDOR = minicom_project MINICOM_AUTORECONF = YES MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \
package/ncmpc/ncmpc.mk +1 -1
@@ -16,7 +16,7 @@ NCMPC_DEPENDENCIES = \ $(TARGET_NLS_DEPENDENCIES) NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING -NCMPC_CPE_ID_VALID = YES +NCMPC_CPE_ID_VENDOR = ncmpc_project NCMPC_CONF_OPTS = \ -Dcurses=ncurses \
package/netatalk/netatalk.mk +1 -1
@@ -14,7 +14,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ libevent NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like NETATALK_LICENSE_FILES = COPYING COPYRIGHT -NETATALK_CPE_ID_VALID = YES +NETATALK_CPE_ID_VENDOR = netatalk_project # Don't run ldconfig! NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \
package/netcat/netcat.mk +1 -1
@@ -8,6 +8,6 @@ NETCAT_VERSION = 0.7.1 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) NETCAT_LICENSE = GPL-2.0+ NETCAT_LICENSE_FILES = COPYING -NETCAT_CPE_ID_VALID = YES +NETCAT_CPE_ID_VENDOR = netcat_project $(eval $(autotools-package))
package/nettle/nettle.mk +1 -1
@@ -10,7 +10,7 @@ NETTLE_DEPENDENCIES = gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 -NETTLE_CPE_ID_VALID = YES +NETTLE_CPE_ID_VENDOR = nettle_project # don't include openssl support for (unused) examples as it has problems # with static linking NETTLE_CONF_OPTS = --disable-openssl
package/oniguruma/oniguruma.mk +1 -1
@@ -10,7 +10,7 @@ ONIGURUMA_SITE = \ ONIGURUMA_SOURCE = onig-$(ONIGURUMA_VERSION).tar.gz ONIGURUMA_LICENSE = BSD-2-Clause ONIGURUMA_LICENSE_FILES = COPYING -ONIGURUMA_CPE_ID_VALID = YES +ONIGURUMA_CPE_ID_VENDOR = oniguruma_project ONIGURUMA_INSTALL_STAGING = YES $(eval $(autotools-package))
package/openrc/openrc.mk +1 -1
@@ -8,7 +8,7 @@ OPENRC_VERSION = 0.42.1 OPENRC_SITE = $(call github,OpenRC,openrc,$(OPENRC_VERSION)) OPENRC_LICENSE = BSD-2-Clause OPENRC_LICENSE_FILES = LICENSE -OPENRC_CPE_ID_VALID = YES +OPENRC_CPE_ID_VENDOR = openrc_project # 0007-checkpath-fix-CVE-2018-21269.patch OPENRC_IGNORE_CVES += CVE-2018-21269
package/p11-kit/p11-kit.mk +1 -1
@@ -13,7 +13,7 @@ P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ ac_cv_have_decl___progname=no P11_KIT_LICENSE = BSD-3-Clause P11_KIT_LICENSE_FILES = COPYING -P11_KIT_CPE_ID_VALID = YES +P11_KIT_CPE_ID_VENDOR = p11-kit_project ifeq ($(BR2_PACKAGE_LIBFFI),y) P11_KIT_DEPENDENCIES += host-pkgconf libffi
package/polkit/polkit.mk +1 -1
@@ -8,7 +8,7 @@ POLKIT_VERSION = 0.116 POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases POLKIT_LICENSE = GPL-2.0 POLKIT_LICENSE_FILES = COPYING -POLKIT_CPE_ID_VALID = YES +POLKIT_CPE_ID_VENDOR = polkit_project POLKIT_AUTORECONF = YES POLKIT_INSTALL_STAGING = YES
package/powerpc-utils/powerpc-utils.mk +1 -1
@@ -10,7 +10,7 @@ POWERPC_UTILS_DEPENDENCIES = zlib POWERPC_UTILS_AUTORECONF = YES POWERPC_UTILS_LICENSE = GPL-2.0+ POWERPC_UTILS_LICENSE_FILES = COPYING -POWERPC_UTILS_CPE_ID_VALID = YES +POWERPC_UTILS_CPE_ID_VENDOR = powerpc-utils_project POWERPC_UTILS_CONF_ENV = \ ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no)
package/procps-ng/procps-ng.mk +1 -1
@@ -9,7 +9,7 @@ PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB -PROCPS_NG_CPE_ID_VALID = YES +PROCPS_NG_CPE_ID_VENDOR = procps-ng_project PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS)
package/rabbitmq-c/rabbitmq-c.mk +1 -1
@@ -8,7 +8,7 @@ RABBITMQ_C_VERSION = 0.10.0 RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,v$(RABBITMQ_C_VERSION)) RABBITMQ_C_LICENSE = MIT RABBITMQ_C_LICENSE_FILES = LICENSE-MIT -RABBITMQ_C_CPE_ID_VALID = YES +RABBITMQ_C_CPE_ID_VENDOR = rabbitmq-c_project RABBITMQ_C_INSTALL_STAGING = YES RABBITMQ_C_CONF_OPTS = \ -DBUILD_API_DOCS=OFF \
package/rhash/rhash.mk +1 -1
@@ -9,7 +9,7 @@ RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION) RHASH_LICENSE = 0BSD RHASH_LICENSE_FILES = COPYING -RHASH_CPE_ID_VALID = YES +RHASH_CPE_ID_VENDOR = rhash_project RHASH_INSTALL_STAGING = YES RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS)
package/rpcbind/rpcbind.mk +1 -1
@@ -9,7 +9,7 @@ RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIN RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 RPCBIND_LICENSE = BSD-3-Clause RPCBIND_LICENSE_FILES = COPYING -RPCBIND_CPE_ID_VALID = YES +RPCBIND_CPE_ID_VENDOR = rpcbind_project RPCBIND_CONF_ENV += \ CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`"
package/rtmpdump/rtmpdump.mk +1 -1
@@ -11,7 +11,7 @@ RTMPDUMP_INSTALL_STAGING = YES # care about librtmp, it's LGPL-2.1+ RTMPDUMP_LICENSE = LGPL-2.1+ RTMPDUMP_LICENSE_FILES = librtmp/COPYING -RTMPDUMP_CPE_ID_VALID = YES +RTMPDUMP_CPE_ID_VENDOR = rtmpdump_project RTMPDUMP_DEPENDENCIES = zlib ifeq ($(BR2_PACKAGE_GNUTLS),y)
package/sane-backends/sane-backends.mk +1 -1
@@ -10,7 +10,7 @@ SANE_BACKENDS_SITE = \ SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPL-2.0+ SANE_BACKENDS_LICENSE_FILES = COPYING -SANE_BACKENDS_CPE_ID_VALID = YES +SANE_BACKENDS_CPE_ID_VENDOR = sane-backends_project SANE_BACKENDS_INSTALL_STAGING = YES SANE_BACKENDS_CONF_OPTS = \
package/spice/spice.mk +1 -1
@@ -9,7 +9,7 @@ SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 SPICE_SITE = http://www.spice-space.org/download/releases/spice-server SPICE_LICENSE = LGPL-2.1+ SPICE_LICENSE_FILES = COPYING -SPICE_CPE_ID_VALID = YES +SPICE_CPE_ID_VENDOR = spice_project SPICE_INSTALL_STAGING = YES SPICE_DEPENDENCIES = \ host-pkgconf \
package/squashfs/squashfs.mk +1 -1
@@ -8,7 +8,7 @@ SQUASHFS_VERSION = 4.4 SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION)) SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING -SQUASHFS_CPE_ID_VALID = YES +SQUASHFS_CPE_ID_VENDOR = squashfs_project SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
package/strace/strace.mk +1 -1
@@ -9,7 +9,7 @@ STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ STRACE_LICENSE_FILES = COPYING LGPL-2.1-or-later -STRACE_CPE_ID_VALID = YES +STRACE_CPE_ID_VENDOR = strace_project STRACE_CONF_OPTS = --enable-mpers=no ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
package/sysklogd/sysklogd.mk +1 -1
@@ -8,7 +8,7 @@ SYSKLOGD_VERSION = 2.2.1 SYSKLOGD_SITE = https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION) SYSKLOGD_LICENSE = BSD-3-Clause SYSKLOGD_LICENSE_FILES = LICENSE -SYSKLOGD_CPE_ID_VALID = YES +SYSKLOGD_CPE_ID_VENDOR = sysklogd_project # Busybox install logger in /usr/bin, and syslogd in /sbin, so install in # the same locations so that busybox does not install its applets in there.
package/tmux/tmux.mk +1 -1
@@ -8,7 +8,7 @@ TMUX_VERSION = 3.1c TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) TMUX_LICENSE = ISC TMUX_LICENSE_FILES = COPYING -TMUX_CPE_ID_VALID = YES +TMUX_CPE_ID_VENDOR = tmux_project TMUX_DEPENDENCIES = libevent ncurses host-pkgconf # Add /usr/bin/tmux to /etc/shells otherwise some login tools like dropbear
package/unzip/unzip.mk +1 -1
@@ -10,7 +10,7 @@ UNZIP_PATCH = unzip_$(UNZIP_VERSION)-26.debian.tar.xz UNZIP_SITE = https://snapshot.debian.org/archive/debian/20210110T204103Z/pool/main/u/unzip UNZIP_LICENSE = Info-ZIP UNZIP_LICENSE_FILES = LICENSE -UNZIP_CPE_ID_VALID = YES +UNZIP_CPE_ID_VENDOR = unzip_project # unzip_$(UNZIP_VERSION)-26.debian.tar.xz has patches to fix: UNZIP_IGNORE_CVES = \
package/upx/upx.mk +1 -1
@@ -9,7 +9,7 @@ UPX_SITE = https://github.com/upx/upx/releases/download/v$(UPX_VERSION) UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.xz UPX_LICENSE = GPL-2.0+ UPX_LICENSE_FILES = COPYING -UPX_CPE_ID_VALID = YES +UPX_CPE_ID_VENDOR = upx_project HOST_UPX_DEPENDENCIES = host-ucl host-zlib
package/valijson/valijson.mk +1 -1
@@ -8,7 +8,7 @@ VALIJSON_VERSION = 0.3 VALIJSON_SITE = $(call github,tristanpenman,valijson,v$(VALIJSON_VERSION)) VALIJSON_LICENSE = BSD-2-Clause VALIJSON_LICENSE_FILES = LICENSE -VALIJSON_CPE_ID_VALID = YES +VALIJSON_CPE_ID_VENDOR = valijson_project VALIJSON_INSTALL_STAGING = YES VALIJSON_INSTALL_TARGET = NO VALIJSON_DEPENDENCIES = boost
package/vsftpd/vsftpd.mk +1 -1
@@ -9,7 +9,7 @@ VSFTPD_SITE = https://security.appspot.com/downloads VSFTPD_LIBS = -lcrypt VSFTPD_LICENSE = GPL-2.0 VSFTPD_LICENSE_FILES = COPYING -VSFTPD_CPE_ID_VALID = YES +VSFTPD_CPE_ID_VENDOR = vsftpd_project define VSFTPD_DISABLE_UTMPX $(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h
package/x11vnc/x11vnc.mk +1 -1
@@ -12,7 +12,7 @@ X11VNC_CONF_OPTS = --without-sdl X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver X11VNC_LICENSE = GPL-2.0+ X11VNC_LICENSE_FILES = COPYING -X11VNC_CPE_ID_VALID = YES +X11VNC_CPE_ID_VENDOR = x11vnc_project # 0002-scan-limit-access-to-shared-memory-segments-to-current-user.patch X11VNC_IGNORE_CVES += CVE-2020-29074
package/xscreensaver/xscreensaver.mk +1 -1
@@ -10,7 +10,7 @@ XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h -XSCREENSAVER_CPE_ID_VALID = YES +XSCREENSAVER_CPE_ID_VENDOR = xscreensaver_project XSCREENSAVER_DEPENDENCIES = \ gdk-pixbuf \
package/yaml-cpp/yaml-cpp.mk +1 -1
@@ -9,7 +9,7 @@ YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,yaml-cpp-$(YAML_CPP_VERSION)) YAML_CPP_INSTALL_STAGING = YES YAML_CPP_LICENSE = MIT YAML_CPP_LICENSE_FILES = LICENSE -YAML_CPP_CPE_ID_VALID = YES +YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project # Disable testing and parse tools YAML_CPP_CONF_OPTS += \
package/zziplib/zziplib.mk +1 -1
@@ -8,7 +8,7 @@ ZZIPLIB_VERSION = 0.13.72 ZZIPLIB_SITE = $(call github,gdraheim,zziplib,v$(ZZIPLIB_VERSION)) ZZIPLIB_LICENSE = LGPL-2.0+ or MPL-1.1 ZZIPLIB_LICENSE_FILES = docs/COPYING.LIB docs/COPYING.MPL docs/copying.htm -ZZIPLIB_CPE_ID_VALID = YES +ZZIPLIB_CPE_ID_VENDOR = zziplib_project ZZIPLIB_INSTALL_STAGING = YES ZZIPLIB_CONF_OPTS += \ -DZZIPDOCS=OFF \
support/testing/tests/core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk +1 -1
@@ -1,5 +1,5 @@ CPE_ID_PKG3_VERSION = 67 -CPE_ID_PKG3_CPE_ID_VALID = YES +CPE_ID_PKG3_CPE_ID_VENDOR = cpe-id-pkg3_project $(eval $(generic-package)) $(eval $(host-generic-package))
Signature · 1 line
2.25.1
PATCH 3/3 package: drop _CPE_ID_VALID, use _CPE_ID_VENDOR
Quoted 27 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
FOO_CPE_ID_VALIDreally ought to be an internal implementaion detail. Packages that really want to trigger their CPE defintitions really should set one of the actual variables to a meaningful value.There are two CPE-related variables that we could chose to set to replace
FOO_CPE_ID_VALID:FOO_CPE_ID_VENDORandFOO_CPE_ID_PRODUCT. Between those two,_VENDORmore often diverges from the default than_PRODUCTdoes, so that's what we use.Reported-by Peter Korsgaard <[email protected]>Signed-off-by Yann E. MORIN <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Arnout Vandecappelle (Essensium/Mind) <[email protected]>Cc Matthew Weber <[email protected]>Cc Fabrice Fontaine <[email protected]>---8<------8<------8<------8<------8<--- #!/bin/bash # Replace FOO_CPE_ID_VALID = YES with FOO_CPE_ID_VENDOR = foo_project for i in $(git grep -l -E '[^)]_CPE_ID_VALID = YES' package support); do pkg="$(basename "${i%/*}")" sed -r -i -e "s/_CPE_ID_VALID = YES/_CPE_ID_VENDOR = ${pkg}_project/" "${i}" done ---8<------8<------8<------8<------8<---
Quoted 1 line
.../core/cpeid-br2-external/package/cpe-id-pkg3/cpe-id-pkg3.mk | 2 +-
The pkg3 test still talks about _CPE_ID_VALID, so I reworded that and committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard