svn commit: r555007 - in head/mail/nullmailer: . files
Fernando Apesteguía
fernape at FreeBSD.org
Fri Nov 13 07:12:20 UTC 2020
Author: fernape
Date: Fri Nov 13 07:12:18 2020
New Revision: 555007
URL: https://svnweb.freebsd.org/changeset/ports/555007
Log:
mail/nullmailer: update to 2.2
ChangeLog: http://untroubled.org/nullmailer/ChangeLog
PR: 251074
Submitted by: uffe at uffe.org
Deleted:
head/mail/nullmailer/files/patch-fdobuf.h
Modified:
head/mail/nullmailer/Makefile
head/mail/nullmailer/distinfo
head/mail/nullmailer/files/patch-Makefile.in
head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc
head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc
head/mail/nullmailer/files/patch-src-Makefile.in
head/mail/nullmailer/pkg-plist
Modified: head/mail/nullmailer/Makefile
==============================================================================
--- head/mail/nullmailer/Makefile Fri Nov 13 06:48:12 2020 (r555006)
+++ head/mail/nullmailer/Makefile Fri Nov 13 07:12:18 2020 (r555007)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= nullmailer
-PORTVERSION= 1.13
-PORTREVISION= 4
+PORTVERSION= 2.2
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/nullmailer/ \
@@ -15,28 +14,29 @@ COMMENT= MTA for hosts which relay to a fixed set of s
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LOCALSTATEDIR= /var/spool
+USES= gmake
+USE_CXXSTD= gnu++98
+USE_RC_SUBR= ${PORTNAME}
-USERS= nullmail
-GROUPS= nullmail
-
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=${LOCALSTATEDIR}
-USE_CXXSTD= gnu++98
-
-USE_RC_SUBR= ${PORTNAME}
SUB_FILES= pkg-install pkg-deinstall pkg-message
+SUB_LIST= LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
+USERS= nullmail
+GROUPS= nullmail
+
PLIST_SUB= LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
-SUB_LIST= LOCALSTATEDIR=${LOCALSTATEDIR} NULLMAIL_USER=${USERS}
OPTIONS_DEFINE= GNUTLS
-GNUTLS_CONFIGURE_ENABLE=tls
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_USES= localbase:ldflags
+GNUTLS_CONFIGURE_ENABLE=tls
GNUTLS_LDFLAGS= -lgnutls
+
+LOCALSTATEDIR= /var
post-install:
${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${STAGEDIR}${ETCDIR}
Modified: head/mail/nullmailer/distinfo
==============================================================================
--- head/mail/nullmailer/distinfo Fri Nov 13 06:48:12 2020 (r555006)
+++ head/mail/nullmailer/distinfo Fri Nov 13 07:12:18 2020 (r555007)
@@ -1,2 +1,3 @@
-SHA256 (nullmailer-1.13.tar.gz) = 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d
-SIZE (nullmailer-1.13.tar.gz) = 205431
+TIMESTAMP = 1604790898
+SHA256 (nullmailer-2.2.tar.gz) = 9886fa627b7e7e775e2f09fbe789247b1ca304f152da04ff705e50079263a855
+SIZE (nullmailer-2.2.tar.gz) = 257740
Modified: head/mail/nullmailer/files/patch-Makefile.in
==============================================================================
--- head/mail/nullmailer/files/patch-Makefile.in Fri Nov 13 06:48:12 2020 (r555006)
+++ head/mail/nullmailer/files/patch-Makefile.in Fri Nov 13 07:12:18 2020 (r555007)
@@ -1,15 +1,15 @@
---- Makefile.in.orig 2007-10-09 19:23:26.000000000 -0400
-+++ Makefile.in 2009-08-11 17:21:54.000000000 -0400
-@@ -143,7 +143,7 @@
+--- Makefile.in.orig 2018-10-12 20:49:36 UTC
++++ Makefile.in
+@@ -278,7 +278,7 @@ includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
-libexecdir = @libexecdir@
+libexecdir = @libexecdir@/nullmailer
localedir = @localedir@
- localstatedir = @localstatedir@/nullmailer
+ localstatedir = @localstatedir@/spool/nullmailer
mandir = @mandir@
-@@ -613,8 +613,8 @@
+@@ -793,8 +793,8 @@ install-root:
chown nullmail $(DESTDIR)$(localstatedir)/*
chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue
chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue
Modified: head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc
==============================================================================
--- head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc Fri Nov 13 06:48:12 2020 (r555006)
+++ head/mail/nullmailer/files/patch-lib_fdbuf_tlsibuf.cc Fri Nov 13 07:12:18 2020 (r555007)
@@ -1,14 +1,16 @@
---- lib/fdbuf/tlsibuf.cc.orig
+--- lib/fdbuf/tlsibuf.cc.orig 2018-10-12 20:49:30 UTC
+++ lib/fdbuf/tlsibuf.cc
-@@ -27,5 +27,10 @@
+@@ -27,7 +27,12 @@ tlsibuf::tlsibuf(gnutls_session_t s, unsigned bufsz)
ssize_t tlsibuf::_read(char* buf, ssize_t len)
{
-- return gnutls_record_recv(session, buf, len);
+- int rc;
+ ssize_t rc;
+ do
+ {
+ rc = gnutls_record_recv(session, buf, len);
+ } while (rc == GNUTLS_E_AGAIN || rc == GNUTLS_E_INTERRUPTED);
+ return rc;
- }
+ do
+ {
+ rc = gnutls_record_recv(session, buf, len);
Modified: head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc
==============================================================================
--- head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc Fri Nov 13 06:48:12 2020 (r555006)
+++ head/mail/nullmailer/files/patch-lib_fdbuf_tlsobuf.cc Fri Nov 13 07:12:18 2020 (r555007)
@@ -1,6 +1,6 @@
---- lib/fdbuf/tlsobuf.cc.orig
+--- lib/fdbuf/tlsobuf.cc.orig 2018-10-12 20:49:30 UTC
+++ lib/fdbuf/tlsobuf.cc
-@@ -27,5 +27,10 @@
+@@ -27,5 +27,10 @@ tlsobuf::tlsobuf(gnutls_session_t s, unsigned bufsz)
ssize_t tlsobuf::_write(const char* buf, ssize_t len)
{
Modified: head/mail/nullmailer/files/patch-src-Makefile.in
==============================================================================
--- head/mail/nullmailer/files/patch-src-Makefile.in Fri Nov 13 06:48:12 2020 (r555006)
+++ head/mail/nullmailer/files/patch-src-Makefile.in Fri Nov 13 07:12:18 2020 (r555007)
@@ -1,31 +1,29 @@
---- src/Makefile.in.orig 2007-10-09 19:23:25.000000000 -0400
-+++ src/Makefile.in 2009-08-11 17:24:28.000000000 -0400
-@@ -30,10 +30,9 @@
+--- src/Makefile.in.orig 2018-10-12 20:49:36 UTC
++++ src/Makefile.in
+@@ -86,10 +86,10 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
--bin_PROGRAMS = mailq$(EXEEXT) nullmailer-inject$(EXEEXT) \
-- nullmailer-smtpd$(EXEEXT)
+-bin_PROGRAMS = mailq$(EXEEXT) nullmailer-dsn$(EXEEXT) \
++bin_PROGRAMS = nullmailer-dsn$(EXEEXT) \
+ nullmailer-inject$(EXEEXT) nullmailer-smtpd$(EXEEXT)
-sbin_PROGRAMS = nullmailer-queue$(EXEEXT) nullmailer-send$(EXEEXT) \
- sendmail$(EXEEXT)
-+bin_PROGRAMS = nullmailer-inject$(EXEEXT) nullmailer-smtpd$(EXEEXT)
+sbin_PROGRAMS = nullmailer-queue$(EXEEXT) nullmailer-send$(EXEEXT)
+libexec_PROGRAMS = mailq$(EXEEXT) sendmail$(EXEEXT)
subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -46,7 +46,9 @@
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+@@ -102,7 +102,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
- binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
-+libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+
+PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) $(libexec_PROGRAMS)
am_mailq_OBJECTS = mailq.$(OBJEXT)
mailq_OBJECTS = $(am_mailq_OBJECTS)
mailq_DEPENDENCIES = ../lib/libnullmailer.a
-@@ -154,7 +156,7 @@
+@@ -268,7 +268,7 @@ includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
@@ -34,9 +32,9 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -253,6 +255,31 @@
- else :; fi; \
- done
+@@ -421,6 +421,31 @@ uninstall-sbinPROGRAMS:
+ clean-sbinPROGRAMS:
+ -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+mostlyclean-libexecPROGRAMS:
+
@@ -63,12 +61,12 @@
+ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ done
+
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-@@ -435,7 +462,7 @@
+ mailq$(EXEEXT): $(mailq_OBJECTS) $(mailq_DEPENDENCIES) $(EXTRA_mailq_DEPENDENCIES)
+ @rm -f mailq$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(mailq_OBJECTS) $(mailq_LDADD) $(LIBS)
+@@ -625,7 +650,7 @@ install-dvi: install-dvi-am
- install-dvi: install-dvi-am
+ install-dvi-am:
-install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-libexecPROGRAMS
Modified: head/mail/nullmailer/pkg-plist
==============================================================================
--- head/mail/nullmailer/pkg-plist Fri Nov 13 06:48:12 2020 (r555006)
+++ head/mail/nullmailer/pkg-plist Fri Nov 13 07:12:18 2020 (r555007)
@@ -2,10 +2,12 @@ libexec/nullmailer/smtp
libexec/nullmailer/qmqp
@(%%NULLMAIL_USER%%,,4555) libexec/nullmailer/mailq
libexec/nullmailer/sendmail
+bin/nullmailer-dsn
bin/nullmailer-inject
bin/nullmailer-smtpd
@(%%NULLMAIL_USER%%,,4555) sbin/nullmailer-queue
sbin/nullmailer-send
+man/man1/nullmailer-dsn.1.gz
man/man1/nullmailer-inject.1.gz
man/man1/sendmail.1.gz
man/man7/nullmailer.7.gz
@@ -13,10 +15,11 @@ man/man8/nullmailer-queue.8.gz
man/man8/nullmailer-send.8.gz
%%ETCDIR%%/me.sample
%%ETCDIR%%/remotes.sample
- at dir(%%NULLMAIL_USER%%,%%NULLMAIL_USER%%,700) %%LOCALSTATEDIR%%/nullmailer/queue
- at dir(%%NULLMAIL_USER%%,%%NULLMAIL_USER%%,700) %%LOCALSTATEDIR%%/nullmailer/tmp
- at dir %%LOCALSTATEDIR%%/nullmailer
- at exec mkfifo %%LOCALSTATEDIR%%/nullmailer/trigger
- at exec chmod 600 %%LOCALSTATEDIR%%/nullmailer/trigger
- at exec chown %%NULLMAIL_USER%%:%%NULLMAIL_USER%% %%LOCALSTATEDIR%%/nullmailer/trigger
- at unexec rm -f %%LOCALSTATEDIR%%/nullmailer/trigger
+ at dir(%%NULLMAIL_USER%%,%%NULLMAIL_USER%%,700) %%LOCALSTATEDIR%%/spool/nullmailer/failed
+ at dir(%%NULLMAIL_USER%%,%%NULLMAIL_USER%%,700) %%LOCALSTATEDIR%%/spool/nullmailer/queue
+ at dir(%%NULLMAIL_USER%%,%%NULLMAIL_USER%%,700) %%LOCALSTATEDIR%%/spool/nullmailer/tmp
+ at dir %%LOCALSTATEDIR%%/spool/nullmailer
+ at preexec mkfifo %%LOCALSTATEDIR%%/spool/nullmailer/trigger
+ at preexec chmod 600 %%LOCALSTATEDIR%%/spool/nullmailer/trigger
+ at preexec chown %%NULLMAIL_USER%%:%%NULLMAIL_USER%% %%LOCALSTATEDIR%%/spool/nullmailer/trigger
+ at postunexec rm -f %%LOCALSTATEDIR%%/spool/nullmailer/trigger
More information about the svn-ports-all
mailing list