update of mail/ssmtp to 2.50.9

update of mail/ssmtp to 2.60.3

PR:		ports/40344
Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com>

11 files changed, 145 insertions, 132 deletions

diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 07a1387f33f0..13eee514abef 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -6,50 +6,91 @@
 #
 
 PORTNAME=	ssmtp
-PORTVERSION=	2.38
+PORTVERSION=	2.60.3
 CATEGORIES=	mail
-MASTER_SITES=	http://ftp.debian.org/debian/pool/main/s/ssmtp/ \
-		ftp://ftp.icm.edu.pl/pub/Linux/debian/pool/main/s/ssmtp/
-DISTNAME=	ssmtp_2.38-9
+MASTER_SITES=	http://ftp.us.debian.org/debian/%SUBDIR%/ \
+		http://http.us.debian.org/debian/%SUBDIR%/ \
+		http://ftp.debian.org/debian/%SUBDIR%/ \
+		http://ftp.egr.msu.edu/debian/%SUBDIR%/ \
+		http://mirrors.kernel.org/debian/%SUBDIR%/ \
+		http://archive.progeny.com/debian/%SUBDIR%/ \
+		http://debian.crosslink.net/debian/%SUBDIR%/ \
+		http://ftp-mirror.internap.com/pub/debian/%SUBDIR%/ \
+		http://ftp.cerias.purdue.edu/pub/os/debian/%SUBDIR%/ \
+		http://ftp.lug.udel.edu/debian/%SUBDIR%/ \
+		http://debian.lcs.mit.edu/debian/%SUBDIR%/ \
+		http://debian.teleglobe.net/%SUBDIR%/ \
+		http://debian.rutgers.edu/%SUBDIR%/ \
+		http://debian.oregonstate.edu/debian/%SUBDIR%/ \
+		http://mirrors.terrabox.com/debian/%SUBDIR%/ \
+		http://ftp.de.debian.org/debian/%SUBDIR%/ \
+		http://ftp.at.debian.org/debian/%SUBDIR%/ \
+		http://ftp.bg.debian.org/debian/%SUBDIR%/ \
+		http://ftp.cz.debian.org/debian/%SUBDIR%/ \
+		http://ftp.dk.debian.org/debian/%SUBDIR%/ \
+		http://ftp.ee.debian.org/debian/%SUBDIR%/ \
+		http://ftp.fi.debian.org/debian/%SUBDIR%/ \
+		http://ftp.fr.debian.org/debian/%SUBDIR%/ \
+		http://ftp.hr.debian.org/debian/%SUBDIR%/ \
+		http://ftp.hu.debian.org/debian/%SUBDIR%/ \
+		http://ftp.ie.debian.org/debian/%SUBDIR%/ \
+		http://ftp.is.debian.org/debian/%SUBDIR%/ \
+		http://ftp.it.debian.org/debian/%SUBDIR%/ \
+		http://ftp.nl.debian.org/debian/%SUBDIR%/ \
+		http://ftp.no.debian.org/debian/%SUBDIR%/ \
+		http://ftp.pl.debian.org/debian/%SUBDIR%/ \
+		http://ftp.si.debian.org/debian/%SUBDIR%/ \
+		http://ftp.es.debian.org/debian/%SUBDIR%/ \
+		http://ftp.se.debian.org/debian/%SUBDIR%/ \
+		http://ftp.tr.debian.org/debian/%SUBDIR%/ \
+		http://ftp.uk.debian.org/debian/%SUBDIR%/ \
+		http://ftp.au.debian.org/debian/%SUBDIR%/ \
+		http://ftp.wa.au.debian.org/debian/%SUBDIR%/ \
+		http://ftp.nz.debian.org/debian/%SUBDIR%/ \
+		http://ftp.jp.debian.org/debian/%SUBDIR%/ \
+		http://linux.csie.nctu.edu.tw/debian/%SUBDIR%/ \
+		http://debian.linux.org.tw/debian/%SUBDIR%/ \
+		http://linux.cdpa.nsysu.edu.tw/debian/%SUBDIR%/ \
+		http://ftp.br.debian.org/debian/%SUBDIR%/ \
+		http://ftp.cl.debian.org/debian/%SUBDIR%/
+MASTER_SITE_SUBDIR=	pool/main/s/ssmtp
+DISTNAME=	ssmtp_${PORTVERSION}
 
-IGNORE=		configures the hostname at compiletime instead of installtime
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Extremely simple MTA to get mail off the system to a mail hub
 
-MAINTAINER=	ns88@k.pl
-COMMENT=	Sendmail alternative for small routers (only for outgoing mail)
+WRKSRC=		${WRKDIR}/ssmtp-2.60
+
+USE_OPENSSL=	yes
+
+GNU_CONFIGURE=  yes
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+CONFIGURE_ARGS=	--enable-ssl --enable-inet6
 
-WRKSRC=		${WRKDIR}/ssmtp-2.38
-USE_GMAKE=	true
 MAN8=		ssmtp.8
 
-pre-install:
-	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 0755 \
-	${PREFIX}/etc/ssmtp
+post-configure:
+	@${REINPLACE_CMD} -e "s,/etc/ssl/certs/ssmtp.pem,${PREFIX}/etc/ssmtp/ssmtp.pem,g" \
+		${WRKSRC}/ssmtp.c ${WRKSRC}/ssmtp.conf
+	@${REINPLACE_CMD} -e "s, /etc, ${PREFIX}/etc,g" ${WRKSRC}/ssmtp.8
+
+replace:
+	@${REINPLACE_CMD} -e 's,^[^#],#&,g' /etc/mail/mailer.conf
+	@${ECHO_CMD} "sendmail	${PREFIX}/sbin/ssmtp" >> /etc/mail/mailer.conf
+	@${ECHO_CMD} "send-mail	${PREFIX}/sbin/ssmtp" >> /etc/mail/mailer.conf
+	@${ECHO_CMD} "mailq		${PREFIX}/sbin/ssmtp" >> /etc/mail/mailer.conf
+	@${ECHO_CMD} "newaliases	${PREFIX}/sbin/ssmtp" >> /etc/mail/mailer.conf
+	@${ECHO_CMD} "hoststat	/usr/bin/true" >> /etc/mail/mailer.conf
+	@${ECHO_CMD} "purgestat	/usr/bin/true" >> /etc/mail/mailer.conf
 
 post-install:
-	@PREFIX="${PREFIX}" ${SH} ${PKGINSTALL}
 	@${ECHO_MSG} --------------------------------------------------
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To replace sendmail with ssmtp type make replace"
 	@${ECHO_MSG}
 	@${ECHO_MSG} --------------------------------------------------
+	@${SED} -e 's#/etc#${PREFIX}/etc#' ${PKGMESSAGE}
 
-.include <bsd.port.pre.mk>
-
-replace:
-.if ${OSVERSION} >= 400014
-	@${ECHO} backuping old /etc/mail/mailer.conf
-	@${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old-ssmtp
-	@${ECHO} Replacing mailwarpper config
-	@${ECHO_CMD} "sendmail		${PREFIX}/sbin/ssmtp" > /etc/mail/mailer.conf
-	@${ECHO_CMD} "send-mail		${PREFIX}/sbin/ssmtp" >> /etc/mail/mailer.conf
-	@${ECHO_CMD} "mailq			/bin/echo" >> /etc/mail/mailer.conf
-	@${ECHO_CMD} "newaliases		/bin/echo" >> /etc/mail/mailer.conf
-.else
-	@${ECHO} backuping old /usr/sbin/sendmail
-	@${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF
-	@${CHMOD} 000 /usr/sbin/sendmail.OFF
-	@${LN} -s ${PREFIX}/sbin/ssmtp /usr/sbin/sendmail
-	@${ECHO} Done !
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/ssmtp/distinfo b/mail/ssmtp/distinfo
index 016700596437..950cd7ddc765 100644
--- a/mail/ssmtp/distinfo
+++ b/mail/ssmtp/distinfo
@@ -1 +1 @@
-MD5 (ssmtp_2.38-9.tar.gz) = 3f95d07488cf5bc3b92c7eb182634d8a
+MD5 (ssmtp_2.60.3.tar.gz) = b9b1c07f513ff2b46ae8a09eaf3e04e5
diff --git a/mail/ssmtp/files/patch-Makefile.in b/mail/ssmtp/files/patch-Makefile.in
new file mode 100644
index 000000000000..ce16456a59ea
--- /dev/null
+++ b/mail/ssmtp/files/patch-Makefile.in
@@ -0,0 +1,22 @@
+--- Makefile.in.orig	Mon Apr  7 02:22:53 2003
++++ Makefile.in	Mon Apr  7 02:31:44 2003
+@@ -17,8 +17,8 @@
+ CONFIGURATION_FILE=$(SSMTPCONFDIR)/ssmtp.conf
+ REVALIASES_FILE=$(SSMTPCONFDIR)/revaliases
+ 
+-INSTALLED_CONFIGURATION_FILE=$(CONFIGURATION_FILE)
+-INSTALLED_REVALIASES_FILE=$(REVALIASES_FILE)
++INSTALLED_CONFIGURATION_FILE=$(CONFIGURATION_FILE).sample
++INSTALLED_REVALIASES_FILE=$(REVALIASES_FILE).sample
+ 
+ # Programs
+ GEN_CONFIG=$(srcdir)/generate_config
+@@ -51,7 +51,7 @@
+ 	$(INSTALL) -m 644 $(srcdir)/ssmtp.8 $(mandir)/ssmtp.8
+ 	$(INSTALL) -d -m 755 $(SSMTPCONFDIR)
+ 	$(INSTALL) -m 644 $(srcdir)/revaliases $(INSTALLED_REVALIASES_FILE)
+-	$(GEN_CONFIG) $(INSTALLED_CONFIGURATION_FILE)
++	$(INSTALL) -m 644 $(srcdir)/ssmtp.conf $(INSTALLED_CONFIGURATION_FILE)
+ 
+ 
+ .PHONY: install-sendmail
diff --git a/mail/ssmtp/files/patch-aa b/mail/ssmtp/files/patch-aa
deleted file mode 100644
index f1dba2001262..000000000000
--- a/mail/ssmtp/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.orig	Tue Dec  5 23:40:45 2000
-+++ Makefile	Tue Dec  5 23:40:32 2000
-@@ -34,10 +34,10 @@
- 
- # Places to install things, used to relocate things for Ultrix kits.
- # 	ROOT normally is the empty string...
--#ROOT=
--LOCATION=/usr
-+ROOT=${PREFIX}
-+#LOCATION=
- DESTDIR=${ROOT}${LOCATION}/sbin
--MANDIR=${ROOT}${LOCATION}/share/man/man8
-+MANDIR=${PREFIX}/man/man8
- ETCDIR=${ROOT}/etc
- SSMTPCONFDIR=${ETCDIR}/ssmtp
- # (End of relocation section)
-@@ -62,41 +62,15 @@
- #FLAGS= -Wall -O6 -DDEBUG ${BASEFLAGS}
- #FLAGS= -Wall -g ${BASEFLAGS}
- 
--CFLAGS= ${FLAGS} ${BASEFLAGS}
-+CFLAGS+= ${FLAGS} ${BASEFLAGS}
- 
- all: ssmtp
- 
- install: ssmtp
- 	test `whoami` = root
--	install -d -m 755 ${DESTDIR}
--	install -s -m 755 ssmtp ${DESTDIR}/ssmtp
--	install -d -m 755 ${MANDIR}
--	install -m 644 ssmtp.8 ${MANDIR}/ssmtp.8
--	install -d -m 755 ${SSMTPCONFDIR}
--	install -m 644 revaliases ${INSTALLED_REVALIASES_FILE}
--	$(GEN_CONFIG) ${INSTALLED_CONFIGURATION_FILE}
--
--
--install-sendmail: ssmtp install
--	rm -f ${DESTDIR}/sendmail
--	ln -s ssmtp ${DESTDIR}/sendmail
--	install -d -m 755 ${DESTDIR}/../lib
--	rm -f ${DESTDIR}/../lib/sendmail
--	ln -s ../sbin/sendmail ${DESTDIR}/../lib
--	rm -f ${MANDIR}/sendmail.8
--	ln -s ssmtp.8 ${MANDIR}/sendmail.8
--
--uninstall:
--	test `whoami` = root
--	rm -f ${DESTDIR}/ssmtp
--	rm -f ${MANDIR}/ssmtp.8
--	rm -f ${CONFIGURATION_FILE} ${REVALIASES_FILE}
--	rmdir ${SSMTPCONFDIR}
--
--uninstall-sendmail: uninstall
--	rm -f ${DESTDIR}/sendmail ${DESTDIR}/../lib/sendmail
--	rm -f ${MANDIR}/sendmail.8
--
-+	${BSD_INSTALL_PROGRAM} ssmtp ${DESTDIR}
-+	${BSD_INSTALL_MAN} ssmtp.8 ${MANDIR}/ssmtp.8
-+	${BSD_INSTALL_DATA} revaliases ${INSTALLED_REVALIASES_FILE}
- clean:
- 	rm -f ssmtp *.o core
- 
diff --git a/mail/ssmtp/files/patch-arpadate.c b/mail/ssmtp/files/patch-arpadate.c
new file mode 100644
index 000000000000..7993e9ae2d54
--- /dev/null
+++ b/mail/ssmtp/files/patch-arpadate.c
@@ -0,0 +1,11 @@
+--- arpadate.c.orig	Sun Dec  8 18:30:13 2002
++++ arpadate.c	Mon Apr  7 01:17:58 2003
+@@ -79,7 +79,7 @@
+ 	time_t now;
+ 
+ 	/* RFC822 format string borrowed from GNU shellutils date.c */
+-	const char *format = "%a, %_d %b %Y %H:%M:%S %z";
++	const char *format = "%a, %e %b %Y %H:%M:%S %z";
+ 
+ 	now = time(NULL);
+ 
diff --git a/mail/ssmtp/files/patch-configure b/mail/ssmtp/files/patch-configure
new file mode 100644
index 000000000000..6d5fde1af078
--- /dev/null
+++ b/mail/ssmtp/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Sep 27 14:47:52 2002
++++ configure	Mon Apr  7 01:03:46 2003
+@@ -1340,7 +1340,7 @@
+ #define HAVE_SSL 1
+ EOF
+ 
+-	LIBS="$LIBS -lssl"
++	LIBS="$LIBS -lssl -lcrypto"
+ fi
+ enableval=""
+ 
diff --git a/mail/ssmtp/files/patch-ssmtp.c b/mail/ssmtp/files/patch-ssmtp.c
new file mode 100644
index 000000000000..1baf75ad41e6
--- /dev/null
+++ b/mail/ssmtp/files/patch-ssmtp.c
@@ -0,0 +1,10 @@
+--- ssmtp.c.orig	Sun Dec  8 18:26:20 2002
++++ ssmtp.c	Mon Apr  7 01:24:52 2003
+@@ -14,6 +14,7 @@
+ */
+ #define VERSION "2.60.1"
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <sys/param.h>
diff --git a/mail/ssmtp/pkg-descr b/mail/ssmtp/pkg-descr
index ee881553541b..1a8b30da2f56 100644
--- a/mail/ssmtp/pkg-descr
+++ b/mail/ssmtp/pkg-descr
@@ -1,5 +1,9 @@
-This is sSMTP, a program that replaces sendmail on workstations that
-should send their mail via the departmental mailhub from which they pick up
-their mail (via pop, imap, rsmtp, pop_fetch, NFS... or the like).  This
-program accepts mail and sends it to the mailhub, optionally replacing the
-domain in the From: line with a different one.
+A secure, effective and simple way of getting mail off a system to your
+mail hub. It contains no suid-binaries or other dangerous things - no mail
+spool to poke around in, and no daemons running in the background. Mail is
+simply forwarded to the configured mailhost. Extremely easy configuration.
+
+WARNING: the above is all it does; it does not receive mail, expand aliases
+or manage a queue. That belongs on a mail hub with a system administrator.
+
+WWW: http://packages.debian.org/testing/mail/ssmtp.html
diff --git a/mail/ssmtp/pkg-install b/mail/ssmtp/pkg-install
deleted file mode 100644
index 66d091ba5959..000000000000
--- a/mail/ssmtp/pkg-install
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-
-#
-# Generate configuration file
-#
-
-
-if [ -s ${PREFIX}/etc/ssmtp/ssmtp.conf ]; then
-    echo Configuration file $1 already exists.
-    exit
-fi
-
-umask 022
-
-cat >>${PREFIX}/etc/ssmtp/ssmtp.conf <<EOF
-#
-# ${PREFIX}/ssmtp/ssmtp.conf -- a config file for sSMTP sendmail.
-#
-# The person who gets all mail for userids < 10
-root=postmaster
-# The place where the mail goes. The actual machine name is required
-# no MX records are consulted. Commonly mailhosts are named mail.domain.com
-# The example will fit if you are in domain.com and you mailhub is so named.
-mailhub=mail
-# Where will the mail seem to come from?
-#rewriteDomain=`echo -n $mailname`
-# The full hostname
-hostname=`hostname`
-EOF
diff --git a/mail/ssmtp/pkg-message b/mail/ssmtp/pkg-message
new file mode 100644
index 000000000000..f057eb99ca71
--- /dev/null
+++ b/mail/ssmtp/pkg-message
@@ -0,0 +1,5 @@
+sSMTP has been installed successfully.
+
+However, before you can use the program, you should copy the files
+"revaliases.sample" and "ssmtp.conf.sample" in /usr/local/etc/ssmtp to
+"revaliases" and "ssmtp.conf" respectively and edit them to suit your needs.
diff --git a/mail/ssmtp/pkg-plist b/mail/ssmtp/pkg-plist
index bdf1a8ea3b06..ed049105c745 100644
--- a/mail/ssmtp/pkg-plist
+++ b/mail/ssmtp/pkg-plist
@@ -1,4 +1,4 @@
 sbin/ssmtp
-etc/ssmtp/ssmtp.conf
-etc/ssmtp/revaliases
+etc/ssmtp/revaliases.sample
+etc/ssmtp/ssmtp.conf.sample
 @dirrm etc/ssmtp