diff options
| -rw-r--r-- | meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch | 35 | ||||
| -rw-r--r-- | meta-networking/recipes-support/ntopng/ndpi_5.0.bb (renamed from meta-networking/recipes-support/ntopng/ndpi_4.2.bb) | 10 |
2 files changed, 2 insertions, 43 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 deleted file mode 100644 index d5c7f5f1cc..0000000000 --- a/meta-networking/recipes-support/ntopng/files/0001-autogen.sh-not-generate-configure.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From d482bcc8fca90afc95ac3cbe848a3c9d7ad81ddc Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Wed, 4 Nov 2020 23:37:44 -0800 | ||
| 4 | Subject: [PATCH] autogen.sh: not generate configure | ||
| 5 | |||
| 6 | Only use autogen.sh to generate configure.ac. | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate [embedded specific] | ||
| 9 | |||
| 10 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 11 | |||
| 12 | refresh patch to 4.0 | ||
| 13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 14 | --- | ||
| 15 | autogen.sh | 7 ------- | ||
| 16 | 1 file changed, 7 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/autogen.sh b/autogen.sh | ||
| 19 | index 0aa7507..36e0423 100755 | ||
| 20 | --- a/autogen.sh | ||
| 21 | +++ b/autogen.sh | ||
| 22 | @@ -33,10 +33,3 @@ if test -z $PKG_CONFIG; then | ||
| 23 | echo "pkg-config is missing: please install it (apt-get install pkg-config) and try again" | ||
| 24 | exit | ||
| 25 | fi | ||
| 26 | - | ||
| 27 | -autoreconf -ivf | ||
| 28 | - | ||
| 29 | -echo "./configure $@" | ||
| 30 | -chmod +x configure | ||
| 31 | -./configure $@ | ||
| 32 | - | ||
| 33 | -- | ||
| 34 | 2.25.1 | ||
| 35 | |||
diff --git a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb index 66d24e4cd8..dc31672548 100644 --- a/meta-networking/recipes-support/ntopng/ndpi_4.2.bb +++ b/meta-networking/recipes-support/ntopng/ndpi_5.0.bb | |||
| @@ -8,11 +8,8 @@ RDEPENDS:${PN} += " libpcap" | |||
| 8 | LICENSE = "LGPL-3.0-only" | 8 | LICENSE = "LGPL-3.0-only" |
| 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=b52f2d57d10c4f7ee67a7eb9615d5d24" |
| 10 | 10 | ||
| 11 | SRCREV = "8b5c6af71b562549f8416b31803daae223e09f46" | 11 | SRCREV = "375f99ef9fb4999d778b57bbeece171b3fa9fba6" |
| 12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=4.2-stable;protocol=https \ | 12 | SRC_URI = "git://github.com/ntop/nDPI.git;branch=5.0-stable;protocol=https;tag=${PV}" |
| 13 | file://0001-autogen.sh-not-generate-configure.patch \ | ||
| 14 | " | ||
| 15 | |||
| 16 | 13 | ||
| 17 | inherit autotools-brokensep pkgconfig | 14 | inherit autotools-brokensep pkgconfig |
| 18 | 15 | ||
| @@ -25,6 +22,3 @@ do_configure:prepend() { | |||
| 25 | EXTRA_OEMAKE = " \ | 22 | EXTRA_OEMAKE = " \ |
| 26 | libdir=${libdir} \ | 23 | libdir=${libdir} \ |
| 27 | " | 24 | " |
| 28 | |||
| 29 | # remove this CVE_STATUS, when the recipe is updated to 4.12 or newer | ||
| 30 | CVE_STATUS[CVE-2025-25066] = "cpe-incorrect: Version 4.2 is not vulnerable yet" | ||
