[opensips] Ver. 1.8.1
Peter Lemenkov
peter at fedoraproject.org
Wed Aug 15 17:03:48 UTC 2012
commit dd6e1a3497d583f8088ba64370c728959fbe6071
Author: Fedora Build <lemenkov at gmail.com>
Date: Wed Aug 15 21:03:38 2012 +0400
Ver. 1.8.1
Signed-off-by: Fedora Build <lemenkov at gmail.com>
.gitignore | 1 +
...s-0001-Consistently-use-rtpproxy-switches.patch | 40 ++++++
...edora-Improve-packaging-for-Fedora-RHEL-a.patch | 91 -------------
opensips-0002-Cleanup-Oracle-s-makefiles.patch | 141 ++++++++++++++++++++
opensips-0002-backport-from-trunk-rev-9099.patch | 27 ----
opensips-0003-Backported-from-trunk-rev-9121.patch | 40 ------
...n-types-to-NULL-upon-freeing-resultset-co.patch | 8 +-
opensips-0004-db_oracle-typo-fixes.patch | 129 ------------------
...opensips-0004-fixed-DB-type-inconsistency.patch | 8 +-
...sips-0005-Drop-rpath-from-Oracle-s-module.patch | 42 ------
...-async-Oracle-operations-they-didn-t-work.patch | 39 ++++--
opensips-0006-Clean-Makefile-for-Oracle.patch | 72 ----------
...-Don-t-fetch-the-last-record-use-next-one.patch | 26 ----
opensips-0008-Fix-SQL-types.patch | 58 --------
opensips-0011-Proper-memory-zeroing.patch | 27 ----
...ips-0012-Free-columns-data-only-in-Oracle.patch | 35 -----
opensips.spec | 41 ++----
sources | 2 +-
18 files changed, 231 insertions(+), 596 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd193d0..15d1756 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ opensips-1.6.3-tls_src.tar.gz
/opensips-1.7.1_src.tar.gz
/opensips-1.7.2_src.tar.gz
/opensips-1.8.0-beta_src.tar.gz
+/opensips-1.8.1_src.tar.gz
diff --git a/opensips-0001-Consistently-use-rtpproxy-switches.patch b/opensips-0001-Consistently-use-rtpproxy-switches.patch
new file mode 100644
index 0000000..321ef35
--- /dev/null
+++ b/opensips-0001-Consistently-use-rtpproxy-switches.patch
@@ -0,0 +1,40 @@
+From f0981bcbe43ec290fa18bebbe1d63b1d74c19391 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 11 Aug 2011 16:37:04 +0400
+Subject: [PATCH 1/5] Consistently use rtpproxy switches
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ modules/rtpproxy/doc/rtpproxy_admin.xml | 2 +-
+ modules/rtpproxy/rtpproxy.c | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml
+index 01dbffd..fc3da42 100644
+--- a/modules/rtpproxy/doc/rtpproxy_admin.xml
++++ b/modules/rtpproxy/doc/rtpproxy_admin.xml
+@@ -545,7 +545,7 @@ rtpproxy_offer();
+ connection information.
+ </para></listitem>
+ <listitem><para>
+- <emphasis>s/w</emphasis> - flags that for the UA from which
++ <emphasis>s</emphasis> - flags that for the UA from which
+ message is received, support symmetric RTP must be forced.
+ </para></listitem>
+ <listitem><para>
+diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
+index 073d05f..eda5c84 100644
+--- a/modules/rtpproxy/rtpproxy.c
++++ b/modules/rtpproxy/rtpproxy.c
+@@ -3028,8 +3028,6 @@ force_rtp_proxy_body(struct sip_msg* msg, struct force_rtpp_args *args)
+ enable_notification = 1;
+ break;
+
+- case 'w':
+- case 'W':
+ case 's':
+ case 'S':
+ if (append_opts(&opts, 'S') == -1) {
+--
+1.7.11.2
+
diff --git a/opensips-0002-Cleanup-Oracle-s-makefiles.patch b/opensips-0002-Cleanup-Oracle-s-makefiles.patch
new file mode 100644
index 0000000..084ec54
--- /dev/null
+++ b/opensips-0002-Cleanup-Oracle-s-makefiles.patch
@@ -0,0 +1,141 @@
+From fa56a2c404360e368a3a9d2f8f94c3580ad69439 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov at gmail.com>
+Date: Thu, 14 Jun 2012 11:38:48 +0400
+Subject: [PATCH 2/5] Cleanup Oracle's makefiles
+
+Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
+---
+ modules/db_oracle/Makefile | 54 ++--------------------------------------------
+ utils/db_oracle/Makefile | 52 ++------------------------------------------
+ 2 files changed, 4 insertions(+), 102 deletions(-)
+
+diff --git a/modules/db_oracle/Makefile b/modules/db_oracle/Makefile
+index 6b7e685..a721aba 100644
+--- a/modules/db_oracle/Makefile
++++ b/modules/db_oracle/Makefile
+@@ -6,57 +6,7 @@ include ../../Makefile.defs
+ auto_gen=
+ NAME=db_oracle.so
+
+-# can be defined for non standard placement of oracle so's
+-ORAPATH=
+-LIBS=
+-
+-# use for multiple client sdk version install
+-ifneq ($(ORAVERSION),)
+- ORAVERDIR=/$(ORAVERSION)
+-endif
+-
+-# use include/library path's for full client installation
+-ifneq ($(ORAHOME),)
+- DEFS +=-I$(ORAHOME)/include
+- LIBS +=-L$(ORAHOME)/lib
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(ORAHOME)/lib
+-endif
+-else
+-# use standard know paths oci.h locations (linux)
+-DEFS +=-I$(LOCALBASE)/include/oracle$(ORAVERDIR) \
+- -I$(SYSBASE)/include/oracle$(ORAVERDIR)
+-endif
+-
+-# search 'so' path if it non standard (possible liboclntsh locations on linux)
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(LOCALBASE)/lib64/oracle$(ORAVERDIR) )
+-endif
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(SYSBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(SYSBASE)/lib64/oracle$(ORAVERDIR) )
+-endif
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
+-endif
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
+-endif
+-
+-ifneq ($(ORAPATH),)
+- LIBS +=-L$(ORAPATH)
+-endif
+-
+-LIBS +=-locci -lclntsh
+-
+-#DEFS+=-DLINUX -D_GNU_SOURCE -D_REENTRANT
+-#LIBS+=-lpthread
+-
+-ifneq ($(ORAPATH),)
+- LIBS +=-Wl,-rpath $(ORAPATH)
+-endif
++DEFS +=-I$(ORAHOME)/include
++LIBS +=-L$(ORAHOME)/lib -locci -lclntsh
+
+ include ../../Makefile.modules
+diff --git a/utils/db_oracle/Makefile b/utils/db_oracle/Makefile
+index b1c8231..9565134 100644
+--- a/utils/db_oracle/Makefile
++++ b/utils/db_oracle/Makefile
+@@ -10,56 +10,8 @@ NAME=opensips_orasel
+
+ include ../../Makefile.sources
+
+-ORAPATH=
+-
+-# use for multiple client sdk version install
+-ifneq ($(ORAVERSION),)
+- ORAVERDIR=/$(ORAVERSION)
+-endif
+-
+-# use include/library path's for full client installation
+-ifneq ($(ORAHOME),)
+- DEFS +=-I$(ORAHOME)/include
+- LIBS +=-L$(ORAHOME)/lib
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(ORAHOME)/lib
+-endif
+-else
+-# use standard know paths oci.h locations (linux)
+- DEFS +=-I$(LOCALBASE)/include/oracle$(ORAVERDIR) \
+- -I$(SYSBASE)/include/oracle$(ORAVERDIR)
+-endif
+-
+-# search 'so' path if it non standard (possible liboclntsh locations on linux)
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(LOCALBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(LOCALBASE)/lib64/oracle$(ORAVERDIR) )
+-endif
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(SYSBASE)/lib64/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(SYSBASE)/lib64/oracle$(ORAVERDIR) )
+-endif
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
+-endif
+-ifeq ($(ORAPATH),)
+- ORAPATH=$(shell [ -f $(SYSBASE)/lib/oracle$(ORAVERDIR)/libocci.so ] && \
+- echo $(SYSBASE)/lib/oracle$(ORAVERDIR) )
+-endif
+-
+-ifneq ($(ORAPATH),)
+- LIBS +=-L$(ORAPATH)
+-endif
+-
+-LIBS +=-locci -lclntsh
+-
+-#DEFS +=-DLINUX -D_GNU_SOURCE -D_REENTRANT
+-#LIBS +=-lpthread
+-
+-ifneq ($(ORAPATH),)
+- LIBS +=-Wl,-rpath $(ORAPATH)
+-endif
++DEFS +=-I$(ORAHOME)/include
++LIBS +=-L$(ORAHOME)/lib -locci -lclntsh
+
+ include ../../Makefile.rules
+
+--
+1.7.11.2
+
diff --git a/opensips-0009-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch b/opensips-0003-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch
similarity index 76%
rename from opensips-0009-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch
rename to opensips-0003-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch
index 1136977..c778e4d 100644
--- a/opensips-0009-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch
+++ b/opensips-0003-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch
@@ -1,11 +1,11 @@
-From f45b4ec621335dd1cbd36983cd16bb2c246f29cd Mon Sep 17 00:00:00 2001
+From 1367f5bb674eeb30881a13987cd95d553df0d921 Mon Sep 17 00:00:00 2001
From: vladut-paiu <vladut-paiu at 689a6050-402a-0410-94f2-e92a70836424>
Date: Tue, 3 Jul 2012 09:34:52 +0000
-Subject: [PATCH 09/13] Reset column types to NULL upon freeing resultset
+Subject: [PATCH 3/5] Reset column types to NULL upon freeing resultset
columns Credit to Peter Lemenkov
---
- db/db_res.c | 1 +
+ db/db_res.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/db/db_res.c b/db/db_res.c
@@ -21,5 +21,5 @@ index 78868ec..cbba30f 100644
RES_NAMES(_r) = NULL;
}
--
-1.7.10.4
+1.7.11.2
diff --git a/opensips-0010-fixed-DB-type-inconsistency.patch b/opensips-0004-fixed-DB-type-inconsistency.patch
similarity index 78%
rename from opensips-0010-fixed-DB-type-inconsistency.patch
rename to opensips-0004-fixed-DB-type-inconsistency.patch
index eae9fd9..4deaee5 100644
--- a/opensips-0010-fixed-DB-type-inconsistency.patch
+++ b/opensips-0004-fixed-DB-type-inconsistency.patch
@@ -1,10 +1,10 @@
-From d4f6843c5669ff24460981619338699fba1fb22c Mon Sep 17 00:00:00 2001
+From 491b37a23ae25b5e585f3324dc581d3b5ede0559 Mon Sep 17 00:00:00 2001
From: vladut-paiu <vladut-paiu at 689a6050-402a-0410-94f2-e92a70836424>
Date: Tue, 3 Jul 2012 10:01:52 +0000
-Subject: [PATCH 10/13] fixed DB type inconsistency Credits to Peter Lemenkov
+Subject: [PATCH 4/5] fixed DB type inconsistency Credits to Peter Lemenkov
---
- modules/usrloc/ucontact.c | 4 ++--
+ modules/usrloc/ucontact.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c
@@ -26,5 +26,5 @@ index 17992d5..ea400d2 100644
vals2[4].val.bitmap_val = _c->cflags;
--
-1.7.10.4
+1.7.11.2
diff --git a/opensips-0013-Removed-all-async-Oracle-operations-they-didn-t-work.patch b/opensips-0005-Removed-all-async-Oracle-operations-they-didn-t-work.patch
similarity index 93%
rename from opensips-0013-Removed-all-async-Oracle-operations-they-didn-t-work.patch
rename to opensips-0005-Removed-all-async-Oracle-operations-they-didn-t-work.patch
index 890fd5a..17506e3 100644
--- a/opensips-0013-Removed-all-async-Oracle-operations-they-didn-t-work.patch
+++ b/opensips-0005-Removed-all-async-Oracle-operations-they-didn-t-work.patch
@@ -1,21 +1,21 @@
-From ae9ec4f6793f7278d00d2b93eb671480a4cac40c Mon Sep 17 00:00:00 2001
+From 2097ba18efdfd5f98a726eb1890aa61723b3807e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A1=D0=B0=D0=BC=D1?=
=?UTF-8?q?=83=D1=81=D0=B5=D0=BD=D0=BA=D0=BE?= <samusenko at msm.ru>
Date: Mon, 25 Jun 2012 17:54:27 +0400
-Subject: [PATCH 13/13] Removed all async Oracle operations - they didn't work
+Subject: [PATCH 5/5] Removed all async Oracle operations - they didn't work
well anyway
---
- modules/db_oracle/asynch.c | 270 -----------------------------------------
- modules/db_oracle/asynch.h | 62 ----------
- modules/db_oracle/db_oracle.c | 2 +-
- modules/db_oracle/dbase.c | 53 +++-----
- modules/db_oracle/ora_con.c | 73 ++++-------
- modules/db_oracle/ora_con.h | 3 +-
- modules/db_oracle/res.c | 110 +++++++++--------
- modules/db_oracle/timer.c | 131 ++++++++++++++++++++
- modules/db_oracle/timer.h | 22 ++++
- 9 files changed, 256 insertions(+), 470 deletions(-)
+ modules/db_oracle/asynch.c | 270 ------------------------------------------
+ modules/db_oracle/asynch.h | 62 ----------
+ modules/db_oracle/db_oracle.c | 2 +-
+ modules/db_oracle/dbase.c | 53 +++------
+ modules/db_oracle/ora_con.c | 73 ++++--------
+ modules/db_oracle/ora_con.h | 3 +-
+ modules/db_oracle/res.c | 114 ++++++++++--------
+ modules/db_oracle/timer.c | 131 ++++++++++++++++++++
+ modules/db_oracle/timer.h | 22 ++++
+ 9 files changed, 258 insertions(+), 472 deletions(-)
delete mode 100644 modules/db_oracle/asynch.c
delete mode 100644 modules/db_oracle/asynch.h
create mode 100644 modules/db_oracle/timer.c
@@ -292,7 +292,7 @@ index 5835ffe..7267bee 100644
int uri_len;
diff --git a/modules/db_oracle/res.c b/modules/db_oracle/res.c
-index e9e6233..2c625f8 100644
+index e9e6233..22f10ee 100644
--- a/modules/db_oracle/res.c
+++ b/modules/db_oracle/res.c
@@ -32,7 +32,7 @@
@@ -315,6 +315,17 @@ index e9e6233..2c625f8 100644
/*
* Get and convert columns from a result. Define handlers and buffers
+@@ -211,8 +215,8 @@ set_int:
+ case SQLT_AFC: /* Ansi fixed char */
+ case SQLT_AVC: /* Ansi Var char */
+ // case SQLT_RID: /* rowid */
+- LM_DBG("use DB_STR result type\n");
+- RES_TYPES(_r)[i] = DB_STR;
++ LM_DBG("use DB_STRING result type\n");
++ RES_TYPES(_r)[i] = DB_STRING;
+ dyn_str:
+ dtype = SQLT_CHR;
+ len = 0; /* DATA_SIZE is ub2 */
@@ -362,66 +366,74 @@ static int convert_row(db_res_t* _res, db_row_t* _r, dmap_t* _d)
*/
static int get_rows(ora_con_t* con, db_res_t* _r, OCIStmt* _c, dmap_t* _d)
@@ -606,5 +617,5 @@ index 0000000..24aa4a9
+#endif // ORA_TIMER_H
\ No newline at end of file
--
-1.7.10.4
+1.7.11.2
diff --git a/opensips.spec b/opensips.spec
index 300ad38..4f66cf2 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -17,24 +17,16 @@
Summary: Open Source SIP Server
Name: opensips
-Version: 1.8.0
-Release: 3%{?dist}
+Version: 1.8.1
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Daemons
-Source0: http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-beta_src.tar.gz
-Patch1: opensips-0001-packaging-fedora-Improve-packaging-for-Fedora-RHEL-a.patch
-Patch2: opensips-0002-backport-from-trunk-rev-9099.patch
-Patch3: opensips-0003-Backported-from-trunk-rev-9121.patch
-Patch4: opensips-0004-db_oracle-typo-fixes.patch
-Patch5: opensips-0005-Drop-rpath-from-Oracle-s-module.patch
-Patch6: opensips-0006-Clean-Makefile-for-Oracle.patch
-Patch7: opensips-0007-Don-t-fetch-the-last-record-use-next-one.patch
-Patch8: opensips-0008-Fix-SQL-types.patch
-Patch9: opensips-0009-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch
-Patch10: opensips-0010-fixed-DB-type-inconsistency.patch
-Patch11: opensips-0011-Proper-memory-zeroing.patch
-Patch12: opensips-0012-Free-columns-data-only-in-Oracle.patch
-Patch13: opensips-0013-Removed-all-async-Oracle-operations-they-didn-t-work.patch
+Source0: http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}_src.tar.gz
+Patch1: opensips-0001-Consistently-use-rtpproxy-switches.patch
+Patch2: opensips-0002-Cleanup-Oracle-s-makefiles.patch
+Patch3: opensips-0003-Reset-column-types-to-NULL-upon-freeing-resultset-co.patch
+Patch4: opensips-0004-fixed-DB-type-inconsistency.patch
+Patch5: opensips-0005-Removed-all-async-Oracle-operations-they-didn-t-work.patch
URL: http://opensips.org
BuildRequires: expat-devel
@@ -286,6 +278,7 @@ a MySQL-Database to be used for persistent storage.
Summary: Oracle Storage Support for the OpenSIPS
Group: System Environment/Daemons
Requires: %{name} = %{version}-%{release}
+BuildRequires: oracle-instantclient-devel
%description oracle
The %{name}-oracle package contains the Oracle plugin for %{name}, which allows
@@ -612,22 +605,14 @@ the exchange of instant messages between SIP clients and XMPP(jabber)
clients.
%prep
-%setup -q -n %{name}-%{version}-beta-tls
+%setup -q -n %{name}-%{version}-tls
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
# Fix for broken behaviour of a git/rpmbuild in EL5
rm -f modules/db_oracle/asynch.*
-%patch13 -p1
+%patch5 -p1
%build
LOCALBASE=/usr NICER=0 CFLAGS="%{optflags}" %{?_with_oracle:ORAHOME="$ORACLE_HOME"} %{__make} all %{?_smp_mflags} TLS=1 \
@@ -1193,6 +1178,10 @@ chown -R %{opensips_user}:%{opensips_group} %{_sysconfdir}/%{name}
%doc docdir/README.xmpp
%changelog
+* Wed Aug 15 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.8.1-1
+- Ver. 1.8.1
+- Dropped all upstreamed patches
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 21989c1..1e20281 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21a1bb74d8b8ed5adbaa0d3bf1084b48 opensips-1.8.0-beta_src.tar.gz
+03703558bb78be73d77b1f4311863cc4 opensips-1.8.1_src.tar.gz
More information about the scm-commits
mailing list