diff options
| author | Koop Mast <kwm@rainbow-runner.nl> | 2016-12-27 03:11:43 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2016-12-27 03:11:43 +0800 |
| commit | be8d7135e50783e7d116884fcdea05ae4381012c (patch) | |
| tree | 8020bcc0ece5b5c19fdc5daa65e15ace63f93afe /mail | |
| parent | ad49df9d4b1b8adb4b80442b3b4ad4a7e2f22c86 (diff) | |
| parent | 8e1a04bcf5d355fe9bafaaaf732ae4f821226cb7 (diff) | |
| download | freebsd-ports-gnome-be8d7135e50783e7d116884fcdea05ae4381012c.tar.gz freebsd-ports-gnome-be8d7135e50783e7d116884fcdea05ae4381012c.tar.zst freebsd-ports-gnome-be8d7135e50783e7d116884fcdea05ae4381012c.zip | |
Merge branch 'master' into gnome-3.22
Diffstat (limited to 'mail')
68 files changed, 892 insertions, 195 deletions
diff --git a/mail/Makefile b/mail/Makefile index 28b532594587..d7980c0eb1ba 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -223,6 +223,7 @@ SUBDIR += mailpile SUBDIR += mailscanner SUBDIR += mailsync + SUBDIR += mailutils SUBDIR += mailx SUBDIR += mairix SUBDIR += masqmail diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile index 302043bbc023..5e4e5787a17c 100644 --- a/mail/crm114/Makefile +++ b/mail/crm114/Makefile @@ -3,7 +3,7 @@ PORTNAME= crm114 PORTVERSION= 20100106 -PORTREVISION= 1 +PORTREVISION= 2 # WARNING change versionname in CRM114RELEASENAME too. # portlint didn't like this variable at this place. # So I have to put it down in this file. diff --git a/mail/cyrus2courier/pkg-descr b/mail/cyrus2courier/pkg-descr index 45d79728e144..5d656a668e6a 100644 --- a/mail/cyrus2courier/pkg-descr +++ b/mail/cyrus2courier/pkg-descr @@ -1,4 +1,4 @@ Convert a single mailbox from Cyrus-Imap into the Maildir++ format used by the Courier-IMAP and Dovecot IMAP servers. -WWW: http://www.madness.at/projects/ +WWW: http://www.madness.at/projects/cyrus2courier/ diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile index 479b991b742c..3c6e919ae1cc 100644 --- a/mail/davmail/Makefile +++ b/mail/davmail/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= davmail -PORTVERSION= 4.7.2 +PORTVERSION= 4.7.3 CATEGORIES= mail java MASTER_SITES= SF/davmail/davmail/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION} @@ -19,7 +19,7 @@ USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ ALL_TARGET= release -REVISION= 2427 # 4.7.2 +REVISION= 2438 # 4.7.3 # port build number, same as on DISTNAME MAKE_ARGS= -Drevision=${REVISION} MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8" diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo index bd349fa98a9e..8fe1bc378c1e 100644 --- a/mail/davmail/distinfo +++ b/mail/davmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1466903595 -SHA256 (davmail-src-4.7.2-2427.tgz) = bf66cd4e735329d9862c8e01c9749e2d21d5beddc8090545d705b9aa8d04dbe7 -SIZE (davmail-src-4.7.2-2427.tgz) = 22682341 +TIMESTAMP = 1480186300 +SHA256 (davmail-src-4.7.3-2438.tgz) = 3940a7f6aa44cb3c419c2a4ede71e465b29b7076c9ed1bb0abe251a60378c208 +SIZE (davmail-src-4.7.3-2438.tgz) = 22728139 diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile index 893af16861e5..1b54e24de1c4 100644 --- a/mail/dbmail22/Makefile +++ b/mail/dbmail22/Makefile @@ -3,7 +3,7 @@ PORTNAME= dbmail PORTVERSION= 2.2.18 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/2.2/ PKGNAMESUFFIX= 22 diff --git a/mail/delatt/Makefile b/mail/delatt/Makefile index bed7980433be..5422437d36a6 100644 --- a/mail/delatt/Makefile +++ b/mail/delatt/Makefile @@ -4,8 +4,7 @@ PORTNAME= delatt DISTVERSION= 1.1.3 CATEGORIES= mail -MASTER_SITES= http://danborn.net/delatt/ \ - LOCAL/ehaupt +MASTER_SITES= LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Strip attachments from email diff --git a/mail/delatt/pkg-descr b/mail/delatt/pkg-descr index 7cad300d5e5e..819ee45fced4 100644 --- a/mail/delatt/pkg-descr +++ b/mail/delatt/pkg-descr @@ -3,5 +3,3 @@ It will work with either mbox or maildir files. It is great for archiving old email without wasting space on attachments and the extra HTML message parts that some MUAs attach. - -WWW: http://danborn.net/delatt/ diff --git a/mail/elm/Makefile b/mail/elm/Makefile index 064275497093..148b6c0a0823 100644 --- a/mail/elm/Makefile +++ b/mail/elm/Makefile @@ -3,7 +3,7 @@ PORTNAME= elm PORTVERSION= 2.5.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://instinct.org/elm/files/tarballs/ DISTNAME= ${PORTNAME}${PORTVERSION} diff --git a/mail/geary/Makefile b/mail/geary/Makefile index 9b02652843d9..6903e8384a57 100644 --- a/mail/geary/Makefile +++ b/mail/geary/Makefile @@ -20,14 +20,12 @@ LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ libgee-0.8.so:devel/libgee \ libgcr-3.so:security/gcr -USES= cmake desktop-file-utils gettext gmake \ +USES= cmake desktop-file-utils gettext \ libtool pkgconfig shebangfix tar:xz USE_GNOME= gnomedocutils gnomeprefix gtk30 intlhack SHEBANG_FILES= desktop/geary-attach USE_LDCONFIG= yes -GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CONFIGURE_ARGS= --prefix=${PREFIX} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/mail/gmime2-sharp/Makefile b/mail/gmime2-sharp/Makefile index 9d9fbda31e84..30fd1cc1360c 100644 --- a/mail/gmime2-sharp/Makefile +++ b/mail/gmime2-sharp/Makefile @@ -1,7 +1,7 @@ # Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org> # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail PKGNAMESUFFIX= 2-sharp diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile index 226240f7707a..d9fefa62b8b3 100644 --- a/mail/gmime2/Makefile +++ b/mail/gmime2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmime PORTVERSION= 2.2.27 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= mail MASTER_SITES= GNOME PKGNAMESUFFIX?= 2 diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile index edd04ce7138f..b0a68050c503 100644 --- a/mail/gmime24/Makefile +++ b/mail/gmime24/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmime PORTVERSION= 2.4.33 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= mail MASTER_SITES= GNOME PKGNAMESUFFIX?= 24 diff --git a/mail/gmime26/Makefile b/mail/gmime26/Makefile index 15dcb5c07889..40d2bb459a71 100644 --- a/mail/gmime26/Makefile +++ b/mail/gmime26/Makefile @@ -3,6 +3,7 @@ PORTNAME= gmime PORTVERSION= 2.6.20 +PORTREVISION?= 1 CATEGORIES?= mail MASTER_SITES= GNOME PKGNAMESUFFIX?= 26 diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile index 7638d4f1ef93..d1d1410ceaa3 100644 --- a/mail/gnome-gmail-notifier/Makefile +++ b/mail/gnome-gmail-notifier/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnome-gmail-notifier PORTVERSION= 0.10.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail deskutils MASTER_SITES= GOOGLE_CODE diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile index 84cc8d88f1d8..341cc0176195 100644 --- a/mail/gnubiff/Makefile +++ b/mail/gnubiff/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnubiff PORTVERSION= 2.2.13 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= SF diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile index 19cf8b32e259..12fa5b91ddb0 100644 --- a/mail/horde-imp/Makefile +++ b/mail/horde-imp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= imp -PORTVERSION= 6.2.16 +PORTVERSION= 6.2.17 CATEGORIES= mail www pear PKGNAMEPREFIX= horde- diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo index 8bd1d1847335..23360c9f6cba 100644 --- a/mail/horde-imp/distinfo +++ b/mail/horde-imp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473287831 -SHA256 (Horde/imp-6.2.16.tgz) = ac1548f589ac593f9e55bcce7f9ec073c0600616272419b947f98a1c9039df8d -SIZE (Horde/imp-6.2.16.tgz) = 5009152 +TIMESTAMP = 1481937689 +SHA256 (Horde/imp-6.2.17.tgz) = 0449e26a15238f558b5184c0fa101a23943b8f267512559ee96a31a8c6ee5d5d +SIZE (Horde/imp-6.2.17.tgz) = 5008979 diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile index e830bbaac850..a4a0448c96ec 100644 --- a/mail/horde-ingo/Makefile +++ b/mail/horde-ingo/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ingo -PORTVERSION= 3.2.12 +PORTVERSION= 3.2.13 CATEGORIES= mail www pear PKGNAMEPREFIX= horde- diff --git a/mail/horde-ingo/distinfo b/mail/horde-ingo/distinfo index 344f477bc9d0..d8497dce373e 100644 --- a/mail/horde-ingo/distinfo +++ b/mail/horde-ingo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473287837 -SHA256 (Horde/ingo-3.2.12.tgz) = 7c8877580ee81c3078e666b90ad2c0c160df3081c17c6505dc5d9ba475422595 -SIZE (Horde/ingo-3.2.12.tgz) = 1506871 +TIMESTAMP = 1481937695 +SHA256 (Horde/ingo-3.2.13.tgz) = 3b062012f356a82ef5d328723fd16f50f3e5d9d3fcb290e0cc346aa7f545880d +SIZE (Horde/ingo-3.2.13.tgz) = 1506854 diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile index 23bbbc4608b5..0ed033e80b57 100644 --- a/mail/horde-turba/Makefile +++ b/mail/horde-turba/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= turba -PORTVERSION= 4.2.17 +PORTVERSION= 4.2.18 PKGNAMEPREFIX= horde- CATEGORIES= mail www pear diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo index 12dae01b0c80..cb225afe2309 100644 --- a/mail/horde-turba/distinfo +++ b/mail/horde-turba/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478647759 -SHA256 (Horde/turba-4.2.17.tgz) = ab4c0b30e0be620d423dc04069e130215add2f25764d2a72dc3c65da94518c0a -SIZE (Horde/turba-4.2.17.tgz) = 1979416 +TIMESTAMP = 1481937728 +SHA256 (Horde/turba-4.2.18.tgz) = f052ba36733e0b573876e2add5c7b79903d99e3c2f7aa4d4bb80a4eb730e817b +SIZE (Horde/turba-4.2.18.tgz) = 1979424 diff --git a/mail/horde-webmail/Makefile b/mail/horde-webmail/Makefile index 341c60bc9333..f0919622dc18 100644 --- a/mail/horde-webmail/Makefile +++ b/mail/horde-webmail/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= webmail -PORTVERSION= 5.2.16 +PORTVERSION= 5.2.17 CATEGORIES= mail www pear PKGNAMEPREFIX= horde- diff --git a/mail/horde-webmail/distinfo b/mail/horde-webmail/distinfo index d728c3c11be6..177899af725a 100644 --- a/mail/horde-webmail/distinfo +++ b/mail/horde-webmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1473287848 -SHA256 (Horde/webmail-5.2.16.tgz) = 4ac8f0f466e84f7dcce0dfe9c8c140a6ff27d34efaa20b283a7d4341b8c55a24 -SIZE (Horde/webmail-5.2.16.tgz) = 169482 +TIMESTAMP = 1482001577 +SHA256 (Horde/webmail-5.2.17.tgz) = 47ad8da428d1e72e7da7ac0022cc987e36750e96f0ba13d1a32f707d8eca4dee +SIZE (Horde/webmail-5.2.17.tgz) = 172378 diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile new file mode 100644 index 000000000000..df3a31a68377 --- /dev/null +++ b/mail/mailutils/Makefile @@ -0,0 +1,91 @@ +# Created by: Attila Nagy <bra@fsn.hu> +# $FreeBSD$ + +PORTNAME= mailutils +PORTVERSION= 3.1.1 +PORTREVISION= 1 +CATEGORIES= mail +MASTER_SITES= GNU + +MAINTAINER= zeus@gnu.org.ua +COMMENT= Utilities and daemons for processing e-mail + +LICENSE= GPLv3+ + +LIB_DEPENDS= libltdl.so:devel/libltdl + +USES= gmake iconv libtool makeinfo readline tar:xz +GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib +USE_LDCONFIG= yes +INSTALL_TARGET= install-strip + +INFO= ${PORTNAME} + +OPTIONS_DEFINE= GNUTLS GSSAPI GUILE MH NNTP NLS PAM PYTHON +OPTIONS_DEFAULT= BDB GNUTLS PAM +OPTIONS_MULTI= DB +OPTIONS_MULTI_DB= BDB GDBM KYOTOCABINET LDAP MYSQL PGSQL TOKYOCABINET +OPTIONS_SUB= yes + +BDB_DESC= Berkeley DB v4.8 support (last working one) +DB_DESC= Database configuration +KYOTOCABINET_DESC= Kyoto Cabinet database support +MH_DESC= MH (Message Handling) system support +TOKYOCABINET_DESC= Tokyo Cabinet database support + +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls + +GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi +GSSAPI_CONFIGURE_WITH= gssapi + +GUILE_LIB_DEPENDS= libguile.so:lang/guile +GUILE_CONFIGURE_WITH= guile +GUILE_BROKEN= does not build: ERROR: invalid arglist syntax: (hash paren_open SCM mbox paren_close) + +MH_CONFIGURE_ENABLE= mh + +NNTP_CONFIGURE_ENABLE= nntp + +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls + +PAM_CONFIGURE_ENABLE= pam + +PYTHON_BUILD_DEPENDS= python-config:lang/python +PYTHON_USES= python +PYTHON_CONFIGURE_ENABLE=python + +BDB_USES= bdb:48 +BDB_CONFIGURE_WITH= berkeley-db +BDB_CPPFLAGS= -I${BDB_INCLUDE_DIR} +BDB_LDFLAGS= -L${BDB_LIB_DIR} +INVALID_BDB_VER= 5+ + +GDBM_LIB_DEPENDS= libgdbm.so:databases/gdbm +GDBM_CONFIGURE_WITH= gdbm + +KYOTOCABINET_LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet +KYOTOCABINET_CONFIGURE_WITH= kyotocabinet + +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap + +MYSQL_USES= mysql +MYSQL_CONFIGURE_WITH= mysql + +PGSQL_USES= pgsql +PGSQL_CONFIGURE_WITH= postgres + +TOKYOCABINET_LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet +TOKYOCABINET_CONFIGURE_WITH= tokyocabinet + +post-patch: + @${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|' \ + ${WRKSRC}/lib/gnu/Makefile.in + @${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' \ + ${WRKSRC}/dotlock/Makefile.in \ + ${WRKSRC}/maidag/Makefile.in + +.include <bsd.port.mk> diff --git a/mail/mailutils/distinfo b/mail/mailutils/distinfo new file mode 100644 index 000000000000..f03ee037c824 --- /dev/null +++ b/mail/mailutils/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1481868208 +SHA256 (mailutils-3.1.1.tar.xz) = e5a07994924f63d8f29efe94e63ba6b110ac70b2b7f61ffa6f54ae4c9287bc21 +SIZE (mailutils-3.1.1.tar.xz) = 2759000 diff --git a/mail/mailutils/pkg-descr b/mail/mailutils/pkg-descr new file mode 100644 index 000000000000..f25546acd335 --- /dev/null +++ b/mail/mailutils/pkg-descr @@ -0,0 +1,9 @@ +Mailutils is a Swiss Army knife of electronic mail handling. It offers +a rich set of utilities and daemons for processing the e-mail. + +All Mailutils programs are able to operate on mailboxes of any existing +format, ranging from standard UNIX maildrops, through maildir and up to +remote mailboxes, which are transparently accessed using IMAP4, POP3, +and SMTP. + +WWW: http://mailutils.org/ diff --git a/mail/mailutils/pkg-plist b/mail/mailutils/pkg-plist new file mode 100644 index 000000000000..fe3bd3cf9fff --- /dev/null +++ b/mail/mailutils/pkg-plist @@ -0,0 +1,335 @@ +@(root,mail,2755) bin/dotlock +bin/frm +bin/from +bin/mail +bin/mailutils +bin/mailutils-config +bin/messages +bin/mimeview +bin/movemail +%%MH%%bin/mu-mh/ali +%%MH%%bin/mu-mh/anno +%%MH%%bin/mu-mh/burst +%%MH%%bin/mu-mh/comp +%%MH%%bin/mu-mh/fmtcheck +%%MH%%bin/mu-mh/folder +%%MH%%bin/mu-mh/folders +%%MH%%bin/mu-mh/forw +%%MH%%bin/mu-mh/inc +%%MH%%bin/mu-mh/install-mh +%%MH%%bin/mu-mh/mark +%%MH%%bin/mu-mh/mhl +%%MH%%bin/mu-mh/mhn +%%MH%%bin/mu-mh/mhparam +%%MH%%bin/mu-mh/mhpath +%%MH%%bin/mu-mh/mhseq +%%MH%%bin/mu-mh/msgchk +%%MH%%bin/mu-mh/pick +%%MH%%bin/mu-mh/prompter +%%MH%%bin/mu-mh/refile +%%MH%%bin/mu-mh/repl +%%MH%%bin/mu-mh/rmf +%%MH%%bin/mu-mh/rmm +%%MH%%bin/mu-mh/scan +%%MH%%bin/mu-mh/send +%%MH%%bin/mu-mh/show +%%MH%%bin/mu-mh/sortm +%%MH%%bin/mu-mh/whatnow +%%MH%%bin/mu-mh/whom +bin/popauth +bin/readmsg +bin/sieve +include/mailutils/acl.h +include/mailutils/address.h +include/mailutils/alloc.h +include/mailutils/argcv.h +include/mailutils/assoc.h +include/mailutils/attribute.h +include/mailutils/auth.h +include/mailutils/body.h +include/mailutils/cctype.h +include/mailutils/cfg.h +include/mailutils/cidr.h +include/mailutils/cli.h +include/mailutils/cstr.h +include/mailutils/daemon.h +include/mailutils/datetime.h +include/mailutils/dbm.h +include/mailutils/debug.h +include/mailutils/diag.h +include/mailutils/envelope.h +include/mailutils/errno.h +include/mailutils/error.h +include/mailutils/filter.h +include/mailutils/folder.h +include/mailutils/glob.h +include/mailutils/gsasl.h +include/mailutils/guile.h +include/mailutils/header.h +include/mailutils/imap.h +include/mailutils/imapio.h +include/mailutils/imaputil.h +include/mailutils/io.h +include/mailutils/iterator.h +include/mailutils/kwd.h +include/mailutils/ldap.h +include/mailutils/list.h +include/mailutils/locker.h +include/mailutils/log.h +include/mailutils/mailbox.h +include/mailutils/mailcap.h +include/mailutils/mailer.h +include/mailutils/mailutils.h +include/mailutils/md5.h +include/mailutils/message.h +include/mailutils/mh.h +include/mailutils/mime.h +include/mailutils/monitor.h +include/mailutils/msgset.h +include/mailutils/mu_auth.h +include/mailutils/nls.h +include/mailutils/nntp.h +include/mailutils/observer.h +include/mailutils/opool.h +include/mailutils/opt.h +include/mailutils/pam.h +include/mailutils/parse822.h +include/mailutils/pop3.h +include/mailutils/prog.h +include/mailutils/progmailer.h +include/mailutils/property.h +include/mailutils/python.h +include/mailutils/radius.h +include/mailutils/refcount.h +include/mailutils/registrar.h +include/mailutils/secret.h +include/mailutils/server.h +include/mailutils/sha1.h +include/mailutils/sieve.h +include/mailutils/smtp.h +include/mailutils/sockaddr.h +include/mailutils/sql.h +include/mailutils/stdstream.h +include/mailutils/stream.h +include/mailutils/sys/amd.h +include/mailutils/sys/attribute.h +include/mailutils/sys/auth.h +include/mailutils/sys/body.h +include/mailutils/sys/dbm.h +include/mailutils/sys/debcat.h +include/mailutils/sys/envelope.h +include/mailutils/sys/file_stream.h +include/mailutils/sys/filter.h +include/mailutils/sys/folder.h +include/mailutils/sys/gsasl-stream.h +include/mailutils/sys/header.h +include/mailutils/sys/header_stream.h +include/mailutils/sys/imap.h +include/mailutils/sys/imapio.h +include/mailutils/sys/iostream.h +include/mailutils/sys/iterator.h +include/mailutils/sys/list.h +include/mailutils/sys/logstream.h +include/mailutils/sys/mailbox.h +include/mailutils/sys/mailer.h +include/mailutils/sys/mapfile_stream.h +include/mailutils/sys/memory_stream.h +include/mailutils/sys/message.h +include/mailutils/sys/message_stream.h +include/mailutils/sys/mime.h +include/mailutils/sys/monitor.h +include/mailutils/sys/msgset.h +include/mailutils/sys/nntp.h +include/mailutils/sys/nullstream.h +include/mailutils/sys/observer.h +include/mailutils/sys/pop3.h +include/mailutils/sys/prog_stream.h +include/mailutils/sys/property.h +include/mailutils/sys/rdcache_stream.h +include/mailutils/sys/registrar.h +include/mailutils/sys/smtp.h +include/mailutils/sys/stream.h +include/mailutils/sys/streamref.h +include/mailutils/sys/streamtrans.h +include/mailutils/sys/syslogstream.h +include/mailutils/sys/temp_file_stream.h +include/mailutils/sys/tls-stream.h +include/mailutils/sys/url.h +include/mailutils/sys/xscript-stream.h +include/mailutils/syslog.h +include/mailutils/tls.h +include/mailutils/types.h +include/mailutils/url.h +include/mailutils/util.h +include/mailutils/version.h +include/mailutils/wordsplit.h +lib/libmailutils.a +lib/libmailutils.so +lib/libmailutils.so.5 +lib/libmailutils.so.5.0.1 +lib/libmu_auth.a +lib/libmu_auth.so +lib/libmu_auth.so.5 +lib/libmu_auth.so.5.0.1 +lib/libmu_dbm.a +lib/libmu_dbm.so +lib/libmu_dbm.so.5 +lib/libmu_dbm.so.5.0.1 +lib/libmu_imap.a +lib/libmu_imap.so +lib/libmu_imap.so.5 +lib/libmu_imap.so.5.0.1 +lib/libmu_maildir.a +lib/libmu_maildir.so +lib/libmu_maildir.so.5 +lib/libmu_maildir.so.5.0.1 +lib/libmu_mailer.a +lib/libmu_mailer.so +lib/libmu_mailer.so.5 +lib/libmu_mailer.so.5.0.1 +lib/libmu_mbox.a +lib/libmu_mbox.so +lib/libmu_mbox.so.5 +lib/libmu_mbox.so.5.0.1 +%%MH%%lib/libmu_mh.a +%%MH%%lib/libmu_mh.so +%%MH%%lib/libmu_mh.so.5 +%%MH%%lib/libmu_mh.so.5.0.1 +lib/libmu_pop.a +lib/libmu_pop.so +lib/libmu_pop.so.5 +lib/libmu_pop.so.5.0.1 +%%PYTHON%%lib/libmu_py.a +%%PYTHON%%lib/libmu_py.so +%%PYTHON%%lib/libmu_py.so.5 +%%PYTHON%%lib/libmu_py.so.5.0.1 +lib/libmu_sieve.a +lib/libmu_sieve.so +lib/libmu_sieve.so.5 +lib/libmu_sieve.so.5.0.1 +lib/libmuaux.a +lib/libmuaux.so +lib/libmuaux.so.5 +lib/libmuaux.so.5.0.1 +lib/mailutils/editheader.a +lib/mailutils/editheader.so +lib/mailutils/list.a +lib/mailutils/list.so +lib/mailutils/moderator.a +lib/mailutils/moderator.so +lib/mailutils/numaddr.a +lib/mailutils/numaddr.so +lib/mailutils/pipe.a +lib/mailutils/pipe.so +lib/mailutils/spamd.a +lib/mailutils/spamd.so +lib/mailutils/timestamp.a +lib/mailutils/timestamp.so +lib/mailutils/vacation.a +lib/mailutils/vacation.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__init__.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/address.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/address.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/address.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/attribute.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/attribute.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/attribute.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/auth.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/auth.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/auth.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/body.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/body.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/body.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/c_api.a +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/c_api.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/envelope.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/envelope.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/envelope.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/error.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/error.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/error.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/filter.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/filter.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/filter.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/folder.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/folder.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/folder.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/header.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/header.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/header.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailbox.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailbox.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailbox.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailcap.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailcap.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailcap.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailer.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailer.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailer.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/message.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/message.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/message.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mime.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mime.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mime.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/nls.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/nls.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/nls.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/registrar.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/registrar.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/registrar.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/secret.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/secret.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/secret.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/sieve.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/sieve.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/sieve.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/stream.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/stream.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/stream.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/url.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/url.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/url.pyo +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/util.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/util.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/util.pyo +man/man1/imap4d.1.gz +man/man1/mail.1.gz +man/man1/pop3d.1.gz +man/man1/popauth.1.gz +sbin/comsatd +sbin/imap4d +@(root,mail,4755) sbin/maidag +sbin/pop3d +share/aclocal/mailutils.m4 +%%MH%%share/emacs/site-lisp/mailutils-mh.el +%%MH%%share/emacs/site-lisp/mailutils-mh.elc +%%NLS%%share/locale/ca/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/de/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/es/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/fi/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/fr/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/id/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/pl/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/ro/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/ru/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/sv/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/uk/LC_MESSAGES/mailutils.mo +%%NLS%%share/locale/vi/LC_MESSAGES/mailutils.mo +%%MH%%%%DATADIR%%/mh/components +%%MH%%%%DATADIR%%/mh/forwcomps +%%MH%%%%DATADIR%%/mh/mailutils-mh.el +%%MH%%%%DATADIR%%/mh/mhl.format +%%MH%%%%DATADIR%%/mh/mhl.forward +%%MH%%%%DATADIR%%/mh/mhl.headers +%%MH%%%%DATADIR%%/mh/mhl.repl +%%MH%%%%DATADIR%%/mh/mhl.usenet +%%MH%%%%DATADIR%%/mh/replcomps +%%MH%%%%DATADIR%%/mh/replgroupcomps +%%MH%%%%DATADIR%%/mh/scan.default +%%MH%%%%DATADIR%%/mh/scan.mailx +%%MH%%%%DATADIR%%/mh/scan.size +%%MH%%%%DATADIR%%/mh/scan.time +%%MH%%%%DATADIR%%/mh/scan.timely diff --git a/mail/mixmaster/Makefile b/mail/mixmaster/Makefile index bb02b37d2955..b4f99a6c8348 100644 --- a/mail/mixmaster/Makefile +++ b/mail/mixmaster/Makefile @@ -4,7 +4,7 @@ PORTNAME= mixmaster PORTVERSION= 3.0.2d -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= http://www.c-s.li/ports/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile index 76052e75012d..19a472a5d1ab 100644 --- a/mail/mmr/Makefile +++ b/mail/mmr/Makefile @@ -3,6 +3,7 @@ PORTNAME= mmr PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.sourcefiles.org/Internet/Mail/Clients/Console/ \ http://slouken.libsdl.org/projects/mmr/ diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 5c9171e90a09..3a038ff6f137 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mutt -PORTVERSION= 1.7.1 -PORTREVISION?= 2 +PORTVERSION= 1.7.2 +PORTREVISION?= 0 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ @@ -218,8 +218,8 @@ DOCS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-doc-ref .include <bsd.port.options.mk> # un/comment as each VERSION is created for PORTVERSION -#VVV_PATCH_VERSION= 1.7.0 -#RR_PATCH_VERSION= 1.7.0 +VVV_PATCH_VERSION= 1.7.1 +RR_PATCH_VERSION= 1.7.1 #GREETING_PATCH_VERSION= 1.7.0 .if !defined(VVV_PATCH_VERSION) diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 40c171daceaf..c18ba7b1dc74 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1476585934 -SHA256 (mutt/mutt-1.7.1.tar.gz) = e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df -SIZE (mutt/mutt-1.7.1.tar.gz) = 4025008 +TIMESTAMP = 1481676540 +SHA256 (mutt/mutt-1.7.2.tar.gz) = 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 +SIZE (mutt/mutt-1.7.2.tar.gz) = 4025880 SHA256 (mutt/patch-1.7.1.rr.compressed.gz) = 97bc56bbc6b0312b87e8dfb68dd9b551edb9d6771bb1b52b1c6f63f51d0bd05b SIZE (mutt/patch-1.7.1.rr.compressed.gz) = 9985 SHA256 (mutt/patch-1.7.1.vvv.nntp.gz) = 798db983e3d63d954bfd88e0b8771f806afddf0ae07cc9a03d27def355675687 @@ -11,8 +11,8 @@ SHA256 (mutt/patch-1.5.1.dgc.deepif.1) = d655a2f0003bdb2efb7ee5a8c77c113da661110 SIZE (mutt/patch-1.5.1.dgc.deepif.1) = 767 SHA256 (mutt/patch-1.7.0.ats.date_conditional.1) = a7f65e0b6e59713582b3b0a1c3d3c0e54e5875f5dfe3bda285e51a5b6d96e14e SIZE (mutt/patch-1.7.0.ats.date_conditional.1) = 2415 -SHA256 (mutt/mutt-1.7.1.vc.greeting) = 05dce466675c8692ab4a2c34d309de06e98e965241249e3cfccbb8d10873b9a3 -SIZE (mutt/mutt-1.7.1.vc.greeting) = 4175 +SHA256 (mutt/mutt-1.7.2.vc.greeting) = 05dce466675c8692ab4a2c34d309de06e98e965241249e3cfccbb8d10873b9a3 +SIZE (mutt/mutt-1.7.2.vc.greeting) = 4175 SHA256 (mutt/patch-1.7.1.vvv.initials.gz) = 1405104d8929d672dc5ffebbca8ea5601a88c515e862ec2f89e5b92bfdb53ad0 SIZE (mutt/patch-1.7.1.vvv.initials.gz) = 675 SHA256 (mutt/patch-1.7.1.vvv.quote.gz) = de0e47fb8ffe1ab6587aba37438c90443bee6508759bf82d8aa5da27317b3cc7 diff --git a/mail/mutt/files/patch-gpgme180 b/mail/mutt/files/patch-gpgme180 deleted file mode 100644 index c69ef6466830..000000000000 --- a/mail/mutt/files/patch-gpgme180 +++ /dev/null @@ -1,36 +0,0 @@ -Use gpgme hg commit 84ad86e8b8ab to support gpgme 1.8.0. This patch -should be removed once mutt hg commit 84ad86e8b8ab is in an official -release. - ---- crypt-gpgme.c.orig 2016-11-27 02:22:51 UTC -+++ crypt-gpgme.c -@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h - return verify_sender (h, GPGME_PROTOCOL_CMS); - } - --void gpgme_set_sender (const char *sender) -+void mutt_gpgme_set_sender (const char *sender) - { - mutt_error ("[setting sender] mailbox: %s\n", sender); - FREE (¤t_sender); ---- crypt-gpgme.h.orig 2016-11-27 02:22:51 UTC -+++ crypt-gpgme.h -@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, - - int smime_gpgme_verify_sender (HEADER *h); - --void gpgme_set_sender (const char *sender); -+void mutt_gpgme_set_sender (const char *sender); - - #endif ---- crypt-mod-pgp-gpgme.c.orig 2016-11-27 02:22:51 UTC -+++ crypt-mod-pgp-gpgme.c -@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta - - static void crypt_mod_pgp_set_sender (const char *sender) - { -- gpgme_set_sender (sender); -+ mutt_gpgme_set_sender (sender); - } - - struct crypt_module_specs crypt_mod_pgp_gpgme = diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index bb9a402d8835..ce45594ce281 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -3,7 +3,7 @@ PORTNAME= mutt PORTVERSION= 1.4.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index df7a6099a637..3b509d738c18 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -3,6 +3,7 @@ PORTNAME= nmh PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= SAVANNAH diff --git a/mail/normalizemime/Makefile b/mail/normalizemime/Makefile index daceaaf2407c..4dc9caefc51e 100644 --- a/mail/normalizemime/Makefile +++ b/mail/normalizemime/Makefile @@ -3,6 +3,7 @@ PORTNAME= normalizemime PORTVERSION= 1.19 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://hyvatti.iki.fi/~jaakko/spam/ DISTNAME= normalizemime.cc diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index 525c0af3efc2..1444f8da8c84 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= notmuch -PORTVERSION= 0.23.2 -PORTREVISION= 1 +PORTVERSION= 0.23.3 CATEGORIES= mail MASTER_SITES= http://notmuchmail.org/releases/ @@ -17,6 +16,10 @@ BUILD_DEPENDS= c++filt:devel/binutils LIB_DEPENDS= libgmime-2.6.so:mail/gmime26 \ libxapian.so:databases/xapian-core \ libtalloc.so:devel/talloc +TEST_DEPENDS= bash:shells/bash \ + emacs:editors/emacs-nox11 \ + dtach:misc/dtach \ + base64:converters/base64 BROKEN_powerpc64= Does not build @@ -26,7 +29,17 @@ USE_GNOME= glib20 CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man USE_LDCONFIG= yes -MAKE_ENV+= PYTHONCMD=${PYTHON_CMD} +MAKE_ENV+= PYTHONCMD=${PYTHON_CMD} + +## a lot of tests are failing because they're Linux oriented and need +## some tweaking to run on FreeBSD +TEST_ENV+= NOTMUCH_SKIP_TESTS="basic new count insert tagging json sexp \ + emacs emacs-large-search-buffer crypto smime atomicity ruby \ + parse-time-string upgrade thread-search thread-breakage \ + message-property lock" V=1 \ + TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" + +TEST_TARGET= test OPTIONS_DEFINE= BASH DOXYGEN EMACS MANPAGES MUTT RUBY ZSH EMACS_DESC= Install EMACS lisp files (requires emacs) diff --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo index 53fe78cc82cc..8750636d9f1c 100644 --- a/mail/notmuch/distinfo +++ b/mail/notmuch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479902218 -SHA256 (notmuch-0.23.2.tar.gz) = edfd7528d43bf1e1ab2620607f9fdcf772603455a61c2eb49978619c352c97bc -SIZE (notmuch-0.23.2.tar.gz) = 690833 +TIMESTAMP = 1481130627 +SHA256 (notmuch-0.23.3.tar.gz) = 0f5da5cf0203b774e345c50d56e975a87c2fc5407ef4ea284b6e2b55a8951882 +SIZE (notmuch-0.23.3.tar.gz) = 691361 diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile index b65a5cfa61c7..32b3b3b5d2da 100644 --- a/mail/offlineimap/Makefile +++ b/mail/offlineimap/Makefile @@ -3,7 +3,7 @@ PORTNAME= offlineimap DISTVERSIONPREFIX= v -DISTVERSION= 7.0.9 +DISTVERSION= 7.0.12 CATEGORIES= mail python MAINTAINER= mp39590@gmail.com diff --git a/mail/offlineimap/distinfo b/mail/offlineimap/distinfo index 2887f0f73140..5342c9fa1f42 100644 --- a/mail/offlineimap/distinfo +++ b/mail/offlineimap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478351776 -SHA256 (OfflineIMAP-offlineimap-v7.0.9_GH0.tar.gz) = aec349b97fe41681ebad48d03cac62dc84e405ad136ac92067ecfcd640bf6a12 -SIZE (OfflineIMAP-offlineimap-v7.0.9_GH0.tar.gz) = 692604 +TIMESTAMP = 1481881723 +SHA256 (OfflineIMAP-offlineimap-v7.0.12_GH0.tar.gz) = 7fdad62ed59eb817969465dcba794271f8f84aa51d31ace9994865dbf9b934d4 +SIZE (OfflineIMAP-offlineimap-v7.0.12_GH0.tar.gz) = 695070 diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile index efc7622bea52..f9c4f43ceb50 100644 --- a/mail/opensmtpd-devel/Makefile +++ b/mail/opensmtpd-devel/Makefile @@ -28,8 +28,7 @@ MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) SSL_PORT_DESC= SSL/TLS support via OpenSSL/LibreSSL from port TABLE_DB_DESC= Build table-db plugin (aliases) -USES= cpe libtool -USE_OPENSSL= yes +USES= cpe libtool ssl GNU_CONFIGURE= yes CPE_VENDOR= openbsd diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile index c9e5a55f854e..348a99bfc25f 100644 --- a/mail/opensmtpd/Makefile +++ b/mail/opensmtpd/Makefile @@ -27,8 +27,7 @@ MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) SSL_PORT_DESC= SSL/TLS support via OpenSSL/LibreSSL from port TABLE_DB_DESC= Build table-db plugin (aliases) -USES= cpe libtool -USE_OPENSSL= yes +USES= cpe libtool ssl GNU_CONFIGURE= yes CPE_VENDOR= openbsd diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile index d91d103ae290..33bafa08cfd8 100644 --- a/mail/p5-qpsmtpd/Makefile +++ b/mail/p5-qpsmtpd/Makefile @@ -4,7 +4,7 @@ PORTNAME= qpsmtpd PORTVERSION= 0.93 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail perl5 PKGNAMEPREFIX= p5- diff --git a/mail/pear-Contact_Vcard_Build/pkg-descr b/mail/pear-Contact_Vcard_Build/pkg-descr index f8032f5c4b36..de19c78d6a8e 100644 --- a/mail/pear-Contact_Vcard_Build/pkg-descr +++ b/mail/pear-Contact_Vcard_Build/pkg-descr @@ -1,4 +1,4 @@ PEAR::Contact_Vcard_Build allows you to programmatically create a vCard, version 2.1 or 3.0, and fetch the vCard text. -WWW: http://pear.php.net/package/Contact_Vcard_Build/ +WWW: https://pear.php.net/package/Contact_Vcard_Build diff --git a/mail/pear-Contact_Vcard_Parse/pkg-descr b/mail/pear-Contact_Vcard_Parse/pkg-descr index 924908fe8445..ad6f2711cb3f 100644 --- a/mail/pear-Contact_Vcard_Parse/pkg-descr +++ b/mail/pear-Contact_Vcard_Parse/pkg-descr @@ -1,4 +1,4 @@ PEAR::Contact_Vcard_Parse allows you to parse vCard files and text blocks, and get back an array of the elements of each vCard in the file or text. -WWW: http://pear.php.net/package/Contact_Vcard_Parse/ +WWW: https://pear.php.net/package/Contact_Vcard_Parse diff --git a/mail/pear-Horde_Imap_Client/Makefile b/mail/pear-Horde_Imap_Client/Makefile index 509c51ab81ce..412983425f70 100644 --- a/mail/pear-Horde_Imap_Client/Makefile +++ b/mail/pear-Horde_Imap_Client/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Horde_Imap_Client -PORTVERSION= 2.29.10 +PORTVERSION= 2.29.12 CATEGORIES= mail www pear PKGNAMEPREFIX= pear- diff --git a/mail/pear-Horde_Imap_Client/distinfo b/mail/pear-Horde_Imap_Client/distinfo index f8f50717e595..95319adc4a6d 100644 --- a/mail/pear-Horde_Imap_Client/distinfo +++ b/mail/pear-Horde_Imap_Client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478647745 -SHA256 (Horde/Horde_Imap_Client-2.29.10.tgz) = 23592d5c94f05f0d9bb79c89c2e34b6b0da82f3321fc8259bf955b3539043554 -SIZE (Horde/Horde_Imap_Client-2.29.10.tgz) = 247135 +TIMESTAMP = 1482001573 +SHA256 (Horde/Horde_Imap_Client-2.29.12.tgz) = 2956a2f047bbaaac1299f848221b81a9ae3c4e635954a775a65a6cbde0efa2b2 +SIZE (Horde/Horde_Imap_Client-2.29.12.tgz) = 247415 diff --git a/mail/pear-MIME_Type/pkg-descr b/mail/pear-MIME_Type/pkg-descr index b44ae969e32e..8bbd200618fd 100644 --- a/mail/pear-MIME_Type/pkg-descr +++ b/mail/pear-MIME_Type/pkg-descr @@ -7,4 +7,4 @@ PEAR::MIME_Type provides functionality for dealing with MIME types. * Autodetect a file's mime-type, either with mime_content_type() or the 'file' command. -WWW: http://pear.php.net/package/MIME_Type/ +WWW: https://pear.php.net/package/MIME_Type diff --git a/mail/pear-Mail/pkg-descr b/mail/pear-Mail/pkg-descr index e47128798eff..1b396bf042c8 100644 --- a/mail/pear-Mail/pkg-descr +++ b/mail/pear-Mail/pkg-descr @@ -6,4 +6,4 @@ Currently supported are native PHP mail() function, sendmail and SMTP. This package also provides a RFC 822 Email address list validation utility class. -WWW: http://pear.php.net/package/Mail/ +WWW: https://pear.php.net/package/Mail diff --git a/mail/pear-Mail_Mbox/pkg-descr b/mail/pear-Mail_Mbox/pkg-descr index 41708d49d532..19694216e17b 100644 --- a/mail/pear-Mail_Mbox/pkg-descr +++ b/mail/pear-Mail_Mbox/pkg-descr @@ -1,4 +1,4 @@ It can split messages inside a Mbox, return the number of messages, return, update or remove an specific message or add a message on the Mbox. -WWW: http://pear.php.net/package/Mail_Mbox/ +WWW: https://pear.php.net/package/Mail_Mbox diff --git a/mail/pear-Mail_Mime/pkg-descr b/mail/pear-Mail_Mime/pkg-descr index b140fc6097cb..f74955242601 100644 --- a/mail/pear-Mail_Mime/pkg-descr +++ b/mail/pear-Mail_Mime/pkg-descr @@ -1,3 +1,3 @@ PEAR classes to deal with creation and manipulation of MIME messages. -WWW: http://pear.php.net/package/Mail_Mime/ +WWW: https://pear.php.net/package/Mail_Mime diff --git a/mail/pear-Mail_Queue/pkg-descr b/mail/pear-Mail_Queue/pkg-descr index 8eb8346914f4..225315ae16bd 100644 --- a/mail/pear-Mail_Queue/pkg-descr +++ b/mail/pear-Mail_Queue/pkg-descr @@ -8,4 +8,4 @@ waiting to be fed to the MTA (Mail Transport Agent), and sends them later (e.g. a certain amount of mails every few minutes) by crontab or in other way. -WWW: http://pear.php.net/package/Mail_Queue/ +WWW: https://pear.php.net/package/Mail_Queue diff --git a/mail/pear-Mail_mimeDecode/pkg-descr b/mail/pear-Mail_mimeDecode/pkg-descr index 5a67e8fec13c..2b6c3554516b 100644 --- a/mail/pear-Mail_mimeDecode/pkg-descr +++ b/mail/pear-Mail_mimeDecode/pkg-descr @@ -4,4 +4,4 @@ This package used to be part of the Mail_Mime package, but has been split off. This class will parse a raw mime email and return the structure. Returned structure is similar to that returned by imap_fetchstructure(). -WWW: http://pear.php.net/package/Mail_mimeDecode +WWW: https://pear.php.net/package/Mail_mimeDecode diff --git a/mail/pear-Net_Cyrus/pkg-descr b/mail/pear-Net_Cyrus/pkg-descr index 1c56d5cc6c84..a31412622695 100644 --- a/mail/pear-Net_Cyrus/pkg-descr +++ b/mail/pear-Net_Cyrus/pkg-descr @@ -4,4 +4,4 @@ Cyrus IMAP servers. It can be used to create,delete and modify users and it's properties (Quota and ACL) -WWW: http://pear.php.net/package/Net_Cyrus +WWW: https://pear.php.net/package/Net_Cyrus diff --git a/mail/pear-Net_IMAP/pkg-descr b/mail/pear-Net_IMAP/pkg-descr index 12cf713ff262..c9e02444985a 100644 --- a/mail/pear-Net_IMAP/pkg-descr +++ b/mail/pear-Net_IMAP/pkg-descr @@ -1,4 +1,4 @@ This PEAR class provides an implementation of the IMAP protocol using PEAR's Net_Socket:: class. -WWW: http://pear.php.net/package/Net_IMAP/ +WWW: https://pear.php.net/package/Net_IMAP diff --git a/mail/pear-Net_LMTP/pkg-descr b/mail/pear-Net_LMTP/pkg-descr index a057ff6c2034..11b3ef73d2f5 100644 --- a/mail/pear-Net_LMTP/pkg-descr +++ b/mail/pear-Net_LMTP/pkg-descr @@ -1,4 +1,4 @@ PEAR::Net_LMTP provides an implementation of the RFC2033 LMTP using PEAR::Net_Socket and PEAR::Auth_SASL. -WWW: http://pear.php.net/package/Net_LMTP/ +WWW: https://pear.php.net/package/Net_LMTP diff --git a/mail/pecl-mailparse/pkg-descr b/mail/pecl-mailparse/pkg-descr index abf0218493a6..c9f9ca014e16 100644 --- a/mail/pecl-mailparse/pkg-descr +++ b/mail/pecl-mailparse/pkg-descr @@ -4,4 +4,4 @@ Mailparse is stream based, which means that it does not keep in-memory copies of the files it processes - so it is very resource efficient when dealing with large messages. -WWW: http://pecl.php.net/package/mailparse +WWW: https://pecl.php.net/package/mailparse diff --git a/mail/pecl-pop3/pkg-descr b/mail/pecl-pop3/pkg-descr index b620931ff4a0..b817005bcf24 100644 --- a/mail/pecl-pop3/pkg-descr +++ b/mail/pecl-pop3/pkg-descr @@ -3,4 +3,4 @@ script to connect to and interact with a POP3 mail server. It is based on the PHP streams interface and requires no external library. -WWW: http://pecl.php.net/package/POP3 +WWW: https://pecl.php.net/package/POP3 diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index be3e8b274969..94abbd6b4c88 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 3.2-20161106 +DISTVERSION= 3.2-20161204 PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= mail ipv6 diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 283a8a7f6b00..ce0875887617 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478386144 -SHA256 (postfix/postfix-3.2-20161106.tar.gz) = 765c0b5a0620a4f9d333bcba3206209da12c25f6b55894b2c05483cba8b940bf -SIZE (postfix/postfix-3.2-20161106.tar.gz) = 4368066 +TIMESTAMP = 1480886639 +SHA256 (postfix/postfix-3.2-20161204.tar.gz) = c390c2bfa0ac67268688258537cd0ec1758c0768351d645aee529a05e42d0047 +SIZE (postfix/postfix-3.2-20161204.tar.gz) = 4366046 diff --git a/mail/rubygem-actionmailer/Makefile b/mail/rubygem-actionmailer/Makefile index 6b4e84c7e49e..ed1246a9e26e 100644 --- a/mail/rubygem-actionmailer/Makefile +++ b/mail/rubygem-actionmailer/Makefile @@ -19,4 +19,7 @@ NO_ARCH= yes USE_RUBY= yes USES= gem +DEPRECATED= Upstream support ended +EXPIRATION_DATE= 2017-01-07 + .include <bsd.port.mk> diff --git a/mail/rubygem-tmail/pkg-descr b/mail/rubygem-tmail/pkg-descr index f57b76413918..d1c1d56b9599 100644 --- a/mail/rubygem-tmail/pkg-descr +++ b/mail/rubygem-tmail/pkg-descr @@ -1,4 +1,4 @@ TMail is a mail manipulating library for Ruby, with RFC822 and MIME multipart support. -WWW: http://rubygems.org/gems/tmail/ +WWW: https://rubygems.org/gems/tmail/ diff --git a/mail/smtp-gated/Makefile b/mail/smtp-gated/Makefile index b00cef14a534..e4a05225dfc4 100644 --- a/mail/smtp-gated/Makefile +++ b/mail/smtp-gated/Makefile @@ -3,7 +3,7 @@ PORTNAME= smtp-gated PORTVERSION= 1.4.20.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://software.klolik.org/smtp-gated/files/ diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index abc2e3a6b853..06dee27080f5 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.5.1 -PORTREVISION= 1 +PORTREVISION= 6 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source @@ -31,9 +31,6 @@ BUILD_DEPENDS= nspr>=4.12:devel/nspr \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l -EM_VERSION= 1.9.6.1 -L_VERSION= 4.7.5.1 - SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= # empty @@ -56,10 +53,10 @@ PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_DEFINE= ENIGMAIL LIGHTNING RUST +OPTIONS_DEFINE= LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 -OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA ENIGMAIL GTK2 LIGHTNING +OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK2 LIGHTNING .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> @@ -67,29 +64,8 @@ OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA ENIGMAIL GTK2 LIGHTNING WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} MOZSRC:= ${WRKSRC}/mozilla -XPI_LIBDIR= ${PREFIX}/lib/xpi - -.if ${PORT_OPTIONS:MENIGMAIL} -MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail -DISTFILES+= ${EM_DISTFILE}:enigmail -RUN_DEPENDS+= gpg2:security/gnupg -EM_DISTNAME= enigmail-${EM_VERSION} -EM_DISTFILE= ${EM_DISTNAME}.tar.gz -EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}.xpi -EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} -EM_ID= ${PORTNAME}@mozilla-enigmail.org -EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ - ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ - ${XPI_LIBDIR}/${EM_ID}/modules/app.jsm -.endif - .if ${PORT_OPTIONS:MLIGHTNING} MOZ_OPTIONS+= --enable-calendar -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar -LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi -XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} -XPI_ID= lightning@thunderbird.mozilla.org .else MOZ_OPTIONS+= --disable-calendar .endif @@ -97,65 +73,21 @@ MOZ_OPTIONS+= --disable-calendar post-extract: @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop -.if ${PORT_OPTIONS:MENIGMAIL} - @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ - -C ${WRKSRC}/mailnews/extensions -.endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp -.if ${PORT_OPTIONS:MENIGMAIL} - @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ - ${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \ - ${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl - @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ - -e '/^all/s/ xpi//' \ - -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ - ${WRKSRC}/mailnews/extensions/enigmail/Makefile - @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ - -e '/em:maxVersion/s/pre//' \ - ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf -.endif pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) -.if ${PORT_OPTIONS:MENIGMAIL} -post-configure: - cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ - ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure - -post-build: - ${DO_MAKE_BUILD:N-j*:S,${MAKEFILE},Makefile,} all xpi \ - -C ${WRKSRC}/mailnews/extensions/enigmail -.endif - port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} -.if ${PORT_OPTIONS:MLIGHTNING} - @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/thunderbird - @(cd ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE}) - @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}/install.rdf - @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST} -.endif -.if ${PORT_OPTIONS:MENIGMAIL} - @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} - @(cd ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) - @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES:S/^/${STAGEDIR}/} - @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} - @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} -.endif .include <bsd.port.post.mk> diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index dfb082e1949e..e7552975e405 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1480587562 SHA256 (thunderbird-45.5.1.source.tar.xz) = 15088086ab8643275f04775002aca02701e30b4d61f108d5380b6e6b7582a24c SIZE (thunderbird-45.5.1.source.tar.xz) = 201116636 -SHA256 (enigmail-1.9.6.1.tar.gz) = 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f -SIZE (enigmail-1.9.6.1.tar.gz) = 1745021 diff --git a/mail/thunderbird/files/patch-bug1232150 b/mail/thunderbird/files/patch-bug1232150 new file mode 100644 index 000000000000..463bf653268e --- /dev/null +++ b/mail/thunderbird/files/patch-bug1232150 @@ -0,0 +1,280 @@ +commit 9a18802e82c7 +Author: Martin Husemann <martin> +Date: Fri Jan 22 00:09:00 2016 +0100 + + Bug 1232150 - "Atomic operations for PPC/PPC64". r=lhansen +--- + js/src/jit/AtomicOperations.h | 2 + + js/src/jit/none/AtomicOperations-sparc.h | 251 +++++++++++++++++++++++++++++++ + 2 files changed, 253 insertions(+) + +diff --git js/src/jit/AtomicOperations.h js/src/jit/AtomicOperations.h +index 16196342a282..42aee72eb879 100644 +--- mozilla/js/src/jit/AtomicOperations.h ++++ mozilla/js/src/jit/AtomicOperations.h +@@ -328,6 +328,8 @@ AtomicOperations::isLockfree(int32_t size) + # include "jit/mips-shared/AtomicOperations-mips-shared.h" + #elif defined(__ppc__) || defined(__PPC__) + # include "jit/none/AtomicOperations-ppc.h" ++#elif defined(__sparc__) ++# include "jit/none/AtomicOperations-sparc.h" + #elif defined(JS_CODEGEN_NONE) + // You can disable the JIT with --disable-ion but you must still + // provide the atomic operations that will be used by the JS engine. +diff --git js/src/jit/none/AtomicOperations-sparc.h js/src/jit/none/AtomicOperations-sparc.h +new file mode 100644 +index 000000000000..706ada86241b +--- /dev/null ++++ mozilla/js/src/jit/none/AtomicOperations-sparc.h +@@ -0,0 +1,251 @@ ++/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- ++ * vim: set ts=8 sts=4 et sw=4 tw=99: ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ++ ++/* For documentation, see jit/AtomicOperations.h */ ++ ++#ifndef jit_sparc_AtomicOperations_sparc_h ++#define jit_sparc_AtomicOperations_sparc_h ++ ++#include "mozilla/Assertions.h" ++#include "mozilla/Types.h" ++ ++#if defined(__clang__) || defined(__GNUC__) ++ ++// The default implementation tactic for gcc/clang is to use the newer ++// __atomic intrinsics added for use in C++11 <atomic>. Where that ++// isn't available, we use GCC's older __sync functions instead. ++// ++// ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS is kept as a backward ++// compatible option for older compilers: enable this to use GCC's old ++// __sync functions instead of the newer __atomic functions. This ++// will be required for GCC 4.6.x and earlier, and probably for Clang ++// 3.1, should we need to use those versions. ++ ++//#define ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ ++inline bool ++js::jit::AtomicOperations::isLockfree8() ++{ ++# ifndef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int8_t), 0)); ++ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int16_t), 0)); ++ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int32_t), 0)); ++# if defined(__LP64__) ++ MOZ_ASSERT(__atomic_always_lock_free(sizeof(int64_t), 0)); ++# endif ++ return true; ++# else ++ return false; ++# endif ++} ++ ++inline void ++js::jit::AtomicOperations::fenceSeqCst() ++{ ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ __sync_synchronize(); ++# else ++ __atomic_thread_fence(__ATOMIC_SEQ_CST); ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::loadSeqCst(T* addr) ++{ ++ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8()); ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ __sync_synchronize(); ++ T v = *addr; ++ __sync_synchronize(); ++# else ++ T v; ++ __atomic_load(addr, &v, __ATOMIC_SEQ_CST); ++# endif ++ return v; ++} ++ ++template<typename T> ++inline void ++js::jit::AtomicOperations::storeSeqCst(T* addr, T val) ++{ ++ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8()); ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ __sync_synchronize(); ++ *addr = val; ++ __sync_synchronize(); ++# else ++ __atomic_store(addr, &val, __ATOMIC_SEQ_CST); ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::compareExchangeSeqCst(T* addr, T oldval, T newval) ++{ ++ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8()); ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ return __sync_val_compare_and_swap(addr, oldval, newval); ++# else ++ __atomic_compare_exchange(addr, &oldval, &newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); ++ return oldval; ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::fetchAddSeqCst(T* addr, T val) ++{ ++#if !defined( __LP64__) ++ static_assert(sizeof(T) <= 4, "not available for 8-byte values yet"); ++#endif ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ return __sync_fetch_and_add(addr, val); ++# else ++ return __atomic_fetch_add(addr, val, __ATOMIC_SEQ_CST); ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::fetchSubSeqCst(T* addr, T val) ++{ ++#if !defined( __LP64__) ++ static_assert(sizeof(T) <= 4, "not available for 8-byte values yet"); ++#endif ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ return __sync_fetch_and_sub(addr, val); ++# else ++ return __atomic_fetch_sub(addr, val, __ATOMIC_SEQ_CST); ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::fetchAndSeqCst(T* addr, T val) ++{ ++#if !defined( __LP64__) ++ static_assert(sizeof(T) <= 4, "not available for 8-byte values yet"); ++#endif ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ return __sync_fetch_and_and(addr, val); ++# else ++ return __atomic_fetch_and(addr, val, __ATOMIC_SEQ_CST); ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::fetchOrSeqCst(T* addr, T val) ++{ ++#if !defined( __LP64__) ++ static_assert(sizeof(T) <= 4, "not available for 8-byte values yet"); ++#endif ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ return __sync_fetch_and_or(addr, val); ++# else ++ return __atomic_fetch_or(addr, val, __ATOMIC_SEQ_CST); ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::fetchXorSeqCst(T* addr, T val) ++{ ++#if !defined( __LP64__) ++ static_assert(sizeof(T) <= 4, "not available for 8-byte values yet"); ++#endif ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ return __sync_fetch_and_xor(addr, val); ++# else ++ return __atomic_fetch_xor(addr, val, __ATOMIC_SEQ_CST); ++# endif ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::loadSafeWhenRacy(T* addr) ++{ ++ return *addr; // FIXME (1208663): not yet safe ++} ++ ++template<typename T> ++inline void ++js::jit::AtomicOperations::storeSafeWhenRacy(T* addr, T val) ++{ ++ *addr = val; // FIXME (1208663): not yet safe ++} ++ ++inline void ++js::jit::AtomicOperations::memcpySafeWhenRacy(void* dest, const void* src, size_t nbytes) ++{ ++ ::memcpy(dest, src, nbytes); // FIXME (1208663): not yet safe ++} ++ ++inline void ++js::jit::AtomicOperations::memmoveSafeWhenRacy(void* dest, const void* src, size_t nbytes) ++{ ++ ::memmove(dest, src, nbytes); // FIXME (1208663): not yet safe ++} ++ ++template<typename T> ++inline T ++js::jit::AtomicOperations::exchangeSeqCst(T* addr, T val) ++{ ++ MOZ_ASSERT(sizeof(T) < 8 || isLockfree8()); ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ T v; ++ __sync_synchronize(); ++ do { ++ v = *addr; ++ } while (__sync_val_compare_and_swap(addr, v, val) != v); ++ return v; ++# else ++ T v; ++ __atomic_exchange(addr, &val, &v, __ATOMIC_SEQ_CST); ++ return v; ++# endif ++} ++ ++template<size_t nbytes> ++inline void ++js::jit::RegionLock::acquire(void* addr) ++{ ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ while (!__sync_bool_compare_and_swap(&spinlock, 0, 1)) ++ ; ++# else ++ uint32_t zero = 0; ++ uint32_t one = 1; ++ while (!__atomic_compare_exchange(&spinlock, &zero, &one, false, __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE)) { ++ zero = 0; ++ continue; ++ } ++# endif ++} ++ ++template<size_t nbytes> ++inline void ++js::jit::RegionLock::release(void* addr) ++{ ++ MOZ_ASSERT(AtomicOperations::loadSeqCst(&spinlock) == 1, "releasing unlocked region lock"); ++# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ __sync_sub_and_fetch(&spinlock, 1); ++# else ++ uint32_t zero = 0; ++ __atomic_store(&spinlock, &zero, __ATOMIC_SEQ_CST); ++# endif ++} ++ ++# undef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS ++ ++#elif defined(ENABLE_SHARED_ARRAY_BUFFER) ++ ++# error "Either disable JS shared memory, use GCC or Clang, or add code here" ++ ++#endif ++ ++#endif // jit_sparc_AtomicOperations_sparc_h diff --git a/mail/thunderbird/files/patch-bug1290037 b/mail/thunderbird/files/patch-bug1290037 new file mode 100644 index 000000000000..94d9cd381bfb --- /dev/null +++ b/mail/thunderbird/files/patch-bug1290037 @@ -0,0 +1,29 @@ +commit 7943c27406fb +Author: Franziskus Kiefer <franziskuskiefer@gmail.com> +Date: Thu Jul 28 16:48:00 2016 +0200 + + Bug 1290037 - Update keybits in H2, r=mt + + MozReview-Commit-ID: 35oWoDMqe1Y + + --HG-- + extra : rebase_source : 020fbd93c190131eb04eed2d583787d6e5954a5a +--- + netwerk/protocol/http/Http2Session.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git netwerk/protocol/http/Http2Session.cpp netwerk/protocol/http/Http2Session.cpp +index dbcc1115cbd3..f3cd57304f73 100644 +--- mozilla/netwerk/protocol/http/Http2Session.cpp ++++ mozilla/netwerk/protocol/http/Http2Session.cpp +@@ -3549,8 +3549,8 @@ Http2Session::ConfirmTLSProfile() + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } diff --git a/mail/thunderbird/files/patch-bug1321877 b/mail/thunderbird/files/patch-bug1321877 new file mode 100644 index 000000000000..f7f79285a328 --- /dev/null +++ b/mail/thunderbird/files/patch-bug1321877 @@ -0,0 +1,42 @@ +commit a13d95795217 +Author: <tharvik@gmail.com> +Date: Thu Dec 8 18:20:12 2016 -0600 + + Bug 1321877. Fix compiler warnings in Downscaler.h when skia is not enabled. r=tnikkel +--- + image/Downscaler.h | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git image/Downscaler.h image/Downscaler.h +index 21179a38f200..0bdef0eaa646 100644 +--- mozilla/image/Downscaler.h ++++ mozilla/image/Downscaler.h +@@ -154,14 +154,14 @@ private: + class Downscaler + { + public: +- explicit Downscaler(const nsIntSize&) ++ explicit Downscaler(const nsIntSize&) : mScale(1.0, 1.0) + { + MOZ_RELEASE_ASSERT(false, "Skia is not enabled"); + } + +- const nsIntSize& OriginalSize() const { return nsIntSize(); } +- const nsIntSize& TargetSize() const { return nsIntSize(); } +- const gfxSize& Scale() const { return gfxSize(1.0, 1.0); } ++ const nsIntSize& OriginalSize() const { return mSize; } ++ const nsIntSize& TargetSize() const { return mSize; } ++ const gfxSize& Scale() const { return mScale; } + + nsresult BeginFrame(const nsIntSize&, const Maybe<nsIntRect>&, uint8_t*, bool, bool = false) + { +@@ -177,6 +177,9 @@ public: + DownscalerInvalidRect TakeInvalidRect() { return DownscalerInvalidRect(); } + void ResetForNextProgressivePass() { } + const nsIntSize FrameSize() const { return nsIntSize(0, 0); } ++private: ++ nsIntSize mSize; ++ gfxSize mScale; + }; + + #endif // MOZ_ENABLE_SKIA |