diff --git a/CHANGELOG.md b/CHANGELOG.md index 28c4f4c77..810ad8deb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,41 @@ # CHANGELOG +3.3.1 (unreleased) +------------------ + +### Configuration + +### Core + +### Development + +### Data Format + +### Bots +#### 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 + +#### 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 Thu, 04 Apr 2024 10:40:34 +0200 + intelmq (3.3.0-1) stable; urgency=medium * 3.3.0 Feature release - -- Aaron Kaplan Fr, 01 Mar 2024 14:19:00 +0100 + -- Aaron Kaplan 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__))