[packages/gitlab-shell] up to 3.3.0

[glen]

commit 7f95a39d32bbde922920c27a517b6a43ed235cf8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Aug 4 09:28:34 2016 +0300

    up to 3.3.0
    
    repos_path comes now from commandline, not from config to support
    multiple git storage paths

 config.yml.patch     | 16 ++++++----------
 gitlab-shell.spec    |  6 +++---
 unvendor-redis.patch |  5 +++++
 3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index 8b61c5e..bef91f2 100644
--- a/gitlab-shell.spec
+++ b/gitlab-shell.spec
@@ -4,14 +4,14 @@
 %define gname git
 Summary:	GitLab ssh access and repository management
 Name:		gitlab-shell
-Version:	3.0.0
+Version:	3.3.0
 Release:	1
 License:	MIT
 Group:		Applications/Shells
 Source0:	https://github.com/gitlabhq/gitlab-shell/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	1798d8026f92729b607d9656ca6c6c01
+# Source0-md5:	30d6c1e19eb4f45954e55ea27e3cb68e
 Patch0:		config.yml.patch
-URL:		https://github.com/gitlabhq/gitlab-shell
+URL:		https://gitlab.com/gitlab-org/gitlab-shell
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.665
 BuildRequires:	sed >= 4.0
diff --git a/config.yml.patch b/config.yml.patch
index bcd01d3..18527d5 100644
--- a/config.yml.patch
+++ b/config.yml.patch
@@ -1,5 +1,5 @@
---- gitlab-shell-1.9.5/config.yml	2014-06-02 04:44:18.214779888 +0200
-+++ gitlab-shell-1.9.5/config.yml	2014-06-02 04:44:18.214779888 +0200
+--- gitlab-shell-3.3.0/config.yml~	2016-08-04 09:24:14.000000000 +0300
++++ gitlab-shell-3.3.0/config.yml	2016-08-04 09:26:47.671443673 +0300
 @@ -1,5 +1,5 @@
  # GitLab user. git by default
 -user: git
@@ -7,19 +7,15 @@
  
  # Url to gitlab instance. Used for api calls. Should end with a slash.
  gitlab_url: "http://localhost/"
-@@ -15,10 +15,10 @@
- # Give the canonicalized absolute pathname,
- # REPOS_PATH MUST NOT CONTAIN ANY SYMLINK!!!
- # Check twice that none of the components is a symlink, including "/home".
--repos_path: "/home/git/repositories"
-+repos_path: "/var/lib/gitlab/repositories"
+@@ -25,7 +25,7 @@
+   self_signed_cert: false
  
  # File used as authorized_keys for gitlab user
 -auth_file: "/home/git/.ssh/authorized_keys"
 +auth_file: "/var/lib/gitlab/.ssh/authorized_keys"
  
- # Redis settings used for pushing commit notices to gitlab
- redis:
+ # File that contains the secret key for verifying access to GitLab.
+ # Default is .gitlab_shell_secret in the root directory.
 @@ -35,21 +35,21 @@
  
  # File that contains the secret key for verifying access to GitLab.
diff --git a/unvendor-redis.patch b/unvendor-redis.patch
index 17af827..d823580 100644
--- a/unvendor-redis.patch
+++ b/unvendor-redis.patch
@@ -5,3 +5,8 @@
  require 'yaml'
  
  class GitlabConfig
+--- gitlab-shell-3.3.0/lib/gitlab_redis.rb~	2016-07-27 18:29:35.000000000 +0300
++++ gitlab-shell-3.3.0/lib/gitlab_redis.rb	2016-08-04 09:31:43.753514191 +0300
+@@ -1,2 +1 @@
+-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
+ require 'redis'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-shell.git/commitdiff/7f95a39d32bbde922920c27a517b6a43ed235cf8