* [meta-networking][PATCH] ndpi: upgrade 3.4 -> 4.0
@ 2021-09-08 0:15 Changqing Li
2021-09-08 5:36 ` [oe] " Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Changqing Li @ 2021-09-08 0:15 UTC (permalink / raw)
To: openembedded-devel
From: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
.../0001-autogen.sh-not-generate-configure.patch | 12 ++++++++----
.../ntopng/{ndpi_3.4.bb => ndpi_4.0.bb} | 7 +++----
2 files changed, 11 insertions(+), 8 deletions(-)
rename meta-networking/recipes-support/ntopng/{ndpi_3.4.bb => ndpi_4.0.bb} (76%)
diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
index ffc6ec1ef..1cbf059ef 100644
--- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
+++ b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
@@ -8,15 +8,18 @@ Only use autogen.sh to generate configure.ac.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+
+refresh patch to 4.0
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
- autogen.sh | 8 --------
- 1 file changed, 8 deletions(-)
+ autogen.sh | 9 ---------
+ 1 file changed, 9 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index df734ce9..d7bbf8cb 100755
+index cf5d7057..cb73cf9d 100755
--- a/autogen.sh
+++ b/autogen.sh
-@@ -52,11 +52,3 @@ cat configure.seed | sed \
+@@ -52,12 +52,3 @@ cat configure.seed | sed \
-e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
-e "s/@FUZZY@/$FUZZY/g" \
> configure.ac
@@ -25,6 +28,7 @@ index df734ce9..d7bbf8cb 100755
-cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp
-cat configure.tmp > configure
-
+-echo "./configure $@"
-chmod +x configure
-./configure $@
-
diff --git a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb
similarity index 76%
rename from meta-networking/recipes-support/ntopng/ndpi_3.4.bb
rename to meta-networking/recipes-support/ntopng/ndpi_4.0.bb
index 89450f562..24de044c0 100644
--- a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb
+++ b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb
@@ -3,15 +3,14 @@ DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \
inspection. Based on OpenDPI it includes ntop extensions"
SECTION = "libdevel"
-DEPENDS = "libpcap"
+DEPENDS = "libpcap json-c"
RDEPENDS:${PN} += " libpcap"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
-SRCREV = "64929a75e0a7a60d864bd25a9fd97fdf9ac892a2"
-SRC_URI = "git://github.com/ntop/nDPI.git;branch=3.4-stable \
+SRCREV = "b8806bd2de7391abee18353e9a99ee4aec13887c"
+SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable \
file://0001-autogen.sh-not-generate-configure.patch \
- file://CVE-2021-36082.patch \
"
S = "${WORKDIR}/git"
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [oe] [meta-networking][PATCH] ndpi: upgrade 3.4 -> 4.0
2021-09-08 0:15 [meta-networking][PATCH] ndpi: upgrade 3.4 -> 4.0 Changqing Li
@ 2021-09-08 5:36 ` Khem Raj
2021-09-08 5:48 ` Changqing Li
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-09-08 5:36 UTC (permalink / raw)
To: Changqing Li; +Cc: openembeded-devel
This update fails ntopng see
https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1516
Can you look into ti ? perhaps this needs to be upgraded too.
On Tue, Sep 7, 2021 at 5:19 PM Changqing Li <changqing.li@windriver.com> wrote:
>
> From: Changqing Li <changqing.li@windriver.com>
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
> .../0001-autogen.sh-not-generate-configure.patch | 12 ++++++++----
> .../ntopng/{ndpi_3.4.bb => ndpi_4.0.bb} | 7 +++----
> 2 files changed, 11 insertions(+), 8 deletions(-)
> rename meta-networking/recipes-support/ntopng/{ndpi_3.4.bb => ndpi_4.0.bb} (76%)
>
> diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
> index ffc6ec1ef..1cbf059ef 100644
> --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
> +++ b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
> @@ -8,15 +8,18 @@ Only use autogen.sh to generate configure.ac.
> Upstream-Status: Inappropriate [embedded specific]
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> +
> +refresh patch to 4.0
> +Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
> - autogen.sh | 8 --------
> - 1 file changed, 8 deletions(-)
> + autogen.sh | 9 ---------
> + 1 file changed, 9 deletions(-)
>
> diff --git a/autogen.sh b/autogen.sh
> -index df734ce9..d7bbf8cb 100755
> +index cf5d7057..cb73cf9d 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> -@@ -52,11 +52,3 @@ cat configure.seed | sed \
> +@@ -52,12 +52,3 @@ cat configure.seed | sed \
> -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
> -e "s/@FUZZY@/$FUZZY/g" \
> > configure.ac
> @@ -25,6 +28,7 @@ index df734ce9..d7bbf8cb 100755
> -cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp
> -cat configure.tmp > configure
> -
> +-echo "./configure $@"
> -chmod +x configure
> -./configure $@
> -
> diff --git a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb
> similarity index 76%
> rename from meta-networking/recipes-support/ntopng/ndpi_3.4.bb
> rename to meta-networking/recipes-support/ntopng/ndpi_4.0.bb
> index 89450f562..24de044c0 100644
> --- a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb
> +++ b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb
> @@ -3,15 +3,14 @@ DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \
> inspection. Based on OpenDPI it includes ntop extensions"
>
> SECTION = "libdevel"
> -DEPENDS = "libpcap"
> +DEPENDS = "libpcap json-c"
> RDEPENDS:${PN} += " libpcap"
> LICENSE = "GPLv3"
> LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
>
> -SRCREV = "64929a75e0a7a60d864bd25a9fd97fdf9ac892a2"
> -SRC_URI = "git://github.com/ntop/nDPI.git;branch=3.4-stable \
> +SRCREV = "b8806bd2de7391abee18353e9a99ee4aec13887c"
> +SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable \
> file://0001-autogen.sh-not-generate-configure.patch \
> - file://CVE-2021-36082.patch \
> "
>
> S = "${WORKDIR}/git"
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [oe] [meta-networking][PATCH] ndpi: upgrade 3.4 -> 4.0
2021-09-08 5:36 ` [oe] " Khem Raj
@ 2021-09-08 5:48 ` Changqing Li
0 siblings, 0 replies; 3+ messages in thread
From: Changqing Li @ 2021-09-08 5:48 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
On 9/8/21 1:36 PM, Khem Raj wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
>
> This update fails ntopng see
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1516
>
> Can you look into ti ? perhaps this needs to be upgraded too.
OK, I will check this.
>
> On Tue, Sep 7, 2021 at 5:19 PM Changqing Li <changqing.li@windriver.com> wrote:
>> From: Changqing Li <changqing.li@windriver.com>
>>
>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> ---
>> .../0001-autogen.sh-not-generate-configure.patch | 12 ++++++++----
>> .../ntopng/{ndpi_3.4.bb => ndpi_4.0.bb} | 7 +++----
>> 2 files changed, 11 insertions(+), 8 deletions(-)
>> rename meta-networking/recipes-support/ntopng/{ndpi_3.4.bb => ndpi_4.0.bb} (76%)
>>
>> diff --git a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
>> index ffc6ec1ef..1cbf059ef 100644
>> --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
>> +++ b/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch
>> @@ -8,15 +8,18 @@ Only use autogen.sh to generate configure.ac.
>> Upstream-Status: Inappropriate [embedded specific]
>>
>> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>> +
>> +refresh patch to 4.0
>> +Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> ---
>> - autogen.sh | 8 --------
>> - 1 file changed, 8 deletions(-)
>> + autogen.sh | 9 ---------
>> + 1 file changed, 9 deletions(-)
>>
>> diff --git a/autogen.sh b/autogen.sh
>> -index df734ce9..d7bbf8cb 100755
>> +index cf5d7057..cb73cf9d 100755
>> --- a/autogen.sh
>> +++ b/autogen.sh
>> -@@ -52,11 +52,3 @@ cat configure.seed | sed \
>> +@@ -52,12 +52,3 @@ cat configure.seed | sed \
>> -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
>> -e "s/@FUZZY@/$FUZZY/g" \
>> > configure.ac
>> @@ -25,6 +28,7 @@ index df734ce9..d7bbf8cb 100755
>> -cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp
>> -cat configure.tmp > configure
>> -
>> +-echo "./configure $@"
>> -chmod +x configure
>> -./configure $@
>> -
>> diff --git a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb
>> similarity index 76%
>> rename from meta-networking/recipes-support/ntopng/ndpi_3.4.bb
>> rename to meta-networking/recipes-support/ntopng/ndpi_4.0.bb
>> index 89450f562..24de044c0 100644
>> --- a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb
>> +++ b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb
>> @@ -3,15 +3,14 @@ DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \
>> inspection. Based on OpenDPI it includes ntop extensions"
>>
>> SECTION = "libdevel"
>> -DEPENDS = "libpcap"
>> +DEPENDS = "libpcap json-c"
>> RDEPENDS:${PN} += " libpcap"
>> LICENSE = "GPLv3"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
>>
>> -SRCREV = "64929a75e0a7a60d864bd25a9fd97fdf9ac892a2"
>> -SRC_URI = "git://github.com/ntop/nDPI.git;branch=3.4-stable \
>> +SRCREV = "b8806bd2de7391abee18353e9a99ee4aec13887c"
>> +SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable \
>> file://0001-autogen.sh-not-generate-configure.patch \
>> - file://CVE-2021-36082.patch \
>> "
>>
>> S = "${WORKDIR}/git"
>> --
>> 2.17.1
>>
>>
>>
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-08 5:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-08 0:15 [meta-networking][PATCH] ndpi: upgrade 3.4 -> 4.0 Changqing Li
2021-09-08 5:36 ` [oe] " Khem Raj
2021-09-08 5:48 ` Changqing Li
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.