diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 20:38:48 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-07-08 20:38:48 +0000 |
| commit | 80e2d957e60b7341f1ebd677bd45cd97bdd827d8 (patch) | |
| tree | b075064e0e611464410a6330264a029cf0788c20 | |
| parent | 7c5e566c5c6025449f7ecff03acf73f5fa9ab516 (diff) | |
| download | nixlib-80e2d957e60b7341f1ebd677bd45cd97bdd827d8.tar nixlib-80e2d957e60b7341f1ebd677bd45cd97bdd827d8.tar.gz nixlib-80e2d957e60b7341f1ebd677bd45cd97bdd827d8.tar.bz2 nixlib-80e2d957e60b7341f1ebd677bd45cd97bdd827d8.tar.lz nixlib-80e2d957e60b7341f1ebd677bd45cd97bdd827d8.tar.xz nixlib-80e2d957e60b7341f1ebd677bd45cd97bdd827d8.tar.zst nixlib-80e2d957e60b7341f1ebd677bd45cd97bdd827d8.zip | |
Add a patch to work around GNU TLS behavior
svn path=/nixpkgs/trunk/; revision=22540
| -rw-r--r-- | pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch | 12 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch new file mode 100644 index 000000000000..de4b94f09572 --- /dev/null +++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.gnutls.patch @@ -0,0 +1,12 @@ +diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c +--- a/libsoup/soup-gnutls.c ++++ b/libsoup/soup-gnutls.c +@@ -477,7 +477,7 @@ soup_ssl_wrap_iochannel (GIOChannel *sock, gboolean non_blocking, + goto THROW_CREATE_ERROR; + + /* See http://bugzilla.gnome.org/show_bug.cgi?id=581342 */ +- if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0) ++ if (gnutls_priority_set_direct (session, "NORMAL:!VERS-TLS1.2:!VERS-TLS1.1:!VERS-TLS1.0", NULL) != 0) + goto THROW_CREATE_ERROR; + + if (gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, diff --git a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix index cc1b6467d8c6..6ddc76e0f4be 100644 --- a/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix +++ b/pkgs/desktops/gnome-2.28/desktop/libsoup/2.31.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation { url = mirror://gnome/sources/libsoup/2.31/libsoup-2.31.2.tar.bz2; sha256 = "ae52e970deb0ca5e890d87cf55e555249c086bd56ae1fff69599174ca0075379"; }; + patches = [./2.31.gnutls.patch]; buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl glib GConf gnome_keyring ]; } |