Date: Fri, 2 Apr 2004 19:48:36 +0200 (CEST) From: "Herbert J. Skuhra" <herbert.skuhra@gmx.at> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65094: patch to update mail/msmtp from 0.5.0 to 0.7.2 Message-ID: <20040402174836.303FE27C4@stavanger.norge> Resent-Message-ID: <200404021750.i32HoLYe042384@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65094
>Category: ports
>Synopsis: patch to update mail/msmtp from 0.5.0 to 0.7.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Apr 02 09:50:21 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Herbert J. Skuhra
>Release: FreeBSD 5.2.1-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD stavanger.norge 5.2.1-RELEASE-p3 FreeBSD 5.2.1-RELEASE-p3 #1: Wed Mar 17 19:48:58 CET 2004 herbert@stavanger.norge:/usr/obj/usr/src/sys/PC1 i386
>Description:
Msmtp-0.7.2 was released 2004/03/25.
>How-To-Repeat:
>Fix:
Here comes the patch
diff -ruN msmtp.bak/Makefile msmtp/Makefile
--- msmtp.bak/Makefile Fri Apr 2 19:32:09 2004
+++ msmtp/Makefile Fri Apr 2 19:07:42 2004
@@ -6,7 +6,7 @@
#
PORTNAME= msmtp
-PORTVERSION= 0.5.0
+PORTVERSION= 0.7.2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= msmtp
@@ -14,28 +14,32 @@
MAINTAINER= rip@devco.net
COMMENT= SMTP plugin for MUAs
-USE_GETOPT_LONG= yes
-USE_OPENSSL= yes
-USE_REINPLACE= yes
-
+GNU_CONFIGURE= yes
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GMAKE= yes
MAN1= msmtp.1
PLIST_FILES= bin/msmtp
-post-patch:
- @${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|g ; \
- s|CC =|CC ?=|g' \
- ${WRKSRC}/Makefile
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/msmtp ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/msmtp.1 ${PREFIX}/man/man1
-
-post-install:
- @${ECHO_CMD} "*****************************************************************************"
- @${ECHO_CMD} ""
- @${ECHO_CMD} "Please note that since version 0.5.0 this program uses a configuration file"
- @${ECHO_CMD} "rather than the old command line options, see the man page."
- @${ECHO_CMD} ""
- @${ECHO_CMD} "***************************************************************************##"
+.if !defined(WITH_OPENSSL)
+WITH_GNUTLS= yes
+.endif
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
+.endif
+
+.if defined(WITH_OPENSSL)
+USE_OPENSSL= yes
+CONFIGURE_ARGS+= --with-ssl=openssl
+.endif
+
+.if defined(WITH_GNU_SASL)
+LIB_DEPENDS+= gsasl:${PORTSDIR}/security/gsasl
+.else
+CONFIGURE_ARGS+= --disable-gsasl
+.endif
.include <bsd.port.mk>
diff -ruN msmtp.bak/distinfo msmtp/distinfo
--- msmtp.bak/distinfo Fri Apr 2 19:32:09 2004
+++ msmtp/distinfo Sun Mar 28 12:57:14 2004
@@ -1,2 +1,2 @@
-MD5 (msmtp-0.5.0.tar.gz) = 8d1f7b62eb7f9d32355bf11d6dbb5817
-SIZE (msmtp-0.5.0.tar.gz) = 41147
+MD5 (msmtp-0.7.2.tar.gz) = a9a44243211c8b84a220779335a257a5
+SIZE (msmtp-0.7.2.tar.gz) = 139544
diff -ruN msmtp.bak/files/patch-aa msmtp/files/patch-aa
--- msmtp.bak/files/patch-aa Fri Apr 2 19:32:09 2004
+++ msmtp/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -1,37 +0,0 @@
-*** Makefile.orig Thu Aug 21 22:28:13 2003
---- Makefile Thu Aug 21 22:28:44 2003
-***************
-*** 3,18 ****
- #
-
- # GNU/Linux and GNU/Hurd
-- CC = gcc
-- CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -D_GNU_SOURCE -Wall -O2
-- LFLAGS = -lssl -lcrypto -s
-- EXTRAOBJS =
--
-- # FreeBSD, NetBSD, OpenBSD
- #CC = gcc
-! #CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -Wall -O2
- #LFLAGS = -lssl -lcrypto -s
- #EXTRAOBJS =
-
- # SunOS
- #CC = cc
---- 3,18 ----
- #
-
- # GNU/Linux and GNU/Hurd
- #CC = gcc
-! #CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -D_GNU_SOURCE -Wall -O2
- #LFLAGS = -lssl -lcrypto -s
- #EXTRAOBJS =
-+
-+ # FreeBSD, NetBSD, OpenBSD
-+ CC = gcc
-+ CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -Wall -O2 -I${LOCALBASE}/include
-+ LFLAGS = -lssl -lcrypto -s -L${LOCALBASE}/lib
-+ EXTRAOBJS = getopt.o getopt1.o
-
- # SunOS
- #CC = cc
diff -ruN msmtp.bak/pkg-descr msmtp/pkg-descr
--- msmtp.bak/pkg-descr Fri Apr 2 19:32:09 2004
+++ msmtp/pkg-descr Fri Apr 2 19:24:57 2004
@@ -1,18 +1,21 @@
-msmtp -- SMTP plugin for MUAs
+msmtp -- An SMTP client
-This is a simple program that works as an "SMTP plugin" for Mutt and probably
-other MUAs (mail user agents). msmtp forwards mails to an SMTP server (for
-example at a free mail provider) which does the delivery.
+Is an SMTP client that can be used as an "SMTP plugin" for Mutt and probably
+other MUAs (mail user agents). It forwards mails to an SMTP server (for
+example at a free mail provider) which does the delivery.
+To use this program, create a configuration file with your mail account(s) and
+tell your MUA to call msmtp instead of /usr/sbin/sendmail.
Features include:
+
* SMTP AUTH methods PLAIN, LOGIN and CRAM-MD5
+ (and DIGEST-MD5 and NTLM when compiled with GSASL support)
* TLS encrypted connections
- * IPv6 support
- * robustness
- * detailed error messages (including the full answer of the SMTP server)
- if something goes wrong
+ (including server certificate verification and the possibility to send
+ a client certificate)
+ * DSN (Delivery Status Notification) support
+ * IPv6 support (on systems that support it)
+ * support for multiple accounts
* sendmail compatible exit codes (which most MUAs understand).
-
-Simply tell your MUA to call msmtp instead of /usr/sbin/sendmail
WWW: http://msmtp.sourceforge.net/
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040402174836.303FE27C4>