From 9bd8c1c0dcb66754d45f697d59ff49d9c04141f7 Mon Sep 17 00:00:00 2001
From: Aaron Jones <aaronmdjones@gmail.com>
Date: Tue, 28 Feb 2017 21:28:20 +0000
Subject: [PATCH] Charybdis 3.5.4

---
 NEWS.md      | 16 ++++++++++++++++
 configure    | 18 +++++++++---------
 configure.ac |  2 +-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index b0dbf74b5..22e64f1b1 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,22 @@
 This is charybdis 3.5.3, Copyright (c) 2005-2016 Charybdis team.
 See LICENSE for licensing details (GPL v2).
 
+## charybdis-3.5.4
+
+### security
+- Disable TLSv1.0 in all backends
+- Fix possible NULL dereference in mkpasswd
+- Backport SubjectPublicKeyInfo certificate digest methods from version 4
+- Backport REHASH SSLD functionality from version 4
+  - This allows new ssld processes to be started (to inherit a new or upgraded TLS backend
+    library) without dropping any existing clients or active server links
+
+### misc
+- Various memory leak fixes in newconf, sslproc, zlib
+- Fix crash bug when performing /whois on someone half-way through a CHALLENGE
+- Fix crash bug when performing remote MODRESTART command
+- Allow extban matching presence in secret (+s) channels
+
 ## charybdis-3.5.3
 
 ### security
diff --git a/configure b/configure
index 1e0b6b64b..d320eaeae 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for charybdis 3.5.3.
+# Generated by GNU Autoconf 2.69 for charybdis 3.5.4.
 #
 # $Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='charybdis'
 PACKAGE_TARNAME='charybdis'
-PACKAGE_VERSION='3.5.3'
-PACKAGE_STRING='charybdis 3.5.3'
+PACKAGE_VERSION='3.5.4'
+PACKAGE_STRING='charybdis 3.5.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1319,7 +1319,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures charybdis 3.5.3 to adapt to many kinds of systems.
+\`configure' configures charybdis 3.5.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1380,7 +1380,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of charybdis 3.5.3:";;
+     short | recursive ) echo "Configuration of charybdis 3.5.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1518,7 +1518,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-charybdis configure 3.5.3
+charybdis configure 3.5.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2122,7 +2122,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by charybdis $as_me 3.5.3, which was
+It was created by charybdis $as_me 3.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -10389,7 +10389,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by charybdis $as_me 3.5.3, which was
+This file was extended by charybdis $as_me 3.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10455,7 +10455,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-charybdis config.status 3.5.3
+charybdis config.status 3.5.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 176003857..9d0852318 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.57)
 dnl Sneaky way to get an Id tag into the configure script
 AC_COPYRIGHT([$Id: configure.ac 3516 2007-06-10 16:14:03Z jilles $])
 
-AC_INIT([charybdis], [3.5.3])
+AC_INIT([charybdis], [3.5.4])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER(include/setup.h)