backout to mutt-1.6.2 again.
people who reported crashes: please get backtraces.
This commit is contained in:
sthen
parent
d87ca15482
commit
bc2ecedbf4
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.346 2016/09/15 16:14:08 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.347 2016/09/19 22:33:53 sthen Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += abook
|
||||
@ -96,9 +96,10 @@
|
||||
SUBDIR += msmtp
|
||||
SUBDIR += mu
|
||||
SUBDIR += mutt
|
||||
SUBDIR += mutt,compressed,sidebar
|
||||
SUBDIR += mutt,compressed,sidebar,sasl
|
||||
SUBDIR += mutt,compressed,sidebar,sasl,slang
|
||||
SUBDIR += mutt,gpgme
|
||||
SUBDIR += mutt,gpgme,sasl
|
||||
SUBDIR += mutt,gpgme,sasl,slang
|
||||
SUBDIR += mutt,sasl
|
||||
SUBDIR += mutt,slang
|
||||
SUBDIR += nmh
|
||||
|
||||
@ -1,12 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.86 2016/09/19 21:13:25 jca Exp $
|
||||
# $OpenBSD: Makefile,v 1.87 2016/09/19 22:33:53 sthen Exp $
|
||||
|
||||
COMMENT= tty-based e-mail client
|
||||
|
||||
D= 20160916
|
||||
DISTNAME= neomutt-$D
|
||||
PKGNAME= mutt-1.7.0.$D
|
||||
EPOCH= 2
|
||||
REVISION= 0
|
||||
DISTNAME= mutt-1.6.2
|
||||
EPOCH= 3
|
||||
|
||||
CATEGORIES= mail
|
||||
HOMEPAGE= http://www.mutt.org/
|
||||
@ -19,7 +16,11 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
# uses pledge()
|
||||
WANTLIB+= c crypto iconv idn intl qdbm ssl z
|
||||
|
||||
MASTER_SITES= https://github.com/neomutt/neomutt/releases/download/neomutt-$D/
|
||||
MASTER_SITES= http://ftp.mutt.org/pub/mutt/ \
|
||||
https://bitbucket.org/mutt/mutt/downloads/ \
|
||||
ftp://ftp.mutt.org/pub/mutt/
|
||||
MASTER_SITES1= http://lunar-linux.org/~tchan/mutt/
|
||||
MASTER_SITES2= http://spacehopper.org/mutt/
|
||||
DIST_SUBDIR= mutt
|
||||
PATCH_DIST_STRIP= -p1
|
||||
|
||||
@ -29,26 +30,22 @@ LIB_DEPENDS= databases/qdbm \
|
||||
BUILD_DEPENDS+= textproc/docbook-xsl \
|
||||
www/lynx
|
||||
|
||||
FLAVORS= gpgme sasl slang
|
||||
FLAVORS= compressed gpgme sasl sidebar slang
|
||||
FLAVOR?=
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
FLAVOR_COMMA= ${FLAVOR_EXT:S/-/,/g}
|
||||
SUBST_VARS= FLAVOR_COMMA
|
||||
|
||||
CONFIGURE_ARGS+= --enable-external_dotlock \
|
||||
--disable-fcntl \
|
||||
--enable-compressed \
|
||||
--enable-flock \
|
||||
--enable-hcache \
|
||||
--disable-notmuch \
|
||||
--enable-sidebar \
|
||||
--with-idn \
|
||||
--enable-imap \
|
||||
--enable-pop \
|
||||
--enable-smtp \
|
||||
--enable-nntp \
|
||||
--mandir=${PREFIX}/man \
|
||||
--without-gdbm \
|
||||
--without-tokyocabinet \
|
||||
@ -88,6 +85,48 @@ CONFIGURE_ARGS+= --with-curses
|
||||
WANTLIB+= ncurses
|
||||
.endif
|
||||
|
||||
# third party patches
|
||||
|
||||
# N.B. In general we would like to avoid additional patches here, they
|
||||
# frequently cause problems at update time. If you have a favourite patch
|
||||
# that you would like to see added, please engage with Mutt upstream
|
||||
# to talk about getting it imported directly instead. You can of course
|
||||
# patch locally :-)
|
||||
|
||||
# If there are conflicts when updating mutt, check to see if gentoo have
|
||||
# already fixed: http://prefix.gentooexperimental.org:8000/mutt-patches
|
||||
|
||||
# sidebar patch (not good, but people seem to like it...)
|
||||
DIST_SIDEBAR= sidebar-1.6.0.diff.gz:2
|
||||
SUPDISTFILES+= ${DIST_SIDEBAR}
|
||||
.if ${FLAVOR:Msidebar}
|
||||
PATCHFILES+= ${DIST_SIDEBAR}
|
||||
.endif
|
||||
|
||||
# compressed folders patch http://www.spinnaker.de/mutt/compressed/
|
||||
DIST_COMPR= compressed-1.6.0.diff.gz:2
|
||||
SUPDISTFILES+= ${DIST_COMPR}
|
||||
.if ${FLAVOR:Mcompressed}
|
||||
PATCHFILES+= ${DIST_COMPR}
|
||||
CONFIGURE_ARGS+= --enable-compressed
|
||||
.endif
|
||||
|
||||
# trashfolder, http://cedricduval.free.fr/mutt/patches/
|
||||
# enabled unconditionally, it's not *too* intrusive (additional flavours
|
||||
# mean a big increase in ports testing required).
|
||||
PATCHFILES+= trashfolder-1.6.0.diff.gz:2
|
||||
|
||||
.if ${FLAVOR:Msidebar} || ${FLAVOR:Mcompressed}
|
||||
AUTOCONF_VERSION= 2.69
|
||||
AUTOMAKE_VERSION= 1.15
|
||||
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
|
||||
${MODGNU_AUTOMAKE_DEPENDS}
|
||||
|
||||
post-patch:
|
||||
cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
|
||||
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf --install
|
||||
.endif
|
||||
|
||||
post-install:
|
||||
@mv -f ${PREFIX}/share/doc/mutt/samples/* ${PREFIX}/share/examples/mutt
|
||||
@perl -pi -e "s,/usr/bin/gpg,${LOCALBASE}/bin/gpg," \
|
||||
|
||||
@ -1,2 +1,8 @@
|
||||
SHA256 (mutt/neomutt-20160916.tar.gz) = meYui5USUonF0Z3zAScDcnYXDcUMmLvHEeJok2aJax4=
|
||||
SIZE (mutt/neomutt-20160916.tar.gz) = 4416507
|
||||
SHA256 (mutt/compressed-1.6.0.diff.gz) = M0kf2sRul69EWWFx83uNvDnm1FivfwEd8IdpeaapZDI=
|
||||
SHA256 (mutt/mutt-1.6.2.tar.gz) = xdAu8GSGzfBPnuuenXmUiQ2N+n9H57/rU6KmfaKsHY4=
|
||||
SHA256 (mutt/sidebar-1.6.0.diff.gz) = Y7ayjXAIttUr2YFRVHsFIlHNS8h+Rn5H/+vjct/nFVs=
|
||||
SHA256 (mutt/trashfolder-1.6.0.diff.gz) = t3nG32GnfzBpE5qthWK0pHyO7Yq1uPVoF0KhwuqhkLg=
|
||||
SIZE (mutt/compressed-1.6.0.diff.gz) = 6306
|
||||
SIZE (mutt/mutt-1.6.2.tar.gz) = 3956745
|
||||
SIZE (mutt/sidebar-1.6.0.diff.gz) = 12174
|
||||
SIZE (mutt/trashfolder-1.6.0.diff.gz) = 2757
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-main_c,v 1.5 2016/09/19 08:24:28 sthen Exp $
|
||||
$OpenBSD: patch-main_c,v 1.6 2016/09/19 22:33:53 sthen Exp $
|
||||
|
||||
Pledge
|
||||
|
||||
--- main.c.orig Thu Sep 15 15:45:23 2016
|
||||
+++ main.c Sun Sep 18 19:51:26 2016
|
||||
@@ -380,6 +380,30 @@ int main (int argc, char **argv)
|
||||
--- main.c.orig Sat Apr 2 19:12:22 2016
|
||||
+++ main.c Mon Apr 4 15:32:24 2016
|
||||
@@ -741,6 +741,30 @@ int main (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-mutt_sasl_c,v 1.3 2016/09/01 17:33:40 sthen Exp $
|
||||
$OpenBSD: patch-mutt_sasl_c,v 1.4 2016/09/19 22:33:53 sthen Exp $
|
||||
|
||||
Pledge
|
||||
|
||||
--- mutt_sasl.c.orig Fri Aug 26 23:53:14 2016
|
||||
+++ mutt_sasl.c Thu Sep 1 18:11:34 2016
|
||||
@@ -86,7 +86,6 @@ static sasl_callback_t mutt_sasl_callbacks[5];
|
||||
--- mutt_sasl.c.orig Sun Jan 17 05:18:59 2016
|
||||
+++ mutt_sasl.c Sun Jan 17 05:19:37 2016
|
||||
@@ -84,7 +84,6 @@ static int getnameinfo_err(int ret)
|
||||
|
||||
static sasl_secret_t *secret_ptr = NULL;
|
||||
static sasl_callback_t mutt_sasl_callbacks[5];
|
||||
|
||||
-static int mutt_sasl_start (void);
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@ threading, encryption and signing with PGP/GPG and S/MIME, and many
|
||||
operations can use regular expressions. It's highly customizable with
|
||||
many options for colours, key bindings, display formats etc.
|
||||
|
||||
This package is built from the NeoMutt tree, adding extra functionality
|
||||
previously available through separate patchsets. Bug reports should go
|
||||
to NeoMutt and not Mutt upstream.
|
||||
|
||||
Flavors:
|
||||
gpgme - build with support for GPGME, simplifying use with GnuPG:
|
||||
"set crypt_use_gpgme = yes" in muttrc, and run gpg-agent:
|
||||
"export GPG_TTY=$(tty); eval $(gpg-agent --daemon)"
|
||||
sasl - build with SASL authentication support
|
||||
slang - use S-Lang instead of curses for screen handling
|
||||
compressed - build with compressed folder support
|
||||
(see: http://www.spinnaker.de/mutt/compressed/)
|
||||
sidebar - adds a sidebar that has a folder list
|
||||
(see: http://thomer.com/mutt/)
|
||||
|
||||
@ -1,14 +1,18 @@
|
||||
@comment $OpenBSD: PLIST,v 1.24 2016/09/19 21:13:25 jca Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.25 2016/09/19 22:33:53 sthen Exp $
|
||||
@pkgpath mail/mutt/stable${FLAVOR_COMMA}
|
||||
@pkgpath mail/mutt/snapshot[,compressed][,hcache][,idn][,sidebar]${FLAVOR_COMMA}
|
||||
@pkgpath mail/mutt/[,compressed][,idn][,sidebar]${FLAVOR_COMMA}
|
||||
@pkgpath mail/mutt/snapshot[,hcache][,idn]${FLAVOR_COMMA}
|
||||
@pkgpath mail/mutt/[,idn]${FLAVOR_COMMA}
|
||||
bin/flea
|
||||
@bin bin/mutt
|
||||
@bin bin/mutt_dotlock
|
||||
bin/muttbug
|
||||
@bin bin/pgpewrap
|
||||
@bin bin/pgpring
|
||||
bin/smime_keys
|
||||
@man man/man1/flea.1
|
||||
@man man/man1/mutt.1
|
||||
@man man/man1/mutt_dotlock.1
|
||||
@man man/man1/muttbug.1
|
||||
@man man/man1/pgpewrap.1
|
||||
@man man/man1/pgpring.1
|
||||
@man man/man1/smime_keys.1
|
||||
@ -18,7 +22,6 @@ bin/smime_keys
|
||||
share/doc/mutt/
|
||||
share/doc/mutt/COPYRIGHT
|
||||
share/doc/mutt/ChangeLog
|
||||
share/doc/mutt/ChangeLog.neomutt
|
||||
share/doc/mutt/GPL
|
||||
share/doc/mutt/INSTALL
|
||||
share/doc/mutt/NEWS
|
||||
@ -26,7 +29,6 @@ share/doc/mutt/PGP-Notes.txt
|
||||
share/doc/mutt/README
|
||||
share/doc/mutt/README.SECURITY
|
||||
share/doc/mutt/README.SSL
|
||||
share/doc/mutt/README.neomutt
|
||||
share/doc/mutt/TODO
|
||||
share/doc/mutt/advancedusage.html
|
||||
share/doc/mutt/applying-patches.txt
|
||||
@ -35,44 +37,10 @@ share/doc/mutt/devel-notes.txt
|
||||
share/doc/mutt/gettingstarted.html
|
||||
share/doc/mutt/index.html
|
||||
share/doc/mutt/intro.html
|
||||
share/doc/mutt/keybase/
|
||||
share/doc/mutt/keybase/LICENSE
|
||||
share/doc/mutt/keybase/README.md
|
||||
share/doc/mutt/keybase/attachmentView.png
|
||||
share/doc/mutt/keybase/decrypt.sh
|
||||
share/doc/mutt/keybase/install.sh
|
||||
share/doc/mutt/keybase/keybase.py
|
||||
share/doc/mutt/keybase/muttrc
|
||||
share/doc/mutt/keybase/pagerMode.png
|
||||
share/doc/mutt/keybase/pgpdecrypt.sh
|
||||
share/doc/mutt/keybase/pgpverify.sh
|
||||
share/doc/mutt/keybase/verify.sh
|
||||
share/doc/mutt/manual.html
|
||||
share/doc/mutt/manual.txt
|
||||
share/doc/mutt/mimesupport.html
|
||||
share/doc/mutt/miscellany.html
|
||||
share/doc/mutt/muttrc.attach-headers-color
|
||||
share/doc/mutt/muttrc.compress
|
||||
share/doc/mutt/muttrc.cond-date
|
||||
share/doc/mutt/muttrc.encrypt-to-self
|
||||
share/doc/mutt/muttrc.forgotten-attachment
|
||||
share/doc/mutt/muttrc.ifdef
|
||||
share/doc/mutt/muttrc.index-color
|
||||
share/doc/mutt/muttrc.initials
|
||||
share/doc/mutt/muttrc.keywords
|
||||
share/doc/mutt/muttrc.limit-current-thread
|
||||
share/doc/mutt/muttrc.nested-if
|
||||
share/doc/mutt/muttrc.new-mail
|
||||
share/doc/mutt/muttrc.nntp
|
||||
share/doc/mutt/muttrc.notmuch
|
||||
share/doc/mutt/muttrc.progress
|
||||
share/doc/mutt/muttrc.quasi-delete
|
||||
share/doc/mutt/muttrc.reply-with-xorig
|
||||
share/doc/mutt/muttrc.sidebar
|
||||
share/doc/mutt/muttrc.skip-quoted
|
||||
share/doc/mutt/muttrc.status-color
|
||||
share/doc/mutt/muttrc.timeout
|
||||
share/doc/mutt/neomutt-syntax.vim
|
||||
share/doc/mutt/optionalfeatures.html
|
||||
share/doc/mutt/patch-notes.txt
|
||||
share/doc/mutt/reference.html
|
||||
@ -80,9 +48,6 @@ share/doc/mutt/samples/
|
||||
share/doc/mutt/security.html
|
||||
share/doc/mutt/smime-notes.txt
|
||||
share/doc/mutt/tuning.html
|
||||
share/doc/mutt/vim-keybindings/
|
||||
share/doc/mutt/vim-keybindings/README.md
|
||||
share/doc/mutt/vim-keybindings/vim-keybindings.rc
|
||||
share/examples/mutt/
|
||||
@sample ${SYSCONFDIR}/
|
||||
share/examples/mutt/Mush.rc
|
||||
@ -123,9 +88,7 @@ share/examples/mutt/pgp5.rc
|
||||
share/examples/mutt/pgp6.rc
|
||||
share/examples/mutt/sample.mailcap
|
||||
share/examples/mutt/sample.muttrc
|
||||
share/examples/mutt/sample.muttrc-sidebar
|
||||
share/examples/mutt/sample.muttrc-tlr
|
||||
share/examples/mutt/sample.vimrc-sidebar
|
||||
share/examples/mutt/smime.rc
|
||||
share/examples/mutt/smime_keys_test.pl
|
||||
share/locale/bg/LC_MESSAGES/mutt.mo
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user