All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
@ 2020-04-16 14:16 Gregory Vimont
  2020-04-16 14:16 ` [meta-oe][PATCH 2/3] opencv: Fix CVE-2019-15939 Gregory Vimont
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Gregory Vimont @ 2020-04-16 14:16 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Gregory Vimont

Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
---
 .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb}             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)

diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
similarity index 98%
rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
index d781da600..5074eb2fa 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
@@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
 
-SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
-SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
+SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
+SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
 SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
 SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
 SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
@@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
            file://download.patch \
            "
-PV = "4.1.0"
+PV = "4.1.1"
 
 S = "${WORKDIR}/git"
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [meta-oe][PATCH 2/3] opencv: Fix CVE-2019-15939
  2020-04-16 14:16 [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Gregory Vimont
@ 2020-04-16 14:16 ` Gregory Vimont
  2020-04-16 14:16 ` [meta-oe][PATCH 3/3] opencv: Fix CVE-2019-5063 and CVE-2019-5064 Gregory Vimont
  2020-04-16 18:38 ` [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Khem Raj
  2 siblings, 0 replies; 9+ messages in thread
From: Gregory Vimont @ 2020-04-16 14:16 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Gregory Vimont

Fixes a floating point exception
https://github.com/opencv/opencv/issues/15287

Upstream-Status: Backport
[https://github.com/opencv/opencv/commit/c05595e48274188e34a30d37ef22bdedc87c53ae]
CVE: CVE-2019-15939
Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
---
 .../opencv/opencv/CVE-2019-15939.patch        | 67 +++++++++++++++++++
 .../recipes-support/opencv/opencv_4.1.1.bb    |  1 +
 2 files changed, 68 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/CVE-2019-15939.patch

diff --git a/meta-oe/recipes-support/opencv/opencv/CVE-2019-15939.patch b/meta-oe/recipes-support/opencv/opencv/CVE-2019-15939.patch
new file mode 100644
index 000000000..b1e996df3
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/CVE-2019-15939.patch
@@ -0,0 +1,67 @@
+From 5a497077f109d543ab86dfdf8add1c76c0e47d29 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@intel.com>
+Date: Fri, 23 Aug 2019 16:14:53 +0300
+Subject: [PATCH] objdetect: add input check in HOG detector
+
+---
+ modules/objdetect/src/hog.cpp | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/modules/objdetect/src/hog.cpp b/modules/objdetect/src/hog.cpp
+index 9524851eebb..378bab30876 100644
+--- a/modules/objdetect/src/hog.cpp
++++ b/modules/objdetect/src/hog.cpp
+@@ -68,6 +68,7 @@ enum {DESCR_FORMAT_COL_BY_COL, DESCR_FORMAT_ROW_BY_ROW};
+ 
+ static int numPartsWithin(int size, int part_size, int stride)
+ {
++    CV_Assert(stride != 0);
+     return (size - part_size + stride) / stride;
+ }
+ 
+@@ -80,13 +81,17 @@ static Size numPartsWithin(cv::Size size, cv::Size part_size,
+ 
+ static size_t getBlockHistogramSize(Size block_size, Size cell_size, int nbins)
+ {
++    CV_Assert(!cell_size.empty());
+     Size cells_per_block = Size(block_size.width / cell_size.width,
+-        block_size.height / cell_size.height);
++                                block_size.height / cell_size.height);
+     return (size_t)(nbins * cells_per_block.area());
+ }
+ 
+ size_t HOGDescriptor::getDescriptorSize() const
+ {
++    CV_Assert(!cellSize.empty());
++    CV_Assert(!blockStride.empty());
++
+     CV_Assert(blockSize.width % cellSize.width == 0 &&
+         blockSize.height % cellSize.height == 0);
+     CV_Assert((winSize.width - blockSize.width) % blockStride.width == 0 &&
+@@ -144,20 +149,20 @@ bool HOGDescriptor::read(FileNode& obj)
+     if( !obj.isMap() )
+         return false;
+     FileNodeIterator it = obj["winSize"].begin();
+-    it >> winSize.width >> winSize.height;
++    it >> winSize.width >> winSize.height; CV_Assert(!winSize.empty());
+     it = obj["blockSize"].begin();
+-    it >> blockSize.width >> blockSize.height;
++    it >> blockSize.width >> blockSize.height; CV_Assert(!blockSize.empty());
+     it = obj["blockStride"].begin();
+-    it >> blockStride.width >> blockStride.height;
++    it >> blockStride.width >> blockStride.height; CV_Assert(!blockStride.empty());
+     it = obj["cellSize"].begin();
+-    it >> cellSize.width >> cellSize.height;
+-    obj["nbins"] >> nbins;
++    it >> cellSize.width >> cellSize.height; CV_Assert(!cellSize.empty());
++    obj["nbins"] >> nbins; CV_Assert(nbins > 0);
+     obj["derivAperture"] >> derivAperture;
+     obj["winSigma"] >> winSigma;
+     obj["histogramNormType"] >> histogramNormType;
+     obj["L2HysThreshold"] >> L2HysThreshold;
+     obj["gammaCorrection"] >> gammaCorrection;
+-    obj["nlevels"] >> nlevels;
++    obj["nlevels"] >> nlevels; CV_Assert(nlevels > 0);
+     if (obj["signedGradient"].empty())
+         signedGradient = false;
+     else
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.1.bb b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
index 5074eb2fa..c77c7ff80 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
@@ -50,6 +50,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            file://0001-Dont-use-isystem.patch \
            file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
            file://download.patch \
+           file://CVE-2019-15939.patch \
            "
 PV = "4.1.1"
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [meta-oe][PATCH 3/3] opencv: Fix CVE-2019-5063 and CVE-2019-5064
  2020-04-16 14:16 [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Gregory Vimont
  2020-04-16 14:16 ` [meta-oe][PATCH 2/3] opencv: Fix CVE-2019-15939 Gregory Vimont
@ 2020-04-16 14:16 ` Gregory Vimont
  2020-04-16 18:38 ` [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Khem Raj
  2 siblings, 0 replies; 9+ messages in thread
From: Gregory Vimont @ 2020-04-16 14:16 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Gregory Vimont

Upstream-Status: Backport [https://github.com/opencv/opencv/commit/f42d5399aac80d371b17d689851406669c9b9111]
CVE: CVE-2019-5063
CVE: CVE-2019-5064
Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
---
 .../opencv/opencv/CVE-2019-5063.patch         | 35 ++++++++++++++
 .../opencv/opencv/CVE-2019-5064.patch         | 47 +++++++++++++++++++
 .../recipes-support/opencv/opencv_4.1.1.bb    |  2 +
 3 files changed, 84 insertions(+)
 create mode 100644 meta-oe/recipes-support/opencv/opencv/CVE-2019-5063.patch
 create mode 100644 meta-oe/recipes-support/opencv/opencv/CVE-2019-5064.patch

diff --git a/meta-oe/recipes-support/opencv/opencv/CVE-2019-5063.patch b/meta-oe/recipes-support/opencv/opencv/CVE-2019-5063.patch
new file mode 100644
index 000000000..a2431c333
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/CVE-2019-5063.patch
@@ -0,0 +1,35 @@
+From 161a6f06099f842dd4b5e499ddd6ce9daf643e40 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@intel.com>
+Date: Thu, 7 Nov 2019 14:01:51 +0300
+Subject: [PATCH] core(persistence): add more checks for implementation
+ limitations
+ 
+---
+ modules/core/src/persistence_xml.cpp  | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modules/core/src/persistence_xml.cpp b/modules/core/src/persistence_xml.cpp
+index 89876dd3da..52b5374425 100644
+--- a/modules/core/src/persistence_xml.cpp
++++ b/modules/core/src/persistence_xml.cpp
+@@ -627,6 +627,8 @@ public:
+                                         c = '\"';
+                                     else
+                                     {
++                                        if (len + 2 + i >= CV_FS_MAX_LEN)
++                                            CV_PARSE_ERROR_CPP("string is too long");
+                                         memcpy( strbuf + i, ptr-1, len + 2 );
+                                         i += len + 2;
+                                     }
+@@ -635,9 +637,9 @@ public:
+                                 CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG_CPP();
+                             }
+                         }
++                        if (i + 1 >= CV_FS_MAX_LEN)
++                            CV_PARSE_ERROR_CPP("Too long string literal");
+                         strbuf[i++] = c;
+-                        if( i >= CV_FS_MAX_LEN )
+-                            CV_PARSE_ERROR_CPP( "Too long string literal" );
+                     }
+                     elem->setValue(FileNode::STRING, strbuf, i);
+                 }
diff --git a/meta-oe/recipes-support/opencv/opencv/CVE-2019-5064.patch b/meta-oe/recipes-support/opencv/opencv/CVE-2019-5064.patch
new file mode 100644
index 000000000..1bf81c9b6
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/CVE-2019-5064.patch
@@ -0,0 +1,47 @@
+From 161a6f06099f842dd4b5e499ddd6ce9daf643e40 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@intel.com>
+Date: Thu, 7 Nov 2019 14:01:51 +0300
+Subject: [PATCH] core(persistence): add more checks for implementation
+ limitations
+ 
+---
+ modules/core/src/persistence_json.cpp | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/modules/core/src/persistence_json.cpp b/modules/core/src/persistence_json.cpp
+index 89914e6534..2efdf17d3f 100644
+--- a/modules/core/src/persistence_json.cpp
++++ b/modules/core/src/persistence_json.cpp
+@@ -578,10 +578,14 @@ public:
+                             sz = (int)(ptr - beg);
+                             if( sz > 0 )
+                             {
++                                if (i + sz >= CV_FS_MAX_LEN)
++                                    CV_PARSE_ERROR_CPP("string is too long");
+                                 memcpy(buf + i, beg, sz);
+                                 i += sz;
+                             }
+                             ptr++;
++                            if (i + 1 >= CV_FS_MAX_LEN)
++                                CV_PARSE_ERROR_CPP("string is too long");
+                             switch ( *ptr )
+                             {
+                             case '\\':
+@@ -605,6 +609,8 @@ public:
+                             sz = (int)(ptr - beg);
+                             if( sz > 0 )
+                             {
++                                if (i + sz >= CV_FS_MAX_LEN)
++                                    CV_PARSE_ERROR_CPP("string is too long");
+                                 memcpy(buf + i, beg, sz);
+                                 i += sz;
+                             }
+@@ -620,6 +626,8 @@ public:
+                             sz = (int)(ptr - beg);
+                             if( sz > 0 )
+                             {
++                                if (i + sz >= CV_FS_MAX_LEN)
++                                    CV_PARSE_ERROR_CPP("string is too long");
+                                 memcpy(buf + i, beg, sz);
+                                 i += sz;
+                             }
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.1.bb b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
index c77c7ff80..1b6a6c9fa 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
@@ -51,6 +51,8 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
            file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
            file://download.patch \
            file://CVE-2019-15939.patch \
+           file://CVE-2019-5063.patch \
+           file://CVE-2019-5064.patch \
            "
 PV = "4.1.1"
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
  2020-04-16 14:16 [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Gregory Vimont
  2020-04-16 14:16 ` [meta-oe][PATCH 2/3] opencv: Fix CVE-2019-15939 Gregory Vimont
  2020-04-16 14:16 ` [meta-oe][PATCH 3/3] opencv: Fix CVE-2019-5063 and CVE-2019-5064 Gregory Vimont
@ 2020-04-16 18:38 ` Khem Raj
  2020-04-16 19:06   ` Martin Jansa
  2020-04-17  7:57   ` Gregory Vimont
  2 siblings, 2 replies; 9+ messages in thread
From: Khem Raj @ 2020-04-16 18:38 UTC (permalink / raw)
  To: Gregory Vimont; +Cc: openembeded-devel, Gregory Vimont

This fails on mips/glibc

https://errors.yoctoproject.org/Errors/Details/404685/


On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont <gregory.vimont@gmail.com> wrote:
>
> Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
> ---
>  .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb}             | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> similarity index 98%
> rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> index d781da600..5074eb2fa 100644
> --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
>
>  DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
>
> -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
> -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
> +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
> +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
>  SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
>  SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
>  SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
> @@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
>             file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
>             file://download.patch \
>             "
> -PV = "4.1.0"
> +PV = "4.1.1"
>
>  S = "${WORKDIR}/git"
>
> --
> 2.17.1
>
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
  2020-04-16 18:38 ` [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Khem Raj
@ 2020-04-16 19:06   ` Martin Jansa
  2020-04-17  8:01     ` Gregory Vimont
  2020-04-17  7:57   ` Gregory Vimont
  1 sibling, 1 reply; 9+ messages in thread
From: Martin Jansa @ 2020-04-16 19:06 UTC (permalink / raw)
  To: Khem Raj; +Cc: Gregory Vimont, openembeded-devel, Gregory Vimont

[-- Attachment #1: Type: text/plain, Size: 2092 bytes --]

On Thu, Apr 16, 2020 at 11:38:24AM -0700, Khem Raj wrote:
> This fails on mips/glibc
> 
> https://errors.yoctoproject.org/Errors/Details/404685/
> 
> 
> On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont <gregory.vimont@gmail.com> wrote:
> >
> > Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
> > ---
> >  .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb}             | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >  rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)
> >
> > diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > similarity index 98%
> > rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> > rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > index d781da600..5074eb2fa 100644
> > --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> > +++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
> >
> >  DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
> >
> > -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
> > -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
> > +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
> > +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
> >  SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
> >  SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
> >  SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
> > @@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
> >             file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
> >             file://download.patch \
> >             "
> > -PV = "4.1.0"
> > +PV = "4.1.1"

Gregory,

was there a reason for 4.1.1 + backports instead of 4.2.0 version
released in December 2019?

Or 4.1.2 from Octobver 2019 if 4.2.x is breaking too many things.

Cheers,

> >  S = "${WORKDIR}/git"
> >
> > --
> > 2.17.1
> >
> > 

> 


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 201 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
  2020-04-16 18:38 ` [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Khem Raj
  2020-04-16 19:06   ` Martin Jansa
@ 2020-04-17  7:57   ` Gregory Vimont
  2020-04-21 12:51     ` Gregory Vimont
  1 sibling, 1 reply; 9+ messages in thread
From: Gregory Vimont @ 2020-04-17  7:57 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel, Gregory Vimont

[-- Attachment #1: Type: text/plain, Size: 1979 bytes --]

I don't know what went wrong, I see only Warnings there.

Le jeu. 16 avr. 2020 à 20:38, Khem Raj <raj.khem@gmail.com> a écrit :

> This fails on mips/glibc
>
> https://errors.yoctoproject.org/Errors/Details/404685/
>
>
> On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont <gregory.vimont@gmail.com>
> wrote:
> >
> > Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
> > ---
> >  .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb}             | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >  rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb =>
> opencv_4.1.1.bb} (98%)
> >
> > diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > similarity index 98%
> > rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> > rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > index d781da600..5074eb2fa 100644
> > --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> > +++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
> >
> >  DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
> >
> > -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
> > -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
> > +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
> > +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
> >  SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
> >  SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
> >  SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
> > @@ -51,7 +51,7 @@ SRC_URI = "git://
> github.com/opencv/opencv.git;name=opencv \
> >
>  file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
> >             file://download.patch \
> >             "
> > -PV = "4.1.0"
> > +PV = "4.1.1"
> >
> >  S = "${WORKDIR}/git"
> >
> > --
> > 2.17.1
> >
> > 
>

[-- Attachment #2: Type: text/html, Size: 3677 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
  2020-04-16 19:06   ` Martin Jansa
@ 2020-04-17  8:01     ` Gregory Vimont
  0 siblings, 0 replies; 9+ messages in thread
From: Gregory Vimont @ 2020-04-17  8:01 UTC (permalink / raw)
  To: Martin Jansa; +Cc: Khem Raj, openembeded-devel, Gregory Vimont

[-- Attachment #1: Type: text/plain, Size: 2402 bytes --]

I was working on minimal security fixes on my zeus branch.
Later I will update the recipe for openCV 4.3.0.

Le jeu. 16 avr. 2020 à 21:06, Martin Jansa <martin.jansa@gmail.com> a
écrit :

> On Thu, Apr 16, 2020 at 11:38:24AM -0700, Khem Raj wrote:
> > This fails on mips/glibc
> >
> > https://errors.yoctoproject.org/Errors/Details/404685/
> >
> >
> > On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont <gregory.vimont@gmail.com>
> wrote:
> > >
> > > Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
> > > ---
> > >  .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb}             | 6
> +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > >  rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb =>
> opencv_4.1.1.bb} (98%)
> > >
> > > diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > > similarity index 98%
> > > rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> > > rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > > index d781da600..5074eb2fa 100644
> > > --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
> > > +++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
> > > @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
> > >
> > >  DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
> > >
> > > -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
> > > -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
> > > +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
> > > +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
> > >  SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
> > >  SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
> > >  SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
> > > @@ -51,7 +51,7 @@ SRC_URI = "git://
> github.com/opencv/opencv.git;name=opencv \
> > >
>  file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
> > >             file://download.patch \
> > >             "
> > > -PV = "4.1.0"
> > > +PV = "4.1.1"
>
> Gregory,
>
> was there a reason for 4.1.1 + backports instead of 4.2.0 version
> released in December 2019?
>
> Or 4.1.2 from Octobver 2019 if 4.2.x is breaking too many things.
>
> Cheers,
>
> > >  S = "${WORKDIR}/git"
> > >
> > > --
> > > 2.17.1
> > >
> > >
>
> > 
>
>

[-- Attachment #2: Type: text/html, Size: 4279 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
  2020-04-17  7:57   ` Gregory Vimont
@ 2020-04-21 12:51     ` Gregory Vimont
  2020-04-25  7:33       ` Khem Raj
  0 siblings, 1 reply; 9+ messages in thread
From: Gregory Vimont @ 2020-04-21 12:51 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel, Gregory Vimont

[-- Attachment #1: Type: text/plain, Size: 2187 bytes --]

Hello,
How can I reproduce this build configuration ?


Le ven. 17 avr. 2020 à 09:57, Grégory Vimont <gregory.vimont@gmail.com> a
écrit :

> I don't know what went wrong, I see only Warnings there.
>
> Le jeu. 16 avr. 2020 à 20:38, Khem Raj <raj.khem@gmail.com> a écrit :
>
>> This fails on mips/glibc
>>
>> https://errors.yoctoproject.org/Errors/Details/404685/
>>
>>
>> On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont <gregory.vimont@gmail.com>
>> wrote:
>> >
>> > Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
>> > ---
>> >  .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb}             | 6 +++---
>> >  1 file changed, 3 insertions(+), 3 deletions(-)
>> >  rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb =>
>> opencv_4.1.1.bb} (98%)
>> >
>> > diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>> b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>> > similarity index 98%
>> > rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>> > rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>> > index d781da600..5074eb2fa 100644
>> > --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>> > +++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>> > @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
>> >
>> >  DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
>> >
>> > -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
>> > -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
>> > +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
>> > +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
>> >  SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
>> >  SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
>> >  SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
>> > @@ -51,7 +51,7 @@ SRC_URI = "git://
>> github.com/opencv/opencv.git;name=opencv \
>> >
>>  file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
>> >             file://download.patch \
>> >             "
>> > -PV = "4.1.0"
>> > +PV = "4.1.1"
>> >
>> >  S = "${WORKDIR}/git"
>> >
>> > --
>> > 2.17.1
>> >
>> > 
>>
>

[-- Attachment #2: Type: text/html, Size: 4157 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1
  2020-04-21 12:51     ` Gregory Vimont
@ 2020-04-25  7:33       ` Khem Raj
  0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2020-04-25  7:33 UTC (permalink / raw)
  To: Grégory Vimont; +Cc: openembeded-devel, Gregory Vimont

On Tue, Apr 21, 2020 at 5:51 AM Grégory Vimont <gregory.vimont@gmail.com> wrote:
>
> Hello,
> How can I reproduce this build configuration ?
>

MACHINE=qemumips bitbake opencv


>
> Le ven. 17 avr. 2020 à 09:57, Grégory Vimont <gregory.vimont@gmail.com> a écrit :
>>
>> I don't know what went wrong, I see only Warnings there.
>>
>> Le jeu. 16 avr. 2020 à 20:38, Khem Raj <raj.khem@gmail.com> a écrit :
>>>
>>> This fails on mips/glibc
>>>
>>> https://errors.yoctoproject.org/Errors/Details/404685/
>>>
>>>
>>> On Thu, Apr 16, 2020 at 7:17 AM Gregory Vimont <gregory.vimont@gmail.com> wrote:
>>> >
>>> > Signed-off-by: Gregory Vimont <gregory.vimont@softbankrobotics.com>
>>> > ---
>>> >  .../opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb}             | 6 +++---
>>> >  1 file changed, 3 insertions(+), 3 deletions(-)
>>> >  rename meta-oe/recipes-support/opencv/{opencv_4.1.0.bb => opencv_4.1.1.bb} (98%)
>>> >
>>> > diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>>> > similarity index 98%
>>> > rename from meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>>> > rename to meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>>> > index d781da600..5074eb2fa 100644
>>> > --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
>>> > +++ b/meta-oe/recipes-support/opencv/opencv_4.1.1.bb
>>> > @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
>>> >
>>> >  DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
>>> >
>>> > -SRCREV_opencv = "371bba8f54560b374fbcd47e7e02f015ac4969ad"
>>> > -SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7"
>>> > +SRCREV_opencv = "ddbd10c0019f3ee5f43b7902d47e7fc4303a6574"
>>> > +SRCREV_contrib = "0915b7eaddba3c06d83e201c9a7595e73801f417"
>>> >  SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
>>> >  SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
>>> >  SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
>>> > @@ -51,7 +51,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
>>> >             file://0001-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-g.patch \
>>> >             file://download.patch \
>>> >             "
>>> > -PV = "4.1.0"
>>> > +PV = "4.1.1"
>>> >
>>> >  S = "${WORKDIR}/git"
>>> >
>>> > --
>>> > 2.17.1
>>> >
>>> > 

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-25  7:33 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-16 14:16 [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Gregory Vimont
2020-04-16 14:16 ` [meta-oe][PATCH 2/3] opencv: Fix CVE-2019-15939 Gregory Vimont
2020-04-16 14:16 ` [meta-oe][PATCH 3/3] opencv: Fix CVE-2019-5063 and CVE-2019-5064 Gregory Vimont
2020-04-16 18:38 ` [oe] [meta-oe][PATCH 1/3] opencv: 4.1.0 -> 4.1.1 Khem Raj
2020-04-16 19:06   ` Martin Jansa
2020-04-17  8:01     ` Gregory Vimont
2020-04-17  7:57   ` Gregory Vimont
2020-04-21 12:51     ` Gregory Vimont
2020-04-25  7:33       ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.