qca2: remove
This commit is contained in:
parent
ed3fab5173
commit
bf95b6e456
|
@ -1,35 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, openssl, cmake, pkg-config, qt, darwin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qca";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz";
|
||||
sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ openssl qt ]
|
||||
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
|
||||
|
||||
# tells CMake to use this CA bundle file if it is accessible
|
||||
preConfigure = ''
|
||||
export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt
|
||||
'';
|
||||
|
||||
# tricks CMake into using this CA bundle file if it is not accessible (in a sandbox)
|
||||
cmakeFlags = [ "-Dqca_CERTSTORE=/etc/ssl/certs/ca-certificates.crt" ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Qt Cryptographic Architecture";
|
||||
license = "LGPL";
|
||||
homepage = "http://delta.affinix.com/qca";
|
||||
maintainers = [ maintainers.sander ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
|
@ -1,28 +0,0 @@
|
|||
--- a/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:34:25.810682094 +0000
|
||||
+++ b/plugins/qca-ossl/qca-ossl.cpp 2015-12-02 09:29:51.720392423 +0000
|
||||
@@ -5403,11 +5403,13 @@
|
||||
ctx = SSL_CTX_new(SSLv2_client_method());
|
||||
break;
|
||||
#endif
|
||||
+#ifndef OPENSSL_NO_SSL3
|
||||
case TLS::SSL_v3:
|
||||
ctx = SSL_CTX_new(SSLv3_client_method());
|
||||
break;
|
||||
+#endif
|
||||
case TLS::TLS_v1:
|
||||
+ ctx = SSL_CTX_new(SSLv23_client_method());
|
||||
- ctx = SSL_CTX_new(TLSv1_client_method());
|
||||
break;
|
||||
case TLS::DTLS_v1:
|
||||
default:
|
||||
@@ -7133,8 +7135,10 @@
|
||||
return new opensslInfoContext(this);
|
||||
else if ( type == "sha1" )
|
||||
return new opensslHashContext( EVP_sha1(), this, type);
|
||||
+#ifndef OPENSSL_NO_SHA0
|
||||
else if ( type == "sha0" )
|
||||
return new opensslHashContext( EVP_sha(), this, type);
|
||||
+#endif
|
||||
else if ( type == "ripemd160" )
|
||||
return new opensslHashContext( EVP_ripemd160(), this, type);
|
||||
#ifdef HAVE_OPENSSL_MD2
|
|
@ -1192,6 +1192,7 @@ mapAliases ({
|
|||
|
||||
QmidiNet = throw "'QmidiNet' has been renamed to/replaced by 'qmidinet'"; # Converted to throw 2022-02-22
|
||||
qca-qt5 = throw "'qca-qt5' has been renamed to/replaced by 'libsForQt5.qca-qt5'"; # Converted to throw 2022-02-22
|
||||
qca2 = throw "qca2 has been removed, because it depended on qt4"; # Added 2022-05-26
|
||||
qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05
|
||||
qflipper = qFlipper; # Added 2022-02-11
|
||||
qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02
|
||||
|
|
|
@ -20832,8 +20832,6 @@ with pkgs;
|
|||
|
||||
qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };
|
||||
|
||||
qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
|
||||
|
||||
qimageblitz = callPackage ../development/libraries/qimageblitz {};
|
||||
|
||||
qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
|
||||
|
|
Loading…
Reference in a new issue