Merge pull request #2368 from certtools/release-3.2.0

Release 3.2.0

CHANGELOG.md

@@ -1,12 +1,12 @@
 <!-- comment
-   SPDX-FileCopyrightText: 2015-2022 Sebastian Wagner
+   SPDX-FileCopyrightText: 2015-2023 Sebastian Wagner
    SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
 CHANGELOG
 ==========
 
-3.1.1 (unreleased)
+3.2.0 (2023-07-18)
 ------------------
 
 ### Core
@@ -39,7 +39,7 @@ CHANGELOG
   - Reset detected `feedname` at shutdown to re-detect the feedname on reloads (PR#2361 by @elsif2, fixes #2360).
 - `intelmq.bots.parsers.shadowserver._config`:
   - Added 'IPv6-Vulnerable-Exchange' alias and 'Accessible-WS-Discovery-Service' report. (PR#2338)
-  - Removed unused 'p0f_genre' and 'p0f_detail' from the 'DNS-Open-Resolvers' report. (PR#2338)
+  - Removed unused `p0f_genre` and `p0f_detail` from the 'DNS-Open-Resolvers' report. (PR#2338)
   - Added 'Accessible-SIP' report. (PR#2348)
   - Added 'IPv6-Open-HTTP-Proxy' and 'IPv6-Accessible-HTTP-Proxy' aliases. (PR#2348)
   - Removed  duplicate mappings from the 'Spam-URL' report. (PR#2348)
@@ -67,8 +67,6 @@ CHANGELOG
 ### Tests
 - New decorator `skip_installation` and environment variable `INTELMQ_TEST_INSTALLATION` to skip tests requiring an IntelMQ installation on the test host by default (PR#2370 by Sebastian Wagner, fixes #2369)
 
-### Packaging
-
 ### Tools
 - `intelmqsetup`:
   - SECURITY: fixed a low-risk bug causing the tool to change owner of `/` if run with the `INTELMQ_PATHS_NO_OPT` environment variable set. This affects only the PIP package as the DEB/RPM packages don't contain this tool. (PR#2355 by Kamil Mańkowski, fixes #2354)
@@ -78,8 +76,31 @@ CHANGELOG
 - `intelmqctl`:
   - Increased the performance through removing unnecessary reads. (by Sebastian Kufner)
 
-### Known Errors
-- `intelmq.parsers.html_table` may not process invalid URLs in patched Python version due to changes in `urllib`. See #2382
+### Known Issues
+This is short list of the most important known issues. The full list can be retrieved from [GitHub](https://github.com/certtools/intelmq/labels/bug?page=2&q=is%3Aopen+label%3Abug).
+- `intelmq.parsers.html_table` may not process invalid URLs in patched Python version due to changes in `urllib` (#2382).
+- Breaking changes in 'rt' library (#2367).
+- Stomp collector failed (#2342).
+- Type error with SQL output bot's `prepare_values` returning list instead of tuple (#2255).
+- `intelmq_psql_initdb` does not work for SQLite (#2202).
+- intelmqsetup: should install a default state file (#2175).
+- Misp Expert - Crash if misp event already exist (#2170).
+- Turris greylist has been updated (#2167).
+- Spamhaus CERT parser uses wrong field (#2165).
+- Custom headers ignored in HTTPCollectorBot (#2150).
+- Missing commas in SQL query for separate Events table (#2125).
+- intelmqctl log: parsing syslog does not work (#2097).
+- Bash completion scripts depend on old JSON-based configuration files (#2094).
+- Bot configuration examples use JSON instead of YAML (#2066).
+- Bots started with IntelMQ-API/Manager stop when the webserver is restarted (#952).
+- Corrupt dump files when interrupted during writing (#870).
+
+
+3.0.2 (2021-09-10)
+------------------
+
+### Core
+- `intelmq.lib.bot.CollectorBot`: Fixed an issue with within the `new_report` function, which re-loads the harmonization file after a new incoming dataset, which leads to CPU drain and decreased performance (PR#2106 by Sebastian Waldbauer, fixes #2098).
 
 3.1.0 (2023-02-10)
 ------------------

NEWS.md

@@ -10,6 +10,17 @@ This file lists all changes which have an affect on the administration of IntelM
 Please refer to the change log for a full list of changes.
 
 
+3.2.0 Feature release (2023-07-18)
+----------------------------------
+
+No changes are required by administrators.
+
+[IEP007: Running IntelMQ bots as Python Library](https://github.com/certtools/ieps/tree/main/007) is implemented.
+
+The accompanying 3.2.0 release of intelmq-api switches it's backend from the library hug to fastapi.
+Deb-packages of intelmq-api 3.2.0 are delayed for some distributions because of necessary changes in packaging.
+
+
 3.1.0 Feature release (2023-02-10)
 ----------------------------------
 

debian/changelog

@@ -1,3 +1,15 @@
+intelmq (3.2.0-1) stable; urgency=medium
+
+  * 3.2.0 Release
+
+ -- Sebastian Wagner <[email protected]>  Tue, 18 Jul 2023 20:04:50 +0200
+
+intelmq (3.2.0~a1-1) stable; urgency=medium
+
+  * Update to 3.2.0 Alpha 1.
+
+ -- Sebastian Wagner <[email protected]>  Wed, 24 May 2023 16:47:37 +0200
+
 intelmq (3.1.0-1) stable; urgency=medium
 
   * Update to 3.1.0.

debian/control

@@ -5,7 +5,6 @@ Priority: optional
 Build-Depends: debhelper (>= 4.1.16),
                dh-python,
                lsb-release,
-               python-setuptools,
                python3-all,
                python3-cerberus,
                python3-dateutil,

docs/user/installation.rst

@@ -1,5 +1,5 @@
 ..
-   SPDX-FileCopyrightText: 2017-2021 Sebastian Wagner
+   SPDX-FileCopyrightText: 2017-2023 Sebastian Wagner
    SPDX-License-Identifier: AGPL-3.0-or-later
 
 Installation
@@ -30,9 +30,9 @@ The following instructions assume the following requirements. Python versions >=
 
 Supported and recommended operating systems are:
 
-* Debian 10 Buster and 11 Bullseye
-* openSUSE Tumbleweed
-* Ubuntu: 20.04 focal
+* Debian 10 Buster, Debian 11 Bullseye, Debian 12 Bookworm
+* openSUSE Tumbleweed, Leap 15.5
+* Ubuntu: 20.04 Focal, 22.04 Jammy
 * For the Docker-installation: Docker Engine: 18.x and higher
 
 Other distributions which are (most probably) supported include AlmaLinux, CentOS, Fedora, FreeBSD 12, RHEL and RockyLinux.
@@ -45,10 +45,13 @@ Native deb/rpm packages
 
 These are the operating systems which are currently supported by packages:
 
-* **Debian 10** Buster
 * **Debian 11** Bullseye
 * **openSUSE Tumbleweed**
-* **Ubuntu 20.04** Focal Fossa (enable the universe repositories by appending ``universe`` in ``/etc/apt/sources.list`` to ``deb http://[...].archive.ubuntu.com/ubuntu/ focal main`` first)
+* **Ubuntu 20.04** Focal Fossa
+
+  * Enable the universe repositories by appending ``universe`` in ``/etc/apt/sources.list`` to ``deb http://[...].archive.ubuntu.com/ubuntu/ focal main`` first.
+
+  * `intelmq-api` is only available with hug-based version 3.0.1, not the latest fastapi-based 3.1.0).
 
 Get the installation instructions for your operating system here: `Installation Native Packages <https://software.opensuse.org/download.html?project=home:sebix:intelmq&package=intelmq>`_.
 The instructions show how to add the repository and install the `intelmq` package. You can also install the `intelmq-manager` package to get the `Web-Frontend IntelMQ Manager <https://github.com/certtools/intelmq-manager/>`_.

intelmq/version.py

@@ -2,5 +2,5 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-__version_info__ = (3, 1, 0)
+__version_info__ = (3, 2, 0)
 __version__ = '.'.join(map(str, __version_info__))