REL: Release version 2.2.0

certtools · Jun 23, 2020 · 776d091 · 776d091
1 parent e99322c
commit 776d091
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,14 @@ CHANGELOG
 =========
 
 
-2.2.0 (unreleased)
+2.2.0 (2020-06-23)
 ------------------
 This IntelMQ Manager version requires IntelMQ >= 2.2.0.
 
 ### Backend
 - `config`: Get file paths from `intelmctl debug --get-paths` if possible and fall back to hard-coded paths otherwise. Thereby environment variables influencing the paths are respected (#193).
 
+### Pages
 #### About
 - Show output of `intelmqctl debug`.
 

diff --git a/NEWS.md b/NEWS.md
@@ -4,13 +4,13 @@ NEWS
 See the changelog for a full list of changes.
 
 
-2.2.0 (unreleased)
+2.2.0 (2020-06-23)
 ------------------
 This IntelMQ Manager version requires IntelMQ >= 2.2.0.
 
 ### Paths
-The paths for configuration files is not queried from the IntelMQ Core.
-The environment variables `INTELMQ_ROOT_DIR` and `INTELMQ_PATHS_NO_OPT`/`INTELMQ_PATHS_OPT` are now respected.
+The paths for configuration files are queried from the IntelMQ Core.
+Thus, the environment variables `INTELMQ_ROOT_DIR` and `INTELMQ_PATHS_NO_OPT`/`INTELMQ_PATHS_OPT` are now respected.
 
 
 2.1.1 (2020-04-27)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+intelmq-manager (2.2.0-1) stable; urgency=medium
+
+  * Update to 2.2.0.
+
+ -- Sebastian Wagner <[email protected]>  Tue, 23 Jun 2020 10:46:42 +0200
+
 intelmq-manager (2.2.0~alpha1-1) unstable; urgency=medium
 
   * Update to 2.2.0 alpha 1.

diff --git a/debian/patches/fix-paths.patch b/debian/patches/fix-paths.patch
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      // to be displayed so that user can replicate
 @@ -16,17 +16,17 @@
      $BOT_ID_REJECT_REGEX = '/[^A-Za-z0-9.-]/';
-     $VERSION = "2.2.0a1";
+     $VERSION = "2.2.0";
 
 -    $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.

diff --git a/intelmq-manager/php/config.php b/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.0a1";
+    $VERSION = "2.2.0";
 
     $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