qca2: Update to new upstream version 2.1.0.

This also removes qca2_ossl, because it's now bundled with the main QCA
package and we can now drop all those patches and build system fixes,
because they have switched from autotools to cmake.

Tested against a few builds like PSI and Tomahawk.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

pkgs/applications/audio/tomahawk/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest
-, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4
+, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4
 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper
 
 , enableXMPP      ? true,  libjreen     ? null
@@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
   postInstall = let
     pluginPath = stdenv.lib.concatStringsSep ":" [
       "${phonon_backend_vlc}/lib/kde4/plugins"
-      "${qca2_ossl}/lib/qt4/plugins"
     ];
   in ''
     for i in "$out"/bin/*; do

pkgs/applications/misc/kdeconnect/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2, qca2_ossl
+{ stdenv, fetchurl, gettext, kdelibs, libXtst, libfakekey, makeWrapper, pkgconfig, qca2
 , qjson
 }:
 
@@ -11,11 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
   };
 
-  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qca2_ossl qjson ];
+  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper pkgconfig qca2 qjson ];
-
-  postInstall = ''
-    wrapProgram $out/lib/kde4/libexec/kdeconnectd --prefix QT_PLUGIN_PATH : ${qca2_ossl}/lib/qt4/plugins
-  '';
 
   meta = with stdenv.lib; {
     description = "A tool to connect and sync your devices with KDE";

pkgs/applications/networking/instant-messengers/psi/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM
-, libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib
+, libICE, qca2, pkgconfig, liboil, speex, callPackage, which, glib
 , libXScrnSaver, scrnsaverproto
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ aspell qt4 zlib sox libX11 xproto libSM libICE
-      qca2 qca2_ossl pkgconfig which glib scrnsaverproto libXScrnSaver
+      qca2 pkgconfig which glib scrnsaverproto libXScrnSaver
     ];
 
   NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
     PSI_PLUGINS="$out/lib/psi/plugins"
     mkdir -p "$PSI_PLUGINS"
     ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS"
-    PSI_QT_PLUGINS="$out/share/psi"
-    mkdir -p "$PSI_QT_PLUGINS"/crypto
-    ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto
   '';
 
   meta = {

pkgs/development/libraries/qca2/default.nix

@@ -1,29 +1,15 @@
-{ stdenv, fetchurl, which, qt4 }:
+{ stdenv, fetchurl, cmake, pkgconfig, qt }:
 
 stdenv.mkDerivation rec {
-  name = "qca-2.0.3";
+  name = "qca-2.1.0";
 
   src = fetchurl {
-    url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2";
+    url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz";
-    sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld";
+    sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92";
   };
 
-  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ cmake pkgconfig ];
-  
+  buildInputs = [ qt ];
-  nativeBuildInputs = [ which ];
-
-  preBuild =
-    ''
-      sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\
-              EMSA3_SHA224,     ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
-              EMSA3_SHA256,     ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
-              EMSA3_SHA384,     ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\
-              EMSA3_SHA512      ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding'
-    '';
-
-  patches = [ ./gcc47.patch ];
-
-  configureFlags = "--no-separate-debug-info";
 
   enableParallelBuilding = true;
 

pkgs/development/libraries/qca2/gcc47.patch

@@ -1,12 +0,0 @@
-# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html
---- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200
-+++ qca-2.0.3/src/botantools/botan/botan/secmem.h  2012-09-16 23:28:43.767480490 +0200
-@@ -214,7 +214,7 @@
- 
-       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
-       SecureVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(true); set(in, n); }
-+         { MemoryRegion<T>::init(true); this->set(in, n); }
-       SecureVector(const MemoryRegion<T>& in)
-          { MemoryRegion<T>::init(true); set(in); }
-       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)

pkgs/development/libraries/qca2/ossl.nix

@@ -1,33 +0,0 @@
-{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}:
-
-stdenv.mkDerivation rec {
-  version = "2.0.0-beta3";
-  name = "qca-ossl-${version}";
-  src = fetchurl {
-    url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2";
-    sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08";
-  };
-  # SVN version has stabilized and has a lot of fixes for fresh OpenSSL
-  # Take the main source from there
-  git_src = fetchgit {
-    url = git://anongit.kde.org/qca;
-    rev = "0a8b9db6613f2282fe492ff454412f502a6be410";
-    sha256 =  "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1";
-  };
-  buildInputs = [ qt4 qca2 openssl ];
-  nativeBuildInputs = [ which ];
-  dontAddPrefix = true;
-  configureFlags="--no-separate-debug-info --with-qca=${qca2}
-    --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib";
-  preConfigure=''
-    cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp .
-
-    configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins"
-  '';
-  meta = with stdenv.lib; {
-    description = "Qt Cryptographic Architecture OpenSSL plugin";
-    license = "LGPL";
-    homepage = http://delta.affinix.com/qca;
-    maintainers = [ maintainers.urkud ];
-  };
-}

pkgs/top-level/all-packages.nix

@@ -7252,9 +7252,7 @@ let
 
   re2 = callPackage ../development/libraries/re2 { };
 
-  qca2 = callPackage ../development/libraries/qca2 {};
+  qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
-
-  qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {};
 
   qimageblitz = callPackage ../development/libraries/qimageblitz {};