From 32827eeb8e986a46b71a43c74a9af2e83656b5d4 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 27 Mar 2006 09:07:48 +0000 Subject: [PATCH] Stefan Fiedler: - update mutt to devel version (1.5.11), this fixes as segfault - place cyrus-sasl2 headers in /usr/include/sasl, sasl1 headers in /usr/include/sasl1, as required for the mutt build. Index: package/tsa/cyrus-sasl2/cyrus-sasl2.conf =================================================================== [2006032420170825328] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7353 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/mutt/mutt.desc | 5 ++--- package/tsa/cyrus-sasl/cyrus-sasl.conf | 4 ++-- package/tsa/cyrus-sasl2/cyrus-sasl2.conf | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/base/mutt/mutt.desc b/package/base/mutt/mutt.desc index 0e2022f26..8540e0ce1 100644 --- a/package/base/mutt/mutt.desc +++ b/package/base/mutt/mutt.desc @@ -37,8 +37,7 @@ [L] GPL [S] Stable -[V] 1.4.2.1i +[V] 1.5.11 [P] X -?---5---9 114.100 -[D] 3803665787 mutt-1.4.2.1i.tar.gz ftp://ftp.mutt.org/mutt/ - +[D] 1394214086 mutt-1.5.11.tar.gz ftp://ftp.mutt.org/mutt/devel/ diff --git a/package/tsa/cyrus-sasl/cyrus-sasl.conf b/package/tsa/cyrus-sasl/cyrus-sasl.conf index 3df2a2d7c..d46beec7c 100644 --- a/package/tsa/cyrus-sasl/cyrus-sasl.conf +++ b/package/tsa/cyrus-sasl/cyrus-sasl.conf @@ -21,7 +21,7 @@ # --- ROCK-COPYRIGHT-NOTE-END --- var_append confopt ' ' '--disable-krb4' -var_append confopt ' ' '--includedir=/$prefix/include/sasl' +var_append confopt ' ' '--includedir=/$prefix/include/sasl1' # have to use gdbm for now since bdb4 isn't supported var_append confopt ' ' '--with-dblib=gdbm' @@ -29,4 +29,4 @@ var_append confopt ' ' '--with-dblib=gdbm' var_append INSTALL_WRAPPER_FILTER "|" \ 'sed -e "s,man3/sasl,man3/sasl1,g" -e "s,man8/sasl,man8/sasl1,g"' -hook_add postinstall 3 "cd /$prefix/include/sasl; ln -sf . include" +hook_add postinstall 3 "cd /$prefix/include/sasl1; ln -sf . include" diff --git a/package/tsa/cyrus-sasl2/cyrus-sasl2.conf b/package/tsa/cyrus-sasl2/cyrus-sasl2.conf index 8e735d135..c50ed5506 100644 --- a/package/tsa/cyrus-sasl2/cyrus-sasl2.conf +++ b/package/tsa/cyrus-sasl2/cyrus-sasl2.conf @@ -20,5 +20,5 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -var_append confopt ' ' '--includedir=/$prefix/include/sasl2' +var_append confopt ' ' '--includedir=/$prefix/include/sasl'