From e4046d3a1eb4721f12b781028602f03bd8e522f0 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebix@sebix.at>
Date: Tue, 27 Aug 2024 10:32:29 +0200
Subject: [PATCH] REL: 3.3.1 Bugfix release

---
 CHANGELOG.md       | 35 ++++++++++++++---------------------
 NEWS.md            | 14 ++------------
 intelmq/version.py |  2 +-
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7af899343..dfc7bb1cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,15 +9,9 @@
 3.3.1 (unreleased)
 ------------------
 
-### Configuration
-
 ### Core
 - `intelmq.lib.utils.drop_privileges`: When IntelMQ is called as `root` and dropping the privileges to user `intelmq`, also set the non-primary groups associated with the `intelmq` user. Makes the behaviour of running intelmqctl as `root` closer to the behaviour of `sudo -u intelmq ...` (PR#2507 by Mikk Margus Möll).
 
-### Development
-
-### Data Format
-
 ### Bots
 #### Collectors
 - `intelmq.bots.collectors.shadowserver.collector_reports_api.py`:
@@ -43,17 +37,20 @@
 - `intelmq.bots.outputs.misp.output_feed`: Handle failures if saved current event wasn't saved or is incorrect (PR by Kamil Mankowski).
 - `intelmq.bots.outputs.smtp_batch.output`: Documentation on multiple recipients added (PR#2501 by Edvard Rejthar).
 
-### Documentation
-
-### Packaging
-
-### Tests
-
-### Tools
-
-### Contrib
-
-### Known issues
+### 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' 3.0 library (#2367).
+- 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).
+- Spamhaus CERT parser uses wrong field (#2165).
+- Custom headers ignored in HTTPCollectorBot (#2150).
+- intelmqctl log: parsing syslog does not work (#2097).
+- Bash completion scripts depend on old JSON-based configuration files (#2094).
+- Bots started with IntelMQ-API/Manager stop when the webserver is restarted (#952).
+- Corrupt dump files when interrupted during writing (#870).
 
 
 3.3.0 (2024-03-01)
@@ -179,10 +176,6 @@
    -  got support for providing custom harmonization file, generating view for storing `raw` fields separately, and adding `IF NOT EXISTS`/`OR REPLACE` clauses ([PR#2404](https://github.com/certtools/intelmq/pull/2404) by Kamil Mankowski).
    -  got support for generating JSONB fields for PostgreSQL schema (PR#2436 by Kamil Mankowski).
 
-### Contrib
-
-### Known issues
-
 
 3.2.1 (2023-08-28)
 ------------------
diff --git a/NEWS.md b/NEWS.md
index 08ab1ac3d..9369e3075 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,20 +10,10 @@ 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.3.0 Bugfix release (unreleased)
+3.3.1 Bugfix release (unreleased)
 ---------------------------------
 
-### Requirements
-
-### Tools
-
-### Data Format
-
-### Configuration
-
-### Libraries
-
-### Postgres databases
+No changes are required by administrators.
 
 
 3.3.0 Feature release (2024-03-01)
diff --git a/intelmq/version.py b/intelmq/version.py
index 0881fb079..b86828f9c 100644
--- a/intelmq/version.py
+++ b/intelmq/version.py
@@ -2,5 +2,5 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-__version_info__ = (3, 3, 1, 'alpha1')
+__version_info__ = (3, 3, 1,)
 __version__ = '.'.join(map(str, __version_info__))