REL: 2.2.1 bugfix release

certtools · Jul 30, 2020 · 4ecb114 · 4ecb114
1 parent 53a1d47
commit 4ecb114
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,9 @@
 CHANGELOG
 ==========
 
-2.2.1 (unreleased)
+2.2.1 (2020-07-30)
 ------------------
 
-### Configuration
-
 ### Core
 - `intelmq.lib.upgrades`:
   - Add upgrade function for changed configuration of the feed "Abuse.ch URLHaus" (#1571, PR#1572 by Filip Pokorný).
@@ -16,8 +14,6 @@ CHANGELOG
 ### Development
 - Ignore line length (E501) in code-style checks altogether.
 
-### Harmonization
-
 ### Bots
 #### Collectors
 - `intelmq.bots.collectors.misp`: Fix access to actual MISP object (PR#1548 by Tomas Bellus @tomas321)
@@ -47,8 +43,6 @@ CHANGELOG
 - User-Guide:
   - Overhaul pipeline configuration section and explain named queues better (#1577).
 
-### Packaging
-
 ### Tests
 - `intelmq.tests.bots.experts.cymru`: Adapt `test_empty_result`, remove `test_unicode_as_name` and `test_country_question_mark` (#1576).
 
@@ -63,6 +57,10 @@ CHANGELOG
 - `malware_name_mapping`: Change MISP Threat Actors URL to new URL (branch master -> main) in download script.
 
 ### Known issues
+- Bots started with IntelMQ-Manager stop when the webserver is restarted. (#952).
+- Corrupt dump files when interrupted during writing (#870).
+- Bash completion scripts search in wrong directory in packages (#1561).
+- Cymru Expert: Wrong Cache-Key Calculation (#1592).
 
 
 2.2.0 (2020-06-18)

diff --git a/NEWS.md b/NEWS.md
@@ -3,15 +3,14 @@ NEWS
 
 See the changelog for a full list of changes.
 
-2.2.1 Bugfix release (unreleased)
+2.2.1 Bugfix release (2020-07-30)
 ----------------------------------
 
 ### Requirements
 #### MaxMind GeoIP Expert Bot
 The current python library versions of geoip (version 4) and maxminddb (version 2) no longer support Python 3.5. Keep older versions of these libraries if you are using this Python version.
 
 ### Configuration
-
 #### Abuse.ch URLHaus
 
 The current documented value for the `column` parameter was:
@@ -22,10 +21,6 @@ Better is:
 ```json
 ['time.source', 'source.url', 'status', 'classification.type|__IGNORE__', 'source.fqdn|__IGNORE__', 'source.ip', 'source.asn', 'source.geolocation.cc']
 ```
-### Libraries
-
-### Postgres databases
-
 
 2.2.0 Feature release (2020-06-18)
 ----------------------------------

diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,8 @@
-intelmq (2.2.1~alpha1-1) UNRELEASED; urgency=medium
+intelmq (2.2.1-1) stable; urgency=medium
 
-  * Update to 2.2.1 Alpha 1
+  * Update to 2.2.1.
 
- -- Sebastian Wagner <wagner@cert.at>  Thu, 18 Jun 2020 10:32:05 +0200
+ -- Sebastian Wagner <wagner@cert.at>  Thu, 30 Jul 2020 14:19:21 +0200
 
 intelmq (2.2.0-1) stable; urgency=medium
 

diff --git a/intelmq/lib/upgrades.py b/intelmq/lib/upgrades.py
@@ -25,7 +25,7 @@
            'v220_configuration',
            'v220_azure_collector',
            'v220_feed_changes',
-           'v221_feed_changes_1',
+           'v221_feed_changes',
            ]
 
 
@@ -463,7 +463,7 @@ def v220_feed_changes(defaults, runtime, harmonization, dry_run):
     return messages + ' Remove affected bots yourself.' if messages else changed, defaults, runtime, harmonization
 
 
-def v221_feed_changes_1(defaults, runtime, harmonization, dry_run):
+def v221_feed_changes(defaults, runtime, harmonization, dry_run):
     """
     Migrates feeds' configuration for changed/fixed parameters. Deprecation of HP Hosts file feed & parser.
     """
@@ -514,8 +514,7 @@ def v221_feed_changes_1(defaults, runtime, harmonization, dry_run):
     ((2, 1, 2), ()),
     ((2, 1, 3), (v213_deprecations, v213_feed_changes)),
     ((2, 2, 0), (v220_configuration, v220_azure_collector, v220_feed_changes)),
-    ((2, 2, 1), (v221_feed_changes_1, )),
-    ((2, 3, 0), ()),
+    ((2, 2, 1), (v221_feed_changes, )),
 ])
 
 ALWAYS = (harmonization, )
diff --git a/intelmq/tests/lib/test_upgrades.py b/intelmq/tests/lib/test_upgrades.py
@@ -542,13 +542,13 @@ def test_v220_feed_changes(self):
 
     def test_v221_feed_changes(self):
         """ Test v221_feeds_1 """
-        result = upgrades.v221_feed_changes_1({}, V221_FEED, {}, False)
+        result = upgrades.v221_feed_changes({}, V221_FEED, {}, False)
         self.assertTrue(result[0])
         self.assertEqual(V221_FEED_OUT, result[2])
 
     def test_v221_feed_changes_2(self):
         """ Test v213_feed_changes """
-        result = upgrades.v221_feed_changes_1({}, V221_FEED_2, {}, False)
+        result = upgrades.v221_feed_changes({}, V221_FEED_2, {}, False)
         self.assertEqual('A discontinued feed "HP Hosts File" has been found '
                          'as bot hphosts-collector. '
                          'The removed parser "HP Hosts" has been found '

diff --git a/intelmq/version.py b/intelmq/version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 2, 1, 'alpha1')
+__version_info__ = (2, 2, 1)
 __version__ = '.'.join(map(str, __version_info__))