From nobody Thu Oct 27 08:25:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mydyj1WCvz4gcW7; Thu, 27 Oct 2022 08:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mydyj0yVdz3nv2; Thu, 27 Oct 2022 08:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666859101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B9gn8Aosl6ePFXyW0O2emLQvgYsKppmb2hjmyBUTnPA=; b=tYOibIq36Kmdwq8RnVxJURJsNQK54tztUHS5nmYUsGu4uXjYZmHUIHuWX1R5Ayp20WAShs xIlO+5rhk0yeDQ6WDodHUOGegnls/f7UWGVKDwrYPBsbYFkCsVmwnTRgk5Zov+aaB2lN6I lSqtR84bVAHs5dZu3oas3mSLKKZnmFzJ1a3E4Tq7QXWsLorKComsErPbA+Mjdtk50+Xl98 maw56I+mTnkeGokReQQfGaiImu1kgH7jpjPOAwjwy9kRkNNtcnrYCTlVzzfHtTUg1761nf PzwwOs52LiTkgiIZIg3Q4x2zu2nTtcGM4M4ZXsphi7jJrwEHdtfsrH+XSijjmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mydyh71fJzqlp; Thu, 27 Oct 2022 08:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29R8P0Ta011239; Thu, 27 Oct 2022 08:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29R8P0kc011238; Thu, 27 Oct 2022 08:25:00 GMT (envelope-from git) Date: Thu, 27 Oct 2022 08:25:00 GMT Message-Id: <202210270825.29R8P0kc011238@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 68d6aa009c87 - main - security/ossec-hids*: local_rules.xml replaced with sample file List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68d6aa009c87714f94855e5dc9a5d60992209b84 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666859101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B9gn8Aosl6ePFXyW0O2emLQvgYsKppmb2hjmyBUTnPA=; b=L8Uimfb/6yume3UuPoF/FVNku8SVo9FzbSC27C5VfdQh9QmhO/9crV2biYgdgULCh1kxKv /JWcy8d6IeS15fiixtUNF4MaKi+aw+1MxXqZocxZYuN3YEAaJxAZq8/A9cl5B++QNx4O+b QFNX4h084uGRTFKSGYkn/OO/fSy/eV8s/4IuAmYUbmTplDzggqiHxT8eCHEW+XOiwyryP9 fKmaK2okoVqeCFjFJ+LrYAU1Xikhz6S7udDLQ4crSY5X8+215HkjizqNtLDQmev/MIx6Zj JqKsDVXDOgIF2EQLvffvGIMtkB2E7w8zG/FKzDVwVtg92rJW3ovxOcvS27Pfdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666859101; a=rsa-sha256; cv=none; b=BXm6YWNqr0IzyL7QOlweK9eAJQThx9JYbbDfEbONfSaVYWk4yVxYiUb0wKZyn31reiUzD+ FOOVGS3Yq+bbaUvm1jGfgBxpLlCV9u3sHf6xr0pb01foDR1dfHpP3IAT8ynXYpwDhcz8ns LlXl4WVVb1xkVFqPXDlereBH3ViTUVh6/rEsvUxIxwoHg0Qs8exiVZVjEuN/NsWWa3BrNr HtYvAmHfrwQ2Q4VkMtXxjz5odz4TOR/ko1nUm/DaXkkHmOmXfEvycGq7GSH0y+P4wUj9UH YEZKFU/JPqsd/JALOo3++jRZECr2xQADzW/zrnKDvn5TByyNDeNAfLiZbW7y1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=68d6aa009c87714f94855e5dc9a5d60992209b84 commit 68d6aa009c87714f94855e5dc9a5d60992209b84 Author: Dominik Lisiak AuthorDate: 2022-10-27 07:56:38 +0000 Commit: Fernando Apesteguía CommitDate: 2022-10-27 08:20:32 +0000 security/ossec-hids*: local_rules.xml replaced with sample file PR: 266176 Reported by: dominik.lisiak@bemsoft.pl (maintainer) --- security/ossec-hids-agent/Makefile | 1 + security/ossec-hids-local/Makefile | 5 +++++ security/ossec-hids-local/pkg-plist-local | 2 +- security/ossec-hids-local/pkg-plist-server | 2 +- security/ossec-hids-local/scripts/plist.conf | 4 ++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/security/ossec-hids-agent/Makefile b/security/ossec-hids-agent/Makefile index 52eae5c0eb24..c0f5736fbc23 100644 --- a/security/ossec-hids-agent/Makefile +++ b/security/ossec-hids-agent/Makefile @@ -1,3 +1,4 @@ +PORTREVISION= 0 COMMENT= Security tool to monitor and check logs and intrusions - agent installation OSSEC_TYPE= agent diff --git a/security/ossec-hids-local/Makefile b/security/ossec-hids-local/Makefile index 820bed6b7b88..de07d873f3d4 100644 --- a/security/ossec-hids-local/Makefile +++ b/security/ossec-hids-local/Makefile @@ -1,3 +1,4 @@ +PORTREVISION?= 1 PKGNAMESUFFIX?= -${OSSEC_TYPE} COMMENT?= Security tool to monitor and check logs and intrusions - local (standalone) installation WWW= https://ossec.github.io @@ -139,6 +140,10 @@ SAMPLE_FILES= ${OSSEC_HOME}/etc/local_internal_options.conf \ ${OSSEC_HOME}/active-response/bin/ossec-slack.sh \ ${OSSEC_HOME}/active-response/bin/ossec-tweeter.sh +.if ${OSSEC_TYPE} != agent +SAMPLE_FILES+= ${OSSEC_HOME}/rules/local_rules.xml +.endif + .if empty(USER) USER=$$(${ID} -un) .endif diff --git a/security/ossec-hids-local/pkg-plist-local b/security/ossec-hids-local/pkg-plist-local index 630a2d4aaa57..55fa77b05b9d 100644 --- a/security/ossec-hids-local/pkg-plist-local +++ b/security/ossec-hids-local/pkg-plist-local @@ -119,7 +119,7 @@ @(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml @(,ossec,0640) %%OSSEC_HOME%%/rules/lighttpd_rules.xml @(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml -@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml +@sample(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml.sample @(,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 diff --git a/security/ossec-hids-local/pkg-plist-server b/security/ossec-hids-local/pkg-plist-server index 630a2d4aaa57..55fa77b05b9d 100644 --- a/security/ossec-hids-local/pkg-plist-server +++ b/security/ossec-hids-local/pkg-plist-server @@ -119,7 +119,7 @@ @(,ossec,0640) %%OSSEC_HOME%%/rules/last_rootlogin_rules.xml @(,ossec,0640) %%OSSEC_HOME%%/rules/lighttpd_rules.xml @(,ossec,0640) %%OSSEC_HOME%%/rules/linux_usbdetect_rules.xml -@(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml +@sample(,ossec,0640) %%OSSEC_HOME%%/rules/local_rules.xml.sample @(,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 diff --git a/security/ossec-hids-local/scripts/plist.conf b/security/ossec-hids-local/scripts/plist.conf index 7095978eedcd..756b49f80c3d 100644 --- a/security/ossec-hids-local/scripts/plist.conf +++ b/security/ossec-hids-local/scripts/plist.conf @@ -33,3 +33,7 @@ sample_paths=" /active-response/bin/ossec-pagerduty.sh.sample /active-response/bin/ossec-slack.sh.sample /active-response/bin/ossec-tweeter.sh.sample" +if [ "${OSSEC_TYPE}" != "agent" ]; then + sample_paths="${sample_paths} +/rules/local_rules.xml.sample" +fi