diff options
Diffstat (limited to 'security/ossec-hids-local-config')
6 files changed, 16 insertions, 14 deletions
diff --git a/security/ossec-hids-local-config/Makefile b/security/ossec-hids-local-config/Makefile index 699809d..3f3db1a 100644 --- a/security/ossec-hids-local-config/Makefile +++ b/security/ossec-hids-local-config/Makefile @@ -1,5 +1,4 @@ -# $FreeBSD: head/security/ossec-hids-local-config/Makefile 518343 2019-11-24 17:58:28Z fernape $ - +PORTREVISION?= 2 PKGNAMESUFFIX?= -${OSSEC_TYPE}-config COMMENT?= Configuration manager for ossec-hids-${OSSEC_TYPE} OSSEC_TYPE?= local diff --git a/security/ossec-hids-local-config/files/agent-conf.in b/security/ossec-hids-local-config/files/agent-conf.in index 673d0f6..a1da79d 100644 --- a/security/ossec-hids-local-config/files/agent-conf.in +++ b/security/ossec-hids-local-config/files/agent-conf.in @@ -8,7 +8,7 @@ agent_conf_files="${agent_conf_dir}/*.conf" select_elements() { local element="$1" - sed -n "/<${element}.*>/,/<\/${element}>/p" + sed -En "/<${element}.*>/,/<\/${element}>/p" } remove_comments() { @@ -17,7 +17,7 @@ remove_comments() { } remove_empty_lines() { - sed '/^\s*$/d' + sed -E '/^[[:space:]]*$/d' } agent_conf() { diff --git a/security/ossec-hids-local-config/files/ossec-conf.in b/security/ossec-hids-local-config/files/ossec-conf.in index d28d238..1afdb54 100644 --- a/security/ossec-hids-local-config/files/ossec-conf.in +++ b/security/ossec-hids-local-config/files/ossec-conf.in @@ -8,12 +8,12 @@ ossec_conf_files="${ossec_conf_dir}/*.conf" select_elements_content() { local element="$1" - sed -n "/<${element}>/,/<\/${element}>/{ /<${element}>/d; /<\/${element}>/d; p; }" + sed -En "/<${element}>/,/<\/${element}>/{ /<${element}>/d; /<\/${element}>/d; p; }" } remove_elements() { local element="$1" - sed -e "/<${element}>/,/<\/${element}>/d" + sed -E "/<${element}>/,/<\/${element}>/d" } remove_comments() { @@ -22,7 +22,7 @@ remove_comments() { } remove_empty_lines() { - sed '/^\s*$/d' + sed -E '/^[[:space:]]*$/d' } ossec_conf() { diff --git a/security/ossec-hids-local-config/scripts/plist.sh b/security/ossec-hids-local-config/scripts/plist.sh index b1915c4..07fbcd5 100644 --- a/security/ossec-hids-local-config/scripts/plist.sh +++ b/security/ossec-hids-local-config/scripts/plist.sh @@ -61,10 +61,10 @@ while read line; do path="" case ${line} in "@dir %%OSSEC_HOME%%"*) - path=`echo "${line}" | sed -e "s|@dir %%OSSEC_HOME%%||g"` + path=`echo "${line}" | sed -E 's|@dir %%OSSEC_HOME%%||g'` ;; "%%OSSEC_HOME%%"*) - path=`echo "${line}" | sed -e "s|%%OSSEC_HOME%%||g"` + path=`echo "${line}" | sed -E 's|%%OSSEC_HOME%%||g'` ;; "%%"*) unchanged_lines="${unchanged_lines}${NL}${line}" diff --git a/security/ossec-hids-local-config/scripts/template-to-agent.sh b/security/ossec-hids-local-config/scripts/template-to-agent.sh index 3034b1f..7c11b82 100644 --- a/security/ossec-hids-local-config/scripts/template-to-agent.sh +++ b/security/ossec-hids-local-config/scripts/template-to-agent.sh @@ -19,7 +19,8 @@ ossec_syscheck_bin_dirs="${ossec_prefix}/bin,${ossec_prefix}/active-response" ossec_syscheck_etc_dirs="${ossec_prefix}/etc" replace() { - sed -e 's|<template_config \(.*\)>|<agent_config \1>|' \ + sed -E \ + -e 's|<template_config (.*)>|<agent_config \1>|' \ -e 's|</template_config>|</agent_config>|' \ -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \ -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \ @@ -27,7 +28,7 @@ replace() { } extract() { - sed -n '/^<agent_config .*>$/,/^<\/agent_config>$/p' + sed -En '/^<agent_config .*>$/,/^<\/agent_config>$/p' } replace | extract diff --git a/security/ossec-hids-local-config/scripts/template-to-ossec.sh b/security/ossec-hids-local-config/scripts/template-to-ossec.sh index 3933446..5ad3228 100644 --- a/security/ossec-hids-local-config/scripts/template-to-ossec.sh +++ b/security/ossec-hids-local-config/scripts/template-to-ossec.sh @@ -24,13 +24,15 @@ fi replace() { if grep -q "<template_config>" "${ossec_file}"; then - sed -e 's|<template_config>|<ossec_config>|' \ + sed -E \ + -e 's|<template_config>|<ossec_config>|' \ -e 's|</template_config>|</ossec_config>|' \ -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \ -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \ "${ossec_file}" else - sed -e 's|<template_config .*os="FreeBSD".*>|<ossec_config>|' \ + sed -E \ + -e 's|<template_config .*os="FreeBSD".*>|<ossec_config>|' \ -e 's|</template_config>|</ossec_config>|' \ -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \ -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \ @@ -39,7 +41,7 @@ replace() { } extract() { - sed -n '/^<ossec_config.*>$/,/^<\/ossec_config>$/p' + sed -En '/^<ossec_config.*>$/,/^<\/ossec_config>$/p' } replace | extract |