and ${CFLAGS}. This fixes the build of net/djbdns, as well as any
other of these packages passing down PKG_SYSCONFDIR via CFLAGS, as
well as being more generally correct for arbitrary user-defined
CFLAGS. Suggested by jlam.
For consistency across djbware in pkgsrc:
* In math/djbfft's and sysutils/daemontools's do-configure targets,
remove leading @ from ${ECHO} lines; from the former, also remove
unneeded single quotes from one such line.
* Rename net/publicfile's pre-build and sysutils/service-config's
post-patch targets to do-configure.
* In sysutils/checkpassword's do-configure target, reorder creation
of conf-cc, conf-ld, and conf-home.
All of the affected packages have been verified to compile.
XXX These packages probably have enough build goo in common to
XXX warrant an mk/djbware.mk. I'll investigate this post-freeze.
messages with MIME attachments that match certain signatures, as
well as Jeremy Kitchen's patch that causes such rejections to be
logged.
Bump PKGREVISION.
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
MTAs' options, since it causes qmail-smtpd to offer several SASL
mechanisms. No need to preserve the meaning of the old option, as
it was introduced less than a day ago.
into the bsd.options.mk framework. Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.
This fixes PR pkg/26590.
complete list:
badrcptto bigdns darwin netqmail nullenvsender
outgoingip qregex realrcptto smtpauth syncdir
tls
This obviates the need for a separate netqmail package. As a result,
reintegrate Makefile.common into Makefile, and simplify a handful
of definitions. If you used the netqmail package, set PKG_OPTIONS.qmail
to "netqmail bigdns" to build with the same patches as before.
Note that most of these options result in patches being applied,
and that any given combination of patches may not apply cleanly.
If there's a combination you need that doesn't work, or build
options you need that aren't available, let me know.
On Darwin, the "darwin" option is set by default, as it's needed
in order to build. The patch includes <nameser8_compat.h>, which
is present on Panther, but not on older systems. We provide a
buildlink stand-in where needed.
On Linux, the "netqmail" option is set by default, as with recent
glibc it's necessary to #include <errno.h> in order to build.
On other platforms, no options are set by default.
Bump PKGREVISION.
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.
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.
again in foo_precmd() to a different value. This is an unusual
usage, and these comments may help if a future rc.subr isn't as
accommodating to such trickery. Suggested by lukem.
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.
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@.
USE_PKGINSTALL is "YES". bsd.pkg.install.mk will no longer automatically
pick up a INSTALL/DEINSTALL script in the package directory and assume that
you want it for the corresponding *_EXTRA_TMPL variable.
have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES". This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile. Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.
