From 7f49eef44d7acd59fd624941f53de738add7e454 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 11 Jan 2021 09:53:13 +0100 Subject: [PATCH] TT#105600 secsipid package Change-Id: I3ce8d9a35190dffc65718ad1fb7861381b258751 --- debian/control | 16 +++++++++ debian/patches/series | 3 ++ ...e-detect-of-pkg-config-knows-about-l.patch | 36 +++++++++++++++++++ ...nclude-secsipid.h-from-standard-path.patch | 34 ++++++++++++++++++ ...csipid-use-pkg-config-when-available.patch | 34 ++++++++++++++++++ debian/rules | 1 + 6 files changed, 124 insertions(+) create mode 100644 debian/patches/upstream/secsipid-Makefile-detect-of-pkg-config-knows-about-l.patch create mode 100644 debian/patches/upstream/secsipid-include-secsipid.h-from-standard-path.patch create mode 100644 debian/patches/upstream/secsipid-use-pkg-config-when-available.patch diff --git a/debian/control b/debian/control index d21b90294..63a031fbd 100644 --- a/debian/control +++ b/debian/control @@ -36,6 +36,7 @@ Build-Depends: libreadline-dev, libsasl2-dev, libsctp-dev [linux-any], + libsecsipid-dev, libsnmp-dev, libsqlite3-dev, libssl-dev, @@ -829,6 +830,21 @@ Description: extra modules for Kamailio . This package provides: gzcompress uuid ev jansson +Package: ngcp-kamailio-secsipid-modules +Architecture: any +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Description: contains the secsipid module + Kamailio is a very fast and flexible SIP (RFC3261) + proxy server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package contains the secsipid Module. + Package: ngcp-kamailio-lcrrate-modules Architecture: any Multi-Arch: same diff --git a/debian/patches/series b/debian/patches/series index b74ceb6e8..41cd33942 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,6 +37,9 @@ upstream/0002-Revert-tls-added-define-condition-on-version-functio.patch upstream/0003-Revert-tls-support-compilation-without-deprecated-Op.patch upstream/pv_headers-fix-x_hdr-index-on-get.patch upstream/ndb_redis-set-message-level-to-debug-on-exec.patch +upstream/secsipid-use-pkg-config-when-available.patch +upstream/secsipid-Makefile-detect-of-pkg-config-knows-about-l.patch +upstream/secsipid-include-secsipid.h-from-standard-path.patch # upstream master (5.5) upstream/permissions-basic-safety-for-concurent-rpc-reload.patch upstream/permissions-add-reload_delta-parameter.patch diff --git a/debian/patches/upstream/secsipid-Makefile-detect-of-pkg-config-knows-about-l.patch b/debian/patches/upstream/secsipid-Makefile-detect-of-pkg-config-knows-about-l.patch new file mode 100644 index 000000000..9b1ca771a --- /dev/null +++ b/debian/patches/upstream/secsipid-Makefile-detect-of-pkg-config-knows-about-l.patch @@ -0,0 +1,36 @@ +From b7cff8de3b3d26b1120678fac331ca52424e6c01 Mon Sep 17 00:00:00 2001 +From: Daniel-Constantin Mierla +Date: Thu, 7 Jan 2021 17:34:36 +0100 +Subject: [PATCH] secsipid: Makefile - detect of pkg-config knows about + libsecsipid + +(cherry picked from commit 664542adf42a4d829ddf9b9e482aba81f30883d8) +--- + src/modules/secsipid/Makefile | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile +index 13012cd248..2b97061d31 100644 +--- a/src/modules/secsipid/Makefile ++++ b/src/modules/secsipid/Makefile +@@ -7,7 +7,16 @@ include ../../Makefile.defs + auto_gen= + NAME=secsipid.so + +-BUILDER = $(shell which pkg-config) ++ifeq ($(CROSS_COMPILE),) ++ BUILDER = $(shell which pkg-config) ++ifneq ($(BUILDER),) ++ PKGLIBSECSIPID = $(shell $(BUILDER) --exists secsipid-1 > /dev/null 2>&1 ; echo $$? ) ++ifneq ($(PKGLIBSECSIPID),0) ++ BUILDER = ++endif ++endif ++endif ++ + ifeq ($(BUILDER),) + DEFS+= -I. + LIBS = -L. -lsecsipid +-- +2.20.1 + diff --git a/debian/patches/upstream/secsipid-include-secsipid.h-from-standard-path.patch b/debian/patches/upstream/secsipid-include-secsipid.h-from-standard-path.patch new file mode 100644 index 000000000..a859b74ab --- /dev/null +++ b/debian/patches/upstream/secsipid-include-secsipid.h-from-standard-path.patch @@ -0,0 +1,34 @@ +From 06bd17a8387008a3c7b797bd820a687ece5e3627 Mon Sep 17 00:00:00 2001 +From: Daniel-Constantin Mierla +Date: Fri, 8 Jan 2021 08:21:55 +0100 +Subject: [PATCH] secsipid: include secsipid.h from standard path + +(cherry picked from commit c1a3443b09cee8a923f8801f8f3034f078034bf5) +--- + src/modules/secsipid/secsipid_mod.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c +index d3ad1c896e..efdb5ff50e 100644 +--- a/src/modules/secsipid/secsipid_mod.c ++++ b/src/modules/secsipid/secsipid_mod.c +@@ -25,14 +25,14 @@ + #include + #include + ++#include ++ + #include "../../core/sr_module.h" + #include "../../core/dprint.h" + #include "../../core/mod_fix.h" + #include "../../core/data_lump.h" + #include "../../core/kemi.h" + +-#include "secsipid.h" +- + MODULE_VERSION + + static int secsipid_expire = 300; +-- +2.20.1 + diff --git a/debian/patches/upstream/secsipid-use-pkg-config-when-available.patch b/debian/patches/upstream/secsipid-use-pkg-config-when-available.patch new file mode 100644 index 000000000..a42d99e9b --- /dev/null +++ b/debian/patches/upstream/secsipid-use-pkg-config-when-available.patch @@ -0,0 +1,34 @@ +From b0a629ef9b366f4946dd1e73ce4aed2e028c119b Mon Sep 17 00:00:00 2001 +From: Victor Seva +Date: Thu, 7 Jan 2021 11:14:53 +0100 +Subject: [PATCH] secsipid: use pkg-config when available + +(cherry picked from commit 231a6eceeb67318cf4708a765b47df6c336350da) +--- + src/modules/secsipid/Makefile | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/modules/secsipid/Makefile b/src/modules/secsipid/Makefile +index ec8ad07980..13012cd248 100644 +--- a/src/modules/secsipid/Makefile ++++ b/src/modules/secsipid/Makefile +@@ -7,8 +7,14 @@ include ../../Makefile.defs + auto_gen= + NAME=secsipid.so + +-DEFS+= -I. +-LIBS+= -L. -lsecsipid ++BUILDER = $(shell which pkg-config) ++ifeq ($(BUILDER),) ++ DEFS+= -I. ++ LIBS = -L. -lsecsipid ++else ++ DEFS+= $(shell pkg-config --cflags secsipid-1) ++ LIBS = $(shell pkg-config --libs secsipid-1) ++endif + + ifeq ($(OS), darwin) + LIBS+= -framework CoreFoundation -framework Security -lpthread +-- +2.20.1 + diff --git a/debian/rules b/debian/rules index f264b3a6f..d49346744 100755 --- a/debian/rules +++ b/debian/rules @@ -64,6 +64,7 @@ PACKAGE_GROUPS += websocket PACKAGE_GROUPS += autheph PACKAGE_GROUPS += cnxcc PACKAGE_GROUPS += erlang +PACKAGE_GROUPS += secsipid PACKAGE_GROUPS += lcrrate PACKAGE_GROUPS += tcap