From 44176d5824c52443a24fb121819b9b30055a4018 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 13:13:02 +0000
Subject: [PATCH 1/3] Update listing with threatintel-2024-11-22_13-08-21

---
 docs/vulnerability_feeds/listing.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/vulnerability_feeds/listing.json b/docs/vulnerability_feeds/listing.json
index 6a0a876f9f..1c3f6c6389 100644
--- a/docs/vulnerability_feeds/listing.json
+++ b/docs/vulnerability_feeds/listing.json
@@ -27,12 +27,6 @@
       }
     ],
     "5": [
-      {
-        "built": "2024-11-20T13:12:15.751735771Z",
-        "version": 5,
-        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-20_13-08-27/threatintel-vuln-v5-2024-11-20_13-08-27.tar.gz",
-        "checksum": "88eb06bdaaa0cc58234b76c9db91d39be4c0816d1c83ecdff8cccfa5afcdf24a"
-      },
       {
         "built": "2024-11-21T01:33:56.389777835Z",
         "version": 5,
@@ -50,6 +44,12 @@
         "version": 5,
         "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-22_01-30-08/threatintel-vuln-v5-2024-11-22_01-30-08.tar.gz",
         "checksum": "163a0ec98a4f4594f4b1964880dd8d4ef502ba1c8d3b9627966e834afa10d60b"
+      },
+      {
+        "built": "2024-11-22T13:12:11.203567672Z",
+        "version": 5,
+        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-22_13-08-21/threatintel-vuln-v5-2024-11-22_13-08-21.tar.gz",
+        "checksum": "cea7fa40c959b8a5a8f6344de2e6e3b1278849955dd8f1beb7659700cd5c9af6"
       }
     ]
   }

From 466a6769f4864d5a8a0cc5bd1ed5dab66cd0a555 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 23 Nov 2024 01:34:25 +0000
Subject: [PATCH 2/3] Update listing with threatintel-2024-11-23_01-29-52

---
 docs/vulnerability_feeds/listing.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/vulnerability_feeds/listing.json b/docs/vulnerability_feeds/listing.json
index 1c3f6c6389..1cddb8ae28 100644
--- a/docs/vulnerability_feeds/listing.json
+++ b/docs/vulnerability_feeds/listing.json
@@ -27,12 +27,6 @@
       }
     ],
     "5": [
-      {
-        "built": "2024-11-21T01:33:56.389777835Z",
-        "version": 5,
-        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-21_01-30-07/threatintel-vuln-v5-2024-11-21_01-30-07.tar.gz",
-        "checksum": "60063279771817f4584a08149ba7a92ef6a4f314e6b0d2857aa88d5603871102"
-      },
       {
         "built": "2024-11-21T13:12:37.632497219Z",
         "version": 5,
@@ -50,6 +44,12 @@
         "version": 5,
         "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-22_13-08-21/threatintel-vuln-v5-2024-11-22_13-08-21.tar.gz",
         "checksum": "cea7fa40c959b8a5a8f6344de2e6e3b1278849955dd8f1beb7659700cd5c9af6"
+      },
+      {
+        "built": "2024-11-23T01:33:39.704440701Z",
+        "version": 5,
+        "url": "https://threat-intel.deepfence.io/vulnerability-db/releases/download/threatintel-vuln-v5-2024-11-23_01-29-52/threatintel-vuln-v5-2024-11-23_01-29-52.tar.gz",
+        "checksum": "23d293ea39b89e02c269c24695397d661ba73cfe126d4361692f6f7d2011a1fb"
       }
     ]
   }

From 2ae51488f40c8a46d828274f4bdf52a6ffd73ea3 Mon Sep 17 00:00:00 2001
From: Ramanan Ravikumar <38394463+ramanan-ravi@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:23:35 +0530
Subject: [PATCH 3/3] Append logrotate to existing crontab in agents (#2377)

Also handle duplicate entries
---
 deepfence_agent/start_agent.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/deepfence_agent/start_agent.sh b/deepfence_agent/start_agent.sh
index 55aa6638a2..0504a1307e 100755
--- a/deepfence_agent/start_agent.sh
+++ b/deepfence_agent/start_agent.sh
@@ -47,7 +47,12 @@ configure_cron() {
   #doesnt work smoothly inside docker!
   service cron start
   chmod 600 /etc/logrotate.d/fenced_logrotate.conf
-  (echo "*/5 * * * * /usr/sbin/logrotate /etc/logrotate.d/fenced_logrotate.conf") | crontab -
+  MARK="/etc/logrotate.d/fenced_logrotate.conf"
+  crontab_output=$(crontab -l)
+  if [ $(echo "$crontab_output" | grep -ic "$MARK") -eq 0 ]
+  then
+      { crontab -l; echo "*/5 * * * * /usr/sbin/logrotate /etc/logrotate.d/fenced_logrotate.conf"; } | crontab -
+  fi
 }
 
 launch_deepfenced() {