public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: 8.12.6 -> 8.12.8, fix CVE-2016-9086

Browse Source 
https://about.gitlab.com/2016/11/02/cve-2016-9086-patches/
This commit is contained in:
Franz Pletz 2016-11-03 05:31:24 +01:00
parent d4eae0d23a
commit a7d35fdff3
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/gitlab/Gemfile
View File

@ -103,7 +103,7 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing # Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0' gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
gem 'github-markup', '~> 1.4' gem 'gitlab-markup', '~> 1.5.0'
gem 'redcarpet', '~> 3.3.3' gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.3.2' gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~>3.6' gem 'rdoc', '~>3.6'

3
pkgs/applications/version-management/gitlab/Gemfile.lock
View File

@ -281,6 +281,7 @@ GEM
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3) posix-spawn (~> 0.3)
gitlab-markup (1.5.0)
gitlab_git (10.6.6) gitlab_git (10.6.6)
activesupport (~> 4.0) activesupport (~> 4.0)
charlock_holmes (~> 0.7.3) charlock_holmes (~> 0.7.3)
@ -868,8 +869,8 @@ DEPENDENCIES
gemnasium-gitlab-service (~> 0.2) gemnasium-gitlab-service (~> 0.2)
gemojione (~> 3.0) gemojione (~> 3.0)
github-linguist (~> 4.7.0) github-linguist (~> 4.7.0)
github-markup (~> 1.4)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
github-markup (~> 1.5.0)
gitlab_git (~> 10.6.6) gitlab_git (~> 10.6.6)
gitlab_meta (= 7.0) gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1) gitlab_omniauth-ldap (~> 1.2.1)

4
pkgs/applications/version-management/gitlab/default.nix
View File

@ -24,7 +24,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gitlab-${version}"; name = "gitlab-${version}";
version = "8.12.6"; version = "8.12.8";
buildInputs = [ env ruby bundler tzdata git nodejs procps ]; buildInputs = [ env ruby bundler tzdata git nodejs procps ];
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "gitlabhq"; owner = "gitlabhq";
repo = "gitlabhq"; repo = "gitlabhq";
rev = "v${version}"; rev = "v${version}";
sha256 = "14dbr8a1il75xz83hkdjm3yq49168mkn62l86bi36n5pfw44kcvh"; sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3";
}; };
patches = [ patches = [

11
pkgs/applications/version-management/gitlab/gemset.nix
View File

@ -937,6 +937,7 @@
type = "gem"; type = "gem";
}; };
version = "1.4.0"; version = "1.4.0";
meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown
}; };
gitlab-flowdock-git-hook = { gitlab-flowdock-git-hook = {
dependencies = ["flowdock" "gitlab-grit" "multi_json"]; dependencies = ["flowdock" "gitlab-grit" "multi_json"];
@ -955,6 +956,14 @@
}; };
version = "2.8.1"; version = "2.8.1";
}; };
gitlab-markup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a";
type = "gem";
};
version = "1.5.0";
};
gitlab_git = { gitlab_git = {
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
@ -2821,4 +2830,4 @@
}; };
version = "2.0.0"; version = "2.0.0";
}; };
} }