From nobody Fri Aug 12 07:13:12 2022 X-Original-To: dev-commits-ports-main@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 4M3vyx0n0Dz4Yn1w; Fri, 12 Aug 2022 07:13:13 +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 4M3vyx0BjLz3m8V; Fri, 12 Aug 2022 07:13:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660288393; 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=cWvessHRMKBeZEfBhd4eMsk+QFF8XQvBPg5Amrx8mTw=; b=Q30/xFb9LDdfrT8SPm1qO3T5/cSQ76Ru6XRzVPzlwtNgwBtQpwq7Dm3mEqhx25eBmWpt1y mf9nZQ15Idx5oz47Q0Nmd9lZkDrcLusGPhl0CSLY8SxhBQZnlgvNe7UzjE3+/7QLWctXf7 i8tPCw8YaSPWMRXISuCJUDmT7tM2hE9AejXUYlM6F3adA3aErOvQcFZQEJXQaGzKo/Ah28 NrZIsALY30fEAP+oBD13gmPnnPyyaGCkCNGjFZYDnT+gi0BLK/8bAc8CPGkhMd4mVNSAvY uU64SmtAGRgJJQ6QedFX4oCVczf9Alg3XaxSh8qEXWHRtr6cMovG/XDnmxPpsg== 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 4M3vyw6PVCzMpB; Fri, 12 Aug 2022 07:13:12 +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 27C7DCKI062531; Fri, 12 Aug 2022 07:13:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27C7DCj5062530; Fri, 12 Aug 2022 07:13:12 GMT (envelope-from git) Date: Fri, 12 Aug 2022 07:13:12 GMT Message-Id: <202208120713.27C7DCj5062530@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: b1d0b5eecdb0 - main - security/ossec-hids* : Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1d0b5eecdb0aef92f8c37fa94ebad66dda141d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660288393; 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=cWvessHRMKBeZEfBhd4eMsk+QFF8XQvBPg5Amrx8mTw=; b=eBcLcE3W9CgDTQpv4XAixfq8TnRjdnjarUuMhkdvRBQtqCgChtBAG/LVHlHzuf41JJMRO4 VFwaJ7Vp+s1xTfvhT7ZN5c/nbG/TQgq7ruHnQWB/Gk3a3tUJPd8+hokQZxgo8YR9thPvsi OI3rGM8Jma8MddShUovDm/vl6GbcdCx4MIO28W+i4chbjuNSulWRRK8mAob5HZDD++mPGD A3y8X/d8N9nRmCVS6pxgcTJX+lEieCuWyHeiNFzxEpJQLmqjWvCK6zixqHIKZHCRx7JaGY KvcH/jdtCM4djwiDdqgPdQrh7T8c53tmJ7tPWkW0d9x+jYSJQJBDJ5+kqMOlzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660288393; a=rsa-sha256; cv=none; b=XtLQ1lgTJvHfrotzu98exB01buLvKiU1FeAk1/7AXrBJjkb6qiRmh+KGO6edFKkNzAb357 ZpGz8IozZJdUbTxsWJZiCbQbDZGPowAbke/P1Gn59kL0SK+aYCMxnE0eXxsx7iO36Xwvm3 apUQ8ssoYzb4kmrpcMSMLMcNxcoD4x3OcyMLwztIysEBw2ykmohFRbqM2EOvQfAzPdZXhb TlA2Vn9bq72R3YPk1kbjSrTZsZiaLTpKZ+yzDvajDrxaSvETQZKzC+GwjG6chKBGkh3/zf fc/4zICegN59bwWNyPu71YlFh7coYDNve8d6pnXKG5AJG5j8v3A0Kz2GqJICpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1d0b5eecdb0aef92f8c37fa94ebad66dda141d6 commit b1d0b5eecdb0aef92f8c37fa94ebad66dda141d6 Author: Dominik Lisiak AuthorDate: 2022-08-12 07:08:57 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-08-12 07:13:02 +0000 security/ossec-hids* : Fix build Remove unwanted patches from previous commit PR: 265688 Fixes: 2b0855d security/ossec-hids: Update to 3.7.0 --- .../ossec-hids-local/files/patch-src_addagent_main.c | 18 ------------------ .../files/patch-src_addagent_manage__agents.h | 8 -------- .../files/patch-src_client-agent_agentd.c | 19 ------------------- .../files/patch-src_client-agent_agentd.h | 11 ----------- .../files/patch-src_client-agent_config.c | 12 ------------ .../files/patch-src_os__net_os__net.c | 10 ---------- 6 files changed, 78 deletions(-) diff --git a/security/ossec-hids-local/files/patch-src_addagent_main.c b/security/ossec-hids-local/files/patch-src_addagent_main.c deleted file mode 100644 index 130872b255ad..000000000000 --- a/security/ossec-hids-local/files/patch-src_addagent_main.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/addagent/main.c.orig 2020-02-14 19:46:22 UTC -+++ src/addagent/main.c -@@ -17,6 +17,7 @@ static void print_banner(void); - static void manage_shutdown(int sig) __attribute__((noreturn)); - #endif - -+int willchroot; - - #if defined(__MINGW32__) - static int setenv(const char *name, const char *val, __attribute__((unused)) int overwrite) -@@ -104,7 +105,6 @@ int main(int argc, char **argv) - int ret; - #endif - -- extern int willchroot; - willchroot = 1; - - /* Set the name */ diff --git a/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h b/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h deleted file mode 100644 index 1e1f32d65088..000000000000 --- a/security/ossec-hids-local/files/patch-src_addagent_manage__agents.h +++ /dev/null @@ -1,8 +0,0 @@ ---- src/addagent/manage_agents.h.orig 2020-02-14 19:46:22 UTC -+++ src/addagent/manage_agents.h -@@ -147,4 +147,4 @@ extern fpos_t fp_pos; - #define GMF_UNKN_ERROR ARGV0 ": Could not run GetModuleFileName which returned (%ld).\n" - - --int willchroot; -+extern int willchroot; diff --git a/security/ossec-hids-local/files/patch-src_client-agent_agentd.c b/security/ossec-hids-local/files/patch-src_client-agent_agentd.c deleted file mode 100644 index ab6530725444..000000000000 --- a/security/ossec-hids-local/files/patch-src_client-agent_agentd.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/client-agent/agentd.c.orig 2020-02-14 19:46:22 UTC -+++ src/client-agent/agentd.c -@@ -15,6 +15,8 @@ - #include "os_dns/os_dns.h" - #endif //WIN32 - -+struct imsgbuf server_ibuf; -+ - /* Start the agent daemon */ - void AgentdStart(const char *dir, int uid, int gid, const char *user, const char *group) - { -@@ -39,7 +41,6 @@ void AgentdStart(const char *dir, int uid, int gid, co - merror("starting imsg stuff"); - /* Prepare for os_dns */ - struct imsgbuf osdns_ibuf; -- extern struct imsgbuf server_ibuf; - //struct imsgbuf osdns_ibuf; - int imsg_fds[2]; - merror("Creating socketpair()"); diff --git a/security/ossec-hids-local/files/patch-src_client-agent_agentd.h b/security/ossec-hids-local/files/patch-src_client-agent_agentd.h deleted file mode 100644 index 61846975c01a..000000000000 --- a/security/ossec-hids-local/files/patch-src_client-agent_agentd.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/client-agent/agentd.h.orig 2020-02-14 19:46:22 UTC -+++ src/client-agent/agentd.h -@@ -83,7 +83,7 @@ extern int run_foreground; - extern keystore keys; - extern agent *agt; - #ifndef WIN32 --struct imsgbuf server_ibuf; -+extern struct imsgbuf server_ibuf; - #endif //WIN32 - - #endif /* __AGENTD_H */ diff --git a/security/ossec-hids-local/files/patch-src_client-agent_config.c b/security/ossec-hids-local/files/patch-src_client-agent_config.c deleted file mode 100644 index 74765c6d70af..000000000000 --- a/security/ossec-hids-local/files/patch-src_client-agent_config.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/client-agent/config.c.orig 2020-02-14 19:46:22 UTC -+++ src/client-agent/config.c -@@ -17,8 +17,8 @@ - time_t available_server; - int run_foreground; - keystore keys; --agent *agt; - -+extern agent *agt; - - /* Read the config file (for the remote client) */ - int ClientConf(const char *cfgfile) diff --git a/security/ossec-hids-local/files/patch-src_os__net_os__net.c b/security/ossec-hids-local/files/patch-src_os__net_os__net.c deleted file mode 100644 index 0cc169681836..000000000000 --- a/security/ossec-hids-local/files/patch-src_os__net_os__net.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/os_net/os_net.c.orig 2020-02-14 19:46:22 UTC -+++ src/os_net/os_net.c -@@ -14,6 +14,7 @@ - #include - #include "shared.h" - #include "os_net.h" -+ - agent *agt; - - /* Prototypes */