Merge remote-tracking branch 'origin/master' into hardened-stdenv

pkgs/tools/archivers/pxattr/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, gcc }:
+
+stdenv.mkDerivation rec {
+  name = "pxattr-2.1.0";
+
+  src = fetchurl {
+    url = "http://www.lesbonscomptes.com/pxattr/pxattr-2.1.0.tar.gz";
+    sha256 = "1dwcqc5z7gzma1zhis2md49bj2nq7m6jimh4zlx9szw6svisz56z";
+  };
+
+  buildInputs = [ gcc ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pxattr $out/bin
+  '';
+
+  meta = {
+    homepage = http://www.lesbonscomptes.com/pxattr/index.html;
+    description = "Provides a single interface to extended file attributes";
+    maintainers = [ stdenv.lib.maintainers.vrthra ];
+    license = [ stdenv.lib.licenses.mit ];
+  };
+}

pkgs/tools/archivers/unarj/default.nix

@@ -1,11 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "unarj-2.63a";
+  name = "unarj-${version}";
+  version = "2.65";
 
   src = fetchurl {
-    url = http://www.ibiblio.org/pub/Linux/utils/compress/unarj-2.63a.tar.gz;
-    sha256 = "0j4sn57fq2p23pcq4ck06pm618q4vq09wgm89ilfn4c9l9x2ky1k";
+    sha256 = "0r027z7a0azrd5k885xvwhrxicpd0ah57jzmaqlypxha2qjw7p6p";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/unarj/${name}.tar.gz/c6fe45db1741f97155c7def322aa74aa/${name}.tar.gz";
   };
 
   preInstall = ''
@@ -13,8 +14,11 @@ stdenv.mkDerivation rec {
     sed -i -e s,/usr/local/bin,$out/bin, Makefile
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Unarchiver of ARJ files";
-    license = stdenv.lib.licenses.free;
+    license = licenses.free;
+    maintainers = with maintainers; [ nckx ];
+    # Vulnerable to CVE-2015-0557 & possibly CVE-2015-0556, CVE-2015-2782:
+    broken = true;
   };
 }

pkgs/tools/archivers/xarchive/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A GTK+ front-end for command line archiving tools";
-    maintainers = [ stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.domenkozar ];
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };

pkgs/tools/archivers/xarchiver/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GTK+2 only frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
     homepage = http://sourceforge.net/projects/xarchiver/;
-    maintainers = [ stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.domenkozar ];
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
   };

pkgs/tools/archivers/zpaq/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, unzip }:
 stdenv.mkDerivation rec {
   name = "zpaq-${version}";
-  version = "7.12";
+  version = "7.13";
 
   src = let
     mungedVersion = with stdenv.lib; concatStrings (splitString "." version);
   in fetchurl {
-    sha256 = "1lgkxiinam80pqqyvs3x845k6kf0wgw121vz0gr8za4blb756n30";
+    sha256 = "06fry12c92nxds2m5cd69h0cpxvp0mxhssagmjiwxpmgn57wy84i";
     url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip";
   };