fixed patches for gitlabhq 7.1.1

2014-08-04 15:50:41 +02:00 · 2014-08-04 15:50:41 +02:00 · 369aba995c
parent 9296a127a0
commit 369aba995c
4 changed files with 118 additions and 4 deletions
--- a/www-apps/gitlabhq/Manifest
+++ b/www-apps/gitlabhq/Manifest
@ -35,6 +35,8 @@ AUX gitlabhq-6.8.2-ldap-custom-mapping.patch 2579 SHA256 82aaae2c64554e9c00dfb8f
 AUX gitlabhq-7.0.0-email-custom-reply_to.patch 1814 SHA256 7db95e36e2ef661f846209a612affc0e6276894bce6abf7acc686cd2398c76a5 SHA512 64aa56d83a9ccafaeafd808436e19388450ef7b6aff9bc1406e84033f624993923446a83bea32ec8987addb9c0ccb0d65ed9dc7cc30f181183634d8d5610aa2e WHIRLPOOL 5f23b4e7c2b482314f826508c50e9845e042e9a6b5d85f3f49f7db9ed140a35a9d07967f9b6a5c7dea481ad7e4dd5d682b4734921cc3adc0c4e37822ad4db234
 AUX gitlabhq-7.0.0-fix-gemfile.patch 2185 SHA256 48070f5cd7e16ce27abad8e2cf80493add671cd1383c758e5fffa696ed9452bc SHA512 f4cd487e17153f6cc60219f76df54574102b2ec2b154b2b9ddbf142a9e9d0188d3a8b4dbdec284d6b6be01a9c242d083440f50e8ced83f7c726fa2cce98720dd WHIRLPOOL fd9c550339bbf953d9bdc46cbc7552883a5eaafea60a0778e0dea4cc00defe548283b9ada02982f7063005233c72081623c1ef18f499ad5d6acf544af424da46
 AUX gitlabhq-7.0.0-ldap-custom-mapping.patch 2708 SHA256 8592744ba8b373b2e89c76d7ceb6c755bd46e2c2de6143b3f1d9967e4b6e5fb3 SHA512 a172444da26ddc9dfebe0c0ead4a2eb73a77ac44dfd9b3dbcf2b3faa679d963db080d2979d707e337b99f8e6384ccfd323f5d6e70921d193e99db75a4ba45b38 WHIRLPOOL d25e1f78342c781d26b84c09bd7eba08b46375c2f353b358f838602253dc2fe57807a437fc0c2891a6bc2893eba0bb278bd605ab8b6c837101a783c84536095b
+AUX gitlabhq-7.1.1-fix-gemfile.patch 2184 SHA256 9ba304baa5a17f1b0637fe243f551ddcc22cf32c3e82b7dc5b1a5cc0c5fc5876 SHA512 db8757874f136fc6a1d138feadbad6f8dfc773446f969b76a4715901dac02c04c978133ef3e9218b9c4a3d0173f53c0d14608ae123ee300a803529cbf232a1d1 WHIRLPOOL 27adf9392f3f1cbc6288afc1aabc174850a689f47f015c9d638b62769607e6e4f5ebe8bcb3811ee189ceeddef7c5bca384b322d15c0008b8867887f26d6188e2
+AUX gitlabhq-7.1.1-fix-project-name-regex.patch 638 SHA256 9f3dfcdc4365422037ecc8854b10e2cf96f4fb9508a6d5214b16c3545ca1353b SHA512 4606eade95b75e31eb791d793e3571c4e998c2d451e1f92ce70fba06e3a29c74a17f2fedba24ded4dbdc6db3da87960890552869fd8790caed26ff6fbb201717 WHIRLPOOL 6470de727d060556cc1413ac23f3c3198035f3cd7b05a291f7dedfcd9071a5afecca57c15f7387a84d9c1830118e47fae4fc72ba2f2e67c346bf18c4dae09865
 DIST gitlabhq-6.7.5.tar.gz 10229484 SHA256 547ed2807cccf08c11450a9df035dad8db66ab9f9d693db29e3aa1ee65edbae0 SHA512 a90c0cd3954bf20ece9e98626216a42afcb0cc07e0cb23874ab2065757805ac38a8dcf4e93d804a33caeecaf2c6e94d8566f5700cd4161ef9a0aaac089b9ded8 WHIRLPOOL 4d8f5ff3a1245c5e13fc3ff8f819160017dd4dba9f6a48c0f851272da5c97f45162d3e53f327002f1ecde7f31dd5f392bed8503b1b306d913bf63827777cdbcd
 DIST gitlabhq-6.8.2.tar.gz 10558471 SHA256 db9400d5ffadd3564bbee6e388c90d7f4c8f88450e67213aad11df2d137534ec SHA512 0f57c6bb3b9e89a5bbf7ae4c774e54480518f185f2e50270a7dd921eb2a2322f3e6866ca70741582fad4f99b372ba025fbab15108c291d53ebf04cfaec2f9b75 WHIRLPOOL 73ebd0fb0faef7afd48398ec4e73c8f4175f3dc2a9450ae391b4d3a66b54e0d77f901f518738eb98cc267691559094d4ebecd4c0a7c18fa671c3a1aee4dfe4d2
 DIST gitlabhq-6.9.2.tar.gz 10566288 SHA256 2c01b223c3e889c7a45d3815f352c0546a337286d395e4d49df5ecedc1a57dc0 SHA512 b51b4e261666c14f782ce7edbbda24b6d32bb080c5444249f5c38e5233398b30f50a17cc8cbee18d75e57ba11ec3deeab4ffd1a6d6257c1858f8fe63e5138e54 WHIRLPOOL a3b9a8149fab69443b769aa145eb2c9a99bfc9f4a080edf0a6bd46c4771247b6f1c729bf5185e63bf63a02d654145362b7c8e9fefef6f0cdf1f4f30a32cf9dcb
@ -44,4 +46,4 @@ EBUILD gitlabhq-6.7.5.ebuild 10983 SHA256 79fe5e03f1f03625a27d5ef398bb4d40e991c7
 EBUILD gitlabhq-6.8.2.ebuild 10605 SHA256 5a7e869aee5481f5c610c81a130ea677de4977d4fc184839b3f7ce16152dacb4 SHA512 3f63b20e111e74d183e36acaa9499287801b18e53f4a1f0e0271f2d93625bf9b311e3a1634e2426965cefd7fe9d2a86114b71ba32f91abded11bd0234ebc87f8 WHIRLPOOL 3f77d6e351f6552932efbe40af389069bda3e44933a0ab426663574ff490665e7ae9a8cfc2726e378073816de7423e8c8269e3cee01b0a64299044a1f99d4811
 EBUILD gitlabhq-6.9.2.ebuild 10626 SHA256 24d0e4410d93bce5bf9675a14b8618cc5590dc78b4b16a2a1b0b055b8d88fc6f SHA512 cb5b956a0b0699100704a66fff30c9d1706194b32f31208284b2622b81b3f612ceab17e9f6873cc97e0556f7eb009d0e9727595e72172b98b6fb91d483b3e5e4 WHIRLPOOL a7013e0dfc2ef18ad95eb060ebe301dc417e50420dad54f078625c699d0a4620ffc883ecb847030f7b2d4e590bfd2d901b72712f4a0af55bbf0ef6a78c139deb
 EBUILD gitlabhq-7.0.0.ebuild 10499 SHA256 46a604af0c5821ce08719c1a3b72423e5159be079a43087e7e7b5e6761edd552 SHA512 20bc45aa50f5e51df1b4f8773fb9c0c64a77b082786020046a1fe4a36d6bdaba79be503a5c7313aa042bd2f44460aabc0eba3f2dd9f1e36cabef7e6c9f118a01 WHIRLPOOL e60d41edac4865cba8df509df61499c8438c3e11d12a337935e229f828ebcd54fb82837e85fbf66a1845649e725ad13fdc7204af180659cc3b19e84f48f30ae1
-EBUILD gitlabhq-7.1.1.ebuild 10499 SHA256 babcd0144c9bb6bf5150ff93a05b3176da8768014cca16070f5e908531239eaf SHA512 d74ef14d451e2afdce265672bbbe33544b340cf915e78a1951fda1f8ac626c22540b43664bcf936b11ab159a0b7e8880ae13bb5343d54991526cc58ed8c6708f WHIRLPOOL 7d269b138742464c589ef5a874619d104906963af1a2306052d0c265a4123d57c70f3f70b4b56c920f794244e5255a1b9ddbc11e1778c15b1cb4a16278cd06b1
+EBUILD gitlabhq-7.1.1.ebuild 10506 SHA256 6cb6fde602b33739f1e37b944c2fb79fb53ac687d20cdf657289239f1e4d9112 SHA512 546fe8c2f272a2130e742a0155cdf20a5d78aea8faaecf2829c038e83d90e40ff5dcb1986236511f86d3dbeab47f07791ed541f3e83f1d99af701d25cc23178d WHIRLPOOL c5247ce35898b92e9045dbae95b7741592aefe2441b80f834a1cc7aab84aab8b96cc797b4fdcd55819d1872d724b4427d0e83fca68a6840a436497261e6738b7
--- a/www-apps/gitlabhq/files/gitlabhq-7.1.1-fix-gemfile.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-7.1.1-fix-gemfile.patch
@ -0,0 +1,88 @@
+diff --git a/Gemfile b/Gemfile
+index 86f8edb..0f2a83e 100644
+--- a/Gemfile
+++ b/Gemfile
+@@ -146,6 +146,10 @@ gem "underscore-rails", "~> 1.4.4"
+ # Sanitize user input
+ gem "sanitize", '~> 2.0'
+ 
+# The newer revision of charlock_holmes that is finally fixed to
+# be compatible with Gentoo
+gem "charlock_holmes", git: "https://github.com/brianmario/charlock_holmes.git", ref: "dde194609b3513b0d2369ce8f916ae52566154b4"
+
+ # Protect against bruteforcing
+ gem "rack-attack"
+ 
+@@ -158,7 +162,6 @@ gem 'semantic-ui-sass', '~> 0.16.1.0'
+ gem "sass-rails", '~> 4.0.2'
+ gem "coffee-rails"
+ gem "uglifier"
+-gem "therubyracer"
+ gem 'turbolinks'
+ gem 'jquery-turbolinks'
+ 
+diff --git a/Gemfile.lock b/Gemfile.lock
+index fe85e9e..7b4b1b1 100644
+--- a/Gemfile.lock
+++ b/Gemfile.lock
+@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/brianmario/charlock_holmes.git
+  revision: dde194609b3513b0d2369ce8f916ae52566154b4
+  ref: dde194609b3513b0d2369ce8f916ae52566154b4
+  specs:
+    charlock_holmes (0.6.9.4)
+
+ GEM
+   remote: https://rubygems.org/
+   specs:
+@@ -61,7 +68,6 @@ GEM
+       json (>= 1.7)
+     celluloid (0.15.2)
+       timers (~> 1.1.0)
+-    charlock_holmes (0.6.9.4)
+     cliver (0.3.2)
+     code_analyzer (0.4.3)
+       sexp_processor
+@@ -271,7 +277,6 @@ GEM
+       addressable (~> 2.3)
+     letter_opener (1.1.2)
+       launchy (~> 2.2)
+-    libv8 (3.16.14.3)
+     listen (2.3.1)
+       celluloid (>= 0.15.2)
+       rb-fsevent (>= 0.9.3)
+@@ -408,7 +413,6 @@ GEM
+       redis-store (~> 1.1.0)
+     redis-store (1.1.4)
+       redis (>= 2.2)
+-    ref (1.0.5)
+     request_store (1.0.5)
+     require_all (1.3.2)
+     rest-client (1.6.7)
+@@ -506,9 +510,6 @@ GEM
+     term-ansicolor (1.2.2)
+       tins (~> 0.8)
+     test_after_commit (0.2.2)
+-    therubyracer (0.12.0)
+-      libv8 (~> 3.16.14.0)
+-      ref
+     thin (1.6.1)
+       daemons (>= 1.0.9)
+       eventmachine (>= 1.0.0)
+@@ -580,6 +581,7 @@ DEPENDENCIES
+   bootstrap-sass (~> 3.0)
+   capybara (~> 2.2.1)
+   carrierwave
+  charlock_holmes!
+   coffee-rails
+   colored
+   coveralls
+@@ -671,7 +673,6 @@ DEPENDENCIES
+   stamp
+   state_machine
+   test_after_commit
+-  therubyracer
+   thin
+   tinder (~> 1.9.2)
+   turbolinks
--- a/www-apps/gitlabhq/files/gitlabhq-7.1.1-fix-project-name-regex.patch
+++ b/www-apps/gitlabhq/files/gitlabhq-7.1.1-fix-project-name-regex.patch
@ -0,0 +1,24 @@
+diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
+index 4b80388..30730aa 100644
+--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
+@@ -1,3 +1,5 @@
+# encoding: utf-8
+
+ module Gitlab
+   module Regex
+     extend self
+@@ -11,11 +13,11 @@ module Gitlab
+     end
+ 
+     def project_name_regex
+-      /\A[a-zA-Z0-9_][a-zA-Z0-9_\-\. ]*\z/
+      /\A[\p{Word}_][\p{Word}_\-:\. ]*\z/
+     end
+ 
+     def project_regex_message
+-      "can contain only letters, digits, '_', '-' and '.' and space. " \
+      "can contain only letters, digits, '_', '-', ':' and '.' and space. " \
+       "It must start with letter, digit or '_'."
+     end
+ 
--- a/www-apps/gitlabhq/gitlabhq-7.1.1.ebuild
+++ b/www-apps/gitlabhq/gitlabhq-7.1.1.ebuild
@ -68,10 +68,10 @@ ruby_add_bdepend "
 #
 RUBY_PATCHES=(
 	"${P}-fix-gemfile.patch"
-	"${PN}-6.7.5-fix-project-name-regex.patch"
+	"${P}-fix-project-name-regex.patch"
 	"${PN}-6.0.2-fix-sendmail-config.patch"
-	"${P}-ldap-custom-mapping.patch"
-	"${P}-email-custom-reply_to.patch"
+	"${PN}-7.0.0-ldap-custom-mapping.patch"
+	"${PN}-7.0.0-email-custom-reply_to.patch"
 )

 MY_NAME="gitlab"