Update to commit 57f6b20f94bff1c0c43bd8caac70a0a32f54d8d5

Patches merged upstream: removed.

diff --git a/Makefile b/Makefile
index 90afae1b7e82465f211a0482787b157478a5913e..91b08657d7f6c50e14110454c1e446323ac935d3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ USES=         cmake ssl
 
 USE_GITHUB=            yes
 GH_ACCOUNT=            openiked
-GH_TAGNAME=            7efaa952cabc5fa6441392677147b5702d1bfbb8
-DISTVERSION=   g20210119
+GH_TAGNAME=            57f6b20f94bff1c0c43bd8caac70a0a32f54d8d5
+DISTVERSION=   g20210125
 
 USE_RC_SUBR= iked
 USERS=         _iked

diff --git a/distinfo b/distinfo
index 7040d70e09bd732b1e91e6836f4209135affc1f6..e89abda9fcc7fa307881ec3f69e2dfde0fa361dc 100644 (file)
--- a/distinfo
+++ b/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611258184
-SHA256 (openiked-openiked-portable-g20210119-7efaa952cabc5fa6441392677147b5702d1bfbb8_GH0.tar.gz) = d2300f1055a77f7dfe928de59f995af2ac56709b7ca5bab5581a9955aca76351
-SIZE (openiked-openiked-portable-g20210119-7efaa952cabc5fa6441392677147b5702d1bfbb8_GH0.tar.gz) = 275522
+TIMESTAMP = 1611691965
+SHA256 (openiked-openiked-portable-g20210125-57f6b20f94bff1c0c43bd8caac70a0a32f54d8d5_GH0.tar.gz) = d391a163de915ffab9c3ab457f7cd88a3f2b3889814ac23c7e69a61d5e29f286
+SIZE (openiked-openiked-portable-g20210125-57f6b20f94bff1c0c43bd8caac70a0a32f54d8d5_GH0.tar.gz) = 276424

diff --git a/files/patch-CMakeLists.txt b/files/patch-CMakeLists.txt
deleted file mode 100644 (file)
index a4866fe..0000000
--- a/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- CMakeLists.txt.orig        2021-01-21 11:28:09 UTC
-+++ CMakeLists.txt
-@@ -24,6 +24,12 @@ include(CheckIncludeFiles)
- include_directories("/usr/local/include")
- link_directories("/usr/local/lib")
- 
-+
-+if (NOT DEFINED CMAKE_INSTALL_SYSCONFDIR )
-+      set (CMAKE_INSTALL_SYSCONFDIR ${CMAKE_INSTALL_PREFIX}/etc)
-+endif()
-+set (SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}/iked)
-+
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-       include_directories("/usr/local/opt/openssl@1.1/include")
-       link_directories("/usr/local/opt/openssl@1.1/lib")
-@@ -32,8 +38,8 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-       add_definitions(-DHAVE_ATTRIBUTE__DEAD__)
-       add_definitions(-DHAVE_SOCKADDR_SA_LEN)
- elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
--      add_definitions(-DIKED_CONFIG="/usr/local/etc/iked.conf")
--      add_definitions(-DIKED_CA="/usr/local/etc/iked/")
-+      add_definitions(-DIKED_CONFIG="${CMAKE_INSTALL_SYSCONFDIR}/iked.conf")
-+      add_definitions(-DIKED_CA="${SYSCONFDIR}/")
- elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-       add_definitions(-D_GNU_SOURCE)
-       add_definitions(-D_DEFAULT_SOURCE)

diff --git a/files/patch-iked_CMakeLists.txt b/files/patch-iked_CMakeLists.txt
deleted file mode 100644 (file)
index 454139f..0000000
--- a/files/patch-iked_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- iked/CMakeLists.txt.orig   2021-01-21 11:28:09 UTC
-+++ iked/CMakeLists.txt
-@@ -194,3 +194,12 @@ add_custom_command(
- )
- 
- install(TARGETS iked RUNTIME DESTINATION sbin)
-+install(FILES ${CMAKE_SOURCE_DIR}/iked.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/ca)
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/certs)
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/crls)
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/private)
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/pubkeys/ipv4)
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/pubkeys/ipv6)
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/pubkeys/fqdn)
-+install(DIRECTORY DESTINATION ${SYSCONFDIR}/pubkeys/ufqdn)