diff options
Diffstat (limited to 'meta-oe/recipes-support/iniparser')
4 files changed, 87 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch b/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch new file mode 100644 index 0000000000..4824344f05 --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser/0001-iniparser.pc-Make-libpath-a-variable.patch @@ -0,0 +1,23 @@ +From 1761298b73c759c07e4652ada307f68512a75ff1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 25 Mar 2022 20:44:41 -0700 +Subject: [PATCH] iniparser.pc: Make libpath a variable + +Will set according to baselib that yocto exports. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + iniparser.pc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/iniparser.pc ++++ b/iniparser.pc +@@ -1,6 +1,6 @@ + prefix=/usr + exec_prefix=/usr +-libdir=${exec_prefix}/lib ++libdir=${exec_prefix}/@baselib@ + includedir=${prefix}/include + datarootdir=${prefix}/share + datadir=${datarootdir} diff --git a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch index b666f00f70..46c1b0f7ac 100644 --- a/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch +++ b/meta-oe/recipes-support/iniparser/iniparser/Add-CMake-support.patch @@ -4,6 +4,8 @@ Date: Thu, 13 Feb 2014 07:03:26 -0500 Subject: Add CMake support. --- +Upstream-Status: Pending + CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 CMakeLists.txt diff --git a/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch b/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch new file mode 100644 index 0000000000..db5fb06aac --- /dev/null +++ b/meta-oe/recipes-support/iniparser/iniparser/CVE-2023-33461.patch @@ -0,0 +1,48 @@ +CVE: CVE-2023-33461 +Upstream-Status: Backport [https://github.com/ndevilla/iniparser/pull/146/commits/ace9871f65d11b5d73f0b9ee8cf5d2807439442d] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> + + +From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001 +From: Antonio <antoniolrt@gmail.com> +Date: Fri, 2 Jun 2023 15:03:10 -0300 +Subject: [PATCH] Handle null return from iniparser_getstring + +Fix handling of NULL returns from iniparser_getstring in +iniparser_getboolean, iniparser_getlongint and iniparser_getdouble, +avoiding a crash. +--- + src/iniparser.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/iniparser.c b/src/iniparser.c +index f1d1658..dbceb20 100644 +--- a/src/iniparser.c ++++ b/src/iniparser.c +@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return strtol(str, NULL, 0); + } + +@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou + const char * str ; + + str = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (str==INI_INVALID_KEY) return notfound ; ++ if (str==NULL || str==INI_INVALID_KEY) return notfound ; + return atof(str); + } + +@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound) + const char * c ; + + c = iniparser_getstring(d, key, INI_INVALID_KEY); +- if (c==INI_INVALID_KEY) return notfound ; ++ if (c==NULL || c==INI_INVALID_KEY) return notfound ; + if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') { + ret = 1 ; + } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') { diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb index f3593fb5ff..c80668d279 100644 --- a/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ b/meta-oe/recipes-support/iniparser/iniparser_4.1.bb @@ -6,12 +6,23 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac" DEPENDS = "doxygen-native" +PV .= "+git" + SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ - file://Add-CMake-support.patch" + file://0001-iniparser.pc-Make-libpath-a-variable.patch \ + file://Add-CMake-support.patch \ + file://CVE-2023-33461.patch \ +" -# tag 4.1 -SRCREV= "0a38e85c9cde1e099ca3bf70083bd00f89c3e5b6" +SRCREV= "deb85ad4936d4ca32cc2260ce43323d47936410d" S = "${WORKDIR}/git" inherit cmake + +do_install:append() { + install -Dm 0644 ${S}/iniparser.pc ${D}${libdir}/pkgconfig/iniparser.pc + sed -i -e 's,@baselib@,${baselib},g' ${D}${libdir}/pkgconfig/iniparser.pc +} + +BBCLASSEXTEND += "native" |