From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8B64158087 for ; Thu, 20 Jan 2022 12:39:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E3D52BC015; Thu, 20 Jan 2022 12:39:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A06352BC015 for ; Thu, 20 Jan 2022 12:39:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EAF03433A2 for ; Thu, 20 Jan 2022 12:39:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B622239 for ; Thu, 20 Jan 2022 12:39:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642682229.b5b0a869b6d98b25d8494c48a9e21db4398dc4a3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-voip/captagent/files/, net-voip/captagent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-voip/captagent/captagent-6.3.1-r1.ebuild net-voip/captagent/captagent-6.3.1.ebuild net-voip/captagent/files/captagent-6.3.1-r1-clang.patch X-VCS-Directories: net-voip/captagent/files/ net-voip/captagent/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b5b0a869b6d98b25d8494c48a9e21db4398dc4a3 X-VCS-Branch: master Date: Thu, 20 Jan 2022 12:39:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a453b627-55ea-4416-83b8-293559e58bb2 X-Archives-Hash: 6edcf784774f8420e96561e5bca965c6 commit: b5b0a869b6d98b25d8494c48a9e21db4398dc4a3 Author: Jaco Kroon uls co za> AuthorDate: Thu Jan 20 09:14:12 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 20 12:37:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b0a869 net-voip/captagent: revision bump to fix clang compile Upstream: https://github.com/sipcapture/captagent/pull/245 Not expecting a new release soon. Closes: https://bugs.gentoo.org/831391 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/23880 Signed-off-by: Sam James gentoo.org> ...gent-6.3.1.ebuild => captagent-6.3.1-r1.ebuild} | 6 ++- .../captagent/files/captagent-6.3.1-r1-clang.patch | 63 ++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/net-voip/captagent/captagent-6.3.1.ebuild b/net-voip/captagent/captagent-6.3.1-r1.ebuild similarity index 82% rename from net-voip/captagent/captagent-6.3.1.ebuild rename to net-voip/captagent/captagent-6.3.1-r1.ebuild index 7addb19c0e0d..3023031778b2 100644 --- a/net-voip/captagent/captagent-6.3.1.ebuild +++ b/net-voip/captagent/captagent-6.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,8 +15,10 @@ KEYWORDS="~amd64 ~x86" IUSE="ipv6 mysql pcre redis ssl" PATCHES=( - # https://github.com/sipcapture/captagent/pull/239 (should be accepted). + # https://github.com/sipcapture/captagent/pull/239 (merged). "${FILESDIR}/${P}-gcc10.patch" + # https://github.com/sipcapture/captagent/pull/245 (merged). + "${FILESDIR}/${P}-captagent-6.3.1-r1-clang.patch" # Already upstreamed for next version. "${FILESDIR}/${P}-configure.patch" ) diff --git a/net-voip/captagent/files/captagent-6.3.1-r1-clang.patch b/net-voip/captagent/files/captagent-6.3.1-r1-clang.patch new file mode 100644 index 000000000000..02940147d30f --- /dev/null +++ b/net-voip/captagent/files/captagent-6.3.1-r1-clang.patch @@ -0,0 +1,63 @@ +From a4b5cc7806861b75b03ea0d31e1413e3e293770c Mon Sep 17 00:00:00 2001 +From: Jaco Kroon +Date: Thu, 20 Jan 2022 07:07:40 +0200 +Subject: [PATCH] Move declaration of usage() function to avoid conflicting + implicit declaration. + +Signed-off-by: Jaco Kroon +--- + src/captagent.c | 31 +++++++++++++++---------------- + 1 file changed, 15 insertions(+), 16 deletions(-) + +diff --git a/src/captagent.c b/src/captagent.c +index 6f5f533..052b0bb 100644 +--- a/src/captagent.c ++++ b/src/captagent.c +@@ -108,6 +108,21 @@ void handler(int value) { + exit(0); + } + ++void usage(int8_t e) ++{ ++ printf( ++ "usage: Captagent <-vh> <-f config>\n" ++ " -h display help/usage\n" ++ " -a print a list of all availlable devices\n" ++ " -v display version information\n" ++ " -c validate configuration and exit\n" ++ " -d enable daemon mode\n" ++ " -n enable foreground mode\n" ++ " -f [/path/to/rtpagent.xml] to specify a config file\n" ++ " -D [/path/to/file.pcap] to specify a pcap file as input\n" ++ " -x [1 - 10] set debug level\n"); ++ exit(e); ++} + + // Print the list of availlable devices + static void print_all_devices() +@@ -230,22 +245,6 @@ int daemonize(int nofork) + error: return -1; + } + +-void usage(int8_t e) +-{ +- printf( +- "usage: Captagent <-vh> <-f config>\n" +- " -h display help/usage\n" +- " -a print a list of all availlable devices\n" +- " -v display version information\n" +- " -c validate configuration and exit\n" +- " -d enable daemon mode\n" +- " -n enable foreground mode\n" +- " -f [/path/to/rtpagent.xml] to specify a config file\n" +- " -D [/path/to/file.pcap] to specify a pcap file as input\n" +- " -x [1 - 10] set debug level\n"); +- exit(e); +-} +- + void print_hw() { + + char k[33]; +-- +2.33.1 +