summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch12
-rw-r--r--meta-networking/recipes-support/ntopng/ndpi_4.0.bb (renamed from meta-networking/recipes-support/ntopng/ndpi_3.4.bb)7
2 files changed, 11 insertions, 8 deletions
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 ffc6ec1efc..1cbf059efd 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.
8Upstream-Status: Inappropriate [embedded specific] 8Upstream-Status: Inappropriate [embedded specific]
9 9
10Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 10Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
11
12refresh patch to 4.0
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
11--- 14---
12 autogen.sh | 8 -------- 15 autogen.sh | 9 ---------
13 1 file changed, 8 deletions(-) 16 1 file changed, 9 deletions(-)
14 17
15diff --git a/autogen.sh b/autogen.sh 18diff --git a/autogen.sh b/autogen.sh
16index df734ce9..d7bbf8cb 100755 19index cf5d7057..cb73cf9d 100755
17--- a/autogen.sh 20--- a/autogen.sh
18+++ b/autogen.sh 21+++ b/autogen.sh
19@@ -52,11 +52,3 @@ cat configure.seed | sed \ 22@@ -52,12 +52,3 @@ cat configure.seed | sed \
20 -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \ 23 -e "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" \
21 -e "s/@FUZZY@/$FUZZY/g" \ 24 -e "s/@FUZZY@/$FUZZY/g" \
22 > configure.ac 25 > configure.ac
@@ -25,6 +28,7 @@ index df734ce9..d7bbf8cb 100755
25-cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp 28-cat configure | sed "s/#define PACKAGE/#define NDPI_PACKAGE/g" | sed "s/#define VERSION/#define NDPI_VERSION/g" > configure.tmp
26-cat configure.tmp > configure 29-cat configure.tmp > configure
27- 30-
31-echo "./configure $@"
28-chmod +x configure 32-chmod +x configure
29-./configure $@ 33-./configure $@
30- 34-
diff --git a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb
index 89450f562c..aee2d8c6fd 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 \
3inspection. Based on OpenDPI it includes ntop extensions" 3inspection. Based on OpenDPI it includes ntop extensions"
4 4
5SECTION = "libdevel" 5SECTION = "libdevel"
6DEPENDS = "libpcap" 6DEPENDS = "libpcap json-c"
7RDEPENDS:${PN} += " libpcap" 7RDEPENDS:${PN} += " libpcap"
8LICENSE = "GPLv3" 8LICENSE = "GPLv3"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" 9LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24"
10 10
11SRCREV = "64929a75e0a7a60d864bd25a9fd97fdf9ac892a2" 11SRCREV = "dabab0e9515c2e6a71a91bdc807453e416f831ca"
12SRC_URI = "git://github.com/ntop/nDPI.git;branch=3.4-stable \ 12SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable \
13 file://0001-autogen.sh-not-generate-configure.patch \ 13 file://0001-autogen.sh-not-generate-configure.patch \
14 file://CVE-2021-36082.patch \
15" 14"
16 15
17S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"