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

qca2: Update to new upstream version 2.1.0.

Browse Source 
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>
This commit is contained in:
aszlig
2015-03-31 02:13:06 +02:00
parent ee7c9bd86a
commit 6a4370f1ba
7 changed files with 14 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qca2/default.nix
+8 -22
View File
@@ -1,32 +1,18 @@
{ 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";
sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld";
url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz";
sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92";
};
buildInputs = [ qt4 ];
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";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ qt ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Qt Cryptographic Architecture";
license = "LGPL";
pkgs/development/libraries/qca2/gcc47.patch
-12
View File
@@ -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
-33
View File
@@ -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 ];
};
}