From 63af5252a9e7ea6a676cd4f0773f2ceaf52a1e9d Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Wed, 8 May 2024 15:27:19 +0200 Subject: [PATCH] gloox: make dns.h public Needed in the latest version of Renga. --- net-libs/gloox/gloox-1.0.28.recipe | 2 +- net-libs/gloox/patches/gloox-1.0.28.patchset | 45 +++++++++++++++++--- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/net-libs/gloox/gloox-1.0.28.recipe b/net-libs/gloox/gloox-1.0.28.recipe index b094735db..556fd0c05 100644 --- a/net-libs/gloox/gloox-1.0.28.recipe +++ b/net-libs/gloox/gloox-1.0.28.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Rock-solid, full-featured Jabber/XMPP client library, written in cl HOMEPAGE="https://camaya.net/gloox/" COPYRIGHT="2002-2023 Jakob Schröter" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="http://camaya.net/download/gloox-$portVersion.tar.bz2" CHECKSUM_SHA256="591bd12c249ede0b50a1ef6b99ac0de8ef9c1ba4fd2e186f97a740215cc5966c" PATCHES="gloox-$portVersion.patchset" diff --git a/net-libs/gloox/patches/gloox-1.0.28.patchset b/net-libs/gloox/patches/gloox-1.0.28.patchset index 1e4392a7b..66c45cbd3 100644 --- a/net-libs/gloox/patches/gloox-1.0.28.patchset +++ b/net-libs/gloox/patches/gloox-1.0.28.patchset @@ -1,11 +1,11 @@ -From 14aca6f824c3fa48a0042609083ffa2bb08d9711 Mon Sep 17 00:00:00 2001 +From fbea0d8af83fed0b9304c712ed1abadccaaa7581 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 28 Mar 2020 10:17:16 +0100 Subject: Search for network functions in libnetwork diff --git a/configure.ac b/configure.ac -index 6e707e5..fe84d53 100644 +index a43bf01..880ed23 100644 --- a/configure.ac +++ b/configure.ac @@ -330,7 +330,7 @@ AC_ARG_ENABLE( getaddrinfo, @@ -26,10 +26,10 @@ index 6e707e5..fe84d53 100644 dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -- -2.37.3 +2.43.2 -From f93d15f6b273aabbcd81cf4e8e9e96820a319f25 Mon Sep 17 00:00:00 2001 +From 620c67c5aef9374f00c527e5231c33381a2de356 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 28 Mar 2020 13:10:43 +0100 Subject: Hack for detecting libnetwork internal functions @@ -38,7 +38,7 @@ These functions are found indirectly through #defines in the headers. So a normal AC_SEARCH_LIBS does not work. diff --git a/configure.ac b/configure.ac -index fe84d53..91bd9e0 100644 +index 880ed23..f229077 100644 --- a/configure.ac +++ b/configure.ac @@ -220,7 +220,7 @@ else @@ -69,5 +69,38 @@ index fe84d53..91bd9e0 100644 [AC_MSG_RESULT(yes) AC_DEFINE(HAVE_RES_QUERY) -- -2.37.3 +2.43.2 + + +From c4e790bbe4c9cfb7fcbe4da4ec3e827789dce05b Mon Sep 17 00:00:00 2001 +From: PulkoMandy +Date: Wed, 8 May 2024 13:14:17 +0200 +Subject: Move dns.h to installed headers + +It is needed to implement XEP-0368 + +diff --git a/src/Makefile.am b/src/Makefile.am +index 788d394..4457af1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -51,7 +51,7 @@ libgloox_la_LIBADD = + libgloox_la_CFLAGS = $(CPPFLAGS) + + libglooxincludedir = $(includedir)/gloox +-libglooxinclude_HEADERS = adhoccommandprovider.h privacymanager.h tag.h \ ++libglooxinclude_HEADERS = adhoccommandprovider.h privacymanager.h tag.h dns.h \ + adhoc.h attention.h iqhandler.h privatexml.h \ + annotations.h client.h privatexmlhandler.h \ + annotationshandler.h component.h registration.h \ +@@ -108,7 +108,7 @@ libglooxinclude_HEADERS = adhoccommandprovider.h privacymanager.h ta + jingleiceudp.h jinglefiletransfer.h \ + iodata.h adhocplugin.h + +-noinst_HEADERS = config.h prep.h dns.h nonsaslauth.h mucmessagesession.h stanzaextensionfactory.h \ ++noinst_HEADERS = config.h prep.h nonsaslauth.h mucmessagesession.h stanzaextensionfactory.h \ + tlsgnutlsclient.h \ + tlsgnutlsbase.h tlsgnutlsclientanon.h tlsgnutlsserveranon.h tlsopensslbase.h tlsschannel.h \ + compressionzlib.h rosteritemdata.h tlsopensslclient.h \ +-- +2.43.2