Skip to content

Commit

Permalink
security/gsad: update to 22.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alonsobsd committed Aug 1, 2022
1 parent f9d9aa4 commit 8d632b3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
4 changes: 3 additions & 1 deletion security/gsad/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gsad
DISTVERSIONPREFIX= v
DISTVERSION= 21.4.4
DISTVERSION= 22.4.0
CATEGORIES= security

MAINTAINER= acm@FreeBSD.org
Expand Down Expand Up @@ -39,6 +39,7 @@ post-patch:
${REINPLACE_CMD} -e 's|$${GVM_LOG_DIR}|/var/log/gvm|g' ${WRKSRC}/src/gsad_log.conf.sample

post-install:
@${MKDIR} ${STAGEDIR}/var/run/gsad
@${MKDIR} ${STAGEDIR}/var/run/gvm
@${MKDIR} ${STAGEDIR}${ETCDIR}
@${INSTALL_DATA} ${WRKSRC}/src/gsad_log.conf.sample ${STAGEDIR}${ETCDIR}
Expand All @@ -47,5 +48,6 @@ post-install:
@${ECHO_CMD} "sbin/gsad" >> ${TMPPLIST} >> ${TMPPLIST}
@${ECHO_CMD} "share/man/man8/gsad.8.gz" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gsad" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(gvm,gvm,750) /var/run/gvm" >> ${TMPPLIST}

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions security/gsad/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1650489331
SHA256 (greenbone-gsad-v21.4.4_GH0.tar.gz) = ea60fc00a1e8d9a2e548aba5056472a8076cd8ba26012f3e20e44e3906b02525
SIZE (greenbone-gsad-v21.4.4_GH0.tar.gz) = 220618
TIMESTAMP = 1659324216
SHA256 (greenbone-gsad-v22.4.0_GH0.tar.gz) = 4b0ee7a704f4dc20225dc65562618b6d3d4bb3877f2beca5eb6183c40330bdae
SIZE (greenbone-gsad-v22.4.0_GH0.tar.gz) = 220713
22 changes: 10 additions & 12 deletions security/gsad/files/patch-CMakeLists.txt
@@ -1,15 +1,15 @@
--- CMakeLists.txt.orig 2022-04-20 16:19:23.710555000 -0500
+++ CMakeLists.txt 2022-04-20 16:22:09.030744000 -0500
@@ -61,7 +61,7 @@
--- CMakeLists.txt 2022-07-21 02:09:24.000000000 -0500
+++ CMakeLists.txt 2022-07-31 22:27:14.895003000 -0500
@@ -51,7 +51,7 @@
endif (CLANG_FORMAT)

if (NOT SYSCONFDIR)
- set (SYSCONFDIR "/etc")
+ set (SYSCONFDIR "{CMAKE_INSTALL_PREFIX}/etc")
+ set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
endif (NOT SYSCONFDIR)

if (NOT EXEC_PREFIX)
@@ -96,7 +96,7 @@
@@ -86,7 +86,7 @@
set (GSAD_CONFIG_DIR "${SYSCONFDIR}/gvm/")

if (NOT GSAD_RUN_DIR)
Expand All @@ -18,29 +18,27 @@
endif (NOT GSAD_RUN_DIR)

if (NOT GSAD_PID_PATH)
@@ -104,7 +104,7 @@
@@ -94,7 +94,7 @@
endif (NOT GSAD_PID_PATH)

if (NOT GVMD_RUN_DIR)
- set (GVMD_RUN_DIR "/run/gvmd")
+ set (GVMD_RUN_DIR "${LOCALSTATEDIR}/run/gvmd")
endif (NOT GVMD_RUN_DIR)

if (NOT GSAD_PID_DIR)
@@ -143,17 +143,17 @@

@@ -130,15 +130,15 @@
endif (NOT GVM_CA_CERTIFICATE)


-configure_file (src/gsad_log_conf.cmake_in src/gsad_log.conf)
+#configure_file (src/gsad_log_conf.cmake_in src/gsad_log.conf)
+# configure_file (src/gsad_log_conf.cmake_in src/gsad_log.conf)

## Install

install (DIRECTORY DESTINATION ${GSAD_RUN_DIR})

-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf
- DESTINATION ${GSAD_CONFIG_DIR})
+#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf
+# install (FILES ${CMAKE_CURRENT_BINARY_DIR}/src/gsad_log.conf
+# DESTINATION ${GSAD_CONFIG_DIR})

add_subdirectory (src)
Expand Down

0 comments on commit 8d632b3

Please sign in to comment.