pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/qmail Russ Nelson, Charles Cazabon, Dave Sill, Pe...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6e729b3d4bdf
branches: trunk
changeset: 472408:6e729b3d4bdf
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sat Apr 10 05:30:06 2004 +0000
description:
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@.
diffstat:
mail/qmail/Makefile | 16 +++--
mail/qmail/PLIST | 3 +-
mail/qmail/distinfo | 22 +++++++-
mail/qmail/files/qmail.sh | 13 +++-
mail/qmail/files/qmailsmtpd.sh | 29 +++++++++++
mail/qmail/patches/patch-aa | 28 ++++++++--
mail/qmail/patches/patch-ab | 18 +++---
mail/qmail/patches/patch-ac | 24 +++++---
mail/qmail/patches/patch-ad | 11 ++++
mail/qmail/patches/patch-ae | 9 +++
mail/qmail/patches/patch-af | 15 +++++
mail/qmail/patches/patch-ag | 13 +++++
mail/qmail/patches/patch-ah | 16 ++++++
mail/qmail/patches/patch-ai | 13 +++++
mail/qmail/patches/patch-aj | 16 ++++++
mail/qmail/patches/patch-ak | 103 +++++++++++++++++++++++++++++++++++++++++
mail/qmail/patches/patch-al | 27 ++++++++++
mail/qmail/patches/patch-am | 17 ++++++
mail/qmail/patches/patch-an | 63 +++++++++++++++++++++++++
mail/qmail/patches/patch-ao | 22 ++++++++
mail/qmail/patches/patch-ap | 51 ++++++++++++++++++++
mail/qmail/patches/patch-aq | 12 ++++
22 files changed, 500 insertions(+), 41 deletions(-)
diffs (truncated from 719 to 300 lines):
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/Makefile
--- a/mail/qmail/Makefile Sat Apr 10 04:13:27 2004 +0000
+++ b/mail/qmail/Makefile Sat Apr 10 05:30:06 2004 +0000
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.20 2004/03/29 05:10:04 snj Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/10 05:30:06 schmonz Exp $
#
DISTNAME= qmail-1.03
-PKGREVISION= 4
+PKGREVISION= 5
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.rifkin.technion.ac.il/pub/qmail/ \
- ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \
- ftp://ftp.id.wustl.edu/pub/qmail/
+ ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/
MAINTAINER= zuntum%NetBSD.org@localhost
HOMEPAGE= http://www.qmail.org/
-COMMENT= SECURE, reliable, efficient, simple, and FAST MTA for UNIX systems
+COMMENT= Secure, reliable, efficient, simple, and fast MTA for UNIX systems
DEPENDS+= qmail-users>=1.0:../../mail/qmail-users
+DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp
ALL_TARGET= it man
INSTALL_TARGET= setup check
@@ -30,8 +29,11 @@
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
OWN_DIRS+= ${QMAILDIR}
+EVAL_PREFIX+= LOCALBASE_UCSPI_TCP=ucspi-tcp
+
FILES_SUBST+= QMAILDIR=${QMAILDIR}
-RCD_SCRIPTS= qmail
+FILES_SUBST+= LOCALBASE_UCSPI_TCP=${LOCALBASE_UCSPI_TCP}
+RCD_SCRIPTS= qmail qmailsmtpd
RCD_SCRIPTS_EXAMPLEDIR= ${QMAILDIR}/etc/rc.d
.include "../../mk/bsd.prefs.mk"
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/PLIST
--- a/mail/qmail/PLIST Sat Apr 10 04:13:27 2004 +0000
+++ b/mail/qmail/PLIST Sat Apr 10 05:30:06 2004 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/28 01:56:14 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/10 05:30:06 schmonz Exp $
${QMAILDIR}/etc/mailer.conf.qmail
${QMAILDIR}/etc/rc.d/qmail
+${QMAILDIR}/etc/rc.d/qmailsmtpd
${QMAILDIR}/bin/bouncesaying
${QMAILDIR}/bin/condredirect
${QMAILDIR}/bin/datemail
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/distinfo
--- a/mail/qmail/distinfo Sat Apr 10 04:13:27 2004 +0000
+++ b/mail/qmail/distinfo Sat Apr 10 05:30:06 2004 +0000
@@ -1,7 +1,21 @@
-$NetBSD: distinfo,v 1.3 2002/05/03 10:39:01 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2004/04/10 05:30:06 schmonz Exp $
SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
Size (qmail-1.03.tar.gz) = 220668 bytes
-SHA1 (patch-aa) = 9a54276636d5000fb8ae217344158301b91bde1d
-SHA1 (patch-ab) = a37492ce29e86cab7aaf0dc3446ab5db95edcd86
-SHA1 (patch-ac) = 2f1ef6b0490d9792fc8d7d50af5f620b09f58ecf
+SHA1 (patch-aa) = d876fb59c6e1e93d0332696c1ebf06e04a8fafb2
+SHA1 (patch-ab) = 47f788fd28feca2442bbb9094d99633a1578e447
+SHA1 (patch-ac) = e05c2c1c4066a2fd1b6c3763c6fe73d541994014
+SHA1 (patch-ad) = eacd740cf85abbb385b241cf4f33f7b80a03ce4b
+SHA1 (patch-ae) = 56311eb87ee8325ba347c6cdbfd8b5484c7142e0
+SHA1 (patch-af) = 582ce985dde5df7eb507e2abe90c62b6d73485e2
+SHA1 (patch-ag) = bfd2ae4613add0ab9b4c2672466600abf9de38ae
+SHA1 (patch-ah) = 48d9c4f5a47372dd13c380edf50ceeb209d61ea3
+SHA1 (patch-ai) = 67ac4722837e5dd6136d4fbe900ef80eda74ea95
+SHA1 (patch-aj) = a1691a04a90f3969ac8853e7d04833603195880e
+SHA1 (patch-ak) = d1e88006f04874df6c1896b08bbdfb4e5d67f654
+SHA1 (patch-al) = 20a8bb4d44477522135762219c4aaeebddfd6085
+SHA1 (patch-am) = fd1d09686dcdbb58b7a45c114aa56d0b1360035b
+SHA1 (patch-an) = de2bb294c742ee4b512634f37553bdb79ea7ffb1
+SHA1 (patch-ao) = 63176ba524913c6e693de7460d25016a10a438f8
+SHA1 (patch-ap) = de2d4d409c5e588e1cf9c6ca2cd966eeef022a55
+SHA1 (patch-aq) = 2e5f0a4870b13ff60f79edf5dc58eff783fd5bea
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/files/qmail.sh
--- a/mail/qmail/files/qmail.sh Sat Apr 10 04:13:27 2004 +0000
+++ b/mail/qmail/files/qmail.sh Sat Apr 10 05:30:06 2004 +0000
@@ -1,24 +1,29 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: qmail.sh,v 1.2 2002/09/20 02:01:57 grant Exp $
+# $NetBSD: qmail.sh,v 1.3 2004/04/10 05:30:06 schmonz Exp $
#
-# PROVIDE: mail
+# PROVIDE: mail qmail
# REQUIRE: LOGIN
. /etc/rc.subr
name="qmail"
rcvar=${name}
-required_files="@QMAILDIR@/rc @QMAILDIR@/control/me"
+required_files="@QMAILDIR@/control/me"
command="@QMAILDIR@/bin/qmail-send"
start_precmd="qmail_precmd"
extra_commands="reload"
+if [ -z "$qmail_flags" ]; then
+ qmail_flags="./Mailbox"
+fi
+
qmail_precmd()
{
- command="@QMAILDIR@/rc"
+ command="@SETENV@ - PATH=@QMAILDIR@/bin:$PATH qmail-start '$qmail_flags' splogger qmail"
command_args="&"
+ rc_flags=""
}
load_rc_config $name
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/files/qmailsmtpd.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail/files/qmailsmtpd.sh Sat Apr 10 05:30:06 2004 +0000
@@ -0,0 +1,29 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: qmailsmtpd.sh,v 1.1 2004/04/10 05:30:06 schmonz Exp $
+#
+
+# PROVIDE: mail
+# REQUIRE: qmail
+
+. /etc/rc.subr
+
+name="qmailsmtpd"
+rcvar=${name}
+command="@LOCALBASE_UCSPI_TCP@/bin/tcpserver"
+procname=${name}
+start_precmd="qmailsmtpd_precmd"
+
+if [ -z "$qmailsmtpd_flags" ]; then
+ qmailsmtpd_flags="-v -H -R -l 0"
+fi
+
+qmailsmtpd_precmd()
+{
+ command="@SETENV@ - @LOCALBASE_UCSPI_TCP@/bin/argv0 @LOCALBASE_UCSPI_TCP@/bin/tcpserver $name $qmailsmtpd_flags -u `@ID@ -u qmaild` -g `@ID@ -g qmaild` 0 smtp @QMAILDIR@/bin/qmail-smtpd 2>&1
| @QMAILDIR@/bin/splogger smtpd 3"
+ command_args="&"
+ rc_flags=""
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/patches/patch-aa
--- a/mail/qmail/patches/patch-aa Sat Apr 10 04:13:27 2004 +0000
+++ b/mail/qmail/patches/patch-aa Sat Apr 10 05:30:06 2004 +0000
@@ -1,10 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2002/05/03 10:39:01 zuntum Exp $
-
-First part of QMAILQUEUE patch, as found on http://www.qmail.org/
+$NetBSD: patch-aa,v 1.2 2004/04/10 05:30:06 schmonz Exp $
---- Makefile.orig Mon Jun 15 04:53:16 1998
-+++ Makefile Tue Jan 19 10:52:24 1999
-@@ -1483,12 +1483,12 @@
+--- Makefile.orig 1998-06-15 06:53:16.000000000 -0400
++++ Makefile
+@@ -263,7 +263,7 @@ makelib cdbmake_pack.o cdbmake_hash.o cd
+ cdbmake_add.o
+
+ cdbmake_add.o: \
+-compile cdbmake_add.c cdbmake.h uint32.h
++compile cdbmake_add.c cdbmake.h alloc.h uint32.h
+ ./compile cdbmake_add.c
+
+ cdbmake_hash.o: \
+@@ -1483,12 +1483,12 @@ load qmail-send.o qsutil.o control.o con
trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o date822fmt.o \
datetime.a case.a ndelay.a getln.a wait.a seek.a fd.a sig.a open.a \
lock.a stralloc.a alloc.a substdio.a error.a str.a fs.a auto_qmail.o \
@@ -19,3 +26,12 @@
qmail-send.0: \
qmail-send.8
+@@ -1892,7 +1892,7 @@ trylsock.c compile load
+
+ spawn.o: \
+ compile chkspawn spawn.c sig.h wait.h substdio.h byte.h str.h \
+-stralloc.h gen_alloc.h select.h exit.h coe.h open.h error.h \
++stralloc.h gen_alloc.h select.h exit.h alloc.h coe.h open.h error.h \
+ auto_qmail.h auto_uids.h auto_spawn.h
+ ./chkspawn
+ ./compile spawn.c
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/patches/patch-ab
--- a/mail/qmail/patches/patch-ab Sat Apr 10 04:13:27 2004 +0000
+++ b/mail/qmail/patches/patch-ab Sat Apr 10 05:30:06 2004 +0000
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2002/05/03 10:39:01 zuntum Exp $
-
-Second part of QMAILQUEUE patch, as found on http://www.qmail.org/
+$NetBSD: patch-ab,v 1.2 2004/04/10 05:30:06 schmonz Exp $
---- qmail.c.orig Mon Jun 15 04:53:16 1998
-+++ qmail.c Tue Jan 19 09:57:36 1999
-@@ -6,14 +6,25 @@
+--- qmail.c.orig 1998-06-15 06:53:16.000000000 -0400
++++ qmail.c
+@@ -6,8 +6,17 @@
#include "fd.h"
#include "qmail.h"
#include "auto_qmail.h"
@@ -23,12 +21,12 @@
int qmail_open(qq)
struct qmail *qq;
- {
+@@ -15,6 +24,8 @@ struct qmail *qq;
int pim[2];
int pie[2];
-+
+
+ setup_qqargs();
-
++
if (pipe(pim) == -1) return -1;
if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
-
+
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/patches/patch-ac
--- a/mail/qmail/patches/patch-ac Sat Apr 10 04:13:27 2004 +0000
+++ b/mail/qmail/patches/patch-ac Sat Apr 10 05:30:06 2004 +0000
@@ -1,11 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2002/05/03 10:39:01 zuntum Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/10 05:30:06 schmonz Exp $
-Patch necessary to cope with non-RFC >512 dns entries,
-as found on http://www.ckdhr.com/ckd/qmail-103.patch
-
---- dns.c.orig Mon Aug 17 16:06:58 1998
-+++ dns.c Wed Aug 26 16:28:56 1998
-@@ -21,10 +21,12 @@
+--- dns.c.orig 1998-06-15 06:53:16.000000000 -0400
++++ dns.c
+@@ -7,8 +7,6 @@
+ #include <errno.h>
+ extern int res_query();
+ extern int res_search();
+-extern int errno;
+-extern int h_errno;
+ #include "ip.h"
+ #include "ipalloc.h"
+ #include "fmt.h"
+@@ -21,10 +19,12 @@ extern int h_errno;
static unsigned short getshort(c) unsigned char *c;
{ unsigned short u; u = c[0]; return (u << 8) + c[1]; }
@@ -19,7 +25,7 @@
static int numanswers;
static char name[MAXDNAME];
-@@ -45,18 +47,33 @@
+@@ -45,18 +45,33 @@ int type;
errno = 0;
if (!stralloc_copy(&glue,domain)) return DNS_MEM;
if (!stralloc_0(&glue)) return DNS_MEM;
@@ -57,7 +63,7 @@
while (n-- > 0)
{
i = dn_expand(response.buf,responseend,responsepos,name,MAXDNAME);
-@@ -66,7 +83,7 @@
+@@ -66,7 +81,7 @@ int type;
if (i < QFIXEDSZ) return DNS_SOFT;
responsepos += QFIXEDSZ;
}
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail/patches/patch-ad Sat Apr 10 05:30:06 2004 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-ad,v 1.1 2004/04/10 05:30:06 schmonz Exp $
+
+--- cdb_seek.c.orig 1998-06-15 06:53:16.000000000 -0400
++++ cdb_seek.c
+@@ -1,6 +1,5 @@
+ #include <sys/types.h>
+ #include <errno.h>
+-extern int errno;
+ #include "cdb.h"
+
+ #ifndef SEEK_SET
diff -r 2525fc780f03 -r 6e729b3d4bdf mail/qmail/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail/patches/patch-ae Sat Apr 10 05:30:06 2004 +0000
@@ -0,0 +1,9 @@
+$NetBSD: patch-ae,v 1.1 2004/04/10 05:30:06 schmonz Exp $
+
+--- cdbmake_add.c.orig 1998-06-15 06:53:16.000000000 -0400
++++ cdbmake_add.c
+@@ -1,3 +1,4 @@
++#include "alloc.h"
Home |
Main Index |
Thread Index |
Old Index