Date: Mon, 03 Aug 2026 15:07:36 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 47a516785a6f - main - net/rtpproxy: update to 3.1.1 Message-ID: <6a70aeb8.39360.2ba57b4f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=47a516785a6f1efd95bc3c499250613831c61016 commit 47a516785a6f1efd95bc3c499250613831c61016 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-08-02 15:46:33 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-08-03 15:03:00 +0000 net/rtpproxy: update to 3.1.1 - unbundle libucl, xxhash properly - remove maintainer (timed out) libexecinfo cannot be unbundled as the port requires internal headers we do not install. With thanks to sobomax and joshruehlig@gmail.com for providing earlier versions of this patch. Reported by: p5B2EA84B3@t-online.de Approved by: farrokhi (maintainer timeout, >1 month) PR: 283019 --- net/rtpproxy/Makefile | 45 +++++++++++++++------- net/rtpproxy/distinfo | 6 +-- net/rtpproxy/files/patch-Makefile.am | 17 ++++++++ net/rtpproxy/files/patch-configure.ac | 19 +++++++++ net/rtpproxy/files/patch-libxxHash_rtpp__xxHash.h | 8 ++++ .../files/patch-scripts_rtpproxy.in.freebsd | 8 ++-- net/rtpproxy/files/patch-src_Makefile.am | 29 ++++++++++++++ net/rtpproxy/pkg-plist | 12 +++++- 8 files changed, 122 insertions(+), 22 deletions(-) diff --git a/net/rtpproxy/Makefile b/net/rtpproxy/Makefile index fa5da7b00d4b..ef9a5816c04b 100644 --- a/net/rtpproxy/Makefile +++ b/net/rtpproxy/Makefile @@ -1,29 +1,46 @@ PORTNAME= rtpproxy -PORTVERSION= 2.1.1 -DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTVERSION= 3.1.1 CATEGORIES= net +MASTER_SITES= https://github.com/sippy/${PORTNAME}/releases/download/v${DISTVERSION}/ -MAINTAINER= farrokhi@FreeBSD.org -COMMENT= High-performance RTP proxy server for the SIP Express Router (SER) +MAINTAINER= ports@FreeBSD.org +COMMENT= RTP proxy server for OpenSIPS, Kamailio or Sippy B2BUA WWW= https://www.rtpproxy.org/ LICENSE= BSD2CLAUSE -LIB_DEPENDS= libgsm.so:audio/gsm +LIB_DEPENDS= libg722.so:audio/libg722 \ + libgsm.so:audio/gsm \ + libsndfile.so:audio/libsndfile \ + libbcg729.so:audio/bcg729 \ + libsrtp2.so:net/libsrtp2 \ + libucl.so:textproc/libucl \ + libunwind.so:devel/libunwind \ + libxxhash.so:devel/xxhash -USES+= cpe libtool -USE_GITHUB= yes -GH_ACCOUNT= sippy +USES= autoreconf cpe libtool pkgconfig localbase:ldflags ssl GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib - USERS= ${PORTNAME} GROUPS= ${PORTNAME} +OPTIONS_DEFINE= LTO +OPTIONS_DEFAULT= LTO +LTO_CONFIGURE_ENABLE= lto + +.include <bsd.port.pre.mk> + +# utility udp_contention requires rdtsc, an x86-only feature +.if ${ARCH} == "i386" || ${ARCH} == "amd64" +PLIST_SUB+= X86="" +.else +PLIST_SUB+= X86="@comment " +.endif + +post-extract: + ${RM} -r ${WRKSRC}/external/libucl + ${RM} -r ${WRKSRC}/external/xxHash + post-build: ${SED} 's|%%PREFIX%%|${PREFIX}|g ; s|%%RC_SUBR%%|/etc/rc.subr|g' \ ${WRKSRC}/scripts/rtpproxy.in.freebsd > ${WRKDIR}/rtpproxy @@ -31,4 +48,4 @@ post-build: post-install: ${INSTALL_SCRIPT} ${WRKDIR}/rtpproxy ${STAGEDIR}${PREFIX}/etc/rc.d/rtpproxy -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net/rtpproxy/distinfo b/net/rtpproxy/distinfo index b25c19e6681d..8947e2825277 100644 --- a/net/rtpproxy/distinfo +++ b/net/rtpproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602330417 -SHA256 (sippy-rtpproxy-v2.1.1_GH0.tar.gz) = 6404774fca10f5fdac08a2aae080e984e20628199564944608513e79089b4695 -SIZE (sippy-rtpproxy-v2.1.1_GH0.tar.gz) = 1796618 +TIMESTAMP = 1745983536 +SHA256 (rtpproxy-3.1.1.tar.gz) = e6bb3caf748f1dd214cf3184a0c755f24a8a5612122c21f33b97e1606baf972d +SIZE (rtpproxy-3.1.1.tar.gz) = 3819790 diff --git a/net/rtpproxy/files/patch-Makefile.am b/net/rtpproxy/files/patch-Makefile.am new file mode 100644 index 000000000000..68e3987f2d38 --- /dev/null +++ b/net/rtpproxy/files/patch-Makefile.am @@ -0,0 +1,17 @@ +--- Makefile.am.orig 2025-02-25 20:08:44 UTC ++++ Makefile.am +@@ -21,13 +21,9 @@ endif + SUB_LIBRE= libre + endif + +-SUBDIRS= libexecinfo libucl libxxHash $(SUB_LIBRE) makeann $(SUBD_MOD) \ ++SUBDIRS= libexecinfo $(SUB_LIBRE) makeann $(SUBD_MOD) \ + $(SUBD_ELP) src $(SUBD_UDCNT) \ + $(SUBD_EAUD) ${SUBD_DOCS} +- +-if TESTS_EXIST +-SUBDIRS += tests +-endif + + dist_man_MANS= rtpproxy.8 + EXTRA_DIST= README.remote doc rpm/rtpproxy.init rpm/rtpproxy.spec \ diff --git a/net/rtpproxy/files/patch-configure.ac b/net/rtpproxy/files/patch-configure.ac new file mode 100644 index 000000000000..f9d05c54149f --- /dev/null +++ b/net/rtpproxy/files/patch-configure.ac @@ -0,0 +1,19 @@ +--- configure.ac.orig 2025-02-25 20:08:44 UTC ++++ configure.ac +@@ -477,14 +477,10 @@ AC_CONFIG_FILES([Makefile src/Makefile makeann/Makefil + AC_CONFIG_FILES([Makefile src/Makefile makeann/Makefile + extractaudio/Makefile libexecinfo/Makefile modules/Makefile + modules/acct_csv/Makefile modules/acct_rtcp_hep/Makefile +- modules/catch_dtmf/Makefile modules/badmod/Makefile libxxHash/Makefile ++ modules/catch_dtmf/Makefile modules/badmod/Makefile + libre/Makefile modules/dtls_gw/Makefile modules/ice_lite/Makefile +- pertools/Makefile pertools/udp_contention/Makefile libucl/Makefile ++ pertools/Makefile pertools/udp_contention/Makefile + python/sippy_lite/sippy/Time/clock_dtime.py doc/Makefile]) +- +-AM_COND_IF([TESTS_EXIST], [ +- AC_CONFIG_FILES([tests/Makefile]) +-]) + + AM_COND_IF([BUILD_ELPERIODIC], [ + ac_configure_args="$ac_configure_args \"CFLAGS=$CFLAGS\"" diff --git a/net/rtpproxy/files/patch-libxxHash_rtpp__xxHash.h b/net/rtpproxy/files/patch-libxxHash_rtpp__xxHash.h new file mode 100644 index 000000000000..be93ecc08c7a --- /dev/null +++ b/net/rtpproxy/files/patch-libxxHash_rtpp__xxHash.h @@ -0,0 +1,8 @@ +--- libxxHash/rtpp_xxHash.h.orig 2026-08-02 15:45:18 UTC ++++ libxxHash/rtpp_xxHash.h +@@ -27,4 +27,4 @@ + + #pragma once + #define XXH_INLINE_ALL +-#include "../external/xxHash/xxhash.h" ++#include <xxhash.h> diff --git a/net/rtpproxy/files/patch-scripts_rtpproxy.in.freebsd b/net/rtpproxy/files/patch-scripts_rtpproxy.in.freebsd index b5ba68cef5d5..5eba97184d71 100644 --- a/net/rtpproxy/files/patch-scripts_rtpproxy.in.freebsd +++ b/net/rtpproxy/files/patch-scripts_rtpproxy.in.freebsd @@ -1,4 +1,4 @@ ---- scripts/rtpproxy.in.freebsd.orig 2015-03-09 17:40:27 UTC +--- scripts/rtpproxy.in.freebsd.orig 2025-02-25 20:08:44 UTC +++ scripts/rtpproxy.in.freebsd @@ -1,28 +1,36 @@ #!/bin/sh @@ -20,12 +20,12 @@ name=rtpproxy -rcvar=`set_rcvar` -- --command="${prefix}/bin/rtpproxy" --pidfile="/var/run/rtpproxy.pid" +desc="rtpproxy daemon startup script" +rcvar=rtpproxy_enable +-command="${prefix}/bin/rtpproxy" +-pidfile="/var/run/rtpproxy.pid" +- load_rc_config ${name} +prefix=%%PREFIX%% diff --git a/net/rtpproxy/files/patch-src_Makefile.am b/net/rtpproxy/files/patch-src_Makefile.am new file mode 100644 index 000000000000..e66e2740706f --- /dev/null +++ b/net/rtpproxy/files/patch-src_Makefile.am @@ -0,0 +1,29 @@ +--- src/Makefile.am.orig 2025-02-25 20:08:44 UTC ++++ src/Makefile.am +@@ -78,8 +78,8 @@ rtpproxy_LDADD=librtpproxy.la -lm -lpthread + BASE_SOURCES+=rtpp_modman.c + + rtpproxy_LDADD=librtpproxy.la -lm -lpthread +-rtpproxy_debug_LDADD=-lm -lpthread @LIBS_ELPERIODIC@ $(top_srcdir)/libucl/libucl_debug.la \ +- $(XXH_DIR)/libxxHash_debug.la $(RTPP_MEMDEB_LDADD) ++rtpproxy_debug_LDADD=-lm -lpthread @LIBS_ELPERIODIC@ -lucl \ ++ -lxxhash $(RTPP_MEMDEB_LDADD) + rtpproxy_debug_LDFLAGS=-Wl,--export-dynamic $(LTO_FLAG) + rtpproxy_LDFLAGS=$(LTO_FLAG) + +@@ -178,12 +178,12 @@ librtpproxy_la_SOURCES = $(BASE_SOURCES) $(SRCS_AUTOGE + + librtpproxy_la_SOURCES = $(BASE_SOURCES) $(SRCS_AUTOGEN) \ + rtpp_refcnt.c rtpp_refcnt.h rtpp_mallocs.c rtpp_mallocs.h \ +- $(top_srcdir)/libucl/libucl.la $(XXH_DIR)/libxxHash.la \ ++ -lucl -lxxhash \ + rtpp_module_if_static.c rtpp_module_if_static.h + librtpproxy_la_CFLAGS = $(rtpproxy_CFLAGS) -fPIC + librtpproxy_la_CPPFLAGS = $(rtpproxy_CPPFLAGS) -DLIBRTPPROXY +-librtpproxy_la_LIBADD = $(top_srcdir)/libucl/libucl.la \ +- $(XXH_DIR)/libxxHash.la ++librtpproxy_la_LIBADD = -lucl \ ++ -lxxhash + if BUILD_MODULES + librtpproxy_la_LIBADD += $(MOD_DIR)/catch_dtmf/librtpp_catch_dtmf.la \ + $(MOD_DIR)/acct_csv/librtpp_acct_csv.la \ diff --git a/net/rtpproxy/pkg-plist b/net/rtpproxy/pkg-plist index f43ff315e937..bbeb479b3566 100644 --- a/net/rtpproxy/pkg-plist +++ b/net/rtpproxy/pkg-plist @@ -1,7 +1,17 @@ -etc/rc.d/rtpproxy +bin/extractaudio bin/makeann bin/rtpproxy bin/rtpproxy_debug +%%X86%%bin/udp_contention +etc/rc.d/rtpproxy lib/rtpproxy/rtpp_acct_csv.so lib/rtpproxy/rtpp_acct_csv_debug.so +lib/rtpproxy/rtpp_acct_rtcp_hep.so +lib/rtpproxy/rtpp_acct_rtcp_hep_debug.so +lib/rtpproxy/rtpp_catch_dtmf.so +lib/rtpproxy/rtpp_catch_dtmf_debug.so +lib/rtpproxy/rtpp_dtls_gw.so +lib/rtpproxy/rtpp_dtls_gw_debug.so +lib/rtpproxy/rtpp_ice_lite.so +lib/rtpproxy/rtpp_ice_lite_debug.so share/man/man8/rtpproxy.8.gzhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a70aeb8.39360.2ba57b4f>