From 80678163cec84f0e361c4ff8f6402992eb388280 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Mon, 24 Sep 2018 17:32:38 +0200
Subject: [PATCH] REL: Release version 1.0.2

---
 CHANGELOG.md                   | 18 ++++++++----------
 NEWS.md                        | 10 ++++++++++
 debian/changelog               |  6 ++++++
 docs/Release.md                |  4 +---
 intelmq-manager/php/config.php |  2 +-
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5308e5..ec83f8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-1.0.2 (unreleased)
+1.0.2 (2018-09-24)
 ------------------
 
 ### Backend
@@ -10,28 +10,26 @@ CHANGELOG
 
 ### Pages
 
-#### Landing page
-
 #### Configuration
 - Underscore is now allowed for new parameter names (#153).
 
-#### Management
-
 #### Monitor
 * Fix link to monitor page (#157).
 
-#### Check
-
 ### Documentation
-- Add a FAQ and add a section about the docker issue #160.
+- Add a FAQ and add a section about the docker issue (#160).
 - Add instructions for Debian 9, Ubuntu 18.04, and openSUSE Leap 42.3, 15.0 (#168).
 
-### Third-party libraries
-
 ### Packaging
 - Include a positions file matching the default configuration of intelmq (#171).
 
 ### Known issues
+* Missing CSRF protection (#111).
+* Missing copyright notices (#140).
+* Graph jumps around on "Add edge" bug component (#148).
+* new runtime parameters with _ not possible (#153).
+* wrong error message for new bots with existing ID (#152).
+* Queue size for deleted queue remains displayed (#158).
 
 1.0.1 (2018-04-23)
 ------------------
diff --git a/NEWS.md b/NEWS.md
index af25701..0534a0e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,16 @@ NEWS
 
 See the changelog for a full list of changes.
 
+1.0.1 (2018-09-24)
+------------------
+
+No changes are required by administrators.
+
+1.0.0 (2018-04-23)
+------------------
+
+No changes are required by administrators.
+
 0.3.1
 -----
 
diff --git a/debian/changelog b/debian/changelog
index 5e0d1be..0458f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+intelmq-manager (1.0.1-2) stable; urgency=medium
+
+  * update to version 1.0.2
+
+ -- Wagner Sebastian <wagner@cert.at>  Mon, 24 Sep 2018 17:30:06 +0200
+
 intelmq-manager (1.0.1-1) stable; urgency=low
 
   * update to version 1.0.1
diff --git a/docs/Release.md b/docs/Release.md
index c2006a7..1523df9 100644
--- a/docs/Release.md
+++ b/docs/Release.md
@@ -9,11 +9,9 @@ Assumption: You are working on branch maintenance, the next version is a bug fix
 
  * CHANGELOG.MD and
  * NEWS.MD: Update the latest header, fix the order and remove empty sections if necessary.
- * `intelmq/version.py`: Update the version.
+ * `intelmq-manager/php/config.php`: Update the version.
  * `debian/changelog`: Insert a new section for the new version with the tool `dch`.
 
-Eventually adapt the default log levels if necessary. Should be INFO for stable releases. See older releases.
-
 ## Commit and tag.
 Commit your changes, the message should start with `REL: `. Push and create a pull request from maintenance to master. Someone else should review the changes. Eventually fix them, make sure the `REL: ` is the last commit, you can also push that one at last, after the reviews.
 
diff --git a/intelmq-manager/php/config.php b/intelmq-manager/php/config.php
index 3ba18ab..1f9c1ea 100644
--- a/intelmq-manager/php/config.php
+++ b/intelmq-manager/php/config.php
@@ -16,5 +16,5 @@
     
     $BOT_CONFIGS_REJECT_REGEX = '/[^[:print:]\n\r\t]/';
     $BOT_ID_REJECT_REGEX = '/[^A-Za-z0-9.-]/';
-    $VERSION = "1.0.2.alpha1";
+    $VERSION = "1.0.2";
 ?>