diff options
| author |   Changqing Li <changqing.li@windriver.com> | 2021-09-10 09:59:03 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-09-09 20:25:10 -0700 |
| commit | 8359cf87458d185011831a8132b8af17bcbc9605 (patch) | |
| tree | 739e28360e4f736efdf0ccf379e430a058096c77 | |
| parent | aca0b06856314aa7ff244d363923e2bbf94e6369 (diff) | |
| download | meta-openembedded-contrib-8359cf87458d185011831a8132b8af17bcbc9605.tar.gz | |
ndpi: upgrade 3.4 -> 4.0
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch | 12 | ||||
| -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. 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 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 \ 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 = "dabab0e9515c2e6a71a91bdc807453e416f831ca" +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" |