about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2018-10-01 19:57:46 +0200
committerMichael Weiss <dev.primeos@gmail.com>2018-10-01 20:16:26 +0200
commit18b468ed8186131d5a8a6590ff10253e12d0195a (patch)
tree05ab88ef4f330c2789da3cb8093c800ac05c6a5d /pkgs/applications
parent83fd9785f65b8fd4cbaa146270f90b2a0d74b5f3 (diff)
downloadnixlib-18b468ed8186131d5a8a6590ff10253e12d0195a.tar
nixlib-18b468ed8186131d5a8a6590ff10253e12d0195a.tar.gz
nixlib-18b468ed8186131d5a8a6590ff10253e12d0195a.tar.bz2
nixlib-18b468ed8186131d5a8a6590ff10253e12d0195a.tar.lz
nixlib-18b468ed8186131d5a8a6590ff10253e12d0195a.tar.xz
nixlib-18b468ed8186131d5a8a6590ff10253e12d0195a.tar.zst
nixlib-18b468ed8186131d5a8a6590ff10253e12d0195a.zip
gollum: 4.1.3 -> 4.1.4 (security, CVE-2018-3740)
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/gollum/Gemfile.lock10
-rw-r--r--pkgs/applications/misc/gollum/gemset.nix12
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index f63ffa091a07..977bd5e50ddd 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -11,22 +11,22 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gollum (4.1.3)
+    gollum (4.1.4)
       gemojione (~> 3.2)
-      gollum-lib (>= 4.2.9)
+      gollum-lib (~> 4.2, >= 4.2.10)
       kramdown (~> 1.9.0)
       mustache (>= 0.99.5, < 1.0.0)
       sinatra (~> 1.4, >= 1.4.4)
       useragent (~> 0.16.2)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.2.9)
+    gollum-lib (4.2.10)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
       gollum-grit_adapter (~> 1.0)
       nokogiri (>= 1.6.1, < 2.0)
       rouge (~> 2.1)
-      sanitize (~> 2.1)
+      sanitize (~> 2.1.1, >= 2.1.1)
       stringex (~> 2.6)
       twitter-text (= 1.14.7)
     json (2.1.0)
@@ -43,7 +43,7 @@ GEM
     rack-protection (1.5.5)
       rack
     rouge (2.2.1)
-    sanitize (2.1.0)
+    sanitize (2.1.1)
       nokogiri (>= 1.4.4)
     sinatra (1.4.8)
       rack (~> 1.5)
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 1b3cda168ac2..3413b6ba6310 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -45,10 +45,10 @@
     dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1146irmnm0xyzjzw8k14wvb6h4cqh4q53ds92wk6jpsfs6r1pjq6";
+      sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7";
       type = "gem";
     };
-    version = "4.1.3";
+    version = "4.1.4";
   };
   gollum-grit_adapter = {
     dependencies = ["gitlab-grit"];
@@ -63,10 +63,10 @@
     dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w48mrjgy4ykd1ix421n96nx0w15iid2aj3sgglpl3bdkizxhfqj";
+      sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf";
       type = "gem";
     };
-    version = "4.2.9";
+    version = "4.2.10";
   };
   json = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.1.1";
   };
   sinatra = {
     dependencies = ["rack" "rack-protection" "tilt"];