ports/159720: [maintainer] [patch] mail/mimedefang update to latest version
Mikhail T.
m.tsatsenko at gmail.com
Fri Aug 12 15:10:10 UTC 2011
>Number: 159720
>Category: ports
>Synopsis: [maintainer] [patch] mail/mimedefang update to latest version
>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: Fri Aug 12 15:10:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Mikhail T.
>Release: 8.2
>Organization:
>Environment:
FreeBSD red 8.2-RELEASE FreeBSD 8.2-RELEASE #1 r218780: Thu Mar 10 21:36:01 MSK 2011 root at red:/usr/obj/usr/src/sys/XGATE amd64
>Description:
Update to 2.72
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: mimedefang/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- mimedefang/Makefile 5 Jul 2011 16:37:09 -0000 1.73
+++ mimedefang/Makefile 12 Aug 2011 15:04:40 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= mimedefang
-PORTVERSION= 2.71
+PORTVERSION= 2.72
CATEGORIES= mail
MASTER_SITES= http://www.mimedefang.org/static/
@@ -35,6 +35,7 @@
--with-user=${MAILUSER} \
--with-spooldir=${SPOOLDIR} \
--with-quarantinedir=${QUARANTINEDIR} \
+ --with-ipheader \
--prefix=${PREFIX}
.if defined (MIMEDEFANG_DISABLE_CLAMAV)
@@ -43,6 +44,7 @@
--disable-clamd
.endif
+MAN1= mimedefang-util.1
MAN5= mimedefang-filter.5
MAN7= mimedefang-notify.7 mimedefang-protocol.7
MAN8= mimedefang.8 mimedefang.pl.8 mimedefang-multiplexor.8 \
@@ -50,7 +52,7 @@
SUB_FILES= pkg-message
-CONFIG_FILES= mimedefang-filter sa-mimedefang.cf
+CONFIG_FILES= mimedefang-filter sa-mimedefang.cf mimedefang-ip-key
.include <bsd.port.pre.mk>
Index: mimedefang/distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.51
diff -u -r1.51 distinfo
--- mimedefang/distinfo 5 Jul 2011 16:37:09 -0000 1.51
+++ mimedefang/distinfo 12 Aug 2011 15:04:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.71.tar.gz) = e743bf506b68110cc0ed1fa588749372330b251b2aa8276377e1cec3fb051e68
-SIZE (mimedefang-2.71.tar.gz) = 343211
+SHA256 (mimedefang-2.72.tar.gz) = 86a3a72fc46155da83ce9536c2d730ae23526d28c1b2beafd7c6f3d2b5c57345
+SIZE (mimedefang-2.72.tar.gz) = 348897
Index: mimedefang/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- mimedefang/pkg-plist 5 Jul 2011 16:37:09 -0000 1.18
+++ mimedefang/pkg-plist 12 Aug 2011 15:04:40 -0000
@@ -1,10 +1,14 @@
bin/mimedefang-multiplexor
bin/mimedefang
bin/mimedefang.pl
+bin/mimedefang-util
bin/md-mx-ctrl
bin/watch-mimedefang
bin/watch-multiple-mimedefangs.tcl
etc/rc.d/mimedefang
+ at unexec if cmp -s %D/%%ETCDIR%%/mimedefang-ip-key %D/%%ETCDIR%%/mimedefang-ip-key.example; then rm -f %D/%%ETCDIR%%/mimedefang-ip-key; fi
+%%ETCDIR%%/mimedefang-ip-key.example
+ at exec [ -f %B/mimedefang-ip-key ] || cp -p %D/%F %B/mimedefang-ip-key
@unexec if cmp -s %D/%%ETCDIR%%/mimedefang-filter %D/%%ETCDIR%%/mimedefang-filter.example; then rm -f %D/%%ETCDIR%%/mimedefang-filter; fi
%%ETCDIR%%/mimedefang-filter.example
@exec [ -f %B/mimedefang-filter ] || cp -p %D/%F %B/mimedefang-filter
Index: mimedefang/files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/mail/mimedefang/files/patch-Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 patch-Makefile.in
--- mimedefang/files/patch-Makefile.in 5 Jul 2011 16:37:10 -0000 1.12
+++ mimedefang/files/patch-Makefile.in 12 Aug 2011 15:04:40 -0000
@@ -1,30 +1,47 @@
---- Makefile.in.orig 2010-06-16 23:06:45.000000000 +0400
-+++ Makefile.in 2011-06-21 22:17:55.182195879 +0400
-@@ -217,13 +217,7 @@
- -mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man8 && chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)$(MANDIR)/man8
- -test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@SPOOLDIR@ || true
- -test ! -d $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(DESTDIR)$(RPM_INSTALL_ROOT)@QDIR@ || true
--
-- if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \
-- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
+--- Makefile.in.orig 2011-06-20 21:25:17.000000000 +0400
++++ Makefile.in 2011-08-12 18:31:02.338324612 +0400
+@@ -156,14 +156,14 @@
+
+ install: all
+ $(INSTALL) -m 755 -d $(DESTDIR)${CONFDIR}
+- -if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key" ; then \
+- $(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key ;\
+- -chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 ; \
++ -if test "$(IP_HEADER)" = "yes" -a ! -f "$(DESTDIR)${CONFDIR}/mimedefang-ip-key.example" ; then \
++ $(PERL) ./gen-ip-validator.pl > $(DESTDIR)${CONFDIR}/mimedefang-ip-key.example ;\
++ chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key.example > /dev/null 2>&1 ; \
+ fi
+
+ if test "$(DEFANGUSER)" != "" ; then \
+ if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \
+- chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
++ chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key.example > /dev/null 2>&1 || true; \
+ $(INSTALL) -m 700 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 || true; \
+ $(INSTALL) -m 700 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 || true; \
+ fi \
+@@ -185,11 +185,7 @@
+ -test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 700 $(DESTDIR)$(SPOOLDIR) || true
+ -test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 700 $(DESTDIR)$(QDIR) || true
+
+- if test -f $(DESTDIR)${CONFDIR}/mimedefang-filter ; then \
+- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.example || exit 1; \
- else \
-- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \
+- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter || exit 1; \
- fi
--
-+ @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1
- @INSTALL@ -m 755 mimedefang-multiplexor $(DESTDIR)$(RPM_INSTALL_ROOT)$(prefix)/bin/mimedefang-multiplexor
- @INSTALL@ -m 755 md-mx-ctrl $(DESTDIR)$(RPM_INSTALL_ROOT)$(prefix)/bin/md-mx-ctrl
- @INSTALL@ -m 755 watch-mimedefang $(DESTDIR)$(RPM_INSTALL_ROOT)$(prefix)/bin/watch-mimedefang
-@@ -242,11 +236,7 @@
++ $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.example || exit 1
+
+ $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor
+ $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) md-mx-ctrl $(DESTDIR)$(prefix)/bin/md-mx-ctrl
+@@ -210,11 +206,7 @@
+ $(INSTALL) -m 644 mimedefang-protocol.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7
+ $(INSTALL) -m 644 mimedefang-notify.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7
if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
- mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} > /dev/null 2>&1 ; \
- chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR} ;\
-- if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf ; then \
-- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
+- if test -f $(DESTDIR)${CONFDIR}/sa-mimedefang.cf ; then \
+- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
- else \
-- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf || exit 1; \
+- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf || exit 1; \
- fi \
-+ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/sa-mimedefang.cf.example || exit 1 ; \
++ $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
fi
- @echo ""
+ distro: FORCE
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list