From 8359cf87458d185011831a8132b8af17bcbc9605 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Fri, 10 Sep 2021 09:59:03 +0800 Subject: ndpi: upgrade 3.4 -> 4.0 Signed-off-by: Changqing Li Signed-off-by: Khem Raj --- .../0001-autogen.sh-not-generate-configure.patch | 12 ++++++--- meta-networking/recipes-support/ntopng/ndpi_3.4.bb | 29 ---------------------- meta-networking/recipes-support/ntopng/ndpi_4.0.bb | 28 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 33 deletions(-) delete mode 100644 meta-networking/recipes-support/ntopng/ndpi_3.4.bb create mode 100644 meta-networking/recipes-support/ntopng/ndpi_4.0.bb 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 + +refresh patch to 4.0 +Signed-off-by: Changqing Li --- - 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_3.4.bb deleted file mode 100644 index 89450f562c..0000000000 --- a/meta-networking/recipes-support/ntopng/ndpi_3.4.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "A library for deep-packet inspection." -DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \ -inspection. Based on OpenDPI it includes ntop extensions" - -SECTION = "libdevel" -DEPENDS = "libpcap" -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 \ - file://0001-autogen.sh-not-generate-configure.patch \ - file://CVE-2021-36082.patch \ -" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig - -CPPFLAGS += "${SELECTED_OPTIMIZATION}" - -do_configure:prepend() { - ${S}/autogen.sh -} - -EXTRA_OEMAKE = " \ - libdir=${libdir} \ -" diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.0.bb b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb new file mode 100644 index 0000000000..aee2d8c6fd --- /dev/null +++ b/meta-networking/recipes-support/ntopng/ndpi_4.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "A library for deep-packet inspection." +DESCRIPTION = "nDPI is an open source LGPLv3 library for deep-packet \ +inspection. Based on OpenDPI it includes ntop extensions" + +SECTION = "libdevel" +DEPENDS = "libpcap json-c" +RDEPENDS:${PN} += " libpcap" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" + +SRCREV = "dabab0e9515c2e6a71a91bdc807453e416f831ca" +SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.0-stable \ + file://0001-autogen.sh-not-generate-configure.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig + +CPPFLAGS += "${SELECTED_OPTIMIZATION}" + +do_configure:prepend() { + ${S}/autogen.sh +} + +EXTRA_OEMAKE = " \ + libdir=${libdir} \ +" -- cgit 1.2.3-korg