mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-02 11:19:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag '3.11.1'

Browse source 
3.11.1
This commit is contained in:
François Grisez 2017-03-02 14:57:23 +01:00
commit 652ec4a52b
4 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CMakeLists.txt
View file

@ -21,7 +21,7 @@
############################################################################
cmake_minimum_required(VERSION 3.0)
project(linphone VERSION 3.11.0 LANGUAGES C CXX)
project(linphone VERSION 3.11.1 LANGUAGES C CXX)
set(LINPHONE_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
@ -358,3 +358,18 @@ install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/LinphoneConfigVersion.cmake"
DESTINATION ${CONFIG_PACKAGE_LOCATION}
)
# CPack settings
set(CPACK_PACKAGE_NAME "linphone")
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
set(CPACK_SOURCE_IGNORE_FILES
"^${CMAKE_BINARY_DIR}"
"/\\\\..+"
"^${CMAKE_SOURCE_DIR}/mediastreamer2"
"^${CMAKE_SOURCE_DIR}/oRTP"
)
include(CPack)

3
NEWS
View file

@ -1,3 +1,6 @@
linphone-3.11.1 -- March 2nd, 2017
* Bugfix in Autotools scripts
linphone-3.11.0 -- February 24th, 2017
* Security vulnerability fix concering TLS. The common name of certificats
delivered by SIP proxies were not compared with their hostname.

6
configure.ac
View file

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT([linphone],[3.11.0],[linphone-developers@nongnu.org])
AC_INIT([linphone],[3.11.1],[linphone-developers@nongnu.org])
AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
@ -823,7 +823,7 @@ AC_ARG_ENABLE(external-ortp,
no) external_ortp=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-external-ortp) ;;
esac],
[external_ortp=false]
[external_ortp=$(if test -d oRTP; then printf false; else printf true; fi)]
)
if test "$external_ortp" = 'true'; then
@ -851,7 +851,7 @@ AC_SUBST([ORTP_DIR])
AC_ARG_ENABLE([external-mediastreamer],
[AS_HELP_STRING([--enable-external-mediastreamer],[Use external mediastreamer library])],,
[enable_external_mediastreamer=no]
[enable_external_mediastreamer=$(if test -d mediastreamer2; then printf no; else printf yes; fi)]
)
AS_CASE($enable_external_mediastreamer,

2
coreapi/Makefile.am
View file

@ -202,6 +202,8 @@ make_gitversion_h:
cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \
fi ; \
rm -f $(builddir)/$(GITVERSION_FILE_TMP) ; \
else \
touch $(GITVERSION_FILE) ; \
fi
$(GITVERSION_FILE): make_gitversion_h