diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index c039fa03a89..18fc934ee55 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,53 +1,39 @@ # OpenBSD makefile for: postfix -# Version required: beta-19981211 +# Version required: beta-19981230 # Date created: 1998-Dec-10 # Whom: dugsong@OpenBSD.ORG # # Relevant URLs: http://www.postfix.org/ # http://www.alphaworks.ibm.com/formula/securemailer/ # -# $OpenBSD: Makefile,v 1.2 1998/12/16 22:00:51 marc Exp $ +# $OpenBSD: Makefile,v 1.3 1999/01/12 02:39:30 dugsong Exp $ -DISTNAME= postfix-beta-19981211 +DISTNAME= postfix-beta-19981230 CATEGORIES= mail +MASTER_SITES= ftp://ftp.merit.edu/postfix/ \ + ftp://ftp.sunet.se/pub/unix/mail/postfix/ \ + ftp://ftp.tau.ac.il/pub/unix/mail/postfix/ \ + ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/ \ + ftp://ftp.win.ne.jp/pub/network/mail/postfix/ + MAINTAINER= dugsong@monkey.org -NO_CDROM= "LIC: redistribution not allowed" -MIRROR_DISTFILE=no - -MASTER_SITES= see_do-fetch_target - IS_INTERACTIVE= yes NO_CONFIGURE= yes ALL_TARGET= default -do-fetch: - @if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \ - ${ECHO} "" ; \ - ${ECHO} " The source to this port may not be automatically fetched" ; \ - ${ECHO} " due to licensing restrictions. You MUST fetch the source" ; \ - ${ECHO} " manually after reading and agreeing to the license at:" ; \ - ${ECHO} "" ; \ - ${ECHO} " http://www.alphaworks.ibm.com/formula/securemailer/" ; \ - ${ECHO} "" ; \ - ${ECHO} " Once ${DISTFILES} has been downloaded,"; \ - ${ECHO} " move it to ${DISTDIR} and then restart this build." ; \ - ${ECHO} "" ; \ - exit 1 ; \ - fi - pre-install: @${SH} ${PKGDIR}/INSTALL with PRE-INSTALL post-install: @${SH} ${PKGDIR}/INSTALL with POST-INSTALL -MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postfix.1 \ - postkick.1 postlock.1 postlog.1 postmap.1 sendmail.1 +MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ + postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 relocated.5 transport.5 virtual.5 diff --git a/mail/postfix/files/md5 b/mail/postfix/files/md5 index 663c3243a4b..aa5fca2ac2e 100644 --- a/mail/postfix/files/md5 +++ b/mail/postfix/files/md5 @@ -1 +1 @@ -MD5 (postfix-beta-19981211.tar.gz) = 629f0f42aaa0cedfffb80ce9a6f40440 +MD5 (postfix-beta-19981230.tar.gz) = 1b97c75c3a8e0f55a0577447403403da diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa index 2285604fa2c..2c92b734473 100644 --- a/mail/postfix/patches/patch-aa +++ b/mail/postfix/patches/patch-aa @@ -1,9 +1,9 @@ -*** Makefile.in.orig Wed Dec 9 07:33:50 1998 ---- Makefile.in Sat Dec 12 19:27:27 1998 +*** Makefile.in.orig Wed Dec 30 08:04:36 1998 +--- Makefile.in Mon Jan 11 21:12:36 1999 *************** *** 6,11 **** --- 6,19 ---- - showq postalias postcat postconf postkick postlock postlog \ + showq postalias postcat postconf postdrop postkick postlock postlog \ postmap # man html + PREFIX?= /usr/local @@ -18,8 +18,8 @@ makefiles Makefiles: *************** -*** 38,40 **** ---- 46,79 ---- +*** 39,41 **** +--- 47,81 ---- find . -type s -print | xargs rm -f find . -type d -print | xargs chmod 755 find . -type f -print | xargs chmod a+r @@ -45,6 +45,7 @@ + @echo "-> Installing postfix binaries in $(SBINDIR)" + @[ -d $(SBINDIR) ] || mkdir -p -m 755 $(SBINDIR) + @install -m 755 -c -s bin/* $(SBINDIR) ++ @install -m 2755 -c -s -g maildrop bin/postdrop $(SBINDIR) + @echo + @echo "-> Installing postfix manpages in $(MANDIR)" + @install -m 644 -c man/man1/* $(MANDIR)/man1 diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae new file mode 100644 index 00000000000..a34fe57c5ea --- /dev/null +++ b/mail/postfix/patches/patch-ae @@ -0,0 +1,22 @@ +*** conf/postfix-script.orig Mon Jan 11 21:05:18 1999 +--- conf/postfix-script Mon Jan 11 21:06:24 1999 +*************** +*** 170,177 **** + test -d maildrop || { + $WARN creating missing Postfix maildrop directory + mkdir maildrop || exit 1 +! chmod 1733 maildrop + chown $mail_owner maildrop + } + test -d pid || { + $WARN creating missing Postfix pid directory +--- 170,178 ---- + test -d maildrop || { + $WARN creating missing Postfix maildrop directory + mkdir maildrop || exit 1 +! chmod 730 maildrop + chown $mail_owner maildrop ++ chgrp maildrop maildrop + } + test -d pid || { + $WARN creating missing Postfix pid directory diff --git a/mail/postfix/pkg/DEINSTALL b/mail/postfix/pkg/DEINSTALL index bf6bf43bff1..0ff93cdd5ce 100644 --- a/mail/postfix/pkg/DEINSTALL +++ b/mail/postfix/pkg/DEINSTALL @@ -34,6 +34,7 @@ if [ -d /var/spool/postfix ]; then echo fi -echo "-> Account 'smtp' and group 'smtp' still exist - you may want to remove these manually." +echo "-> Account 'smtp' and groups 'smtp' and 'maildrop' still exist -" +echo " you may want to remove these manually." exit 0 diff --git a/mail/postfix/pkg/INSTALL b/mail/postfix/pkg/INSTALL index 64acacd9a0f..16165b0b405 100644 --- a/mail/postfix/pkg/INSTALL +++ b/mail/postfix/pkg/INSTALL @@ -10,8 +10,10 @@ PKG_PREFIX=${PKG_PREFIX:-/usr/local} SMTPUID=6 SMTPGID=6 +MAILDROPGID=12 if [ "$2" = "PRE-INSTALL" ]; then + # Create postfix user and group. line=`egrep '^smtp:' /etc/group` if [ "$line" != "" ]; then SMTPGID=`echo $line | cut -f3 -d:` @@ -30,6 +32,17 @@ if [ "$2" = "PRE-INSTALL" ]; then fi echo "-> Using account 'smtp' for postfix, uid $SMTPUID, gid $SMTPGID" echo "" + # Create Postfix maildrop group. + line=`egrep '^maildrop:' /etc/group` + if [ "$line" != "" ]; then + MAILDROPGID=`echo $line | cut -f3 -d:` + else + echo "-> Creating maildrop group, gid $MAILDROPGID" + echo "maildrop:*:${MAILDROPGID}:" >> /etc/group + echo "" + fi + echo "-> Using group 'maildrop' for postdrop, gid $MAILDROP" + echo "" exit 0 fi diff --git a/mail/postfix/pkg/PLIST b/mail/postfix/pkg/PLIST index b4904569c67..9124f7acdfc 100644 --- a/mail/postfix/pkg/PLIST +++ b/mail/postfix/pkg/PLIST @@ -138,4 +138,4 @@ share/doc/postfix/virtual.5.html @dirrm share/doc/postfix @dirrm lib/postfix @comment these pkg utilities suk. eesh. -@unexec /var/db/pkg/postfix-beta-19981211/+DEINSTALL with POST-DEINSTALL +@unexec /var/db/pkg/postfix-beta-19981230/+DEINSTALL with POST-DEINSTALL