Merge branch 'maintenance' into develop

Author: Sebastian Wagner

CHANGELOG.md

@@ -63,7 +63,7 @@ CHANGELOG
 ### Known issues
 
 
-3.0.1 (unreleased)
+3.0.1 (2021-09-02)
 ------------------
 
 ### Configuration
@@ -73,10 +73,6 @@ CHANGELOG
 - `intelmq.lib.pipeline`: Fix handling of `load_balance` parameter (PR#2027 by Mikk Margus Möll).
 - `intelmq.lib.bot`: Fix handling of parameter `destination_queues` if value is an empty dictionary (PR#2051 by Sebastian Wagner, fixes #2034).
 
-### Development
-
-### Data Format
-
 ### Bots
 #### Collectors
 - `intelmq.bots.collectors.shodan.collector_stream`: Fix access to parameters, the bot wrongly used `self.parameters` (PR#2020 by Mikk Margus Möll).
@@ -123,9 +119,9 @@ CHANGELOG
   - Fix management actions (start/stop/status/reload/restart) for groups (PR#2086 by Sebastian Wagner, fixes #2085).
   - Do not use hardcoded logging path in `/opt/intelmq`, use the internal default instead (PR#2092 by Sebastian Wagner, fixes #2091).
 
-### Contrib
-
 ### Known issues
+See [open bug reports](https://github.com/certtools/intelmq/issues?q=is%3Aissue+is%3Aopen+label%3Abug) for a more detailed list.
+- ParserBot: erroneous raw line recovery in error handling (#1850).
 
 
 3.0.0 (2021-07-02)

NEWS.md

@@ -29,26 +29,13 @@ The [Data format documentation](https://intelmq.readthedocs.io/en/maintenance/de
 ### Postgres databases
 
 
-3.0.1 Maintenance release (unreleased)
+3.0.1 Maintenance release (2021-09-02)
 --------------------------------------
 
-
-### Requirements
-
-### Tools
-
 ### Bots
 The malwardomains parser bot was removed. The malwaredomains.com website is offline, therefore the parser can not be used anymore. The `intelmqctl upgrade-config` command warns if you have the feed and the bot in use.
 The postgresql output bot was removed. The bot was marked as deprecated in 2019 and announced to be removed in version 3.
 
-### Data Format
-
-### Configuration
-
-### Libraries
-
-### Postgres databases
-
 
 3.0.0 Major release (2021-07-02)
 --------------------------------

debian/changelog

@@ -4,11 +4,11 @@ intelmq (3.1.0~alpha1-1) UNRELEASED; urgency=medium
 
  -- Sebastian Wagner <wagner@cert.at>  Fri, 13 Aug 2021 11:09:58 +0200
 
-intelmq (3.0.1~beta1-1) UNRELEASED; urgency=medium
+intelmq (3.0.1-1) stable; urgency=medium
 
   * Update to 3.0.1.
 
- -- Sebastian Wagner <wagner@cert.at>  Fri, 02 Jul 2021 18:46:36 +0200
+ -- Sebastian Wagner <wagner@cert.at>  Thu, 02 Sep 2021 10:17:30 +0200
 
 intelmq (3.0.0-1) stable; urgency=medium
 

docs/user/installation.rst

@@ -21,7 +21,7 @@ The following instructions assume the following requirements. Python versions >=
 Supported and recommended operating systems are:
 
 * CentOS 7 and 8
-* Debian 10
+* Debian 10 Buster and 11 Bullseye
 * openSUSE Leap 15.2, 15.13
 * Ubuntu: 18.04, 20.04
 * Docker Engine: 18.x and higher
@@ -117,7 +117,8 @@ These are the operating systems which are currently supported by packages:
 
 * **CentOS 7** (run `yum install epel-release` first)
 * **CentOS 8** (run `dnf install epel-release` first)
-* **Debian 10**
+* **Debian 10** Buster
+* **Debian 11** Bullseye
 * **Fedora 33**
 * **Fedora 34**
 * **openSUSE Leap 15.2**