Index: branches/2015Q2/security/ossec-hids-client/Makefile =================================================================== --- branches/2015Q2/security/ossec-hids-client/Makefile (revision 389275) +++ branches/2015Q2/security/ossec-hids-client/Makefile (revision 389276) @@ -1,13 +1,13 @@ # Created by: Valerio Daelli # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= The client port of ossec-hids CLIENT_ONLY= yes MASTERDIR= ${.CURDIR}/../ossec-hids-server PLIST= pkg-plist.client .include "${MASTERDIR}/Makefile" Index: branches/2015Q2/security/ossec-hids-client/pkg-plist.client =================================================================== --- branches/2015Q2/security/ossec-hids-client/pkg-plist.client (revision 389275) +++ branches/2015Q2/security/ossec-hids-client/pkg-plist.client (revision 389276) @@ -1,68 +1,69 @@ %%PORTNAME%%/active-response/bin/disable-account.sh %%PORTNAME%%/active-response/bin/firewall-drop.sh %%PORTNAME%%/active-response/bin/host-deny.sh %%PORTNAME%%/active-response/bin/ip-customblock.sh %%PORTNAME%%/active-response/bin/ipfw.sh %%PORTNAME%%/active-response/bin/ipfw_mac.sh %%PORTNAME%%/active-response/bin/ossec-tweeter.sh %%PORTNAME%%/active-response/bin/pf.sh %%PORTNAME%%/active-response/bin/restart-ossec.sh %%PORTNAME%%/active-response/bin/route-null.sh %%PORTNAME%%/bin/agent-auth %%PORTNAME%%/bin/manage_agents %%PORTNAME%%/bin/ossec-agentd %%PORTNAME%%/bin/ossec-control %%PORTNAME%%/bin/ossec-execd %%PORTNAME%%/bin/ossec-logcollector %%PORTNAME%%/bin/ossec-lua %%PORTNAME%%/bin/ossec-luac %%PORTNAME%%/bin/ossec-syscheckd %%PORTNAME%%/bin/util.sh @group ossec %%PORTNAME%%/etc/shared/cis_debian_linux_rcl.txt %%PORTNAME%%/etc/shared/cis_rhel_linux_rcl.txt %%PORTNAME%%/etc/shared/cis_rhel5_linux_rcl.txt %%PORTNAME%%/etc/shared/rootkit_trojans.txt %%PORTNAME%%/etc/shared/rootkit_files.txt %%PORTNAME%%/etc/shared/system_audit_rcl.txt %%PORTNAME%%/etc/shared/win_malware_rcl.txt %%PORTNAME%%/etc/shared/win_audit_rcl.txt %%PORTNAME%%/etc/shared/win_applications_rcl.txt @sample %%PORTNAME%%/etc/ossec.conf.sample %%PORTNAME%%/etc/internal_options.conf @owner ossec %%PORTNAME%%/logs/ossec.log @owner %%PORTNAME%%/agentless/main.exp %%PORTNAME%%/agentless/sshlogin.exp %%PORTNAME%%/agentless/ssh_asa-fwsmconfig_diff %%PORTNAME%%/agentless/ssh_foundry_diff %%PORTNAME%%/agentless/ssh_pixconfig_diff %%PORTNAME%%/agentless/ssh_nopass.exp %%PORTNAME%%/agentless/ssh_integrity_check_linux %%PORTNAME%%/agentless/ssh_integrity_check_bsd %%PORTNAME%%/agentless/ssh_generic_diff %%PORTNAME%%/agentless/ssh.exp %%PORTNAME%%/agentless/register_host.sh %%PORTNAME%%/agentless/su.exp -@dirrmtry %%PORTNAME%%/agentless -@dirrmtry %%PORTNAME%%/active-response/bin -@dirrmtry %%PORTNAME%%/active-response -@dirrmtry %%PORTNAME%%/etc/shared -@dirrmtry %%PORTNAME%%/etc/ -@dirrmtry %%PORTNAME%%/var/run -@dirrmtry %%PORTNAME%%/var -@dirrmtry %%PORTNAME%%/queue/syscheck -@dirrmtry %%PORTNAME%%/queue/rids +@dir %%PORTNAME%%/agentless +@dir %%PORTNAME%%/active-response/bin +@dir %%PORTNAME%%/active-response +@dir %%PORTNAME%%/etc/shared +@dir %%PORTNAME%%/etc +@dir %%PORTNAME%%/tmp +@dir %%PORTNAME%%/var/run +@dir %%PORTNAME%%/var +@dir %%PORTNAME%%/queue/syscheck +@dir %%PORTNAME%%/queue/rids @owner ossec -@dirrmtry %%PORTNAME%%/queue/ossec -@dirrmtry %%PORTNAME%%/queue/diff +@dir %%PORTNAME%%/queue/ossec +@dir %%PORTNAME%%/queue/diff @owner -@dirrmtry %%PORTNAME%%/queue/alerts -@dirrmtry %%PORTNAME%%/queue -@dirrmtry %%PORTNAME%%/logs -@dirrmtry %%PORTNAME%%/bin +@dir %%PORTNAME%%/queue/alerts +@dir %%PORTNAME%%/queue +@dir %%PORTNAME%%/logs +@dir %%PORTNAME%%/bin @owner ossec -@dirrmtry %%PORTNAME%%/.ssh +@dir %%PORTNAME%%/.ssh @owner -@dirrmtry %%PORTNAME%% +@dir %%PORTNAME%% Index: branches/2015Q2/security/ossec-hids-local/Makefile =================================================================== --- branches/2015Q2/security/ossec-hids-local/Makefile (revision 389275) +++ branches/2015Q2/security/ossec-hids-local/Makefile (revision 389276) @@ -1,11 +1,11 @@ # Created by: Valerio Daelli # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= The client and server (local) port of ossec-hids LOCAL_ONLY= yes MASTERDIR= ${.CURDIR}/../ossec-hids-server .include "${MASTERDIR}/Makefile" Index: branches/2015Q2/security/ossec-hids-server/Makefile =================================================================== --- branches/2015Q2/security/ossec-hids-server/Makefile (revision 389275) +++ branches/2015Q2/security/ossec-hids-server/Makefile (revision 389276) @@ -1,125 +1,130 @@ # Created by: Valerio Daelli # $FreeBSD$ PORTNAME= ossec-hids -PORTVERSION= 2.8.1 -PORTREVISION?= 1 +PORTVERSION= 2.8.2 +PORTREVISION?= 0 CATEGORIES= security -MASTER_SITES= http://www.ossec.net/files/ \ - http://www.ossec.net/files/old/ +USE_GITHUB= yes +GH_ACCOUNT= ossec PKGNAMESUFFIX= -server MAINTAINER= brd@FreeBSD.org COMMENT?= Security tool to monitor and check logs and intrusions USE_RC_SUBR= ossec-hids CFLAGS+= -ferror-limit=0 USES= readline USE_OPENSSL= yes .if defined(MAINTAINER_MODE) UID_FILES+= ../../UIDs GID_FILES+= ../../GIDs .endif USERS= ossec ossecm ossecr GROUPS= ossec .if !defined(CLIENT_ONLY) OPTIONS_DEFINE= MYSQL PGSQL .endif OPTIONS_DEFINE+= DOCS SUB_LIST= PORTNAME=${PORTNAME} SUB_FILES= pkg-message PLIST_SUB= PORTNAME=${PORTNAME} PORTDOCS= BUGS CONFIG CONTRIBUTORS INSTALL LICENSE .include .if ${OSVERSION} < 800067 # Add string function that didn't exist until 8.x EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src__os_csyslogd__csyslogd.c .endif .if !defined(CLIENT_ONLY) .if ${PORT_OPTIONS:MMYSQL} WITH_DB= yes USE_MYSQL= client .endif .if ${PORT_OPTIONS:MPGSQL} WITH_DB= yes USES+= pgsql .endif .endif +STRIP_FILES= ossec-luac agent_control ossec-lua ossec-dbd ossec-regex ossec-monitord ossec-makelists verify-agent-conf ossec-analysisd ossec-agentlessd syscheck_control ossec-execd manage_agents ossec-csyslogd ossec-syscheckd ossec-logtest ossec-authd ossec-logcollector list_agents ossec-maild clear_stats ossec-remoted ossec-reportd rootcheck_control syscheck_update .if defined(CLIENT_ONLY) SUB_LIST+= PRECMD=: PKGNAMESUFFIX= -client CONFLICTS= ossec-hids-server-[0-9]* ossec-hids-local-[0-9]* +STRIP_FILES= agent-auth manage_agents ossec-agentd ossec-execd ossec-logcollector ossec-lua ossec-luac ossec-syscheckd .elif defined(LOCAL_ONLY) SUB_LIST+= PRECMD=ossechids_start_precmd PKGNAMESUFFIX= -local CONFLICTS= ossec-hids-client-[0-9]* ossec-hids-server-[0-9]* .else SUB_LIST+= PRECMD=ossechids_start_precmd CONFLICTS= ossec-hids-client-[0-9]* ossec-hids-local-[0-9]* .endif post-patch: @${REINPLACE_CMD} 's|PREFIX|${PREFIX}/${PORTNAME}|' ${WRKSRC}/src/headers/defs.h @${ECHO} "DIR=\"${STAGEDIR}${PREFIX}/${PORTNAME}\"" > ${WRKSRC}/src/LOCATION @${REINPLACE_CMD} -e 's|-DLUA_USE_LINUX|& ${CPPFLAGS}|' \ -e 's|-lreadline|& ${LDFLAGS}|' \ ${WRKSRC}/src/external/lua-5.2.3/src/Makefile do-build: .if defined(WITH_DB) .if defined(CLIENT_ONLY) @cd ${WRKSRC}/src;${MAKE} setagent;${MAKE} all;${MAKE} build .elif defined(LOCAL_ONLY) @cd ${WRKSRC}/src;${MAKE} setlocal;${MAKE} all;${MAKE} build .else @cd ${WRKSRC}/src;${MAKE} setdb;${MAKE} all;${MAKE} build .endif .else .if defined(CLIENT_ONLY) @cd ${WRKSRC}/src;${MAKE} setagent;${MAKE} all;${MAKE} build; \ ${MAKE} unsetdb .elif defined(LOCAL_ONLY) @cd ${WRKSRC}/src;${MAKE} setlocal;${MAKE} all;${MAKE} build; \ ${MAKE} unsetdb .else @cd ${WRKSRC}/src;${MAKE} all;${MAKE} build;${MAKE} unsetdb .endif .endif do-install: .if defined(CLIENT_ONLY) @cd ${WRKSRC}/src; ${MAKE} agent .elif defined(LOCAL_ONLY) @cd ${WRKSRC}/src; ${MAKE} local .else @cd ${WRKSRC}/src; ${MAKE} server .endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/etc +.for file in ${STRIP_FILES} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/ossec-hids/bin/${file} +.endfor .if defined(CLIENT_ONLY) @${CP} ${WRKSRC}/etc/ossec-agent.conf ${STAGEDIR}${PREFIX}/${PORTNAME}/etc/ossec.conf.sample .elif defined(LOCAL_ONLY) ${CP} ${WRKSRC}/etc/ossec-local.conf ${STAGEDIR}${PREFIX}/${PORTNAME}/etc/ossec.conf.sample .else ${CP} ${WRKSRC}/etc/ossec-server.conf ${STAGEDIR}${PREFIX}/${PORTNAME}/etc/ossec.conf.sample .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} .include Index: branches/2015Q2/security/ossec-hids-server/distinfo =================================================================== --- branches/2015Q2/security/ossec-hids-server/distinfo (revision 389275) +++ branches/2015Q2/security/ossec-hids-server/distinfo (revision 389276) @@ -1,2 +1,2 @@ -SHA256 (ossec-hids-2.8.1.tar.gz) = 03c073761aa484fe21a9fcc0ea318ba132ff2466c64360408046a4b8e527b529 -SIZE (ossec-hids-2.8.1.tar.gz) = 1634812 +SHA256 (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 61e0892175a79fe119c8bab886cd41fcc3be9b84526600b06c18fa178a59cb34 +SIZE (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 1635142 Index: branches/2015Q2/security/ossec-hids-server/pkg-plist =================================================================== --- branches/2015Q2/security/ossec-hids-server/pkg-plist (revision 389275) +++ branches/2015Q2/security/ossec-hids-server/pkg-plist (revision 389276) @@ -1,170 +1,170 @@ %%PORTNAME%%/active-response/bin/disable-account.sh %%PORTNAME%%/active-response/bin/firewall-drop.sh %%PORTNAME%%/active-response/bin/host-deny.sh %%PORTNAME%%/active-response/bin/ip-customblock.sh %%PORTNAME%%/active-response/bin/ipfw_mac.sh %%PORTNAME%%/active-response/bin/ipfw.sh %%PORTNAME%%/active-response/bin/ossec-tweeter.sh %%PORTNAME%%/active-response/bin/pf.sh %%PORTNAME%%/active-response/bin/restart-ossec.sh %%PORTNAME%%/active-response/bin/route-null.sh %%PORTNAME%%/bin/agent_control %%PORTNAME%%/bin/clear_stats %%PORTNAME%%/bin/list_agents %%PORTNAME%%/bin/manage_agents %%PORTNAME%%/bin/ossec-agentlessd %%PORTNAME%%/bin/ossec-analysisd %%PORTNAME%%/bin/ossec-authd %%PORTNAME%%/bin/ossec-control %%PORTNAME%%/bin/ossec-csyslogd %%PORTNAME%%/bin/ossec-dbd %%PORTNAME%%/bin/ossec-execd %%PORTNAME%%/bin/ossec-logcollector %%PORTNAME%%/bin/ossec-logtest %%PORTNAME%%/bin/ossec-lua %%PORTNAME%%/bin/ossec-luac %%PORTNAME%%/bin/ossec-maild %%PORTNAME%%/bin/ossec-makelists %%PORTNAME%%/bin/ossec-monitord %%PORTNAME%%/bin/ossec-regex %%PORTNAME%%/bin/ossec-remoted %%PORTNAME%%/bin/ossec-reportd %%PORTNAME%%/bin/ossec-syscheckd %%PORTNAME%%/bin/rootcheck_control %%PORTNAME%%/bin/syscheck_control %%PORTNAME%%/bin/syscheck_update %%PORTNAME%%/bin/util.sh %%PORTNAME%%/bin/verify-agent-conf @group ossec %%PORTNAME%%/etc/decoder.xml %%PORTNAME%%/etc/internal_options.conf @sample %%PORTNAME%%/etc/ossec.conf.sample %%PORTNAME%%/etc/shared/rootkit_files.txt %%PORTNAME%%/etc/shared/rootkit_trojans.txt %%PORTNAME%%/etc/shared/system_audit_rcl.txt %%PORTNAME%%/etc/shared/win_applications_rcl.txt %%PORTNAME%%/etc/shared/win_audit_rcl.txt %%PORTNAME%%/etc/shared/win_malware_rcl.txt %%PORTNAME%%/etc/shared/cis_debian_linux_rcl.txt %%PORTNAME%%/etc/shared/cis_rhel_linux_rcl.txt %%PORTNAME%%/etc/shared/cis_rhel5_linux_rcl.txt @owner ossec @mode 660 %%PORTNAME%%/logs/active-responses.log %%PORTNAME%%/logs/ossec.log @owner @group @mode %%PORTNAME%%/rules/apache_rules.xml %%PORTNAME%%/rules/arpwatch_rules.xml %%PORTNAME%%/rules/asterisk_rules.xml %%PORTNAME%%/rules/attack_rules.xml %%PORTNAME%%/rules/cimserver_rules.xml %%PORTNAME%%/rules/cisco-ios_rules.xml %%PORTNAME%%/rules/clam_av_rules.xml %%PORTNAME%%/rules/courier_rules.xml %%PORTNAME%%/rules/dovecot_rules.xml %%PORTNAME%%/rules/dropbear_rules.xml %%PORTNAME%%/rules/firewall_rules.xml %%PORTNAME%%/rules/ftpd_rules.xml %%PORTNAME%%/rules/hordeimp_rules.xml %%PORTNAME%%/rules/ids_rules.xml %%PORTNAME%%/rules/imapd_rules.xml %%PORTNAME%%/rules/local_rules.xml %%PORTNAME%%/rules/mailscanner_rules.xml %%PORTNAME%%/rules/mcafee_av_rules.xml %%PORTNAME%%/rules/ms-exchange_rules.xml %%PORTNAME%%/rules/ms-se_rules.xml %%PORTNAME%%/rules/ms_dhcp_rules.xml %%PORTNAME%%/rules/ms_ftpd_rules.xml %%PORTNAME%%/rules/msauth_rules.xml %%PORTNAME%%/rules/mysql_rules.xml %%PORTNAME%%/rules/named_rules.xml %%PORTNAME%%/rules/netscreenfw_rules.xml %%PORTNAME%%/rules/nginx_rules.xml %%PORTNAME%%/rules/openbsd_rules.xml %%PORTNAME%%/rules/ossec_rules.xml %%PORTNAME%%/rules/pam_rules.xml %%PORTNAME%%/rules/php_rules.xml %%PORTNAME%%/rules/pix_rules.xml %%PORTNAME%%/rules/policy_rules.xml %%PORTNAME%%/rules/postfix_rules.xml %%PORTNAME%%/rules/postgresql_rules.xml %%PORTNAME%%/rules/proftpd_rules.xml %%PORTNAME%%/rules/pure-ftpd_rules.xml %%PORTNAME%%/rules/racoon_rules.xml %%PORTNAME%%/rules/roundcube_rules.xml %%PORTNAME%%/rules/rules_config.xml %%PORTNAME%%/rules/sendmail_rules.xml %%PORTNAME%%/rules/smbd_rules.xml %%PORTNAME%%/rules/solaris_bsm_rules.xml %%PORTNAME%%/rules/sonicwall_rules.xml %%PORTNAME%%/rules/spamd_rules.xml %%PORTNAME%%/rules/squid_rules.xml %%PORTNAME%%/rules/sshd_rules.xml %%PORTNAME%%/rules/symantec-av_rules.xml %%PORTNAME%%/rules/symantec-ws_rules.xml %%PORTNAME%%/rules/syslog_rules.xml %%PORTNAME%%/rules/telnetd_rules.xml %%PORTNAME%%/rules/trend-osce_rules.xml %%PORTNAME%%/rules/vmpop3d_rules.xml %%PORTNAME%%/rules/vmware_rules.xml %%PORTNAME%%/rules/vpn_concentrator_rules.xml %%PORTNAME%%/rules/vpopmail_rules.xml %%PORTNAME%%/rules/vsftpd_rules.xml %%PORTNAME%%/rules/web_appsec_rules.xml %%PORTNAME%%/rules/web_rules.xml %%PORTNAME%%/rules/wordpress_rules.xml %%PORTNAME%%/rules/zeus_rules.xml %%PORTNAME%%/agentless/main.exp %%PORTNAME%%/agentless/register_host.sh %%PORTNAME%%/agentless/ssh.exp %%PORTNAME%%/agentless/ssh_asa-fwsmconfig_diff %%PORTNAME%%/agentless/ssh_foundry_diff %%PORTNAME%%/agentless/ssh_generic_diff %%PORTNAME%%/agentless/ssh_integrity_check_bsd %%PORTNAME%%/agentless/ssh_integrity_check_linux %%PORTNAME%%/agentless/ssh_nopass.exp %%PORTNAME%%/agentless/ssh_pixconfig_diff %%PORTNAME%%/agentless/sshlogin.exp %%PORTNAME%%/agentless/su.exp @owner root @group ossec @mode 550 -@dirrmtry %%PORTNAME%%/.ssh -@dirrmtry %%PORTNAME%%/active-response/bin -@dirrmtry %%PORTNAME%%/active-response -@dirrmtry %%PORTNAME%%/agentless -@dirrmtry %%PORTNAME%%/bin -@dirrmtry %%PORTNAME%%/etc/shared -@dirrmtry %%PORTNAME%%/etc -@dirrmtry %%PORTNAME%%/queue/rootcheck -@dirrmtry %%PORTNAME%%/rules -@dirrmtry %%PORTNAME%%/tmp +@dir %%PORTNAME%%/.ssh +@dir %%PORTNAME%%/active-response/bin +@dir %%PORTNAME%%/active-response +@dir %%PORTNAME%%/agentless +@dir %%PORTNAME%%/bin +@dir %%PORTNAME%%/etc/shared +@dir %%PORTNAME%%/etc +@dir %%PORTNAME%%/queue/rootcheck +@dir %%PORTNAME%%/rules +@dir %%PORTNAME%%/tmp @mode 770 -@dirrmtry %%PORTNAME%%/var/run +@dir %%PORTNAME%%/var/run @mode 550 -@dirrmtry %%PORTNAME%%/var +@dir %%PORTNAME%%/var @owner ossec @mode 770 -@dirrmtry %%PORTNAME%%/queue/alerts -@dirrmtry %%PORTNAME%%/queue/ossec +@dir %%PORTNAME%%/queue/alerts +@dir %%PORTNAME%%/queue/ossec @mode 750 -@dirrmtry %%PORTNAME%%/queue/fts -@dirrmtry %%PORTNAME%%/queue/syscheck -@dirrmtry %%PORTNAME%%/queue/diff -@dirrmtry %%PORTNAME%%/queue/agentless -@dirrmtry %%PORTNAME%%/stats -@dirrmtry %%PORTNAME%%/logs/alerts -@dirrmtry %%PORTNAME%%/logs/archives -@dirrmtry %%PORTNAME%%/logs/firewall -@dirrmtry %%PORTNAME%%/logs +@dir %%PORTNAME%%/queue/fts +@dir %%PORTNAME%%/queue/syscheck +@dir %%PORTNAME%%/queue/diff +@dir %%PORTNAME%%/queue/agentless +@dir %%PORTNAME%%/stats +@dir %%PORTNAME%%/logs/alerts +@dir %%PORTNAME%%/logs/archives +@dir %%PORTNAME%%/logs/firewall +@dir %%PORTNAME%%/logs @owner ossecr -@dirrmtry %%PORTNAME%%/queue/agent-info -@dirrmtry %%PORTNAME%%/queue/rids +@dir %%PORTNAME%%/queue/agent-info +@dir %%PORTNAME%%/queue/rids @owner ossec @mode 550 -@dirrmtry %%PORTNAME%%/queue +@dir %%PORTNAME%%/queue @owner root @mode 550 -@dirrmtry %%PORTNAME%% +@dir %%PORTNAME%% Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 389275) +++ branches/2015Q2 (revision 389276) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r389271