| 1 |
commit: b5b0a869b6d98b25d8494c48a9e21db4398dc4a3 |
| 2 |
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za> |
| 3 |
AuthorDate: Thu Jan 20 09:14:12 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 12:37:09 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b0a869 |
| 7 |
|
| 8 |
net-voip/captagent: revision bump to fix clang compile |
| 9 |
|
| 10 |
Upstream: https://github.com/sipcapture/captagent/pull/245 |
| 11 |
|
| 12 |
Not expecting a new release soon. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/831391 |
| 15 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 16 |
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/23880 |
| 18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 19 |
|
| 20 |
...gent-6.3.1.ebuild => captagent-6.3.1-r1.ebuild} | 6 ++- |
| 21 |
.../captagent/files/captagent-6.3.1-r1-clang.patch | 63 ++++++++++++++++++++++ |
| 22 |
2 files changed, 67 insertions(+), 2 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net-voip/captagent/captagent-6.3.1.ebuild b/net-voip/captagent/captagent-6.3.1-r1.ebuild |
| 25 |
similarity index 82% |
| 26 |
rename from net-voip/captagent/captagent-6.3.1.ebuild |
| 27 |
rename to net-voip/captagent/captagent-6.3.1-r1.ebuild |
| 28 |
index 7addb19c0e0d..3023031778b2 100644 |
| 29 |
--- a/net-voip/captagent/captagent-6.3.1.ebuild |
| 30 |
+++ b/net-voip/captagent/captagent-6.3.1-r1.ebuild |
| 31 |
@@ -1,4 +1,4 @@ |
| 32 |
-# Copyright 1999-2021 Gentoo Authors |
| 33 |
+# Copyright 1999-2022 Gentoo Authors |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI=7 |
| 37 |
@@ -15,8 +15,10 @@ KEYWORDS="~amd64 ~x86" |
| 38 |
IUSE="ipv6 mysql pcre redis ssl" |
| 39 |
|
| 40 |
PATCHES=( |
| 41 |
- # https://github.com/sipcapture/captagent/pull/239 (should be accepted). |
| 42 |
+ # https://github.com/sipcapture/captagent/pull/239 (merged). |
| 43 |
"${FILESDIR}/${P}-gcc10.patch" |
| 44 |
+ # https://github.com/sipcapture/captagent/pull/245 (merged). |
| 45 |
+ "${FILESDIR}/${P}-captagent-6.3.1-r1-clang.patch" |
| 46 |
# Already upstreamed for next version. |
| 47 |
"${FILESDIR}/${P}-configure.patch" |
| 48 |
) |
| 49 |
|
| 50 |
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 |
| 51 |
new file mode 100644 |
| 52 |
index 000000000000..02940147d30f |
| 53 |
--- /dev/null |
| 54 |
+++ b/net-voip/captagent/files/captagent-6.3.1-r1-clang.patch |
| 55 |
@@ -0,0 +1,63 @@ |
| 56 |
+From a4b5cc7806861b75b03ea0d31e1413e3e293770c Mon Sep 17 00:00:00 2001 |
| 57 |
+From: Jaco Kroon <jaco@××××××.za> |
| 58 |
+Date: Thu, 20 Jan 2022 07:07:40 +0200 |
| 59 |
+Subject: [PATCH] Move declaration of usage() function to avoid conflicting |
| 60 |
+ implicit declaration. |
| 61 |
+ |
| 62 |
+Signed-off-by: Jaco Kroon <jaco@××××××.za> |
| 63 |
+--- |
| 64 |
+ src/captagent.c | 31 +++++++++++++++---------------- |
| 65 |
+ 1 file changed, 15 insertions(+), 16 deletions(-) |
| 66 |
+ |
| 67 |
+diff --git a/src/captagent.c b/src/captagent.c |
| 68 |
+index 6f5f533..052b0bb 100644 |
| 69 |
+--- a/src/captagent.c |
| 70 |
++++ b/src/captagent.c |
| 71 |
+@@ -108,6 +108,21 @@ void handler(int value) { |
| 72 |
+ exit(0); |
| 73 |
+ } |
| 74 |
+ |
| 75 |
++void usage(int8_t e) |
| 76 |
++{ |
| 77 |
++ printf( |
| 78 |
++ "usage: Captagent <-vh> <-f config>\n" |
| 79 |
++ " -h display help/usage\n" |
| 80 |
++ " -a print a list of all availlable devices\n" |
| 81 |
++ " -v display version information\n" |
| 82 |
++ " -c validate configuration and exit\n" |
| 83 |
++ " -d enable daemon mode\n" |
| 84 |
++ " -n enable foreground mode\n" |
| 85 |
++ " -f [/path/to/rtpagent.xml] to specify a config file\n" |
| 86 |
++ " -D [/path/to/file.pcap] to specify a pcap file as input\n" |
| 87 |
++ " -x [1 - 10] set debug level\n"); |
| 88 |
++ exit(e); |
| 89 |
++} |
| 90 |
+ |
| 91 |
+ // Print the list of availlable devices |
| 92 |
+ static void print_all_devices() |
| 93 |
+@@ -230,22 +245,6 @@ int daemonize(int nofork) |
| 94 |
+ error: return -1; |
| 95 |
+ } |
| 96 |
+ |
| 97 |
+-void usage(int8_t e) |
| 98 |
+-{ |
| 99 |
+- printf( |
| 100 |
+- "usage: Captagent <-vh> <-f config>\n" |
| 101 |
+- " -h display help/usage\n" |
| 102 |
+- " -a print a list of all availlable devices\n" |
| 103 |
+- " -v display version information\n" |
| 104 |
+- " -c validate configuration and exit\n" |
| 105 |
+- " -d enable daemon mode\n" |
| 106 |
+- " -n enable foreground mode\n" |
| 107 |
+- " -f [/path/to/rtpagent.xml] to specify a config file\n" |
| 108 |
+- " -D [/path/to/file.pcap] to specify a pcap file as input\n" |
| 109 |
+- " -x [1 - 10] set debug level\n"); |
| 110 |
+- exit(e); |
| 111 |
+-} |
| 112 |
+- |
| 113 |
+ void print_hw() { |
| 114 |
+ |
| 115 |
+ char k[33]; |
| 116 |
+-- |
| 117 |
+2.33.1 |
| 118 |
+ |
Archives