From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2P2zKufSBGeGcgAA62LTzQ:P1 (envelope-from ) for ; Tue, 08 Oct 2024 06:36:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 2P2zKufSBGeGcgAA62LTzQ (envelope-from ) for ; Tue, 08 Oct 2024 08:36:23 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Dh1a7q8e; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=VJDcwSCb; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728369383; a=rsa-sha256; cv=none; b=RbpWQvT3nzJKbwUL1gRZHZfBcTEaZ5JEcQhIRS0E6LAQWYouAgKJvqtKyAL8h6QxSxRyFS JuRBhBClaqtcCdELT9nyqsstuHZkVIvDLZhizWNZ+Cj/OVefyzMm5//5znafhlW3gk1Gil AB+JviiN0NIqth5fY/2hTbPLXIfuJO5xqIMs3P4sJOKQe1D45SMWm6oxD238hShs2tDL0/ deeRfigi89myVy30Ln16BbNDuq2Pwa4qZzFDty3UBvNUwKpjl5QjbuagJRB60XAH5MCR8d tj5nDWqqo+TaOSS62oW5bq9KoVJqvqK587thcKmMk8xbUySxOJSIVKkJzzHkyg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Dh1a7q8e; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=VJDcwSCb; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728369383; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=rwtZtZNe90ezqng81GEumpc+7pDTNT9t3H+Hyh/DQ9Q=; b=LRap+skKv8QQW48ojDMsJkO1UhZOEVh9gRTRCtnaB1wfIsCcIlZvL5KSqHREpAXZXRvcct F5PBGo6Lw27lfmnnKWGpu5ruhlQaiDq7r0LBNRn1H6LlBrz6GoE3m9Ojl/vXK2du8sj1Go Zq8Z3FXWGBh/U+GqI10whK6jFmEPjQioxYV6fcoYImx2MaLGdrgWECyz/Dxar5/SymtkSn VEroYA7HpUYOgg0sTDxiGfAnCNNdYrRLMQqsxGoJbOI1hKTq59nB2S7PF9mR9O8XRyieVE Vjb+nl2uKBTJm+50Ybg/PVYB6relx4T6sBzPSdgOLNmbjDEPWWMthS4vCpdH2g== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 810907423B for ; Tue, 08 Oct 2024 08:36:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sy3p7-0003jL-EY; Tue, 08 Oct 2024 02:35:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sy3p5-0003iU-HH for guix-patches@gnu.org; Tue, 08 Oct 2024 02:35:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sy3p5-0004pb-8b for guix-patches@gnu.org; Tue, 08 Oct 2024 02:35:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=rwtZtZNe90ezqng81GEumpc+7pDTNT9t3H+Hyh/DQ9Q=; b=Dh1a7q8e2db7GADenLR0/SbPxXIO5MvsI1bOE7rThfqtPcdkYYtn8d8OA8k8fksUzi8kFzaQl/iEbi6dwxsLOxu++QBFPcaHk2224IRlstOABrpfH0/etbW2aTagjwqzxnSaBysGY/7QxAGntRL7cfenWSGXNgy/+3hK6+SJm3F6VbgIHIvbAJVhun2LKNYD622u2xx0bbJtrtb9TtYkg/1L+1bvfT14dfk1Jx2/ABGTm+QJF8IHL/dfsEQIKC0Xnjz/Z1dy1JH2fSaRCYasM2/k6yjnw8s9yrg8B5wXdp5N80YtsaEJ41ZdUFoU3QTq7302F9Bx+c+Ja5tVJl+iNw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sy3pD-0001gk-FQ for guix-patches@gnu.org; Tue, 08 Oct 2024 02:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73696] [PATCH 3/3] gnu: sipwitch: Fix build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Oct 2024 06:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73696 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73696@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 73696-submit@debbugs.gnu.org id=B73696.17283693376446 (code B ref 73696); Tue, 08 Oct 2024 06:36:03 +0000 Received: (at 73696) by debbugs.gnu.org; 8 Oct 2024 06:35:37 +0000 Received: from localhost ([127.0.0.1]:50483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3om-0001ft-Rk for submit@debbugs.gnu.org; Tue, 08 Oct 2024 02:35:37 -0400 Received: from 5.mo576.mail-out.ovh.net ([46.105.43.105]:52175) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3oh-0001fb-0H for 73696@debbugs.gnu.org; Tue, 08 Oct 2024 02:35:35 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.17.23]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4XN5qY2wl4z1nWh for <73696@debbugs.gnu.org>; Tue, 8 Oct 2024 06:35:21 +0000 (UTC) Received: from ghost-submission-55b549bf7b-rz8mw (unknown [10.110.164.1]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 293C61FDBE; Tue, 8 Oct 2024 06:35:20 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-55b549bf7b-rz8mw with ESMTPSA id eKySN6fSBGfFQQAAEGaTrw (envelope-from ); Tue, 08 Oct 2024 06:35:20 +0000 X-OVh-ClientIp: 86.246.19.221 Date: Tue, 8 Oct 2024 08:35:02 +0200 Message-ID: <20241008063510.26512-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241008063510.26512-1-ngraves@ngraves.fr> References: <20241008063510.26512-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 15179664021671830242 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddguddutdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieelieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=rwtZtZNe90ezqng81GEumpc+7pDTNT9t3H+Hyh/DQ9Q=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728369321; v=1; b=VJDcwSCbszZlokKLQuNpCZGJLW/4Mw8duCgggn073HcHvU18PP8j5kNw3jc2Dg6QtJDto2Nv Zw9EGXuyQPK+DHVcz7++F7ydR3FZAnNW0nqjgK5ChAQlLP/LF2ZbgOV8Fk8kKywgQ6MG0Bjj50a zExzy7HiR2lT7mymeBnfivNNiOraieqKpg+URTQMgldDXy8TDm+zAGS8y/Xxsy9l3wYBju/9TwJ swbqQsVWsnq/plNLMgpMn0OHqnetIXdAKSD6Vu7J8ts7qWXDpmC79lHaY3loHbrs84R+Wr7Y3nV M/hHQBJ4wQaa6ndn2VcsVa3cm7Aa8j12/yoTUjtGU86cg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.20 X-Spam-Score: -3.20 X-Migadu-Queue-Id: 810907423B X-Migadu-Scanner: mx10.migadu.com X-TUID: 2n0yF/MCrqhE * gnu/packages/telephony.scm (sipwitch): Fix build. [origin]: 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 +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