[Pkg-voip-commits] [linphone] 02/02: add a patch to build linphone without attempting to download from mozilla

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch master
in repository linphone.

commit 0787f4171cc200a57d6ca8614ddd2e030d5f5d75
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Thu Apr 27 08:09:02 2017 +0200

    add a patch to build linphone without attempting to download from mozilla
---
 debian/TODO                 |  1 -
 debian/changelog            |  1 +
 debian/patches/offline-mode | 42 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 debian/rules                |  2 +-
 5 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index 3a8ac21..d43000e 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,3 +1,2 @@
-- share/CMakeLists.txt tries to download certdata.txt from mozilla and stores it as rootca.pem
 - package belcard from git://git.linphone.org/belcard.git
 - a number of API names misspell referred as refered
diff --git a/debian/changelog b/debian/changelog
index f558439..88e9e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ linphone (3.11.1-1) UNRELEASED; urgency=low
   * add a patch to update rootca.pem with a more recent version from mozilla
   * run wrap-and-sort -abt
   * change debian/copyright to use DEP5 (Machine-readable debian/copyright)
+  * add a patch to build linphone without attempting to download from mozilla
 
  -- Felix Lechner <felix.lechner at gmail.com>  Fri, 03 Jul 2015 17:24:11 -0700
 
diff --git a/debian/patches/offline-mode b/debian/patches/offline-mode
new file mode 100644
index 0000000..06ed2ca
--- /dev/null
+++ b/debian/patches/offline-mode
@@ -0,0 +1,42 @@
+Add a CMake option that allows one to compile linphone without accessing the internet
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,6 +60,7 @@ option(ENABLE_DEBUG_LOGS "Turn on or off
+ option(ENABLE_NLS "Build with internationalisation support" YES)
+ option(ENABLE_VCARD "Turn on compilation of vcard4 support." YES)
+ option(CXX_WRAPPER "Build the C++ wrapper for Liblinphone." OFF)
++option(OFFLINE_MODE "Build without trying to access remote systems." NO)
+ 
+ 
+ macro(apply_compile_flags SOURCE_FILES)
+--- a/share/CMakeLists.txt
++++ b/share/CMakeLists.txt
+@@ -32,7 +32,7 @@ endif()
+ 
+ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/rootca.pem PROPERTIES GENERATED TRUE)
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rootca.pem
+-	COMMAND ${CMAKE_COMMAND} -DHTTPS_CA_DIR=${HTTPS_CA_DIR} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/rootca.cmake)
++	COMMAND ${CMAKE_COMMAND} -DHTTPS_CA_DIR=${HTTPS_CA_DIR} -DWORK_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR} -DOFFLINE_MODE=${OFFLINE_MODE} -P ${CMAKE_CURRENT_SOURCE_DIR}/rootca.cmake)
+ add_custom_target(rootca ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/rootca.pem)
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rootca.pem
+--- a/share/rootca.cmake
++++ b/share/rootca.cmake
+@@ -28,10 +28,12 @@ execute_process(
+ 	COMMAND ${CMAKE_COMMAND} -E remove "fresh-rootca.pem"
+ 	WORKING_DIRECTORY ${OUTPUT_DIR}
+ )
+-execute_process(
+-	COMMAND "../scripts/mk-ca-bundle.pl" "${OUTPUT_DIR}/fresh-rootca.pem"
+-	WORKING_DIRECTORY ${WORK_DIR}
+-)
++if(NOT OFFLINE_MODE)
++	execute_process(
++		COMMAND "../scripts/mk-ca-bundle.pl" "${OUTPUT_DIR}/fresh-rootca.pem"
++		WORKING_DIRECTORY ${WORK_DIR}
++	)
++endif()
+ if(EXISTS "${OUTPUT_DIR}/fresh-rootca.pem")
+ 	file(RENAME "${OUTPUT_DIR}/fresh-rootca.pem" "${OUTPUT_DIR}/rootca.pem")
+ else()
diff --git a/debian/patches/series b/debian/patches/series
index 343fbb6..205f719 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ install-pkgconfig
 desktop-file-keywords
 regenerate-png-icons
 refresh-archived-rootca
+offline-mode
diff --git a/debian/rules b/debian/rules
index 4a778ec..ecb657e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # Upstream unconditionally sets CMAKE_INSTALL_RPATH. Make it ineffective by
 # setting CMAKE_SKIP_RPATH
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON -DENABLE_LDAP=YES $(CONFIGURE_ARGS)
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON -DENABLE_LDAP=YES -DOFFLINE_MODE=YES $(CONFIGURE_ARGS)
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/linphone.git