update OpenSSL to 1.0.1m (and release 0.12.2.2 for Windows)

wkhtmltopdf · Apr 6, 2015 · 543dd36 · 543dd36
1 parent 61c1845
commit 543dd36
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+v0.12.2.2 (2015-04-06)
+----------------------
+* update OpenSSL to 1.0.1m
+
 v0.12.2.1 (2015-01-19)
 ----------------------
 * update OpenSSL to 1.0.1l

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.12.2.1
+0.12.2.2
diff --git a/scripts/build.py b/scripts/build.py
@@ -370,8 +370,8 @@
 DEPENDENT_LIBS = {
     'openssl': {
         'order' : 1,
-        'url'   : 'https://www.openssl.org/source/openssl-1.0.1l.tar.gz',
-        'sha1'  : '4547a0b4269acf76b1f9e7d188896867d6fc8c18',
+        'url'   : 'https://www.openssl.org/source/openssl-1.0.1m.tar.gz',
+        'sha1'  : '4ccaf6e505529652f9fdafa01d1d8300bd9f3179',
         'build' : {
             'msvc*-win32*': {
                 'result': ['include/openssl/ssl.h', 'lib/ssleay32.lib', 'lib/libeay32.lib'],