[Build-System] Remove Sofia-Sip library from the FreeSWITCH tree and use packages instead.

Author: andywolk

.drone.yml

@@ -14,6 +14,7 @@ steps:
       image: signalwire/freeswitch-public-base
       pull: true
       commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
       - echo "applications/mod_test" >> modules.conf
       - echo 'codecs/mod_openh264' >> modules.conf
       - sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
@@ -27,6 +28,7 @@ steps:
       image: signalwire/freeswitch-public-base
       pull: true
       commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
       - echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
       - chmod +x build.sh
       - ./build.sh
@@ -35,6 +37,7 @@ steps:
       image: signalwire/freeswitch-public-base
       pull: true
       commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
       - make install || true
       - cd tests/unit
       - ./run-tests.sh
@@ -80,6 +83,7 @@ steps:
       image: signalwire/freeswitch-public-base:stretch
       pull: true
       commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
       - cp build/modules.conf.most modules.conf
       #Enable/Uncomment mods
       - echo 'codecs/mod_openh264' >> modules.conf
@@ -109,6 +113,7 @@ steps:
       image: signalwire/freeswitch-public-base:stretch
       pull: true
       commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev
       - mkdir -p scan-build
       - echo '#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
       - chmod +x scan.sh
@@ -139,6 +144,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 430f5a243e6029b985fa0219e9fb44c71a59931af44a3230751e238f8b64dd32
+hmac: 9f536d54b3df4db408a9e23a412185d0c95e66d22d15ba7ff00c7cfc85bff3ab
 
 ...

.gitattributes

@@ -6,7 +6,6 @@
 *.c text eol=lf
 *.cxx text eol=lf
 *.cpp text eol=lf
-/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask text eol=lf
 *.txt text eol=lf
 *.exe -diff binary executable windows dfsg-nonfree debian-ignore
 *.wav -diff binary sound

.gitignore

@@ -260,6 +260,8 @@ libs/libsilk-*/
 libs/rabbitmq-c-*/
 libs/rabbitmq-c-*.zip
 libs/ffmpeg-*/
+libs/sofia-sip*/
+libs/sofia-sip*
 
 src/mod/applications/mod_test/test/test_asr
 src/mod/event_handlers/mod_rayo/test/test_iks

Makefile.am

@@ -30,9 +30,8 @@ endif
 AM_CFLAGS   = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS) 
 AM_CPPFLAGS =
 AM_CPPFLAGS += -I$(switch_srcdir)/libs/libvpx
-AM_CPPFLAGS += $(SWITCH_AM_CXXFLAGS) -I$(switch_srcdir)/libs/sofia-sip/libsofia-sip-ua/sdp
-AM_CPPFLAGS += -I$(switch_srcdir)/libs/sofia-sip/libsofia-sip-ua/su -I$(switch_builddir)/libs/sofia-sip/libsofia-sip-ua/su
-AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS) $(AM_LIBAPR_LDFLAGS) $(AM_LIBAPU_LDFLAGS)
+AM_CPPFLAGS += $(SWITCH_AM_CXXFLAGS) $(SOFIA_SIP_CFLAGS)
+AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS) $(AM_LIBAPR_LDFLAGS) $(AM_LIBAPU_LDFLAGS) $(SOFIA_SIP_LIBS)
 
 DEFAULT_SOUNDS=en-us-callie-8000
 MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)"
@@ -593,14 +592,6 @@ libs/libvpx/Makefile: libs/libvpx/.update
 libs/libvpx/libvpx.a: libs/libvpx/Makefile libs/libvpx/.update
 	@cd libs/libvpx && $(MAKE)
 
-libs/sofia-sip/Makefile:
-	cd libs/sofia-sip && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-
-libs/sofia-sip/libsofia-sip-ua/sdp/.libs/libsdp.a libs/sofia-sip/libsofia-sip-ua/su/.libs/libsu.a: libs/sofia-sip/.update libs/sofia-sip/Makefile
-	@cd libs/sofia-sip && $(MAKE) noop
-	@cd libs/sofia-sip && $(MAKE) SOFIA_CFLAGS="$(SWITCH_AM_CFLAGS)"
-	@$(TOUCH_TARGET)
-
 libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr/.update
 	@cd libs/apr && ./config.status
 	@$(TOUCH_TARGET)
@@ -756,7 +747,6 @@ pristine:
 	git reset --hard
 
 update-clean: clean python-reconf
-	cd libs/sofia-sip && $(MAKE) clean
 	cd libs/esl && $(MAKE) clean
 	cd libs/srtp && $(MAKE) clean
 
@@ -796,11 +786,6 @@ spandsp-reconf:
 	cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS)
 	cd libs/spandsp && $(MAKE)
 
-sofia-reconf:
-	cd libs/sofia-sip && sh ./autogen.sh
-	cd libs/sofia-sip && $(MAKE) clean
-	cd libs/sofia-sip && ./configure $(MY_DEFAULT_ARGS) --with-pic --with-glib=no --disable-shared
-
 cluecon:
 	@clear
 	@echo Thank you for updating. This is going to take a while so relax.

acinclude.m4

@@ -9,8 +9,8 @@ m4_include([build/config/ax_check_java.m4])
 m4_include([build/config/uuid.m4])
 m4_include([build/config/erlang.m4])
 m4_include([build/config/odbc.m4])
+m4_include([build/config/sac-pkg-config.m4])
+m4_include([build/config/sac-openssl.m4])
 m4_include([build/config/sched_setaffinity.m4])
 m4_include([libs/apr/build/apr_common.m4])
-m4_include([libs/sofia-sip/m4/sac-pkg-config.m4])
-m4_include([libs/sofia-sip/m4/sac-openssl.m4])
 m4_include([libs/iksemel/build/libgnutls.m4])

bootstrap.sh

@@ -8,7 +8,7 @@ BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr libzrtp iksemel libdingaling sofia-sip srtp freetdm spandsp unimrcp fs";
+SUBDIRS="apr libzrtp iksemel libdingaling srtp freetdm spandsp unimrcp fs";
 
 while getopts 'jhd:v' o; do 
   case "$o" in

libs/sofia-sip/m4/sac-openssl.m4 renamed to build/config/sac-openssl.m4

@@ -714,6 +714,11 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb >= 3.0.9],[
   ])
 ])
 
+PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.12.12],[
+  AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
+    AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
+])
+
 AC_ARG_ENABLE(deprecated-core-db-events,
 	[AS_HELP_STRING([--enable-deprecated-core-db-events], [Keep deprecated core db events])],,[enable_deprecated_core_db_events="no"])
 
@@ -2104,7 +2109,6 @@ if test "$use_system_aprutil" != "yes"; then
 fi
 AC_CONFIG_SUBDIRS([libs/iksemel])
 AC_CONFIG_SUBDIRS([libs/libdingaling])
-AC_CONFIG_SUBDIRS([libs/sofia-sip])
 AC_CONFIG_SUBDIRS([libs/freetdm])
 AC_CONFIG_SUBDIRS([libs/unimrcp])
 AC_CONFIG_SUBDIRS([libs/spandsp])

libs/sofia-sip/m4/sac-pkg-config.m4 renamed to build/config/sac-pkg-config.m4

@@ -332,7 +332,7 @@ Build-Depends:
  uuid-dev, libexpat1-dev, libgdbm-dev, libdb-dev,
 # used by many modules
  libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
- bison, zlib1g-dev,
+ bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.12.12)
 # module build-depends
  $(debian_wrap "${mod_build_depends}")
 Standards-Version: 3.9.3

configure.ac

@@ -152,6 +152,7 @@ BuildRequires: gnutls-devel
 BuildRequires: libtool >= 1.5.17
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 1.0.1e
+BuildRequires: sofia-sip-devel >= 1.12.12
 BuildRequires: pcre-devel 
 BuildRequires: speex-devel 
 BuildRequires: sqlite-devel

debian/bootstrap.sh

@@ -837,7 +837,6 @@ iksemel/configure
 libdingaling/configure
 libyuv/Makefile
 libyuv/convert
-sofia-sip/configure
 spandsp/configure
 srtp/configure
 tiff-4.0.2/configure