All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/sngrep: bump to version 1.6.0
@ 2022-10-28 21:48 Fabrice Fontaine
  2022-10-30 16:16 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-10-28 21:48 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

- Drop patch (already in version)
- pcre2 is an optional dependency since
  https://github.com/irontec/sngrep/commit/cac42deab5e94661e2495399bc40eaf75e0b46bc
- zlib is an optional dependency since
  https://github.com/irontec/sngrep/commit/c02f439d73f33c727909131cb4d9d01029d7492f

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...nssl.h-fix-build-with-libressl-3.5.0.patch | 40 -------------------
 package/sngrep/sngrep.hash                    |  6 +--
 package/sngrep/sngrep.mk                      | 21 +++++++---
 3 files changed, 19 insertions(+), 48 deletions(-)
 delete mode 100644 package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch

diff --git a/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch b/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
deleted file mode 100644
index 7dbb29ab00..0000000000
--- a/package/sngrep/0001-src-capture_openssl.h-fix-build-with-libressl-3.5.0.patch
+++ /dev/null
@@ -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
diff --git a/package/sngrep/sngrep.hash b/package/sngrep/sngrep.hash
index 33fa91ef5e..60a32022e6 100644
--- a/package/sngrep/sngrep.hash
+++ b/package/sngrep/sngrep.hash
@@ -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
diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
index 841a7bb991..7b614f1770 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -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))
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/sngrep: bump to version 1.6.0
  2022-10-28 21:48 [Buildroot] [PATCH 1/1] package/sngrep: bump to version 1.6.0 Fabrice Fontaine
@ 2022-10-30 16:16 ` Yann E. MORIN
  0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2022-10-30 16:16 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

Fabrice, All,

On 2022-10-28 23:48 +0200, Fabrice Fontaine spake thusly:
> - Drop patch (already in version)
> - pcre2 is an optional dependency since
>   https://github.com/irontec/sngrep/commit/cac42deab5e94661e2495399bc40eaf75e0b46bc
> - zlib is an optional dependency since
>   https://github.com/irontec/sngrep/commit/c02f439d73f33c727909131cb4d9d01029d7492f
> 
> https://github.com/irontec/sngrep/blob/v1.6.0/ChangeLog
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
[--SNIP--]
> diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
> index 841a7bb991..7b614f1770 100644
> --- a/package/sngrep/sngrep.mk
> +++ b/package/sngrep/sngrep.mk
> @@ -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 

    $ make check-package
    WARNING: package/sngrep/sngrep.mk:35: line contains trailing whitespace
    WARNING: package/sngrep/sngrep.mk:45: line contains trailing whitespace

Applied to master with those fixed, thanks.

Regards,
Yann E. MORIN.

> +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))
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-30 16:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-28 21:48 [Buildroot] [PATCH 1/1] package/sngrep: bump to version 1.6.0 Fabrice Fontaine
2022-10-30 16:16 ` Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.