Fix build as a user.

1 files changed, 213 insertions, 4 deletions

diff --git a/security/ossec-hids-local/files/patch-src_Makefile b/security/ossec-hids-local/files/patch-src_Makefile
index 18a92905c101..3297c972c40b 100644
--- a/security/ossec-hids-local/files/patch-src_Makefile
+++ b/security/ossec-hids-local/files/patch-src_Makefile
@@ -1,10 +1,219 @@
 --- src/Makefile.orig	2018-10-11 22:25:16 UTC
 +++ src/Makefile
-@@ -406,7 +406,6 @@ endif
- 	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/diff
+@@ -366,10 +366,10 @@ endif
+ install: install-${TARGET}
  
- 	install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/etc
+ 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
+ 
+-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/rids
++	install -d ${PREFIX}/queue/rids
+ 
+ install-local: install-server-generic
+ 
+@@ -378,128 +378,126 @@ install-hybrid: install-server-generic
+ 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
++	install -d ${PREFIX}
++	install -d ${PREFIX}/logs
++	install /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
+ 
+ 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/
+ 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
+ 
+-	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
+ 
+-	install -d -m 1550 -o root -g ${OSSEC_GROUP} ${PREFIX}/tmp
++	install -d -m 1550 ${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/
+ 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/
+ 	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/
+ 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
+ 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
+ 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
+ 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
+ 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/
+ 
+-	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/
+ 
+-	install -d -m 0700 -o root -g ${OSSEC_GROUP} ${PREFIX}/.ssh
++	install -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/
+ 
+-	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
+ 
+ 	./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
+ 
+-	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/
+ 
+-	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
+ 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
+ 	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
+ endif
+ 
+-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/fts
++	install -d ${PREFIX}/queue/fts
+ 
+-	install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/queue/rootcheck
++	install -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
+ 
+-	install -d -m 0750 -o ${OSSEC_USER_REM} -g ${OSSEC_GROUP} ${PREFIX}/queue/rids
++	install -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/
  
- 	install -d -m 1550 -o root -g ${OSSEC_GROUP} ${PREFIX}/tmp
+ 	rm -f ${PREFIX}/etc/shared/merged.mg