Date: Thu, 29 Oct 2009 16:11:09 +0100 (CET) From: Petr Rehor <prehor@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Petr Rehor <prehor@gmail.com> Subject: ports/140084: [patch] security/amavisd-milter - minor port improvements Message-ID: <200910291511.n9TFB9gp026356@199.106.broadband4.iol.cz> Resent-Message-ID: <200910291520.n9TFK3nj009951@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140084
>Category: ports
>Synopsis: [patch] security/amavisd-milter - minor port improvements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 29 15:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Petr Rehor
>Release: FreeBSD 7.1-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD charon.rx.cz 7.1-RELEASE-p6 FreeBSD 7.1-RELEASE-p6 #0: Tue Jun 9 16:26:47 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Minor port improvements:
- Requires rebuild sendmail port or use WITH_SENDMAIL_STATIC_MILTER when
sendmail from ports is used and ${LOCALBASE}/lib/libmilter.so.X is
not present. See also http://www.freebsd.org/cgi/query-pr.cgi?pr=140080
- Handle WITH_DEBUG properly.
- Notice website in pkg-messages.
>How-To-Repeat:
>Fix:
--- amavisd-milter.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 22 Aug 2009 00:34:47 -0000 1.13
+++ Makefile 29 Oct 2009 14:58:53 -0000
@@ -55,10 +55,26 @@
BROKEN= Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
.endif
+.if !defined(SENDMAIL_WITHOUT_MILTER)
+.if defined(WITH_SENDMAIL_PORT)
+.if !defined(WITH_SENDMAIL_STATIC_MILTER) && !exists(${LOCALBASE}/lib/libmilter.so.${MILTER_SOVER})
+pre-everything::
+ @${ECHO_MSG}
+ @${ECHO_MSG} You must rebuild sendmail port with SENDMAIL_WITH_SHARED_MILTER
+ @${ECHO_MSG} or set variable WITH_SENDMAIL_STATIC_MILTER
+ @${FALSE}
+.endif
+.endif
+.endif
+
.if defined(WITH_SENDMAIL_PORT)
CONFIGURE_ARGS+=--with-sendmail=${MILTERBASE}
.endif
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--enable-debug
+.endif
+
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/files/pkg-message.in,v
retrieving revision 1.1
diff -u -r1.1 pkg-message.in
--- files/pkg-message.in 13 Nov 2005 16:28:47 -0000 1.1
+++ files/pkg-message.in 29 Oct 2009 14:58:53 -0000
@@ -1,6 +1,9 @@
*******************************************************************
+ To configure amavisd-milter, sendmail and amavisd-new point
+ your browser to %%WEBSITE%%
+
Enable amavisd-milter in /etc/rc.conf with the following line:
amavisd_milter_enable="YES"
--- amavisd-milter.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910291511.n9TFB9gp026356>