summaryrefslogtreecommitdiffstats
path: root/mail/mimedefang
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mimedefang')
-rw-r--r--mail/mimedefang/Makefile4
-rw-r--r--mail/mimedefang/distinfo2
-rw-r--r--mail/mimedefang/files/patch-Makefile.in36
-rw-r--r--mail/mimedefang/pkg-install6
-rw-r--r--mail/mimedefang/pkg-plist2
5 files changed, 29 insertions, 21 deletions
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 1158327..c73caa0 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mimedefang
-PORTVERSION= 2.33
+PORTVERSION= 2.34
CATEGORIES= mail
MASTER_SITES= http://www.mimedefang.org/static/ \
http://www.roaringpenguin.com/mimedefang/
@@ -29,7 +29,7 @@ GNU_CONFIGURE= yes
MAILUSER?= mailnull
SPOOLDIR?= /var/spool/MIMEDefang
-QUARANTINEDIR?= /var/spool/MIMEDefang
+QUARANTINEDIR?= /var/spool/MD-Quarantine
CONFIGURE_ENV+= PERL=${PERL}
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/mimedefang \
diff --git a/mail/mimedefang/distinfo b/mail/mimedefang/distinfo
index 4cbd2c1..2f1d067 100644
--- a/mail/mimedefang/distinfo
+++ b/mail/mimedefang/distinfo
@@ -1 +1 @@
-MD5 (mimedefang-2.33.tar.gz) = e4328113da504611019abd0f2da875d0
+MD5 (mimedefang-2.34.tar.gz) = 58f846df6a5e648eb71dd1944e530289
diff --git a/mail/mimedefang/files/patch-Makefile.in b/mail/mimedefang/files/patch-Makefile.in
index b93e462..0b16d95 100644
--- a/mail/mimedefang/files/patch-Makefile.in
+++ b/mail/mimedefang/files/patch-Makefile.in
@@ -1,26 +1,26 @@
---- Makefile.in.orig Fri Sep 13 01:25:26 2002
-+++ Makefile.in Fri Sep 13 01:32:02 2002
-@@ -130,9 +130,8 @@
- -test ! -d $(RPM_INSTALL_ROOT)@SPOOLDIR@ && mkdir -p $(RPM_INSTALL_ROOT)@SPOOLDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@SPOOLDIR@
- -test ! -d $(RPM_INSTALL_ROOT)@QDIR@ && mkdir -p $(RPM_INSTALL_ROOT)@QDIR@ && chmod 700 $(RPM_INSTALL_ROOT)@QDIR@
+--- Makefile.in.orig Thu Jun 26 22:13:09 2003
++++ Makefile.in Thu Jun 26 22:18:40 2003
+@@ -173,9 +173,8 @@
+ -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 $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter ; then \
-- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
+- 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; \
- else \
-+ @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1;
-+ if !(test -f $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter) ; then \
- @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter || exit 1; \
++ @INSTALL@ -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/mimedefang-filter.example || exit 1; \
++ 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 || exit 1; \
fi
-@@ -146,9 +145,8 @@
- @INSTALL@ -m 644 mimedefang-protocol.7 $(RPM_INSTALL_ROOT)$(MANDIR)/man7/mimedefang-protocol.7
+@@ -194,9 +193,8 @@
if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
- mkdir -p $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin > /dev/null 2>&1 ; \
-- if test -f $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf ; then \
-- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
+ mkdir -p $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin > /dev/null 2>&1 ; \
+ chmod 755 $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin ;\
+- if test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf ; then \
+- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
- else \
-+ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
-+ if !(test -f $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf) ; then \
- @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf || exit 1; \
++ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf.example || exit 1; \
++ if !(test -f $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf) ; then \
+ @INSTALL@ -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)$(RPM_INSTALL_ROOT)${CONFDIR}/spamassassin/sa-mimedefang.cf || exit 1; \
fi \
fi
diff --git a/mail/mimedefang/pkg-install b/mail/mimedefang/pkg-install
index 95b0f6d..3e3a748 100644
--- a/mail/mimedefang/pkg-install
+++ b/mail/mimedefang/pkg-install
@@ -8,6 +8,7 @@ PKG_NAME=$1
PKG_ACTION=$2
MAILUSER=mailnull
SPOOLDIR=/var/spool/MIMEDefang
+QUARANTINEDIR=/var/spool/MD-Quarantine
case "$PKG_ACTION" in
POST-INSTALL)
@@ -16,6 +17,11 @@ POST-INSTALL)
chown ${MAILUSER}:${MAILUSER} ${SPOOLDIR}
chmod 700 ${SPOOLDIR}
fi
+ if [ ! -d ${QUARANTINEDIR} ]; then
+ mkdir -p ${QUARANTINEDIR}
+ chown ${MAILUSER}:${MAILUSER} ${QUARANTINEDIR}
+ chmod 700 ${QUARANTINEDIR}
+ fi
;;
PRE-INSTALL|POST-DEINSTALL|DEINSTALL)
diff --git a/mail/mimedefang/pkg-plist b/mail/mimedefang/pkg-plist
index f0bef4c..d606da6 100644
--- a/mail/mimedefang/pkg-plist
+++ b/mail/mimedefang/pkg-plist
@@ -11,6 +11,7 @@ etc/mimedefang/spamassassin/sa-mimedefang.cf.example
%%PORTDOCS%%share/doc/mimedefang/README
%%PORTDOCS%%share/doc/mimedefang/README.ANOMY
%%PORTDOCS%%share/doc/mimedefang/README.SPAMASSASSIN
+%%PORTDOCS%%share/doc/mimedefang/README.SOPHIE
%%PORTDOCS%%share/doc/mimedefang/README.NONROOT
%%PORTDOCS%%share/doc/mimedefang/README.SECURITY
%%PORTDOCS%%share/doc/mimedefang/README.TRU64
@@ -24,3 +25,4 @@ etc/mimedefang/spamassassin/sa-mimedefang.cf.example
@dirrm etc/mimedefang
@cwd /var/spool
@dirrm MIMEDefang
+@dirrm MD-Quarantine
OpenPOWER on IntegriCloud