From 2b26cfaae585a5200039ca46930e1837424143a2 Mon Sep 17 00:00:00 2001 From: htodd Date: Mon, 6 Jan 2014 03:52:38 +0000 Subject: Update Alpine. Version 2.11 includes several new features and bug fixes. Additions include: Increase encryption of S/MIME encrypted messages. Alpine requires version 1.0.0c of Openssl to build. Pico: Improvements in justification of paragraphs: lines that begin with a quote string, followed by a space were considered individual paragraphs, now they are considered part of a paragraph. Based on earlier joint work with Jeff Franklin. Unix Alpine: Allow local .pinerc file to be a symbolic link. - Experimental extended support of recognition of UTF-8 in urls based on information from http://url.spec.whatwg.org. - Added recognition of ws and wss URIs. - Add ability to color folder names, directory names, and text in the FOLDER SCREEN. - Add the ability to color any token used in the display of the INDEX SCREEN. - New option preserve-original-fields that adds the ability to preserve To: and Cc: fields when replying to a message, as specified by original sender. - Add a _SILENT_ token to the list of tokens for a display filter, so that Alpine will not redraw the screen when it is unnecessary. - Added Quota subcommands for printing, forwarding, saving, etc. Bugs that have been addressed include: - Crash when a non-compliant SMTP server closes a connection without a QUIT command. - Crash when resizing the screen in a configuration screen. - Do not bail out during a tcp timeout, instead close connection and avoid crash. - Do not use a shell to open a browser. - Configure script did not test for crypto or pam libraries. - Configure script attempted to build web component, even if header file tcl.h was not present. - Change Cygwin directory separator to "/". - Alpine could set List- headers, contrary to RFC 2369. --- mail/alpine/Makefile | 17 ++++++++--------- mail/alpine/distinfo | 17 ++++------------- mail/alpine/options.mk | 50 -------------------------------------------------- 3 files changed, 12 insertions(+), 72 deletions(-) delete mode 100644 mail/alpine/options.mk (limited to 'mail') diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile index 327f7a2afda..65a41d1e771 100644 --- a/mail/alpine/Makefile +++ b/mail/alpine/Makefile @@ -1,20 +1,17 @@ -# $NetBSD: Makefile,v 1.32 2013/02/06 23:22:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.33 2014/01/06 03:52:38 htodd Exp $ # -DISTNAME= alpine-2.00 -PKGREVISION= 9 +DISTNAME= alpine-2.11 +PKGREVISION= 1 CATEGORIES= mail -MASTER_SITES= ftp://ftp.cac.washington.edu/alpine/ -DIST_SUBDIR= alpine-2.00a -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= http://patches.freeiz.com/alpine/release/src/ +EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.washington.edu/alpine/ +HOMEPAGE= http://patches.freeiz.com/alpine/release/ COMMENT= Program for Internet News and E-mail LICENSE= apache-2.0 -.include "options.mk" - GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} CONFIGURE_ARGS+= --with-ssl-certs-dir=${SSLCERTS:Q} @@ -30,6 +27,8 @@ USE_LIBTOOL= yes MAKE_JOBS_SAFE= no INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +.include "../../mk/bsd.prefs.mk" + .if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M4.99.*) && empty(OS_VERSION:M[5-9]*) CONFIGURE_ARGS+= --without-pthread .endif diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo index 2e44821a121..83736b238c4 100644 --- a/mail/alpine/distinfo +++ b/mail/alpine/distinfo @@ -1,17 +1,8 @@ -$NetBSD: distinfo,v 1.18 2012/10/10 19:45:49 markd Exp $ +$NetBSD: distinfo,v 1.19 2014/01/06 03:52:38 htodd Exp $ -SHA1 (alpine-2.00a/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4 -RMD160 (alpine-2.00a/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13 -Size (alpine-2.00a/alpine-2.00.tar.bz2) = 5222673 bytes -SHA1 (alpine-2.00a/fancy.patch.gz) = 2622d3e86a76908bf4d1ca63501c6dac75563348 -RMD160 (alpine-2.00a/fancy.patch.gz) = b877b97fd88fa73a8428d288f929579560faec4e -Size (alpine-2.00a/fancy.patch.gz) = 24556 bytes -SHA1 (alpine-2.00a/maildir.patch.gz) = 86b66c2f92e49b2edb11fa944ed9bc1089176613 -RMD160 (alpine-2.00a/maildir.patch.gz) = ed700c492479260964f804a08e6b86863cd37e52 -Size (alpine-2.00a/maildir.patch.gz) = 32216 bytes -SHA1 (alpine-2.00a/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc1873c4 -RMD160 (alpine-2.00a/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581 -Size (alpine-2.00a/searchheader.patch.gz) = 1708 bytes +SHA1 (alpine-2.11.tar.xz) = 656556f5d2e5ec7e3680d1760cd02aa3a0072c46 +RMD160 (alpine-2.11.tar.xz) = ea4b2d87500d1aa1b424033ec3263e3cf3c53814 +Size (alpine-2.11.tar.xz) = 4403188 bytes SHA1 (patch-aa) = c306613a297d61591d577b6968a31fc85b03f852 SHA1 (patch-ab) = f0983d8c0123b06a2970eb2736b04afad1502450 SHA1 (patch-imap_src_c-client_auth_gss.c) = 622b18f03074f87036f5469323125b4c855d9ce5 diff --git a/mail/alpine/options.mk b/mail/alpine/options.mk deleted file mode 100644 index 11a6c94ae52..00000000000 --- a/mail/alpine/options.mk +++ /dev/null @@ -1,50 +0,0 @@ -# $NetBSD: options.mk,v 1.4 2012/10/10 19:45:49 markd Exp $ -# - -PKG_OPTIONS_VAR= PKG_OPTIONS.alpine -PKG_SUPPORTED_OPTIONS= fancythreads ldap kerberos maildir pinepwd alpinesearchheader -PKG_SUGGESTED_OPTIONS= pinepwd - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mfancythreads) -PATCH_SITES+=http://staff.washington.edu/chappa/alpine/patches/${DISTNAME}/ -PATCHFILES+= fancy.patch.gz -PATCH_DIST_STRIP= -p1 -.endif - -.if !empty(PKG_OPTIONS:Mkerberos) -CONFIGURE_ARGS+= --with-krb5 -.include "../../mk/krb5.buildlink3.mk" -MAKE_ENV+= KRB5_TYPE=${KRB5_TYPE} -MAKE_FLAGS+= EXTRAAUTHENTICATORS=gss -EXTRASPECIALS+= GSSDIR=${KRB5BASE} -CFLAGS.heimdal= -DHEIMDAL_KRB5 -CFLAGS+= ${CFLAGS.${KRB5_TYPE}} -MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q} -MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q} -MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q} -.endif - -.if !empty(PKG_OPTIONS:Mldap) -CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client} -.include "../../databases/openldap-client/buildlink3.mk" -.else -CONFIGURE_ARGS+= --without-ldap -.endif - -.if !empty(PKG_OPTIONS:Mmaildir) -PATCH_SITES+=http://staff.washington.edu/chappa/alpine/patches/${DISTNAME}/ -PATCHFILES+= maildir.patch.gz -PATCH_DIST_STRIP= -p1 -.endif - -.if !empty(PKG_OPTIONS:Mpinepwd) -CONFIGURE_ARGS+= --with-passfile=.pinepwd -.endif - -.if !empty(PKG_OPTIONS:Malpinesearchheader) -PATCH_SITES+=http://staff.washington.edu/chappa/alpine/patches/${DISTNAME}/ -PATCHFILES+= searchheader.patch.gz -PATCH_DIST_STRIP= -p1 -.endif -- cgit v1.2.3