From 9cdfd17f24d94cf81aded004d8ea21134ebd0b8c Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Dec 10 2017 23:29:13 +0000 Subject: Rebuilt for libjson-c.so.3 --- diff --git a/opensips-2.2.5_json-c_013.patch b/opensips-2.2.5_json-c_013.patch new file mode 100644 index 0000000..dca6a1a --- /dev/null +++ b/opensips-2.2.5_json-c_013.patch @@ -0,0 +1,20 @@ +Index: opensips-2.2.5/modules/json/array_del.c +=================================================================== +--- opensips-2.2.5.orig/modules/json/array_del.c ++++ opensips-2.2.5/modules/json/array_del.c +@@ -27,7 +27,7 @@ + #include + #include + +-void array_list_del_idx( struct array_list * arr, int idx) ++void opensips_array_list_del_idx( struct array_list * arr, int idx) + { + int i; + +@@ -44,5 +44,5 @@ void array_list_del_idx( struct array_li + + void json_object_array_del(struct json_object* obj, int idx) + { +- array_list_del_idx(obj->o.c_array, idx); ++ opensips_array_list_del_idx(obj->o.c_array, idx); + }; diff --git a/opensips.spec b/opensips.spec index 3f26829..8dc1338 100644 --- a/opensips.spec +++ b/opensips.spec @@ -5,7 +5,7 @@ Summary: Open Source SIP Server Name: opensips Version: 2.2.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -58,6 +58,9 @@ Patch43: opensips-0043-usrloc-Fix-locking-for-contact_id-based-deletion.patch Patch44: opensips-0044-usrloc-Fix-bad-logical-condition.patch Patch45: opensips-0045-Don-t-include-mysql-mysql_version.h-directly.patch +# For building against libjson-c-0.13 +Patch100: opensips-2.2.5_json-c_013.patch + URL: https://opensips.org BuildRequires: expat-devel @@ -1369,6 +1372,9 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \ %doc docdir/README.xmpp %changelog +* Sun Dec 10 2017 Björn Esser - 2.2.5-3 +- Rebuilt for libjson-c.so.3 + * Tue Nov 21 2017 Peter Lemenkov - 2.2.5-2 - Backport few more patches - Fix building with MariaDB in F-27