From 147545600de9b858913530ba05b8ec6d58582e23 Mon Sep 17 00:00:00 2001 From: Colin Booth Date: Tue, 4 May 2021 21:41:41 -0700 Subject: [PATCH] ndpi: update to 3.4 --- common/shlibs | 2 +- srcpkgs/ndpi/template | 24 +++++++++++------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/common/shlibs b/common/shlibs index 1b284ac33ef2..7d2a4ad8dc4c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2506,7 +2506,7 @@ libykneomgr.so.0 libykneomgr-0.1.8_1 libopenshot-audio.so.7 libopenshot-audio-0.2.0_1 libopenshot.so.19 libopenshot-0.2.5_3 libpqxx-6.3.so libpqxx-6.3.3_1 -libndpi.so.1 ndpi-1.6_1 +libndpi.so.3 ndpi-3.4_1 liblog.so android-studio-3.0.1_1 libm.so android-studio-3.0.1_1 libdl.so android-studio-3.0.1_1 diff --git a/srcpkgs/ndpi/template b/srcpkgs/ndpi/template index 4990b3353528..43be3ed5ab94 100644 --- a/srcpkgs/ndpi/template +++ b/srcpkgs/ndpi/template @@ -1,26 +1,24 @@ # Template file for 'ndpi' pkgname=ndpi -version=2.2 -revision=4 +version=3.4 +revision=1 wrksrc=nDPI-${version} build_style=gnu-configure hostmakedepends="libtool automake pkg-config" -makedepends="libpcap-devel json-c-devel" +makedepends="libpcap-devel json-c-devel libgcrypt-devel" short_desc="Open Source Deep Packet Inspection Software Toolkit" maintainer="Toyam Cox " -license="LGPL-3" +license="LGPL-3.0-or-later" homepage="http://www.ntop.org/products/ndpi/" distfiles="https://github.com/ntop/nDPI/archive/${version}.tar.gz" -checksum=25607db12f466ba88a1454ef8b378e0e9eb59adffad6baa4b5610859a102a5dd +checksum=dc9b291c7fde94edb45fb0f222e0d93c93f8d6d37f4efba20ebd9c655bfcedf9 -pre_configure() { - # Copied from autogen.sh - local NDPI_MAJOR=${version%.*} - local NDPI_MINOR=${version#*.} - local NDPI_PATCH=0 - local NDPI_VERSION_SHORT=${version}.0 - cat configure.seed | sed "s/@NDPI_MAJOR@/$NDPI_MAJOR/g" | sed "s/@NDPI_MINOR@/$NDPI_MINOR/g" | sed "s/@NDPI_PATCH@/$NDPI_PATCH/g" | sed "s/@NDPI_VERSION_SHORT@/$NDPI_VERSION_SHORT/g" > configure.ac - autoreconf -fi +do_configure() { + ./autogen.sh ${configure_args} +} + +do_check() { + cd tests ; ./do.sh } post_install() {