From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 26 11:40:14 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 04BF937B401 for ; Thu, 26 Jun 2003 11:40:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D082343FDF for ; Thu, 26 Jun 2003 11:40:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h5QIeCUp038063 for ; Thu, 26 Jun 2003 11:40:12 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h5QIeCBs038062; Thu, 26 Jun 2003 11:40:12 -0700 (PDT) Resent-Date: Thu, 26 Jun 2003 11:40:12 -0700 (PDT) Resent-Message-Id: <200306261840.h5QIeCBs038062@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Andrey V. Pevnev" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CACE237B401 for ; Thu, 26 Jun 2003 11:33:06 -0700 (PDT) Received: from ns1.mgul.ac.ru (ns1.mgul.ac.ru [193.233.62.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63F6D43FBF for ; Thu, 26 Jun 2003 11:33:05 -0700 (PDT) (envelope-from andrey@ns1.mgul.ac.ru) Received: from ns1.mgul.ac.ru (localhost [127.0.0.1]) by ns1.mgul.ac.ru (8.12.9/8.12.9) with ESMTP id h5QIX2k6044196 for ; Thu, 26 Jun 2003 22:33:02 +0400 (MSD) Received: (from andrey@localhost) by ns1.mgul.ac.ru (8.12.9/8.12.9/Submit) id h5QIX25G044195; Thu, 26 Jun 2003 22:33:02 +0400 (MSD) Message-Id: <200306261833.h5QIX25G044195@ns1.mgul.ac.ru> Date: Thu, 26 Jun 2003 22:33:02 +0400 (MSD) From: "Andrey V. Pevnev" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/53792: Update port: mail/mimedefang to 2.34 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Andrey V. Pevnev" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2003 18:40:14 -0000 >Number: 53792 >Category: ports >Synopsis: Update port: mail/mimedefang to 2.34 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jun 26 11:40:11 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Andrey V. Pevnev >Release: FreeBSD 4.8-RELEASE i386 >Organization: Moscow State Forestry University >Environment: System: FreeBSD ns1.mgul.ac.ru 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu May 29 10:00:24 MSD 2003 andrey@ns1.mgul.ac.ru:/usr/obj/.amd_mnt/ns/host/usr/src/sys/NS1 i386 >Description: Update to 2.34 >How-To-Repeat: >Fix: --- mimedefang.diff begins here --- diff -ruN mimedefang.bak/Makefile mimedefang/Makefile --- mimedefang.bak/Makefile Thu Jun 26 22:06:29 2003 +++ mimedefang/Makefile Thu Jun 26 22:07:19 2003 @@ -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 @@ 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 -ruN mimedefang.bak/distinfo mimedefang/distinfo --- mimedefang.bak/distinfo Thu Jun 26 22:06:29 2003 +++ mimedefang/distinfo Thu Jun 26 22:11:17 2003 @@ -1 +1 @@ -MD5 (mimedefang-2.33.tar.gz) = e4328113da504611019abd0f2da875d0 +MD5 (mimedefang-2.34.tar.gz) = 58f846df6a5e648eb71dd1944e530289 diff -ruN mimedefang.bak/files/patch-Makefile.in mimedefang/files/patch-Makefile.in --- mimedefang.bak/files/patch-Makefile.in Thu Jun 26 22:06:29 2003 +++ mimedefang/files/patch-Makefile.in Thu Jun 26 22:18:48 2003 @@ -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 -ruN mimedefang.bak/pkg-install mimedefang/pkg-install --- mimedefang.bak/pkg-install Thu Jun 26 22:06:29 2003 +++ mimedefang/pkg-install Thu Jun 26 22:09:31 2003 @@ -8,6 +8,7 @@ PKG_ACTION=$2 MAILUSER=mailnull SPOOLDIR=/var/spool/MIMEDefang +QUARANTINEDIR=/var/spool/MD-Quarantine case "$PKG_ACTION" in POST-INSTALL) @@ -15,6 +16,11 @@ mkdir -p ${SPOOLDIR} chown ${MAILUSER}:${MAILUSER} ${SPOOLDIR} chmod 700 ${SPOOLDIR} + fi + if [ ! -d ${QUARANTINEDIR} ]; then + mkdir -p ${QUARANTINEDIR} + chown ${MAILUSER}:${MAILUSER} ${QUARANTINEDIR} + chmod 700 ${QUARANTINEDIR} fi ;; diff -ruN mimedefang.bak/pkg-plist mimedefang/pkg-plist --- mimedefang.bak/pkg-plist Thu Jun 26 22:06:29 2003 +++ mimedefang/pkg-plist Thu Jun 26 22:26:25 2003 @@ -11,6 +11,7 @@ %%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 @@ @dirrm etc/mimedefang @cwd /var/spool @dirrm MIMEDefang +@dirrm MD-Quarantine --- mimedefang.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: