[packages/opensips] - up to 3.4.1
baggins
baggins at pld-linux.org
Wed Sep 13 10:41:26 CEST 2023
commit 7900173f2cce21a901889329d0ff7be3745a8e9c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Sep 13 09:30:08 2023 +0200
- up to 3.4.1
json-c-0.14.patch | 11 --
make-4.4.patch | 447 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
make.patch | 160 -------------------
opensips.spec | 93 ++++++++----
4 files changed, 509 insertions(+), 202 deletions(-)
---
diff --git a/opensips.spec b/opensips.spec
index 7912fd7..8cc3c15 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -1,4 +1,4 @@
-# TODO: oracle, lua (lua5.1)
+# TODO: oracle, lua (lua5.1), system wolfssl
#
# Conditional build:
%bcond_without mysql # MySQL support
@@ -13,27 +13,28 @@
%bcond_without json # json support
%bcond_without memcached # memcached support
%bcond_without microhttpd # httpd support
+%bcond_without kafka # Apache Kafka support
%bcond_without redis # Redis support
%bcond_with couchbase # couchbase support
%bcond_with mongodb # mongodb support
%bcond_with sngtc # Sangoma transcoding module support
%bcond_without rabbitmq # Rabbit MQ support
+%bcond_with wolfssl # WolfSSL support (builds internal WolfSSL :( )
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.8
-Release: 8
+Version: 3.4.1
+Release: 0.1
License: GPL v2
Group: Networking/Daemons
Source0: https://opensips.org/pub/opensips/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 02ae0094e94d56cb175a542c52a25e39
+# Source0-md5: e889ffaddf770e945e77ebeca5f30fa4
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.service
Patch0: x32.patch
-Patch1: make.patch
-Patch2: json-c-0.14.patch
+Patch1: make-4.4.patch
URL: https://opensips.org/
%{?with_osp:BuildRequires: OSPToolkit}
%{?with_sngtc:BuildRequires: TODO-SNGTC-BRs}
@@ -68,13 +69,14 @@ BuildRequires: pkgconfig
BuildRequires: python-devel >= 1:2.5
%{?with_rabbitmq:BuildRequires: rabbitmq-c-devel}
%{?with_radius:BuildRequires: radiusclient-ng-devel}
+%{?with_kafka:BuildRequires: librdkafka-devel}
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.671
%{?with_sqlite:BuildRequires: sqlite3-devel >= 3}
#BuildRequires: subversion
%{?with_odbc:BuildRequires: unixODBC-devel}
BuildRequires: which
-#BuildRequires: xmlrpc-c-devel >= 1.10.0
+BuildRequires: xmlrpc-c-devel >= 1.10.0
BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
@@ -82,10 +84,10 @@ Requires: systemd-units >= 38
Suggests: python-modules
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# mi_xmlrpc requires xmlrpc-c-devel in version 1.9 only
+# aaa_diameter requires 'freeDiameter/extension.h'
# cachedb_cassandra requires 'protocol/TBinaryProtocol.h'
# lua: lua.h
-%define exclude_modules mi_xmlrpc db_oracle cachedb_cassandra lua
+%define exclude_modules aaa_diameter auth_jwt db_oracle cachedb_cassandra lua
%description
OpenSIPS (Open SIP Server) is a mature Open Source implementation of a
@@ -336,13 +338,24 @@ RabbitMQ interface to openSIPS.
%description rabbitmq -l pl.UTF-8
Interfejs RabbitMQ do openSIPS.
+%package kafka
+Summary: Apache Kafka interface to openSIPS
+Summary(pl.UTF-8): Interfejs Apache Kafka do openSIPS
+Group: Networking/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description kafka
+Apache Kafka interface to openSIPS.
+
+%description kafka -l pl.UTF-8
+Interfejs Apache Kafka do openSIPS.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
scripts/dbtextdb/dbtextdb.py
%build
@@ -399,9 +412,16 @@ exclude_modules="$exclude_modules sngtc"
%if %{without rabbitmq}
exclude_modules="$exclude_modules rabbitmq"
%endif
+%if %{without wolfssl}
+exclude_modules="$exclude_modules tls_wolfssl"
+%endif
+%if %{without kafka}
+exclude_modules="$exclude_modules event_kafka"
+%endif
echo "$exclude_modules" > exclude_modules
-LDFLAGS="%{rpmldflags}" \
+DFLAGS="%{rpmldflags}" \
%{__make} all \
+ PYTHON=%{__python3} \
Q= \
exclude_modules="$exclude_modules" \
prefix=%{_prefix} \
@@ -477,15 +497,9 @@ fi
%doc README* AUTHORS CREDITS ChangeLog INSTALL NEWS scripts examples
%attr(755,root,root) %{_sbindir}/bdb_recover
%attr(755,root,root) %{_sbindir}/opensips
-%attr(755,root,root) %{_sbindir}/opensipsctl
-%attr(755,root,root) %{_sbindir}/opensipsdbctl
-%attr(755,root,root) %{_sbindir}/opensipsunix
%attr(755,root,root) %{_sbindir}/osipsconfig
-%attr(755,root,root) %{_sbindir}/osipsconsole
%dir %{_sysconfdir}/opensips
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/opensips.cfg
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/opensipsctlrc
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/osipsconsolerc
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/scenario_callcenter.xml
%dir %attr(700,root,root) %{_sysconfdir}/opensips/tls
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/tls/README
@@ -509,11 +523,6 @@ fi
%attr(754,root,root) /etc/rc.d/init.d/opensips
%{systemdunitdir}/opensips.service
%dir %{_libdir}/opensips
-%dir %{_libdir}/opensips/opensipsctl
-%{_libdir}/opensips/opensipsctl/opensipsctl.*
-%{_libdir}/opensips/opensipsctl/opensipsdbctl.*
-%dir %{_libdir}/opensips/opensipsctl/dbtextdb
-%attr(755,root,root) %{_libdir}/opensips/opensipsctl/dbtextdb/dbtextdb.py
%dir %{_libdir}/opensips/modules
# explict list here, no globs please (to avoid mistakes)
%attr(755,root,root) %{_libdir}/opensips/modules/acc.so
@@ -525,11 +534,13 @@ fi
%attr(755,root,root) %{_libdir}/opensips/modules/b2b_entities.so
%attr(755,root,root) %{_libdir}/opensips/modules/b2b_logic.so
%attr(755,root,root) %{_libdir}/opensips/modules/b2b_sca.so
+%attr(755,root,root) %{_libdir}/opensips/modules/b2b_sdp_demux.so
%attr(755,root,root) %{_libdir}/opensips/modules/benchmark.so
%attr(755,root,root) %{_libdir}/opensips/modules/cachedb_local.so
%attr(755,root,root) %{_libdir}/opensips/modules/cachedb_sql.so
%attr(755,root,root) %{_libdir}/opensips/modules/call_center.so
%attr(755,root,root) %{_libdir}/opensips/modules/call_control.so
+%attr(755,root,root) %{_libdir}/opensips/modules/callops.so
%attr(755,root,root) %{_libdir}/opensips/modules/cfgutils.so
%attr(755,root,root) %{_libdir}/opensips/modules/clusterer.so
%attr(755,root,root) %{_libdir}/opensips/modules/compression.so
@@ -552,9 +563,9 @@ fi
%attr(755,root,root) %{_libdir}/opensips/modules/enum.so
%attr(755,root,root) %{_libdir}/opensips/modules/event_datagram.so
%attr(755,root,root) %{_libdir}/opensips/modules/event_flatstore.so
-%attr(755,root,root) %{_libdir}/opensips/modules/event_jsonrpc.so
%attr(755,root,root) %{_libdir}/opensips/modules/event_route.so
%attr(755,root,root) %{_libdir}/opensips/modules/event_routing.so
+%attr(755,root,root) %{_libdir}/opensips/modules/event_stream.so
%attr(755,root,root) %{_libdir}/opensips/modules/event_virtual.so
%attr(755,root,root) %{_libdir}/opensips/modules/event_xmlrpc.so
%attr(755,root,root) %{_libdir}/opensips/modules/exec.so
@@ -570,13 +581,18 @@ fi
%attr(755,root,root) %{_libdir}/opensips/modules/mangler.so
%attr(755,root,root) %{_libdir}/opensips/modules/mathops.so
%attr(755,root,root) %{_libdir}/opensips/modules/maxfwd.so
+%attr(755,root,root) %{_libdir}/opensips/modules/media_exchange.so
%attr(755,root,root) %{_libdir}/opensips/modules/mediaproxy.so
%attr(755,root,root) %{_libdir}/opensips/modules/mi_datagram.so
%attr(755,root,root) %{_libdir}/opensips/modules/mid_registrar.so
%attr(755,root,root) %{_libdir}/opensips/modules/mi_fifo.so
-%attr(755,root,root) %{_libdir}/opensips/modules/mi_json.so
+%attr(755,root,root) %{_libdir}/opensips/modules/mi_html.so
+%attr(755,root,root) %{_libdir}/opensips/modules/mi_script.so
%attr(755,root,root) %{_libdir}/opensips/modules/mi_xmlrpc_ng.so
%attr(755,root,root) %{_libdir}/opensips/modules/msilo.so
+%attr(755,root,root) %{_libdir}/opensips/modules/msrp_gateway.so
+%attr(755,root,root) %{_libdir}/opensips/modules/msrp_relay.so
+%attr(755,root,root) %{_libdir}/opensips/modules/msrp_ua.so
%attr(755,root,root) %{_libdir}/opensips/modules/nathelper.so
%attr(755,root,root) %{_libdir}/opensips/modules/nat_traversal.so
%attr(755,root,root) %{_libdir}/opensips/modules/options.so
@@ -589,11 +605,16 @@ fi
%attr(755,root,root) %{_libdir}/opensips/modules/presence_dialoginfo.so
%attr(755,root,root) %{_libdir}/opensips/modules/presence_mwi.so
%attr(755,root,root) %{_libdir}/opensips/modules/presence.so
+%attr(755,root,root) %{_libdir}/opensips/modules/presence_dfks.so
%attr(755,root,root) %{_libdir}/opensips/modules/presence_xcapdiff.so
%attr(755,root,root) %{_libdir}/opensips/modules/presence_xml.so
+%attr(755,root,root) %{_libdir}/opensips/modules/prometheus.so
%attr(755,root,root) %{_libdir}/opensips/modules/proto_bin.so
+%attr(755,root,root) %{_libdir}/opensips/modules/proto_bins.so
%attr(755,root,root) %{_libdir}/opensips/modules/proto_hep.so
+%attr(755,root,root) %{_libdir}/opensips/modules/proto_msrp.so
%attr(755,root,root) %{_libdir}/opensips/modules/proto_sctp.so
+%attr(755,root,root) %{_libdir}/opensips/modules/proto_smpp.so
%attr(755,root,root) %{_libdir}/opensips/modules/proto_tls.so
%attr(755,root,root) %{_libdir}/opensips/modules/proto_ws.so
%attr(755,root,root) %{_libdir}/opensips/modules/proto_wss.so
@@ -604,40 +625,45 @@ fi
%attr(755,root,root) %{_libdir}/opensips/modules/pua_usrloc.so
%attr(755,root,root) %{_libdir}/opensips/modules/python.so
%attr(755,root,root) %{_libdir}/opensips/modules/qos.so
+%attr(755,root,root) %{_libdir}/opensips/modules/qrouting.so
+%attr(755,root,root) %{_libdir}/opensips/modules/rate_cacher.so
%attr(755,root,root) %{_libdir}/opensips/modules/ratelimit.so
%attr(755,root,root) %{_libdir}/opensips/modules/regex.so
%attr(755,root,root) %{_libdir}/opensips/modules/registrar.so
%attr(755,root,root) %{_libdir}/opensips/modules/rest_client.so
%attr(755,root,root) %{_libdir}/opensips/modules/rls.so
%attr(755,root,root) %{_libdir}/opensips/modules/rr.so
+%attr(755,root,root) %{_libdir}/opensips/modules/rtp_relay.so
%attr(755,root,root) %{_libdir}/opensips/modules/rtpengine.so
%attr(755,root,root) %{_libdir}/opensips/modules/rtpproxy.so
%attr(755,root,root) %{_libdir}/opensips/modules/script_helper.so
-%attr(755,root,root) %{_libdir}/opensips/modules/seas.so
%attr(755,root,root) %{_libdir}/opensips/modules/signaling.so
%attr(755,root,root) %{_libdir}/opensips/modules/sipcapture.so
%attr(755,root,root) %{_libdir}/opensips/modules/sip_i.so
%attr(755,root,root) %{_libdir}/opensips/modules/sipmsgops.so
%attr(755,root,root) %{_libdir}/opensips/modules/siprec.so
-%attr(755,root,root) %{_libdir}/opensips/modules/siptrace.so
%attr(755,root,root) %{_libdir}/opensips/modules/sl.so
-%attr(755,root,root) %{_libdir}/opensips/modules/sms.so
%attr(755,root,root) %{_libdir}/opensips/modules/speeddial.so
%attr(755,root,root) %{_libdir}/opensips/modules/sql_cacher.so
%attr(755,root,root) %{_libdir}/opensips/modules/sst.so
%attr(755,root,root) %{_libdir}/opensips/modules/statistics.so
+%attr(755,root,root) %{_libdir}/opensips/modules/status_report.so
+%attr(755,root,root) %{_libdir}/opensips/modules/stir_shaken.so
%attr(755,root,root) %{_libdir}/opensips/modules/stun.so
+%attr(755,root,root) %{_libdir}/opensips/modules/tcp_mgm.so
%attr(755,root,root) %{_libdir}/opensips/modules/textops.so
%attr(755,root,root) %{_libdir}/opensips/modules/tls_mgm.so
+%attr(755,root,root) %{_libdir}/opensips/modules/tls_openssl.so
%attr(755,root,root) %{_libdir}/opensips/modules/tm.so
%attr(755,root,root) %{_libdir}/opensips/modules/topology_hiding.so
+%attr(755,root,root) %{_libdir}/opensips/modules/tracer.so
%attr(755,root,root) %{_libdir}/opensips/modules/uac_auth.so
%attr(755,root,root) %{_libdir}/opensips/modules/uac_redirect.so
%attr(755,root,root) %{_libdir}/opensips/modules/uac_registrant.so
%attr(755,root,root) %{_libdir}/opensips/modules/uac.so
-%attr(755,root,root) %{_libdir}/opensips/modules/uri.so
%attr(755,root,root) %{_libdir}/opensips/modules/userblacklist.so
%attr(755,root,root) %{_libdir}/opensips/modules/usrloc.so
+%attr(755,root,root) %{_libdir}/opensips/modules/uuid.so
%attr(755,root,root) %{_libdir}/opensips/modules/xcap_client.so
%attr(755,root,root) %{_libdir}/opensips/modules/xcap.so
%attr(755,root,root) %{_libdir}/opensips/modules/xml.so
@@ -648,8 +674,6 @@ fi
%{_datadir}/%{name}/pi_http
%{_mandir}/man5/opensips.cfg.5*
%{_mandir}/man8/opensips.8*
-%{_mandir}/man8/opensipsctl.8*
-%{_mandir}/man8/opensipsunix.8*
%files xmpp
%defattr(644,root,root,755)
@@ -766,4 +790,11 @@ fi
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/opensips/modules/event_rabbitmq.so
%attr(755,root,root) %{_libdir}/opensips/modules/rabbitmq.so
+%attr(755,root,root) %{_libdir}/opensips/modules/rabbitmq_consumer.so
+%endif
+
+%if %{with kafka}
+%files kafka
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/event_kafka.so
%endif
diff --git a/json-c-0.14.patch b/json-c-0.14.patch
deleted file mode 100644
index 89a0842..0000000
--- a/json-c-0.14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/make-4.4.patch b/make-4.4.patch
new file mode 100644
index 0000000..6349326
--- /dev/null
+++ b/make-4.4.patch
@@ -0,0 +1,447 @@
+diff -ur opensips-3.4.1/lib/json/Makefile.json opensips-3.4.1.make/lib/json/Makefile.json
+--- opensips-3.4.1/lib/json/Makefile.json 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/lib/json/Makefile.json 2023-09-13 02:53:08.725162011 +0200
+@@ -17,7 +17,7 @@
+ endif
+
+ ifeq ($(CROSS_COMPILE),)
+-JSON_BUILDER = $(shell \
++JSON_BUILDER := $(shell \
+ if pkg-config --exists json 2> /dev/null; then \
+ echo 'pkg-config json'; \
+ elif pkg-config --exists json-c 2> /dev/null; then\
+@@ -30,16 +30,16 @@
+ DEFS += -I$(LOCALBASE)/include -I$(SYSBASE)/include
+ LIBS += -L$(LOCALBASE)/lib -l$(JSONLIB)
+ else
+- JSON_PKG_VER = $(shell $(JSON_BUILDER) --modversion)
+- JSON_PKG_MAJOR = $(shell \
++ JSON_PKG_VER := $(shell $(JSON_BUILDER) --modversion)
++ JSON_PKG_MAJOR := $(shell \
+ ver_tmp=`echo '$(JSON_PKG_VER)' | cut -f1 -d.`; \
+ if [ -z "$$ver_tmp" ]; then ver_tmp=0; fi; \
+ echo "$$ver_tmp";)
+- JSON_PKG_MINOR = $(shell \
++ JSON_PKG_MINOR := $(shell \
+ ver_tmp=`echo '$(JSON_PKG_VER)' | cut -f2 -d.`; \
+ if [ -z "$$ver_tmp" ]; then ver_tmp=0; fi; \
+ echo "$$ver_tmp";)
+- JSON_PKG_MICRO = $(shell \
++ JSON_PKG_MICRO := $(shell \
+ ver_tmp=`echo '$(JSON_PKG_VER)' | cut -f3 -d.`; \
+ if [ -z "$$ver_tmp" ]; then ver_tmp=0; fi; \
+ echo "$$ver_tmp";)
+diff -ur opensips-3.4.1/Makefile.openssl opensips-3.4.1.make/Makefile.openssl
+--- opensips-3.4.1/Makefile.openssl 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/Makefile.openssl 2023-09-13 02:48:08.336778245 +0200
+@@ -5,7 +5,7 @@
+ DEFS += -Wno-deprecated-declarations
+
+ ifeq ($(CROSS_COMPILE),)
+-SSL_BUILDER=$(shell \
++SSL_BUILDER:=$(shell \
+ if pkg-config --exists libssl; then \
+ echo 'pkg-config libssl'; \
+ fi)
+diff -ur opensips-3.4.1/modules/aaa_radius/Makefile opensips-3.4.1.make/modules/aaa_radius/Makefile
+--- opensips-3.4.1/modules/aaa_radius/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/aaa_radius/Makefile 2023-09-13 02:56:40.834593241 +0200
+@@ -13,7 +13,7 @@
+ # Find the radius library we shall use
+ #
+ ifeq ($(RADIUSCLIENT),)
+-RADIUSCLIENT=$(shell if [ -n "`ldconfig -p | grep radcli`" ]; then echo "RADCLI"; \
++RADIUSCLIENT:=$(shell if [ -n "`ldconfig -p | grep radcli`" ]; then echo "RADCLI"; \
+ elif [ -n "`ldconfig -p | grep freeradius`" ]; then echo "FREERADIUS"; \
+ elif [ -n "`ldconfig -p | grep radiusclient-ng`" ];then echo "RADIUSCLIENT"; fi)
+ endif
+@@ -38,7 +38,7 @@
+ endif
+
+ ifeq ($(CROSS_COMPILE),)
+- BUILDER=$(shell if pkg-config --exists $(RADIUS_PACKET); then \
++ BUILDER:=$(shell if pkg-config --exists $(RADIUS_PACKET); then \
+ echo "pkg-config $(RADIUS_PACKET)"; \
+ fi)
+ else
+diff -ur opensips-3.4.1/modules/cachedb_mongodb/Makefile opensips-3.4.1.make/modules/cachedb_mongodb/Makefile
+--- opensips-3.4.1/modules/cachedb_mongodb/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/cachedb_mongodb/Makefile 2023-09-13 02:54:01.326590984 +0200
+@@ -10,7 +10,7 @@
+ include ../../lib/json/Makefile.json
+
+ ifeq ($(CROSS_COMPILE),)
+-MONGOC_BUILDER = $(shell \
++MONGOC_BUILDER := $(shell \
+ if pkg-config --exists libmongoc-1.0; then \
+ echo 'pkg-config libmongoc-1.0'; \
+ fi)
+diff -ur opensips-3.4.1/modules/cachedb_redis/Makefile opensips-3.4.1.make/modules/cachedb_redis/Makefile
+--- opensips-3.4.1/modules/cachedb_redis/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/cachedb_redis/Makefile 2023-09-13 02:57:29.519726762 +0200
+@@ -9,7 +9,7 @@
+ auto_gen=
+ NAME=cachedb_redis.so
+
+-HAVE_REDIS_SSL=$(shell if [ -n "`ldconfig -p | grep hiredis_ssl`" ]; \
++HAVE_REDIS_SSL:=$(shell if [ -n "`ldconfig -p | grep hiredis_ssl`" ]; \
+ then echo "HAVE_REDIS_SSL"; fi)
+ ifeq ($(HAVE_REDIS_SSL), HAVE_REDIS_SSL)
+ LIBS+=-lhiredis_ssl -lssl -lcrypto
+diff -ur opensips-3.4.1/modules/carrierroute/Makefile opensips-3.4.1.make/modules/carrierroute/Makefile
+--- opensips-3.4.1/modules/carrierroute/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/carrierroute/Makefile 2023-09-13 02:56:03.156634781 +0200
+@@ -9,7 +9,7 @@
+ NAME=carrierroute.so
+
+ ifeq ($(CROSS_COMPILE),)
+-CONFUSE_BUILDER = $(shell \
++CONFUSE_BUILDER := $(shell \
+ if which confuse-config >/dev/null 2>/dev/null;then \
+ echo 'confuse-config'; \
+ elif pkg-config --exists libconfuse; then \
+diff -ur opensips-3.4.1/modules/cpl_c/Makefile opensips-3.4.1.make/modules/cpl_c/Makefile
+--- opensips-3.4.1/modules/cpl_c/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/cpl_c/Makefile 2023-09-13 04:04:47.993894559 +0200
+@@ -7,7 +7,7 @@
+ NAME=cpl_c.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/db_berkeley/Makefile opensips-3.4.1.make/modules/db_berkeley/Makefile
+--- opensips-3.4.1/modules/db_berkeley/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/db_berkeley/Makefile 2023-09-13 02:57:50.903891339 +0200
+@@ -23,7 +23,7 @@
+ DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \
+ -I$(SYSBASE)/include -I$(LOCALBASE)/include/db46
+
+-IS_BSD= $(shell echo "$(OS)" | sed -e 's/^.*bsd/yes/i' )
++IS_BSD:= $(shell echo "$(OS)" | sed -e 's/^.*bsd/yes/i' )
+ ifeq ($(IS_BSD), yes)
+ DB_LIB=ldb-4.6
+ else
+diff -ur opensips-3.4.1/modules/db_http/Makefile opensips-3.4.1.make/modules/db_http/Makefile
+--- opensips-3.4.1/modules/db_http/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/db_http/Makefile 2023-09-13 02:58:57.509946567 +0200
+@@ -11,7 +11,7 @@
+ NAME=db_http.so
+
+ ifeq ($(CROSS_COMPILE),)
+-HAS_BUILDER = $(shell if which curl-config >/dev/null 2>/dev/null;then echo YES; fi)
++HAS_BUILDER := $(shell if which curl-config >/dev/null 2>/dev/null;then echo YES; fi)
+
+ ifeq ($(HAS_BUILDER),YES)
+ # use autodetection
+diff -ur opensips-3.4.1/modules/db_mysql/Makefile opensips-3.4.1.make/modules/db_mysql/Makefile
+--- opensips-3.4.1/modules/db_mysql/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/db_mysql/Makefile 2023-09-13 02:58:29.035426868 +0200
+@@ -13,7 +13,7 @@
+ # CROSS_COMPILE=true
+
+ ifeq ($(CROSS_COMPILE),)
+-HAS_MYSQLCFG=$(shell if which mysql_config >/dev/null 2>/dev/null;then echo YES; fi)
++HAS_MYSQLCFG:=$(shell if which mysql_config >/dev/null 2>/dev/null;then echo YES; fi)
+ endif
+
+ ifeq ($(HAS_MYSQLCFG),YES)
+diff -ur opensips-3.4.1/modules/db_postgres/Makefile opensips-3.4.1.make/modules/db_postgres/Makefile
+--- opensips-3.4.1/modules/db_postgres/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/db_postgres/Makefile 2023-09-13 02:57:37.770044746 +0200
+@@ -13,7 +13,7 @@
+ # CROSS_COMPILE=true
+
+ ifeq ($(CROSS_COMPILE),)
+-HAS_PGCFG=$(shell if which pg_config >/dev/null 2>/dev/null;then echo YES; fi)
++HAS_PGCFG:=$(shell if which pg_config >/dev/null 2>/dev/null;then echo YES; fi)
+ endif
+
+
+diff -ur opensips-3.4.1/modules/dialplan/Makefile opensips-3.4.1.make/modules/dialplan/Makefile
+--- opensips-3.4.1/modules/dialplan/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/dialplan/Makefile 2023-09-13 02:57:18.532642157 +0200
+@@ -11,7 +11,7 @@
+ # CROSS_COMPILE=true
+
+ ifeq ($(CROSS_COMPILE),)
+-PCRE_BUILDER = $(shell \
++PCRE_BUILDER := $(shell \
+ if which pcre-config >/dev/null 2>/dev/null; then \
+ echo 'pcre-config'; \
+ elif pkg-config --exists libcre; then \
+diff -ur opensips-3.4.1/modules/event_kafka/Makefile opensips-3.4.1.make/modules/event_kafka/Makefile
+--- opensips-3.4.1/modules/event_kafka/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/event_kafka/Makefile 2023-09-13 02:58:04.187752203 +0200
+@@ -5,7 +5,7 @@
+ NAME=event_kafka.so
+
+ ifeq ($(CROSS_COMPILE),)
+-KAFKA_BUILDER = $(shell \
++KAFKA_BUILDER := $(shell \
+ if pkg-config --exists rdkafka; then \
+ echo 'pkg-config rdkafka'; \
+ fi)
+diff -ur opensips-3.4.1/modules/event_rabbitmq/Makefile opensips-3.4.1.make/modules/event_rabbitmq/Makefile
+--- opensips-3.4.1/modules/event_rabbitmq/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/event_rabbitmq/Makefile 2023-09-13 02:55:23.368717157 +0200
+@@ -7,7 +7,7 @@
+ NAME=event_rabbitmq.so
+
+ ifeq ($(CROSS_COMPILE),)
+-RABBITMQ_BUILDER = $(shell \
++RABBITMQ_BUILDER := $(shell \
+ if pkg-config --exists librabbitmq; then \
+ echo 'pkg-config librabbitmq'; \
+ fi)
+diff -ur opensips-3.4.1/modules/httpd/Makefile opensips-3.4.1.make/modules/httpd/Makefile
+--- opensips-3.4.1/modules/httpd/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/httpd/Makefile 2023-09-13 02:57:56.944130191 +0200
+@@ -8,7 +8,7 @@
+ # the autodetection
+ # CROSS_COMPILE=true
+ ifeq ($(CROSS_COMPILE),)
+-LIBMICROHTTPD_BUILDER=$(shell \
++LIBMICROHTTPD_BUILDER:=$(shell \
+ if pkg-config --exists libmicrohttpd; then \
+ echo 'pkg-config libmicrohttpd'; \
+ fi)
+diff -ur opensips-3.4.1/modules/lua/Makefile opensips-3.4.1.make/modules/lua/Makefile
+--- opensips-3.4.1/modules/lua/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/lua/Makefile 2023-09-13 02:55:02.768121336 +0200
+@@ -6,7 +6,7 @@
+ auto_gen=
+ NAME=lua.so
+
+-MYSQLCFG=$(shell which mysql_config)
++MYSQLCFG:=$(shell which mysql_config)
+ LIB_LUA_NAME?=$(shell \
+ if pkg-config --exists lua; then echo lua; \
+ elif pkg-config --exists lua5.3; then echo lua5.3; \
+@@ -19,8 +19,8 @@
+ elif pkg-config --exists lua-5.1; then echo lua-5.1; \
+ elif pkg-config --exists lua51; then echo lua51; fi)
+
+-LIB_LUA = $(shell pkg-config --libs $(LIB_LUA_NAME) 2>/dev/null)
+-FLAGS_LUA = $(shell pkg-config --cflags $(LIB_LUA_NAME) 2>/dev/null)
++LIB_LUA := $(shell pkg-config --libs $(LIB_LUA_NAME) 2>/dev/null)
++FLAGS_LUA := $(shell pkg-config --cflags $(LIB_LUA_NAME) 2>/dev/null)
+ ifeq (,$(findstring -l,$(LIB_LUA)))
+ LIB_LUA = -llua
+ endif
+diff -ur opensips-3.4.1/modules/mi_xmlrpc_ng/Makefile opensips-3.4.1.make/modules/mi_xmlrpc_ng/Makefile
+--- opensips-3.4.1/modules/mi_xmlrpc_ng/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/mi_xmlrpc_ng/Makefile 2023-09-13 04:05:39.882483610 +0200
+@@ -5,7 +5,7 @@
+ NAME=mi_xmlrpc_ng.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/mmgeoip/Makefile opensips-3.4.1.make/modules/mmgeoip/Makefile
+--- opensips-3.4.1/modules/mmgeoip/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/mmgeoip/Makefile 2023-09-13 02:57:09.028952592 +0200
+@@ -29,7 +29,7 @@
+ NAME=mmgeoip.so
+
+ ifeq ($(GEOIP),)
+-GEOIP=$(shell if [ -n "`ldconfig -p | grep maxminddb`" ]; then echo "GEOIP2"; \
++GEOIP:=$(shell if [ -n "`ldconfig -p | grep maxminddb`" ]; then echo "GEOIP2"; \
+ elif [ -n "`ldconfig -p | grep libGeoIP`" ];then echo "GEOIPLEGACY"; fi)
+ endif
+
+diff -ur opensips-3.4.1/modules/pi_http/Makefile opensips-3.4.1.make/modules/pi_http/Makefile
+--- opensips-3.4.1/modules/pi_http/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/pi_http/Makefile 2023-09-13 03:50:42.424353468 +0200
+@@ -5,7 +5,7 @@
+ NAME=pi_http.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/presence_dialoginfo/Makefile opensips-3.4.1.make/modules/presence_dialoginfo/Makefile
+--- opensips-3.4.1/modules/presence_dialoginfo/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/presence_dialoginfo/Makefile 2023-09-13 04:05:26.392006524 +0200
+@@ -9,7 +9,7 @@
+ NAME=presence_dialoginfo.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/pua/Makefile opensips-3.4.1.make/modules/pua/Makefile
+--- opensips-3.4.1/modules/pua/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/pua/Makefile 2023-09-13 04:04:28.139704657 +0200
+@@ -10,7 +10,7 @@
+ NAME=pua.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/pua_bla/Makefile opensips-3.4.1.make/modules/pua_bla/Makefile
+--- opensips-3.4.1/modules/pua_bla/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/pua_bla/Makefile 2023-09-13 03:50:34.620619088 +0200
+@@ -10,7 +10,7 @@
+ NAME=pua_bla.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/pua_mi/Makefile opensips-3.4.1.make/modules/pua_mi/Makefile
+--- opensips-3.4.1/modules/pua_mi/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/pua_mi/Makefile 2023-09-13 03:50:24.686775345 +0200
+@@ -10,7 +10,7 @@
+ NAME=pua_mi.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/pua_usrloc/Makefile opensips-3.4.1.make/modules/pua_usrloc/Makefile
+--- opensips-3.4.1/modules/pua_usrloc/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/pua_usrloc/Makefile 2023-09-13 03:49:00.155770081 +0200
+@@ -10,7 +10,7 @@
+ NAME=pua_usrloc.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/pua_xmpp/Makefile opensips-3.4.1.make/modules/pua_xmpp/Makefile
+--- opensips-3.4.1/modules/pua_xmpp/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/pua_xmpp/Makefile 2023-09-13 04:05:32.462222355 +0200
+@@ -10,7 +10,7 @@
+ NAME= pua_xmpp.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/rabbitmq/Makefile opensips-3.4.1.make/modules/rabbitmq/Makefile
+--- opensips-3.4.1/modules/rabbitmq/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/rabbitmq/Makefile 2023-09-13 02:55:56.233074926 +0200
+@@ -8,7 +8,7 @@
+ NAME=rabbitmq.so
+
+ ifeq ($(CROSS_COMPILE),)
+-RABBITMQ_BUILDER = $(shell \
++RABBITMQ_BUILDER := $(shell \
+ if pkg-config --exists librabbitmq; then \
+ echo 'pkg-config librabbitmq'; \
+ fi)
+diff -ur opensips-3.4.1/modules/rabbitmq_consumer/Makefile opensips-3.4.1.make/modules/rabbitmq_consumer/Makefile
+--- opensips-3.4.1/modules/rabbitmq_consumer/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/rabbitmq_consumer/Makefile 2023-09-13 02:55:45.929411168 +0200
+@@ -7,7 +7,7 @@
+ NAME=rabbitmq_consumer.so
+
+ ifeq ($(CROSS_COMPILE),)
+-RABBITMQ_BUILDER = $(shell \
++RABBITMQ_BUILDER := $(shell \
+ if pkg-config --exists librabbitmq; then \
+ echo 'pkg-config librabbitmq'; \
+ fi)
+diff -ur opensips-3.4.1/modules/regex/Makefile opensips-3.4.1.make/modules/regex/Makefile
+--- opensips-3.4.1/modules/regex/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/regex/Makefile 2023-09-13 02:53:51.949727353 +0200
+@@ -9,7 +9,7 @@
+ # CROSS_COMPILE=true
+
+ ifeq ($(CROSS_COMPILE),)
+-PCRE_BUILDER = $(shell \
++PCRE_BUILDER := $(shell \
+ if which pcre-config >/dev/null 2>/dev/null; then \
+ echo 'pcre-config'; \
+ elif pkg-config --exists libcre; then \
+diff -ur opensips-3.4.1/modules/rls/Makefile opensips-3.4.1.make/modules/rls/Makefile
+--- opensips-3.4.1/modules/rls/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/rls/Makefile 2023-09-13 04:04:07.771987805 +0200
+@@ -10,7 +10,7 @@
+ NAME=rls.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/snmpstats/Makefile opensips-3.4.1.make/modules/snmpstats/Makefile
+--- opensips-3.4.1/modules/snmpstats/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/snmpstats/Makefile 2023-09-13 02:56:23.960669485 +0200
+@@ -4,14 +4,14 @@
+
+ include ../../Makefile.defs
+
+-HAS_BUILDER = $(shell if which net-snmp-config >/dev/null 2>/dev/null;then echo YES; fi)
++HAS_BUILDER := $(shell if which net-snmp-config >/dev/null 2>/dev/null;then echo YES; fi)
+
+ ifeq ($(CROSS_COMPILE),)
+ ifeq ($(HAS_BUILDER),YES)
+ # use autodetection
+ DEFS += $(shell net-snmp-config --cflags)
+ LIBS += $(shell net-snmp-config --netsnmp-agent-libs --external-agent-libs)
+- INSTALLMIBDIR = $(cfg_prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
++ INSTALLMIBDIR := $(cfg_prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
+ endif
+ else
+ # use standard know paths
+diff -ur opensips-3.4.1/modules/stir_shaken/Makefile opensips-3.4.1.make/modules/stir_shaken/Makefile
+--- opensips-3.4.1/modules/stir_shaken/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/stir_shaken/Makefile 2023-09-13 02:55:32.292320007 +0200
+@@ -6,7 +6,7 @@
+ NAME=stir_shaken.so
+
+ ifeq ($(CROSS_COMPILE),)
+-SSL_BUILDER=$(shell \
++SSL_BUILDER:=$(shell \
+ if pkg-config --exists libcrypto; then \
+ echo 'pkg-config libcrypto'; \
+ fi)
+diff -ur opensips-3.4.1/modules/xcap/Makefile opensips-3.4.1.make/modules/xcap/Makefile
+--- opensips-3.4.1/modules/xcap/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/xcap/Makefile 2023-09-13 04:05:18.831734397 +0200
+@@ -10,7 +10,7 @@
+ NAME=xcap.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
++XML2CFG:=$(shell which xml2-config)
+ endif
+
+ ifneq ($(XML2CFG),)
+diff -ur opensips-3.4.1/modules/xcap_client/Makefile opensips-3.4.1.make/modules/xcap_client/Makefile
+--- opensips-3.4.1/modules/xcap_client/Makefile 2023-08-31 15:30:47.000000000 +0200
++++ opensips-3.4.1.make/modules/xcap_client/Makefile 2023-09-13 02:58:20.035058673 +0200
+@@ -10,8 +10,8 @@
+ NAME=xcap_client.so
+
+ ifeq ($(CROSS_COMPILE),)
+-XML2CFG=$(shell which xml2-config)
+-CURL_BUILDER=$(shell \
++XML2CFG:=$(shell which xml2-config)
++CURL_BUILDER:=$(shell \
+ if pkg-config --exists libcurl; then \
+ echo 'pkg-config libcurl'; \
+ else \
diff --git a/make.patch b/make.patch
deleted file mode 100644
index fd9764b..0000000
--- a/make.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- opensips-2.4.8/Makefile.orig 2020-06-15 17:14:49.000000000 +0200
-+++ opensips-2.4.8/Makefile 2020-10-09 20:17:09.301016848 +0200
-@@ -46,7 +46,6 @@
- # whether or not to overwrite TLS certificates
- tls_overwrite_certs?=
-
--makefile_defs=0
- DEFS:= $(DEFS_EXTRA_OPTS)
- DEBUG_PARSER?=
-
-@@ -474,7 +473,7 @@
- # Install everything (except modules-docbook?)
- install: install-app install-console install-modules-all
-
--opensipsmc: $(cfg_prefix)/$(cfg_dir) $(data_prefix)/$(data_dir)
-+opensipsmc: $(cfg_dir) $(data_dir)
- $(MAKE) -C menuconfig proper
- $(MAKE) -C menuconfig \
- MENUCONFIG_CFG_PATH=$(data_target)/menuconfig_templates/ \
-@@ -491,14 +490,14 @@
- $(MAKE) -C db/schema
- - at echo "Done"
-
--mk-install-dirs: $(cfg_prefix)/$(cfg_dir) $(bin_prefix)/$(bin_dir) \
-- $(modules_prefix)/$(modules_dir) $(doc_prefix)/$(doc_dir) \
-- $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5 \
-- $(data_prefix)/$(data_dir)
-+mk-install-dirs: $(cfg_dir) $(bin_dir) \
-+ $(modules_dir) $(doc_dir) \
-+ $(man_dir)/man8 $(man_dir)/man5 \
-+ $(data_dir)
-
-
- # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
--install-cfg: $(cfg_prefix)/$(cfg_dir)
-+install-cfg: $(cfg_dir)
- sed -e "s#/usr/.*lib/$(NAME)/modules/#$(modules_target)#g" \
- < etc/$(NAME).cfg > $(cfg_prefix)/$(cfg_dir)$(NAME).cfg.sample0
- umask 0077; sed -e "s#/usr/.*etc/$(NAME)/tls/#$(cfg_target)tls/#g" \
-@@ -527,7 +526,7 @@
- $(cfg_prefix)/$(cfg_dir)/osipsconsolerc; \
- fi
-
--install-console: $(bin_prefix)/$(bin_dir)
-+install-console: $(bin_dir)
- # install osipsconsole
- cat scripts/osipsconsole | \
- sed -e "s#PATH_BIN[ \t]*=[ \t]*\"\./\"#PATH_BIN = \"$(bin-target)\"#g" | \
-@@ -540,7 +539,7 @@
- $(INSTALL_BIN) /tmp/osipsconsole $(bin_prefix)/$(bin_dir)
- rm -fr /tmp/osipsconsole
-
--install-bin: app $(bin_prefix)/$(bin_dir) opensipsmc utils
-+install-bin: app $(bin_dir) opensipsmc utils
- # install opensips binary
- $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
- $(INSTALL_BIN) $(NAME) $(bin_prefix)/$(bin_dir)
-@@ -611,7 +610,7 @@
- cd utils/db_oracle; $(MAKE) all ; \
- fi ;
-
--install-modules: modules $(modules_prefix)/$(modules_dir)
-+install-modules: modules $(modules_dir)
- @for r in $(modules_full_path) "" ; do \
- if [ -n "$$r" ]; then \
- if [ -f "$$r" ]; then \
-@@ -629,7 +628,7 @@
- .PHONY: install-doc install-app-doc install-modules-doc
- install-doc: install-app-doc install-modules-doc
-
--install-app-doc: $(doc_prefix)/$(doc_dir)
-+install-app-doc: $(doc_dir)
- - at for d in $(install_docs) ""; do \
- if [ -n "$$d" ]; then \
- $(INSTALL_TOUCH) $(doc_prefix)/$(doc_dir)/"$$d" ; \
-@@ -638,7 +637,7 @@
- done
-
-
--install-modules-doc: $(doc_prefix)/$(doc_dir)
-+install-modules-doc: $(doc_dir)
- - at for r in $(modules_basenames) "" ; do \
- if [ -n "$$r" ]; then \
- if [ -f modules/"$$r"/README ]; then \
-@@ -650,7 +649,7 @@
- done
-
-
--install-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
-+install-man: $(man_dir)/man8 $(man_dir)/man5
- sed -e "s#/etc/$(NAME)/$(NAME)\.cfg#$(cfg_target)$(NAME).cfg#g" \
- -e "s#/usr/sbin/#$(bin-target)#g" \
- -e "s#/usr/lib/$(NAME)/modules/#$(modules_target)#g" \
-@@ -677,7 +676,7 @@
- $(man_prefix)/$(man_dir)/man8/opensipsunix.8
- chmod 644 $(man_prefix)/$(man_dir)/man8/opensipsunix.8
-
--install-modules-docbook: $(doc_prefix)/$(doc_dir)
-+install-modules-docbook: $(doc_dir)
- - at for r in $(modules_basenames) "" ; do \
- if [ -n "$$r" ]; then \
- if [ -d modules/"$$r"/doc ]; then \
-diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile.defs opensips-2.4.0/Makefile.defs
---- opensips-2.4.0.orig/Makefile.defs 2018-04-30 21:37:06.000000000 +0900
-+++ opensips-2.4.0/Makefile.defs 2018-05-23 19:46:05.110927079 +0900
-@@ -52,11 +52,6 @@
-
- # check if already included/exported
-
--ifeq ($(makefile_defs), 1)
--else
--makefile_defs=1
--export makefile_defs
--
- # main binary name
- MAIN_NAME=opensips
-
-@@ -1657,5 +1652,3 @@
- test_objs := $(test_src:.c=.o)
- objs := $(objs) $(test_objs)
- endif
--
--endif # ifeq ($(makefile_defs, 1)
-diff -ur -x .svn -x .git -x .bzr -x CVS -ur opensips-2.4.0.orig/Makefile.rules opensips-2.4.0/Makefile.rules
---- opensips-2.4.0.orig/Makefile.rules 2018-04-30 21:37:06.000000000 +0900
-+++ opensips-2.4.0/Makefile.rules 2018-05-23 19:46:45.491993230 +0900
-@@ -92,26 +92,26 @@
- END { print "#endif /* __MEM_STAT_H_ */\n#endif /* SHM_EXTRA_STATS */"; \
- print "/* modules MD5: $(MODULES_MD5) */"; fflush()}' > $@
-
--$(cfg_prefix)/$(cfg_dir):
-+$(cfg_dir):
- mkdir -m 700 -p $(cfg_prefix)/$(cfg_dir)
-
--$(bin_prefix)/$(bin_dir):
-+$(bin_dir):
- mkdir -p $(bin_prefix)/$(bin_dir)
-
--$(modules_prefix)/$(modules_dir):
-+$(modules_dir):
- mkdir -p $(modules_prefix)/$(modules_dir)
-
--$(doc_prefix)/$(doc_dir):
-+$(doc_dir):
- mkdir -p $(doc_prefix)/$(doc_dir)
-
--$(man_prefix)/$(man_dir)/man8:
-+$(man_dir)/man8:
- mkdir -p $(man_prefix)/$(man_dir)/man8
-
--$(man_prefix)/$(man_dir)/man5:
-+$(man_dir)/man5:
- mkdir -p $(man_prefix)/$(man_dir)/man5
-
--$(data_prefix)/$(data_dir):
-+$(data_dir):
- mkdir -p $(data_prefix)/$(data_dir)
-
-
- .PHONY: dosetrev
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opensips.git/commitdiff/7900173f2cce21a901889329d0ff7be3745a8e9c
More information about the pld-cvs-commit
mailing list