From 269c3275302136e5f2aead3ded4c3bf5a3f60600 Mon Sep 17 00:00:00 2001
From: Igor Kanyuka <ifelmail@gmail.com>
Date: Wed, 20 May 2015 06:56:54 +0300
Subject: [PATCH] Added option to enable PCRE for Linux git

---
 README.md                               | 1 +
 attributes/default.rb                   | 1 +
 libraries/provider_git_client_source.rb | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b0ed518..f5f15f1 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,7 @@ The following attributes are platform-specific.
 * `node['git']['version']` - git version to install
 * `node['git']['url']` - URL to git tarball
 * `node['git']['checksum']` - tarball SHA256 checksum
+* `node['git']['use_pcre']` - if true, builds git with PCRE enabled
 
 Recipes
 =======
diff --git a/attributes/default.rb b/attributes/default.rb
index e2abf80..a396674 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -34,6 +34,7 @@
   default['git']['version'] = '1.9.5'
   default['git']['url'] = "https://nodeload.github.com/git/git/tar.gz/v#{node['git']['version']}"
   default['git']['checksum'] = '0f30984828d573da01d9f8e78210d5f4c56da1697fd6d278bad4cfa4c22ba271'
+  default['git']['use_pcre'] = false
 end
 
 default['git']['server']['base_path'] = '/srv/git'
diff --git a/libraries/provider_git_client_source.rb b/libraries/provider_git_client_source.rb
index 4dcb0fd..9508c3e 100644
--- a/libraries/provider_git_client_source.rb
+++ b/libraries/provider_git_client_source.rb
@@ -20,13 +20,17 @@ class Source < Chef::Provider::GitClient
             case node['platform_version'].to_i
             when 5
               pkgs = %w(expat-devel gettext-devel curl-devel openssl-devel zlib-devel)
+              pkgs += %w{ pcre-devel } if node['git']['use_pcre']
             when 6, 7
               pkgs = %w(expat-devel gettext-devel libcurl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel)
+              pkgs += %w{ pcre-devel } if node['git']['use_pcre']
             else
               pkgs = %w(expat-devel gettext-devel curl-devel openssl-devel perl-ExtUtils-MakeMaker zlib-devel) if node['platform'] == 'amazon'
+              pkgs += %w{ pcre-devel } if node['git']['use_pcre']
             end
           when 'debian'
             pkgs = %w(libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev)
+            pkgs += %w{ libpcre3-dev } if node['git']['use_pcre']
           end
 
           pkgs.each do |pkg|
@@ -44,9 +48,11 @@ class Source < Chef::Provider::GitClient
           # reduce line-noise-eyness
           execute "Extracting and Building Git #{node['git']['version']} from Source" do
             cwd Chef::Config['file_cache_path']
+            additional_make_params = ""
+            additional_make_params += "USE_LIBPCRE=1" if node['git']['use_pcre']
             command <<-COMMAND
     (mkdir git-#{node['git']['version']} && tar -zxf git-#{node['git']['version']}.tar.gz -C git-#{node['git']['version']} --strip-components 1)
-    (cd git-#{node['git']['version']} && make prefix=#{node['git']['prefix']} install)
+    (cd git-#{node['git']['version']} && make prefix=#{node['git']['prefix']} #{additional_make_params} install)
   COMMAND
             not_if "git --version | grep #{node['git']['version']}"
           end