Added changes made on official port repository.3.1.0

12 files changed, 25 insertions, 24 deletions

diff --git a/security/ossec-hids-agent-config/Makefile b/security/ossec-hids-agent-config/Makefile
index c72f8de..5ce62dd 100644
--- a/security/ossec-hids-agent-config/Makefile
+++ b/security/ossec-hids-agent-config/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/security/ossec-hids-agent-config/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 OSSEC_TYPE=	agent
 
diff --git a/security/ossec-hids-agent/Makefile b/security/ossec-hids-agent/Makefile
index 1bcb1f1..60fc031 100644
--- a/security/ossec-hids-agent/Makefile
+++ b/security/ossec-hids-agent/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/security/ossec-hids-agent/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 OSSEC_TYPE=	agent
 
diff --git a/security/ossec-hids-local-config/Makefile b/security/ossec-hids-local-config/Makefile
index 01cf6c6..c27135e 100644
--- a/security/ossec-hids-local-config/Makefile
+++ b/security/ossec-hids-local-config/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/security/ossec-hids-local-config/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 PORTNAME=	ossec-hids
 PORTVERSION=	3.1.0
@@ -317,24 +317,24 @@ pre-install:
 		${FILESDIR}/${TEMPL_SAMPLE_DB}.in > ${WRKDIR}/${TEMPL_SAMPLE_DB}
 
 ossec-dirs:
-	@${MKDIR} -p ${CONF_BIN_DIR} ${COMMAND_BIN_DIR} ${AR_BIN_DIR} ${OSSEC_CONF_DIR} ${OSSEC_LOCAL_CONF_DIR} ${COMMAND_CONF_DIR}
+	@${MKDIR} ${CONF_BIN_DIR} ${COMMAND_BIN_DIR} ${AR_BIN_DIR} ${OSSEC_CONF_DIR} ${OSSEC_LOCAL_CONF_DIR} ${COMMAND_CONF_DIR}
 .if ${OSSEC_TYPE} != agent
-	@${MKDIR} -p ${RULES_DIR}
+	@${MKDIR} ${RULES_DIR}
 .endif
 .if ${OSSEC_TYPE} == server
-	@${MKDIR} -p ${AGENT_CONF_DIR} ${AGENT_LOCAL_CONF_DIR}
+	@${MKDIR} ${AGENT_CONF_DIR} ${AGENT_LOCAL_CONF_DIR}
 .endif
 
 ossec-scripts:
-	@${CP} -f ${WRKDIR}/ossec-conf ${OSSEC_CONF_BIN}
+	@${CP} ${WRKDIR}/ossec-conf ${OSSEC_CONF_BIN}
 .if ${OSSEC_TYPE} == server
-	@${CP} -f ${WRKDIR}/agent-conf ${AGENT_CONF_BIN}
+	@${CP} ${WRKDIR}/agent-conf ${AGENT_CONF_BIN}
 .endif
 .for file_name in ${CMDOUT_SCRIPTS}
-	@${CP} -f ${WRKDIR}/command-${file_name}.sh ${COMMAND_BIN_DIR}/${file_name}.sh
+	@${CP} ${WRKDIR}/command-${file_name}.sh ${COMMAND_BIN_DIR}/${file_name}.sh
 .endfor
-	@${CP} -f ${WRKDIR}/command.conf ${COMMAND_CONF}
-	@${CP} -f ${WRKDIR}/merge-config.sh ${MERGE_CONFIG_BIN}
+	@${CP} ${WRKDIR}/command.conf ${COMMAND_CONF}
+	@${CP} ${WRKDIR}/merge-config.sh ${MERGE_CONFIG_BIN}
 
 ossec-rules:
 .if ${OSSEC_TYPE} != agent
@@ -352,7 +352,7 @@ ossec-conf-managed:
 .    if ${${conf_group}_INSTANCE_OPTIONS_ENABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Enabled ${${option}_OPTION} -->" >> ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
-	@${TEMPL_TO_OSSEC} ${WRKDIR}/${${option}_TEMPLATE} >> ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
+	@${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${${option}_TEMPLATE} >> ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 	@${ECHO_CMD} >> ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 .     endif
 .    endif
@@ -370,7 +370,7 @@ ossec-conf-local:
 .    if ${${conf_group}_INSTANCE_OPTIONS_DISABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Disabled ${${option}_OPTION} -->" >> ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
-	@${TEMPL_TO_OSSEC} ${WRKDIR}/${${option}_TEMPLATE} >> ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
+	@${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${${option}_TEMPLATE} >> ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 	@${ECHO_CMD} >> ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 .     endif
 .    endif
@@ -382,10 +382,10 @@ ossec-conf-local:
 ossec-conf-sample:
 	@${CAT} ${WRKDIR}/${TEMPL_SAMPLE_HEADER} > ${OSSEC_SAMPLE_CONF}
 	@${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF}
-	@${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE} >> ${OSSEC_SAMPLE_CONF}
+	@${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE} >> ${OSSEC_SAMPLE_CONF}
 	@${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF}
 	@-${TEST} -f ${WRKDIR}/${TEMPL_SAMPLE_DB} && \
-		${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE_DB} >> ${OSSEC_SAMPLE_CONF} && \
+		${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE_DB} >> ${OSSEC_SAMPLE_CONF} && \
 		${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF}
 
 agent-conf-managed:
@@ -397,7 +397,7 @@ agent-conf-managed:
 .    if ${${conf_group}_PUSHED_OPTIONS_ENABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Enabled ${${option}_OPTION}_P -->" >> ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
-	@${TEMPL_TO_AGENT} ${WRKDIR}/${${option}_TEMPLATE} >> ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
+	@${SH} ${TEMPL_TO_AGENT} ${WRKDIR}/${${option}_TEMPLATE} >> ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 	@${ECHO_CMD} >> ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF}
 .     endif
 .    endif
@@ -415,7 +415,7 @@ agent-conf-local:
 .    if ${${conf_group}_PUSHED_OPTIONS_DISABLED:M${option}}
 .     if !empty(${option}_TEMPLATE)
 	@${ECHO_CMD} "<!-- Disabled ${${option}_OPTION}_P -->" >> ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
-	@${TEMPL_TO_AGENT} ${WRKDIR}/${${option}_TEMPLATE} >> ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
+	@${SH} ${TEMPL_TO_AGENT} ${WRKDIR}/${${option}_TEMPLATE} >> ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 	@${ECHO_CMD} >> ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF}
 .     endif
 .    endif
diff --git a/security/ossec-hids-local-config/scripts/plist.sh b/security/ossec-hids-local-config/scripts/plist.sh
index 6d61787..6d61787 100755..100644
--- a/security/ossec-hids-local-config/scripts/plist.sh
+++ b/security/ossec-hids-local-config/scripts/plist.sh
diff --git a/security/ossec-hids-local-config/scripts/rules.sh b/security/ossec-hids-local-config/scripts/rules.sh
index 65e28e2..65e28e2 100755..100644
--- a/security/ossec-hids-local-config/scripts/rules.sh
+++ b/security/ossec-hids-local-config/scripts/rules.sh
diff --git a/security/ossec-hids-local-config/scripts/template-to-agent.sh b/security/ossec-hids-local-config/scripts/template-to-agent.sh
index 3034b1f..3034b1f 100755..100644
--- a/security/ossec-hids-local-config/scripts/template-to-agent.sh
+++ b/security/ossec-hids-local-config/scripts/template-to-agent.sh
diff --git a/security/ossec-hids-local-config/scripts/template-to-ossec.sh b/security/ossec-hids-local-config/scripts/template-to-ossec.sh
index 3933446..3933446 100755..100644
--- a/security/ossec-hids-local-config/scripts/template-to-ossec.sh
+++ b/security/ossec-hids-local-config/scripts/template-to-ossec.sh
diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile
index e6553b2..4b189dc 100644
--- a/security/ossec-hids-local/Makefile
+++ b/security/ossec-hids-local/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/security/ossec-hids-local/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 PORTNAME=	ossec-hids
 PORTVERSION=	3.1.0
@@ -12,6 +12,8 @@ COMMENT=	Security tool to monitor and check logs and intrusions
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		gmake readline ssl
+
 OSSEC_TYPE?=	local
 
 .if ${OSSEC_TYPE} == local
@@ -37,7 +39,6 @@ INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 PRELUDE_LIB_DEPENDS=	libprelude.so:security/libprelude
 ZEROMQ_LIB_DEPENDS=	libczmq.so:net/czmq
 
-USES=		gmake readline ssl
 MYSQL_USE=	mysql
 PGSQL_USES=	pgsql
 
@@ -204,12 +205,12 @@ do-install:
 post-install:
 	@${MV} -f ${STAGEDIR}${INTERNAL_OPTS_CONF} ${STAGEDIR}${INTERNAL_OPTS_CONF}.sample
 	@${MV} -f ${STAGEDIR}${FIREWALL_DROP_BIN} ${STAGEDIR}${IPFILTER_BIN}
-	@${CP} -f ${WRKDIR}/restart-ossec.sh ${STAGEDIR}${RESTART_OSSEC_BIN}
+	@${CP} ${WRKDIR}/restart-ossec.sh ${STAGEDIR}${RESTART_OSSEC_BIN}
 	@${CHMOD} 550 ${STAGEDIR}${RESTART_OSSEC_BIN}
 .if defined(MAINTAINER_MODE)
 	@${CHOWN} ${USER}:${OSSEC_GROUP} ${STAGEDIR}${RESTART_OSSEC_BIN}
 .endif
-	
+
 .if ${OSSEC_TYPE} == agent
 .if defined(MAINTAINER_MODE)
 	@for file_name in $$(find "${STAGEDIR}${SHARED_DIR}" -type f); do ${CHMOD} 0644 $${file_name}; ${CHOWN} ${OSSEC_USER}:${OSSEC_GROUP} $${file_name}; done
diff --git a/security/ossec-hids-local/scripts/plist.sh b/security/ossec-hids-local/scripts/plist.sh
index c08c5e1..c08c5e1 100755..100644
--- a/security/ossec-hids-local/scripts/plist.sh
+++ b/security/ossec-hids-local/scripts/plist.sh
diff --git a/security/ossec-hids-server-config/Makefile b/security/ossec-hids-server-config/Makefile
index e48b24c..8c49b34 100644
--- a/security/ossec-hids-server-config/Makefile
+++ b/security/ossec-hids-server-config/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/security/ossec-hids-server-config/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 OSSEC_TYPE=	server
 
diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile
index 6018efa..b10e12b 100644
--- a/security/ossec-hids-server/Makefile
+++ b/security/ossec-hids-server/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/security/ossec-hids-server/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 OSSEC_TYPE=	server
 
diff --git a/security/ossec-hids/Makefile b/security/ossec-hids/Makefile
index 5d99201..656fea6 100644
--- a/security/ossec-hids/Makefile
+++ b/security/ossec-hids/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/security/ossec-hids/Makefile 484537 2018-11-09 18:52:21Z swills $
 
 PORTNAME=	ossec-hids
 PORTVERSION=	3.1.0