diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-07 13:52:17 +0000 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-10 07:12:08 +0200 |
| commit | b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526 (patch) | |
| tree | ade0d51a3449de13f4cb688202c9e33ae1dd9567 | |
| parent | 347c1ed8a0db3bbf431ba3436edbff964395861b (diff) | |
| download | nixlib-b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526.tar nixlib-b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526.tar.gz nixlib-b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526.tar.bz2 nixlib-b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526.tar.lz nixlib-b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526.tar.xz nixlib-b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526.tar.zst nixlib-b08247f1e4803e4bfa9eeec6d9dbe80e52d3b526.zip | |
ptlib: 2.10.10 -> 2.10.11, add check for SSLv3
| -rw-r--r-- | pkgs/development/libraries/ptlib/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/ptlib/sslv3.patch | 16 |
2 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index aa2601a7bd3e..604f246e711f 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -2,20 +2,20 @@ , openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }: stdenv.mkDerivation rec { - name = "ptlib-2.10.10"; + name = "ptlib-2.10.11"; src = fetchurl { 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 cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ]; enableParallelBuilding = true; - patches = [ ./bison.patch ]; - + patches = [ ./bison.patch ./sslv3.patch ]; + meta = with stdenv.lib; { description = "Portable Tools from OPAL VoIP"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/ptlib/sslv3.patch b/pkgs/development/libraries/ptlib/sslv3.patch new file mode 100644 index 000000000000..1ccf3593ec1f --- /dev/null +++ b/pkgs/development/libraries/ptlib/sslv3.patch @@ -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: |