Commit graph

11 commits

Author SHA1 Message Date
schmonz
1f1a81b5d6 Improve binary package:
* Reduce potential patch conflicts by switching more DESTDIR support to sed
* Enable `qmail-netqmail` by default
* Install `qmail-viruscan` signatures via CONF_FILES
* With `tls` option, don't generate cert, instruct the user at INSTALL time

That last change also fixes the source build with `tls` enabled on
systems that don't already have a /var/qmail/control, as reported
by Thomas Lazar on pkgsrc-users@.

While here, add a comment with the new location of the qregex patch.
Since it's named strangely, I've also placed a traditionally-named
copy on ftp.n.o.

Bump PKGREVISION.
2014-05-30 21:35:04 +00:00
schmonz
af51669ae9 The TLS/SASL patch no longer applies over our patch to hier.c
(reported by Thomas Lazar), so instead express our local changes
with SUBST_SED at do-configure. Update to the latest TLS/SASL patch.
Bump PKGREVISION.
2014-04-16 04:57:23 +00:00
schmonz
288964eb45 Rename and comment pkgsrc patches. No functional change. 2013-08-15 15:43:48 +00:00
marino
9d024ea0ea PR#46333 mail/qmail: Fix qmail-*spawn segfaults on DragonFly
Fix implemented per PR.
2012-05-20 08:48:56 +00:00
sbd
470c1181eb At joerg@'s suggestion instead of set MANINSTALL to agree with what gets
installed simple don't install the catpages.
2012-03-12 03:53:55 +00:00
joerg
9340115756 Fix PLIST overlap with dependency 2011-09-28 06:36:57 +00:00
schmonz
fadd3f4ce3 DESTDIR support, PKGMANDIR support, OS X fixes, general cleanups.
For ${OPSYS}/${USE_DESTDIR}/${PKGMANDIR} combinations that already
worked, no functional change (hence no PKGREVISION bump).
2011-06-07 02:53:42 +00:00
schmonz
f863c03b03 Short story:
1) Mostly conform to hier(7) and honor PKG_SYSCONFDIR.
2) Follow more closely Dave Sill's "Life with qmail" (LWQ).
3) Add a bunch of features to the rc.d scripts.
4) Remove some (but not all) obstacles to binary packaging.
5) Introduce QMAIL_AUTOCONFIG, QMAIL_QUEUE_DIR, and QMAIL_QUEUE_EXTRA.
6) Enable pkgviews installation.
7) Bump PKGREVISION.


Long story:

1) Mostly conform to hier(7) and honor PKG_SYSCONFDIR.

     Based on a January 1997 post by mrg to the qmail list: prior
     to installation, we create symlinks in ${QMAILDIR} that point
     into ${LOCALBASE} or ${PKG_SYSCONFDIR}, causing installation
     to place files in those locations while allowing the canonical
     /var/qmail paths to continue to work. The notable deviation
     from hier(7) is that even though some binaries ought to go in
     sbin, they've all been lumped into bin for simplicity.

     Pleasant effects:
     * We no longer need to set LOCALBASE (a big no-no), and as a
       result also no longer need to set NO_MTREE, RCD_SCRIPTS_EXAMPLEDIR,
       or EVAL_PREFIX. This will also allow a few qmail-related
       packages to do likewise.
     * The commands and manual pages are in easily accessible paths
       by default.
     * Package installation and deinstallation work much better.

     Side effects:
     * There were a few minor conflicts with mail/courier-maildirmake,
       mail/mutt, and mail/pulsar. The latest versions of each are
       fine, so we add CONFLICTS only for older versions. (Thanks
       to those packages' maintainers!) There's also a conflict
       with security/mirrordir, which has a "bin/forward" command
       and corresponding section 1 man page.

     * Some directories under ${PREFIX} get chown'd to group qmail.
       Rather than modify the qmail installer, the affected
       directories are simply chown'd back afterward during
       post-install if PKG_INSTALLATION_TYPE is "overwrite". (If
       it's "pkgviews", then only the package's depot directory is
       affected, so we leave it alone.)

2) Follow more closely Dave Sill's "Life with qmail" (LWQ).

     Similarities:
     * Installs into /var/qmail from source.
     * Installs ucspi-tcp and daemontools.
     * Uses tcpserver(1).
     * Uses tcp.smtp.cdb for relay access control.
     * Uses control/defaultdelivery.
     * Uses control/concurrencyincoming.
     * Requires that control/rcpthosts exist to prevent open relays.
     * Uses similar chains of commands in run scripts.
     * Provides a script much like qmailctl.

     Differences:
     * This package does the following work for you automatically:
       * Creates user accounts.
       * Fetches, extracts, patches, configures, and compiles the source.
       * Installs binaries.
       * Runs ./config-fast.
       * Creates tcp.smtp{,cdb} and tcp.pop3d{,cdb}.
       * Creates control/concurrencyincoming.
       * Creates control/defaultdelivery (defaulting to "./Mailbox").
       * Creates the three required system aliases.
     * LWQ suggests doing some things this package doesn't do:
       * Applying patches.
       * Copying a script from /var/qmail/boot to /var/qmail/rc.
       * Configuring svscan(8) to run at boot.
       * Creating and populating /service.
       * Using supervise(8) and multilog(8).
       * Using the qmailctl script to control qmail.
       * Using the inst_check script to verify the installation.
       * Storing tcp.smtp{,cdb} in /etc.
       * Renaming the system sendmail(8) and marking it non-executable.
     * Instead, this package:
       * Builds from unmodified source. (See also mail/netqmail.)
       * Uses NetBSD-style rc.d scripts (including one similar to qmailctl).
       * Sends log messages to syslog(3).
       * Stores tcp.smtp{,cdb} and tcp.pop3{,cdb} in ${PKG_SYSCONFDIR}.
       * Provides an example mailer.conf(5).

3) Add a bunch of features to the rc.d scripts.

     Rename the qmail script and rcvar to qmailsend. Add "doqueue"
     (synonyms: alrm, flush) and "queue" commands, add "hup" as a
     synonym for "reload", and determine default delivery instruction
     from control/defaultdelivery (LWQ). Add control/defaultdelivery
     to required_files. Rename qmailsend_flags to
     qmailsend_defaultdelivery, which overrides control/defaultdelivery
     if set.

     In the qmailpop3d and qmailsmtpd scripts, enforce resource
     limits with softlimit(8) (LWQ). Add dependency on sysutils/daemontools
     for this. Rename qmailfoo_flags to qmailfoo_tcpflags. Add
     qmailfoo_tcphost (default: 0, meaning "any address") and
     qmailfoo_tcpport (default: 110 and 25, respectively). Add
     qmailfoo_softlimit (default: 2000000). Add qmailfoo_pretcpserver
     and qmailfoo_prefoo (default: empty), useful for inserting
     commands such as rblsmtpd(1) or relay-ctrl into the chain.
     Log to splogger's default syslog facility ("mail"), and use
     the name of the script as the tag.

     In the qmailpop3d, qmailsend, and qmailsmtpd scripts, add
     qmailfoo_postenv (defaults: empty, PATH=${PREFIX}/bin:$PATH,
     and QMAILQUEUE=${PREFIX}/bin/qmail-queue, respectively), useful
     primarily for setting environment variables for each service.
     Add "pause" and "cont" commands (LWQ). They send -STOP and
     -CONT signals, respectively. Add "stat" as a synonym for
     "status" (LWQ).

     In the qmailpop3d script, add -x to qmailpop3d_tcpflags and
     add "cdb" command. Add qmailpop3d_checkpassword (useful for
     authenticating against alternate user databases) and
     qmailpop3d_maildirname (useful if your maildirs are named
     something other than "Maildir"). Add tcp.pop3.cdb to
     required_files.

     In the qmailsmtpd script, add -x and remove -H from
     qmailsmtpd_tcpflags, limit the number of incoming connections
     to control/concurrencyincoming, and add "cdb" command (LWQ).
     Add control/concurrencyincoming and tcp.smtp.cdb to required_files.

     Add qmailqread script and ${PREFIX}/bin/qmail-qread-client,
     based on Steinar Haug's example on www.qmail.org. If enabled,
     this allows local non-root users to see the queue.

     Add qmail script (structure copied from net/samba/files/samba.sh).
     Its interface is very similar to LWQ's qmailctl: it provides
     the commands "start stop restart rcvar pause cont stat status
     cdb doqueue reload queue alrm flush hup help". These commands
     can be run either directly from the appropriate service-specific
     script(s), or from this qmail script (which will call the
     right script(s) for you).

4) Remove some (but not all) obstacles to binary packaging.

     Each of these is better explained elsewhere. Summary:
     * Installs into the normal ${LOCALBASE}.
     * /var/qmail paths still work.
     * No patches are applied. (See also mail/netqmail.)

5) Introduce QMAIL_AUTOCONFIG, QMAIL_QUEUE_DIR, and QMAIL_QUEUE_EXTRA.

     QMAIL_AUTOCONFIG (default: YES): whether to automatically
     create basic config files.

     QMAIL_QUEUE_DIR (default: ${VARBASE}/spool/qmail): the path
     to the queue.

     QMAIL_QUEUE_EXTRA (default: empty): an additional recipient
     that will be added to every delivery. This is used primarily
     for logging. If this is set to a non-empty value, the necessary
     dot-qmail(5) file is created automatically at install time.

6) Enable pkgviews installation.

7) Bump PKGREVISION.

     Other user-visible changes:

     This package no longer applies patches to qmail. mail/netqmail,
     to be imported shortly, does.

     Restrictions on the redistribution of modified qmail apply
     not only to binaries but also to source. Clarify this in
     RESTRICTED.

     Add "newaliases", "hoststat", and "purgestat" entries to the
     sample mailer.conf. Install it to ${PREFIX}/share/examples/${PKGBASE},
     as other pkgsrc mailers do. ("newaliases" is actually provided
     by the fastforward package, and isn't needed unless you're
     using it.)

     Explain how to enable qmail in MESSAGE (cribbed from the
     postfix package).

Thanks to zuntum, snj, salo, and jlam for ideas, discussion, and review.
2004-07-21 22:35:59 +00:00
schmonz
f7e542297a Add revision 1.01 of Ward Vandewege's badrcptto patch. With this
patch, qmail-smtpd will reject mail during the SMTP conversation
if a recipient is listed in control/badrcptto. This complements
control/badmailfrom as found in stock qmail. Requested by Nathan
Arthur.

Add an rc.d script for qmail-pop3d. It needs sysutils/checkpassword,
which is so tiny I've added the dependency even as I don't use
qmail-pop3d myself.

In the rc.d script for qmail-smtpd, require control/rcpthosts to
be present. This prevents accidental open relays.

Now that it's used for the path to checkpassword too, rename
LOCALBASE_UCSPI_TCP to LOCALBASE_NORMAL.

Convert to buildlink3.

Bump PKGREVISION.
2004-04-24 05:29:36 +00:00
schmonz
fa7fdb69b2 Russ Nelson, Charles Cazabon, Dave Sill, Peter Samuel, and Henning
Brauer have prepared a distribution of qmail, called "netqmail":

    "We have done this because in our opinion, too many new users
    are confused by the out-of-date INSTALL file, and too much time
    is spent arguing on the mailing list over bugs.  We have tried
    to stick to the barest minimum number of changes.  We have
    fixed only those things which are out-and-out wrong, or which
    have been approved by djb (specifically QMAILQUEUE)."

This package already includes the QMAILQUEUE patch. Add netqmail
1.05's other patches, with the exception that patches to documentation
files which are not installed have been lovingly omitted.

This package also already includes a patch to handle oversized DNS
packets. It's still here, too.

pkgsrc changes:
* Add qmail-smtpd rc.d script (and ensuing dependency on net/ucspi-tcp).
* Update qmail rc.d script: respect $qmail_flags, treating it as the
    default delivery instruction.
* Remove non-working MASTER_SITES.

From the netqmail changelog:

20040121 code: qmail-smtpd is protected from exceedingly long (eg 2GB)
         header lines
20040121 code: qmail_lspawn, qmail-newmrh, qmail-newu, and qmail-rspawn
         are protected from misbehaving on hosts where the size of an
         integer is not the same as the size of a character pointer
         (eg 64 bit hosts with 32 bit ints)
20031027 doc: qmail.7 identifies installation as netqmail and points to
         http://qmail.org/
20031027 doc: qmail-queue.8 adds explanation of $QMAILQUEUE
20031027 doc: qmail-log.5 adds reference to errors from $QMAILQUEUE script
20031027 code: qmail-smtpd identifies itself as netqmail
20031027 code: if $QMAILQUEUE is set, it's invoked instead of qmail-queue
20031024 code: changed errno from int to #include.
20031024 code: fixed .qmail parsing bug.
20031024 code: recognize 0.0.0.0 as a local address.
20031024 code: sendmail's -f flag now overrides environment variables.

And for all this, bump PKGREVISION.

Pre-flight checks by snj@.
2004-04-10 05:30:06 +00:00
zuntum
efd2204448 Store patches locally instead of fetching them from PATCH_SITES - fixes
problem with qmailqueue patch unexpectedly differing over time
2002-05-03 10:39:00 +00:00