Author: eelco
Date: Sat Jul 24 08:50:30 2010
New Revision: 22724
URL: https://svn.nixos.org/websvn/nix/?rev=22724&sc=1
Log:
* Make mutt build against OpenSSL 1.0.0.
Added:
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/mutt/openssl.patch
Modified:
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/mutt/default.nix
Modified:
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/mutt/default.nix
==============================================================================
---
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/mutt/default.nix
Fri Jul 23 15:36:35 2010 (r22723)
+++
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/mutt/default.nix
Sat Jul 24 08:50:30 2010 (r22724)
@@ -14,16 +14,21 @@
stdenv.mkDerivation {
name = "mutt-1.5.20";
+
src = fetchurl {
url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz;
sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm";
};
+
+ patches = [ ./openssl.patch ];
+
buildInputs = [
ncurses which perl
(if headerCache then gdbm else null)
(if sslSupport then openssl else null)
(if saslSupport then cyrus_sasl else null)
];
+
configureFlags = [
"--with-mailpath=" "--enable-smtp"
# The next allows building mutt without having anything setgid
Added:
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/mutt/openssl.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/x-updates/pkgs/applications/networking/mailreaders/mutt/openssl.patch
Sat Jul 24 08:50:30 2010 (r22724)
@@ -0,0 +1,15 @@
+Fixes a compilation problem with OpenSSL 1.0.0.
+From http://www.freebsd.org/cgi/query-pr.cgi?pr=146261
+
+diff -ru -x '*~' mutt-1.5.20-orig/mutt_ssl.c mutt-1.5.20/mutt_ssl.c
+--- mutt-1.5.20-orig/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200
++++ mutt-1.5.20/mutt_ssl.c 2010-07-24 10:46:08.000000000 +0200
+@@ -652,7 +652,7 @@
+ char *buf = NULL;
+ int bufsize;
+ /* needed to get the DNS subjectAltNames: */
+- STACK *subj_alt_names;
++ STACK_OF(GENERAL_NAME) *subj_alt_names;
+ int subj_alt_names_count;
+ GENERAL_NAME *subj_alt_name;
+ /* did we find a name matching hostname? */
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
