Merge pull request #327 from jam7/openssl

Change to use openssl instead of openssl_devel

packages/cmake.rb

@@ -6,7 +6,7 @@ class Cmake < Package
   source_sha1 'a37785b3f256a31ee21a047569bc74a8f57067bb'
 
   depends_on 'buildessential'
-  depends_on 'openssl_devel'
+  depends_on 'openssl'
 
   def self.build
     system "./bootstrap"

packages/libevent.rb

@@ -4,7 +4,7 @@ class Libevent < Package                                            	# name the
   version '2.0.22'                                               	                                      # software version
   source_url 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz'     # software source tarball url
   source_sha1 'a586882bc93a208318c70fc7077ed8fca9862864'          	# source tarball sha1 sum
-  depends_on 'openssl_devel'
+  depends_on 'openssl'
   
   def self.build                                                  # self.build contains commands needed to build the software from source
     system "./configure"

packages/libunwind.rb

@@ -6,7 +6,7 @@ class Libunwind < Package
   source_sha1 '7c93a6ae35afff4d0efd143b62a9fd235423964f'
 
   depends_on 'buildessential'
-  depends_on 'openssl_devel'
+  depends_on 'openssl'
 
   def self.build
     system "CC='gcc' ./configure"

packages/openssl.rb

 require 'package'
 
 class Openssl < Package
-  version '1.0.1e'
-  binary_url ({
-    i686: 'https://dl.dropboxusercontent.com/s/w6y84tusor5xz5f/openssl-1.0.1e-chromeos-i686.tar.gz?token_hash=AAGQ2xjngbnzme2CKee7Mz5WvkylBtFy1rwUzWDVNuOQ_Q&dl=1',
-    x86_64: 'https://dl.dropboxusercontent.com/s/384awniosicvm12/openssl-1.0.1e-chromeos-x86_64.tar.gz?token_hash=AAH4sdqkNnhIFU-uPdrpqddsi8UU0vWe_gwkplUBM_40MQ&dl=1'
-  })
-  binary_sha1 ({
-    i686: 'cadea32ec770c4b44d565b7e5fdf96a469a05757',
-    x86_64: '3cf4defb11fc2fccce77736d0f4559e56d9d7e05'
-  })
+  version '1.0.2j'
+
+  source_url 'ftp://openssl.org/source/openssl-1.0.2j.tar.gz'
+  source_sha1 'bdfbdb416942f666865fa48fe13c2d0e588df54f'
+
+  depends_on 'perl'
+
+  def self.build
+    system "./config", "--prefix=/usr/local", "--openssldir=/etc/ssl", "shared", "zlib-dynamic"
+    system "make"
+  end
+
+  def self.install
+    system "make", "INSTALL_PREFIX=#{CREW_DEST_DIR}", "install"
+
+    # remove all files pretended to install /etc/ssl (use system's /etc/ssl as is)
+    system "rm", "-rf", "#{CREW_DEST_DIR}/etc"
+  end
+
 end

packages/openssl_devel.rb

-require 'package'
-
-#Installs JUST the headers to match the chromeos supplied libraries so that you can build things 
-# that link with openssl. Needs to be kept version-synced with chromeos releases
-# Could detect current version and grab one of many different packages, compare to saved
-# hashes and support multiple versions if needed
-
-#grumble - package names in crew must conform to ruby variable name restrictions. For instance '-' is disallowed
-class Openssl_devel < Package
-  version '1.0.2f'
-
-#  chromeos wget can't do proper ssl negotiation with this server
-#  source_url 'https://www.openssl.org/source/old/1.0.2/openssl-1.0.2g.tar.gz'
-#  so use their ftp server.  
-  source_url 'ftp://ftp.openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz'
-  source_sha1 '2047c592a6e5a42bd37970bdb4a931428110a927'
-
-  depends_on 'perl'
-
-  def self.build
-    # only need to run config to get the headers set up right
-    system './config'
-  end
-
-  def self.install
-    out = "#{CREW_DEST_DIR}/usr/local/include/openssl"
-    system "mkdir -p #{out}"
-
-    `ls ./include/openssl`.split(' ').each do |header|
-      system "cp", "./include/openssl/#{header}", out
-    end
-
-    #system "cp", "./include/openssl/*", "#{out}"
-  end
-
-end

packages/python27.rb

@@ -7,7 +7,7 @@ class Python27 < Package
 
   depends_on 'bz2'
   depends_on 'ncurses'
-  depends_on 'openssl_devel'
+  depends_on 'openssl'
 
   def self.build                                                  # self.build contains commands needed to build the software from source
     system "./configure --prefix=/usr/local CPPFLAGS=\"-I/usr/local/include -I/usr/local/include/ncurses\" LDFLAGS=\"-L/usr/local/lib\" CFLAGS=\" -fPIC\""

packages/python34.rb

@@ -5,7 +5,7 @@ class Python34 < Package
   source_url 'https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz'     # software source tarball url
   source_sha1 'e8c1bd575a6ccc2a75f79d9d094a6a29d3802f5d'          	# source tarball sha1 sum
 
-  depends_on 'openssl_devel'
+  depends_on 'openssl'
   
   def self.build                                                  # self.build contains commands needed to build the software from source
     system "./configure"

packages/tmux.rb

@@ -8,7 +8,7 @@ class Tmux < Package                                            	# name the pack
   depends_on 'readline'                                            # software dependencies
   depends_on 'libevent'
   # does this really depend on openssl?  or just on libevent that depends on openssl
-  depends_on 'openssl_devel'
+  depends_on 'openssl'
   depends_on 'ncurses'
   
   def self.build                                                  # self.build contains commands needed to build the software from source