diff --git a/opensips-0001-Consistently-use-rtpproxy-switches.patch b/opensips-0001-Consistently-use-rtpproxy-switches.patch index 0c8c1bf..1a54ba1 100644 --- a/opensips-0001-Consistently-use-rtpproxy-switches.patch +++ b/opensips-0001-Consistently-use-rtpproxy-switches.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Consistently use rtpproxy switches Signed-off-by: Peter Lemenkov diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml -index 21a8884b3..d0bcd8877 100644 +index 9e1cd41ac..e253f0317 100644 --- a/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy/doc/rtpproxy_admin.xml -@@ -577,7 +577,7 @@ modparam("rtpproxy", "rtpp_notify_socket", "/tmp/rtpproxy.unix") +@@ -635,7 +635,7 @@ modparam("rtpproxy", "generated_sdp_media_ip", "10.0.0.1") connection information. @@ -18,10 +18,10 @@ index 21a8884b3..d0bcd8877 100644 diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c -index 161b43f3c..e243f5636 100644 +index 8cbbd00f5..bf6317ace 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c -@@ -3414,8 +3414,6 @@ static int rtpproxy_offer_answer(struct sip_msg *msg, struct rtpp_args *args, +@@ -3546,8 +3546,6 @@ static int rtpproxy_offer_answer(struct sip_msg *msg, struct rtpp_args *args, } break; diff --git a/opensips-0004-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch b/opensips-0004-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch index 3f34316..efd57f3 100644 --- a/opensips-0004-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch +++ b/opensips-0004-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Return actual payload ID in case of a dynamic payload Signed-off-by: Peter Lemenkov diff --git a/modules/sipmsgops/codecs.c b/modules/sipmsgops/codecs.c -index eee397af7..cb8f35e81 100644 +index e292a81f9..37167984b 100644 --- a/modules/sipmsgops/codecs.c +++ b/modules/sipmsgops/codecs.c @@ -28,6 +28,7 @@ diff --git a/opensips-0008-Fix-var-run-to-run.patch b/opensips-0008-Fix-var-run-to-run.patch deleted file mode 100644 index 7269696..0000000 --- a/opensips-0008-Fix-var-run-to-run.patch +++ /dev/null @@ -1,213 +0,0 @@ -From: Alexey Vasilyev -Date: Thu, 24 Mar 2022 10:57:04 +0000 -Subject: [PATCH] Fix /var/run to /run - -Filesystem Hierarchy Standard 3.0 released in 2015. -It's time to fix /var/run to /run - -diff --git a/etc/opensips.cfg b/etc/opensips.cfg -index 1f44c41b5..9a2960c7b 100644 ---- a/etc/opensips.cfg -+++ b/etc/opensips.cfg -@@ -69,7 +69,7 @@ loadmodule "sipmsgops.so" - - #### FIFO Management Interface - loadmodule "mi_fifo.so" --modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo") -+modparam("mi_fifo", "fifo_name", "/run/opensips/opensips_fifo") - modparam("mi_fifo", "fifo_mode", 0666) - - #### USeR LOCation module -diff --git a/modules/acc/etc/radiusclient.conf b/modules/acc/etc/radiusclient.conf -index 3b3ea1932..b03720330 100644 ---- a/modules/acc/etc/radiusclient.conf -+++ b/modules/acc/etc/radiusclient.conf -@@ -61,7 +61,7 @@ login_radius /usr/local/sbin/login.radius - # - # if opensips don't run as root, this directory should be used - # the debian init script for example use this location --seqfile /var/run/opensips/opensips_radius.seq -+seqfile /run/opensips/opensips_radius.seq - - # file which specifies mapping between ttyname and NAS-Port attribute - mapfile /usr/local/etc/radiusclient/port-id-map -diff --git a/modules/call_control/call_control.c b/modules/call_control/call_control.c -index 438bda432..c449b49b9 100644 ---- a/modules/call_control/call_control.c -+++ b/modules/call_control/call_control.c -@@ -126,7 +126,7 @@ int parse_stop(unsigned int type, void *val); - - // Local global variables - static CallControlSocket callcontrol_socket = { -- "/var/run/callcontrol/socket", // name -+ "/run/callcontrol/socket", // name - -1, // sock - 500, // timeout in 500 milliseconds if there is no answer - 0, // time of the last failure -diff --git a/modules/call_control/doc/call_control_admin.xml b/modules/call_control/doc/call_control_admin.xml -index 8378268fc..99bdf013b 100644 ---- a/modules/call_control/doc/call_control_admin.xml -+++ b/modules/call_control/doc/call_control_admin.xml -@@ -223,7 +223,7 @@ modparam("call_control", "disable", 1) - - - Default value is -- /var/run/callcontrol/socket. -+ /run/callcontrol/socket. - - - -@@ -231,7 +231,7 @@ modparam("call_control", "disable", 1) - Setting the <varname>socket_name</varname> parameter - - ... --modparam("call_control", "socket_name", "/var/run/callcontrol/socket") -+modparam("call_control", "socket_name", "/run/callcontrol/socket") - ... - - -diff --git a/modules/mediaproxy/doc/mediaproxy_admin.xml b/modules/mediaproxy/doc/mediaproxy_admin.xml -index 7609542c0..6f6794b8f 100644 ---- a/modules/mediaproxy/doc/mediaproxy_admin.xml -+++ b/modules/mediaproxy/doc/mediaproxy_admin.xml -@@ -173,7 +173,7 @@ modparam("mediaproxy", "disable", 1) - - - Default value is -- /var/run/mediaproxy/dispatcher.sock. -+ /run/mediaproxy/dispatcher.sock. - - - -@@ -181,7 +181,7 @@ modparam("mediaproxy", "disable", 1) - Setting the <varname>mediaproxy_socket</varname> parameter - - ... --modparam("mediaproxy", "mediaproxy_socket", "/var/run/mediaproxy/dispatcher.sock") -+modparam("mediaproxy", "mediaproxy_socket", "/run/mediaproxy/dispatcher.sock") - ... - - -diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c -index 5e606ac66..d1c9db932 100644 ---- a/modules/mediaproxy/mediaproxy.c -+++ b/modules/mediaproxy/mediaproxy.c -@@ -177,7 +177,7 @@ static int mediaproxy_disabled = False; - static str ice_candidate = str_init("none"); - - static MediaproxySocket mediaproxy_socket = { -- "/var/run/mediaproxy/dispatcher.sock", // name -+ "/run/mediaproxy/dispatcher.sock", // name - -1, // sock - 500, // timeout in 500 milliseconds if there is no answer - 0, // time of the last failure -diff --git a/modules/mi_fifo/doc/mi_fifo_admin.xml b/modules/mi_fifo/doc/mi_fifo_admin.xml -index cebae251d..743869d76 100644 ---- a/modules/mi_fifo/doc/mi_fifo_admin.xml -+++ b/modules/mi_fifo/doc/mi_fifo_admin.xml -@@ -105,7 +105,7 @@ - you are getting this error while trying to use - opensips-cli, you can fix it by either store - the fifo file in a non-sticky bit directory (such as -- /var/run/opensips), or disable the fifo -+ /run/opensips), or disable the fifo - protection using sysctl fs.protected_fifos = 0 - (NOT RECOMMENDED). - -diff --git a/modules/nat_traversal/doc/nat_traversal_admin.xml b/modules/nat_traversal/doc/nat_traversal_admin.xml -index 8b05da15d..f11583a31 100644 ---- a/modules/nat_traversal/doc/nat_traversal_admin.xml -+++ b/modules/nat_traversal/doc/nat_traversal_admin.xml -@@ -487,7 +487,7 @@ modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: OpenSIPS\r\nX- - Setting the <varname>keepalive_state_file</varname> parameter - - ... --modparam("nat_traversal", "keepalive_state_file", "/var/run/opensips/keepalive_state") -+modparam("nat_traversal", "keepalive_state_file", "/run/opensips/keepalive_state") - ... - - -diff --git a/packaging/arch/opensips.tmpfiles.conf b/packaging/arch/opensips.tmpfiles.conf -index 16f903159..2951b891c 100644 ---- a/packaging/arch/opensips.tmpfiles.conf -+++ b/packaging/arch/opensips.tmpfiles.conf -@@ -1 +1 @@ --d /var/run/opensips 0755 opensips opensips -+d /run/opensips 0755 opensips opensips -diff --git a/packaging/debian/opensips.init b/packaging/debian/opensips.init -index e95910645..0a2a66617 100644 ---- a/packaging/debian/opensips.init -+++ b/packaging/debian/opensips.init -@@ -25,7 +25,7 @@ DESC=opensips - CFGFILE=/etc/opensips/opensips.cfg - M4CFGFILE=/etc/opensips/opensips.m4 - M4ARCHIVEDIR=/etc/opensips/archive --HOMEDIR=/var/run/opensips -+HOMEDIR=/run/opensips - PIDFILE=$HOMEDIR/$NAME.pid - DEFAULTS=/etc/default/opensips - RUN_OPENSIPS=no -@@ -69,9 +69,9 @@ create_radius_seqfile () - # write to the file. If the file exists before opensips starts, it - # won't change it's ownership and will be writable for both root - # and opensips, no matter what options are chosen at install time -- RADIUS_SEQ_FILE=/var/run/opensips/opensips_radius.seq -- if [ -d /var/run/opensips ]; then -- chown ${USER}:${GROUP} /var/run/opensips -+ RADIUS_SEQ_FILE=/run/opensips/opensips_radius.seq -+ if [ -d /run/opensips ]; then -+ chown ${USER}:${GROUP} /run/opensips - - if [ ! -f $RADIUS_SEQ_FILE ]; then - touch $RADIUS_SEQ_FILE -@@ -108,7 +108,7 @@ case "$1" in - check_opensips_config - create_radius_seqfile - -- # dirs under /var/run will go away on reboot. -+ # dirs under /run will go away on reboot. - mkdir -p "$HOMEDIR" - chmod 775 "$HOMEDIR" - chown "$USER:$GROUP" "$HOMEDIR" >/dev/null 2>&1 || true -diff --git a/packaging/debian/opensips.postinst b/packaging/debian/opensips.postinst -index 7460d3060..f6d97e601 100644 ---- a/packaging/debian/opensips.postinst -+++ b/packaging/debian/opensips.postinst -@@ -4,7 +4,7 @@ - - PKG=opensips - DEFAULTS=/etc/default/opensips --HOMEDIR=/var/run/opensips -+HOMEDIR=/run/opensips - - set -e - -diff --git a/packaging/redhat_fedora/opensips.init b/packaging/redhat_fedora/opensips.init -index bbc6bc5f7..a29327001 100644 ---- a/packaging/redhat_fedora/opensips.init -+++ b/packaging/redhat_fedora/opensips.init -@@ -6,7 +6,7 @@ - # description: OpenSIPS is a fast SIP Server. - # - # processname: opensips --# pidfile: /var/run/opensips.pid -+# pidfile: /run/opensips.pid - # config: /etc/opensips/opensips.cfg - # - ### BEGIN INIT INFO -@@ -23,7 +23,7 @@ - prog=opensips - opensips=/usr/sbin/$prog - cfgdir="/etc/$prog" --pidfile="/var/run/$prog.pid" -+pidfile="/run/$prog.pid" - lockfile="/var/lock/subsys/$prog" - configfile="$cfgdir/$prog.cfg" - m4configfile="$cfgdir/$prog.m4" -diff --git a/packaging/redhat_fedora/opensips.tmpfiles.conf b/packaging/redhat_fedora/opensips.tmpfiles.conf -index 16f903159..2951b891c 100644 ---- a/packaging/redhat_fedora/opensips.tmpfiles.conf -+++ b/packaging/redhat_fedora/opensips.tmpfiles.conf -@@ -1 +1 @@ --d /var/run/opensips 0755 opensips opensips -+d /run/opensips 0755 opensips opensips diff --git a/opensips.spec b/opensips.spec index 6b15dd7..5592534 100644 --- a/opensips.spec +++ b/opensips.spec @@ -4,7 +4,7 @@ Summary: Open Source SIP Server Name: opensips -Version: 3.2.7 +Version: 3.3.0 Release: 1%{?dist} License: GPLv2+ Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -18,7 +18,6 @@ Patch006: opensips-0006-tm-clone-message-in-async-mode-only-in-request-route.pat %if 0%{?fedora} >= 34 Patch007: opensips-0007-libcouchbase-API-v3.patch %endif -Patch008: opensips-0008-Fix-var-run-to-run.patch URL: https://opensips.org @@ -438,6 +437,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Mmgeoip is a lightweight wrapper for the MaxMind GeoIP API. It adds IP address-to-location lookup capability to OpenSIPS scripts. +%package msrp +Summary: MSRP support +BuildRequires: pkgconfig(openssl) +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-b2bua%{?_isa} = %{version}-%{release} +Requires: %{name}-tls_mgm%{?_isa} = %{version}-%{release} + +%description msrp +This module provides the MSRP support for OpenSIPS. This includes MSRP UA, MSRP +gateway between SIP MESSAGE and MSRP, MSRP relay as describned in RFC 4976. + %package peering Summary: Radius peering Requires: %{name}%{?_isa} = %{version}-%{release} @@ -1016,7 +1026,9 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \ %{_libdir}/opensips/modules/sql_cacher.so %{_libdir}/opensips/modules/sst.so %{_libdir}/opensips/modules/statistics.so +%{_libdir}/opensips/modules/status_report.so %{_libdir}/opensips/modules/stun.so +%{_libdir}/opensips/modules/tcp_mgm.so %{_libdir}/opensips/modules/textops.so %{_libdir}/opensips/modules/tm.so %{_libdir}/opensips/modules/topology_hiding.so @@ -1107,7 +1119,9 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \ %doc docdir/README.sql_cacher %doc docdir/README.sst %doc docdir/README.statistics +%doc docdir/README.status_report %doc docdir/README.stun +%doc docdir/README.tcp_mgm %doc docdir/README.textops %doc docdir/README.tm %doc docdir/README.topology_hiding @@ -1139,9 +1153,11 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \ %{_libdir}/opensips/modules/b2b_entities.so %{_libdir}/opensips/modules/b2b_logic.so %{_libdir}/opensips/modules/b2b_sca.so +%{_libdir}/opensips/modules/b2b_sdp_demux.so %doc docdir/README.b2b_entities %doc docdir/README.b2b_logic %doc docdir/README.b2b_sca +%doc docdir/README.b2b_sdp_demux %files cachedb_couchbase %{_libdir}/opensips/modules/cachedb_couchbase.so @@ -1302,6 +1318,16 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \ %{_libdir}/opensips/modules/mmgeoip.so %doc docdir/README.mmgeoip +%files msrp +%{_libdir}/opensips/modules/msrp_gateway.so +%{_libdir}/opensips/modules/msrp_relay.so +%{_libdir}/opensips/modules/msrp_ua.so +%{_libdir}/opensips/modules/proto_msrp.so +%doc docdir/README.msrp_gateway +%doc docdir/README.msrp_relay +%doc docdir/README.msrp_ua +%doc docdir/README.proto_msrp + %files peering %{_libdir}/opensips/modules/peering.so %doc docdir/README.peering @@ -1469,6 +1495,9 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \ %changelog +* Wed Jul 20 2022 Peter Lemenkov - 3.3.0-1 +- Ver. 3.3.0 + * Tue Jul 5 2022 Peter Lemenkov - 3.2.7-1 - Ver. 3.2.7 diff --git a/sources b/sources index 7bceea9..1f80409 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opensips-3.2.7.tar.gz) = 15ee9a198a86891a0c916f8e71d8773776773c89104acba90f43b91529a2c5cac3f2cdea09e02de9d61e11f3102814e348b191ccb87e0fb489abb180be0d0849 +SHA512 (opensips-3.3.0.tar.gz) = 2d3c6e6115e6e1b1ef42fb038c20de65403eb1bbec6954fc9e59e7191f939f1b5534b076a034501fdb5271af0621c0a1ffd6d9582df67ad278f35075b1e8372e