Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ndpi: update to 3.4
@ 2021-05-05  4:43 heliocat
  2021-05-05  4:52 ` heliocat
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: heliocat @ 2021-05-05  4:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages ndpi
https://github.com/void-linux/void-packages/pull/30688

ndpi: update to 3.4
Found as part of the great package linting project.

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/30688.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ndpi-30688.patch --]
[-- Type: text/x-diff, Size: 2175 bytes --]

From 147545600de9b858913530ba05b8ec6d58582e23 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
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 <Vaelatern@voidlinux.org>"
-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() {

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-05-09  4:04 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-05  4:43 [PR PATCH] ndpi: update to 3.4 heliocat
2021-05-05  4:52 ` heliocat
2021-05-05 14:32 ` ericonr
2021-05-05 16:02 ` heliocat
2021-05-05 16:24 ` Vaelatern
2021-05-05 16:32 ` ericonr
2021-05-05 16:34 ` ericonr
2021-05-09  4:04 ` [PR PATCH] [Merged]: " ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).