NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/sngrep: bump to version 1.6.0

Browse Source 
- Drop patch (already in version)
- pcre2 is an optional dependency since
  cac42deab5
- zlib is an optional dependency since
  c02f439d73

https://github.com/irontec/sngrep/blob/v1.6.0/ChangeLog

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2022-10-28 23:48:11 +02:00 committed by Yann E. MORIN
parent e0f40892e9
commit 69c9cc60a1
3 changed files with 19 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
View File

@ -1,40 +0,0 @@
From 4e1406ad0df370ff8bf1d3a81aaadbb1cad2d761 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 29 Apr 2022 18:53:45 +0200
Subject: [PATCH] src/capture_openssl.h: fix build with libressl >= 3.5.0
Fix the following build failure with libressl >= 3.5.0:
capture_openssl.c: In function 'P_hash':
capture_openssl.c:101:18: error: storage size of 'hm' isn't known
101 | HMAC_CTX hm;
| ^~
Fixes:
- http://autobuild.buildroot.org/results/f1e8cdb3ac35a30055ab79d41e6cc038e5339c37
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/irontec/sngrep/commit/4e1406ad0df370ff8bf1d3a81aaadbb1cad2d761]
---
src/capture_openssl.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/capture_openssl.h b/src/capture_openssl.h
index 780de494..1f87a5cd 100644
--- a/src/capture_openssl.h
+++ b/src/capture_openssl.h
@@ -67,10 +67,11 @@
#endif
/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
- * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...)
+ * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...) until
+ * version 3.5.0
*/
#if defined(LIBRESSL_VERSION_NUMBER)
-#define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
+#define MODSSL_USE_OPENSSL_PRE_1_1_API (LIBRESSL_VERSION_NUMBER < 0x30500000L)
#else
#define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
#endif

6
package/sngrep/sngrep.hash
View File

@ -1,6 +1,6 @@
# From https://github.com/irontec/sngrep/releases/download/v1.4.7/sngrep-1.4.7.tar.gz.md5sum
md5 78fe753e24f36ddaf627bc2b734f45ba sngrep-1.4.7.tar.gz
# From https://github.com/irontec/sngrep/releases/download/v1.6.0/sngrep-1.6.0.tar.gz.md5sum
md5 1519ca6cd1167c0722debfb96e2ac173 sngrep-1.6.0.tar.gz
# Locally computed
sha256 3c96aadd8b8c6b7adb5552d6fb4234f2000f15109b0f6c5feb632c81306cc49b sngrep-1.4.7.tar.gz
sha256 fd80964d6560f2ff57b4f5bef2353d1a6f7c48d2f1a5f0a167c854bd2e801999 sngrep-1.6.0.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE

21
package/sngrep/sngrep.mk
View File

@ -4,8 +4,9 @@
#
################################################################################
SNGREP_VERSION = 1.4.7
SNGREP_SITE = $(call github,irontec,sngrep,v$(SNGREP_VERSION))
SNGREP_VERSION = 1.6.0
SNGREP_SITE = \
https://github.com/irontec/sngrep/releases/download/v$(SNGREP_VERSION)
SNGREP_LICENSE = GPL-3.0+
SNGREP_LICENSE_FILES = LICENSE
SNGREP_AUTORECONF = YES
@ -29,11 +30,21 @@ else
SNGREP_CONF_OPTS += --without-gnutls --without-openssl
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
ifeq ($(BR2_PACKAGE_PCRE2),y)
SNGREP_DEPENDENCIES += pcre2
SNGREP_CONF_OPTS += --without-pcre --with-pcre2
else ifeq ($(BR2_PACKAGE_PCRE),y)
SNGREP_DEPENDENCIES += pcre
SNGREP_CONF_OPTS += --with-pcre
SNGREP_CONF_OPTS += --with-pcre --without-pcre2
else
SNGREP_CONF_OPTS += --without-pcre
SNGREP_CONF_OPTS += --without-pcre --without-pcre2
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
SNGREP_DEPENDENCIES += zlib
SNGREP_CONF_OPTS += --with-zlib
else
SNGREP_CONF_OPTS += --without-zlib
endif
$(eval $(autotools-package))