Merge branch 'master' of gitlab.linphone.org:BC/public/linphone-cmake-builder

builders/flexisip.cmake

@@ -46,18 +46,20 @@ endif()
 if(ENABLE_REDIS)
 	lcb_dependencies("hiredis")
 endif()
+if(ENABLE_JWE_AUTH_PLUGIN)
+	lcb_dependencies("jose")
+endif()
 
 lcb_cmake_options(
 	"-DENABLE_TRANSCODER=${ENABLE_TRANSCODER}"
 	"-DENABLE_ODBC=NO"
 	"-DENABLE_REDIS=${ENABLE_REDIS}"
 	"-DENABLE_SOCI=${ENABLE_SOCI}"
-	"-DENABLE_PUSHNOTIFICATION=${ENABLE_PUSHNOTIFICATION}"
 	"-DENABLE_PRESENCE=${ENABLE_PRESENCE}"
 	"-DENABLE_CONFERENCE=${ENABLE_CONFERENCE}"
 	"-DENABLE_SNMP=${ENABLE_SNMP}"
 	"-DENABLE_DOC=${ENABLE_DOC}"
 	"-DENABLE_PROTOBUF=${ENABLE_PROTOBUF}"
 	"-DENABLE_MDNS=${ENABLE_MDNS}"
+	"-DENABLE_JWE_AUTH_PLUGIN=${ENABLE_JWE_AUTH_PLUGIN}"
 )
-

builders/jansson.cmake

+############################################################################
+# jansson.cmake
+# Copyright (C) 2018  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
+
+lcb_git_repository("git@gitlab.linphone.org:BC/public/external/jansson.git")
+lcb_external_source_paths("externals/jansson")
+lcb_may_be_found_on_system(YES)

builders/jose.cmake

+############################################################################
+# jose.cmake
+# Copyright (C) 2018  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
+
+lcb_git_repository("git@gitlab.linphone.org:BC/public/external/jose.git")
+lcb_external_source_paths("externals/jose")
+lcb_spec_file("jose.spec")
+
+lcb_dependencies("jansson")
+lcb_dependencies("zlib")

configs/config-flexisip-rpm.cmake

@@ -51,7 +51,6 @@ set(LINPHONE_BUILDER_USE_SYSTEM_DEPENDENCIES YES CACHE BOOL "" FORCE)
 
 # Define default values for the flexisip builder options
 set(DEFAULT_VALUE_ENABLE_CXX_WRAPPER ON)
-set(DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION ON)
 set(DEFAULT_VALUE_ENABLE_REDIS ON)
 set(DEFAULT_VALUE_ENABLE_SOCI ON)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)

configs/config-flexisip.cmake

@@ -21,7 +21,6 @@
 ############################################################################
 
 # Define default values for the flexisip builder options
-set(DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION ON)
 set(DEFAULT_VALUE_ENABLE_REDIS ON)
 set(DEFAULT_VALUE_ENABLE_UNIT_TESTS OFF)
 set(DEFAULT_VALUE_ENABLE_PRESENCE OFF)
@@ -29,6 +28,7 @@ set(DEFAULT_VALUE_ENABLE_CONFERENCE OFF)
 set(DEFAULT_VALUE_ENABLE_SNMP ON)
 set(DEFAULT_VALUE_ENABLE_POLARSSL ON)
 set(DEFAULT_VALUE_ENABLE_PROTOBUF OFF)
+set(DEFAULT_VALUE_ENABLE_JWE_AUTH_PLUGIN OFF)
 
 set(DEFAULT_VALUE_ENABLE_VCARD OFF)
 set(DEFAULT_VALUE_ENABLE_VIDEO OFF)
@@ -91,4 +91,3 @@ if(ENABLE_CONFERENCE)
 		"-DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS}"
 	)
 endif()
-

options/flexisip.cmake

@@ -22,10 +22,10 @@
 
 # Flexisip build options
 
-lcb_add_option("REDIS" "Enable hiredis support." "${DEFAULT_VALUE_ENABLE_REDIS}")
-lcb_add_option("PushNotification" "Enable push notification support." "${DEFAULT_VALUE_ENABLE_PUSHNOTIFICATION}")
+lcb_add_option("Redis" "Enable hiredis support." "${DEFAULT_VALUE_ENABLE_REDIS}")
 lcb_add_option("Presence" "Enable presence server support." "${DEFAULT_VALUE_ENABLE_PRESENCE}")
 lcb_add_option("Conference" "Enable conference server support." "${DEFAULT_VALUE_ENABLE_CONFERENCE}")
 lcb_add_option("SNMP" "Enable SNMP support." "${DEFAULT_ENABLE_SNMP}")
 lcb_add_option("Transcoder" "Enable transcoder support." "${DEFAULT_ENABLE_TRANSCODER}")
-lcb_add_option("PROTOBUF" "Enable protobuf for REDIS." "${DEFAULT_ENABLE_PROTOBUF}" "ENABLE_PROTOBUF" OFF)
+lcb_add_option("Protobuf" "Enable protobuf for REDIS." "${DEFAULT_ENABLE_PROTOBUF}" "ENABLE_PROTOBUF" OFF)
+lcb_add_option("Jwe Auth Plugin" "Enable JweAuth plugin support." "${DEFAULT_VALUE_ENABLE_JWE_AUTH_PLUGIN}")