Update to 0.1.15, and update CMakeLists.txt

3 files changed, 28 insertions, 20 deletions

diff --git a/ports/libnice/CMakeLists.txt b/ports/libnice/CMakeLists.txt
index 7454a0046..bde3a34ac 100644
--- a/ports/libnice/CMakeLists.txt
+++ b/ports/libnice/CMakeLists.txt
@@ -1,8 +1,14 @@
 cmake_minimum_required(VERSION 3.0)
-project(libnice C)
+project(libnice
+	LANGUAGES C
+	VERSION 0.1.15)
 SET (this_target libnice)
 
-add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
+add_definitions(
+	-D_CRT_SECURE_NO_WARNINGS
+	-D_SCL_SECURE_NO_WARNINGS
+	-DHAVE_OPENSSL
+	-DPACKAGE_STRING="${PROJECT_VERSION}")
 
 configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/config.h ${CMAKE_SOURCE_DIR}/config.h COPYONLY)
 configure_file(${CMAKE_SOURCE_DIR}/win32/vs9/libnice.def ${CMAKE_SOURCE_DIR}/libnice.def COPYONLY)
@@ -13,6 +19,7 @@ find_library(GOBJECT_LIBRARY gobject-2.0)
 find_library(GIO_LIBRARY gio-2.0)
 find_library(IPHLPAPI_LIBRARY iphlpapi)
 find_library(WS2_32_LIB ws2_32)
+find_package(OpenSSL REQUIRED)
 include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR} 
 	${CMAKE_CURRENT_SOURCE_DIR}/agent
@@ -24,21 +31,22 @@ include_directories(
 
 SET (SRCS
 	./agent/address.c
+	./agent/agent-enum-types.c
 	./agent/agent.c
 	./agent/candidate.c
 	./agent/component.c
 	./agent/conncheck.c
 	./agent/debug.c
 	./agent/discovery.c
-	./agent/discovery.c
 	./agent/inputstream.c
 	./agent/interfaces.c
 	./agent/iostream.c
 	./agent/outputstream.c
 	./agent/pseudotcp.c
 	./agent/stream.c
-	./random/random.c
 	./random/random-glib.c
+	./random/random.c
+	./random/test.c
 	./socket/http.c
 	./socket/pseudossl.c
 	./socket/socket.c
@@ -47,12 +55,10 @@ SET (SRCS
 	./socket/tcp-bsd.c
 	./socket/tcp-passive.c
 	./socket/udp-bsd.c
-	./socket/udp-turn.c
 	./socket/udp-turn-over-tcp.c
+	./socket/udp-turn.c
 	./stun/debug.c
-	./stun/md5.c
 	./stun/rand.c
-	./stun/sha1.c
 	./stun/stun5389.c
 	./stun/stunagent.c
 	./stun/stuncrc32.c
@@ -66,54 +72,56 @@ SET (SRCS
 	./libnice.def
 	)
 SET(HEADERS
-	./config.h
 	./agent/address.h
-	./agent/agent.h
+	./agent/agent-enum-types.h
 	./agent/agent-priv.h
+	./agent/agent.h
 	./agent/candidate.h
 	./agent/component.h
 	./agent/conncheck.h
 	./agent/debug.h
 	./agent/discovery.h
-	./agent/discovery.h
 	./agent/inputstream.h
 	./agent/interfaces.h
 	./agent/iostream.h
 	./agent/outputstream.h
 	./agent/pseudotcp.h
 	./agent/stream.h
-	./random/random.h
+	./config.h
+	./nice/nice.h
 	./random/random-glib.h
+	./random/random.h
 	./socket/http.h
 	./socket/pseudossl.h
+	./socket/socket-priv.h
 	./socket/socket.h
 	./socket/socks5.h
 	./socket/tcp-active.h
 	./socket/tcp-bsd.h
 	./socket/tcp-passive.h
 	./socket/udp-bsd.h
-	./socket/udp-turn.h
 	./socket/udp-turn-over-tcp.h
+	./socket/udp-turn.h
 	./stun/constants.h
 	./stun/debug.h
-	./stun/md5.h
 	./stun/rand.h
-	./stun/sha1.h
 	./stun/stun5389.h
 	./stun/stunagent.h
 	./stun/stuncrc32.h
 	./stun/stunhmac.h
 	./stun/stunmessage.h
+	./stun/tools/stund.h
 	./stun/usages/bind.h
 	./stun/usages/ice.h
 	./stun/usages/timer.h
 	./stun/usages/turn.h
 	./stun/utils.h
 	./stun/win32_common.h
+	./win32/vs9/config.h
 	)
 add_library(libnice ${SRCS} ${HEADERS})
 set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244 /wd4005 /wd4391 /wd4142 /wd4267")
-target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${GLIB_LIBRARY} ${GOBJECT_LIBRARY} ${GIO_LIBRARY})
+target_link_libraries(libnice ${IPHLPAPI_LIBRARY} ${WS2_32_LIB} ${GLIB_LIBRARY} ${GOBJECT_LIBRARY} ${GIO_LIBRARY} OpenSSL::SSL)
 install(TARGETS libnice
 RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
diff --git a/ports/libnice/CONTROL b/ports/libnice/CONTROL
index fc96705c7..7a33f1423 100644
--- a/ports/libnice/CONTROL
+++ b/ports/libnice/CONTROL
@@ -1,4 +1,4 @@
 Source: libnice
-Version: 0.1.13-2
+Version: 0.1.15
 Description: Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).
-Build-Depends: glib
+Build-Depends: glib, openssl
diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake
index d641f409d..fe7036cc3 100644
--- a/ports/libnice/portfile.cmake
+++ b/ports/libnice/portfile.cmake
@@ -2,9 +2,9 @@ include(vcpkg_common_functions)
 
 vcpkg_download_distfile(
     ARCHIVE
-    URLS "https://nice.freedesktop.org/releases/libnice-0.1.13.tar.gz"
-    FILENAME "libnice-0.1.13.tar.gz"
-    SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
+    URLS "https://nice.freedesktop.org/releases/libnice-0.1.15.tar.gz"
+    FILENAME "libnice-0.1.15.tar.gz"
+    SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 )
 vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}