update changelog for 2.2.4v2.2.4

3 files changed, 4 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 634b1b6..32c76ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,10 +28,13 @@ history is also available from Git.
 
 LibreSSL Portable Release Notes:
 
-2.2.4 - Build fixes
+2.2.4 - Build and bug fixes
 
         * Backported build fixes for CMake on Windows, OSX and Linux
 
+        * Fixes for a memory leak and out-of-bounds access in OBJ_obj2txt
+          reported by Qualys Security.
+
 2.2.3 - Bug fixes, build enhancements
 
         * LibreSSL 2.2.2 incorrectly handles ClientHello messages that do not
diff --git a/patches/opensslv.h b/patches/opensslv.h
deleted file mode 100644
index 04cdead..0000000
--- a/patches/opensslv.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/openssl/opensslv.h.orig     Fri Sep 11 17:03:15 2015
-+++ include/openssl/opensslv.h  Fri Sep 11 17:04:56 2015
-@@ -3,8 +3,8 @@
- #define HEADER_OPENSSLV_H
- 
- /* These will change with each release of LibreSSL-portable */
--#define LIBRESSL_VERSION_NUMBER        0x20020003L
--#define LIBRESSL_VERSION_TEXT  "LibreSSL 2.2.3"
-+#define LIBRESSL_VERSION_NUMBER        0x20020004L
-+#define LIBRESSL_VERSION_TEXT  "LibreSSL 2.2.4"
- 
- /* These will never change */
- #define OPENSSL_VERSION_NUMBER 0x20000000L
diff --git a/update.sh b/update.sh
index f07603a..02d6915 100755
--- a/update.sh
+++ b/update.sh
@@ -121,7 +121,6 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h
 copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h"
 
 $CP $libssl_src/src/crypto/opensslv.h include/openssl
-patch -p0 < patches/opensslv.h
 awk '/LIBRESSL_VERSION_TEXT/ {print $4}' < include/openssl/opensslv.h | cut -d\" -f1 > VERSION
 echo "LibreSSL version `cat VERSION`"