gentoo resync : 02.02.2022

4 files changed, 69 insertions, 3 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 54641dd706a0..3f117b881441 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/captagent/Manifest b/net-voip/captagent/Manifest
index 4f0a906a7470..fc09d3b24f13 100644
--- a/net-voip/captagent/Manifest
+++ b/net-voip/captagent/Manifest
@@ -1,5 +1,6 @@
 AUX captagent-6.3.1-configure.patch 5583 BLAKE2B a7e7847cc5809b5964358c758e3ae620b4d1f503b33219b57acfabf119472422b1e324685b2cb9dd53286ff7fc98f531501b2ceacc14586692702367ed473221 SHA512 f343c32ef4bee8bf9ca6136442ac0998db6366bdab36da1da20d0bde6db838f47cf70ff2cc853190437a06ec87b0a506e29c215c6103f48b5b19958dbf8d2d18
 AUX captagent-6.3.1-gcc10.patch 5557 BLAKE2B a896a85f231b72676dd594cd82e5cce38d81bead6113351ec263bc1379e810a1e9ba32a04bf17d30179b7f6a8a8d47f3b75eb42016b7a156768dbf7831670038 SHA512 35ffd35de93c72ba763ac8da63fe08d06b8535d34647f6111e8c00e07565980ef6c0ff056ce47d570296b1a37e6cc7d0d1f4c3099fbea5385a2fb6e3c56c8d3c
+AUX captagent-6.3.1-r1-clang.patch 1908 BLAKE2B 29b760d860810f327b253ba3f78a52a5f7f95e479c07be356ebf9ea432cab7e87d5aec1e5a00ed3d80b532c33883155729ae8d219d8f9c9affe174404edcc64c SHA512 2570152d90397224fecb142435c5f284d3ad28b8c3f3176ce8d6451ad7afa75512894af9100da7232b37a57470fa0123517d3b56a95589a74ded4343a8057270
 DIST captagent-6.3.1.tar.gz 1488741 BLAKE2B c59c5a4633f18b4eed07cc216ba939712140a244504e4263f10dec27f5937bbd54103f32a4c2a350c2560b56da18c98b6137d005010d5bb93e712d2d6fc86d0d SHA512 e4043ddb92a1228fb9e4e220e503e3bd0bf9009c893e9c153fc90d15f91902ff7b86ca4b01bf2ef40056bc16647a3838fcfb88f76503f41f4bea88d054e4d7de
-EBUILD captagent-6.3.1.ebuild 1091 BLAKE2B 36b465c462f7e33764a8b37fb212266e92cd850eba025e5f595b87479d7bc86bb1b8e79d10f6d2ab13f08d22e91e1e86a07be52de7da9c9138dfcef51b82645a SHA512 228d949fcaeb3c28b94cc7782a3180d9edafafbf99261ef5a0eddb5f4672d9add26a2ca454b2f19ca305ecb88086248fb6535f4b085a0a90f05aaaef55edd9d0
+EBUILD captagent-6.3.1-r1.ebuild 1183 BLAKE2B 857824e4db92515a3efaef93588b680da26c2626f66275937c72a7516f97c8e04c7b82c5b3d1b64ae5531216346ef15965f019a14ecb7800110adb9e6cc557e8 SHA512 4d2d59e77a56a091db21c4e54f636a4d1db2e1432a57ad4fbc8aeecdece256e4321fc3b3608c3f61b36c9696b21b6451b788a7af52ac1c3f62f3d992b7219a7a
 MISC metadata.xml 452 BLAKE2B fc2cebae1cc8d34bd63fa3670d52cbc530e68d0604c1b9f49158c82fc98eab99d4df9cb8a5ac423aa68bc9495d82d592c862feb1d7a3bc318409136e36aa9f24 SHA512 a40e4cee4507f552ab8e88bae5efbdbb7cbb71c7dda1e500f0a3ffa9ab83b0b47cebc6e129de844318a83eb82939fac4991cbefc80af15ca8e51cef26fc2c6f3
diff --git a/net-voip/captagent/captagent-6.3.1.ebuild b/net-voip/captagent/captagent-6.3.1-r1.ebuild
index 7addb19c0e0d..b72ebf6929c4 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}/${PN}-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 <jaco@uls.co.za>
+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 <jaco@uls.co.za>
+---
+ 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
+