update to msmtp-1.8.7, from Xiyue Deng (taking maintainer), plus I fixed

WANTLIB and regen'd patches (mostly with the same result but I tweaked
one to make it easier to compare the new with the previous line)
This commit is contained in:
sthen 2020-02-06 11:26:10 +00:00
parent c5587e5898
commit 7506de6a9b
9 changed files with 46 additions and 48 deletions

View File

@ -1,28 +1,30 @@
# $OpenBSD: Makefile,v 1.47 2019/07/12 20:47:30 sthen Exp $
# $OpenBSD: Makefile,v 1.48 2020/02/06 11:26:10 sthen Exp $
COMMENT = SMTP plugin for MUAs
DISTNAME = msmtp-1.6.6
DISTNAME = msmtp-1.8.7
CATEGORIES = mail
REVISION = 1
HOMEPAGE = https://marlam.de/msmtp/
MAINTAINER = Xiyue Deng <manphiz@gmail.com>
# GPLv3
PERMIT_PACKAGE = Yes
WANTLIB = c crypto iconv idn intl ssl
WANTLIB = c iconv idn2 intl gnutls
MASTER_SITES = https://marlam.de/msmtp/releases/
EXTRACT_SUFX = .tar.xz
LIB_DEPENDS = devel/libidn
LIB_DEPENDS = devel/libidn2 \
security/gnutls
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --with-libgsasl=no \
--with-libidn=yes \
--with-tls=openssl \
--with-tls=gnutls \
--without-libsecret
post-install:

View File

@ -1,2 +1,2 @@
SHA256 (msmtp-1.6.6.tar.xz) = 2hXbH2K9AgH85TEK24nIYYi+kc10W3yztiuBpQHn+14=
SIZE (msmtp-1.6.6.tar.xz) = 283744
SHA256 (msmtp-1.8.7.tar.xz) = mlO83CROxbGoBpNOzHdG2dCdtYH1h77fWX6dovSMUfE=
SIZE (msmtp-1.8.7.tar.xz) = 340908

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-doc_msmtprc-system_example,v 1.1 2009/02/13 14:59:01 pirofti Exp $
--- doc/msmtprc-system.example.orig Sat Apr 7 18:20:34 2007
+++ doc/msmtprc-system.example Fri Feb 13 16:53:09 2009
@@ -6,10 +6,10 @@
account default
# The SMTP smarthost.
-host mailhub.oursite.example
+host localhost
# Construct envelope-from addresses of the form "user@oursite.example".
-#auto_from on
+auto_from on
#maildomain oursite.example
# Use TLS.

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-scripts_msmtpq_msmtp-queue,v 1.1 2012/01/11 22:56:07 gsoares Exp $
--- scripts/msmtpq/msmtp-queue.orig Tue Jan 10 16:47:20 2012
+++ scripts/msmtpq/msmtp-queue Tue Jan 10 16:49:07 2012
$OpenBSD: patch-scripts_msmtpq_msmtp-queue,v 1.2 2020/02/06 11:26:10 sthen Exp $
Index: scripts/msmtpq/msmtp-queue
--- scripts/msmtpq/msmtp-queue.orig
+++ scripts/msmtpq/msmtp-queue
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-#!/usr/bin/env sh
+#!/bin/sh
##--------------------------------------------------------------

View File

@ -1,6 +1,8 @@
$OpenBSD: patch-scripts_msmtpq_msmtpq,v 1.2 2013/04/23 14:32:26 gsoares Exp $
--- scripts/msmtpq/msmtpq.orig Thu Feb 14 16:33:59 2013
+++ scripts/msmtpq/msmtpq Thu Mar 21 21:12:19 2013
$OpenBSD: patch-scripts_msmtpq_msmtpq,v 1.3 2020/02/06 11:26:10 sthen Exp $
Index: scripts/msmtpq/msmtpq
--- scripts/msmtpq/msmtpq.orig
+++ scripts/msmtpq/msmtpq
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-scripts_msmtpqueue_msmtp-enqueue_sh,v 1.1 2008/10/19 20:35:01 jasper Exp $
--- scripts/msmtpqueue/msmtp-enqueue.sh.orig Mon Jul 28 00:20:50 2008
+++ scripts/msmtpqueue/msmtp-enqueue.sh Tue Oct 14 14:18:49 2008
$OpenBSD: patch-scripts_msmtpqueue_msmtp-enqueue_sh,v 1.2 2020/02/06 11:26:10 sthen Exp $
Index: scripts/msmtpqueue/msmtp-enqueue.sh
--- scripts/msmtpqueue/msmtp-enqueue.sh.orig
+++ scripts/msmtpqueue/msmtp-enqueue.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-#!/usr/bin/env sh
+#!/bin/sh
QUEUEDIR=$HOME/.msmtpqueue

View File

@ -1,14 +1,16 @@
$OpenBSD: patch-scripts_msmtpqueue_msmtp-listqueue_sh,v 1.3 2017/03/26 13:34:06 rpe Exp $
--- scripts/msmtpqueue/msmtp-listqueue.sh.orig Mon Jul 28 00:20:57 2008
+++ scripts/msmtpqueue/msmtp-listqueue.sh Tue Oct 14 14:15:51 2008
$OpenBSD: patch-scripts_msmtpqueue_msmtp-listqueue_sh,v 1.4 2020/02/06 11:26:10 sthen Exp $
Index: scripts/msmtpqueue/msmtp-listqueue.sh
--- scripts/msmtpqueue/msmtp-listqueue.sh.orig
+++ scripts/msmtpqueue/msmtp-listqueue.sh
@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-#!/usr/bin/env sh
+#!/bin/sh
QUEUEDIR=$HOME/.msmtpqueue
for i in $QUEUEDIR/*.mail; do
- egrep -s --colour -h '(^From:|^To:|^Subject:)' "$i" || echo "No mail in queue";
+ egrep -s -h '(^From:|^To:|^Subject:)' "$i" || echo "No mail in queue";
- grep -E -s --colour -h '(^From:|^To:|^Subject:)' "$i" || echo "No mail in queue";
+ grep -E -s -h '(^From:|^To:|^Subject:)' "$i" || echo "No mail in queue";
echo " "
done

View File

@ -1,8 +1,10 @@
$OpenBSD: patch-scripts_msmtpqueue_msmtp-runqueue_sh,v 1.1 2008/10/19 20:35:01 jasper Exp $
--- scripts/msmtpqueue/msmtp-runqueue.sh.orig Mon Jul 28 00:21:43 2008
+++ scripts/msmtpqueue/msmtp-runqueue.sh Tue Oct 14 14:18:56 2008
$OpenBSD: patch-scripts_msmtpqueue_msmtp-runqueue_sh,v 1.2 2020/02/06 11:26:10 sthen Exp $
Index: scripts/msmtpqueue/msmtp-runqueue.sh
--- scripts/msmtpqueue/msmtp-runqueue.sh.orig
+++ scripts/msmtpqueue/msmtp-runqueue.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-#!/usr/bin/env sh
+#!/bin/sh
QUEUEDIR="$HOME/.msmtpqueue"

View File

@ -1,6 +1,8 @@
$OpenBSD: patch-scripts_set_sendmail_set_sendmail_sh,v 1.2 2014/07/16 12:14:17 ajacoutot Exp $
--- scripts/set_sendmail/set_sendmail.sh.orig Mon Jul 28 00:22:50 2008
+++ scripts/set_sendmail/set_sendmail.sh Wed Oct 15 03:15:06 2008
$OpenBSD: patch-scripts_set_sendmail_set_sendmail_sh,v 1.3 2020/02/06 11:26:10 sthen Exp $
Index: scripts/set_sendmail/set_sendmail.sh
--- scripts/set_sendmail/set_sendmail.sh.orig
+++ scripts/set_sendmail/set_sendmail.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh