Debianization and various other fixes.

  * Fix error.h to use errno.h rather than its own declaration.

  * Filter Disposition-Notification-To headers from incoming messages.

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..562db30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,252 @@
+alloc.0
+alloc.a
+alloc.o
+alloc_re.o
+author.o
+auto-ccld.sh
+auto-str
+auto-str.o
+auto_bin.c
+auto_bin.o
+auto_cron.c
+auto_cron.o
+auto_qmail.c
+auto_qmail.o
+byte_chr.o
+byte_copy.o
+byte_cr.o
+byte_diff.o
+byte_rchr.o
+byte_zero.o
+case.0
+case.a
+case_diffb.o
+case_diffs.o
+case_lowerb.o
+case_startb.o
+case_starts.o
+checktag.o
+compile
+concatHDR.o
+constmap.o
+cookie.o
+copy.o
+date2yyyymm.o
+date822fmt.o
+dateline.o
+datetime.0
+datetime.o
+decodeB.o
+decodeHDR.o
+decodeQ.o
+direntry.0
+direntry.h
+encodeB.o
+encodeQ.o
+env.0
+env.a
+env.o
+envread.o
+error.0
+error.a
+error.o
+error_str.0
+error_str.o
+error_temp.0
+ezmlm-accept
+ezmlm-accept.0
+ezmlm-archive
+ezmlm-archive.0
+ezmlm-archive.o
+ezmlm-cgi
+ezmlm-cgi.0
+ezmlm-cgi.o
+ezmlm-check
+ezmlm-check.0
+ezmlm-clean
+ezmlm-clean.0
+ezmlm-clean.o
+ezmlm-cron
+ezmlm-cron.0
+ezmlm-cron.o
+ezmlm-gate
+ezmlm-gate.0
+ezmlm-gate.o
+ezmlm-get
+ezmlm-get.0
+ezmlm-get.o
+ezmlm-glconf
+ezmlm-glconf.0
+ezmlm-idx
+ezmlm-idx.0
+ezmlm-idx.o
+ezmlm-issubn
+ezmlm-issubn.0
+ezmlm-issubn.o
+ezmlm-limit
+ezmlm-limit.0
+ezmlm-limit.o
+ezmlm-list
+ezmlm-list.0
+ezmlm-list.o
+ezmlm-make
+ezmlm-make.0
+ezmlm-make.o
+ezmlm-manage
+ezmlm-manage.0
+ezmlm-manage.o
+ezmlm-mktab.0
+ezmlm-moderate
+ezmlm-moderate.0
+ezmlm-moderate.o
+ezmlm-reject
+ezmlm-reject.0
+ezmlm-reject.o
+ezmlm-request
+ezmlm-request.0
+ezmlm-request.o
+ezmlm-return
+ezmlm-return.0
+ezmlm-return.o
+ezmlm-send
+ezmlm-send.0
+ezmlm-send.o
+ezmlm-split
+ezmlm-split.0
+ezmlm-split.o
+ezmlm-store
+ezmlm-store.0
+ezmlm-store.o
+ezmlm-sub
+ezmlm-sub.0
+ezmlm-sub.o
+ezmlm-test
+ezmlm-test.0
+ezmlm-tstdig
+ezmlm-tstdig.0
+ezmlm-tstdig.o
+ezmlm-unsub
+ezmlm-unsub.0
+ezmlm-unsub.o
+ezmlm-warn
+ezmlm-warn.0
+ezmlm-warn.o
+ezmlm-weed
+ezmlm-weed.0
+ezmlm-weed.o
+ezmlm.0
+ezmlmglrc.0
+ezmlmrc
+ezmlmrc.0
+ezmlmsubrc.0
+fd.a
+fd_copy.0
+fd_copy.o
+fd_move.0
+fd_move.o
+find-systype
+fmt_str.o
+fmt_uint.o
+fmt_uint0.o
+fmt_ulong.o
+fork.h
+fs.a
+getconf.o
+getln.0
+getln.a
+getln.o
+getln2.0
+getln2.o
+getopt.0
+getopt.a
+hasflock.h
+hassgact.h
+idxthread.o
+install
+install.o
+issub.o
+load
+lock.a
+lock_ex.o
+log.o
+logmsg.o
+make-compile
+make-load
+make-makelib
+makehash.o
+makelib
+mime.a
+now.0
+now.o
+open.a
+open_append.o
+open_read.o
+open_trunc.o
+opensql.o
+putsubs.o
+qmail.o
+quote.o
+scan_8long.o
+scan_ulong.o
+searchlog.o
+seek.a
+seek_set.o
+sgetopt.0
+sgetopt.o
+sig.a
+sig_catch.o
+sig_pipe.o
+slurp.o
+slurpclose.o
+str.a
+str_chr.o
+str_cpy.o
+str_diff.o
+str_diffn.o
+str_len.o
+str_rchr.o
+str_start.o
+stralloc.0
+stralloc.a
+stralloc_arts.o
+stralloc_cat.o
+stralloc_catb.o
+stralloc_cats.o
+stralloc_copy.o
+stralloc_eady.o
+stralloc_opyb.o
+stralloc_opys.o
+stralloc_pend.o
+strerr.a
+strerr.o
+strerr_die.o
+strerr_sys.o
+subdb.a
+subfd.0
+subfderr.o
+subgetopt.0
+subgetopt.o
+subscribe.o
+substdi.o
+substdio.0
+substdio.a
+substdio.o
+substdio_copy.0
+substdio_copy.o
+substdio_in.0
+substdio_out.0
+substdo.o
+surf.0
+surf.a
+surf.o
+surfpcs.0
+surfpcs.o
+systype
+tagmsg.o
+uint32.h
+unfoldHDR.o
+wait.0
+wait.a
+wait_pid.o
+yyyymm.a
+build

diff --git a/TARGETS b/TARGETS
index 6ae165323641b9bbfe96a86a0feaa1998e5134b6..8c10dcf5e955948068f1c0c2140e6ff1af353479 100644 (file)
--- a/TARGETS
+++ b/TARGETS
@@ -1,3 +1,4 @@
+alloc.0
 alloc.a
 alloc.o
 alloc_re.o
@@ -17,6 +18,7 @@ byte_cr.o
 byte_diff.o
 byte_rchr.o
 byte_zero.o
+case.0
 case.a
 case_diffb.o
 case_diffs.o
@@ -32,74 +34,115 @@ copy.o
 date2yyyymm.o
 date822fmt.o
 dateline.o
+datetime.0
 datetime.o
 decodeB.o
 decodeHDR.o
 decodeQ.o
+direntry.0
 direntry.h
 encodeB.o
 encodeQ.o
+env.0
 env.a
 env.o
 envread.o
+error.0
 error.a
 error.o
+error_str.0
 error_str.o
+error_temp.0
 ezmlm-accept
+ezmlm-accept.0
 ezmlm-archive
+ezmlm-archive.0
 ezmlm-archive.o
 ezmlm-cgi
+ezmlm-cgi.0
 ezmlm-cgi.o
 ezmlm-check
+ezmlm-check.0
 ezmlm-clean
+ezmlm-clean.0
 ezmlm-clean.o
 ezmlm-cron
+ezmlm-cron.0
 ezmlm-cron.o
 ezmlm-gate
+ezmlm-gate.0
 ezmlm-gate.o
 ezmlm-get
+ezmlm-get.0
 ezmlm-get.o
 ezmlm-glconf
+ezmlm-glconf.0
 ezmlm-idx
+ezmlm-idx.0
 ezmlm-idx.o
 ezmlm-issubn
+ezmlm-issubn.0
 ezmlm-issubn.o
 ezmlm-limit
+ezmlm-limit.0
 ezmlm-limit.o
 ezmlm-list
+ezmlm-list.0
 ezmlm-list.o
 ezmlm-make
+ezmlm-make.0
 ezmlm-make.o
 ezmlm-manage
+ezmlm-manage.0
 ezmlm-manage.o
+ezmlm-mktab.0
 ezmlm-moderate
+ezmlm-moderate.0
 ezmlm-moderate.o
 ezmlm-reject
+ezmlm-reject.0
 ezmlm-reject.o
 ezmlm-request
+ezmlm-request.0
 ezmlm-request.o
 ezmlm-return
+ezmlm-return.0
 ezmlm-return.o
 ezmlm-send
+ezmlm-send.0
 ezmlm-send.o
 ezmlm-split
+ezmlm-split.0
 ezmlm-split.o
 ezmlm-store
+ezmlm-store.0
 ezmlm-store.o
 ezmlm-sub
+ezmlm-sub.0
 ezmlm-sub.o
 ezmlm-test
+ezmlm-test.0
 ezmlm-tstdig
+ezmlm-tstdig.0
 ezmlm-tstdig.o
 ezmlm-unsub
+ezmlm-unsub.0
 ezmlm-unsub.o
 ezmlm-warn
+ezmlm-warn.0
 ezmlm-warn.o
 ezmlm-weed
+ezmlm-weed.0
 ezmlm-weed.o
+ezmlm.0
+ezmlmglrc.0
 ezmlmrc
+ezmlmrc.0
+ezmlmsubrc.0
 fd.a
+fd_copy.0
 fd_copy.o
+fd_move.0
 fd_move.o
 find-systype
 fmt_str.o
@@ -109,13 +152,18 @@ fmt_ulong.o
 fork.h
 fs.a
 getconf.o
+getln.0
 getln.a
 getln.o
+getln2.0
 getln2.o
+getopt.0
 getopt.a
 hasflock.h
 hassgact.h
 idxthread.o
+install
+install.o
 issub.o
 load
 lock.a
@@ -128,6 +176,7 @@ make-makelib
 makehash.o
 makelib
 mime.a
+now.0
 now.o
 open.a
 open_append.o
@@ -142,6 +191,7 @@ scan_ulong.o
 searchlog.o
 seek.a
 seek_set.o
+sgetopt.0
 sgetopt.o
 sig.a
 sig_catch.o
@@ -156,6 +206,7 @@ str_diffn.o
 str_len.o
 str_rchr.o
 str_start.o
+stralloc.0
 stralloc.a
 stralloc_arts.o
 stralloc_cat.o
@@ -171,21 +222,30 @@ strerr.o
 strerr_die.o
 strerr_sys.o
 subdb.a
+subfd.0
 subfderr.o
+subgetopt.0
 subgetopt.o
 subscribe.o
 substdi.o
+substdio.0
 substdio.a
 substdio.o
+substdio_copy.0
 substdio_copy.o
+substdio_in.0
+substdio_out.0
 substdo.o
+surf.0
 surf.a
 surf.o
+surfpcs.0
 surfpcs.o
 systype
 tagmsg.o
 uint32.h
 unfoldHDR.o
+wait.0
 wait.a
 wait_pid.o
 yyyymm.a

diff --git a/checktag.c b/checktag.c
index fe4e410f35e052a1fbfd1d5c305ffcd874d21248..d923323157205f87b89a4d349585f4c2b306b858 120000 (symlink)
--- a/checktag.c
+++ b/checktag.c
@@ -1 +1 @@
-sub_std/checktag.c
\ No newline at end of file
+sub_pgsql/checktag.c
\ No newline at end of file

diff --git a/conf-bin b/conf-bin
index 813dc946c8ae1f1f45e954dc30b1f69b4bf6c1f0..350f0167ff715e690d9647533f99244e62773eb2 100644 (file)
--- a/conf-bin
+++ b/conf-bin
@@ -1,3 +1,3 @@
-/usr/local/bin/ezmlm
+/usr/bin
 
 Programs will be installed in this directory.

diff --git a/conf-cc b/conf-cc
index e58fb9bbab13783353b0be906ec38e31b3404c52..1a2ccb566ad8708918a3527c9a5cdaa91d0347eb 100644 (file)
--- a/conf-cc
+++ b/conf-cc
@@ -1,3 +1,3 @@
-cc -O2
+gcc -O2 -g
 
 This will be used to compile .c files.

diff --git a/conf-ld b/conf-ld
index a9e796a591d78084a9a102889a2e8f4ba7f9b776..1d0518a9614bb9b04d5dbdeaa583578ba4882b5b 100644 (file)
--- a/conf-ld
+++ b/conf-ld
@@ -1,3 +1,3 @@
-cc -s
+gcc
 
 This will be used to link .o files into an executable.

diff --git a/conf-man b/conf-man
index b4e70a437a51085c12c6098ccd53273106052413..bc32c8d92a40640e91a99669d4c17bec5829357b 100644 (file)
--- a/conf-man
+++ b/conf-man
@@ -1,4 +1,4 @@
-/usr/local/man
+/usr/share/man
 
 Man pages will be installed in subdirectories of this directory. An
 unformatted man page foo.1 will go into .../man1/foo.1; a formatted man

diff --git a/conf-sqlcc b/conf-sqlcc
index 6d13424d1b31730064a886ff6d56102c1f6da450..1a22eace64eef51e13827d1858f35db4dceb59c3 120000 (symlink)
--- a/conf-sqlcc
+++ b/conf-sqlcc
@@ -1 +1 @@
-sub_std/conf-sqlcc
\ No newline at end of file
+sub_pgsql/conf-sqlcc
\ No newline at end of file

diff --git a/conf-sqlld b/conf-sqlld
index 7432a47da9db6fb1b9f7ee473ee1540792b92031..88f4b33f23571d45b4e66ebcf23cb7a4e1ebee2b 120000 (symlink)
--- a/conf-sqlld
+++ b/conf-sqlld
@@ -1 +1 @@
-sub_std/conf-sqlld
\ No newline at end of file
+sub_pgsql/conf-sqlld
\ No newline at end of file

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644 (file)
index 0000000..8a7376e
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,5 @@
+build
+ezmlm-cgi
+ezmlm-idx
+files
+*.substvars

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..ff7e964
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+ezmlm-idx (0.40-1) experimental; urgency=low
+
+  * Debianization!
+  
+ -- Mark Wooding <mdw@nsict.org>  Sat, 22 Nov 2003 15:25:16 +0000

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..e89bd41
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,48 @@
+Source: ezmlm-idx
+Section: mail
+Priority: extra
+Standards-Version: 3.1.1
+Maintainer: Mark Wooding <mdw@distorted.org.uk>
+
+Package: ezmlm-idx
+Architecture: any
+Depends: qmail (>= 1.03), ${shlibs:Depends}
+Provides: ezmlm
+Description: An easy-to-use, high-speed mailing list manager for qmail.
+ ezmlm lets users set up their own mailing lists within qmail's address
+ hierarchy. A user, Joe, types
+ .
+    ezmlm-make ~/SOS ~/.qmail-sos joe-sos isp.net
+ . 
+ and instantly has a functioning mailing list, joe-sos@isp.net, with all
+ relevant information stored in a new ~/SOS directory.
+ .
+ ezmlm sets up joe-sos-subscribe and joe-sos-unsubscribe for automatic
+ processing of subscription and unsubscription requests. Any message to
+ joe-sos-subscribe will work; Joe doesn't have to explain any tricky
+ command formats. ezmlm will send back instructions if a subscriber sends
+ a message to joe-sos-request or joe-sos-help.
+ .
+ ezmlm automatically archives new messages. Messages are labelled with
+ sequence numbers; a subscriber can fetch message 123 by sending mail to
+ joe-sos-get.123. The archive format supports fast message retrieval even
+ when there are thousands of messages.
+ .
+ ezmlm takes advantage of qmail's VERPs to reliably determine the
+ recipient address and message number for every incoming bounce message.
+ It waits ten days and then sends the subscriber a list of message
+ numbers that bounced. If that warning bounces, ezmlm sends a probe; if
+ the probe bounces, ezmlm automatically removes the subscriber from the
+ mailing list.
+
+Package: ezmlm-cgi
+Architecture: any
+Depends: qmail (>= 1.03), httpd,
+ ezmlm-idx (>= ${Source-Version}), ${shlibs:Depends}
+Description: An easy-to-use, high-speed mailing list manager for qmail.
+ This is a CGI program which lets users browse ezmlm mailing list
+ archives.
+ .
+ The documentation recommends installing this program setuid-root; this
+ package does NOT do this.  Instead, make your list archives readable
+ by the web server user.

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..2cdeb62
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,3 @@
+ezmlm is copyright (C) 1997 Dan Bernstein.  The licence is unclear.
+ezmlm-idx is copyright (c) 1997, 1998, 1999 Fred Lindberg and Fred B. Ringel,
+and released under the GNU General Public License.

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..6394f6b
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,60 @@
+#! /usr/bin/make -f
+
+export DH_COMPAT = 4
+
+mdw-setup:
+       upstream=`git-describe idx | sed 's:^idx/::'`; \
+       dir=ezmlm-idx_$$upstream.orig; \
+       git-tar-tree idx $$dir | gzip -9c >../$$dir.tar.gz
+
+clean:
+       make clean std
+       dh_clean
+       rm -f build
+
+build:
+       make pgsql
+       make it install man
+       touch build
+
+install: build
+       dh_clean
+       mkdir -p debian/ezmlm-idx/usr/bin debian/ezmlm-idx/usr/share/man
+       ./install debian/ezmlm-idx/usr/bin <BIN
+       ./install debian/ezmlm-idx/usr/share/man <MAN
+       rm -rf debian/ezmlm-idx/usr/share/man/cat*
+       mkdir -p debian/ezmlm-idx/usr/share/ezmlm
+       find debian/ezmlm-idx/usr/bin ! -perm +111 -print0 | \
+               xargs -0ri mv {} debian/ezmlm-idx/usr/share/ezmlm
+       mkdir -p debian/ezmlm-cgi/usr/lib/cgi-bin
+       mkdir -p debian/ezmlm-cgi/usr/share/man/man1
+       cp ezmlm-cgi debian/ezmlm-cgi/usr/lib/cgi-bin
+       cp ezmlm-cgi.1 debian/ezmlm-cgi/usr/share/man/man1
+
+binary-indep:
+
+binary-arch: install
+       dh_testdir -a
+       dh_testroot -a
+       dh_installman -a
+       dh_compress -a
+       dh_installdocs -a
+       dh_makeshlibs -a
+       dh_fixperms -a
+       dh_strip -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_installdeb -a
+       dh_md5sums -a
+       dh_builddeb -a
+
+binary: binary-arch binary-indep
+
+source: clean mdw-setup
+       dir=`pwd | sed 's:^.*/::'`; \
+        upstream=`git-describe idx | sed 's:^idx/::'`; \
+        tarball=ezmlm-idx_$$upstream.orig.tar.gz; \
+       cd ..; \
+       dpkg-source -b -i'(?:^|/)\.git(?:$$|/)' $$dir $$tarball
+
+.PHONY: clean binary-indep binary-arch binary source mdw-setup

diff --git a/error.h b/error.h
index 42fdc81e68be72f348cb400fe75f48e2d6e67d24..bd9da3fa39278ddb328175f009d0c4c69057ac65 100644 (file)
--- a/error.h
+++ b/error.h
@@ -1,7 +1,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-extern int errno;
+#include <errno.h>
 
 extern int error_intr;
 extern int error_nomem;

diff --git a/ezmlm-archive.1 b/ezmlm-archive.1
index ca764f80fbefc37d189a188f35988da0f4cdb83d..ea72623e1af5ba32f15555f13f184d486c73c68d 100644 (file)
--- a/ezmlm-archive.1
+++ b/ezmlm-archive.1
@@ -32,7 +32,7 @@ The output files created are:
 The thread index. It contains one line per subject, starting with the
 number of the first message with that subject within the set
 investigated, ``:'', a 20 character
-subject hash, blank, ``\[n\]'' where ``n'' is the number of messages in the
+subject hash, blank, ``[n]'' where ``n'' is the number of messages in the
 thread, blank, and the subject.
 The file ``yyyymm'' contains
 entries for all threads that have messages in the month ``yyyymm''

diff --git a/ezmlm-check.sh b/ezmlm-check.sh
index b844d1b3e5da1977ff7575dbf7855bd3100e6320..abece4ba43668fd079d58a6d80b65dd81813641b 100644 (file)
--- a/ezmlm-check.sh
+++ b/ezmlm-check.sh
@@ -14,7 +14,7 @@ else
     fi
 fi
 
-QINJECT="${QMPATH}/bin/qmail-inject"
+QINJECT="/usr/sbin/qmail-inject"
 EZLIST="${EZPATH}/ezmlm-list"
 MYNAME='ezmlm-check'
 MYDTLINE="Delivered-To: ${MYNAME}"

diff --git a/ezmlm-cron.c b/ezmlm-cron.c
index e35f7ea447ee01649e6c4dcf4b6c2f9eac2ce929..e3857bff7945de147d4c04ac7f8bdf5c72a14694 100644 (file)
--- a/ezmlm-cron.c
+++ b/ezmlm-cron.c
@@ -34,7 +34,7 @@ unsigned long deltah = 24L;   /* default interval 24h */
 unsigned long hh = 4L;         /* default time 04:12 */
 unsigned long mm = 12L;
 char *dow = "*";               /* day of week */
-char *qmail_inject = "/bin/qmail-inject ";
+char *qmail_inject = "/usr/sbin/qmail-inject ";
 char strnum[FMT_ULONG];
 unsigned long uid,euid;
 
@@ -343,7 +343,6 @@ char **argv;
     if (!stralloc_cats(&addr,dow)) die_nomem();
     if (!stralloc_cats(&addr," ")) die_nomem();
     part0start = addr.len;             /* /var/qmail/bin/qmail-inject */
-    if (!stralloc_cats(&addr,auto_qmail)) die_nomem();
     if (!stralloc_cats(&addr,qmail_inject)) die_nomem();
     part0len = addr.len - part0start;
     if (!stralloc_cats(&addr,local)) die_nomem();
@@ -403,8 +402,6 @@ char **argv;
       if (line.s[pos] == '#')
         continue;                      /* cron comment */
       pos = str_chr(line.s,'/');
-      if (!str_start(line.s+pos,auto_qmail)) continue;
-      pos += str_len(auto_qmail);
       if (!str_start(line.s+pos,qmail_inject)) continue;
       pos += str_len(qmail_inject);
       poslocal = pos;

diff --git a/ezmlm-make.c b/ezmlm-make.c
index 11fc6f48d7e848f8962812d499da23d2383addfd..6676a61e42bfbe51f87696f7148c7198cf1b2913 100644 (file)
--- a/ezmlm-make.c
+++ b/ezmlm-make.c
@@ -423,7 +423,7 @@ char **argv;
       if (errno != error_noent)
         strerr_die4sys(111,FATAL,ERR_OPEN,template.s,": ");
       else {                   /* ezbin/ezmlmrc */
-       if (!stralloc_copys(&template,auto_bin)) die_nomem();
+       if (!stralloc_copys(&template,"/usr/share/ezmlm")) die_nomem();
        if (!stralloc_cats(&template,TXT_EZMLMRC)) die_nomem();
        if (!stralloc_0(&template)) die_nomem();
        if ((fdin = open_read(template.s)) == -1)

diff --git a/ezmlm-mktab b/ezmlm-mktab
index feb8cc639e05a773c3f7cbf73e934e39641b7dcb..bdc46079a2187f6dd71310145dd6b4ba808e38aa 120000 (symlink)
--- a/ezmlm-mktab
+++ b/ezmlm-mktab
@@ -1 +1 @@
-sub_std/ezmlm-mktab
\ No newline at end of file
+sub_pgsql/ezmlm-mktab
\ No newline at end of file

diff --git a/ezmlm-test.sh b/ezmlm-test.sh
index a1d03b85572146d8c9a08b3447ed52dc58ac6b36..0653795366bd4701485939b2b685d14696099dee 100644 (file)
--- a/ezmlm-test.sh
+++ b/ezmlm-test.sh
@@ -218,11 +218,11 @@ if [ ! -x "${EZBIN}/ezmlm-make" ]; then
        exit 99
 fi
 
-if [ ! -x "${QMPATH}/bin/qmail-local" ]; then
+if [ ! -x "/usr/sbin/qmail-local" ]; then
        ${ECHO} "can't find qmail-local. Please correct the path in the script"
        exit 99
 fi
-if [ ! -x "${QMPATH}/bin/qmail-inject" ]; then
+if [ ! -x "/usr/sbin/qmail-inject" ]; then
        ${ECHO} "can't find qmail-inject. Please correct the path in the script"
        exit 99
 fi
@@ -284,7 +284,7 @@ send_test()
   {
        ${ECHO} "X-num: #TSTMSG$1#"
        ${ECHO} "To: ${SND}@$HOST"
-  } | ${QMPATH}/bin/qmail-inject
+  } | /usr/sbin/qmail-inject
   return 0
 }
 
@@ -517,7 +517,7 @@ fi
 if [ "$SECT" != "9" ]; then
 
 ${ECHO} "Subject: zzz-test" > "${DIR}/__tmp"
-${QMPATH}/bin/qmail-local "$EZTEST" "$HOME" "$SND-zzz" "$DASH" \
+/usr/sbin/qmail-local "$EZTEST" "$HOME" "$SND-zzz" "$DASH" \
                "$LIST-$SINK-zzz" "$HOST" \
                "<>" '' < "${DIR}/__tmp" >"${ERR}" 2>&1 || \
        { ${ECHO} "-failed to deliver message with qmail-local"; exit 100; }

diff --git a/ezmlmrc.ch_GB b/ezmlmrc.ch_GB
index 61afeb379590fa86c4f2d1cc04719ef53affe3e1..a2d1c713dc9f6f3771f93cfce19488c12f3a8863 100644 (file)
--- a/ezmlmrc.ch_GB
+++ b/ezmlmrc.ch_GB
@@ -254,6 +254,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 # Only one allowed

diff --git a/ezmlmrc.cs b/ezmlmrc.cs
index 7620bec1e2daaf0d2caa012bc6e11aaaf0043948..d2b3f98082e4adad81893780e90404deded629ad 100644 (file)
--- a/ezmlmrc.cs
+++ b/ezmlmrc.cs
@@ -256,6 +256,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 # Only one allowed

diff --git a/ezmlmrc.da b/ezmlmrc.da
index 8733272b7f505f9d69f6b845d035f5870b54f2ad..84645dab3319b63d1cd45a0e70af179cd358cf9b 100644 (file)
--- a/ezmlmrc.da
+++ b/ezmlmrc.da
@@ -258,6 +258,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 # Only one allowed

diff --git a/ezmlmrc.de b/ezmlmrc.de
index cd8f44fb63b63c69d5c83070429f5acb87b21397..ff51b37c8464e947a1c417016b079774c1e2650e 100644 (file)
--- a/ezmlmrc.de
+++ b/ezmlmrc.de
@@ -316,6 +316,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/ezmlmrc.en_US b/ezmlmrc.en_US
index bf51c120b4756e38e4036b22c942a8969efa3f38..24294cedecdf822f68a043da9532f584a968a188 100644 (file)
--- a/ezmlmrc.en_US
+++ b/ezmlmrc.en_US
@@ -284,6 +284,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/ezmlmrc.es b/ezmlmrc.es
index 5b5cf00ef522174149a6314bece9f5a2e180f28f..ab24e1a7f788f567dc18c9030b13396094aa77f4 100644 (file)
--- a/ezmlmrc.es
+++ b/ezmlmrc.es
@@ -284,6 +284,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/ezmlmrc.fr b/ezmlmrc.fr
index dd04a17b3cadb68c800271666085bd52b2701221..46e7a65cd05bf24dd58795bc0b8b6417edc56e2c 100644 (file)
--- a/ezmlmrc.fr
+++ b/ezmlmrc.fr
@@ -298,6 +298,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/ezmlmrc.id b/ezmlmrc.id
index 506918fddc7b767575e6d48004bb3ff0b0513765..3e7c4d5706ebc23c95011be4934e70e255405cc3 100644 (file)
--- a/ezmlmrc.id
+++ b/ezmlmrc.id
@@ -286,6 +286,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/ezmlmrc.it b/ezmlmrc.it
index 3db0eec1ea0d2a50444ec4cebedef08a58ff6486..9fd1922853d733d63c93ce16af10f522bf760b54 100644 (file)
--- a/ezmlmrc.it
+++ b/ezmlmrc.it
@@ -286,6 +286,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/ezmlmrc.jp b/ezmlmrc.jp
index a2753923db3dd1c357485ae5a49139aef39ea085..c85f5baa79fc414f4ccadd2a01efed80fc9c180f 100644 (file)
--- a/ezmlmrc.jp
+++ b/ezmlmrc.jp
@@ -284,6 +284,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/ezmlmrc.pl b/ezmlmrc.pl
index 58df48a284da12412ec0d2aa4648716481087e24..392fd95dad935fb3563b14152e726251cf91ad48 100644 (file)
--- a/ezmlmrc.pl
+++ b/ezmlmrc.pl
@@ -262,6 +262,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 # Only one allowed

diff --git a/ezmlmrc.pt b/ezmlmrc.pt
index a8532a5a3ded3b2d04ead269c7beec0754b3b086..5e3fceddc986b4c812fa6f31608f268ea4a9fb69 100644 (file)
--- a/ezmlmrc.pt
+++ b/ezmlmrc.pt
@@ -257,6 +257,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 # Only one allowed

diff --git a/ezmlmrc.pt_BR b/ezmlmrc.pt_BR
index 81aadbf9507eb632e057a72e4b51ed2b127ea1ee..1978841b246129df65acd86e41f6c6efe746f941 100644 (file)
--- a/ezmlmrc.pt_BR
+++ b/ezmlmrc.pt_BR
@@ -257,6 +257,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 # Only one allowed

diff --git a/ezmlmrc.ru b/ezmlmrc.ru
index 49e6d34ef555e09512ba179dda614b530130ce95..72ff01dd16641b609f4151a65e105b572db5f363 100644 (file)
--- a/ezmlmrc.ru
+++ b/ezmlmrc.ru
@@ -257,6 +257,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 # Only one allowed

diff --git a/ezmlmrc.sv b/ezmlmrc.sv
index 4f6c6b50b0a8df25846ab60632119e0ee519c443..9128e6fba0ca22221d1e0f50f9a69d2f8830ca3c 100644 (file)
--- a/ezmlmrc.sv
+++ b/ezmlmrc.sv
@@ -284,6 +284,7 @@ return-path
 return-receipt-to
 content-length
 precedence
+disposition-notification-to
 x-confirm-reading-to
 x-pmrqc
 list-subscribe

diff --git a/idx.h b/idx.h
index 59f7867329bff286592d69688c158bb2f015f7a2..b57b0f797eef0b3e8e2475d717b35322adb102b2 100644 (file)
--- a/idx.h
+++ b/idx.h
@@ -285,8 +285,8 @@
 /* per line in DIR/qmqpservers will be tried until a working one is found. */
 /* the option is mainly to allow large list clusters on a single host to use */
 /* different QMQPC hosts as exploders.*/
-#define PROG_QMAIL_QUEUE "bin/qmail-queue"
-#define PROG_QMAIL_QMQPC "bin/qmail-qmqpc"
+#define PROG_QMAIL_QUEUE "/usr/sbin/qmail-queue"
+#define PROG_QMAIL_QMQPC "/usr/sbin/qmail-qmqpc"
 
 /*---------- Things below this line are not configurable -----------*/
 /* file in DIR that has the qmqpc servers (if any) */

diff --git a/issub.c b/issub.c
index 8d7ce9e31472e69e1da9ff4ef9c02ca5c230303e..1d4ec7f6f72156222bac99bc280c46d11e4530ca 120000 (symlink)
--- a/issub.c
+++ b/issub.c
@@ -1 +1 @@
-sub_std/issub.c
\ No newline at end of file
+sub_pgsql/issub.c
\ No newline at end of file

diff --git a/logmsg.c b/logmsg.c
index e540bca24a08f922b960c8925dfcc70173ebc4df..c7b7258f9e65a5aa0049248baaeed06b4d1d4ff1 120000 (symlink)
--- a/logmsg.c
+++ b/logmsg.c
@@ -1 +1 @@
-sub_std/logmsg.c
\ No newline at end of file
+sub_pgsql/logmsg.c
\ No newline at end of file

diff --git a/opensql.c b/opensql.c
index 5a27e829fbbb1acc78ec8c66e19bd4dbb4bf30de..7ee4990a8961bb76fddf813941d77ccced065d87 120000 (symlink)
--- a/opensql.c
+++ b/opensql.c
@@ -1 +1 @@
-sub_std/opensql.c
\ No newline at end of file
+sub_pgsql/opensql.c
\ No newline at end of file

diff --git a/putsubs.c b/putsubs.c
index 79ffb49961de989aef56e2086b193eded089e19b..07faef1f47687a5f5a49641e8ba255578fd9d781 120000 (symlink)
--- a/putsubs.c
+++ b/putsubs.c
@@ -1 +1 @@
-sub_std/putsubs.c
\ No newline at end of file
+sub_pgsql/putsubs.c
\ No newline at end of file

diff --git a/qmail.c b/qmail.c
index 1ee257bd002865a32a8efc3f3970246b8e688f9b..5c204c0f6b8fc830c24d77e61daad9c63a5cf928 100644 (file)
--- a/qmail.c
+++ b/qmail.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include "substdio.h"
 #include "readwrite.h"
 #include "wait.h"
@@ -10,7 +11,15 @@
 #include "stralloc.h"
 #include "idx.h"
 
-static char *binqqargs[2] = { PROG_QMAIL_QUEUE, 0 } ;
+static char *binqqargs[2] = { 0, 0 } ;
+
+static void setup_qqargs()
+{
+  if(!binqqargs[0])
+    binqqargs[0] = getenv("QMAILQUEUE");
+  if(!binqqargs[0])
+    binqqargs[0] = "/usr/sbin/qmail-queue";
+}
 
 int qmail_open(qq,sa)
 struct qmail *qq;
@@ -21,6 +30,8 @@ stralloc *sa;
   unsigned i,j;
   char **cpp;
 
+  setup_qqargs();
+
   qq->msgbytes = 0L;
   if (pipe(pim) == -1) return -1;
   if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }

diff --git a/searchlog.c b/searchlog.c
index c6f19527479f0e81be26ad4abddc8c1214575173..acc39b2d435b250a5c5aae55d6e6a8622dca72e1 120000 (symlink)
--- a/searchlog.c
+++ b/searchlog.c
@@ -1 +1 @@
-sub_std/searchlog.c
\ No newline at end of file
+sub_pgsql/searchlog.c
\ No newline at end of file

diff --git a/sub_pgsql/conf-sqlcc b/sub_pgsql/conf-sqlcc
index 886cf2f1ea688f6c6f1cbab6942850cc8d24e6fc..d329262659c4ccaadff143da5f3ff2792327227d 100644 (file)
--- a/sub_pgsql/conf-sqlcc
+++ b/sub_pgsql/conf-sqlcc
@@ -1,4 +1,4 @@
--I/usr/include/pgsql
+-I/usr/include/postgresql
 
 # the top line will be used when compiling. Edit to reflect your PostgreSQL
 # installation. The above is correct for RedHat rpms.

diff --git a/subscribe.c b/subscribe.c
index 1c16baebb9c8c280121683a4258c4b918926504a..34945d793424621c7b5fad083e49b5539668416e 120000 (symlink)
--- a/subscribe.c
+++ b/subscribe.c
@@ -1 +1 @@
-sub_std/subscribe.c
\ No newline at end of file
+sub_pgsql/subscribe.c
\ No newline at end of file

diff --git a/tagmsg.c b/tagmsg.c
index 4f795c96ce387847c5b1719fcebf4cf9558d8e8b..eb94d96d0c430a2c2d69c0ab34c65e5f61596a9e 120000 (symlink)
--- a/tagmsg.c
+++ b/tagmsg.c
@@ -1 +1 @@
-sub_std/tagmsg.c
\ No newline at end of file
+sub_pgsql/tagmsg.c
\ No newline at end of file