From edd5b8201e4f9e3127053dc5b1231ae4b16a3ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miquel=20Sabat=C3=A9=20Sol=C3=A0?= <msabate@suse.com>
Date: Thu, 31 May 2018 13:21:01 +0200
Subject: [PATCH] Bump version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
---
 CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++
 VERSION      |  2 +-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b450ff63..98d2b60e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## 2.3.3
+
+- 93df51cce0da ldap: don't crash on search when guessing an email (#1832)
+- 45814babef7e packaging: added new encryption options for LDAP
+- 4892eb1dc5ce ldap: fixed a couple of bugs around SSL support (#1746, #1774, bsc#1073232)
+- dc769adcddfe devise: use a more fine-grained scope for Github (#1790)
+- ae07ec4ca2cd sync: do not remove repositories on some errors (#1293, #1599)
+- 17e82c0791ba lib: be explicit on the exceptions to be rescued
+- 88553b817552 portusctl: added Clair timeout to the options
+- fed2818e8a96 security: fetch the manifest more safely (#1743)
+- 943c7627feab security: don't crash on clair timeouts (#1751)
+
+### Words of warning
+
+Commits 45814babef7e and 4892eb1dc5ce introduce some new options for LDAP. In
+particular, the following options have been added inside of the `ldap`
+configuration:
+
+```yaml
+  # Encryption options
+  encryption:
+    # Available methods: "plain", "simple_tls" and "start_tls".
+    method: ""
+    options:
+      # The CA file to be accepted by the LDAP server. If none is provided, then
+      # the default parameters from the host will be sent.
+      ca_file: ""
+
+      # Protocol version.
+      ssl_version: "TLSv1_2"
+```
+
+Notice that the old `ldap.method` is getting deprecated and in later versions it
+will be removed. Thus, you should use these options from now on.
+
 ## 2.3.2
 
 - Upgraded loofah and rails-html-sanitizer to fix CVE-2018-3741
diff --git a/VERSION b/VERSION
index f90b1afc0..0bee604df 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.2
+2.3.3