From 86c828caa9390ef6202675497331d0e4fd442105 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebix@sebix.at>
Date: Thu, 4 Apr 2024 10:42:18 +0200
Subject: [PATCH 1/2] prepare version 3.3.1, fix changelog

missing steps after the last release
(https://docs.intelmq.org/latest/dev/release/#prepare-new-version)
fix
dch: warning:     debian/changelog(l5): ignoring invalid week day 'Fr'
---
 CHANGELOG.md            | 31 +++++++++++++++++++++++++++++++
 NEWS.md                 | 20 ++++++++++++++++++--
 debian/changelog        |  8 +++++++-
 intelmq/lib/upgrades.py |  4 +++-
 intelmq/version.py      |  4 ++--
 5 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28c4f4c77..96ca418e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,37 @@
 # CHANGELOG
 
 
+## 3.3.1 (unreleased)
+
+### Configuration
+
+### Core
+
+### Development
+
+### Data Format
+
+### Bots
+#### Collectors
+
+#### Parsers
+
+#### Experts
+
+#### Outputs
+
+### Documentation
+
+### Packaging
+
+### Tests
+
+### Tools
+
+### Contrib
+
+### Known issues
+
 
 3.3.0 (2024-03-01)
 ------------------
diff --git a/NEWS.md b/NEWS.md
index fc678a421..08ab1ac3d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,8 +10,24 @@ 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 Feature release  (2024-03-01)
----------------------
+3.3.0 Bugfix release (unreleased)
+---------------------------------
+
+### Requirements
+
+### Tools
+
+### Data Format
+
+### Configuration
+
+### Libraries
+
+### Postgres databases
+
+
+3.3.0 Feature release (2024-03-01)
+----------------------------------
 
 ### Documentation
 The documentation is now available at [docs.intelmq.org](https://docs.intelmq.org/). Documentation has been updated and restructured into User, Administrator and Developer Guide. It provides modern look with various quality of life improvements. Big thanks to to @gethvi. 
diff --git a/debian/changelog b/debian/changelog
index ac9ddbe81..b0ef8a328 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+intelmq (3.3.1~a1-1) UNRELEASED; urgency=medium
+
+  * 3.3.1 Bugfix release
+
+ -- Sebastian Wagner <sebix@sebix.at>  Thu, 04 Apr 2024 10:40:34 +0200
+
 intelmq (3.3.0-1) stable; urgency=medium
 
   * 3.3.0 Feature release
 
- -- Aaron Kaplan <aaron@lo-res.org>  Fr, 01 Mar 2024 14:19:00 +0100
+ -- Aaron Kaplan <aaron@lo-res.org>  Fri, 01 Mar 2024 14:19:00 +0100
 
 intelmq (3.2.1-2) stable; urgency=medium
 
diff --git a/intelmq/lib/upgrades.py b/intelmq/lib/upgrades.py
index 70b6a8de3..fdcfd9688 100644
--- a/intelmq/lib/upgrades.py
+++ b/intelmq/lib/upgrades.py
@@ -40,7 +40,7 @@
            'v310_shadowserver_feednames',
            'v320_update_turris_greylist_url',
            'v322_url_replacement',
-           'v322_removed_feeds_and_bots'
+           'v322_removed_feeds_and_bots',
            ]
 
 
@@ -979,6 +979,8 @@ def v322_removed_feeds_and_bots(configuration, harmonization, dry_run, **kwargs)
     ((3, 1, 0), (v310_feed_changes, v310_shadowserver_feednames)),
     ((3, 2, 0), (v320_update_turris_greylist_url,)),
     ((3, 2, 2), (v322_url_replacement, v322_removed_feeds_and_bots)),
+    ((3, 3, 0), ()),
+    ((3, 3, 1), ()),
 ])
 
 ALWAYS = (harmonization,)
diff --git a/intelmq/version.py b/intelmq/version.py
index ccb58cc79..0881fb079 100644
--- a/intelmq/version.py
+++ b/intelmq/version.py
@@ -1,6 +1,6 @@
-# SPDX-FileCopyrightText: 2016-2023 Sebastian Wagner
+# SPDX-FileCopyrightText: 2016-2024 Sebastian Wagner
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-__version_info__ = (3, 3, 0)
+__version_info__ = (3, 3, 1, 'alpha1')
 __version__ = '.'.join(map(str, __version_info__))

From ba1df21b5a6e7197f6cf3cedc12de3a54ba6ed66 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebix@sebix.at>
Date: Thu, 4 Apr 2024 10:47:44 +0200
Subject: [PATCH 2/2] doc: changelog entries for #2482 and #2488

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96ca418e9..810ad8deb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,8 @@
 # CHANGELOG
 
 
-## 3.3.1 (unreleased)
+3.3.1 (unreleased)
+------------------
 
 ### Configuration
 
@@ -20,6 +21,9 @@
 #### Collectors
 
 #### Parsers
+- `intelmq.bots.parsers.shadowserver._config`:
+  - Fetch schema before first run (PR#2482 by elsif2, fixes #2480).
+- `intelmq.bots.parsers.dataplane.parser`: Use `  |  ` as field delimiter, fix parsing of AS names including `|` (PR#2488 by DigitalTrustCenter).
 
 #### Experts