From ec176d6f9311cd1da0fff19deb5afc5c91a15773 Mon Sep 17 00:00:00 2001 From: schmonz Date: Mon, 2 Aug 2004 03:57:17 +0000 Subject: Remove add-on scripts and config files from the qmail and netqmail packages. They now simply compile and install qmail and its prerequisites. (The add-on scripts and config files will be revivified as a separate qmail-run package. Thus, QMAIL_AUTOCONFIG is no longer needed.) The user is notified at install time that one popular, well-regarded way to enable qmail is to follow the directions in "Life with qmail", and that another way is to install the qmail-run package. These changes, based on discussion with Charles Cazabon, are intended to make life easier for the helpful people on the qmail mailing list by clearly marking custom add-ons as such. Other changes: Since netqmail is a tarball containing the qmail tarball plus the netqmail bits, we can use it for both packages and share more logic between the two packages: MASTER_SITES, DISTINFO_FILE, WRKSRC, and the post-extract target. Now that there's one place to put the distinfo, add Eben Pratt's simple patch to build and install on Mac OS X 10.3 (the patch is not applied on other OSes). Bump PKGREVISION of both packages. --- mail/netqmail/Makefile | 20 +++----- mail/netqmail/distinfo | 4 +- mail/qmail/INSTALL | 41 ++-------------- mail/qmail/MESSAGE | 23 +++------ mail/qmail/Makefile | 12 ++--- mail/qmail/Makefile.common | 42 ++++++++++------ mail/qmail/PLIST | 8 ++- mail/qmail/distinfo | 4 -- mail/qmail/files/mailer.conf | 10 ---- mail/qmail/files/qmail-qread-client.sh | 7 --- mail/qmail/files/qmail.sh | 90 ---------------------------------- mail/qmail/files/qmailpop3d.sh | 78 ----------------------------- mail/qmail/files/qmailqread.sh | 28 ----------- mail/qmail/files/qmailsend.sh | 90 ---------------------------------- mail/qmail/files/qmailsmtpd.sh | 79 ----------------------------- 15 files changed, 55 insertions(+), 481 deletions(-) delete mode 100644 mail/qmail/distinfo delete mode 100644 mail/qmail/files/mailer.conf delete mode 100644 mail/qmail/files/qmail-qread-client.sh delete mode 100644 mail/qmail/files/qmail.sh delete mode 100644 mail/qmail/files/qmailpop3d.sh delete mode 100644 mail/qmail/files/qmailqread.sh delete mode 100644 mail/qmail/files/qmailsend.sh delete mode 100644 mail/qmail/files/qmailsmtpd.sh (limited to 'mail') diff --git a/mail/netqmail/Makefile b/mail/netqmail/Makefile index 11437259843..c865d6db429 100644 --- a/mail/netqmail/Makefile +++ b/mail/netqmail/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/07/21 22:42:04 schmonz Exp $ +# $NetBSD: Makefile,v 1.2 2004/08/02 03:57:17 schmonz Exp $ # -DISTNAME= netqmail-1.05 +PKGNAME= ${DISTNAME} +PKGREVISION= 1 CATEGORIES= mail -MASTER_SITES= http://qmail.org/ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://qmail.org/netqmail/ @@ -19,18 +19,10 @@ NO_BIN_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_PACKAGE= "needs work to function properly as a binary package" -WRKSRC= ${WRKDIR}/${DISTNAME}/${DISTNAME} +APPLY_NETQMAIL= \ + ${PATCH} ${PATCH_DIST_ARGS} < ../${DISTNAME}.patch; \ + cd ..; ${MV} ${QMAIL_VERS} ${DISTNAME} .include "../../mail/qmail/Makefile.common" -.if defined(PKG_PHASE) && ${PKG_PHASE} == "extract" -WRKSRC= ${WRKDIR}/${DISTNAME} -.endif - -post-extract: - @extract_file=qmail-1.03.tar.gz; export extract_file; \ - cd ${WRKSRC}; ${EXTRACT_CMD}; cd qmail-1.03; \ - ${PATCH} ${PATCH_DIST_ARGS} < ../${DISTNAME}.patch; \ - cd ..; ${MV} qmail-1.03 ${DISTNAME} - .include "../../mk/bsd.pkg.mk" diff --git a/mail/netqmail/distinfo b/mail/netqmail/distinfo index af4890125a0..d7bff1cd961 100644 --- a/mail/netqmail/distinfo +++ b/mail/netqmail/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/07/21 22:42:04 schmonz Exp $ +$NetBSD: distinfo,v 1.2 2004/08/02 03:57:17 schmonz Exp $ SHA1 (netqmail-1.05.tar.gz) = fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829 Size (netqmail-1.05.tar.gz) = 252264 bytes +SHA1 (panther.patch) = 952b919786d808a605343d078696e1af7cbd2577 +Size (panther.patch) = 2392 bytes SHA1 (patch-aa) = c9928d0879dee77010bb469d4afa8c4ca35668f8 diff --git a/mail/qmail/INSTALL b/mail/qmail/INSTALL index a5589944d84..2e7b3ca67d3 100644 --- a/mail/qmail/INSTALL +++ b/mail/qmail/INSTALL @@ -1,10 +1,8 @@ -# $NetBSD: INSTALL,v 1.1 2004/07/21 22:35:59 schmonz Exp $ +# $NetBSD: INSTALL,v 1.2 2004/08/02 03:57:17 schmonz Exp $ DOCDIR=@DOCDIR@ EGDIR=@EGDIR@ -SHAREDIR=@SHAREDIR@ QMAILDIR=@QMAILDIR@ -QMAIL_AUTOCONFIG=@QMAIL_AUTOCONFIG@ QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@ QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ @@ -53,43 +51,12 @@ EOF ;; POST-INSTALL) - if [ "${QMAIL_AUTOCONFIG}" = YES ]; then - - cd ${SHAREDIR}/setup && ./config-fast `./hostname` - - cd ${PKG_SYSCONFDIR}/alias && ${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root - - if ! [ -s ${PKG_SYSCONFDIR}/control/concurrencyincoming ]; then - ${ECHO} 20 > ${PKG_SYSCONFDIR}/control/concurrencyincoming - ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/concurrencyincoming - fi - - if ! [ -s ${PKG_SYSCONFDIR}/control/defaultdelivery ]; then - ${ECHO} ./Mailbox > ${PKG_SYSCONFDIR}/control/defaultdelivery - ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/defaultdelivery - fi - - pop3rule=':allow' - smtprule='127.:allow,RELAYCLIENT=""' - for i in pop3 smtp; do - if ! [ -s ${PKG_SYSCONFDIR}/tcp.${i} ]; then - eval ${ECHO} \"\$${i}rule\" > ${PKG_SYSCONFDIR}/tcp.${i} - fi - ${CHMOD} 644 ${PKG_SYSCONFDIR}/tcp.${i} - ${LOCALBASE}/bin/tcprules ${PKG_SYSCONFDIR}/tcp.${i}.cdb ${PKG_SYSCONFDIR}/tcp.${i}.tmp < ${PKG_SYSCONFDIR}/tcp.${i} - ${CHMOD} 644 ${PKG_SYSCONFDIR}/tcp.${i}.cdb - done - - if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then - ${ECHO} '#' >> ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA} - ${CHMOD} 644 ${PKG_SYSCONFDIR}/alias/.qmail-${QMAIL_QUEUE_EXTRA} - fi - - else + if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then ${CAT} < -To enable POP3 (only for Maildirs): -- Set qmailpop3d=YES in /etc/rc.conf. - -To allow local non-root users to see the queue: -- Set qmailqread=YES in /etc/rc.conf. -- Change the mailq entry in /etc/mailer.conf to qmail-qread-client. - -Alternatively, you can manage the qmail daemons with daemontools -by creating appropriate run scripts in /service. There are many -ways to do this; you may find the qmail-conf package helpful. +Alternatively, you can let pkgsrc do the work by installing the +qmail-run package. =========================================================================== diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index ea0ee7e31b0..a6049bd2b6b 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,13 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2004/07/21 22:35:59 schmonz Exp $ +# $NetBSD: Makefile,v 1.25 2004/08/02 03:57:17 schmonz Exp $ # -DISTNAME= qmail-1.03 -PKGREVISION= 7 +PKGNAME= ${QMAIL_VERS} +PKGREVISION= 8 CATEGORIES= mail -MASTER_SITES= http://cr.yp.to/software/ \ - ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \ - ftp://ftp.jp.qmail.org/qmail/ \ - ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://cr.yp.to/qmail.html @@ -22,6 +18,8 @@ NO_BIN_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} NO_PACKAGE= "needs work to function properly as a binary package" +APPLY_NETQMAIL= ${DO_NADA} + .include "../../mail/qmail/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/mail/qmail/Makefile.common b/mail/qmail/Makefile.common index 6ee459be2a6..78c1acd6732 100644 --- a/mail/qmail/Makefile.common +++ b/mail/qmail/Makefile.common @@ -1,6 +1,10 @@ -# $NetBSD: Makefile.common,v 1.1 2004/07/21 22:35:59 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/08/02 03:57:17 schmonz Exp $ # +QMAIL_VERS= qmail-1.03 +DISTNAME= netqmail-1.05 +MASTER_SITES= http://qmail.org/ + DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools DEPENDS+= qmail-users>=1.0:../../mail/qmail-users @@ -13,12 +17,19 @@ CONFLICTS+= pulsar<=0.1.1 PKG_INSTALLATION_TYPES= overwrite pkgviews +WRKSRC= ${WRKDIR}/${DISTNAME}/${PKGNAME_NOREV} + +.if defined(PKG_PHASE) && ${PKG_PHASE} == "extract" +WRKSRC= ${WRKDIR}/${DISTNAME} +.endif + ALL_TARGET= it man INSTALL_TARGET= setup check FILESDIR= ${.CURDIR}/../../mail/qmail/files MESSAGE_SRC= ${.CURDIR}/../../mail/qmail/MESSAGE PLIST_SRC= ${.CURDIR}/../../mail/qmail/PLIST +DISTINFO_FILE= ${.CURDIR}/../../mail/netqmail/distinfo USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../mail/qmail/DEINSTALL @@ -27,7 +38,6 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias ${EGDIR}/boot MAKE_DIRS+= ${PKG_SYSCONFDIR}/control ${DOCDIR} MAKE_DIRS+= ${PKG_SYSCONFDIR}/users OWN_DIRS+= ${QMAILDIR} ${QMAIL_QUEUE_DIR} -RCD_SCRIPTS= qmail qmailqread qmailpop3d qmailsend qmailsmtpd PKG_SYSCONFSUBDIR= qmail DOCDIR= ${PREFIX}/share/doc/qmail @@ -39,9 +49,9 @@ FILES_SUBST+= DOCDIR=${DOCDIR} FILES_SUBST+= EGDIR=${EGDIR} FILES_SUBST+= SHAREDIR=${SHAREDIR} FILES_SUBST+= QMAILDIR=${QMAILDIR} -FILES_SUBST+= QMAIL_AUTOCONFIG=${QMAIL_AUTOCONFIG} FILES_SUBST+= QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR} FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA} +PLIST_SUBST+= OSXSUFX+=${OSXSUFX} SETUP_PROGRAMS= dnsfq dnsip dnsptr hostname install ipmeprint SETUP_SCRIPTS= config config-fast @@ -57,8 +67,16 @@ INSTALLATION_DIRS+= share/doc/qmail share/examples/qmail share/qmail .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= QMAILDIR QMAIL_AUTOCONFIG -BUILD_DEFS+= QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA +.if ${OPSYS} == "Darwin" +OSXSUFX= .doc +PATCHFILES= panther.patch +PATCH_SITES= http://http.netdevice.com:9080/qmail/patch/ +PATCH_DIST_STRIP= -p1 +.else +OSXSUFX= # empty +.endif + +BUILD_DEFS+= QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA .if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*) PKG_FAIL_REASON+= "QMAIL_QUEUE_DIR must not be under ${QMAILDIR}" @@ -74,17 +92,16 @@ SUBST_SED.logging= -e 's|0|${QUEUE_EXTRALEN}|g' SUBST_SED.logging+= -e 's|""|${QUEUE_EXTRA}|g' .endif +post-extract: + @extract_file=${QMAIL_VERS}.tar.gz; export extract_file; \ + cd ${WRKSRC}; ${EXTRACT_CMD}; cd ${QMAIL_VERS}; \ + ${APPLY_NETQMAIL} + do-configure: ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld ${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail -post-build: - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf \ - > ${WRKDIR}/mailer.conf.qmail - @${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail-qread-client.sh \ - > ${WRKDIR}/qmail-qread-client - post-install: # qmail's installer sets strange permissions; set them back . if (${PKG_INSTALLATION_TYPE} == "overwrite") @@ -99,9 +116,6 @@ post-install: . endfor . endif - ${INSTALL_DATA} ${WRKDIR}/mailer.conf.qmail ${EGDIR}/mailer.conf - ${INSTALL_SCRIPT} ${WRKDIR}/qmail-qread-client ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${SHAREDIR} ${INSTALL_PROGRAM_DIR} ${SHAREDIR}/setup for i in ${SETUP_PROGRAMS}; do \ diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST index 9950bf9c062..df59c622c80 100644 --- a/mail/qmail/PLIST +++ b/mail/qmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/07/21 22:35:59 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/08/02 03:57:17 schmonz Exp $ bin/bouncesaying bin/condredirect bin/datemail @@ -28,7 +28,6 @@ bin/qmail-qmqpc bin/qmail-qmqpd bin/qmail-qmtpd bin/qmail-qread -bin/qmail-qread-client bin/qmail-qstat bin/qmail-queue bin/qmail-remote @@ -147,7 +146,7 @@ man/man8/qmail-tcpok.8 man/man8/qmail-tcpto.8 man/man8/splogger.8 share/doc/qmail/FAQ -share/doc/qmail/INSTALL +share/doc/qmail/INSTALL${OSXSUFX} share/doc/qmail/INSTALL.alias share/doc/qmail/INSTALL.ctl share/doc/qmail/INSTALL.ids @@ -165,7 +164,7 @@ share/doc/qmail/PIC.relaygood share/doc/qmail/PIC.rem2local share/doc/qmail/REMOVE.binmail share/doc/qmail/REMOVE.sendmail -share/doc/qmail/SENDMAIL +share/doc/qmail/SENDMAIL${OSXSUFX} share/doc/qmail/TEST.deliver share/doc/qmail/TEST.receive share/doc/qmail/UPGRADE @@ -179,7 +178,6 @@ share/examples/qmail/boot/home share/examples/qmail/boot/home+df share/examples/qmail/boot/proc share/examples/qmail/boot/proc+df -share/examples/qmail/mailer.conf share/qmail/setup/config share/qmail/setup/config-fast share/qmail/setup/dnsfq diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo deleted file mode 100644 index 7d8dd48e675..00000000000 --- a/mail/qmail/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -$NetBSD: distinfo,v 1.6 2004/07/21 22:35:59 schmonz Exp $ - -SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a -Size (qmail-1.03.tar.gz) = 220668 bytes diff --git a/mail/qmail/files/mailer.conf b/mail/qmail/files/mailer.conf deleted file mode 100644 index c918d862c6b..00000000000 --- a/mail/qmail/files/mailer.conf +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: mailer.conf,v 1.3 2004/07/21 22:35:59 schmonz Exp $ -# -# Use "qmail" as replacement for "sendmail". -# -sendmail @PREFIX@/bin/sendmail -send-mail @PREFIX@/bin/sendmail -mailq @PREFIX@/bin/qmail-qread -newaliases @PREFIX@/bin/newaliases -hoststat @PREFIX@/bin/qmail-tcpto -purgestat @PREFIX@/bin/qmail-tcpok diff --git a/mail/qmail/files/qmail-qread-client.sh b/mail/qmail/files/qmail-qread-client.sh deleted file mode 100644 index 1a175d07787..00000000000 --- a/mail/qmail/files/qmail-qread-client.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!@SH@ -# -# Client program to allow local non-root users to see the queue. -# Requires that the corresponding server program be running. From -# Steinar Haug. - -exec @LOCALBASE@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6' diff --git a/mail/qmail/files/qmail.sh b/mail/qmail/files/qmail.sh deleted file mode 100644 index a7c8bead012..00000000000 --- a/mail/qmail/files/qmail.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: qmail.sh,v 1.5 2004/07/21 22:35:59 schmonz Exp $ -# -# Master script for administrators to control qmail services. -# Usage resembles the qmailctl script from "Life with qmail". -# - -# KEYWORD: nostart - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -rcd_dir=`@DIRNAME@ $0` - -# NOTE: run_rc_command sets $rc_arg -# -forward_commands() -{ - # Backward compat with NetBSD <1.6: - [ -z "$rc_arg" ] && rc_arg=$_arg - - for file in $COMMAND_LIST; do - $rcd_dir/$file $rc_arg - done -} - -reverse_commands() -{ - # Backward compat with NetBSD <1.6: - [ -z "$rc_arg" ] && rc_arg=$_arg - - REVCOMMAND_LIST= - for file in $COMMAND_LIST; do - REVCOMMAND_LIST="$file $REVCOMMAND_LIST" - done - for file in $REVCOMMAND_LIST; do - $rcd_dir/$file $rc_arg - done -} - -qmailrcd() -{ - for service in $@; do - $rcd_dir/qmail${service} $rc_arg - done -} - -qmail_help() -{ - @CAT@ <