merged from parent

chromebrew @ 05193892

+Subproject commit 051938929a540604d38814a3614e80f214bca76d

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/libffi.rb

 require 'package'
 
 class Libffi < Package
-  version '3.0.13'
+  version '3.0.13-1'
   source_url 'ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz'
   source_sha1 'f5230890dc0be42fb5c58fbf793da253155de106'
 
@@ -13,6 +13,6 @@ class Libffi < Package
   end
 
   def self.install
-    system "make", "install"
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
   end
 end

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/llvm.rb

 require 'package'
 
 class Llvm < Package
-  version '3.8.1'
+  version '3.8.1-1'
   source_url 'http://llvm.org/releases/3.8.1/llvm-3.8.1.src.tar.xz'
   source_sha1 'e0c48c4c182424b99999367d688cd8ce7876827b'
 
@@ -18,7 +18,7 @@ class Llvm < Package
 
   def self.install
     Dir.chdir CREW_BREW_DIR+"llvm-"+version+".src/mybuilddir" do
-       system "cmake -DCMAKE_INSTALL_PREFIX=/usr/local -P cmake_install.cmake"
+       system "cmake -DCMAKE_INSTALL_PREFIX=#{CREW_DEST_DIR}/usr/local -P cmake_install.cmake"
     end  
   end
 end

packages/mlocate.rb

+require 'package'
+
+class Mlocate < Package
+  version '0.26'
+  source_url 'https://fedorahosted.org/releases/m/l/mlocate/mlocate-0.26.tar.xz' # software source tarball url
+  source_sha1 'c6e6d81b25359c51c545f4b8ba0f3b469227fcbc'                         # source tarball sha1 sum
+  
+  def self.build                                                                 # self.build contains commands needed to build the software from source
+    system "sed -i 's/groupname = mlocate/groupname = chronos/g' Makefile.*"     # change groupname in all Makefiles
+    system "./configure"
+    system "make"                                                                # ordered chronologically
+  end
+
+  def self.install                                                               # self.install contains commands needed to install the software on the target system
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"                         # remember to include DESTDIR set to CREW_DEST_DIR - needed to keep track of changes made to system
+  end
+end

packages/mono.rb

 require 'package'
 
 class Mono < Package
-  version '4.4.0.148'
+  version '4.4.0.148-1'
   source_url 'http://download.mono-project.com/sources/mono/mono-4.4.0.148.tar.bz2'
   source_sha1 '8da7726b7c09df97856b55eda062356666928d35'
 
   def self.build
-    system "./configure","--disable-dependency-tracking","--disable-silent-rules","--enable-nls=no","prefix=#{CREW_DEST_DIR}/usr/local"
+    system "./configure","--disable-dependency-tracking","--disable-silent-rules","--enable-nls=no","--prefix=/usr/local"
     system "make"
   end
 
   def self.install
-    system "make", "PREFIX=#{CREW_DEST_DIR}/usr/local", "install"
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
   end
 end

packages/openssl.rb

@@ -3,15 +3,19 @@ require 'package'
 class Openssl < Package
   version '1.0.2j'
 
+<<<<<<< HEAD
 #  chromeos wget can't do proper ssl negotiation with this server
 #  source_url 'https://www.openssl.org/source/openssl-1.0.2j.tar.gz'
 #  so use their ftp server.  
+=======
+>>>>>>> upstream/master
   source_url 'ftp://openssl.org/source/openssl-1.0.2j.tar.gz'
   source_sha1 'bdfbdb416942f666865fa48fe13c2d0e588df54f'
 
   depends_on 'perl'
 
   def self.build
+<<<<<<< HEAD
 	system "./config","--prefix=/usr/local","shared","zlib-dynamic"
 	system "make" #depend
   end
@@ -23,6 +27,17 @@ class Openssl < Package
     	    sudo mv cacert.pem cert.pem'                                # && \
     	    #ln -s /usr/local/ssl/bin/openssl /usr/local/bin/openssl'    # override the system version (in case of a version mismatch)
                                                                   	# the caveat here is /usr/local/bin should come before /usr/bin in $PATH (the default)
+=======
+    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"
+>>>>>>> upstream/master
   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
+# We are going to use openssl only instead of openssl_devel for the
+# ease of maintenance.  Removing package file is not easy, so leaving
+# place holder here.  PH needs to have source_url unfortunately.
 
-#grumble - package names in crew must conform to ruby variable name restrictions. For instance '-' is disallowed
 class Openssl_devel < Package
+<<<<<<< HEAD
   version '1.0.2j'
 
 #  chromeos wget can't do proper ssl negotiation with this server
@@ -14,23 +13,16 @@ class Openssl_devel < Package
 #  so use their ftp server.  
   source_url 'ftp://ftp.openssl.org/source/openssl-1.0.2j.tar.gz'
   source_sha1 'bdfbdb416942f666865fa48fe13c2d0e588df54f'
+=======
+  version 'removed'
 
-  depends_on 'perl'
+  source_url 'ftp://ftp.openssl.org/source/old/1.0.2/openssl-1.0.2f.tar.gz'
+  source_sha1 '2047c592a6e5a42bd37970bdb4a931428110a927'
+>>>>>>> upstream/master
 
   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/patchelf.rb

 require 'package'
 
 class Patchelf < Package
-  version '0.8'
+  version '0.8-2'
   source_url 'http://nixos.org/releases/patchelf/patchelf-0.8/patchelf-0.8.tar.bz2'
   source_sha1 'd0645e9cee6f8e583ae927311c7ce88d29f416fc'
 
@@ -11,6 +11,6 @@ class Patchelf < Package
   end
 
   def self.install
-    system "make", "PREFIX=#{CREW_DEST_DIR}/usr/local", "install"
+    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
   end
 end

packages/php7.rb

@@ -2,11 +2,19 @@ require 'package'
 
 class Php7 < Package
   version '7.1.0'
+<<<<<<< HEAD
   source_url 'http://php.net/distributions/php-7.1.0.tar.xz' # software source tarball url
   source_sha1 'c74c920256b9c6873bae696fbb0ec14a02dc8495'     # source tarball sha1 sum
+=======
+  source_url 'http://php.net/distributions/php-7.1.0.tar.xz'   # software source tarball url
+  source_sha1 'c74c920256b9c6873bae696fbb0ec14a02dc8495'       # source tarball sha1 sum
+>>>>>>> upstream/master
 
+  depends_on 'curl'
+  depends_on 'libpng'
   depends_on 'libxml2'
   depends_on 'openssl'
+<<<<<<< HEAD
   depends_on 'libpng'
 
   def self.build                                             # self.build contains commands needed to build the software from source
@@ -28,5 +36,28 @@ class Php7 < Package
 
   def self.install                                           # self.install contains commands needed to install the software on the target system
     system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"     # remember to include DESTDIR set to CREW_DEST_DIR - needed to keep track of changes made to system
+=======
+  depends_on 'pcre'
+
+  def self.build                                               # self.build contains commands needed to build the software from source
+    system './configure \
+      --prefix=/usr/local \
+      --with-curl \
+      --with-gd \
+      --enable-mbstring \
+      --with-openssl \
+      --with-pcre-regex \
+      --with-zlib'
+    system 'make'                                              # ordered chronologically
+  end
+
+  def self.install                                             # self.install contains commands needed to install the software on the target system
+    system "make", "INSTALL_ROOT=#{CREW_DEST_DIR}", "install"  # remember to include INSTALL_ROOT set to CREW_DEST_DIR - needed to keep track of changes made to system
+
+    # clean up some files created under #{CREW_DEST_DIR}. check http://pear.php.net/bugs/bug.php?id=20383 for more details
+    system "mv", "#{CREW_DEST_DIR}/.depdb", "#{CREW_DEST_DIR}/usr/local/lib/php"
+    system "mv", "#{CREW_DEST_DIR}/.depdblock", "#{CREW_DEST_DIR}/usr/local/lib/php"
+    system "rm", "-rf", "#{CREW_DEST_DIR}/.channels", "#{CREW_DEST_DIR}/.filemap", "#{CREW_DEST_DIR}/.lock", "#{CREW_DEST_DIR}/.registry"
+>>>>>>> upstream/master
   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/thttpd.rb

-require 'package'
-
-class Thttpd < Package
-  version '2.25'
-  source_url 'https://www.dropbox.com/s/sckekosjqtde5rt/thttpd-2.25b.tar.gz?dl=0'
-  source_sha1 '5c2d37ad4291e262b33588375810deb1d48a37ed'
-
-  def self.build
-    system "./configure"
-    system "make"
-  end
-
-  def self.install
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
-  end
-end

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