Manual merge of version 1.4.6-1+rpi1 and 1.4.6-3 to produce 1.4.6-3+rpi1

diff --cc debian/changelog
index afc19eaf1aa4c1483186cfc385f10075a370fa0d,aa51d6a7583e790c6d9278589223209d570b319f..1d3173391ef6ad58a08b618c0c26395205d30731
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,56 +1,63 @@@
- crowdsec (1.4.6-1+rpi1) bookworm-staging; urgency=medium
++crowdsec (1.4.6-3+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>  Tue, 14 Mar 2023 16:01:06 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 01 Jun 2023 19:00:10 +0000
++
+ crowdsec (1.4.6-3) unstable; urgency=medium
+ 
+   * When performing an upgrade from pre-1.4.x versions, apply a workaround
+     to avoid losing CAPI decisions for several hours (Closes: #1033138):
+     delete alert(s) matching “Community blocklist”, and if at least one
+     deletion occurred, restart the daemon to force an immediate pull.
+   * Hardcode libsqlite3-0 (>= 3.35.0) in Depends to ensure Ent-generated
+     SQLite queries are understood (Closes: #1033132): otherwise, we would
+     get a dependency on libsqlite3-0 (>= 3.12.0) via shlibs, which is
+     clearly not enough.
+   * Backport upstream patch to fix building in the past/in the future (as
+     seen with reproducible builds), no longer hardcoding the expected year
+     for yearless timestamps:
+      - 0016-try-to-make-reproducible-build-work-2119.patch
+ 
+  -- Cyril Brulebois <cyril@debamax.com>  Sun, 19 Mar 2023 00:25:07 +0100
+ 
+ crowdsec (1.4.6-2) unstable; urgency=medium
+ 
+   * Prefix package version with `v` when setting BUILD_VERSION, e.g.
+     crowdsec/v1.4.6-2-linux-debian (Closes: #1031324).
+   * Stop shipping a logrotate configuration snippet, as crowdsec rotates
+     logs on its own via lumberjack.Logger, and that can be configured in
+     the main configuration file (/etc/crowdsec/config.yaml):
+      - Delete debian/crowdsec.logrotate
+      - Add debian/crowdsec.conffiles, marking /etc/logrotate.d/crowdsec
+        with the remove-on-upgrade flag.
+   * When purging the package, remove internally-rotated log files, in
+     addition to removing main log files and the logrotate-generated ones.
+   * Really enable upstream-recommended collections, not just the items
+     they require: everything would work fine without this, but those
+     collections wouldn't appear in `cscli collections list`, and they
+     wouldn't be upgraded if admins decided to switch to the online hub.
+   * Compensate for the missing collections when upgrading from 1.4.6-1
+     specifically (including binNMUs).
+   * Enable the crowdsecurity/whitelists parser as well.
+   * When performing a fresh install (as determined by the postinst's being
+     called with just `configure`), and when /run/systemd/system exists,
+     apply a workaround for upstream issue #2120 based on crowdsec.log:
+      - Exit immediately if the unit is not active (e.g. the admin masked
+        it before installing the package).
+      - Check whether entries are received from the Central API, and exit
+        if that's the case.
+      - Check whether `received 0 new entries` is logged, and restart then
+        exit if that's the case.
+      - Repeat those checks every second, up to 20 times.
+   * When performing an upgrade from pre-1.4.x versions, apply a workaround
+     to avoid huge delays at the `restart` step: lower TimeoutStopSec from
+     90s (default) to only 20s, using a runtime override (Closes: #1031326).
+   * Add a dh_install-indep override to get rid of files left over after
+     running the test suite (Closes: #1031328).
+ 
+  -- Cyril Brulebois <cyril@debamax.com>  Fri, 17 Mar 2023 14:42:04 +0100
  
  crowdsec (1.4.6-1) unstable; urgency=medium
  

diff --cc debian/rules
index 411beed448a8c9e8723a9aa6aeb0f19e71348b35,fb37cc4479983e06477e30538944afbafea42ffb..7e896ccd060cb33055c67cce751644123e8b291c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -53,9 -50,20 +50,22 @@@ override_dh_install-arch
        # Drop unit tests from the hub:
        find debian/crowdsec/usr/share/crowdsec/hub -depth -name '.tests' -exec rm -rf '{}' ';'
  
 -
 +override_dh_auto_test:
 +      echo testsuite disabled
 +
+ # #1031328 (upstream #2125):
+ override_dh_install-indep: IDIR=debian/golang-github-crowdsecurity-crowdsec-dev/usr/share/gocode/src/github.com/crowdsecurity/crowdsec/pkg/cwhub
+ override_dh_install-indep:
+       dh_install -i
+       rm -f $(IDIR)/hubdir/.index.json
+       rm -f $(IDIR)/hubdir/collections/crowdsecurity/test_collection.yaml
+       rm -f $(IDIR)/hubdir/scenarios/crowdsecurity/barfoo_scenario.yaml
+       rm -f $(IDIR)/hubdir/scenarios/crowdsecurity/foobar_scenario.yaml
+       rm -f $(IDIR)/hubdir/collections/crowdsecurity/test_collection.yaml
+       rm -f $(IDIR)/hubdir/scenarios/crowdsecurity/barfoo_scenario.yaml
+       rm -f $(IDIR)/install/collections/test_collection.yaml
+       rm -f $(IDIR)/install/scenarios/barfoo_scenario.yaml
+ 
  ### Maintainer targets:
  
  generate_hub_tarball: