ports/173263: [UPDATE] mail/nullmailer to 1.11
Ilya Skalozubov
skinc at skinc.ru
Thu Nov 1 14:30:02 UTC 2012
>Number: 173263
>Category: ports
>Synopsis: [UPDATE] mail/nullmailer to 1.11
>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: Thu Nov 01 14:30:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Ilya Skalozubov
>Release: FreeBSD 9.0-RELEASE-p4 amd64
>Organization:
>Environment:
>Description:
Update mail/nullmailer from 1.05_4 to 1.11.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ur nullmailer.orig/Makefile nullmailer/Makefile
--- nullmailer.orig/Makefile 2011-05-17 21:58:49.000000000 +0300
+++ nullmailer/Makefile 2012-09-18 03:35:03.000000000 +0300
@@ -6,8 +6,7 @@
#
PORTNAME= nullmailer
-PORTVERSION= 1.05
-PORTREVISION= 4
+PORTVERSION= 1.11
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/nullmailer/ \
@@ -31,7 +30,9 @@
LICENSE= GPLv2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR}
+CONFIGURE_ARGS+=--localstatedir=${LOCALSTATEDIR}
+CPPFLAGS+= -I${PREFIX}/include
+LDFLAGS+= -L${PREFIX}/lib
USE_SUBMAKE= yes
@@ -54,4 +55,18 @@
@${INSTALL_DATA} -c ${FILESDIR}/remotes.sample ${ETCDIR}
@${CAT} ${PKGMESSAGE}
+OPTIONS_DEFINE= TLS
+TLS_DESC= Enable SSL/TLS support
+
+OPTIONS_DEFAULT=TLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTLS}
+LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=--enable-tls
+.else
+CONFIGURE_ARGS+=--disable-tls
+.endif
+
.include <bsd.port.mk>
diff -ur nullmailer.orig/distinfo nullmailer/distinfo
--- nullmailer.orig/distinfo 2011-04-27 16:29:21.000000000 +0300
+++ nullmailer/distinfo 2012-08-18 22:08:02.000000000 +0300
@@ -1,2 +1,2 @@
-SHA256 (nullmailer-1.05.tar.gz) = 90356ed2bd95eef09ed04713fdef1f81c1ab95e02eee333a96a8e3eb230cac2f
-SIZE (nullmailer-1.05.tar.gz) = 176800
+SHA256 (nullmailer-1.11.tar.gz) = bf61c839b5f0927e0998c6183f229fa644f97165d3d5402adc59369b2bdaf25e
+SIZE (nullmailer-1.11.tar.gz) = 203239
diff -ur nullmailer.orig/files/patch-src-Makefile.in nullmailer/files/patch-src-Makefile.in
--- nullmailer.orig/files/patch-src-Makefile.in 2009-08-12 00:52:11.000000000 +0300
+++ nullmailer/files/patch-src-Makefile.in 2012-09-18 02:36:09.000000000 +0300
@@ -1,19 +1,20 @@
---- src/Makefile.in.orig 2007-10-09 19:23:25.000000000 -0400
-+++ src/Makefile.in 2009-08-11 17:24:28.000000000 -0400
-@@ -30,9 +30,9 @@
+--- src/Makefile.in.orig 2012-06-12 22:02:44.000000000 +0300
++++ src/Makefile.in 2012-09-18 02:32:20.000000000 +0300
+@@ -31,10 +31,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
--bin_PROGRAMS = mailq$(EXEEXT) nullmailer-inject$(EXEEXT)
+-bin_PROGRAMS = mailq$(EXEEXT) nullmailer-inject$(EXEEXT) \
+- nullmailer-smtpd$(EXEEXT)
-sbin_PROGRAMS = nullmailer-queue$(EXEEXT) nullmailer-send$(EXEEXT) \
- sendmail$(EXEEXT)
-+bin_PROGRAMS = nullmailer-inject$(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 @@
+@@ -48,7 +47,9 @@
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -24,7 +25,7 @@
am_mailq_OBJECTS = mailq.$(OBJEXT)
mailq_OBJECTS = $(am_mailq_OBJECTS)
mailq_DEPENDENCIES = ../lib/libnullmailer.a
-@@ -154,7 +156,7 @@
+@@ -160,7 +161,7 @@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
@@ -33,7 +34,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
-@@ -253,6 +255,31 @@
+@@ -262,6 +263,31 @@
else :; fi; \
done
@@ -65,9 +66,9 @@
uninstall-sbinPROGRAMS:
@$(NORMAL_UNINSTALL)
@list='$(sbin_PROGRAMS)'; for p in $$list; do \
-@@ -435,7 +462,7 @@
+@@ -451,7 +477,7 @@
- install-dvi: install-dvi-am
+ install-dvi-am:
-install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+install-exec-am: install-binPROGRAMS install-sbinPROGRAMS install-libexecPROGRAMS
diff -ur nullmailer.orig/pkg-plist nullmailer/pkg-plist
--- nullmailer.orig/pkg-plist 2011-05-17 21:58:49.000000000 +0300
+++ nullmailer/pkg-plist 2012-09-18 03:42:33.000000000 +0300
@@ -5,6 +5,7 @@
@exec chown %%NULLMAIL_USER%% %D/libexec/nullmailer/mailq
libexec/nullmailer/sendmail
bin/nullmailer-inject
+bin/nullmailer-smtpd
sbin/nullmailer-queue
@exec chmod u+s %D/sbin/nullmailer-queue
@exec chown %%NULLMAIL_USER%% %D/sbin/nullmailer-queue
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list