From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 14 Mar 2023 16:01:07 +0000 (+0000)
Subject: Merge version 1.4.2-3+rpi1 and 1.4.6-1 to produce 1.4.6-1+rpi1
X-Git-Tag: archive/raspbian/1.4.6-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=119bfbdd798886b6902f230a31d164c3751c23eb;p=crowdsec.git

Merge version 1.4.2-3+rpi1 and 1.4.6-1 to produce 1.4.6-1+rpi1
---

119bfbdd798886b6902f230a31d164c3751c23eb
diff --cc debian/changelog
index f019438,9832dcf..afc19ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,34 +1,41 @@@
- crowdsec (1.4.2-3+rpi1) bookworm-staging; urgency=medium
++crowdsec (1.4.6-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.9-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 13:10:12 +0000]
 +  * Disable testsuite (probablly a btrfs related failure).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 27 Feb 2023 11:45:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Mar 2023 16:01:06 +0000
++
+ crowdsec (1.4.6-1) unstable; urgency=medium
+ 
+   * New upstream release (Closes: #1031322).
+   * Include a snapshot of hub files from the v1.4.6 branch, at commit
+     f23a543a80.
+   * Delete patch:
+      - 0012-work-around-buggy-testparse-test.patch (fixed upstream)
+   * Extend patch to avoid crowdsecurity/linux's being marked tainted:
+      - 0004-disable-geoip-enrich.patch
+   * Extend patch to skip more unreliable tests:
+      - 0013-skip-flakky-tests.patch
+   * Add patches:
+      - 0014-silence-yaml-patching.patch: avoid polluting cscli's output
+        with debug messages.
+      - 0015-silence-not-latest-version.patch: upstream maintains a hub
+        branch for our stable release (Closes: #1031323).
+   * Rework collections handling:
+      - With crowdsec growing over time, the initial “let's enable all
+        collections” approach doesn't seem appropriate anymore.
+      - On initial installation, only enable 3 collections (and their
+        dependencies), which should cover common needs already:
+         + crowdsecurity/linux
+         + crowdsecurity/apache2
+         + crowdsecurity/nginx
+      - On upgrade, check whether all 3 collections are (still) enabled.
+        If that's the case, enable their dependencies as well (as new
+        versions tend to gain dependencies over time).
+      - Let admins enable/disable any other collections on their own.
+   * Update README.Debian accordingly.
+ 
+  -- Cyril Brulebois <cyril@debamax.com>  Thu, 02 Mar 2023 05:07:10 +0000
  
  crowdsec (1.4.2-3) unstable; urgency=medium