From c1701ce00138fe9f09c899aad0702f2acd2951c5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Nov 20 2018 09:52:37 +0000 Subject: OpenSIPS ver. 2.3.6 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index f089b0e..5a45673 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ opensips-1.6.3-tls_src.tar.gz /opensips-2.3.3.tar.gz /opensips-2.3.4.tar.gz /opensips-2.3.5.tar.gz +/opensips-2.3.6.tar.gz diff --git a/opensips-0001-Consistently-use-rtpproxy-switches.patch b/opensips-0001-Consistently-use-rtpproxy-switches.patch index edf90fb..b4591d4 100644 --- a/opensips-0001-Consistently-use-rtpproxy-switches.patch +++ b/opensips-0001-Consistently-use-rtpproxy-switches.patch @@ -18,10 +18,10 @@ index 0b378cba5..6f7b79160 100644 diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c -index 1cc3db1d6..7f32cfa99 100644 +index 9b976ffeb..b748a1214 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c -@@ -3543,8 +3543,6 @@ force_rtp_proxy_body(struct sip_msg* msg, struct force_rtpp_args *args, pv_spec_ +@@ -3544,8 +3544,6 @@ force_rtp_proxy_body(struct sip_msg* msg, struct force_rtpp_args *args, pv_spec_ enable_notification = 1; break; diff --git a/opensips-0008-Dont-try-modifying-CFLAGS.patch b/opensips-0008-Dont-try-modifying-CFLAGS.patch index 7b07533..062a4b1 100644 --- a/opensips-0008-Dont-try-modifying-CFLAGS.patch +++ b/opensips-0008-Dont-try-modifying-CFLAGS.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont' try modifying CFLAGS Signed-off-by: Peter Lemenkov diff --git a/Makefile.defs b/Makefile.defs -index 65d8082c9..47a9ca10a 100644 +index 05782806d..b23ce6484 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -793,525 +793,8 @@ endif diff --git a/opensips-0010-Change-file-mode-to-644.patch b/opensips-0010-Change-file-mode-to-644.patch deleted file mode 100644 index c001429..0000000 --- a/opensips-0010-Change-file-mode-to-644.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 20 Sep 2018 13:13:39 +0300 -Subject: [PATCH] Change file mode to 644 - -Signed-off-by: Peter Lemenkov - -diff --git a/modules/call_center/call_center.c b/modules/call_center/call_center.c -old mode 100755 -new mode 100644 -diff --git a/modules/call_center/cc_data.c b/modules/call_center/cc_data.c -old mode 100755 -new mode 100644 -diff --git a/modules/call_center/cc_data.h b/modules/call_center/cc_data.h -old mode 100755 -new mode 100644 -diff --git a/modules/call_center/cc_db.c b/modules/call_center/cc_db.c -old mode 100755 -new mode 100644 -diff --git a/modules/call_center/cc_db.h b/modules/call_center/cc_db.h -old mode 100755 -new mode 100644 -diff --git a/modules/emergency/subscriber_emergency.c b/modules/emergency/subscriber_emergency.c -old mode 100755 -new mode 100644 diff --git a/opensips-0010-Explicitly-use-Python2.patch b/opensips-0010-Explicitly-use-Python2.patch new file mode 100644 index 0000000..1b5dd5f --- /dev/null +++ b/opensips-0010-Explicitly-use-Python2.patch @@ -0,0 +1,36 @@ +From: Peter Lemenkov +Date: Thu, 20 Sep 2018 13:17:07 +0300 +Subject: [PATCH] Explicitly use Python2 + +Signed-off-by: Peter Lemenkov + +diff --git a/scripts/dbtextdb/__init__.py b/scripts/dbtextdb/__init__.py +index 1041be860..3d3bfde22 100644 +--- a/scripts/dbtextdb/__init__.py ++++ b/scripts/dbtextdb/__init__.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright 2008 Google Inc. All Rights Reserved. + +diff --git a/scripts/dbtextdb/dbtextdb.py b/scripts/dbtextdb/dbtextdb.py +index 3cd866f02..98038820b 100755 +--- a/scripts/dbtextdb/dbtextdb.py ++++ b/scripts/dbtextdb/dbtextdb.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright 2008 Google Inc. All Rights Reserved. + +diff --git a/scripts/dbtextdb/dbtextdb_test.py b/scripts/dbtextdb/dbtextdb_test.py +index ecbab0674..ecdff6851 100644 +--- a/scripts/dbtextdb/dbtextdb_test.py ++++ b/scripts/dbtextdb/dbtextdb_test.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # + # Copyright 2008 Google Inc. All Rights Reserved. + diff --git a/opensips-0011-Explicitly-use-Python2.patch b/opensips-0011-Explicitly-use-Python2.patch deleted file mode 100644 index 1b5dd5f..0000000 --- a/opensips-0011-Explicitly-use-Python2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 20 Sep 2018 13:17:07 +0300 -Subject: [PATCH] Explicitly use Python2 - -Signed-off-by: Peter Lemenkov - -diff --git a/scripts/dbtextdb/__init__.py b/scripts/dbtextdb/__init__.py -index 1041be860..3d3bfde22 100644 ---- a/scripts/dbtextdb/__init__.py -+++ b/scripts/dbtextdb/__init__.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # - # Copyright 2008 Google Inc. All Rights Reserved. - -diff --git a/scripts/dbtextdb/dbtextdb.py b/scripts/dbtextdb/dbtextdb.py -index 3cd866f02..98038820b 100755 ---- a/scripts/dbtextdb/dbtextdb.py -+++ b/scripts/dbtextdb/dbtextdb.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # - # Copyright 2008 Google Inc. All Rights Reserved. - -diff --git a/scripts/dbtextdb/dbtextdb_test.py b/scripts/dbtextdb/dbtextdb_test.py -index ecbab0674..ecdff6851 100644 ---- a/scripts/dbtextdb/dbtextdb_test.py -+++ b/scripts/dbtextdb/dbtextdb_test.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # - # Copyright 2008 Google Inc. All Rights Reserved. - diff --git a/opensips.spec b/opensips.spec index 9654736..27fb5d0 100644 --- a/opensips.spec +++ b/opensips.spec @@ -4,7 +4,7 @@ Summary: Open Source SIP Server Name: opensips -Version: 2.3.5 +Version: 2.3.6 Release: 1%{?dist} License: GPLv2+ Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -21,11 +21,8 @@ Patch8: opensips-0008-Dont-try-modifying-CFLAGS.patch # Backported from master branch Patch9: opensips-0009-sst-fix-MIN-SE-header-printing.patch -# Will be proposed to upstream -Patch10: opensips-0010-Change-file-mode-to-644.patch - # Fedora-specific patches -Patch11: opensips-0011-Explicitly-use-Python2.patch +Patch10: opensips-0010-Explicitly-use-Python2.patch # Backported from 2.3 branch # none @@ -1359,6 +1356,9 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \ %changelog +* Tue Nov 20 2018 Peter Lemenkov - 2.3.6-1 +- Ver. 2.3.6 + * Thu Sep 20 2018 Peter Lemenkov - 2.3.5-1 - Ver. 2.3.5 diff --git a/sources b/sources index 6726f51..892a50d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opensips-2.3.5.tar.gz) = 0eebd3f0eafcf8742801eda3398719565f7747fd9a2c8bf06e624d985dec59564e930144954d8c7a9acf2ca9a9fceff81db58e6833f2c4acd40f172a62ea778a +SHA512 (opensips-2.3.6.tar.gz) = 238dda27b86a5a2c00bb1e1bbf5b0b95e4efd349ab735d5c712d76f878a944f9e11a47a6c96eea7702c4f89ab9836d44a358e5ea996c9a4931f858a19f4cdd74