From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 73696@debbugs.gnu.org
Cc: Nicolas Graves <ngraves@ngraves.fr>
Subject: [bug#73696] [PATCH 3/3] gnu: sipwitch: Fix build.
Date: Tue, 8 Oct 2024 08:35:02 +0200 [thread overview]
Message-ID: <20241008063510.26512-3-ngraves@ngraves.fr> (raw)
In-Reply-To: <20241008063510.26512-1-ngraves@ngraves.fr>
* gnu/packages/telephony.scm (sipwitch): Fix build.
[origin]<patches>: Add sipwitch-fix-build-with-exosip5.patch here...
* gnu/packages/patches: ...here and...
* gnu/local.mk: ...here.
---
gnu/local.mk | 1 +
.../sipwitch-fix-build-with-exosip5.patch | 77 +++++++++++++++++++
gnu/packages/telephony.scm | 4 +-
3 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/sipwitch-fix-build-with-exosip5.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 25d6249319..fa9d7f7e0b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2158,6 +2158,7 @@ dist_patch_DATA = \
%D%/packages/patches/shakespeare-spl-fix-grammar.patch \
%D%/packages/patches/shared-mime-info-xdgmime-path.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
+ %D%/packages/patches/sipwitch-fix-build-with-exosip5.patch \
%D%/packages/patches/slim-config.patch \
%D%/packages/patches/slim-login.patch \
%D%/packages/patches/slim-display.patch \
diff --git a/gnu/packages/patches/sipwitch-fix-build-with-exosip5.patch b/gnu/packages/patches/sipwitch-fix-build-with-exosip5.patch
new file mode 100644
index 0000000000..d18aa75f32
--- /dev/null
+++ b/gnu/packages/patches/sipwitch-fix-build-with-exosip5.patch
@@ -0,0 +1,77 @@
+From 59c0063443ce0de7f93c34b6c29dd3f12e678848 Mon Sep 17 00:00:00 2001
+From: Fredrick Brennan <copypaste@kittens.ph>
+Date: Fri, 3 Nov 2023 20:57:59 -0400
+Subject: [PATCH] Fix build with 5.x series of libexosip2
+
+---
+ common/voip.cpp | 5 +++--
+ utils/Makefile.am | 3 ++-
+ utils/sipquery.cpp | 6 +++++-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/common/voip.cpp b/common/voip.cpp
+index d3ee15b..d0f6ebd 100644
+--- a/common/voip.cpp
++++ b/common/voip.cpp
+@@ -138,9 +138,10 @@ bool voip::make_prack_message(context_t ctx, tid_t tid, msg_t *msg)
+ if(!msg)
+ return false;
+
++ msg_t onexxmsg = NULL;
+ *msg = NULL;
+ eXosip_lock(ctx);
+- eXosip_call_build_prack(ctx, tid, msg);
++ eXosip_call_build_prack(ctx, tid, onexxmsg, msg);
+ if(!*msg) {
+ eXosip_unlock(ctx);
+ return false;
+@@ -438,7 +439,7 @@ void voip::create(context_t *ctx, const char *agent, int f)
+
+ #ifdef AF_INET6
+ if(family == AF_INET6)
+- eXosip_enable_ipv6(1);
++ voip::option(*ctx, EXOSIP_OPT_ENABLE_IPV6, (void *)2);
+ #endif
+ }
+
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index dd2040f..ffe6d09 100644
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -22,7 +22,8 @@ sipcontrol_SOURCES = sipcontrol.cpp
+ sipcontrol_LDADD = @LDFLAGS@ @SIPWITCH_LIBS@
+
+ sipquery_SOURCES = sipquery.cpp
+-sipquery_LDADD = @LDFLAGS@ @SIPWITCH_EXOSIP2@ @SIPWITCH_LIBS@
++sipquery_LDFLAGS = -L$(top_builddir)/common -lsipwitch
++sipquery_LDADD = @LDFLAGS@ @SIPWITCH_LIBS@ @SIPWITCH_EXOSIP2@
+
+ sippasswd_SOURCES = sippasswd.cpp
+ sippasswd_LDADD = @LDFLAGS@ @SIPWITCH_LIBS@
+diff --git a/utils/sipquery.cpp b/utils/sipquery.cpp
+index 5b83590..f99512d 100644
+--- a/utils/sipquery.cpp
++++ b/utils/sipquery.cpp
+@@ -50,6 +50,10 @@ static struct eXosip_t *context = NULL;
+
+ using namespace ucommon;
+
++#include "sipwitch/voip.h"
++
++using namespace sipwitch;
++
+ #if defined(_MSWINDOWS_) && defined(__GNUC__)
+ // binds addrinfo for mingw32 linkage since otherwise mingw32 cannot
+ // cannot link proper getaddrinfo/freeaddrinfo calls that eXosip uses.
+@@ -226,7 +230,7 @@ usage:
+
+ #ifdef AF_INET6
+ if(family == AF_INET6) {
+- eXosip_enable_ipv6(1);
++ sipwitch::voip::option(EXOSIP_CONTEXT, EXOSIP_OPT_ENABLE_IPV6, (void *)2);
+ if(binding == NULL)
+ binding = "::0";
+ }
+--
+2.42.0
+
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 714982c5b0..99a8486b7f 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -409,7 +409,9 @@ (define-public sipwitch
(uri (string-append "mirror://gnu/sipwitch/sipwitch-"
version ".tar.gz"))
(sha256 (base32
- "10lli9c703d7qbarzc0lgmz963ppncvnrklwrnri0s1zcmmahyia"))))
+ "10lli9c703d7qbarzc0lgmz963ppncvnrklwrnri0s1zcmmahyia"))
+ (patches
+ (search-patches "sipwitch-fix-build-with-exosip5.patch"))))
(build-system gnu-build-system)
;; The configure.ac uses pkg-config but in a kludgy way which breaks when
;; cross-compiling. Among other issues there the program name "pkg-config"
--
2.46.0
next prev parent reply other threads:[~2024-10-08 6:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-08 6:27 [bug#73696] [PATCH 0/3] Update osip, exosip, sipwitch. [security fixes] Nicolas Graves via Guix-patches via
2024-10-08 6:35 ` [bug#73696] [PATCH 1/3] gnu: osip: Update to 5.3.1 Nicolas Graves via Guix-patches via
2024-10-08 6:35 ` [bug#73696] [PATCH 2/3] gnu: exosip: Update to 5.3.0. [security fixes] Nicolas Graves via Guix-patches via
2024-10-08 6:35 ` Nicolas Graves via Guix-patches via [this message]
2024-10-15 16:19 ` bug#73696: [PATCH 0/3] Update osip, exosip, sipwitch. " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241008063510.26512-3-ngraves@ngraves.fr \
--to=guix-patches@gnu.org \
--cc=73696@debbugs.gnu.org \
--cc=ngraves@ngraves.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).