[gtk-osx] Update OpenSSL to 1.1.0g.



commit 913804b06ade06aa681567ad7a29ac0ede8f2c57
Author: Antoine Martin <antoine nagafix co uk>
Date:   Mon Jan 15 12:53:16 2018 -0800

    Update OpenSSL to 1.1.0g.
    
    No more crashes on install.

 modulesets-stable/gtk-osx-network.modules   |    6 ++----
 modulesets-stable/gtk-osx-python.modules    |    3 ++-
 modulesets-unstable/gtk-osx-network.modules |    4 ++--
 modulesets-unstable/gtk-osx-python.modules  |    1 +
 modulesets/gtk-osx-network.modules          |    4 ++--
 modulesets/gtk-osx-python.modules           |    4 +---
 6 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index ea60424..ce6d477 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -35,13 +35,11 @@
 
   <!-- of the many arguments such as prefix and libdir that jhbuild might pass
   to configure, openssl only understands prefix, and only with =. -->
-  <!-- Unfortunately Python2 hasn't been fixed up to use the 1.1 API
-       so we're stuck at 1.0. -->
   <autotools id="openssl" autogen-sh="Configure" autogenargs="shared "
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl 
%(autogenargs)s"
              makeinstallargs="install_sw" supports-non-srcdir-builds="no">
-    <branch module="openssl-1.0.2k.tar.gz" version="1.0.2k" repo="openssl"
-            hash="sha256:6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"/>
+    <branch module="openssl-1.1.0g.tar.gz" version="1.1.0g" repo="openssl"
+            hash="sha256:de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af"/>
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 3bc5b18..968a582 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -95,7 +95,8 @@
     <dependencies>
       <dep package="gettext-runtime"/>
       <dep package='readline'/>
-    </dependencies>
+      <dep package="openssl"/> <!-- For hashlib -->
+    </hashlib>
   </autotools>
 
   <distutils id="pybsddb">
diff --git a/modulesets-unstable/gtk-osx-network.modules b/modulesets-unstable/gtk-osx-network.modules
index 648f488..575fd7e 100644
--- a/modulesets-unstable/gtk-osx-network.modules
+++ b/modulesets-unstable/gtk-osx-network.modules
@@ -46,8 +46,8 @@
   <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl 
%(autogenargs)s"
              makeinstallargs="install_sw" supports-non-srcdir-builds="no">
-    <branch module="openssl-1.0.2k.tar.gz" version="1.0.2k" repo="openssl"
-            hash="sha256:6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"/>
+    <branch module="openssl-1.1.0g.tar.gz" version="1.1.0g" repo="openssl"
+            hash="sha256:de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af"/>
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index e4010f7..187da0b 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -79,6 +79,7 @@
     <dependencies>
       <dep package="gettext-runtime"/>
       <dep package='readline'/>
+      <dep package="openssl" /> <!-- For hashlib -->
     </dependencies>
     <after>
       <dep package="berkeleydb"/>
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index d54f296..083af48 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -42,8 +42,8 @@
   <autotools id="openssl" autogen-sh="Configure" autogenargs="shared"
              autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s --openssldir=%(prefix)s/etc/ssl 
%(autogenargs)s"
              makeinstallargs="install_sw" supports-non-srcdir-builds="no">
-    <branch module="openssl-1.0.2k.tar.gz" version="1.0.2k" repo="openssl"
-            hash="sha256:6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"/>
+    <branch module="openssl-1.1.0g.tar.gz" version="1.1.0g" repo="openssl"
+            hash="sha256:de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af"/>
   </autotools>
 
   <!-- Rudely demands TeX to build documentation -->
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 17819af..0ce04fc 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -80,10 +80,8 @@
     <dependencies>
       <dep package="gettext-runtime"/>
       <dep package='readline'/>
+      <dep package="openssl" /> <!-- For hashlib -->
     </dependencies>
-    <after>
-      <dep package="berkeleydb"/>
-    </after>
   </autotools>
 
   <distutils id="pybsddb">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]