Attachment #204241 for bug #237632

Lines 1-8 Link Here

(-)security/ossec-hids/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ossec-hids	3	PORTNAME= ossec-hids
4	PORTVERSION= 3.1.0	4	PORTVERSION= 3.3.0
5	PORTREVISION=	5	PORTREVISION= 0
6	CATEGORIES= security	6	CATEGORIES= security
7		7
8	MAINTAINER= dominik.lisiak@bemsoft.pl	8	MAINTAINER= dominik.lisiak@bemsoft.pl




# $FreeBSD$

PORTNAME=	ossec-hids
PORTVERSION=	3.3.0
PORTREVISION=	0
CATEGORIES=	security
PKGNAMESUFFIX=	-${OSSEC_TYPE}


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		gmake ssl

OSSEC_TYPE?=	local


			ossec-hids-local-*
.endif

LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
.if ${OSSEC_TYPE} != agent
RUN_DEPENDS=	expect:lang/expect
.endif

PRELUDE_LIB_DEPENDS=	libprelude.so:security/libprelude
ZEROMQ_LIB_DEPENDS=	libczmq.so:net/czmq

INOTIFY_USES=	pkgconfig
LUA_USES=	readline
MYSQL_USE=	mysql
PGSQL_USES=	pgsql

USE_GITHUB=	yes
GH_ACCOUNT=	ossec

USE_RC_SUBR=	ossec-hids

USES+=		shebangfix
SHEBANG_FILES=	active-response/ossec-pagerduty.sh

.if ${OSSEC_TYPE} != agent
USES+=		shebangfix
SHEBANG_LANG=	expect
expect_OLD_CMD=	"/usr/bin/env expect"
expect_CMD=	${LOCALBASE}/bin/expect
SHEBANG_FILES+=	src/agentlessd/scripts/main.exp \
		src/agentlessd/scripts/ssh.exp \
		src/agentlessd/scripts/ssh_asa-fwsmconfig_diff \
		src/agentlessd/scripts/ssh_foundry_diff \

.endif

OPTIONS_SUB=			yes
OPTIONS_DEFINE=			DOCS INOTIFY LUA

.if ${OSSEC_TYPE} != agent
OPTIONS_DEFINE+=		PRELUDE ZEROMQ

DATABASE_DESC=		Database output

INOTIFY_VARS=	OSSEC_ARGS+=USE_INOTIFY=yes
LUA_VARS=	OSSEC_ARGS+=LUA_ENABLE=yes STRIP_FILES+=ossec-lua STRIP_FILES+=ossec-luac
PRELUDE_VARS=	OSSEC_ARGS+=USE_PRELUDE=yes
ZEROMQ_VARS=	OSSEC_ARGS+=USE_ZEROMQ=yes
MYSQL_VARS=	OSSEC_ARGS+=DATABASE=mysql PKGMSG_FILES+=message-database DB_TYPE=mysql DB_SCHEMA=mysql.schema

		ossec-agentd \
		ossec-execd \
		ossec-logcollector \
		ossec-lua \
		ossec-luac \
		ossec-syscheckd
.else
STRIP_FILES=	agent_control \

		ossec-execd \
		ossec-logcollector \
		ossec-logtest \
		ossec-lua \
		ossec-luac \
		ossec-maild \
		ossec-makelists \
		ossec-monitord \

		VERSION=${PORTVERSION} \
		DB_TYPE=${DB_TYPE} \
		DB_SCHEMA=${DOCSDIR}/${DB_SCHEMA} \
		USER=${USER} \
		OSSEC_USER=${OSSEC_USER} \
		OSSEC_GROUP=${OSSEC_GROUP} \
		OSSEC_RC=${OSSEC_RC}

PKGMESSAGE=	${WRKDIR}/pkg-message
PKGMSG_FILES=	message-header

PKG_CONFIG=	${CONFIGURE_ENV:MPKG_CONFIG=*:S/PKG_CONFIG=//}
CFLAGS+=	-I${LOCALBASE}/include
INOTIFY_CFLAGS=	$$(${PKG_CONFIG} --cflags libinotify)
INOTIFY_LDFLAGS=$$(${PKG_CONFIG} --libs libinotify)

OSSEC_ARGS+=	TARGET=${OSSEC_TYPE} PCRE2_SYSTEM=yes INSTALL_LOCALTIME=no INSTALL_RESOLVCONF=no
.if !defined(MAINTAINER_MODE)
OSSEC_ARGS+=	INSTALL_CMD=install
.endif

	@${CHMOD} 550 ${STAGEDIR}${RESTART_OSSEC_BIN}
.if defined(MAINTAINER_MODE)
	@${CHOWN} ${USER}:${OSSEC_GROUP} ${STAGEDIR}${RESTART_OSSEC_BIN}
.else
	@${SH} ${SCRIPTDIR}/sanitize-stage.sh ${OSSEC_TYPE} ${OSSEC_HOME} ${STAGEDIR}
.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
. else
	@for file_name in $$(find "${STAGEDIR}${SHARED_DIR}" -type f); do ${CHMOD} 0644 $${file_name}; done
. endif
.endif
.endif
	@${ECHO_CMD} -n > ${PKGMESSAGE}
.for file_name in ${PKGMSG_FILES}
	@${CAT} ${WRKDIR}/${file_name} >> ${PKGMESSAGE}

Lines 1-3 Link Here

(-)security/ossec-hids-local/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539457911	1	TIMESTAMP = 1555773447
2	SHA256 (ossec-ossec-hids-3.1.0_GH0.tar.gz) = e0e2987751badb95c2bf618531c7853b2289c910f796da85ff394c0faea43f50	2	SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
3	SIZE (ossec-ossec-hids-3.1.0_GH0.tar.gz) = 1886469	3	SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070

Lines 34-39 Link Here

(-)security/ossec-hids-local/files/ossec-hids.in (-3 / +14 lines)
34	ossec_type="%%OSSEC_TYPE%%"	34	ossec_type="%%OSSEC_TYPE%%"
35	ossec_home="%%OSSEC_HOME%%"	35	ossec_home="%%OSSEC_HOME%%"
36		36
		37	if [ -z "${ossec_hids_user}" ]; then
		38	ossec_hids_user=$(stat -f '%Su' "${ossec_home}")
		39	fi
		40
37	ossec_conf="${ossec_home}/etc/ossec.conf"	41	ossec_conf="${ossec_home}/etc/ossec.conf"
38	ossec_conf_dir="${ossec_home}/etc/ossec.conf.d"	42	ossec_conf_dir="${ossec_home}/etc/ossec.conf.d"
39	ossec_conf_bin="${ossec_home}/bin/config/ossec-conf"	43	ossec_conf_bin="${ossec_home}/bin/config/ossec-conf"
Lines 49-54 Link Here
49	ossec_merged="${ossec_home}/etc/shared/merged.mg"	53	ossec_merged="${ossec_home}/etc/shared/merged.mg"
50		54
51	ossec_local_time="/etc/localtime"	55	ossec_local_time="/etc/localtime"
		56	ossec_resolv_conf="/etc/resolv.conf"
52		57
53	extra_commands="help status reload ossec_conf"	58	extra_commands="help status reload ossec_conf"
54	case ${ossec_type} in	59	case ${ossec_type} in
Lines 353-359 Link Here
353	if [ -x "${agent_conf_bin}" ]; then	358	if [ -x "${agent_conf_bin}" ]; then
354	# Merge agent.conf.d files into agent.conf	359	# Merge agent.conf.d files into agent.conf
355	if [ "$1" == "force" ] \|\| ossec_hids_config_is_outdated "${agent_conf}" "${agent_conf_dir}"; then	360	if [ "$1" == "force" ] \|\| ossec_hids_config_is_outdated "${agent_conf}" "${agent_conf_dir}"; then
356	ossec_hids_create_file "${agent_conf}" %%USER%%:%%OSSEC_GROUP%% 0640	361	ossec_hids_create_file "${agent_conf}" ${ossec_hids_user}:%%OSSEC_GROUP%% 0640
357	"${agent_conf_bin}" > "${agent_conf}"	362	"${agent_conf_bin}" > "${agent_conf}"
358	fi	363	fi
359	fi	364	fi
Lines 363-369 Link Here
363	if [ -x "${ossec_conf_bin}" ]; then	368	if [ -x "${ossec_conf_bin}" ]; then
364	# Merge ossec.conf.d files into ossec.conf	369	# Merge ossec.conf.d files into ossec.conf
365	if [ "$1" == "force" ] \|\| ossec_hids_config_is_outdated "${ossec_conf}" "${ossec_conf_dir}"; then	370	if [ "$1" == "force" ] \|\| ossec_hids_config_is_outdated "${ossec_conf}" "${ossec_conf_dir}"; then
366	ossec_hids_create_file "${ossec_conf}" %%USER%%:%%OSSEC_GROUP%% 0640	371	ossec_hids_create_file "${ossec_conf}" ${ossec_hids_user}:%%OSSEC_GROUP%% 0640
367	"${ossec_conf_bin}" > "${ossec_conf}"	372	"${ossec_conf_bin}" > "${ossec_conf}"
368	fi	373	fi
369	fi	374	fi
Lines 378-384 Link Here
378	echo	383	echo
379	return 1	384	return 1
380	fi	385	fi
381	install -o %%USER%% -g %%OSSEC_GROUP%% -m 0440 "${ossec_local_time}" "${ossec_home}${ossec_local_time}"	386	if [ ! -e "${ossec_resolv_conf}" ]; then
		387	echo "ERROR: Missing \"${ossec_resolv_conf}\"."
		388	echo
		389	return 1
		390	fi
		391	install -o ${ossec_hids_user} -g %%OSSEC_GROUP%% -m 0440 "${ossec_local_time}" "${ossec_home}${ossec_local_time}"
		392	install -o ${ossec_hids_user} -g %%OSSEC_GROUP%% -m 0440 "${ossec_resolv_conf}" "${ossec_home}${ossec_resolv_conf}"
382		393
383	return 0	394	return 0
384	}	395	}




--- src/Makefile.orig	2018-10-11 22:25:16 UTC
+++ src/Makefile
@@ -20,6 +20,9 @@ OSSEC_USER?=ossec
 OSSEC_USER_MAIL?=ossecm
 OSSEC_USER_REM?=ossecr
 
+INSTALL_CMD?=install -m $(1) -o $(2) -g $(3)
+INSTALL_LOCALTIME?=yes
+
 USE_PRELUDE?=no
 USE_ZEROMQ?=no
 USE_GEOIP?=no
@@ -366,10 +369,10 @@ endif
 install: install-${TARGET}
 
 install-agent: install-common
-	install -m 0550 -o root -g 0 ossec-agentd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 agent-auth ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-agentd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) agent-auth ${PREFIX}/bin
 
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/rids
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
 
 install-local: install-server-generic
 
@@ -379,127 +382,129 @@ install-server: install-server-generic
 
 install-common: build
 	./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX}
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs
-	install -m 0660 -o ${OSSEC_USER} -g ${OSSEC_GROUP} /dev/null ${PREFIX}/logs/ossec.log
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs
+	$(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log
 
-	install -d -m 0550 -o root -g 0 ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-logcollector ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-syscheckd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-execd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 manage_agents ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ../contrib/util.sh ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
+	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-logcollector ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-syscheckd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-execd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) manage_agents ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ../contrib/util.sh ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
 
 ifeq (${LUA_ENABLE},yes)
-	install -d -m 0550 -o root -g 0 ${PREFIX}/lua
-	install -d -m 0550 -o root -g 0 ${PREFIX}/lua/native
-	install -d -m 0550 -o root -g 0 ${PREFIX}/lua/compiled
-	install -m 0550 -o root -g 0 ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua
+	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/native
+	$(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/compiled
+	$(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
 endif
 
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/queue
-	install -d -m 0770 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/alerts
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/ossec
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/syscheck
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/diff
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/queue
+	$(call INSTALL_CMD,0770,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/alerts
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/ossec
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/syscheck
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/diff
 
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/etc
-	install -m 0440 -o root -g ${OSSEC_GROUP} /etc/localtime ${PREFIX}/etc
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/etc
+ifeq (${INSTALL_LOCALTIME},yes)
+	$(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/localtime ${PREFIX}/etc
+endif
 
-	install -d -m 1550 -o root -g ${OSSEC_GROUP} ${PREFIX}/tmp
+	$(call INSTALL_CMD,1550,root,${OSSEC_GROUP}) -d ${PREFIX}/tmp
 
 ifneq (,$(wildcard /etc/TIMEZONE))
-	install -m 440 -o root -g ${OSSEC_GROUP} /etc/TIMEZONE ${PREFIX}/etc/
+	$(call INSTALL_CMD,440,root,${OSSEC_GROUP}) /etc/TIMEZONE ${PREFIX}/etc/
 endif
 # Solaris Needs some extra files
 ifeq (${uname_S},SunOS)
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/usr/share/lib/zoneinfo/
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/usr/share/lib/zoneinfo/
 	cp -r /usr/share/lib/zoneinfo/* ${PREFIX}/usr/share/lib/zoneinfo/
 endif
-	install -m 0640 -o root -g ${OSSEC_GROUP} -b ../etc/internal_options.conf ${PREFIX}/etc/
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/internal_options.conf ${PREFIX}/etc/
 ifeq (,$(wildcard ${PREFIX}/etc/local_internal_options.conf))
-	install -m 0640 -o root -g ${OSSEC_GROUP} ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
 endif
 ifeq (,$(wildcard ${PREFIX}/etc/client.keys))
-	install -m 0640 -o root -g ${OSSEC_GROUP} /dev/null ${PREFIX}/etc/client.keys
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) /dev/null ${PREFIX}/etc/client.keys
 endif
 ifeq (,$(wildcard ${PREFIX}/etc/ossec.conf))
 ifneq (,$(wildcard ../etc/ossec.mc))
-	install -m 0640 -o root -g ${OSSEC_GROUP} ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
 else
-	install -m 0640 -o root -g ${OSSEC_GROUP} ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
 endif
 endif
 
-	install -d -m 0770 -o root -g ${OSSEC_GROUP} ${PREFIX}/etc/shared
-	install -m 0640 -o ${OSSEC_USER} -g ${OSSEC_GROUP} rootcheck/db/*.txt ${PREFIX}/etc/shared/
+	$(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/etc/shared
+	$(call INSTALL_CMD,0640,${OSSEC_USER},${OSSEC_GROUP}) rootcheck/db/*.txt ${PREFIX}/etc/shared/
 
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/active-response
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/active-response/bin
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/agentless
-	install -m 0550 -o root -g ${OSSEC_GROUP} agentlessd/scripts/* ${PREFIX}/agentless/
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response/bin
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/agentless
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) agentlessd/scripts/* ${PREFIX}/agentless/
 
-	install -d -m 0700 -o root -g ${OSSEC_GROUP} ${PREFIX}/.ssh
+	$(call INSTALL_CMD,0700,root,${OSSEC_GROUP}) -d ${PREFIX}/.ssh
 
-	install -m 0550 -o root -g ${OSSEC_GROUP} ../active-response/*.sh ${PREFIX}/active-response/bin/
-	install -m 0550 -o root -g ${OSSEC_GROUP} ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/*.sh ${PREFIX}/active-response/bin/
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
 
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/var
-	install -d -m 0770 -o root -g ${OSSEC_GROUP} ${PREFIX}/var/run
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/var
+	$(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/var/run
 
 	./init/fw-check.sh execute
 
 
 
 install-server-generic: install-common
-	install -m 0660 -o ${OSSEC_USER} -g ${OSSEC_GROUP} /dev/null ${PREFIX}/logs/active-responses.log
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs/archives
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs/alerts
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs/firewall
+	$(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/active-responses.log
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/archives
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/alerts
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/firewall
 
-	install -m 0550 -o root -g 0 ossec-agentlessd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-analysisd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-monitord ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-reportd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-maild ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-remoted ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-logtest ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-csyslogd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-authd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-dbd ${PREFIX}/bin
-	install -m 0550 -o root -g 0 ossec-makelists ${PREFIX}/bin
-	install -m 0550 -o root -g 0 verify-agent-conf ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 clear_stats ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 list_agents ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 ossec-regex ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 syscheck_update ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 agent_control ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 syscheck_control ${PREFIX}/bin/
-	install -m 0550 -o root -g 0 rootcheck_control ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) ossec-agentlessd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-analysisd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-monitord ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-reportd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-maild ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-remoted ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-logtest ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-csyslogd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-authd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-dbd ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) ossec-makelists ${PREFIX}/bin
+	$(call INSTALL_CMD,0550,root,0) verify-agent-conf ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) clear_stats ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) list_agents ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) ossec-regex ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) syscheck_update ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) agent_control ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) syscheck_control ${PREFIX}/bin/
+	$(call INSTALL_CMD,0550,root,0) rootcheck_control ${PREFIX}/bin/
 
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/stats
-	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/rules
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/stats
+	$(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/rules
 ifneq (,$(wildcard ${PREFIX}/rules/local_rules.xml))
 	cp ${PREFIX}/rules/local_rules.xml ${PREFIX}/rules/local_rules.xml.installbackup
-	install -m 0640 -o root -g ${OSSEC_GROUP} -b ../etc/rules/*.xml ${PREFIX}/rules
-	install -m 0640 -o root -g ${OSSEC_GROUP} ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
 	rm ${PREFIX}/rules/local_rules.xml.installbackup
 else
-	install -m 0640 -o root -g ${OSSEC_GROUP} -b ../etc/rules/*.xml ${PREFIX}/rules
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
 endif
 
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/fts
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/fts
 
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/rootcheck
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rootcheck
 
-	install -d -m 0750 -o ${OSSEC_USER_REM} -g ${OSSEC_GROUP} ${PREFIX}/queue/agent-info
-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/agentless
+	$(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/agent-info
+	$(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/agentless
 
-	install -d -m 0750 -o ${OSSEC_USER_REM} -g ${OSSEC_GROUP} ${PREFIX}/queue/rids
+	$(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
 
-	install -m 0640 -o root -g ${OSSEC_GROUP} ../etc/decoder.xml ${PREFIX}/etc/
+	$(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/
 
 	rm -f ${PREFIX}/etc/shared/merged.mg
 




ar_conf="${ossec_home}/etc/shared/ar.conf"
merged_mg="${ossec_home}/etc/shared/merged.mg"
client_keys="${ossec_home}/etc/client.keys"
firewall_drop="${ossec_home}/active-response/bin/firewall-drop.sh"
local_time="${ossec_home}/etc/localtime"
resolv_conf="${ossec_home}/etc/resolv.conf"

if [ "$2" == "DEINSTALL"  ]; then
    rm -f "${ar_conf}"
    rm -f "${merged_mg}"
    if [ ! -s "${client_keys}" ]; then
        rm -f "${client_keys}"
    fi
    rm -f "${ar_conf}" "${merged_mg}" "${local_time}" "${resolv_conf}"
    rm -f "${local_time}"
fi

Lines 14-23 Link Here

(-)security/ossec-hids-local/files/pkg-install.in (-2 / +6 lines)
14	}	14	}
15		15
16	if [ "$2" == "POST-INSTALL" ]; then	16	if [ "$2" == "POST-INSTALL" ]; then
		17	if [ -z "${USER}" ]; then
		18	USER=$(id -un)
		19	fi
		20
17	pw usermod %%OSSEC_USER%% -d "${ossec_home}"	21	pw usermod %%OSSEC_USER%% -d "${ossec_home}"
18	pw usermod ossecm -d "${ossec_home}"	22	pw usermod ossecm -d "${ossec_home}"
19	pw usermod ossecr -d "${ossec_home}"	23	pw usermod ossecr -d "${ossec_home}"
20	chown %%USER%%:%%OSSEC_GROUP%% "${ossec_home}"	24	chown ${USER}:%%OSSEC_GROUP%% "${ossec_home}"
21		25
22	create_file "${client_keys}" root:ossec 0640	26	create_file "${client_keys}" ${USER}:%%OSSEC_GROUP%% 0640
23	fi	27	fi




@(,,0550) %%OSSEC_HOME%%/bin/ossec-control
@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd
@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector
@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
@(,,0550) %%OSSEC_HOME%%/bin/ossec-syscheckd
@(,,0550) %%OSSEC_HOME%%/bin/util.sh
@dir(,ossec,0550) %%OSSEC_HOME%%/etc

@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_solaris11_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt

@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_pw.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt
@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt

%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md
%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac




@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd
@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector
@(,,0550) %%OSSEC_HOME%%/bin/ossec-logtest
@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
@(,,0550) %%OSSEC_HOME%%/bin/ossec-maild
@(,,0550) %%OSSEC_HOME%%/bin/ossec-makelists
@(,,0550) %%OSSEC_HOME%%/bin/ossec-monitord

@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_solaris11_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt

@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_pw.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt

@(,ossec,0640) %%OSSEC_HOME%%/rules/hordeimp_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/kesl_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mcafee_av_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_cowrie_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_dionaea_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-exchange_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-se_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms1016_usbdetect_rules.xml

@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_firewall_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ftpd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ipsec_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_powershell_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/msauth_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mysql_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/named_rules.xml

@(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/topleveldomain_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml

%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md
%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
%%MYSQL%%%%DOCSDIR%%/mysql.schema
%%PGSQL%%%%DOCSDIR%%/postgresql.schema




@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd
@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector
@(,,0550) %%OSSEC_HOME%%/bin/ossec-logtest
@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
@(,,0550) %%OSSEC_HOME%%/bin/ossec-maild
@(,,0550) %%OSSEC_HOME%%/bin/ossec-makelists
@(,,0550) %%OSSEC_HOME%%/bin/ossec-monitord

@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_solaris11_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt

@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_pw.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt
@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt

@(,ossec,0640) %%OSSEC_HOME%%/rules/hordeimp_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/kesl_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mcafee_av_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_cowrie_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_dionaea_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-exchange_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-se_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms1016_usbdetect_rules.xml

@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_firewall_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ftpd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ipsec_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_powershell_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/msauth_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/mysql_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/named_rules.xml

@(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/topleveldomain_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml
@(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml

%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md
%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
%%MYSQL%%%%DOCSDIR%%/mysql.schema
%%PGSQL%%%%DOCSDIR%%/postgresql.schema




#!/bin/sh

fixed_lines="
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac"
if [ "${OSSEC_TYPE}" != "agent" ]; then
    fixed_lines="${fixed_lines}
%%MYSQL%%%%DOCSDIR%%/mysql.schema
%%PGSQL%%%%DOCSDIR%%/postgresql.schema"
fi

skip_lines="
%%PORTDOCS%%%%DOCSDIR%%/mysql.schema
%%PORTDOCS%%%%DOCSDIR%%/postgresql.schema"

skip_paths="
/etc/ossec.conf
/etc/client.keys
/logs/active-responses.log
/logs/ossec.log
/lua"
if [ "${OSSEC_TYPE}" = "agent" ]; then
    skip_paths="${skip_paths}
/rules
/agentless
/.ssh"
fi

sample_paths="
/etc/local_internal_options.conf.sample"




WORKDIR=$4
STAGEDIR=$5

. $(dirname "$0")/plist.conf
fixed_lines=""
if [ "${OSSEC_TYPE}" != "agent" ]; then
    fixed_lines="${fixed_lines} %%MYSQL%%%%DOCSDIR%%/mysql.schema %%PGSQL%%%%DOCSDIR%%/postgresql.schema"
fi
skip_lines="%%PORTDOCS%%%%DOCSDIR%%/mysql.schema %%PORTDOCS%%%%DOCSDIR%%/postgresql.schema"
skip_paths="/etc/ossec.conf /etc/client.keys /logs/active-responses.log /logs/ossec.log /lua"
sample_paths="/etc/local_internal_options.conf.sample"
if [ "${OSSEC_TYPE}" == "agent" ]; then
    skip_paths="${skip_paths} /rules /agentless /.ssh"
fi

NL=$'\n'
IFS=${NL}

print_path() {
    local path="$1"
    local command="$2"

        fi
    fi
    local user=`stat -f "%Su" "${full_path}"`
    if [ "${user}" = "${USER}" ]; then
        user=""
    fi
    local group=`stat -f "%Sg" "${full_path}"`
    if [ "${group}" = "${GROUP}" ]; then
        group=""
    fi
    local mode=`stat -f "%p" "${full_path}" | tail -c 5`
    echo "${command}(${user},${group},${mode}) %%OSSEC_HOME%%${path}" >> "${PLIST}"
}

contains() {
    local list="$1"
    local word="$2"

    for e in ${list}; do
        if [ "${e}" = "${word}" ]; then
            return 0
        fi
    done

    return 1
}

echo -n > "${PLIST}"

print_path


done_paths=""
while read line; do
    if ! contains "${skip_lines}" "${line}"; then
    for e in ${skip_lines}; do
        if [ "${e}" == "${line}" ]; then
            skip_line="${e}"
            break
        fi
    done
    if [ -z "${skip_line}" ]; then
        path=""
        case ${line} in
            "@dir %%OSSEC_HOME%%"*)
                path=`echo "${line}" | sed -e "s|@dir %%OSSEC_HOME%%||g"`
                ;;

                path=`echo "${line}" | sed -e "s|%%OSSEC_HOME%%||g"`
                ;;
            "%%"*)
                unchanged_lines="${unchanged_lines}${NL}${line}"
                ;;
        esac
        if [ -n "${path}" ]; then

            path=""
            for segment in ${segments}; do
                path="${path}/${segment}"
                if contains "${skip_paths}" "${path}"; then
                for e in ${skip_paths}; do
                    if [ "${e}" == "${path}" ]; then
                        skip_path="${e}"
                        break
                    fi
                done
                if [ -n "${skip_path}" ]; then
                    break
                fi
                if ! contains "${done_paths}" "${path}"; then
                    done_paths="${done_paths}${NL}${path}"
                    if contains "${sample_paths}" "${path}"; then
                        done_path="${e}"
                        break
                    fi
                done
                if [ -z "${done_path}" ]; then
                    done_paths="${done_paths} ${path}"
                    sample_path=""
                    for e in ${sample_paths}; do
                        if [ "${e}" == "${path}" ]; then
                            sample_path="${e}"
                            break
                        fi
                    done
                    if [ -n "${sample_path}" ]; then
                        print_path "${path}" @sample
                    else
                        print_path "${path}"

            done
        fi
    fi
done < "${WORKDIR}/.staged-plist"

unchanged_lines="${unchanged_lines}${NL}${fixed_lines}"
for line in ${unchanged_lines}; do
    echo "${line}" >> "${PLIST}"
done




#!/bin/sh

# Script removes paths from stage to make stage-qa happy about "orphaned" files

OSSEC_TYPE=$1
OSSEC_HOME=$2
STAGEDIR=$3

. $(dirname "$0")/plist.conf

NL=$'\n'
IFS=${NL}

for path in ${skip_paths}; do
    rm -rf "${STAGEDIR}${OSSEC_HOME}${path}"
done




# $FreeBSD$

PORTNAME=	ossec-hids
PORTVERSION=	3.3.0
PORTREVISION=	0
CATEGORIES=	security
PKGNAMESUFFIX=	-${OSSEC_TYPE}-config


OPTIONS_SUB=			yes

OPTIONS_SINGLE=			FIREWALL
OPTIONS_SINGLE_FIREWALL=	NOFW IPF IPFW PF

OPTIONS_DEFAULT+=		NOFW

FIREWALL_DESC=		Active Response Firewall
PF_DESC=		Packet Filter
IPFW_DESC=		ipfirewall
IPF_DESC=		ipfilter
NOFW_DESC=		Custom or no firewall

TEMPL_ENABLED_HEADER=		template-header-enabled.xml
TEMPL_DISABLED_HEADER=		template-header-disabled.xml

PF_VARS=		FW_DROP=pf.sh PKGMSG_FILES+=message-pf
IPFW_VARS=		FW_DROP=ipfw.sh
IPF_VARS=		FW_DROP=ipfilter.sh
NOFW_VARS=		FW_DROP=

.if defined(MAINTAINER_MODE)
OSSEC_HOME=		${PREFIX}/${PORTNAME}

Lines 1-3 Link Here

(-)security/ossec-hids-local-config/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539459620	1	TIMESTAMP = 1555773476
2	SHA256 (ossec-ossec-hids-3.1.0_GH0.tar.gz) = e0e2987751badb95c2bf618531c7853b2289c910f796da85ff394c0faea43f50	2	SHA256 (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 34fac7664548ddfeea96cb0567df4eda7515cc107625eb25315a5c3522954197
3	SIZE (ossec-ossec-hids-3.1.0_GH0.tar.gz) = 1886469	3	SIZE (ossec-ossec-hids-3.3.0_GH0.tar.gz) = 1900070

Lines 1-6 Link Here

(-)security/ossec-hids-local-config/files/pkg-deinstall.in (+9 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	ossec_home="%%OSSEC_HOME%%"	3	ossec_home="%%OSSEC_HOME%%"
		4	fw_drop="%%FW_DROP%%"
		5
		6	ar_bin_dir="${ossec_home}/active-response/bin"
4	ossec_conf="${ossec_home}/etc/ossec.conf"	7	ossec_conf="${ossec_home}/etc/ossec.conf"
5	agent_conf="${ossec_home}/etc/shared/agent.conf"	8	agent_conf="${ossec_home}/etc/shared/agent.conf"
6		9
Lines 7-10 Link Here
7	if [ "$2" == "DEINSTALL" ]; then	10	if [ "$2" == "DEINSTALL" ]; then
8	rm -f "${ossec_conf}"	11	rm -f "${ossec_conf}"
9	rm -f "${agent_conf}"	12	rm -f "${agent_conf}"
		13
		14	if [ -n "${fw_drop}" ]; then
		15	if [ "${ar_bin_dir}/${fw_drop}" -ef "${ar_bin_dir}/firewall-drop.sh" ]; then
		16	rm -f "${ar_bin_dir}/firewall-drop.sh"
		17	fi
		18	fi
10	fi	19	fi

Lines 1-6 Link Here

(-)security/ossec-hids-local-config/files/pkg-install.in (-1 / +5 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	ossec_home="%%OSSEC_HOME%%"	3	ossec_home="%%OSSEC_HOME%%"
		4	fw_drop="%%FW_DROP%%"
		5
4	ar_bin_dir="${ossec_home}/active-response/bin"	6	ar_bin_dir="${ossec_home}/active-response/bin"
5	ossec_conf="${ossec_home}/etc/ossec.conf"	7	ossec_conf="${ossec_home}/etc/ossec.conf"
6	ossec_conf_bak="${ossec_conf}.bak"	8	ossec_conf_bak="${ossec_conf}.bak"
Lines 8-14 Link Here
8	agent_conf_bak="${ossec_home}/etc/agent.conf.bak"	10	agent_conf_bak="${ossec_home}/etc/agent.conf.bak"
9		11
10	if [ "$2" == "POST-INSTALL" ]; then	12	if [ "$2" == "POST-INSTALL" ]; then
11	ln -f "${ar_bin_dir}/%%FW_DROP%%" "${ar_bin_dir}/firewall-drop.sh"	13	if [ -n "${fw_drop}" ]; then
		14	ln -f "${ar_bin_dir}/${fw_drop}" "${ar_bin_dir}/firewall-drop.sh"
		15	fi
12		16
13	if [ -e "${ossec_conf}" ]; then	17	if [ -e "${ossec_conf}" ]; then
14	mv -f "${ossec_conf}" "${ossec_conf_bak}"	18	mv -f "${ossec_conf}" "${ossec_conf_bak}"

Lines 15-20 Link Here

(-)security/ossec-hids-local-config/files/template-rootcheck-basic.xml.in (+1 lines)
15	<rootcheck>	15	<rootcheck>
16	<rootkit_files>/var/ossec/etc/shared/rootkit_files.txt</rootkit_files>	16	<rootkit_files>/var/ossec/etc/shared/rootkit_files.txt</rootkit_files>
17	<rootkit_trojans>/var/ossec/etc/shared/rootkit_trojans.txt</rootkit_trojans>	17	<rootkit_trojans>/var/ossec/etc/shared/rootkit_trojans.txt</rootkit_trojans>
		18	<system_audit>/var/ossec/etc/shared/system_audit_pw.txt</system_audit>
18	<system_audit>/var/ossec/etc/shared/system_audit_rcl.txt</system_audit>	19	<system_audit>/var/ossec/etc/shared/system_audit_rcl.txt</system_audit>
19	<system_audit>/var/ossec/etc/shared/system_audit_ssh.txt</system_audit>	20	<system_audit>/var/ossec/etc/shared/system_audit_ssh.txt</system_audit>
20	</rootcheck>	21	</rootcheck>

Line 0 Link Here

(-)security/ossec-hids-local-config/scripts/plist.conf (+10 lines)
	1	#!/bin/sh
	2
	3	fixed_lines=""
	4	skip_lines=""
	5	skip_paths=""
	6
	7	sample_paths="
	8	/etc/command.conf.sample
	9	/etc/ossec.conf.d/900.local.conf.sample
	10	/etc/agent.conf.d/900.local.conf.sample"




WORKDIR=$4
STAGEDIR=$5

. $(dirname "$0")/plist.conf
fixed_lines=""
skip_lines=""
skip_paths=""
sample_paths="/etc/command.conf.sample /etc/ossec.conf.d/900.local.conf.sample /etc/agent.conf.d/900.local.conf.sample"

NL=$'\n'
IFS=${NL}

print_path() {
    local path="$1"
    local command="$2"

        fi
    fi
    local user=`stat -f "%Su" "${full_path}"`
    if [ "${user}" = "${USER}" ]; then
        user=""
    fi
    local group=`stat -f "%Sg" "${full_path}"`
    if [ "${group}" = "${GROUP}" ]; then
        group=""
    fi
    local mode=`stat -f "%p" "${full_path}" | tail -c 5`
    echo "${command}(${user},${group},${mode}) %%OSSEC_HOME%%${path}" >> "${PLIST}"
}

contains() {
    local list="$1"
    local word="$2"

    for e in ${list}; do
        if [ "${e}" = "${word}" ]; then
            return 0
        fi
    done

    return 1
}

echo -n > "${PLIST}"

print_path


done_paths=""
while read line; do
    if ! contains "${skip_lines}" "${line}"; then
    for e in ${skip_lines}; do
        if [ "${e}" == "${line}" ]; then
            skip_line="${e}"
            break
        fi
    done
    if [ -z "${skip_line}" ]; then
        path=""
        case ${line} in
            "@dir %%OSSEC_HOME%%"*)
                path=`echo "${line}" | sed -e "s|@dir %%OSSEC_HOME%%||g"`
                ;;

                path=`echo "${line}" | sed -e "s|%%OSSEC_HOME%%||g"`
                ;;
            "%%"*)
                unchanged_lines="${unchanged_lines}${NL}${line}"
                ;;
        esac
        if [ -n "${path}" ]; then

            path=""
            for segment in ${segments}; do
                path="${path}/${segment}"
                if contains "${skip_paths}" "${path}"; then
                for e in ${skip_paths}; do
                    if [ "${e}" == "${path}" ]; then
                        skip_path="${e}"
                        break
                    fi
                done
                if [ -n "${skip_path}" ]; then
                    break
                fi
                if ! contains "${done_paths}" "${path}"; then
                    done_paths="${done_paths}${NL}${path}"
                    if contains "${sample_paths}" "${path}"; then
                        done_path="${e}"
                        break
                    fi
                done
                if [ -z "${done_path}" ]; then
                    done_paths="${done_paths} ${path}"
                    sample_path=""
                    for e in ${sample_paths}; do
                        if [ "${e}" == "${path}" ]; then
                            sample_path="${e}"
                            break
                        fi
                    done
                    if [ -n "${sample_path}" ]; then
                        print_path "${path}" @sample
                    else
                        print_path "${path}"

            done
        fi
    fi
done < "${WORKDIR}/.staged-plist"

unchanged_lines="${unchanged_lines}${NL}${fixed_lines}"
for line in ${unchanged_lines}; do
    echo "${line}" >> "${PLIST}"
done

Return to bug 237632

Lines 1-8 Link Here

(-)security/ossec-hids-local/Makefile (-15 / +22 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ossec-hids	3	PORTNAME= ossec-hids
4	PORTVERSION= 3.1.0	4	PORTVERSION= 3.3.0
5	PORTREVISION= 3	5	PORTREVISION= 0
6	CATEGORIES= security	6	CATEGORIES= security
7	PKGNAMESUFFIX= -${OSSEC_TYPE}	7	PKGNAMESUFFIX= -${OSSEC_TYPE}
8		8
Lines 12-18 Link Here
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	USES= gmake readline ssl	15	USES= gmake ssl
16		16
17	OSSEC_TYPE?= local	17	OSSEC_TYPE?= local
18		18
Lines 30-35 Link Here
30	ossec-hids-local-*	30	ossec-hids-local-*
31	.endif	31	.endif
32		32
		33	LIB_DEPENDS= libpcre2-8.so:devel/pcre2
33	.if ${OSSEC_TYPE} != agent	34	.if ${OSSEC_TYPE} != agent
34	RUN_DEPENDS= expect:lang/expect	35	RUN_DEPENDS= expect:lang/expect
35	.endif	36	.endif
Lines 38-56 Link Here
38	PRELUDE_LIB_DEPENDS= libprelude.so:security/libprelude	39	PRELUDE_LIB_DEPENDS= libprelude.so:security/libprelude
39	ZEROMQ_LIB_DEPENDS= libczmq.so:net/czmq	40	ZEROMQ_LIB_DEPENDS= libczmq.so:net/czmq
40		41
		42	INOTIFY_USES= pkgconfig
		43	LUA_USES= readline
41	MYSQL_USE= mysql	44	MYSQL_USE= mysql
42	PGSQL_USES= pgsql	45	PGSQL_USES= pgsql
43		46
44	USE_GITHUB= yes	47	USE_GITHUB= yes
45	GH_ACCOUNT= ossec	48	GH_ACCOUNT= ossec
		49
46	USE_RC_SUBR= ossec-hids	50	USE_RC_SUBR= ossec-hids
47		51
		52	USES+= shebangfix
		53	SHEBANG_FILES= active-response/ossec-pagerduty.sh
		54
48	.if ${OSSEC_TYPE} != agent	55	.if ${OSSEC_TYPE} != agent
49	USES+= shebangfix
50	SHEBANG_LANG= expect	56	SHEBANG_LANG= expect
51	expect_OLD_CMD= "/usr/bin/env expect"	57	expect_OLD_CMD= "/usr/bin/env expect"
52	expect_CMD= ${LOCALBASE}/bin/expect	58	expect_CMD= ${LOCALBASE}/bin/expect
53	SHEBANG_FILES= src/agentlessd/scripts/main.exp \	59	SHEBANG_FILES+= src/agentlessd/scripts/main.exp \
54	src/agentlessd/scripts/ssh.exp \	60	src/agentlessd/scripts/ssh.exp \
55	src/agentlessd/scripts/ssh_asa-fwsmconfig_diff \	61	src/agentlessd/scripts/ssh_asa-fwsmconfig_diff \
56	src/agentlessd/scripts/ssh_foundry_diff \	62	src/agentlessd/scripts/ssh_foundry_diff \
Lines 64-70 Link Here
64	.endif	70	.endif
65		71
66	OPTIONS_SUB= yes	72	OPTIONS_SUB= yes
67	OPTIONS_DEFINE= DOCS INOTIFY	73	OPTIONS_DEFINE= DOCS INOTIFY LUA
68		74
69	.if ${OSSEC_TYPE} != agent	75	.if ${OSSEC_TYPE} != agent
70	OPTIONS_DEFINE+= PRELUDE ZEROMQ	76	OPTIONS_DEFINE+= PRELUDE ZEROMQ
Lines 81-86 Link Here
81	DATABASE_DESC= Database output	87	DATABASE_DESC= Database output
82		88
83	INOTIFY_VARS= OSSEC_ARGS+=USE_INOTIFY=yes	89	INOTIFY_VARS= OSSEC_ARGS+=USE_INOTIFY=yes
		90	LUA_VARS= OSSEC_ARGS+=LUA_ENABLE=yes STRIP_FILES+=ossec-lua STRIP_FILES+=ossec-luac
84	PRELUDE_VARS= OSSEC_ARGS+=USE_PRELUDE=yes	91	PRELUDE_VARS= OSSEC_ARGS+=USE_PRELUDE=yes
85	ZEROMQ_VARS= OSSEC_ARGS+=USE_ZEROMQ=yes	92	ZEROMQ_VARS= OSSEC_ARGS+=USE_ZEROMQ=yes
86	MYSQL_VARS= OSSEC_ARGS+=DATABASE=mysql PKGMSG_FILES+=message-database DB_TYPE=mysql DB_SCHEMA=mysql.schema	93	MYSQL_VARS= OSSEC_ARGS+=DATABASE=mysql PKGMSG_FILES+=message-database DB_TYPE=mysql DB_SCHEMA=mysql.schema
Lines 92-99 Link Here
92	ossec-agentd \	99	ossec-agentd \
93	ossec-execd \	100	ossec-execd \
94	ossec-logcollector \	101	ossec-logcollector \
95	ossec-lua \
96	ossec-luac \
97	ossec-syscheckd	102	ossec-syscheckd
98	.else	103	.else
99	STRIP_FILES= agent_control \	104	STRIP_FILES= agent_control \
Lines 108-115 Link Here
108	ossec-execd \	113	ossec-execd \
109	ossec-logcollector \	114	ossec-logcollector \
110	ossec-logtest \	115	ossec-logtest \
111	ossec-lua \
112	ossec-luac \
113	ossec-maild \	116	ossec-maild \
114	ossec-makelists \	117	ossec-makelists \
115	ossec-monitord \	118	ossec-monitord \
Lines 159-165 Link Here
159	VERSION=${PORTVERSION} \	162	VERSION=${PORTVERSION} \
160	DB_TYPE=${DB_TYPE} \	163	DB_TYPE=${DB_TYPE} \
161	DB_SCHEMA=${DOCSDIR}/${DB_SCHEMA} \	164	DB_SCHEMA=${DOCSDIR}/${DB_SCHEMA} \
162	USER=${USER} \
163	OSSEC_USER=${OSSEC_USER} \	165	OSSEC_USER=${OSSEC_USER} \
164	OSSEC_GROUP=${OSSEC_GROUP} \	166	OSSEC_GROUP=${OSSEC_GROUP} \
165	OSSEC_RC=${OSSEC_RC}	167	OSSEC_RC=${OSSEC_RC}
Lines 179-187 Link Here
179	PKGMESSAGE= ${WRKDIR}/pkg-message	181	PKGMESSAGE= ${WRKDIR}/pkg-message
180	PKGMSG_FILES= message-header	182	PKGMSG_FILES= message-header
181		183
		184	PKG_CONFIG= ${CONFIGURE_ENV:MPKG_CONFIG=*:S/PKG_CONFIG=//}
182	CFLAGS+= -I${LOCALBASE}/include	185	CFLAGS+= -I${LOCALBASE}/include
		186	INOTIFY_CFLAGS= $$(${PKG_CONFIG} --cflags libinotify)
		187	INOTIFY_LDFLAGS=$$(${PKG_CONFIG} --libs libinotify)
183		188
184	OSSEC_ARGS+= TARGET=${OSSEC_TYPE} INSTALL_LOCALTIME=no	189	OSSEC_ARGS+= TARGET=${OSSEC_TYPE} PCRE2_SYSTEM=yes INSTALL_LOCALTIME=no INSTALL_RESOLVCONF=no
185	.if !defined(MAINTAINER_MODE)	190	.if !defined(MAINTAINER_MODE)
186	OSSEC_ARGS+= INSTALL_CMD=install	191	OSSEC_ARGS+= INSTALL_CMD=install
187	.endif	192	.endif
Lines 213-227 Link Here
213	@${CHMOD} 550 ${STAGEDIR}${RESTART_OSSEC_BIN}	218	@${CHMOD} 550 ${STAGEDIR}${RESTART_OSSEC_BIN}
214	.if defined(MAINTAINER_MODE)	219	.if defined(MAINTAINER_MODE)
215	@${CHOWN} ${USER}:${OSSEC_GROUP} ${STAGEDIR}${RESTART_OSSEC_BIN}	220	@${CHOWN} ${USER}:${OSSEC_GROUP} ${STAGEDIR}${RESTART_OSSEC_BIN}
		221	.else
		222	@${SH} ${SCRIPTDIR}/sanitize-stage.sh ${OSSEC_TYPE} ${OSSEC_HOME} ${STAGEDIR}
216	.endif	223	.endif
217		224
218	.if ${OSSEC_TYPE} == agent	225	.if ${OSSEC_TYPE} == agent
219	.if defined(MAINTAINER_MODE)	226	. if defined(MAINTAINER_MODE)
220	@for file_name in $$(find "${STAGEDIR}${SHARED_DIR}" -type f); do ${CHMOD} 0644 $${file_name}; ${CHOWN} ${OSSEC_USER}:${OSSEC_GROUP} $${file_name}; done	227	@for file_name in $$(find "${STAGEDIR}${SHARED_DIR}" -type f); do ${CHMOD} 0644 $${file_name}; ${CHOWN} ${OSSEC_USER}:${OSSEC_GROUP} $${file_name}; done
221	.else	228	. else
222	@for file_name in $$(find "${STAGEDIR}${SHARED_DIR}" -type f); do ${CHMOD} 0644 $${file_name}; done	229	@for file_name in $$(find "${STAGEDIR}${SHARED_DIR}" -type f); do ${CHMOD} 0644 $${file_name}; done
		230	. endif
223	.endif	231	.endif
224	.endif
225	@${ECHO_CMD} -n > ${PKGMESSAGE}	232	@${ECHO_CMD} -n > ${PKGMESSAGE}
226	.for file_name in ${PKGMSG_FILES}	233	.for file_name in ${PKGMSG_FILES}
227	@${CAT} ${WRKDIR}/${file_name} >> ${PKGMESSAGE}	234	@${CAT} ${WRKDIR}/${file_name} >> ${PKGMESSAGE}

Lines 1-231 Link Here

(-)security/ossec-hids-local/files/patch-src_Makefile (-231 lines)
1	--- src/Makefile.orig 2018-10-11 22:25:16 UTC
2	+++ src/Makefile
3	@@ -20,6 +20,9 @@ OSSEC_USER?=ossec
4	OSSEC_USER_MAIL?=ossecm
5	OSSEC_USER_REM?=ossecr
6
7	+INSTALL_CMD?=install -m $(1) -o $(2) -g $(3)
8	+INSTALL_LOCALTIME?=yes
9	+
10	USE_PRELUDE?=no
11	USE_ZEROMQ?=no
12	USE_GEOIP?=no
13	@@ -366,10 +369,10 @@ endif
14	install: install-${TARGET}
15
16	install-agent: install-common
17	- install -m 0550 -o root -g 0 ossec-agentd ${PREFIX}/bin
18	- install -m 0550 -o root -g 0 agent-auth ${PREFIX}/bin
19	+ $(call INSTALL_CMD,0550,root,0) ossec-agentd ${PREFIX}/bin
20	+ $(call INSTALL_CMD,0550,root,0) agent-auth ${PREFIX}/bin
21
22	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/rids
23	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
24
25	install-local: install-server-generic
26
27	@@ -379,127 +382,129 @@ install-server: install-server-generic
28
29	install-common: build
30	./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX}
31	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/
32	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs
33	- install -m 0660 -o ${OSSEC_USER} -g ${OSSEC_GROUP} /dev/null ${PREFIX}/logs/ossec.log
34	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/
35	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs
36	+ $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log
37
38	- install -d -m 0550 -o root -g 0 ${PREFIX}/bin
39	- install -m 0550 -o root -g 0 ossec-logcollector ${PREFIX}/bin
40	- install -m 0550 -o root -g 0 ossec-syscheckd ${PREFIX}/bin
41	- install -m 0550 -o root -g 0 ossec-execd ${PREFIX}/bin
42	- install -m 0550 -o root -g 0 manage_agents ${PREFIX}/bin
43	- install -m 0550 -o root -g 0 ../contrib/util.sh ${PREFIX}/bin/
44	- install -m 0550 -o root -g 0 ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
45	+ $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/bin
46	+ $(call INSTALL_CMD,0550,root,0) ossec-logcollector ${PREFIX}/bin
47	+ $(call INSTALL_CMD,0550,root,0) ossec-syscheckd ${PREFIX}/bin
48	+ $(call INSTALL_CMD,0550,root,0) ossec-execd ${PREFIX}/bin
49	+ $(call INSTALL_CMD,0550,root,0) manage_agents ${PREFIX}/bin
50	+ $(call INSTALL_CMD,0550,root,0) ../contrib/util.sh ${PREFIX}/bin/
51	+ $(call INSTALL_CMD,0550,root,0) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
52
53	ifeq (${LUA_ENABLE},yes)
54	- install -d -m 0550 -o root -g 0 ${PREFIX}/lua
55	- install -d -m 0550 -o root -g 0 ${PREFIX}/lua/native
56	- install -d -m 0550 -o root -g 0 ${PREFIX}/lua/compiled
57	- install -m 0550 -o root -g 0 ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
58	- install -m 0550 -o root -g 0 ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
59	+ $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua
60	+ $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/native
61	+ $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/compiled
62	+ $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
63	+ $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
64	endif
65
66	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/queue
67	- install -d -m 0770 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/alerts
68	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/ossec
69	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/syscheck
70	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/diff
71	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/queue
72	+ $(call INSTALL_CMD,0770,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/alerts
73	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/ossec
74	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/syscheck
75	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/diff
76
77	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/etc
78	- install -m 0440 -o root -g ${OSSEC_GROUP} /etc/localtime ${PREFIX}/etc
79	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/etc
80	+ifeq (${INSTALL_LOCALTIME},yes)
81	+ $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/localtime ${PREFIX}/etc
82	+endif
83
84	- install -d -m 1550 -o root -g ${OSSEC_GROUP} ${PREFIX}/tmp
85	+ $(call INSTALL_CMD,1550,root,${OSSEC_GROUP}) -d ${PREFIX}/tmp
86
87	ifneq (,$(wildcard /etc/TIMEZONE))
88	- install -m 440 -o root -g ${OSSEC_GROUP} /etc/TIMEZONE ${PREFIX}/etc/
89	+ $(call INSTALL_CMD,440,root,${OSSEC_GROUP}) /etc/TIMEZONE ${PREFIX}/etc/
90	endif
91	# Solaris Needs some extra files
92	ifeq (${uname_S},SunOS)
93	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/usr/share/lib/zoneinfo/
94	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/usr/share/lib/zoneinfo/
95	cp -r /usr/share/lib/zoneinfo/* ${PREFIX}/usr/share/lib/zoneinfo/
96	endif
97	- install -m 0640 -o root -g ${OSSEC_GROUP} -b ../etc/internal_options.conf ${PREFIX}/etc/
98	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/internal_options.conf ${PREFIX}/etc/
99	ifeq (,$(wildcard ${PREFIX}/etc/local_internal_options.conf))
100	- install -m 0640 -o root -g ${OSSEC_GROUP} ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
101	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
102	endif
103	ifeq (,$(wildcard ${PREFIX}/etc/client.keys))
104	- install -m 0640 -o root -g ${OSSEC_GROUP} /dev/null ${PREFIX}/etc/client.keys
105	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) /dev/null ${PREFIX}/etc/client.keys
106	endif
107	ifeq (,$(wildcard ${PREFIX}/etc/ossec.conf))
108	ifneq (,$(wildcard ../etc/ossec.mc))
109	- install -m 0640 -o root -g ${OSSEC_GROUP} ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
110	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
111	else
112	- install -m 0640 -o root -g ${OSSEC_GROUP} ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
113	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
114	endif
115	endif
116
117	- install -d -m 0770 -o root -g ${OSSEC_GROUP} ${PREFIX}/etc/shared
118	- install -m 0640 -o ${OSSEC_USER} -g ${OSSEC_GROUP} rootcheck/db/*.txt ${PREFIX}/etc/shared/
119	+ $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/etc/shared
120	+ $(call INSTALL_CMD,0640,${OSSEC_USER},${OSSEC_GROUP}) rootcheck/db/*.txt ${PREFIX}/etc/shared/
121
122	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/active-response
123	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/active-response/bin
124	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/agentless
125	- install -m 0550 -o root -g ${OSSEC_GROUP} agentlessd/scripts/* ${PREFIX}/agentless/
126	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response
127	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response/bin
128	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/agentless
129	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) agentlessd/scripts/* ${PREFIX}/agentless/
130
131	- install -d -m 0700 -o root -g ${OSSEC_GROUP} ${PREFIX}/.ssh
132	+ $(call INSTALL_CMD,0700,root,${OSSEC_GROUP}) -d ${PREFIX}/.ssh
133
134	- install -m 0550 -o root -g ${OSSEC_GROUP} ../active-response/*.sh ${PREFIX}/active-response/bin/
135	- install -m 0550 -o root -g ${OSSEC_GROUP} ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
136	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/*.sh ${PREFIX}/active-response/bin/
137	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
138
139	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/var
140	- install -d -m 0770 -o root -g ${OSSEC_GROUP} ${PREFIX}/var/run
141	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/var
142	+ $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/var/run
143
144	./init/fw-check.sh execute
145
146
147
148	install-server-generic: install-common
149	- install -m 0660 -o ${OSSEC_USER} -g ${OSSEC_GROUP} /dev/null ${PREFIX}/logs/active-responses.log
150	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs/archives
151	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs/alerts
152	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs/firewall
153	+ $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/active-responses.log
154	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/archives
155	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/alerts
156	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/firewall
157
158	- install -m 0550 -o root -g 0 ossec-agentlessd ${PREFIX}/bin
159	- install -m 0550 -o root -g 0 ossec-analysisd ${PREFIX}/bin
160	- install -m 0550 -o root -g 0 ossec-monitord ${PREFIX}/bin
161	- install -m 0550 -o root -g 0 ossec-reportd ${PREFIX}/bin
162	- install -m 0550 -o root -g 0 ossec-maild ${PREFIX}/bin
163	- install -m 0550 -o root -g 0 ossec-remoted ${PREFIX}/bin
164	- install -m 0550 -o root -g 0 ossec-logtest ${PREFIX}/bin
165	- install -m 0550 -o root -g 0 ossec-csyslogd ${PREFIX}/bin
166	- install -m 0550 -o root -g 0 ossec-authd ${PREFIX}/bin
167	- install -m 0550 -o root -g 0 ossec-dbd ${PREFIX}/bin
168	- install -m 0550 -o root -g 0 ossec-makelists ${PREFIX}/bin
169	- install -m 0550 -o root -g 0 verify-agent-conf ${PREFIX}/bin/
170	- install -m 0550 -o root -g 0 clear_stats ${PREFIX}/bin/
171	- install -m 0550 -o root -g 0 list_agents ${PREFIX}/bin/
172	- install -m 0550 -o root -g 0 ossec-regex ${PREFIX}/bin/
173	- install -m 0550 -o root -g 0 syscheck_update ${PREFIX}/bin/
174	- install -m 0550 -o root -g 0 agent_control ${PREFIX}/bin/
175	- install -m 0550 -o root -g 0 syscheck_control ${PREFIX}/bin/
176	- install -m 0550 -o root -g 0 rootcheck_control ${PREFIX}/bin/
177	+ $(call INSTALL_CMD,0550,root,0) ossec-agentlessd ${PREFIX}/bin
178	+ $(call INSTALL_CMD,0550,root,0) ossec-analysisd ${PREFIX}/bin
179	+ $(call INSTALL_CMD,0550,root,0) ossec-monitord ${PREFIX}/bin
180	+ $(call INSTALL_CMD,0550,root,0) ossec-reportd ${PREFIX}/bin
181	+ $(call INSTALL_CMD,0550,root,0) ossec-maild ${PREFIX}/bin
182	+ $(call INSTALL_CMD,0550,root,0) ossec-remoted ${PREFIX}/bin
183	+ $(call INSTALL_CMD,0550,root,0) ossec-logtest ${PREFIX}/bin
184	+ $(call INSTALL_CMD,0550,root,0) ossec-csyslogd ${PREFIX}/bin
185	+ $(call INSTALL_CMD,0550,root,0) ossec-authd ${PREFIX}/bin
186	+ $(call INSTALL_CMD,0550,root,0) ossec-dbd ${PREFIX}/bin
187	+ $(call INSTALL_CMD,0550,root,0) ossec-makelists ${PREFIX}/bin
188	+ $(call INSTALL_CMD,0550,root,0) verify-agent-conf ${PREFIX}/bin/
189	+ $(call INSTALL_CMD,0550,root,0) clear_stats ${PREFIX}/bin/
190	+ $(call INSTALL_CMD,0550,root,0) list_agents ${PREFIX}/bin/
191	+ $(call INSTALL_CMD,0550,root,0) ossec-regex ${PREFIX}/bin/
192	+ $(call INSTALL_CMD,0550,root,0) syscheck_update ${PREFIX}/bin/
193	+ $(call INSTALL_CMD,0550,root,0) agent_control ${PREFIX}/bin/
194	+ $(call INSTALL_CMD,0550,root,0) syscheck_control ${PREFIX}/bin/
195	+ $(call INSTALL_CMD,0550,root,0) rootcheck_control ${PREFIX}/bin/
196
197	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/stats
198	- install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/rules
199	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/stats
200	+ $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/rules
201	ifneq (,$(wildcard ${PREFIX}/rules/local_rules.xml))
202	cp ${PREFIX}/rules/local_rules.xml ${PREFIX}/rules/local_rules.xml.installbackup
203	- install -m 0640 -o root -g ${OSSEC_GROUP} -b ../etc/rules/*.xml ${PREFIX}/rules
204	- install -m 0640 -o root -g ${OSSEC_GROUP} ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
205	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
206	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
207	rm ${PREFIX}/rules/local_rules.xml.installbackup
208	else
209	- install -m 0640 -o root -g ${OSSEC_GROUP} -b ../etc/rules/*.xml ${PREFIX}/rules
210	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
211	endif
212
213	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/fts
214	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/fts
215
216	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/rootcheck
217	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rootcheck
218
219	- install -d -m 0750 -o ${OSSEC_USER_REM} -g ${OSSEC_GROUP} ${PREFIX}/queue/agent-info
220	- install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/agentless
221	+ $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/agent-info
222	+ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/agentless
223
224	- install -d -m 0750 -o ${OSSEC_USER_REM} -g ${OSSEC_GROUP} ${PREFIX}/queue/rids
225	+ $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
226
227	- install -m 0640 -o root -g ${OSSEC_GROUP} ../etc/decoder.xml ${PREFIX}/etc/
228	+ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/
229
230	rm -f ${PREFIX}/etc/shared/merged.mg
231

Lines 4-18 Link Here

(-)security/ossec-hids-local/files/pkg-deinstall.in (-5 / +2 lines)
4	ar_conf="${ossec_home}/etc/shared/ar.conf"	4	ar_conf="${ossec_home}/etc/shared/ar.conf"
5	merged_mg="${ossec_home}/etc/shared/merged.mg"	5	merged_mg="${ossec_home}/etc/shared/merged.mg"
6	client_keys="${ossec_home}/etc/client.keys"	6	client_keys="${ossec_home}/etc/client.keys"
7	firewall_drop="${ossec_home}/active-response/bin/firewall-drop.sh"
8	local_time="${ossec_home}/etc/localtime"	7	local_time="${ossec_home}/etc/localtime"
		8	resolv_conf="${ossec_home}/etc/resolv.conf"
9		9
10	if [ "$2" == "DEINSTALL" ]; then	10	if [ "$2" == "DEINSTALL" ]; then
11	rm -f "${ar_conf}"
12	rm -f "${merged_mg}"
13	if [ ! -s "${client_keys}" ]; then	11	if [ ! -s "${client_keys}" ]; then
14	rm -f "${client_keys}"	12	rm -f "${client_keys}"
15	fi	13	fi
16	rm -f "${firewall_drop}"	14	rm -f "${ar_conf}" "${merged_mg}" "${local_time}" "${resolv_conf}"
17	rm -f "${local_time}"
18	fi	15	fi

Lines 22-29 Link Here

(-)security/ossec-hids-local/pkg-plist-agent (-2 / +4 lines)
22	@(,,0550) %%OSSEC_HOME%%/bin/ossec-control	22	@(,,0550) %%OSSEC_HOME%%/bin/ossec-control
23	@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd	23	@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd
24	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector	24	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector
25	@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
26	@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
27	@(,,0550) %%OSSEC_HOME%%/bin/ossec-syscheckd	25	@(,,0550) %%OSSEC_HOME%%/bin/ossec-syscheckd
28	@(,,0550) %%OSSEC_HOME%%/bin/util.sh	26	@(,,0550) %%OSSEC_HOME%%/bin/util.sh
29	@dir(,ossec,0550) %%OSSEC_HOME%%/etc	27	@dir(,ossec,0550) %%OSSEC_HOME%%/etc
Lines 43-48 Link Here
43	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt	41	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt
44	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt	42	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt
45	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt	43	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt
		44	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_solaris11_rcl.txt
46	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt	45	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt
47	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt	46	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt
48	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt	47	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt
Lines 55-60 Link Here
55	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt	54	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt
56	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt	55	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt
57	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt	56	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt
		57	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_pw.txt
58	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt	58	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt
59	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt	59	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt
60	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt	60	@(ossec,ossec,0644) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt
Lines 77-79 Link Here
77	%%PORTDOCS%%%%DOCSDIR%%/README.md	77	%%PORTDOCS%%%%DOCSDIR%%/README.md
78	%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md	78	%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md
79	%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample	79	%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample
		80	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
		81	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac

Lines 42-49 Link Here

(-)security/ossec-hids-local/pkg-plist-local (-2 / +10 lines)
42	@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd	42	@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd
43	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector	43	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector
44	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logtest	44	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logtest
45	@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
46	@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
47	@(,,0550) %%OSSEC_HOME%%/bin/ossec-maild	45	@(,,0550) %%OSSEC_HOME%%/bin/ossec-maild
48	@(,,0550) %%OSSEC_HOME%%/bin/ossec-makelists	46	@(,,0550) %%OSSEC_HOME%%/bin/ossec-makelists
49	@(,,0550) %%OSSEC_HOME%%/bin/ossec-monitord	47	@(,,0550) %%OSSEC_HOME%%/bin/ossec-monitord
Lines 74-79 Link Here
74	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt	72	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt
75	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt	73	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt
76	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt	74	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt
		75	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_solaris11_rcl.txt
77	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt	76	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt
78	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt	77	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt
79	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt	78	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt
Lines 86-91 Link Here
86	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt	85	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt
87	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt	86	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt
88	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt	87	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt
		88	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_pw.txt
89	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt	89	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt
90	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt	90	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt
91	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt	91	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt
Lines 112-121 Link Here
112	@(,ossec,0640) %%OSSEC_HOME%%/rules/hordeimp_rules.xml	112	@(,ossec,0640) %%OSSEC_HOME%%/rules/hordeimp_rules.xml
113	@(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml	113	@(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml
114	@(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml	114	@(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml
		115	@(,ossec,0640) %%OSSEC_HOME%%/rules/kesl_rules.xml
		116	@(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml
115	@(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml	117	@(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml
116	@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml	118	@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
117	@(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml	119	@(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
118	@(,ossec,0640) %%OSSEC_HOME%%/rules/mcafee_av_rules.xml	120	@(,ossec,0640) %%OSSEC_HOME%%/rules/mcafee_av_rules.xml
		121	@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_cowrie_rules.xml
		122	@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_dionaea_rules.xml
119	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-exchange_rules.xml	123	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-exchange_rules.xml
120	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-se_rules.xml	124	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-se_rules.xml
121	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms1016_usbdetect_rules.xml	125	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms1016_usbdetect_rules.xml
Lines 123-128 Link Here
123	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_firewall_rules.xml	127	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_firewall_rules.xml
124	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ftpd_rules.xml	128	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ftpd_rules.xml
125	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ipsec_rules.xml	129	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ipsec_rules.xml
		130	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_powershell_rules.xml
126	@(,ossec,0640) %%OSSEC_HOME%%/rules/msauth_rules.xml	131	@(,ossec,0640) %%OSSEC_HOME%%/rules/msauth_rules.xml
127	@(,ossec,0640) %%OSSEC_HOME%%/rules/mysql_rules.xml	132	@(,ossec,0640) %%OSSEC_HOME%%/rules/mysql_rules.xml
128	@(,ossec,0640) %%OSSEC_HOME%%/rules/named_rules.xml	133	@(,ossec,0640) %%OSSEC_HOME%%/rules/named_rules.xml
Lines 160-165 Link Here
160	@(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml	165	@(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml
161	@(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml	166	@(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml
162	@(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml	167	@(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml
		168	@(,ossec,0640) %%OSSEC_HOME%%/rules/topleveldomain_rules.xml
163	@(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml	169	@(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml
164	@(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml	170	@(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml
165	@(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml	171	@(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml
Lines 196-200 Link Here
196	%%PORTDOCS%%%%DOCSDIR%%/README.md	202	%%PORTDOCS%%%%DOCSDIR%%/README.md
197	%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md	203	%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md
198	%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample	204	%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample
		205	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
		206	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
199	%%MYSQL%%%%DOCSDIR%%/mysql.schema	207	%%MYSQL%%%%DOCSDIR%%/mysql.schema
200	%%PGSQL%%%%DOCSDIR%%/postgresql.schema	208	%%PGSQL%%%%DOCSDIR%%/postgresql.schema

Lines 42-49 Link Here

(-)security/ossec-hids-local/pkg-plist-server (-2 / +10 lines)
42	@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd	42	@(,,0550) %%OSSEC_HOME%%/bin/ossec-execd
43	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector	43	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logcollector
44	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logtest	44	@(,,0550) %%OSSEC_HOME%%/bin/ossec-logtest
45	@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
46	@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
47	@(,,0550) %%OSSEC_HOME%%/bin/ossec-maild	45	@(,,0550) %%OSSEC_HOME%%/bin/ossec-maild
48	@(,,0550) %%OSSEC_HOME%%/bin/ossec-makelists	46	@(,,0550) %%OSSEC_HOME%%/bin/ossec-makelists
49	@(,,0550) %%OSSEC_HOME%%/bin/ossec-monitord	47	@(,,0550) %%OSSEC_HOME%%/bin/ossec-monitord
Lines 74-79 Link Here
74	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt	72	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_rhel_linux_rcl.txt
75	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt	73	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles11_linux_rcl.txt
76	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt	74	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_sles12_linux_rcl.txt
		75	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_solaris11_rcl.txt
77	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt	76	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L1_rcl.txt
78	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt	77	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win10_enterprise_L2_rcl.txt
79	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt	78	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2012r2_domainL1_rcl.txt
Lines 86-91 Link Here
86	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt	85	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/cis_win2016_memberL2_rcl.txt
87	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt	86	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_files.txt
88	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt	87	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/rootkit_trojans.txt
		88	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_pw.txt
89	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt	89	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_rcl.txt
90	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt	90	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/system_audit_ssh.txt
91	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt	91	@(ossec,ossec,0640) %%OSSEC_HOME%%/etc/shared/win_applications_rcl.txt
Lines 112-121 Link Here
112	@(,ossec,0640) %%OSSEC_HOME%%/rules/hordeimp_rules.xml	112	@(,ossec,0640) %%OSSEC_HOME%%/rules/hordeimp_rules.xml
113	@(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml	113	@(,ossec,0640) %%OSSEC_HOME%%/rules/ids_rules.xml
114	@(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml	114	@(,ossec,0640) %%OSSEC_HOME%%/rules/imapd_rules.xml
		115	@(,ossec,0640) %%OSSEC_HOME%%/rules/kesl_rules.xml
		116	@(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml
115	@(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml	117	@(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml
116	@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml	118	@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml
117	@(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml	119	@(,ossec,0640) %%OSSEC_HOME%%/rules/mailscanner_rules.xml
118	@(,ossec,0640) %%OSSEC_HOME%%/rules/mcafee_av_rules.xml	120	@(,ossec,0640) %%OSSEC_HOME%%/rules/mcafee_av_rules.xml
		121	@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_cowrie_rules.xml
		122	@(,ossec,0640) %%OSSEC_HOME%%/rules/mhn_dionaea_rules.xml
119	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-exchange_rules.xml	123	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-exchange_rules.xml
120	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-se_rules.xml	124	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms-se_rules.xml
121	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms1016_usbdetect_rules.xml	125	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms1016_usbdetect_rules.xml
Lines 123-128 Link Here
123	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_firewall_rules.xml	127	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_firewall_rules.xml
124	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ftpd_rules.xml	128	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ftpd_rules.xml
125	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ipsec_rules.xml	129	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_ipsec_rules.xml
		130	@(,ossec,0640) %%OSSEC_HOME%%/rules/ms_powershell_rules.xml
126	@(,ossec,0640) %%OSSEC_HOME%%/rules/msauth_rules.xml	131	@(,ossec,0640) %%OSSEC_HOME%%/rules/msauth_rules.xml
127	@(,ossec,0640) %%OSSEC_HOME%%/rules/mysql_rules.xml	132	@(,ossec,0640) %%OSSEC_HOME%%/rules/mysql_rules.xml
128	@(,ossec,0640) %%OSSEC_HOME%%/rules/named_rules.xml	133	@(,ossec,0640) %%OSSEC_HOME%%/rules/named_rules.xml
Lines 160-165 Link Here
160	@(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml	165	@(,ossec,0640) %%OSSEC_HOME%%/rules/sysmon_rules.xml
161	@(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml	166	@(,ossec,0640) %%OSSEC_HOME%%/rules/systemd_rules.xml
162	@(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml	167	@(,ossec,0640) %%OSSEC_HOME%%/rules/telnetd_rules.xml
		168	@(,ossec,0640) %%OSSEC_HOME%%/rules/topleveldomain_rules.xml
163	@(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml	169	@(,ossec,0640) %%OSSEC_HOME%%/rules/trend-osce_rules.xml
164	@(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml	170	@(,ossec,0640) %%OSSEC_HOME%%/rules/unbound_rules.xml
165	@(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml	171	@(,ossec,0640) %%OSSEC_HOME%%/rules/vmpop3d_rules.xml
Lines 196-200 Link Here
196	%%PORTDOCS%%%%DOCSDIR%%/README.md	202	%%PORTDOCS%%%%DOCSDIR%%/README.md
197	%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md	203	%%PORTDOCS%%%%DOCSDIR%%/SUPPORT.md
198	%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample	204	%%PORTDOCS%%%%DOCSDIR%%/ossec.conf.sample
		205	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
		206	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac
199	%%MYSQL%%%%DOCSDIR%%/mysql.schema	207	%%MYSQL%%%%DOCSDIR%%/mysql.schema
200	%%PGSQL%%%%DOCSDIR%%/postgresql.schema	208	%%PGSQL%%%%DOCSDIR%%/postgresql.schema

Line 0 Link Here

(-)security/ossec-hids-local/scripts/plist.conf (+30 lines)
	1	#!/bin/sh
	2
	3	fixed_lines="
	4	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-lua
	5	%%LUA%%@(,,0550) %%OSSEC_HOME%%/bin/ossec-luac"
	6	if [ "${OSSEC_TYPE}" != "agent" ]; then
	7	fixed_lines="${fixed_lines}
	8	%%MYSQL%%%%DOCSDIR%%/mysql.schema
	9	%%PGSQL%%%%DOCSDIR%%/postgresql.schema"
	10	fi
	11
	12	skip_lines="
	13	%%PORTDOCS%%%%DOCSDIR%%/mysql.schema
	14	%%PORTDOCS%%%%DOCSDIR%%/postgresql.schema"
	15
	16	skip_paths="
	17	/etc/ossec.conf
	18	/etc/client.keys
	19	/logs/active-responses.log
	20	/logs/ossec.log
	21	/lua"
	22	if [ "${OSSEC_TYPE}" = "agent" ]; then
	23	skip_paths="${skip_paths}
	24	/rules
	25	/agentless
	26	/.ssh"
	27	fi
	28
	29	sample_paths="
	30	/etc/local_internal_options.conf.sample"

Lines 11-28 Link Here

(-)security/ossec-hids-local/scripts/plist.sh (-51 / +29 lines)
11	WORKDIR=$4	11	WORKDIR=$4
12	STAGEDIR=$5	12	STAGEDIR=$5
13		13
14	staged_plist="${WORKDIR}/.staged-plist"	14	. $(dirname "$0")/plist.conf
15	fixed_lines=""
16	if [ "${OSSEC_TYPE}" != "agent" ]; then
17	fixed_lines="${fixed_lines} %%MYSQL%%%%DOCSDIR%%/mysql.schema %%PGSQL%%%%DOCSDIR%%/postgresql.schema"
18	fi
19	skip_lines="%%PORTDOCS%%%%DOCSDIR%%/mysql.schema %%PORTDOCS%%%%DOCSDIR%%/postgresql.schema"
20	skip_paths="/etc/ossec.conf /etc/client.keys /logs/active-responses.log /logs/ossec.log /lua"
21	sample_paths="/etc/local_internal_options.conf.sample"
22	if [ "${OSSEC_TYPE}" == "agent" ]; then
23	skip_paths="${skip_paths} /rules /agentless /.ssh"
24	fi
25		15
		16	NL=$'\n'
		17	IFS=${NL}
		18
26	print_path() {	19	print_path() {
27	local path="$1"	20	local path="$1"
28	local command="$2"	21	local command="$2"
Lines 34-50 Link Here
34	fi	27	fi
35	fi	28	fi
36	local user=`stat -f "%Su" "${full_path}"`	29	local user=`stat -f "%Su" "${full_path}"`
37	if [ "${user}" == "${USER}" ]; then	30	if [ "${user}" = "${USER}" ]; then
38	user=""	31	user=""
39	fi	32	fi
40	local group=`stat -f "%Sg" "${full_path}"`	33	local group=`stat -f "%Sg" "${full_path}"`
41	if [ "${group}" == "${GROUP}" ]; then	34	if [ "${group}" = "${GROUP}" ]; then
42	group=""	35	group=""
43	fi	36	fi
44	local mode=`stat -f "%p" "${full_path}" \| tail -c 5`	37	local mode=`stat -f "%p" "${full_path}" \| tail -c 5`
45	echo -e "${command}(${user},${group},${mode}) %%OSSEC_HOME%%${path}" >> "${PLIST}"	38	echo "${command}(${user},${group},${mode}) %%OSSEC_HOME%%${path}" >> "${PLIST}"
46	}	39	}
47		40
		41	contains() {
		42	local list="$1"
		43	local word="$2"
		44
		45	for e in ${list}; do
		46	if [ "${e}" = "${word}" ]; then
		47	return 0
		48	fi
		49	done
		50
		51	return 1
		52	}
		53
48	echo -n > "${PLIST}"	54	echo -n > "${PLIST}"
49		55
50	print_path	56	print_path
Lines 51-66 Link Here
51		57
52	done_paths=""	58	done_paths=""
53	while read line; do	59	while read line; do
54	skip_line=""	60	if ! contains "${skip_lines}" "${line}"; then
55	for e in ${skip_lines}; do
56	if [ "${e}" == "${line}" ]; then
57	skip_line="${e}"
58	break
59	fi
60	done
61	if [ -z "${skip_line}" ]; then
62	path=""	61	path=""
63	case $line in	62	case ${line} in
64	"@dir %%OSSEC_HOME%%"*)	63	"@dir %%OSSEC_HOME%%"*)
65	path=`echo "${line}" \| sed -e "s\|@dir %%OSSEC_HOME%%\|\|g"`	64	path=`echo "${line}" \| sed -e "s\|@dir %%OSSEC_HOME%%\|\|g"`
66	;;	65	;;
Lines 68-74 Link Here
68	path=`echo "${line}" \| sed -e "s\|%%OSSEC_HOME%%\|\|g"`	67	path=`echo "${line}" \| sed -e "s\|%%OSSEC_HOME%%\|\|g"`
69	;;	68	;;
70	"%%"*)	69	"%%"*)
71	unchanged_lines="${unchanged_lines} ${line}"	70	unchanged_lines="${unchanged_lines}${NL}${line}"
72	;;	71	;;
73	esac	72	esac
74	if [ -n "${path}" ]; then	73	if [ -n "${path}" ]; then
Lines 76-108 Link Here
76	path=""	75	path=""
77	for segment in ${segments}; do	76	for segment in ${segments}; do
78	path="${path}/${segment}"	77	path="${path}/${segment}"
79	skip_path=""	78	if contains "${skip_paths}" "${path}"; then
80	for e in ${skip_paths}; do
81	if [ "${e}" == "${path}" ]; then
82	skip_path="${e}"
83	break
84	fi
85	done
86	if [ -n "${skip_path}" ]; then
87	break	79	break
88	fi	80	fi
89	done_path=""	81	if ! contains "${done_paths}" "${path}"; then
90	for e in ${done_paths}; do	82	done_paths="${done_paths}${NL}${path}"
91	if [ "${e}" == "${path}" ]; then	83	if contains "${sample_paths}" "${path}"; then
92	done_path="${e}"
93	break
94	fi
95	done
96	if [ -z "${done_path}" ]; then
97	done_paths="${done_paths} ${path}"
98	sample_path=""
99	for e in ${sample_paths}; do
100	if [ "${e}" == "${path}" ]; then
101	sample_path="${e}"
102	break
103	fi
104	done
105	if [ -n "${sample_path}" ]; then
106	print_path "${path}" @sample	84	print_path "${path}" @sample
107	else	85	else
108	print_path "${path}"	86	print_path "${path}"
Lines 111-119 Link Here
111	done	89	done
112	fi	90	fi
113	fi	91	fi
114	done < "${staged_plist}"	92	done < "${WORKDIR}/.staged-plist"
115		93
116	unchanged_lines="${unchanged_lines} ${fixed_lines}"	94	unchanged_lines="${unchanged_lines}${NL}${fixed_lines}"
117	for line in ${unchanged_lines}; do	95	for line in ${unchanged_lines}; do
118	echo "${line}" >> "${PLIST}"	96	echo "${line}" >> "${PLIST}"
119	done	97	done

Line 0 Link Here

(-)security/ossec-hids-local/scripts/sanitize-stage.sh (+16 lines)
	1	#!/bin/sh
	2
	3	# Script removes paths from stage to make stage-qa happy about "orphaned" files
	4
	5	OSSEC_TYPE=$1
	6	OSSEC_HOME=$2
	7	STAGEDIR=$3
	8
	9	. $(dirname "$0")/plist.conf
	10
	11	NL=$'\n'
	12	IFS=${NL}
	13
	14	for path in ${skip_paths}; do
	15	rm -rf "${STAGEDIR}${OSSEC_HOME}${path}"
	16	done

Lines 1-8 Link Here

(-)security/ossec-hids-local-config/Makefile (-4 / +6 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= ossec-hids	3	PORTNAME= ossec-hids
4	PORTVERSION= 3.1.0	4	PORTVERSION= 3.3.0
5	PORTREVISION= 1	5	PORTREVISION= 0
6	CATEGORIES= security	6	CATEGORIES= security
7	PKGNAMESUFFIX= -${OSSEC_TYPE}-config	7	PKGNAMESUFFIX= -${OSSEC_TYPE}-config
8		8
Lines 47-60 Link Here
47	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
48		48
49	OPTIONS_SINGLE= FIREWALL	49	OPTIONS_SINGLE= FIREWALL
50	OPTIONS_SINGLE_FIREWALL= IPF IPFW PF	50	OPTIONS_SINGLE_FIREWALL= NOFW IPF IPFW PF
51		51
52	OPTIONS_DEFAULT+= IPF	52	OPTIONS_DEFAULT+= NOFW
53		53
54	FIREWALL_DESC= Active Response Firewall	54	FIREWALL_DESC= Active Response Firewall
55	PF_DESC= Packet Filter	55	PF_DESC= Packet Filter
56	IPFW_DESC= ipfirewall	56	IPFW_DESC= ipfirewall
57	IPF_DESC= ipfilter	57	IPF_DESC= ipfilter
		58	NOFW_DESC= Custom or no firewall
58		59
59	TEMPL_ENABLED_HEADER= template-header-enabled.xml	60	TEMPL_ENABLED_HEADER= template-header-enabled.xml
60	TEMPL_DISABLED_HEADER= template-header-disabled.xml	61	TEMPL_DISABLED_HEADER= template-header-disabled.xml
Lines 68-73 Link Here
68	PF_VARS= FW_DROP=pf.sh PKGMSG_FILES+=message-pf	69	PF_VARS= FW_DROP=pf.sh PKGMSG_FILES+=message-pf
69	IPFW_VARS= FW_DROP=ipfw.sh	70	IPFW_VARS= FW_DROP=ipfw.sh
70	IPF_VARS= FW_DROP=ipfilter.sh	71	IPF_VARS= FW_DROP=ipfilter.sh
		72	NOFW_VARS= FW_DROP=
71		73
72	.if defined(MAINTAINER_MODE)	74	.if defined(MAINTAINER_MODE)
73	OSSEC_HOME= ${PREFIX}/${PORTNAME}	75	OSSEC_HOME= ${PREFIX}/${PORTNAME}

Lines 51-58 Link Here

(-)security/ossec-hids-local-config/files/template-rules-default.xml.in (+6 lines)
51	<include>ms_ipsec_rules.xml</include>	51	<include>ms_ipsec_rules.xml</include>
52	<include>vmware_rules.xml</include>	52	<include>vmware_rules.xml</include>
53	<include>ids_rules.xml</include>	53	<include>ids_rules.xml</include>
		54	<include>ms_powershell_rules.xml</include>
		55	<include>last_rootlogin_rules.xml</include>
54	<include>apache_rules.xml</include>	56	<include>apache_rules.xml</include>
55	<include>web_rules.xml</include>	57	<include>web_rules.xml</include>
		58	<include>topleveldomain_rules.xml</include>
56	<include>zeus_rules.xml</include>	59	<include>zeus_rules.xml</include>
57	<include>nginx_rules.xml</include>	60	<include>nginx_rules.xml</include>
58	<include>php_rules.xml</include>	61	<include>php_rules.xml</include>
Lines 78-83 Link Here
78	<include>ms_firewall_rules.xml</include>	81	<include>ms_firewall_rules.xml</include>
79	<include>psad_rules.xml</include>	82	<include>psad_rules.xml</include>
80	<include>unbound_rules.xml</include>	83	<include>unbound_rules.xml</include>
		84	<include>kesl_rules.xml</include>
		85	<include>mhn_dionaea_rules.xml</include>
		86	<include>mhn_cowrie_rules.xml</include>
81	<include>local_rules.xml</include>	87	<include>local_rules.xml</include>
82		88
83	<!-- Files not included by default -->	89	<!-- Files not included by default -->