- fix building with json-c 0.14

- rel 5

diff --git a/json-c-0.14.patch b/json-c-0.14.patch
new file mode 100644 (file)
index 0000000..89a0842
--- /dev/null
+++ b/json-c-0.14.patch
@@ -0,0 +1,11 @@
+--- opensips-2.4.0/modules/cgrates/cgrates_cmd.c~      2018-04-30 14:37:06.000000000 +0200
++++ opensips-2.4.0/modules/cgrates/cgrates_cmd.c       2020-05-03 12:18:38.579677771 +0200
+@@ -52,7 +52,7 @@
+               val.s.s = (char *)json_object_get_string(jobj);
+               break;
+       case json_type_boolean:
+-              if (json_object_get_boolean(jobj) == TRUE)
++              if (json_object_get_boolean(jobj) == 1)
+                       val.n = 1;
+               else
+                       val.n = 0;

diff --git a/opensips.spec b/opensips.spec
index 349d817634982c5f651bf7b47ad74326084e9b29..7be8c4896a01be1289227a0a8bd01fbfcf80d090 100644 (file)
--- a/opensips.spec
+++ b/opensips.spec
@@ -22,7 +22,7 @@ Summary:      SIP proxy, redirect and registrar server
 Summary(pl.UTF-8):     Serwer SIP przekazujący (proxy), przekierowujący i rejestrujący
 Name:          opensips
 Version:       2.4.0
 Summary(pl.UTF-8):     Serwer SIP przekazujący (proxy), przekierowujący i rejestrujący
 Name:          opensips
 Version:       2.4.0

-Release:       4
+Release:       5

 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://opensips.org/pub/opensips/%{version}/%{name}-%{version}.tar.gz
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://opensips.org/pub/opensips/%{version}/%{name}-%{version}.tar.gz


@@ -32,6 +32,7 @@ Source2:      %{name}.sysconfig
 Source3:       %{name}.service
 Patch0:                x32.patch
 Patch1:                make.patch
 Source3:       %{name}.service
 Patch0:                x32.patch
 Patch1:                make.patch

+Patch2:                json-c-0.14.patch

 URL:           http://www.opensips.org/
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 %{?with_osp:BuildRequires:     OSPToolkit}
 URL:           http://www.opensips.org/
 %{?with_geoip:BuildRequires:   GeoIP-devel}
 %{?with_osp:BuildRequires:     OSPToolkit}


@@ -334,6 +335,7 @@ Interfejs RabbitMQ do openSIPS.
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

+%patch2 -p1

 
 %build
 exclude_modules="%{exclude_modules}"
 
 %build
 exclude_modules="%{exclude_modules}"