* [gentoo-commits] repo/gentoo:master commit in: net-misc/sipp/, net-misc/sipp/files/
@ 2024-10-06 18:28 Robin H. Johnson
0 siblings, 0 replies; 3+ messages in thread
From: Robin H. Johnson @ 2024-10-06 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 4ca3664063ba0915ab4cce92fc0520d91e08c7d5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 6 14:37:19 2024 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 6 14:37:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca36640
net-misc/sipp: fix -Wformat-overflow
Closes: https://bugs.gentoo.org/940748
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/sipp/files/sipp-3.7.3-overflow.patch | 84 +++++++++++++++++++++++++++
net-misc/sipp/sipp-3.7.3-r1.ebuild | 49 ++++++++++++++++
2 files changed, 133 insertions(+)
diff --git a/net-misc/sipp/files/sipp-3.7.3-overflow.patch b/net-misc/sipp/files/sipp-3.7.3-overflow.patch
new file mode 100644
index 000000000000..87e9c468e576
--- /dev/null
+++ b/net-misc/sipp/files/sipp-3.7.3-overflow.patch
@@ -0,0 +1,84 @@
+https://bugs.gentoo.org/940748
+https://github.com/SIPp/sipp/commit/fdc0c97e1d8acbe4de0d89cf26dfe74bf9b413ed
+
+From fdc0c97e1d8acbe4de0d89cf26dfe74bf9b413ed Mon Sep 17 00:00:00 2001
+From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
+Date: Wed, 11 Sep 2024 20:55:06 +0300
+Subject: [PATCH] Fix 32-bit compilation
+
+--- a/src/call.cpp
++++ b/src/call.cpp
+@@ -1563,8 +1563,8 @@ char * call::get_last_header(const char * name)
+ if (name[len - 1] == ':') {
+ return get_header(last_recv_msg, name, false);
+ } else {
+- char with_colon[MAX_HEADER_LEN];
+- sprintf(with_colon, "%s:", name);
++ char with_colon[MAX_HEADER_LEN+2];
++ snprintf(with_colon, MAX_HEADER_LEN+2, "%s:", name);
+ return get_header(last_recv_msg, with_colon, false);
+ }
+ }
+@@ -1604,8 +1604,8 @@ char * call::get_last_request_uri()
+ }
+
+ last_request_uri[0] = '\0';
+- if (tmp && (tmp_len > 0)) {
+- strncpy(last_request_uri, tmp, tmp_len);
++ if (tmp_len > 0) {
++ memcpy(last_request_uri, tmp, tmp_len);
+ }
+ last_request_uri[tmp_len] = '\0';
+
+--- a/src/rtpstream.cpp
++++ b/src/rtpstream.cpp
+@@ -2702,7 +2702,7 @@ void rtpstream_audioecho_thread(void* param)
+ pthread_mutex_lock(&debugremutexaudio);
+ if (debugrefileaudio != nullptr)
+ {
+- fprintf(debugrefileaudio, "DATA SUCCESSFULLY RECEIVED [AUDIO] nr = %ld...", nr);
++ fprintf(debugrefileaudio, "DATA SUCCESSFULLY RECEIVED [AUDIO] nr = %d...", int(nr));
+ }
+ for (int i = 0; i < 12; i++)
+ {
+@@ -2780,7 +2780,8 @@ void rtpstream_audioecho_thread(void* param)
+ pthread_mutex_lock(&debugremutexaudio);
+ if (debugrefileaudio != nullptr)
+ {
+- fprintf(debugrefileaudio, "DATA SUCCESSFULLY SENT [AUDIO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %ld ns = %ld\n", seq_num, errno, nr, ns);
++ fprintf(debugrefileaudio, "DATA SUCCESSFULLY SENT [AUDIO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %d ns = %d\n",
++ seq_num, errno, int(nr), int(ns));
+ }
+ pthread_mutex_unlock(&debugremutexaudio);
+ } else {
+@@ -2961,7 +2962,7 @@ void rtpstream_videoecho_thread(void* param)
+ pthread_mutex_lock(&debugremutexvideo);
+ if (debugrefilevideo != nullptr)
+ {
+- fprintf(debugrefilevideo, "DATA SUCCESSFULLY RECEIVED [VIDEO] nr = %ld...", nr);
++ fprintf(debugrefilevideo, "DATA SUCCESSFULLY RECEIVED [VIDEO] nr = %d...", int(nr));
+ }
+ for (int i = 0; i < 12; i++)
+ {
+@@ -3038,7 +3039,8 @@ void rtpstream_videoecho_thread(void* param)
+ pthread_mutex_lock(&debugremutexvideo);
+ if (debugrefilevideo != nullptr)
+ {
+- fprintf(debugrefilevideo, "DATA SUCCESSFULLY SENT [VIDEO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %ld ns = %ld\n", seq_num, errno, nr, ns);
++ fprintf(debugrefilevideo, "DATA SUCCESSFULLY SENT [VIDEO] seq_num = [%u] -- MISMATCHED RECV/SENT BYTE COUNT -- errno = %d nr = %d ns = %d\n",
++ seq_num, errno, int(nr), int(ns));
+ }
+ pthread_mutex_unlock(&debugremutexvideo);
+ } else {
+--- a/src/sip_parser.cpp
++++ b/src/sip_parser.cpp
+@@ -455,7 +455,7 @@ static const char* internal_find_header(const char* msg, const char* name, const
+ ptr = strchr(ptr, '\n');
+ if (!ptr || ptr[-1] != '\r' || (ptr[1] == '\r' && ptr[2] == '\n')) {
+ if (ptr && ptr[-1] != '\r') {
+- WARNING("Missing CR during header scan at pos %ld", ptr - msg);
++ WARNING("Missing CR during header scan at pos %d", int(ptr - msg));
+ /* continue? */
+ }
+ return nullptr;
+
diff --git a/net-misc/sipp/sipp-3.7.3-r1.ebuild b/net-misc/sipp/sipp-3.7.3-r1.ebuild
new file mode 100644
index 000000000000..fdfaa3ac31dd
--- /dev/null
+++ b/net-misc/sipp/sipp-3.7.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
+HOMEPAGE="https://github.com/SIPp/sipp"
+SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl +pcap sctp +ssl"
+
+DEPEND="sys-libs/ncurses:=
+ gsl? ( sci-libs/gsl:= )
+ pcap? (
+ net-libs/libpcap
+ net-libs/libnet:1.1
+ )
+ sctp? ( net-misc/lksctp-tools )
+ ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-overflow.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_GSL=$(usex gsl 1 0)
+ -DUSE_PCAP=$(usex pcap 1 0)
+ -DUSE_SCTP=$(usex sctp 1 0)
+ -DUSE_SSL=$(usex ssl 1 0)
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/${PN}
+ use pcap && doins pcap/*.pcap
+ dodoc CHANGES.md README.md
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/sipp/, net-misc/sipp/files/
@ 2023-02-01 19:27 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-02-01 19:27 UTC (permalink / raw
To: gentoo-commits
commit: f721bc1a1d7d2418a483675428399c02f833bebe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 21:25:59 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 19:26:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f721bc1a
net-misc/sipp: drop 3.6.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/sipp/Manifest | 1 -
.../sipp/files/sipp-3.6.0-parallel-build.patch | 11 -----
net-misc/sipp/sipp-3.6.0.ebuild | 49 ----------------------
3 files changed, 61 deletions(-)
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
index e013d3d46161..67ff7f47058d 100644
--- a/net-misc/sipp/Manifest
+++ b/net-misc/sipp/Manifest
@@ -1,2 +1 @@
-DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e0f20c6c3cf9b72ebcd65cb12cf4cab2b90e010d16e17b9bb4832f42915b104ea9bd1253242d304ab4f3cb32 SHA512 eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12
DIST sipp-3.6.1.tar.gz 744407 BLAKE2B a201ecce624c15c51a66c3cb5ac467522755085419c2980b1f76340e7ffca5996516f34d7e52776a8aa0a2170ca2b7301030ecb50272a1c0a8e86aaf18a6de16 SHA512 58504c56ca0c14363fafc5d0598fd93857ef33cc5856f579a225fd0e38238f7d2c409127a18a368e22355cc3912758d4dba07bac7eaa3e8a0d2943ea5fdec602
diff --git a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch b/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
deleted file mode 100644
index 6521918339d2..000000000000
--- a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sipp-3.6.0/Makefile.am.o 2019-12-22 10:40:37.766229344 +0200
-+++ sipp-3.6.0/Makefile.am 2019-12-22 10:42:09.006266083 +0200
-@@ -172,7 +172,7 @@
-
- # Ensure that after a reconfigure the source is cleaned.
- .autoclean: Makefile
-- make clean
-+ $(MAKE) clean
- echo > .autoclean
- BUILT_SOURCES = .autoclean
-
diff --git a/net-misc/sipp/sipp-3.6.0.ebuild b/net-misc/sipp/sipp-3.6.0.ebuild
deleted file mode 100644
index bc7ef82c8b22..000000000000
--- a/net-misc/sipp/sipp-3.6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
-HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases"
-SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gsl +pcap sctp +ssl"
-
-PATCHES=( "${FILESDIR}/sipp-3.6.0-parallel-build.patch" )
-
-DEPEND="sys-libs/ncurses:=
- gsl? ( sci-libs/gsl:= )
- pcap? (
- net-libs/libpcap
- net-libs/libnet:1.1
- )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with gsl) \
- $(use_with pcap) \
- $(use_with sctp) \
- $(use_with ssl openssl) \
- --with-rtpstream
-}
-
-src_install() {
- default
-
- insinto /usr/share/${PN}
- use pcap && doins pcap/*.pcap
- dodoc CHANGES.md README.md
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-misc/sipp/, net-misc/sipp/files/
@ 2019-12-22 16:59 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2019-12-22 16:59 UTC (permalink / raw
To: gentoo-commits
commit: b7268b35a1f1a0b04112239cfd84c225558948c3
Author: Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Tue Nov 19 07:26:49 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 16:59:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7268b35
net-misc/sipp: new package.
A free Open Source test tool / traffic generator for the SIP protocol.
Closes: https://bugs.gentoo.org/108506
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/13699
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-misc/sipp/Manifest | 1 +
.../sipp/files/sipp-3.6.0-parallel-build.patch | 11 +++++
net-misc/sipp/metadata.xml | 15 +++++++
net-misc/sipp/sipp-3.6.0.ebuild | 48 ++++++++++++++++++++++
4 files changed, 75 insertions(+)
diff --git a/net-misc/sipp/Manifest b/net-misc/sipp/Manifest
new file mode 100644
index 00000000000..b6391ce79e6
--- /dev/null
+++ b/net-misc/sipp/Manifest
@@ -0,0 +1 @@
+DIST sipp-3.6.0.tar.gz 1055201 BLAKE2B 48b431bfc33d3a03e6e972ef3ce184989afb12c7e0f20c6c3cf9b72ebcd65cb12cf4cab2b90e010d16e17b9bb4832f42915b104ea9bd1253242d304ab4f3cb32 SHA512 eecbc18a18558a3fbc4f7c841d1fc8bd5be4b0c5d2bb363a12faf730f3c6a0773a24f07dbf062e68baf1a93b21686fa09258d0e08b45b4f941eb5d573bb25c12
diff --git a/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch b/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
new file mode 100644
index 00000000000..6521918339d
--- /dev/null
+++ b/net-misc/sipp/files/sipp-3.6.0-parallel-build.patch
@@ -0,0 +1,11 @@
+--- sipp-3.6.0/Makefile.am.o 2019-12-22 10:40:37.766229344 +0200
++++ sipp-3.6.0/Makefile.am 2019-12-22 10:42:09.006266083 +0200
+@@ -172,7 +172,7 @@
+
+ # Ensure that after a reconfigure the source is cleaned.
+ .autoclean: Makefile
+- make clean
++ $(MAKE) clean
+ echo > .autoclean
+ BUILT_SOURCES = .autoclean
+
diff --git a/net-misc/sipp/metadata.xml b/net-misc/sipp/metadata.xml
new file mode 100644
index 00000000000..2308b2753fd
--- /dev/null
+++ b/net-misc/sipp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>jaco@uls.co.za</email>
+ <name>Jaco Kroon</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="pcap">Enable functionality to replay RTP data from a pcap file</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-misc/sipp/sipp-3.6.0.ebuild b/net-misc/sipp/sipp-3.6.0.ebuild
new file mode 100644
index 00000000000..e4b282e3f3f
--- /dev/null
+++ b/net-misc/sipp/sipp-3.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A free Open Source test tool / traffic generator for the SIP protocol"
+HOMEPAGE="http://sipp.sourceforge.net/ https://github.com/SIPp/sipp/releases"
+SRC_URI="https://github.com/SIPp/sipp/releases/download/v${PV}/${PF}.tar.gz"
+
+LICENSE="GPL-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gsl +pcap sctp +ssl"
+
+PATCHES=( "${FILESDIR}/sipp-3.6.0-parallel-build.patch" )
+
+DEPEND="sys-libs/ncurses:=
+ ssl? ( dev-libs/openssl:= )
+ pcap? (
+ net-libs/libpcap
+ net-libs/libnet:1.1
+ )
+ gsl? ( sci-libs/gsl:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with gsl) \
+ $(use_with pcap) \
+ $(use_with sctp) \
+ $(use_with ssl openssl) \
+ --with-rtpstream
+}
+
+src_install() {
+ default
+ insinto /usr/share/${PN}
+ use pcap && doins pcap/*.pcap
+ dodoc CHANGES.md README.md
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-06 18:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-06 18:28 [gentoo-commits] repo/gentoo:master commit in: net-misc/sipp/, net-misc/sipp/files/ Robin H. Johnson
-- strict thread matches above, loose matches on Subject: below --
2023-02-01 19:27 Andreas Sturmlechner
2019-12-22 16:59 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox