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

* Make mutt build against OpenSSL 1.0.0.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=22724
This commit is contained in:
Eelco Dolstra
2010-07-24 08:50:30 +00:00
parent 3587a2f78e
commit 9b87ffa522
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/mailreaders/mutt/default.nix
+5
View File
@@ -14,16 +14,21 @@ assert saslSupport -> cyrus_sasl != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mutt-1.5.20"; name = "mutt-1.5.20";
src = fetchurl { src = fetchurl {
url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz; url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz;
sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm"; sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm";
}; };
patches = [ ./openssl.patch ];
buildInputs = [ buildInputs = [
ncurses which perl ncurses which perl
(if headerCache then gdbm else null) (if headerCache then gdbm else null)
(if sslSupport then openssl else null) (if sslSupport then openssl else null)
(if saslSupport then cyrus_sasl else null) (if saslSupport then cyrus_sasl else null)
]; ];
configureFlags = [ configureFlags = [
"--with-mailpath=" "--enable-smtp" "--with-mailpath=" "--enable-smtp"
# The next allows building mutt without having anything setgid # The next allows building mutt without having anything setgid
pkgs/applications/networking/mailreaders/mutt/openssl.patch
+15
View File
@@ -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? */