Index: head/security/ossec-hids-local/Makefile =================================================================== --- head/security/ossec-hids-local/Makefile (revision 485976) +++ head/security/ossec-hids-local/Makefile (revision 485977) @@ -1,248 +1,254 @@ # $FreeBSD$ PORTNAME= ossec-hids PORTVERSION= 3.1.0 -PORTREVISION= +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= -${OSSEC_TYPE} MAINTAINER= dominik.lisiak@bemsoft.pl 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 CONFLICTS_INSTALL= ossec-hids-client-* \ ossec-hids-agent-* \ ossec-hids-server-* .elif ${OSSEC_TYPE} == agent CONFLICTS_INSTALL= ossec-hids-client-* \ ossec-hids-local-* \ ossec-hids-server-* .elif ${OSSEC_TYPE} == server CONFLICTS_INSTALL= ossec-hids-client-* \ ossec-hids-agent-* \ ossec-hids-local-* .endif .if ${OSSEC_TYPE} != agent RUN_DEPENDS= expect:lang/expect .endif GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify PRELUDE_LIB_DEPENDS= libprelude.so:security/libprelude ZEROMQ_LIB_DEPENDS= libczmq.so:net/czmq MYSQL_USE= mysql PGSQL_USES= pgsql USE_GITHUB= yes GH_ACCOUNT= ossec USE_RC_SUBR= ossec-hids .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 \ src/agentlessd/scripts/ssh_generic_diff \ src/agentlessd/scripts/ssh_integrity_check_bsd \ src/agentlessd/scripts/ssh_integrity_check_linux \ src/agentlessd/scripts/ssh_nopass.exp \ src/agentlessd/scripts/ssh_pixconfig_diff \ src/agentlessd/scripts/sshlogin.exp \ src/agentlessd/scripts/su.exp .endif OPTIONS_SUB= yes OPTIONS_DEFINE= DOCS INOTIFY .if ${OSSEC_TYPE} != agent OPTIONS_DEFINE+= GEOIP PRELUDE ZEROMQ OPTIONS_RADIO= DATABASE OPTIONS_RADIO_DATABASE= MYSQL PGSQL .endif OPTIONS_DEFAULT= INOTIFY INOTIFY_DESC= Kevent based real time monitoring PRELUDE_DESC= Sensor support from Prelude SIEM ZEROMQ_DESC= ZeroMQ support (experimental) DATABASE_DESC= Database output GEOIP_VARS= OSSEC_ARGS+=USE_GEOIP=yes INOTIFY_VARS= OSSEC_ARGS+=USE_INOTIFY=yes 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 PGSQL_VARS= OSSEC_ARGS+=DATABASE=pgsql PKGMSG_FILES+=message-database DB_TYPE=postgresql DB_SCHEMA=postgresql.schema -OSSEC_ARGS+= TARGET=${OSSEC_TYPE} .if ${OSSEC_TYPE} == agent STRIP_FILES= agent-auth \ manage_agents \ ossec-agentd \ ossec-execd \ ossec-logcollector \ ossec-lua \ ossec-luac \ ossec-syscheckd .else STRIP_FILES= agent_control \ clear_stats \ list_agents \ manage_agents \ ossec-agentlessd \ ossec-analysisd \ ossec-authd \ ossec-csyslogd \ ossec-dbd \ ossec-execd \ ossec-logcollector \ ossec-logtest \ ossec-lua \ ossec-luac \ ossec-maild \ ossec-makelists \ ossec-monitord \ ossec-regex \ ossec-remoted \ ossec-reportd \ ossec-syscheckd \ rootcheck_control \ syscheck_control \ syscheck_update \ verify-agent-conf .endif .if defined(MAINTAINER_MODE) OSSEC_HOME= ${PREFIX}/${PORTNAME} .else OSSEC_HOME?= ${PREFIX}/${PORTNAME} .endif OSSEC_RC= ${PREFIX}/etc/rc.d/ossec-hids FIREWALL_DROP_BIN= ${OSSEC_HOME}/active-response/bin/firewall-drop.sh IPFILTER_BIN= ${OSSEC_HOME}/active-response/bin/ipfilter.sh RESTART_OSSEC_BIN= ${OSSEC_HOME}/active-response/bin/restart-ossec.sh SHARED_DIR= ${OSSEC_HOME}/etc/shared INTERNAL_OPTS_CONF= ${OSSEC_HOME}/etc/local_internal_options.conf .if empty(USER) USER=$$(${ID} -un) .endif .if empty(GROUP) GROUP=$$(${ID} -gn) .endif .if !defined(MAINTAINER_MODE) USER_ARGS+= OSSEC_GROUP=${GROUP} \ OSSEC_USER=${USER} \ OSSEC_USER_MAIL=${USER} \ OSSEC_USER_REM=${USER} .endif OSSEC_USER= ossec OSSEC_GROUP= ossec USERS= ${OSSEC_USER} ossecm ossecr GROUPS= ${OSSEC_GROUP} SUB_LIST+= PORTNAME=${PORTNAME} \ CATEGORY=${CATEGORIES:[1]} \ OSSEC_TYPE=${OSSEC_TYPE} \ OSSEC_HOME=${OSSEC_HOME} \ 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} SUB_FILES= pkg-install \ pkg-deinstall \ ${PKGMSG_FILES} \ restart-ossec.sh .if defined(MAINTAINER_MODE) PLIST_SUB= OSSEC_HOME=${PORTNAME} .else PLIST_SUB= OSSEC_HOME=${OSSEC_HOME} .endif PLIST= ${PKGDIR}/pkg-plist-${OSSEC_TYPE} DOCSFILES= BUGS CHANGELOG CONTRIBUTORS LICENSE README.md SUPPORT.md PKGHELP= ${PKGDIR}/pkg-help-${OSSEC_TYPE} PKGMESSAGE= ${WRKDIR}/pkg-message PKGMSG_FILES= message-header CFLAGS+= -I${LOCALBASE}/include +OSSEC_ARGS+= TARGET=${OSSEC_TYPE} INSTALL_LOCALTIME=no +.if !defined(MAINTAINER_MODE) +OSSEC_ARGS+= INSTALL_CMD=install +.endif BUILD_ARGS+= ${MAKE_ARGS} ${OSSEC_ARGS} PREFIX=${OSSEC_HOME} INSTALL_ARGS+= ${USER_ARGS} ${OSSEC_ARGS} PREFIX=${STAGEDIR}${OSSEC_HOME} .include PKGMSG_FILES+= message-firewall message-config post-patch: @${REINPLACE_CMD} -e 's|-DLUA_USE_LINUX|& ${CPPFLAGS}|' \ -e 's|-lreadline|& ${LDFLAGS}|' \ ${WRKSRC}/src/external/lua/src/Makefile +.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 + @${REINPLACE_CMD} -e 's|-Wno-implicit-fallthrough||g' ${WRKSRC}/src/Makefile +.endif do-build: @cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${BUILD_ARGS} build do-install: @cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_ARGS} install post-install: @${MV} -f ${STAGEDIR}${INTERNAL_OPTS_CONF} ${STAGEDIR}${INTERNAL_OPTS_CONF}.sample @${MV} -f ${STAGEDIR}${FIREWALL_DROP_BIN} ${STAGEDIR}${IPFILTER_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 .else @for file_name in $$(find "${STAGEDIR}${SHARED_DIR}" -type f); do ${CHMOD} 0644 $${file_name}; done .endif .endif @${ECHO_CMD} -n > ${PKGMESSAGE} .for file_name in ${PKGMSG_FILES} @${CAT} ${WRKDIR}/${file_name} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} .endfor .for file_name in ${STRIP_FILES} @${STRIP_CMD} ${STAGEDIR}${OSSEC_HOME}/bin/${file_name} .endfor .if defined(MAINTAINER_MODE) plist: makeplist - @${SCRIPTDIR}/plist.sh ${OSSEC_TYPE} ${OSSEC_HOME} ${PLIST} ${WRKDIR} ${STAGEDIR} + @${SH} ${SCRIPTDIR}/plist.sh ${OSSEC_TYPE} ${OSSEC_HOME} ${PLIST} ${WRKDIR} ${STAGEDIR} .endif post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCSFILES} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} etc/ossec-${OSSEC_TYPE}.conf ${STAGEDIR}${DOCSDIR}/ossec.conf.sample post-install-MYSQL-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} src/os_dbd/${DB_SCHEMA} ${STAGEDIR}${DOCSDIR} post-install-PGSQL-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} src/os_dbd/${DB_SCHEMA} ${STAGEDIR}${DOCSDIR} .include Index: head/security/ossec-hids-local/files/patch-src_Makefile =================================================================== --- head/security/ossec-hids-local/files/patch-src_Makefile (revision 485976) +++ head/security/ossec-hids-local/files/patch-src_Makefile (revision 485977) @@ -1,219 +1,231 @@ --- src/Makefile.orig 2018-10-11 22:25:16 UTC +++ src/Makefile -@@ -366,10 +366,10 @@ endif +@@ -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 -+ install -m 0550 ossec-agentd ${PREFIX}/bin -+ install -m 0550 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 -+ install -d ${PREFIX}/queue/rids ++ $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids install-local: install-server-generic -@@ -378,128 +378,126 @@ install-hybrid: install-server-generic - install-server: 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} + ./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 -+ install -d ${PREFIX} -+ install -d ${PREFIX}/logs -+ install /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 -+ install -d ${PREFIX}/bin -+ install -m 0550 ossec-logcollector ${PREFIX}/bin -+ install -m 0550 ossec-syscheckd ${PREFIX}/bin -+ install -m 0550 ossec-execd ${PREFIX}/bin -+ install -m 0550 manage_agents ${PREFIX}/bin -+ install -m 0550 ../contrib/util.sh ${PREFIX}/bin/ -+ install -m 0550 ${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/ -+ install -d ${PREFIX}/lua -+ install -d ${PREFIX}/lua/native -+ install -d ${PREFIX}/lua/compiled -+ install -m 0550 ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/ -+ install -m 0550 ${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 -+ install -d ${PREFIX}/queue -+ install -d ${PREFIX}/queue/alerts -+ install -d ${PREFIX}/queue/ossec -+ install -d ${PREFIX}/queue/syscheck -+ install -d ${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 -+ install -d ${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 -+ install -d -m 1550 ${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/ -+ install -m 440 /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/ -+ install -d ${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/ -+ install -m 0640 -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 -+ install -m 0640 ../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 -+ install -m 0640 /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 -+ install -m 0640 ../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 -+ install -m 0640 ${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/ -+ install -d ${PREFIX}/etc/shared -+ install -m 0640 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/ -+ install -d ${PREFIX}/active-response -+ install -d ${PREFIX}/active-response/bin -+ install -d ${PREFIX}/agentless -+ install -m 0550 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 -+ install -d ${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/ -+ install -m 0550 ../active-response/*.sh ${PREFIX}/active-response/bin/ -+ install -m 0550 ../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 -+ install -d ${PREFIX}/var -+ install -d ${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 -+ install -m 0660 /dev/null ${PREFIX}/logs/active-responses.log -+ install -d ${PREFIX}/logs/archives -+ install -d ${PREFIX}/logs/alerts -+ install -d ${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/ -+ install -m 0550 ossec-agentlessd ${PREFIX}/bin -+ install -m 0550 ossec-analysisd ${PREFIX}/bin -+ install -m 0550 ossec-monitord ${PREFIX}/bin -+ install -m 0550 ossec-reportd ${PREFIX}/bin -+ install -m 0550 ossec-maild ${PREFIX}/bin -+ install -m 0550 ossec-remoted ${PREFIX}/bin -+ install -m 0550 ossec-logtest ${PREFIX}/bin -+ install -m 0550 ossec-csyslogd ${PREFIX}/bin -+ install -m 0550 ossec-authd ${PREFIX}/bin -+ install -m 0550 ossec-dbd ${PREFIX}/bin -+ install -m 0550 ossec-makelists ${PREFIX}/bin -+ install -m 0550 verify-agent-conf ${PREFIX}/bin/ -+ install -m 0550 clear_stats ${PREFIX}/bin/ -+ install -m 0550 list_agents ${PREFIX}/bin/ -+ install -m 0550 ossec-regex ${PREFIX}/bin/ -+ install -m 0550 syscheck_update ${PREFIX}/bin/ -+ install -m 0550 agent_control ${PREFIX}/bin/ -+ install -m 0550 syscheck_control ${PREFIX}/bin/ -+ install -m 0550 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 -+ install -d ${PREFIX}/stats -+ install -d ${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 -+ install -m 0640 -b ../etc/rules/*.xml ${PREFIX}/rules -+ install -m 0640 ${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 -+ install -m 0640 -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 -+ install -d ${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 -+ install -d ${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 -+ install -d ${PREFIX}/queue/agent-info -+ install -d ${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 -+ install -d ${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/ -+ install -m 0640 ../etc/decoder.xml ${PREFIX}/etc/ ++ $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/ rm -f ${PREFIX}/etc/shared/merged.mg Index: head/security/ossec-hids-local-config/Makefile =================================================================== --- head/security/ossec-hids-local-config/Makefile (revision 485976) +++ head/security/ossec-hids-local-config/Makefile (revision 485977) @@ -1,460 +1,460 @@ # $FreeBSD$ PORTNAME= ossec-hids PORTVERSION= 3.1.0 -PORTREVISION= +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= -${OSSEC_TYPE}-config MAINTAINER= dominik.lisiak@bemsoft.pl COMMENT= Configuration manager for ossec-hids LICENSE= GPLv2 OSSEC_TYPE?= local MASTERDIR?= ${.CURDIR} .if ${OSSEC_TYPE} == local CONFLICTS_INSTALL= ossec-hids-client-* \ ossec-hids-agent-* \ ossec-hids-server-* .elif ${OSSEC_TYPE} == agent CONFLICTS_INSTALL= ossec-hids-client-* \ ossec-hids-local-* \ ossec-hids-server-* .elif ${OSSEC_TYPE} == server CONFLICTS_INSTALL= ossec-hids-client-* \ ossec-hids-agent-* \ ossec-hids-local-* .endif .if !defined(MAINTAINER_MODE) RUN_DEPENDS= ossec-hids-${OSSEC_TYPE}>=${PORTVERSION}:security/ossec-hids-${OSSEC_TYPE} .endif .if defined(MAINTAINER_MODE) USE_GITHUB= yes GH_ACCOUNT= ossec .else MASTER_SITES= # DISTFILES= # EXTRACT_ONLY= # .endif NO_BUILD= yes NO_ARCH= yes OPTIONS_SUB= yes OPTIONS_SINGLE= FIREWALL OPTIONS_SINGLE_FIREWALL= IPF IPFW PF OPTIONS_DEFAULT+= IPF FIREWALL_DESC= Active Response Firewall PF_DESC= Packet Filter IPFW_DESC= ipfirewall IPF_DESC= ipfilter TEMPL_ENABLED_HEADER= template-header-enabled.xml TEMPL_DISABLED_HEADER= template-header-disabled.xml TEMPL_SAMPLE_HEADER= template-header-sample.xml TEMPL_PUSHED_ENABLED_HEADER= ${TEMPL_ENABLED_HEADER} TEMPL_PUSHED_DISABLED_HEADER= ${TEMPL_DISABLED_HEADER} TEMPL_SAMPLE= template-sample-${OSSEC_TYPE}.xml TEMPL_SAMPLE_DB= template-sample-database.xml PF_VARS= FW_DROP=pf.sh PKGMSG_FILES+=message-pf IPFW_VARS= FW_DROP=ipfw.sh IPF_VARS= FW_DROP=ipfilter.sh .if defined(MAINTAINER_MODE) OSSEC_HOME= ${PREFIX}/${PORTNAME} .else OSSEC_HOME?= ${PREFIX}/${PORTNAME} .endif OSSEC_RC= ${PREFIX}/etc/rc.d/ossec-hids TEMPL_TO_OSSEC= ${SCRIPTDIR}/template-to-ossec.sh ${OSSEC_TYPE} ${OSSEC_HOME} TEMPL_TO_AGENT= ${SCRIPTDIR}/template-to-agent.sh ${OSSEC_TYPE} ${OSSEC_HOME} OSSEC_DIR= ${STAGEDIR}${OSSEC_HOME} BIN_DIR= ${OSSEC_DIR}/bin CONF_BIN_DIR= ${BIN_DIR}/config OSSEC_CONF_BIN= ${CONF_BIN_DIR}/ossec-conf AGENT_CONF_BIN= ${CONF_BIN_DIR}/agent-conf COMMAND_BIN_DIR= ${BIN_DIR}/command AR_BIN_DIR= ${OSSEC_DIR}/active-response/bin MERGE_CONFIG_BIN= ${AR_BIN_DIR}/merge-config.sh ETC_DIR= ${OSSEC_DIR}/etc OSSEC_CONF_DIR= ${ETC_DIR}/ossec.conf.d AGENT_CONF_DIR= ${ETC_DIR}/agent.conf.d OSSEC_LOCAL_CONF_DIR= ${OSSEC_CONF_DIR}/disabled AGENT_LOCAL_CONF_DIR= ${AGENT_CONF_DIR}/disabled OSSEC_SAMPLE_CONF= ${OSSEC_CONF_DIR}/900.local.conf.sample COMMAND_CONF_DIR= ${ETC_DIR} COMMAND_CONF= ${COMMAND_CONF_DIR}/command.conf.sample RULES_DIR= ${OSSEC_DIR}/rules .if empty(USER) USER=$$(${ID} -un) .endif .if empty(GROUP) GROUP=$$(${ID} -gn) .endif OSSEC_USER= ossec OSSEC_GROUP= ossec SUB_LIST+= PORTNAME=${PORTNAME} \ OSSEC_TYPE=${OSSEC_TYPE} \ OSSEC_HOME=${OSSEC_HOME} \ VERSION=${PORTVERSION} \ USER=${USER} \ OSSEC_USER=${OSSEC_USER} \ OSSEC_GROUP=${OSSEC_GROUP} \ OSSEC_RC=${OSSEC_RC} \ FW_DROP=${FW_DROP} SUB_FILES= pkg-install \ pkg-deinstall \ ${PKGMSG_FILES} \ ${TEMPL_ENABLED_HEADER} \ ${TEMPL_DISABLED_HEADER} \ ${TEMPL_SAMPLE_HEADER} \ ${TEMPL_PUSHED_ENABLED_HEADER} \ ${TEMPL_PUSHED_DISABLED_HEADER} \ ${TEMPL_SAMPLE} \ merge-config.sh \ ossec-conf \ command.conf .if ${OSSEC_TYPE} == server SUB_FILES+= agent-conf .endif .if defined(MAINTAINER_MODE) PLIST_SUB= OSSEC_HOME=${PORTNAME} .else PLIST_SUB= OSSEC_HOME=${OSSEC_HOME} .endif PLIST= ${PKGDIR}/pkg-plist-${OSSEC_TYPE} PKGHELP= ${PKGDIR}/pkg-help-${OSSEC_TYPE} PKGMESSAGE= ${WRKDIR}/pkg-message PKGMSG_FILES= message-ossec-conf .if ${OSSEC_TYPE} == server PKGMSG_FILES+= message-agent-conf .endif CONF_GROUPS= RULES AR ROOTCHECK SYSCHECK CMDOUT LOGS ############################################################ .for conf_group in ${CONF_GROUPS} . include "${MASTERDIR}/opt-${conf_group:tl}.mk" ${conf_group}_INSTANCE_OPTIONS= ${conf_group}_PUSHED_OPTIONS= . for option in ${${conf_group}_OPTIONS} . if ${${option}_DEFINE:M${OSSEC_TYPE}} ${conf_group}_INSTANCE_OPTIONS+= ${option} ${conf_group}_ALL_OPTIONS+= ${option} . endif . if ${${option}_DEFINE:Mpushed} . if ${OSSEC_TYPE} == server ${conf_group}_PUSHED_OPTIONS+= ${option} . endif . if !${${conf_group}_ALL_OPTIONS:M${option}} ${conf_group}_ALL_OPTIONS+= ${option} . endif . endif . endfor .endfor ############################################################ CONFIG_PROFILES= .for conf_group in ${CONF_GROUPS} . if !empty(${conf_group}_PROFILE) . if ${OSSEC_TYPE} == agent . if !${CONFIG_PROFILES:M${${conf_group}_PROFILE}} CONFIG_PROFILES+= ${${conf_group}_PROFILE} . endif . endif SUB_LIST+= ${conf_group}_PROFILE=${${conf_group}_PROFILE} . endif . for option in ${${conf_group}_ALL_OPTIONS} . if !empty(${option}_PROFILE) . if ${OSSEC_TYPE} == agent . if !${CONFIG_PROFILES:M${${option}_PROFILE}} CONFIG_PROFILES+= ${${option}_PROFILE} . endif . endif SUB_LIST+= ${option}_PROFILE=${${option}_PROFILE} . endif . endfor .endfor .for profile in ${CONFIG_PROFILES} . if empty(CONFIG_PROFILE_VALUE) CONFIG_PROFILE_VALUE:= ${profile} . else CONFIG_PROFILE_VALUE:= ${CONFIG_PROFILE_VALUE}, ${profile} . endif .endfor SUB_LIST+= CONFIG_PROFILES="${CONFIG_PROFILE_VALUE}" ############################################################ .for conf_group in ${CONF_GROUPS} . for option in ${${conf_group}_ALL_OPTIONS} . if !defined(${option}_TEMPLATE) ${option}_TEMPLATE= template-${option:tl:S/_/-/g}.xml . endif . if !empty(${option}_TEMPLATE) && !${SUB_FILES:M${${option}_TEMPLATE}} SUB_FILES+= ${${option}_TEMPLATE} . endif . endfor .endfor .for file_name in ${RULES_FILES} SUB_FILES+= rules-${file_name}.xml .endfor .for file_name in ${CMDOUT_SCRIPTS} SUB_FILES+= command-${file_name}.sh .endfor ############################################################ .for conf_group in ${CONF_GROUPS} . for option in ${${conf_group}_INSTANCE_OPTIONS} . if !empty(${option}_DEPENDS) && !empty(${${option}_DEPENDS}_OPTION) && ${${${option}_DEPENDS:S/_/ /:[1]}_INSTANCE_OPTIONS:M${${option}_DEPENDS}} ${${${option}_DEPENDS}_OPTION}_VARS+= ${conf_group}_INSTANCE_OPTIONS_ENABLED+=${option} ${${${option}_DEPENDS}_OPTION}_VARS_OFF+= ${conf_group}_INSTANCE_OPTIONS_DISABLED+=${option} . elif !empty(${option}_OPTION) OPTIONS_GROUP_G_${conf_group}+= ${${option}_OPTION} ${${option}_OPTION}_DESC= ${${option}_DESC} . if ${${option}_DEFAULT:M${OSSEC_TYPE}} OPTIONS_DEFAULT+= ${${option}_OPTION} . endif ${${option}_OPTION}_VARS+= ${conf_group}_INSTANCE_OPTIONS_ENABLED+=${option} ${${option}_OPTION}_VARS_OFF+= ${conf_group}_INSTANCE_OPTIONS_DISABLED+=${option} . endif . endfor . if !empty(OPTIONS_GROUP_G_${conf_group}) OPTIONS_GROUP+= G_${conf_group} G_${conf_group}_DESC= ${${conf_group}_DESC} . endif .endfor ############################################################ .for conf_group in ${CONF_GROUPS} . for option in ${${conf_group}_PUSHED_OPTIONS} . if !empty(${option}_DEPENDS) && !empty(${${option}_DEPENDS}_OPTION) && ${${${option}_DEPENDS:S/_/ /:[1]}_PUSHED_OPTIONS:M${${option}_DEPENDS}} ${${${option}_DEPENDS}_OPTION}_P_VARS+= ${conf_group}_PUSHED_OPTIONS_ENABLED+=${option} ${${${option}_DEPENDS}_OPTION}_P_VARS_OFF+= ${conf_group}_PUSHED_OPTIONS_DISABLED+=${option} . elif !empty(${option}_DEPENDS) && !empty(${${option}_DEPENDS}_OPTION) && ${${${option}_DEPENDS:S/_/ /:[1]}_INSTANCE_OPTIONS:M${${option}_DEPENDS}} ${${${option}_DEPENDS}_OPTION}_VARS+= ${conf_group}_PUSHED_OPTIONS_ENABLED+=${option} ${${${option}_DEPENDS}_OPTION}_VARS_OFF+= ${conf_group}_PUSHED_OPTIONS_DISABLED+=${option} . elif !empty(${option}_OPTION) OPTIONS_GROUP_G_${conf_group}_P+= ${${option}_OPTION}_P ${${option}_OPTION}_P_DESC= ${${option}_DESC} . if !empty(${option}_PROFILE) ${${option}_OPTION}_P_DESC+= (profile: ${${option}_PROFILE}) . endif . if ${${option}_DEFAULT:Mpushed} OPTIONS_DEFAULT+= ${${option}_OPTION}_P . endif ${${option}_OPTION}_P_VARS+= ${conf_group}_PUSHED_OPTIONS_ENABLED+=${option} ${${option}_OPTION}_P_VARS_OFF+= ${conf_group}_PUSHED_OPTIONS_DISABLED+=${option} . endif . endfor . if !empty(OPTIONS_GROUP_G_${conf_group}_P) OPTIONS_GROUP+= G_${conf_group}_P G_${conf_group}_P_DESC= Pushed ${${conf_group}_DESC} . if !empty(${conf_group}_PROFILE) G_${conf_group}_P_DESC+= (profile: ${${conf_group}_PROFILE}) . endif . endif .endfor ############################################################ .include show-opts: .for conf_group in ${CONF_GROUPS} @${ECHO_CMD} "${conf_group}: ${${conf_group}_DESC}" . for option in ${${conf_group}_INSTANCE_OPTIONS} @${ECHO_CMD} " ${option}: ${${option}_DESC}" . if empty(${option}_TEMPLATE) @${ECHO_CMD} " Template: -" . else @${ECHO_CMD} " Template: ${${option}_TEMPLATE}" . endif . if !empty(${conf_group}_INSTANCE_OPTIONS_ENABLED) && ${${conf_group}_INSTANCE_OPTIONS_ENABLED:M${option}} @${ECHO_CMD} " Enabled: true" . endif . if !empty(${conf_group}_INSTANCE_OPTIONS_DISABLED) && ${${conf_group}_INSTANCE_OPTIONS_DISABLED:M${option}} @${ECHO_CMD} " Enabled: false" . endif . if !empty(${conf_group}_PUSHED_OPTIONS_ENABLED) && ${${conf_group}_PUSHED_OPTIONS_ENABLED:M${option}} @${ECHO_CMD} " Pushed: true" . endif . if !empty(${conf_group}_PUSHED_OPTIONS_DISABLED) && ${${conf_group}_PUSHED_OPTIONS_DISABLED:M${option}} @${ECHO_CMD} " Pushed: false" . endif . endfor .endfor pre-install: @-${OSSEC_HOME}/bin/ossec-dbd -h 2>&1 | ${GREP} -q 'PostgreSQL' && \ ${SED} -e 's|%%OSSEC_HOME%%|${OSSEC_HOME}|g' -e 's|%%DB_TYPE%%|postgresql|g' \ ${FILESDIR}/${TEMPL_SAMPLE_DB}.in > ${WRKDIR}/${TEMPL_SAMPLE_DB} @-${OSSEC_HOME}/bin/ossec-dbd -h 2>&1 | ${GREP} -q 'MySQL' && \ ${SED} -e 's|%%OSSEC_HOME%%|${OSSEC_HOME}|g' -e 's|%%DB_TYPE%%|mysql|g' \ ${FILESDIR}/${TEMPL_SAMPLE_DB}.in > ${WRKDIR}/${TEMPL_SAMPLE_DB} ossec-dirs: @${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} ${RULES_DIR} .endif .if ${OSSEC_TYPE} == server @${MKDIR} ${AGENT_CONF_DIR} ${AGENT_LOCAL_CONF_DIR} .endif ossec-scripts: @${CP} ${WRKDIR}/ossec-conf ${OSSEC_CONF_BIN} .if ${OSSEC_TYPE} == server @${CP} ${WRKDIR}/agent-conf ${AGENT_CONF_BIN} .endif .for file_name in ${CMDOUT_SCRIPTS} @${CP} ${WRKDIR}/command-${file_name}.sh ${COMMAND_BIN_DIR}/${file_name}.sh .endfor @${CP} ${WRKDIR}/command.conf ${COMMAND_CONF} @${CP} ${WRKDIR}/merge-config.sh ${MERGE_CONFIG_BIN} ossec-rules: .if ${OSSEC_TYPE} != agent . for file_name in ${RULES_FILES} @${SED} -e 's|||' ${WRKDIR}/rules-${file_name}.xml > ${RULES_DIR}/freebsd_${file_name}_rules.xml . endfor .endif ossec-conf-managed: .for conf_group in ${CONF_GROUPS} . if !empty(${conf_group}_INSTANCE_OPTIONS) @${CAT} ${WRKDIR}/${TEMPL_ENABLED_HEADER} > ${OSSEC_CONF_DIR}/${${conf_group}_MANAGED_CONF} . if !empty(${conf_group}_INSTANCE_OPTIONS_ENABLED) . for option in ${${conf_group}_INSTANCE_OPTIONS} . if ${${conf_group}_INSTANCE_OPTIONS_ENABLED:M${option}} . if !empty(${option}_TEMPLATE) @${ECHO_CMD} "" >> ${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 . endfor . endif . endif .endfor ossec-conf-local: .for conf_group in ${CONF_GROUPS} . if !empty(${conf_group}_INSTANCE_OPTIONS) @${CAT} ${WRKDIR}/${TEMPL_DISABLED_HEADER} > ${OSSEC_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF} . if !empty(${conf_group}_INSTANCE_OPTIONS_DISABLED) . for option in ${${conf_group}_INSTANCE_OPTIONS} . if ${${conf_group}_INSTANCE_OPTIONS_DISABLED:M${option}} . if !empty(${option}_TEMPLATE) @${ECHO_CMD} "" >> ${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 . endfor . endif . endif .endfor ossec-conf-sample: @${CAT} ${WRKDIR}/${TEMPL_SAMPLE_HEADER} > ${OSSEC_SAMPLE_CONF} @${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF} @${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE} >> ${OSSEC_SAMPLE_CONF} @${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF} @-${TEST} -f ${WRKDIR}/${TEMPL_SAMPLE_DB} && \ ${SH} ${TEMPL_TO_OSSEC} ${WRKDIR}/${TEMPL_SAMPLE_DB} >> ${OSSEC_SAMPLE_CONF} && \ ${ECHO_CMD} >> ${OSSEC_SAMPLE_CONF} agent-conf-managed: .for conf_group in ${CONF_GROUPS} . if !empty(${conf_group}_PUSHED_OPTIONS) @${CAT} ${WRKDIR}/${TEMPL_PUSHED_ENABLED_HEADER} > ${AGENT_CONF_DIR}/${${conf_group}_MANAGED_CONF} . if !empty(${conf_group}_PUSHED_OPTIONS_ENABLED) . for option in ${${conf_group}_PUSHED_OPTIONS} . if ${${conf_group}_PUSHED_OPTIONS_ENABLED:M${option}} . if !empty(${option}_TEMPLATE) @${ECHO_CMD} "" >> ${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 . endfor . endif . endif .endfor agent-conf-local: .for conf_group in ${CONF_GROUPS} . if !empty(${conf_group}_PUSHED_OPTIONS) @${CAT} ${WRKDIR}/${TEMPL_PUSHED_DISABLED_HEADER} > ${AGENT_LOCAL_CONF_DIR}/${${conf_group}_LOCAL_CONF} . if !empty(${conf_group}_PUSHED_OPTIONS_DISABLED) . for option in ${${conf_group}_PUSHED_OPTIONS} . if ${${conf_group}_PUSHED_OPTIONS_DISABLED:M${option}} . if !empty(${option}_TEMPLATE) @${ECHO_CMD} "" >> ${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 . endfor . endif . endif .endfor do-install: ossec-dirs ossec-scripts ossec-rules ossec-conf-managed ossec-conf-local ossec-conf-sample agent-conf-managed agent-conf-local ossec-permissions: +.if defined(MAINTAINER_MODE) @${CHMOD} -R 550 ${OSSEC_DIR} - @${CHMOD} 640 ${COMMAND_CONF} ${OSSEC_CONF_DIR}/* ${OSSEC_LOCAL_CONF_DIR}/* - @${CHMOD} 550 ${OSSEC_CONF_DIR} ${OSSEC_LOCAL_CONF_DIR} -.if ${OSSEC_TYPE} != agent + @${CHMOD} 640 ${COMMAND_CONF} ${OSSEC_LOCAL_CONF_DIR}/* ${OSSEC_CONF_DIR}/* + @${CHMOD} 550 ${OSSEC_LOCAL_CONF_DIR} ${OSSEC_CONF_DIR} +. if ${OSSEC_TYPE} != agent @${CHMOD} 640 ${RULES_DIR}/* -.endif -.if ${OSSEC_TYPE} == server - @${CHMOD} 640 ${AGENT_CONF_DIR}/* ${AGENT_LOCAL_CONF_DIR}/* - @${CHMOD} 550 ${AGENT_CONF_DIR} ${AGENT_LOCAL_CONF_DIR} -.endif -.if defined(MAINTAINER_MODE) +. endif +. if ${OSSEC_TYPE} == server + @${CHMOD} 640 ${AGENT_LOCAL_CONF_DIR}/* ${AGENT_CONF_DIR}/* + @${CHMOD} 550 ${AGENT_LOCAL_CONF_DIR} ${AGENT_CONF_DIR} +. endif @${CHOWN} -R ${USER}:${OSSEC_GROUP} ${OSSEC_DIR} @${CHOWN} -R ${USER}:${GROUP} ${BIN_DIR} .endif post-install: ossec-permissions @${ECHO_CMD} -n > ${PKGMESSAGE} .for file_name in ${PKGMSG_FILES} @${CAT} ${WRKDIR}/${file_name} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} .endfor .if defined(MAINTAINER_MODE) plist: makeplist - @${SCRIPTDIR}/plist.sh ${OSSEC_TYPE} ${OSSEC_HOME} ${PLIST} ${WRKDIR} ${STAGEDIR} + @${SH} ${SCRIPTDIR}/plist.sh ${OSSEC_TYPE} ${OSSEC_HOME} ${PLIST} ${WRKDIR} ${STAGEDIR} rules: extract - @${SCRIPTDIR}/rules.sh ${FILESDIR}/${RULES_DEFAULT_TEMPLATE}.in ${WRKSRC} + @${SH} ${SCRIPTDIR}/rules.sh ${FILESDIR}/${RULES_DEFAULT_TEMPLATE}.in ${WRKSRC} .endif .include Index: head/security/ossec-hids-local-config/files/template-syscheck-pgsql.xml.in =================================================================== --- head/security/ossec-hids-local-config/files/template-syscheck-pgsql.xml.in (nonexistent) +++ head/security/ossec-hids-local-config/files/template-syscheck-pgsql.xml.in (revision 485977) @@ -0,0 +1,16 @@ + + + + + /var/db/postgres + + + + + + + + /var/lib/postgresql + + + Property changes on: head/security/ossec-hids-local-config/files/template-syscheck-pgsql.xml.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/security/ossec-hids-local-config/opt-logs.mk =================================================================== --- head/security/ossec-hids-local-config/opt-logs.mk (revision 485976) +++ head/security/ossec-hids-local-config/opt-logs.mk (revision 485977) @@ -1,52 +1,52 @@ LOGS_MANAGED_CONF= 150.logs.conf LOGS_LOCAL_CONF= 550.logs.local.conf LOGS_DESC= Log Monitoring # Default logs support LOGS_BASIC_OPTION= BASIC LOGS_BASIC_PROFILE= basic -LOGS_BASIC_DESC= Default system logs +LOGS_BASIC_DESC= Basic system logs LOGS_BASIC_DEFINE= server local agent pushed LOGS_BASIC_DEFAULT= server local pushed LOGS_OPTIONS+= LOGS_BASIC # Active response log support LOGS_OSSEC_OPTION= OSSEC LOGS_OSSEC_PROFILE= ossec -LOGS_OSSEC_DESC= Active response logs +LOGS_OSSEC_DESC= OSSEC active response logs LOGS_OSSEC_DEFINE= server local agent pushed LOGS_OSSEC_DEFAULT= server local pushed LOGS_OPTIONS+= LOGS_OSSEC # Apache logs support LOGS_APACHE_OPTION= APACHE LOGS_APACHE_PROFILE= apache LOGS_APACHE_DESC= Apache logs LOGS_APACHE_DEFINE= server local agent pushed LOGS_APACHE_DEFAULT= pushed LOGS_OPTIONS+= LOGS_APACHE # Nginx logs support LOGS_NGINX_OPTION= NGINX LOGS_NGINX_PROFILE= nginx LOGS_NGINX_DESC= Nginx logs LOGS_NGINX_DEFINE= server local agent pushed LOGS_NGINX_DEFAULT= pushed LOGS_OPTIONS+= LOGS_NGINX # Radius logs support LOGS_RADIUS_OPTION= RADIUS LOGS_RADIUS_PROFILE= radius LOGS_RADIUS_DESC= FreeRADIUS logs LOGS_RADIUS_DEFINE= server local agent pushed LOGS_RADIUS_DEFAULT= pushed LOGS_OPTIONS+= LOGS_RADIUS # Vsftpd logs support LOGS_VSFTPD_OPTION= VSFTPD LOGS_VSFTPD_PROFILE= vsftpd LOGS_VSFTPD_DESC= Vsftpd logs LOGS_VSFTPD_DEFINE= server local agent pushed LOGS_VSFTPD_DEFAULT= pushed LOGS_OPTIONS+= LOGS_VSFTPD Index: head/security/ossec-hids-local-config/opt-syscheck.mk =================================================================== --- head/security/ossec-hids-local-config/opt-syscheck.mk (revision 485976) +++ head/security/ossec-hids-local-config/opt-syscheck.mk (revision 485977) @@ -1,42 +1,50 @@ SYSCHECK_MANAGED_CONF= 130.syscheck.conf SYSCHECK_LOCAL_CONF= 530.syscheck.local.conf SYSCHECK_DESC= File Integrity Checking (syscheck) -# Default direcotries -SYSCHECK_BASIC_OPTION= BASIC_SC -SYSCHECK_BASIC_PROFILE= basic -SYSCHECK_BASIC_DESC= "bin", "sbin" and "etc" -SYSCHECK_BASIC_DEFINE= server local agent pushed -SYSCHECK_BASIC_DEFAULT= server local pushed -SYSCHECK_OPTIONS+= SYSCHECK_BASIC - -# OSSEC directories -SYSCHECK_OSSEC_OPTION= OSSEC_SC -SYSCHECK_OSSEC_PROFILE= ossec -SYSCHECK_OSSEC_DESC= OSSEC directories -SYSCHECK_OSSEC_DEFINE= server local agent pushed -SYSCHECK_OSSEC_DEFAULT= server local pushed -SYSCHECK_OPTIONS+= SYSCHECK_OSSEC - # Alert new files SYSCHECK_NEWFILES_OPTION= NEWFILES_SC SYSCHECK_NEWFILES_DESC= Alert on new files created SYSCHECK_NEWFILES_DEFINE= server local SYSCHECK_NEWFILES_DEFAULT= server local SYSCHECK_OPTIONS+= SYSCHECK_NEWFILES # Disable auto_ignore SYSCHECK_NOAUTO_OPTION= NOAUTO_SC SYSCHECK_NOAUTO_DESC= Disable auto_ignore feature SYSCHECK_NOAUTO_DEFINE= server local SYSCHECK_NOAUTO_DEFAULT= server local SYSCHECK_OPTIONS+= SYSCHECK_NOAUTO # Ignore /etc/hosts.allow SYSCHECK_HOSTDENY_DEPENDS= AR_HOSTDENY SYSCHECK_HOSTDENY_OPTION= HOSTDENY_SC SYSCHECK_HOSTDENY_DESC= Ignore access control files SYSCHECK_HOSTDENY_DEFINE= server local agent pushed SYSCHECK_HOSTDENY_DEFAULT= server local pushed SYSCHECK_OPTIONS+= SYSCHECK_HOSTDENY + +# Default direcotries +SYSCHECK_BASIC_OPTION= BASIC_SC +SYSCHECK_BASIC_PROFILE= basic +SYSCHECK_BASIC_DESC= "bin", "sbin" and "etc" directories +SYSCHECK_BASIC_DEFINE= server local agent pushed +SYSCHECK_BASIC_DEFAULT= server local pushed +SYSCHECK_OPTIONS+= SYSCHECK_BASIC + +# OSSEC directories +SYSCHECK_OSSEC_OPTION= OSSEC_SC +SYSCHECK_OSSEC_PROFILE= ossec +SYSCHECK_OSSEC_DESC= OSSEC directories +SYSCHECK_OSSEC_DEFINE= server local agent pushed +SYSCHECK_OSSEC_DEFAULT= server local pushed +SYSCHECK_OPTIONS+= SYSCHECK_OSSEC + +# PostgreSQL directory +SYSCHECK_PGSQL_OPTION= PGSQL_SC +SYSCHECK_PGSQL_PROFILE= postgresql +SYSCHECK_PGSQL_DESC= PostgreSQL configuration files +SYSCHECK_PGSQL_DEFINE= server local agent pushed +SYSCHECK_PGSQL_DEFAULT= pushed +SYSCHECK_OPTIONS+= SYSCHECK_PGSQL