diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2008-11-10 19:08:10 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2008-11-10 19:08:10 +0000 |
| commit | ee32d677abfdab1efdb97ebe44e35720bd6c8299 (patch) | |
| tree | 832adc67240f710cc73f8729d30466dd98d41cca /pkgs/development/libraries/gnutls | |
| parent | 0eed283de02af280c3c1fad5ff1e79217f1350a5 (diff) | |
| download | nixpkgs-ee32d677abfdab1efdb97ebe44e35720bd6c8299.tar nixpkgs-ee32d677abfdab1efdb97ebe44e35720bd6c8299.tar.gz nixpkgs-ee32d677abfdab1efdb97ebe44e35720bd6c8299.tar.bz2 nixpkgs-ee32d677abfdab1efdb97ebe44e35720bd6c8299.tar.lz nixpkgs-ee32d677abfdab1efdb97ebe44e35720bd6c8299.tar.xz nixpkgs-ee32d677abfdab1efdb97ebe44e35720bd6c8299.tar.zst nixpkgs-ee32d677abfdab1efdb97ebe44e35720bd6c8299.zip | |
GnuTLS 2.6.1.
svn path=/nixpkgs/trunk/; revision=13240
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gnutls/tmpdir.patch | 37 |
2 files changed, 16 insertions, 25 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3af9fe0395b..0617730433a 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-2.4.2"; + name = "gnutls-2.6.1"; src = fetchurl { url = "mirror://gnu/gnutls/${name}.tar.bz2"; - sha256 = "03mvpx35psvw51rv60jffpddziz6vbpapwn8lcgc7iwiqqbfjw0w"; + sha256 = "19yhhni61vslbi325yxk6zh8ci3kc2ndfgp36v6av5zq10ih9rrk"; }; patches = [ ./tmpdir.patch ]; diff --git a/pkgs/development/libraries/gnutls/tmpdir.patch b/pkgs/development/libraries/gnutls/tmpdir.patch index 5670647af5f..bc61d7e5079 100644 --- a/pkgs/development/libraries/gnutls/tmpdir.patch +++ b/pkgs/development/libraries/gnutls/tmpdir.patch @@ -5,29 +5,20 @@ build failures in chroots. See also: http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/2693 ---- gnutls-2.4.0/tests/Makefile.in 2008-06-18 17:02:36.000000000 +0200 -+++ gnutls-2.4.0/tests/Makefile.in 2008-06-28 20:00:10.000000000 +0200 -@@ -56,7 +56,7 @@ host_triplet = @host@ - @HAVE_FORK_TRUE@am__append_2 = x509self x509signself x509dn anonself pskself dhepskself \ - @HAVE_FORK_TRUE@ tlsia resume netconf-psk +--- gnutls-2.6.1/tests/Makefile.in 2008-11-10 10:37:52.000000000 +0100 ++++ gnutls-2.6.1/tests/Makefile.in 2008-11-10 19:31:52.000000000 +0100 +@@ -58,7 +58,7 @@ host_triplet = @host@ + @HAVE_FORK_TRUE@am__append_4 = x509self x509signself x509dn anonself pskself dhepskself \ + @HAVE_FORK_TRUE@ tlsia resume netconf-psk setcredcrash --@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_3 = openpgpself -+@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_3 = - @ENABLE_OPRFI_TRUE@am__append_4 = oprfi - check_PROGRAMS = $(am__EXEEXT_4) - TESTS = $(am__EXEEXT_4) -@@ -151,7 +151,7 @@ libutils_la_OBJECTS = $(am_libutils_la_O - @HAVE_FORK_TRUE@ tlsia$(EXEEXT) resume$(EXEEXT) \ - @HAVE_FORK_TRUE@ netconf-psk$(EXEEXT) - @ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__EXEEXT_2 = \ --@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@ openpgpself$(EXEEXT) -+@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@ - @ENABLE_OPRFI_TRUE@am__EXEEXT_3 = oprfi$(EXEEXT) - am__EXEEXT_4 = simple$(EXEEXT) openssl$(EXEEXT) gc$(EXEEXT) \ - set_pkcs12_cred$(EXEEXT) certder$(EXEEXT) \ +-@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_5 = openpgpself ++@ENABLE_OPENPGP_TRUE@@HAVE_FORK_TRUE@am__append_5 = + @ENABLE_OPRFI_TRUE@am__append_6 = oprfi + check_PROGRAMS = $(am__EXEEXT_5) + TESTS = $(am__EXEEXT_5) ---- gnutls-2.4.0/tests/openpgp/Makefile.in 2008-06-18 17:02:37.000000000 +0200 -+++ gnutls-2.4.0/tests/openpgp/Makefile.in 2008-06-27 20:07:00.000000000 +0200 +--- gnutls-2.6.1/tests/openpgp/Makefile.in 2008-11-10 10:37:52.000000000 +0100 ++++ gnutls-2.6.1/tests/openpgp/Makefile.in 2008-11-10 19:32:26.000000000 +0100 @@ -51,7 +51,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ @@ -38,8 +29,8 @@ build failures in chroots. See also: subdir = tests/openpgp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ---- gnutls-2.4.0/guile/tests/Makefile.in 2008-06-18 17:02:34.000000000 +0200 -+++ gnutls-2.4.0/guile/tests/Makefile.in 2008-06-27 20:08:13.000000000 +0200 +--- gnutls-2.6.1/guile/tests/Makefile.in 2008-11-10 10:37:50.000000000 +0100 ++++ gnutls-2.6.1/guile/tests/Makefile.in 2008-11-10 19:32:50.000000000 +0100 @@ -48,7 +48,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ |