Commit Graph

26 Commits

Author SHA1 Message Date
Yann E. MORIN
b9db38d370 package: drop _CPE_ID_VALID, use _CPE_ID_VENDOR
FOO_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.

    ---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<---

Reported-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Matthew Weber <matthew.weber@rockwellcollins.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Peter: update cpe-test comment to reflect pkg3 change]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-03-06 17:18:07 +01:00
Fabrice Fontaine
483fc9dbd9 package/jsoncpp: set JSONCPP_CPE_ID_VALID
cpe:2.3🅰️jsoncpp_project:jsoncpp is a valid CPE identifier for this
package:

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2021-02-07 10:40:21 +01:00
Bernd Kuhls
b2019a5183 package/jsoncpp: security bump version to 1.9.4
Release notes of this "Security and build system fixes" release:
https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.4

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2020-11-06 08:10:41 +01:00
Bernd Kuhls
bab0d6ef43 package/jsoncpp: bump version to 1.9.3
Removed patch which was committed upstream.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-06-17 22:59:44 +02:00
Fabrice Fontaine
4b03dd5461 package/jsoncpp: disable tests
Disable tests to avoid a build failure on gcc 4.8 because of
std::hexfloat added in version 1.9.2 with
638ad269e7

Fixes:
 - http://autobuild.buildroot.org/results/f816229b835f61fa3e4c84aa659d30f81191f369

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-01-08 09:30:56 +01:00
Bernd Kuhls
ff9dc529a1 package/jsoncpp: bump version to 1.9.2
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2020-01-05 22:01:15 +01:00
Bernd Kuhls
7af21c704c package/jsoncpp: bump version to 1.9.1
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-15 22:34:28 +02:00
Bernd Kuhls
3651d4baa3 package/jsoncpp: switch build system to meson
Bumping jsoncpp to 1.9.1 will cause a CMake-related build error:
https://github.com/open-source-parsers/jsoncpp/issues/970

To fix the bug upstream suggests to switch to meson:
"Our official policy has been only supporting the meson build, and
 having users submit fixes for the CMake build."
https://github.com/open-source-parsers/jsoncpp/issues/970#issuecomment-509794015

Remove all _CONF_OPTS as they are not supported by meson.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-15 22:34:25 +02:00
Fabrice Fontaine
7098ee7f61 jsoncpp: do not always build static library
Currently, static libray is always built as BUILD_STATIC_LIBS is ON by
default so correctly set BUILD_STATIC_LIBS depending on BR2_SHARED_LIBS
variable

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-03-07 23:02:46 +01:00
Fabrice Fontaine
2a479530b4 jsoncpp: bump to version 1.8.4
Add license hash

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-03-07 21:46:42 +01:00
Jörg Krause
404a4f08e1 jsoncpp: bump to version 1.8.3
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-10-02 21:47:46 +02:00
Bernd Kuhls
7c31aafcd4 package/jsoncpp: bump version to 1.8.1
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-07-25 21:49:48 +02:00
Bernd Kuhls
734414453e package/jsoncpp: bump version to 1.8.0
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-06-10 23:00:45 +02:00
Adam Duskett
b206a2733b package/j*/Config.in: fix ordering of statements
The check-package script when ran gives warnings on ordering issues
on all of these Config files.  This patch cleans up all warnings
related to the ordering in the Config files for packages starting with
the letter j in the package directory.

The appropriate ordering is: type, default, depends on, select, help
See http://nightly.buildroot.org/#_config_files for more information.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-05-01 11:37:03 +02:00
Jörg Krause
e8d04791ff package/jsoncpp: bump to version 1.7.7
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-10-13 08:03:15 +02:00
Jörg Krause
b01a670219 package/jsoncpp: bump to version 1.7.5
Remove patch applied upstream in commit
d4a49cf511a9ef5ee52af83f8aed4437eaa160e1.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-09-21 23:27:31 +02:00
Bernd Kuhls
70566eb231 package/jsoncpp: Do not treat conversion warning as error
Fixes
http://autobuild.buildroot.net/results/74b/74b1b9f8defc275ff2bc3d877faf2863929737b9/
http://autobuild.buildroot.net/results/71d/71dcaf18e3d42c66af8036a68250eea1be09227b/
http://autobuild.buildroot.net/results/599/5997a9e4a8ca8b6171438495920d0a487518851c/
http://autobuild.buildroot.net/results/4ab/4abde1d7fd631d3b50a6b53824a781a08d022bca/
http://autobuild.buildroot.net/results/968/9680ebd8c804ef15d471519d54f8aa209710414d/
http://autobuild.buildroot.net/results/d5b/d5be4d51458ca10f3f4ff5fd3ad4b3cfd097f3ad/
http://autobuild.buildroot.net/results/b1e/b1e3fc27f3d0cdd6ca8f7aff06f7d5e4108817ec/
http://autobuild.buildroot.net/results/ffb/ffb40572269c63438228000495e1dc78c778788e/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-27 12:16:12 +02:00
Bernd Kuhls
4610564c7d package/jsoncpp: add hash
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-24 23:24:15 +02:00
Bernd Kuhls
0bfec0c95b package/jsoncpp: bump version to 1.7.2
Removed patches applied upstream.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-04-24 17:20:50 +02:00
Jörg Krause
6b462ac8bd package/jsoncpp: add patch to fix musl build issue on x86
This patch is replaces two previous sumbissions, the first by Bernd Kuhls [1],
the second by me [2].

The posix_memalign declaration is incompatible with musl for C++ on x86, because
of the exception specification [2]. Note, the referenced patch is part of a
patch series to "Add musl support to GCC".

However, this build issue only happens if compilation is done with the GCC
compiler option '-pedantic' [3] which is done so in jsoncpp.

Fortunately, upstream accepted a patch to opt-out '-pedantic' [4]. We backport
this patch to fix autobuild errors.

Fixes:
http://autobuild.buildroot.net/results/588/5885d33b8d9f17878f565f3ae5371017dc89aede/
http://autobuild.buildroot.net/results/0d9/0d90c7c13ae1640b07709c4c686e0237ada1324d/
http://autobuild.buildroot.net/results/30b/30b98ac7362c27254218a6e521d29971070f8c3c/
http://autobuild.buildroot.net/results/292/29289c125166630aeaf884ccc006bcf12c8aa0f6/

and many more.

[1] https://patchwork.ozlabs.org/patch/505425/
[2] https://patchwork.ozlabs.org/patch/533169/
[3] https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01425.html
[4] 48bfe91062

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-31 18:56:08 +01:00
Jörg Krause
f9280fd9e9 package/jsoncpp: bump to version 1.6.5
Remove patch 0001-Revert-Use-std-namespace-for-snprintf.patch:
This patch was initially intented to remove upstream commit
1c58876185d2a4ed87dac4a54b82f607e74f55fd to disable std::snprintf() for all
compilers. However, the patch actually reverts upstream commit
240ddb6a1b7aae7c6528e328995812ee695a73af which only uses std namespace if the
compiler defines __cplusplus >= 201103L, thus is a recent C++11 compiler.

Furthermore, upstream commit fac87108a49fb1b2640eff5d8e4cc7a12723a510 adds
the `-std=c++11` compiler flag to gcc, so jsoncpp now requires a C++11 compiler
either way.

With jsoncpp requiring a recent C++11 compiler we need at least gcc 4.7.

Backport patch from upstream [1] to remove `-Werror` from the compiler flags to
allow building with CS ARM toolchains.

[1]
d7b84f69c5

Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
Reviewed-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-08-19 11:05:49 +02:00
Gustavo Zacarias
757e9c4c2a package: kill pointless text justification
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-23 09:47:08 +02:00
Bernd Kuhls
5e90f6350e package/jsoncpp: bump version to 1.6.1
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-11 15:29:06 +02:00
Baruch Siach
5ec45823c1 jsoncpp: don't build tests
Fixes:
http://autobuild.buildroot.net/results/a0f/a0f60a1df243bdae875f12668011a53a70071ee6/
http://autobuild.buildroot.net/results/f88/f8885520b5892d49164c88a974e7dffc1c3c2ce0/
http://autobuild.buildroot.net/results/448/448745830f58496e6dcdf48e2ad57650b4744909/

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-06 10:58:44 +02:00
Baruch Siach
42bb259af5 jsoncpp: fix build for non C++11 toolchains
Add a patch removing reference to std::snprintf that is only in C++11.

Fixes:
http://autobuild.buildroot.net/results/b39/b390beeb9a6fea12f1a4d9f2ff9a8a483628cad2/
http://autobuild.buildroot.net/results/d18/d18b3e116b680a3897fbea296938e900a1e5e80a/
http://autobuild.buildroot.net/results/1b2/1b20a2f81dd2b409785930705222bc03576c4907/

and many more.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-31 13:55:52 +02:00
Bernd Kuhls
3201c7746d package/jsoncpp: new package
Needed for upcoming Kodi pctv/filmon PVR packages:

https://github.com/kodi-pvr/pvr.pctv/blob/master/CMakeLists.txt#L11
https://github.com/kodi-pvr/pvr.filmon/blob/master/CMakeLists.txt#L11

[Thomas:
  - bump to 1.6.0
  - change the license to "Public Domain or MIT"
  - wrap Config.in help text]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-03-15 18:54:49 +01:00