Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.11.0
@ 2021-11-01 15:10 Michael Vetter
  2021-11-03 17:53 ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Vetter @ 2021-11-01 15:10 UTC (permalink / raw)
  To: buildroot; +Cc: Michael Vetter

Changes:
  * SASL EXTERNAL support (XEP-0178)
  * Client certificate can be provided for TLS negotiation.
    If the certificate contains a single xmppAddr and JID is not
    provided with xmpp_conn_set_jid(), the xmppAddr is chosen as JID
    element contains "from" attribute over TLS connections now
    GnuTLS can be selected optionally with configure script
  * Support for manual certificate verification
  * New API:
    - xmpp_conn_set_client_cert()
    - xmpp_conn_cert_xmppaddr_num()
    - xmpp_conn_cert_xmppaddr()
    - xmpp_conn_set_cafile()
    - xmpp_conn_set_capath()
    - xmpp_conn_set_certfail_handler()
    - xmpp_conn_get_peer_cert()
    - xmpp_tlscert_get_ctx()
    - xmpp_tlscert_get_conn()
    - xmpp_tlscert_get_pem()
    - xmpp_tlscert_get_dnsname()
    - xmpp_tlscert_get_string()
    - xmpp_tlscert_get_description()
    - xmpp_tlscert_free()

Signed-off-by: Michael Vetter <jubalh@iodoru.org>
---
 package/libstrophe/libstrophe.hash | 2 +-
 package/libstrophe/libstrophe.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash
index d5f151660f..7e211d0a6a 100644
--- a/package/libstrophe/libstrophe.hash
+++ b/package/libstrophe/libstrophe.hash
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256  5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39  libstrophe-0.10.1.tar.gz
+sha256  3605a20f32d7b3193292e238b410d595e01b1d64510f42c108da13c09b60688a  libstrophe-0.10.1.tar.gz
 sha256  82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08  MIT-LICENSE.txt
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  GPL-LICENSE.txt
diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk
index e078eb25cd..718a8dc581 100644
--- a/package/libstrophe/libstrophe.mk
+++ b/package/libstrophe/libstrophe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBSTROPHE_VERSION = 0.10.1
+LIBSTROPHE_VERSION = 0.11.0
 LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION))
 LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf
 # Doesn't ship configure
-- 
2.31.1

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.11.0
@ 2021-11-02 10:19 Fabrice Fontaine
  2021-11-03 17:48 ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2021-11-02 10:19 UTC (permalink / raw)
  To: buildroot; +Cc: Denis Bodor, Michael Vetter, Fabrice Fontaine

- Use official tarball (and so drop autoreconf and first patch)
- gnutls is an optional dependency since
  https://github.com/strophe/libstrophe/commit/e490011b680633b3d4b734cd416b4ae2c21b3cc3

https://github.com/strophe/libstrophe/releases/tag/0.11.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../libstrophe/0001-make-autoreconfable.patch | 20 -------------------
 package/libstrophe/Config.in                  |  2 +-
 package/libstrophe/libstrophe.hash            |  2 +-
 package/libstrophe/libstrophe.mk              | 17 +++++++++++-----
 4 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 package/libstrophe/0001-make-autoreconfable.patch

diff --git a/package/libstrophe/0001-make-autoreconfable.patch b/package/libstrophe/0001-make-autoreconfable.patch
deleted file mode 100644
index 76ca6f25e8..0000000000
--- a/package/libstrophe/0001-make-autoreconfable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Make the package autoreconfigurable
-
-Signed-off-by: Denis Bodor <lefinnois@lefinnois.net>
-[Gustavo: update for 0.8.8]
-
-diff -Nura libstrophe-0.8.8.orig/m4/.empty libstrophe-0.8.8/m4/.empty
---- libstrophe-0.8.8.orig/m4/.empty	1969-12-31 21:00:00.000000000 -0300
-+++ libstrophe-0.8.8/m4/.empty	2015-09-23 19:29:37.893688227 -0300
-@@ -0,0 +1,2 @@
-+
-+
-diff -Nura libstrophe-0.8.8.orig/Makefile.am libstrophe-0.8.8/Makefile.am
---- libstrophe-0.8.8.orig/Makefile.am	2015-09-23 19:26:10.960492781 -0300
-+++ libstrophe-0.8.8/Makefile.am	2015-09-23 19:29:17.265970964 -0300
-@@ -1,4 +1,4 @@
--AUTOMAKE_OPTIONS = subdir-objects
-+AUTOMAKE_OPTIONS = subdir-objects foreign
- 
- ACLOCAL_AMFLAGS = -I m4
- AM_CFLAGS = -g -Wall
diff --git a/package/libstrophe/Config.in b/package/libstrophe/Config.in
index 5fdb918d7a..6ddc70b9f9 100644
--- a/package/libstrophe/Config.in
+++ b/package/libstrophe/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBSTROPHE
 	bool "libstrophe"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBXML2 if !BR2_PACKAGE_EXPAT
 	help
 	  libstrophe is a lightweight XMPP client library written in C.
diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash
index d5f151660f..9551b191c6 100644
--- a/package/libstrophe/libstrophe.hash
+++ b/package/libstrophe/libstrophe.hash
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256  5bf0bbc555cb6059008f1b748370d4d2ee1e1fabd3eeab68475263556405ba39  libstrophe-0.10.1.tar.gz
+sha256  feafee545403d26a44aa573d4adf327d6d07ad3f3466370634d22bbac5bd49ee  libstrophe-0.11.0.tar.xz
 sha256  82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08  MIT-LICENSE.txt
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  GPL-LICENSE.txt
diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk
index e078eb25cd..04ba0a69d0 100644
--- a/package/libstrophe/libstrophe.mk
+++ b/package/libstrophe/libstrophe.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-LIBSTROPHE_VERSION = 0.10.1
-LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION))
-LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf
-# Doesn't ship configure
-LIBSTROPHE_AUTORECONF = YES
+LIBSTROPHE_VERSION = 0.11.0
+LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz
+LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION)
+LIBSTROPHE_DEPENDENCIES = host-pkgconf
 LIBSTROPHE_LICENSE = MIT or GPL-3.0
 LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt
 LIBSTROPHE_INSTALL_STAGING = YES
@@ -21,4 +20,12 @@ LIBSTROPHE_CONF_OPTS += --with-libxml2
 LIBSTROPHE_DEPENDENCIES += libxml2
 endif
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBSTROPHE_CONF_OPTS += --with-tls --without-gnutls
+LIBSTROPHE_DEPENDENCIES += openssl
+else
+LIBSTROPHE_CONF_OPTS += --with-gnutls --without-tls
+LIBSTROPHE_DEPENDENCIES += gnutls
+endif
+
 $(eval $(autotools-package))
-- 
2.33.0

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

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.11.0
  2021-11-02 10:19 [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.11.0 Fabrice Fontaine
@ 2021-11-03 17:48 ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2021-11-03 17:48 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Denis Bodor, Michael Vetter, buildroot

On Tue,  2 Nov 2021 11:19:20 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> - Use official tarball (and so drop autoreconf and first patch)
> - gnutls is an optional dependency since
>   https://github.com/strophe/libstrophe/commit/e490011b680633b3d4b734cd416b4ae2c21b3cc3
> 
> https://github.com/strophe/libstrophe/releases/tag/0.11.0
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  .../libstrophe/0001-make-autoreconfable.patch | 20 -------------------
>  package/libstrophe/Config.in                  |  2 +-
>  package/libstrophe/libstrophe.hash            |  2 +-
>  package/libstrophe/libstrophe.mk              | 17 +++++++++++-----
>  4 files changed, 14 insertions(+), 27 deletions(-)
>  delete mode 100644 package/libstrophe/0001-make-autoreconfable.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.11.0
  2021-11-01 15:10 Michael Vetter
@ 2021-11-03 17:53 ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2021-11-03 17:53 UTC (permalink / raw)
  To: Michael Vetter; +Cc: buildroot

Hello Michael,

On Mon,  1 Nov 2021 16:10:05 +0100
Michael Vetter <jubalh@iodoru.org> wrote:

> Changes:
>   * SASL EXTERNAL support (XEP-0178)
>   * Client certificate can be provided for TLS negotiation.
>     If the certificate contains a single xmppAddr and JID is not
>     provided with xmpp_conn_set_jid(), the xmppAddr is chosen as JID
>     element contains "from" attribute over TLS connections now
>     GnuTLS can be selected optionally with configure script
>   * Support for manual certificate verification
>   * New API:
>     - xmpp_conn_set_client_cert()
>     - xmpp_conn_cert_xmppaddr_num()
>     - xmpp_conn_cert_xmppaddr()
>     - xmpp_conn_set_cafile()
>     - xmpp_conn_set_capath()
>     - xmpp_conn_set_certfail_handler()
>     - xmpp_conn_get_peer_cert()
>     - xmpp_tlscert_get_ctx()
>     - xmpp_tlscert_get_conn()
>     - xmpp_tlscert_get_pem()
>     - xmpp_tlscert_get_dnsname()
>     - xmpp_tlscert_get_string()
>     - xmpp_tlscert_get_description()
>     - xmpp_tlscert_free()
> 
> Signed-off-by: Michael Vetter <jubalh@iodoru.org>
> ---
>  package/libstrophe/libstrophe.hash | 2 +-
>  package/libstrophe/libstrophe.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Sorry, I applied a more recent and different patch from Fabrice doing
the same version bump.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-03 17:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-02 10:19 [Buildroot] [PATCH 1/1] package/libstrophe: bump to version 0.11.0 Fabrice Fontaine
2021-11-03 17:48 ` Thomas Petazzoni
  -- strict thread matches above, loose matches on Subject: below --
2021-11-01 15:10 Michael Vetter
2021-11-03 17:53 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox