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

ptlib: 2.10.10 -> 2.10.11, add check for SSLv3

This commit is contained in:
Robin Gloster 2016-02-07 13:52:17 +00:00 committed by Franz Pletz
parent 347c1ed8a0
commit b08247f1e4
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/ptlib/default.nix
View File

@ -2,11 +2,11 @@
, openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }: , openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ptlib-2.10.10"; name = "ptlib-2.10.11";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz"; url = "mirror://gnome/sources/ptlib/2.10/${name}.tar.xz";
sha256 = "7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4"; sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs";
}; };
buildInputs = [ pkgconfig bison flex unixODBC openssl openldap buildInputs = [ pkgconfig bison flex unixODBC openssl openldap
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [ ./bison.patch ]; patches = [ ./bison.patch ./sslv3.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Portable Tools from OPAL VoIP"; description = "Portable Tools from OPAL VoIP";

16
pkgs/development/libraries/ptlib/sslv3.patch Normal file
View File

@ -0,0 +1,16 @@
--- ptlib-2.10.11/src/ptclib/pssl.cxx 2016-02-07 09:54:36.326325637 +0000
+++ ptlib-2.10.11/src/ptclib/pssl.cxx 2016-02-07 09:55:55.677870908 +0000
@@ -805,11 +805,13 @@
SSL_METHOD * meth;
switch (method) {
+#if !defined(OPENSSL_NO_SSL3)
case SSLv3:
meth = SSLv3_method();
break;
+#endif
case TLSv1:
meth = TLSv1_method();
break;
case SSLv23:
default: