From ee74e1a055907e2ba66b871accd77038ee73597d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 4 Feb 2015 11:48:13 +0100
Subject: [PATCH] solr: 4.10.2 -> 4.10.3, CVE-2014-3628
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4fa25ee93a45df61d97cf7ddd0149bbd954216d0)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/build-support/fetchurl/mirrors.nix |  2 +-
 pkgs/servers/search/solr/default.nix    | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 8e9e9297372..5f0fe5fa486 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -262,7 +262,6 @@ rec {
 
   # Apache mirrors (see http://www.apache.org/mirrors/).
   apache = [
-    http://apache.cs.uu.nl/dist/
     http://www.eu.apache.org/dist/
     ftp://ftp.inria.fr/pub/Apache/
     http://apache.cict.fr/
@@ -272,6 +271,7 @@ rec {
     http://www.apache.org/dist/
     http://archive.apache.org/dist/ # fallback for old releases
     ftp://ftp.funet.fi/pub/mirrors/apache.org/
+    http://apache.cs.uu.nl/dist/
   ];
 
   postgresql = [
diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index a5dbaa1731d..76a83d77c5e 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "solr-${version}";
-  version = "4.10.2";
+  version = "4.10.3";
 
   src = fetchurl {
     url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz";
-    sha256 = "07wwfgwcca3ndjrkfk7qyc4q8bdhwr0s6h4ijl4sqdy65aqcc6qh";
+    sha256 = "1dp269jka4q62qhv47j91wsrsnbxfn23lsx6qcycbijrlyh28w5c";
   };
 
   phases = [ "unpackPhase" "installPhase" ];
@@ -17,14 +17,12 @@ stdenv.mkDerivation rec {
     cp -r example/lib/ext $out/lib/ext
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://lucene.apache.org/solr/";
-    description = ''
-      Open source enterprise search platform from the Apache Lucene project
-    '';
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    description = "Open source enterprise search platform from the Apache Lucene project";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.rickynils maintainers.iElectric ];
   };
 
 }