REL: 2.2.1 Bugfix release

Author: Sebastian Wagner

CHANGELOG.md

@@ -2,38 +2,24 @@ CHANGELOG
 =========
 
 
-2.2.1 (unreleased)
+2.2.1 (2020-07-30)
 ------------------
 This IntelMQ Manager version requires IntelMQ >= 2.2.1.
 
 ### Backend
 - Fix loading paths from `intelmqctl` executable (PR #205 by Einar Felipe Lanfranco).
 
-### Pages
-
-#### Landing page
-
-#### Configuration
-
-#### Management
-
-#### Monitor
-
-#### Check
-
 ### Documentation
 - User Guide:
   - Add section on configuration paths.
   - Add section on named queues / paths.
 - Readme:
   - Update screenshots (#201, PR#207 by Mladen Markovic).
 
-### Third-party libraries
-
-### Packaging
-
 ### Known issues
-
+* Graph jumps around on "Add edge" (#148).
+* wrong error message for new bots with existing ID (#152).
+* Monitor page: Automatic log refresh reset log page to first one (#190).
 
 2.2.0 (2020-06-23)
 ------------------

NEWS.md

@@ -4,9 +4,9 @@ NEWS
 See the changelog for a full list of changes.
 
 
-2.2.1 (unreleased)
+2.2.1 (2020-07-30)
 ------------------
-
+This IntelMQ Manager version requires IntelMQ >= 2.2.1.
 
 2.2.0 (2020-06-23)
 ------------------

debian/changelog

@@ -1,3 +1,9 @@
+intelmq-manager (2.2.1-1) stable; urgency=medium
+
+  * Update to version 2.2.1.
+
+ -- Sebastian Wagner <wagner@cert.at>  Thu, 30 Jul 2020 17:52:49 +0200
+
 intelmq-manager (2.2.0-1) stable; urgency=medium
 
   * Update to 2.2.0.

debian/patches/fix-paths.patch

@@ -1,6 +1,6 @@
 Description: Fix paths for LSB
 Author: Sebastian Wagner <wagner@cert.at>
-Last-Update: 2020-04-28
+Last-Update: 2020-07-30
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/intelmq-manager/php/config.php	2020-04-28 15:17:27.858979961 +0200
@@ -14,9 +14,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      }
 
      // to be displayed so that user can replicate
-@@ -16,17 +16,17 @@
+@@ -16,16 +16,16 @@
      $BOT_ID_REJECT_REGEX = '/[^A-Za-z0-9.-]/';
-     $VERSION = "2.2.1a1";
+     $VERSION = "2.2.1";
 
 -    $ALLOWED_PATH = "/opt/intelmq/var/lib/bots/"; // PHP is allowed to fetch the config files from the current location in order to display bot configurations.
 +    $ALLOWED_PATH = "/var/lib/intelmq/bots/"; // PHP is allowed to fetch the config files from the current location in order to display bot configurations.
@@ -28,15 +28,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -        'harmonization' => '/opt/intelmq/etc/harmonization.conf',
 -        'pipeline' 	=> '/opt/intelmq/etc/pipeline.conf',
 -        'runtime' 	=> '/opt/intelmq/etc/runtime.conf',
--        'system' 	=> '/opt/intelmq/etc/system.conf',
 -        'positions' => '/opt/intelmq/etc/manager/positions.conf',
 +        'bots' 		=> '/etc/intelmq/BOTS',
 +        'defaults' 	=> '/etc/intelmq/defaults.conf',
 +        'harmonization' => '/etc/intelmq/harmonization.conf',
 +        'pipeline' 	=> '/etc/intelmq/pipeline.conf',
 +        'runtime' 	=> '/etc/intelmq/runtime.conf',
-+        'system' 	=> '/etc/intelmq/system.conf',
 +        'positions' => '/etc/intelmq/manager/positions.conf',
      );
      # get paths from intelmqctl directly if it works
-     $proc = proc_open($c . "--type json debug --get-paths", [
+     $proc = proc_open(sprintf($CONTROLLER_JSON, "debug --get-paths"), [

intelmq-manager/php/config.php

@@ -14,7 +14,7 @@
 
     $BOT_CONFIGS_REJECT_REGEX = '/[^[:print:]\n\r\t]/';
     $BOT_ID_REJECT_REGEX = '/[^A-Za-z0-9.-]/';
-    $VERSION = "2.2.1a1";
+    $VERSION = "2.2.1";
 
     $ALLOWED_PATH = "/opt/intelmq/var/lib/bots/"; // PHP is allowed to fetch the config files from the current location in order to display bot configurations.
     $FILESIZE_THRESHOLD = 2000; // config files under this size gets loaded automatically; otherwise a link is generated