From dc394a3f8dc74af221da67b60a3596e92e5ddaf0 Mon Sep 17 00:00:00 2001 From: David Marec Date: Tue, 26 Jan 2021 22:03:42 +0100 Subject: [PATCH] Patches merged upstream: removed. --- Makefile | 2 +- distinfo | 6 +++--- files/patch-ikectl_CMakeLists.txt | 7 ------- files/patch-iked_CMakeLists.txt | 11 ----------- 4 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 files/patch-ikectl_CMakeLists.txt delete mode 100644 files/patch-iked_CMakeLists.txt diff --git a/Makefile b/Makefile index 91b0865..d8b54e0 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ USES= cmake ssl USE_GITHUB= yes GH_ACCOUNT= openiked -GH_TAGNAME= 57f6b20f94bff1c0c43bd8caac70a0a32f54d8d5 +GH_TAGNAME= d01898b12765c70088729880d66d6b81c87d2e2f DISTVERSION= g20210125 USE_RC_SUBR= iked diff --git a/distinfo b/distinfo index e89abda..f07d78f 100644 --- a/distinfo +++ b/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1611691965 -SHA256 (openiked-openiked-portable-g20210125-57f6b20f94bff1c0c43bd8caac70a0a32f54d8d5_GH0.tar.gz) = d391a163de915ffab9c3ab457f7cd88a3f2b3889814ac23c7e69a61d5e29f286 -SIZE (openiked-openiked-portable-g20210125-57f6b20f94bff1c0c43bd8caac70a0a32f54d8d5_GH0.tar.gz) = 276424 +TIMESTAMP = 1611694944 +SHA256 (openiked-openiked-portable-g20210125-d01898b12765c70088729880d66d6b81c87d2e2f_GH0.tar.gz) = ec40eb71058fd93718b3db67932f4415daa7a23a06e7f53e045368e42362f010 +SIZE (openiked-openiked-portable-g20210125-d01898b12765c70088729880d66d6b81c87d2e2f_GH0.tar.gz) = 276466 diff --git a/files/patch-ikectl_CMakeLists.txt b/files/patch-ikectl_CMakeLists.txt deleted file mode 100644 index be5b58c..0000000 --- a/files/patch-ikectl_CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ ---- ikectl/CMakeLists.txt.orig 2021-01-26 20:10:39 UTC -+++ ikectl/CMakeLists.txt -@@ -69,3 +69,4 @@ target_link_libraries(ikectl - ) - - install(TARGETS ikectl RUNTIME DESTINATION sbin) -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ikectl.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man8/) diff --git a/files/patch-iked_CMakeLists.txt b/files/patch-iked_CMakeLists.txt deleted file mode 100644 index a76114c..0000000 --- a/files/patch-iked_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- iked/CMakeLists.txt.orig 2021-01-26 20:10:39 UTC -+++ iked/CMakeLists.txt -@@ -195,6 +195,8 @@ add_custom_command( - - install(TARGETS iked RUNTIME DESTINATION sbin) - install(FILES ${CMAKE_SOURCE_DIR}/iked.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}) -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/iked.conf.5 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man5/) -+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/iked.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man8/) - install(DIRECTORY DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/iked/ca) - install(DIRECTORY DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/iked/certs) - install(DIRECTORY DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/iked/crls) -- 2.47.0