Update ssmtp to 2.64. Changeset from Thomas Merkel.

Changes since 2.61 are difficult to ascertain.  There is no useful
upstream changelog, and the full Debian one primarily includes
packaging changes only.  However, there appear to have at least been
some security fixes.

6 files changed, 27 insertions, 51 deletions

diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 0ace5cdb607..12bf159c322 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2013/02/06 23:22:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2013/10/24 11:31:10 jperkin Exp $
 #
 # TLS functionality needs testing. Please let me know the result,
 # and preferably info about your system.
 #
 # Toru TAKAMIZU
 
-DISTNAME=	ssmtp_2.61.orig
-PKGNAME=	ssmtp-2.61
-PKGREVISION=	3
+DISTNAME=	ssmtp_2.64.orig
+EXTRACT_SUFX=	.tar.bz2
+PKGNAME=	ssmtp-2.64
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/s/ssmtp/}
 
diff --git a/mail/ssmtp/distinfo b/mail/ssmtp/distinfo
index 8559455255d..1123be32820 100644
--- a/mail/ssmtp/distinfo
+++ b/mail/ssmtp/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.5 2009/02/07 23:21:05 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/10/24 11:31:10 jperkin Exp $
 
-SHA1 (ssmtp_2.61.orig.tar.gz) = bc4b6c20bf8c2c9e66b359e3c24545a2615a1988
-RMD160 (ssmtp_2.61.orig.tar.gz) = da76ee6dd86fc663e6fd69fcb2fb5f550f716de7
-Size (ssmtp_2.61.orig.tar.gz) = 53341 bytes
-SHA1 (patch-aa) = 73681fd5585fe520fb9620e2f8358c41ad42cfd8
-SHA1 (patch-ab) = fd4fb2e5baeacd9f1e60c04cd6c4229c39fa2641
-SHA1 (patch-ac) = 4deb9edcd201d0d5e6144dc9fa6a1b13c77c6cde
+SHA1 (ssmtp_2.64.orig.tar.bz2) = db0cc6b4f82ab8b4c79335933db9c4db706324d1
+RMD160 (ssmtp_2.64.orig.tar.bz2) = ea6472e52a499c39d1d8ce7e13add9d8e9accbfb
+Size (ssmtp_2.64.orig.tar.bz2) = 52501 bytes
+SHA1 (patch-ab) = e5ff11efbe25b9691eeeed4d0c526304568222eb
+SHA1 (patch-ac) = c348a88e31ab4962e8e325e5a17a4511fcd84bb7
 SHA1 (patch-ad) = 92c666b84e8fa20103103f6d24f887a587d57a4c
-SHA1 (patch-ae) = ef626358229731e6afff2e194928780e5fc908a3
+SHA1 (patch-ae) = 009618ceb22c7970ae96411bf101932b6d2dd96f
diff --git a/mail/ssmtp/patches/patch-aa b/mail/ssmtp/patches/patch-aa
deleted file mode 100644
index 45d156b4da5..00000000000
--- a/mail/ssmtp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/19 20:39:10 jlam Exp $
-
---- 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/patches/patch-ab b/mail/ssmtp/patches/patch-ab
index 7cfa05be6a9..f3c061ae600 100644
--- a/mail/ssmtp/patches/patch-ab
+++ b/mail/ssmtp/patches/patch-ab
@@ -1,13 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2004/10/22 14:45:47 tv Exp $
+$NetBSD: patch-ab,v 1.3 2013/10/24 11:31:10 jperkin Exp $
 
---- ssmtp.c.orig	Fri Jul 23 01:58:48 2004
+--- ssmtp.c.orig	2013-10-21 16:32:47.439696367 +0000
 +++ ssmtp.c
-@@ -12,8 +12,9 @@
-  See COPYRIGHT for the license
- 
- */
--#define VERSION "2.60.4"
-+#define VERSION "2.61"
+@@ -13,6 +13,7 @@
+ #define VERSION "2.64"
+ #define _GNU_SOURCE
  
 +#include <sys/types.h>
  #include <sys/socket.h>
diff --git a/mail/ssmtp/patches/patch-ac b/mail/ssmtp/patches/patch-ac
index 39ed918cba0..48bc9891f95 100644
--- a/mail/ssmtp/patches/patch-ac
+++ b/mail/ssmtp/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2009/02/07 23:21:05 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2013/10/24 11:31:10 jperkin Exp $
 
 --- Makefile.in.orig	2004-07-26 07:32:18.000000000 +0200
 +++ Makefile.in
@@ -15,12 +15,3 @@ $NetBSD: patch-ac,v 1.3 2009/02/07 23:21:05 joerg Exp $
  
  
  .PHONY: install-sendmail
-@@ -79,7 +79,7 @@ uninstall-sendmail: uninstall
- 
- # Binaries:
- ssmtp: $(OBJS)
--	$(CC) -o ssmtp $(OBJS) @LIBS@
-+	$(CC) -o ssmtp $(OBJS) $(LDFLAGS) @LIBS@
- 
- .PHONY: clean
- clean:
diff --git a/mail/ssmtp/patches/patch-ae b/mail/ssmtp/patches/patch-ae
index 71b1222d8c2..d16b4a997fc 100644
--- a/mail/ssmtp/patches/patch-ae
+++ b/mail/ssmtp/patches/patch-ae
@@ -1,17 +1,19 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/06/19 20:39:10 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2013/10/24 11:31:10 jperkin Exp $
 
---- ssmtp.8.orig	Fri Sep 27 05:48:59 2002
-+++ ssmtp.8	Thu Jun 19 13:12:40 2003
-@@ -1,11 +1,8 @@
- .TH SSMTP 8 "Last change: 5 February 2000"
+--- ssmtp.8.orig	2008-02-29 02:50:15.000000000 +0000
++++ ssmtp.8
+@@ -1,13 +1,10 @@
+ .TH SSMTP 8 "Last change: 4 February 2005"
  .SH NAME
 -ssmtp, sendmail \- send a message using smtp
 +ssmtp \- send a message using smtp
  .SH SYNOPSIS
  .B ssmtp
--.RI "[ " flags " ] [ " address " "  ... " ]"
--.br
--.B /usr/lib/sendmail
  .RI "[ " flags " ] [ " address " "  ... " ]"
  .br
+-.B /usr/lib/sendmail
+-.RI "[ " flags " ] [ " address " "  ... " ]"
+-.br
  .SH DESCRIPTION
+ .I ssmtp
+ is a send-only sendmail emulator for machines which normally pick their mail