From: Tomas Zeman <tzeman@volny.cz>

Date: Tue, 6 Nov 2007 11:43:46 +0100

@@ -0,0 +1,37 @@

+# Maintainer: Tomas Zeman <tzeman@volny.cz>

+# Accepts tai64 format dates (lines starting with @....) + mlmatchup

+# 	see http://www.magma.com.ni/moin/TipsAnd/QmailAnalog

+

+branch=diet

+pkgorig=qmailanalog

+pkgname=$branch-$pkgorig

+pkgver=0.70

+makedepends=(dietlibc)

+url="http://cr.yp.to/qmailanalog.html"

+archs=(i686)

+up2date='lynx -dump -nolist $url|grep $pkgorig|grep tar.gz|head -1|sed -e "s/.*$pkgorig-\(.*\)\.tar.gz.*$/\1/"'

+source=(http://cr.yp.to/software/$pkgorig-$pkgver.tar.gz \

+	qmailanalog-multilog.patch)

+sha1sums=('d9f47b6c5348759aeba3873b6b7653b823b2f92c' \

+          '05b9b7995e3bef33d8c9c2af239d9d23d95f813f')

+provides=(qmailanalog)

+

+build() {

+	qmail_dir=/var/qmail

+	Fcd $pkgorig-$pkgver

+	echo "$qmail_dir" > conf-home

+	echo "diet gcc $CFLAGS" > conf-cc

+	echo "diet gcc -s -static" > conf-ld

+	Fmkdir $qmail_dir

+	patch -p1 < $Fsrcdir/qmailanalog-multilog.patch || Fdie

+	sed -i -e "s{(auto_home,{(\"$Fdestdir$qmail_dir\",{" hier.c

+	make || Fdie

+	make setup || Fdie

+	Frm $qmail_dir/man/cat*

+	Fmkdir /usr/share/doc/$pkgname-$pkgver

+	Fmv $qmail_dir/doc/* /usr/share/doc/$pkgname-$pkgver

+	Frm $qmail_dir/doc

+}

+# vim: ft=sh

@@ -0,0 +1,885 @@

+diff -x .svn -Naur qmailanalog-0.70/error.h qmailanalog/error.h

+--- qmailanalog-0.70/error.h	1998-08-30 23:39:27.000000000 +0200

++++ qmailanalog/error.h	2007-04-30 20:57:24.000000000 +0200

+@@ -1,7 +1,8 @@

+ #ifndef ERROR_H

+ #define ERROR_H

+ 

+-extern int errno;

++/* extern int errno; */

++#include <errno.h>

+ 

+ extern int error_intr;

+ extern int error_nomem;

+diff -x .svn -Naur qmailanalog-0.70/FILES qmailanalog/FILES

+--- qmailanalog-0.70/FILES	1998-08-30 23:39:26.000000000 +0200

++++ qmailanalog/FILES	2007-04-30 20:57:24.000000000 +0200

+@@ -132,3 +132,6 @@

+ case.3

+ case.h

+ case_lowers.c

++mlmatchup.8

++mlmatchup.c

++mlmatchup

+diff -x .svn -Naur qmailanalog-0.70/hier.c qmailanalog/hier.c

+--- qmailanalog-0.70/hier.c	1998-08-30 23:39:27.000000000 +0200

++++ qmailanalog/hier.c	2007-06-13 11:09:42.000000000 +0200

+@@ -9,12 +9,16 @@

+   d(auto_home,"man",-1,-1,02755);

+   d(auto_home,"man/man1",-1,-1,02755);

+   d(auto_home,"man/cat1",-1,-1,02755);

++  d(auto_home,"man/man8",-1,-1,02755);

++  d(auto_home,"man/cat8",-1,-1,02755);

+ 

+   c(auto_home,"doc","MATCHUP",-1,-1,0644);

+   c(auto_home,"doc","ACCOUNTING",-1,-1,0644);

+ 

+   c(auto_home,"man/man1","matchup.1",-1,-1,0644);

+   c(auto_home,"man/cat1","matchup.0",-1,-1,0644);

++  c(auto_home,"man/man8","mlmatchup.8",-1,-1,0644);

++  c(auto_home,"man/cat8","mlmatchup.0",-1,-1,0644);

+   c(auto_home,"man/man1","xqp.1",-1,-1,0644);

+   c(auto_home,"man/cat1","xqp.0",-1,-1,0644);

+   c(auto_home,"man/man1","xsender.1",-1,-1,0644);

+@@ -25,6 +29,7 @@

+   c(auto_home,"man/cat1","columnt.0",-1,-1,0644);

+ 

+   c(auto_home,"bin","matchup",-1,-1,0755);

++  c(auto_home,"bin","mlmatchup",-1,-1,0755);

+   c(auto_home,"bin","columnt",-1,-1,0755);

+   c(auto_home,"bin","zoverall",-1,-1,0755);

+   c(auto_home,"bin","zsendmail",-1,-1,0755);

+diff -x .svn -Naur qmailanalog-0.70/Makefile qmailanalog/Makefile

+--- qmailanalog-0.70/Makefile	1998-08-30 23:39:26.000000000 +0200

++++ qmailanalog/Makefile	2007-05-03 00:15:12.000000000 +0200

+@@ -243,7 +243,7 @@

+ 	chmod 755 makelib

+ 

+ man: \

+-matchup.0 columnt.0 xqp.0 xsender.0 xrecipient.0 alloc.0 case.0 \

++matchup.0 mlmatchup.0 columnt.0 xqp.0 xsender.0 xrecipient.0 alloc.0 case.0 \

+ error.0 error_str.0 getln2.0 getln.0 stralloc.0

+ 

+ matchup: \

+@@ -275,7 +275,7 @@

+ 	./compile open_trunc.c

+ 

+ prog: \

+-matchup columnt zoverall zsendmail xqp xsender xrecipient ddist \

++matchup mlmatchup columnt zoverall zsendmail xqp xsender xrecipient ddist \

+ deferrals failures successes rhosts recipients rxdelay senders suids \

+ zddist zdeferrals zfailures zsuccesses zrhosts zrecipients zrxdelay \

+ zsenders zsuids

+@@ -566,3 +566,22 @@

+ 	| sed s}HOME}"`head -1 conf-home`"}g \

+ 	> zsuids

+ 	chmod 755 zsuids

++

++mlmatchup: \

++load mlmatchup.o strerr.a getln.a substdio.a stralloc.a alloc.a error.a \

++str.a fs.a case.a

++	./load mlmatchup strerr.a getln.a substdio.a stralloc.a \

++	alloc.a error.a str.a fs.a case.a 

++

++mlmatchup.0: \

++mlmatchup.8

++	nroff -man mlmatchup.8 > mlmatchup.0

++

++mlmatchup.o: \

++compile mlmatchup.c stralloc.h gen_alloc.h gen_alloc.h gen_allocdefs.h \

++strerr.h getln.h substdio.h subfd.h substdio.h readwrite.h exit.h \

++str.h fmt.h scan.h case.h

++	./compile mlmatchup.c

++

++clean:

++	rm -f `cat TARGETS`

+diff -x .svn -Naur qmailanalog-0.70/man.do qmailanalog/man.do

+--- qmailanalog-0.70/man.do	1998-08-30 23:39:27.000000000 +0200

++++ qmailanalog/man.do	2007-04-30 20:57:24.000000000 +0200

+@@ -1,4 +1,4 @@

+ dependon \

+-matchup.0 columnt.0 \

++matchup.0 mlmatchup.0 columnt.0 \

+ xqp.0 xsender.0 xrecipient.0 \

+ alloc.0 case.0 error.0 error_str.0 getln2.0 getln.0 stralloc.0

+diff -x .svn -Naur qmailanalog-0.70/matchup.1 qmailanalog/matchup.1

+--- qmailanalog-0.70/matchup.1	1998-08-30 23:39:27.000000000 +0200

++++ qmailanalog/matchup.1	2007-04-30 20:57:24.000000000 +0200

+@@ -7,7 +7,9 @@

+ .B matchup

+ reads a series of lines from

+ .BR qmail-send ,

+-with a numeric timestamp in front of each line.

++with a numeric timestamp in the format seconds.nanoseconds or a TAI64N timestamps

++in front of each line, allowing either splogger(8) or multilog(8) to produce the

++logfiles.

+ .B matchup

+ matches the end of each delivery attempt with the start of the delivery attempt

+ and with the relevant message information;

+@@ -108,4 +110,6 @@

+ xsender(1),

+ accustamp(1),

+ qmail-log(5),

+-splogger(8)

++splogger(8),

++multilog(8),

++mlmatchup(1)

+diff -x .svn -Naur qmailanalog-0.70/matchup.c qmailanalog/matchup.c

+--- qmailanalog-0.70/matchup.c	1998-08-30 23:39:27.000000000 +0200

++++ qmailanalog/matchup.c	2007-04-30 20:57:24.000000000 +0200

+@@ -183,6 +183,47 @@

+   poolbytes = pool.len; /* redundant, but doesn't hurt */

+ }

+ 

++/* turn TAI date into old fashioned date */

++/* dates without @ are left alone */

++

++static char datebuf[FMT_ULONG+FMT_ULONG+2]; /* ssssssssss.ffffffffff\n */

++

++char *

++datize(s)

++char *s;

++{

++  int c;

++  int len;

++  unsigned long u;

++  unsigned long seconds = 0;

++  unsigned long nanoseconds = 0;

++

++  if(*s != '@') return s;

++  s++;

++

++  while ((c = *s++)) {

++    u = c - '0';

++    if (u >= 10) {

++      u = c - 'a';

++      if (u >= 6) break;

++      u += 10;

++    }

++    seconds <<= 4;

++    seconds += nanoseconds >> 28;

++    nanoseconds &= 0xfffffff;

++    nanoseconds <<= 4;

++    nanoseconds += u;

++  }

++  seconds -= 4611686018427387914ULL;

++

++  len = fmt_ulong(datebuf, seconds);

++  datebuf[len++] = '.';

++  len += fmt_uint0(datebuf+len, nanoseconds, 9);

++  datebuf[len] = 0;

++

++  return datebuf;

++}

++

+ stralloc line = {0};

+ int match;

+ 

+@@ -209,7 +250,7 @@

+   dmsg.u[dpos] = m;

+ 

+   dstart.u[dpos] = pool.len;

+-  if (!stralloc_cats(&pool,line.s + field[0])) nomem();

++  if (!stralloc_cats(&pool,datize(line.s + field[0]))) nomem();

+   if (!stralloc_0(&pool)) nomem();

+ 

+   dchan.u[dpos] = pool.len;

+@@ -267,7 +308,7 @@

+   if (mpos != -1) {

+     outs(pool.s + birth.u[mpos]);

+     outs(" "); outs(pool.s + dstart.u[dpos]);

+-    outs(" "); outs(line.s + field[0]);

++    outs(" "); outs(datize(line.s + field[0]));

+     outs(" "); out(strnum,fmt_ulong(strnum,bytes.u[mpos]));

+     outs(" "); outs(pool.s + sender.u[mpos]);

+     outs(" "); outs(pool.s + dchan.u[dpos]);

+@@ -279,7 +320,7 @@

+   else {

+     outs(pool.s + dstart.u[dpos]);

+     outs(" "); outs(pool.s + dstart.u[dpos]);

+-    outs(" "); outs(line.s + field[0]);

++    outs(" "); outs(datize(line.s + field[0]));

+     outs(" 0 ? "); outs(pool.s + dchan.u[dpos]);

+     outs("."); outs(pool.s + drecip.u[dpos]);

+     outs(" ? ? "); outs(reason);

+@@ -313,7 +354,7 @@

+   if (mpos == -1) return;

+ 

+   outs("m "); outs(pool.s + birth.u[mpos]);

+-  outs(" "); outs(line.s + field[0]);

++  outs(" "); outs(datize(line.s + field[0]));

+   outs(" "); out(strnum,fmt_ulong(strnum,bytes.u[mpos]));

+   outs(" "); out(strnum,fmt_ulong(strnum,numk.u[mpos]));

+   outs(" "); out(strnum,fmt_ulong(strnum,numd.u[mpos]));

+@@ -344,7 +385,7 @@

+   numz.u[mpos] = 0;

+ 

+   birth.u[mpos] = pool.len;

+-  if (!stralloc_cats(&pool,line.s + field[0])) nomem();

++  if (!stralloc_cats(&pool,datize(line.s + field[0]))) nomem();

+   if (!stralloc_0(&pool)) nomem();

+ 

+   sender.u[mpos] = pool.len;

+diff -x .svn -Naur qmailanalog-0.70/mlmatchup.8 qmailanalog/mlmatchup.8

+--- qmailanalog-0.70/mlmatchup.8	1970-01-01 01:00:00.000000000 +0100

++++ qmailanalog/mlmatchup.8	2007-04-30 20:57:24.000000000 +0200

+@@ -0,0 +1,33 @@

++.TH mlmatchup 8

++.SH NAME

++mlmatchup \- collect information on messages and deliveries through multilog

++.SH SYNTAX

++.B mlmatchup

++.SH DESCRIPTION

++.B mlmatchup

++behaves exactly like

++.BR matchup(1)

++with the difference, that it first reads (pending delivery) lines

++from file descriptor 4.  This makes

++.B mlmatchup

++suitable as a procesor action for multilog.

++

++If you use multilog to process

++.B qmail-send

++logfiles expand the run file of qmail-send's log services like this:

++

++.EX

++   exec setuidgid qmaill multilog t ./main \\

++.br

++     !/usr/local/qmailanalog/bin/mlmatchup ./qmailanalog

++.EE

++

++.SH "SEE ALSO"

++multilog(8),

++matchup(1),

++xqp(1),

++xrecipient(1),

++xsender(1),

++accustamp(1),

++qmail-log(5),

++splogger(8)

+diff -x .svn -Naur qmailanalog-0.70/mlmatchup.c qmailanalog/mlmatchup.c

+--- qmailanalog-0.70/mlmatchup.c	1970-01-01 01:00:00.000000000 +0100

++++ qmailanalog/mlmatchup.c	2007-04-30 20:57:24.000000000 +0200

+@@ -0,0 +1,536 @@

++#include "stralloc.h"

++#include "gen_alloc.h"

++#include "gen_allocdefs.h"

++#include "strerr.h"

++#include "getln.h"

++#include "substdio.h"

++#include "subfd.h"

++#include "readwrite.h"

++#include "exit.h"

++#include "str.h"

++#include "fmt.h"

++#include "scan.h"

++#include "case.h"

++

++#define FATAL "matchup: fatal: "

++

++void nomem() { strerr_die2x(111,FATAL,"out of memory"); }

++void die_read() { strerr_die2sys(111,FATAL,"unable to read input: "); }

++void die_write() { strerr_die2sys(111,FATAL,"unable to write output: "); }

++void die_write5() { strerr_die2sys(111,FATAL,"unable to write fd 5: "); }

++

++void out(buf,len) char *buf; int len;

++{ if (substdio_put(subfdout,buf,len) == -1) die_write(); }

++void outs(buf) char *buf;

++{ if (substdio_puts(subfdout,buf) == -1) die_write(); }

++

++char buf5[512];

++substdio ss5 = SUBSTDIO_FDBUF(write,5,buf5,sizeof buf5);

++

++void out5(buf,len) char *buf; int len;

++{ if (substdio_put(&ss5,buf,len) == -1) die_write5(); }

++void outs5(buf) char *buf;

++{ if (substdio_puts(&ss5,buf) == -1) die_write5(); }

++

++GEN_ALLOC_typedef(ulongalloc,unsigned long,u,len,a)

++GEN_ALLOC_ready(ulongalloc,unsigned long,u,len,a,i,n,x,30,ulongalloc_ready)

++GEN_ALLOC_readyplus(ulongalloc,unsigned long,u,len,a,i,n,x,30,ulongalloc_readyplus)

++

++char strnum[FMT_ULONG];

++

++stralloc pool = {0};

++unsigned int poolbytes = 0;

++

++int nummsg = 0;

++ulongalloc msg = {0};

++ulongalloc bytes = {0};

++ulongalloc qp = {0};

++ulongalloc uid = {0};

++ulongalloc numk = {0};

++ulongalloc numd = {0};

++ulongalloc numz = {0};

++ulongalloc sender = {0};

++ulongalloc birth = {0};

++

++int msg_find(m)

++unsigned long m;

++{

++  int i;

++  for (i = 0;i < nummsg;++i) if (msg.u[i] == m) return i;

++  return -1;

++}

++

++int msg_add(m)

++unsigned long m;

++{

++  int i;

++  for (i = 0;i < nummsg;++i) if (msg.u[i] == m) return i;

++  i = nummsg++;

++  if (!ulongalloc_ready(&msg,nummsg)) nomem();

++  if (!ulongalloc_ready(&bytes,nummsg)) nomem();

++  if (!ulongalloc_ready(&qp,nummsg)) nomem();

++  if (!ulongalloc_ready(&uid,nummsg)) nomem();

++  if (!ulongalloc_ready(&numk,nummsg)) nomem();

++  if (!ulongalloc_ready(&numd,nummsg)) nomem();

++  if (!ulongalloc_ready(&numz,nummsg)) nomem();

++  if (!ulongalloc_ready(&sender,nummsg)) nomem();

++  if (!ulongalloc_ready(&birth,nummsg)) nomem();

++  msg.u[i] = m;

++  return i;

++}

++

++int msg_kill(i)

++int i;

++{

++  poolbytes -= str_len(pool.s + sender.u[i]) + 1;

++  poolbytes -= str_len(pool.s + birth.u[i]) + 1;

++

++  --nummsg;

++  msg.u[i] = msg.u[nummsg];

++  bytes.u[i] = bytes.u[nummsg];

++  qp.u[i] = qp.u[nummsg];

++  uid.u[i] = uid.u[nummsg];

++  numk.u[i] = numk.u[nummsg];

++  numd.u[i] = numd.u[nummsg];

++  numz.u[i] = numz.u[nummsg];

++  sender.u[i] = sender.u[nummsg];

++  birth.u[i] = birth.u[nummsg];

++}

++

++int numdel = 0;

++ulongalloc del = {0};

++ulongalloc dmsg = {0};

++ulongalloc dchan = {0};

++ulongalloc drecip = {0};

++ulongalloc dstart = {0};

++

++int del_find(d)

++unsigned long d;

++{

++  int i;

++  for (i = 0;i < numdel;++i) if (del.u[i] == d) return i;

++  return -1;

++}

++

++int del_add(d)

++unsigned long d;

++{

++  int i;

++  for (i = 0;i < numdel;++i) if (del.u[i] == d) return i;

++  i = numdel++;

++  if (!ulongalloc_ready(&del,numdel)) nomem();

++  if (!ulongalloc_ready(&dmsg,numdel)) nomem();

++  if (!ulongalloc_ready(&dchan,numdel)) nomem();

++  if (!ulongalloc_ready(&drecip,numdel)) nomem();

++  if (!ulongalloc_ready(&dstart,numdel)) nomem();

++  del.u[i] = d;

++  return i;

++}

++

++void del_kill(i)

++int i;

++{

++  poolbytes -= str_len(pool.s + dchan.u[i]) + 1;

++  poolbytes -= str_len(pool.s + drecip.u[i]) + 1;

++  poolbytes -= str_len(pool.s + dstart.u[i]) + 1;

++  --numdel;

++  del.u[i] = del.u[numdel];

++  dmsg.u[i] = dmsg.u[numdel];

++  dchan.u[i] = dchan.u[numdel];

++  drecip.u[i] = drecip.u[numdel];

++  dstart.u[i] = dstart.u[numdel];

++}

++

++stralloc pool2 = {0};

++

++void garbage()

++{

++  int i;

++  char *x;

++

++  if (pool.len - poolbytes < poolbytes + 4096) return;

++

++  if (!stralloc_copys(&pool2,"")) nomem();

++

++  for (i = 0;i < nummsg;++i) {

++    x = pool.s + birth.u[i];

++    birth.u[i] = pool2.len;

++    if (!stralloc_cats(&pool2,x)) nomem();

++    if (!stralloc_0(&pool2)) nomem();

++    x = pool.s + sender.u[i];

++    sender.u[i] = pool2.len;

++    if (!stralloc_cats(&pool2,x)) nomem();

++    if (!stralloc_0(&pool2)) nomem();

++  }

++

++  for (i = 0;i < numdel;++i) {

++    x = pool.s + dstart.u[i];

++    dstart.u[i] = pool2.len;

++    if (!stralloc_cats(&pool2,x)) nomem();

++    if (!stralloc_0(&pool2)) nomem();

++    x = pool.s + dchan.u[i];

++    dchan.u[i] = pool2.len;

++    if (!stralloc_cats(&pool2,x)) nomem();

++    if (!stralloc_0(&pool2)) nomem();

++    x = pool.s + drecip.u[i];

++    drecip.u[i] = pool2.len;

++    if (!stralloc_cats(&pool2,x)) nomem();

++    if (!stralloc_0(&pool2)) nomem();

++  }

++

++  if (!stralloc_copy(&pool,&pool2)) nomem();

++

++  poolbytes = pool.len; /* redundant, but doesn't hurt */

++}

++

++/* turn TAI date into old fashioned date */

++/* dates without @ are left alone */

++

++static char datebuf[FMT_ULONG+FMT_ULONG+2]; /* ssssssssss.ffffffffff\n */

++

++char *

++datize(s)

++char *s;

++{

++  int c;

++  int len;

++  unsigned long u;

++  unsigned long seconds = 0;

++  unsigned long nanoseconds = 0;

++

++  if(*s != '@') return s;

++  s++;

++

++  while ((c = *s++)) {

++    u = c - '0';

++    if (u >= 10) {

++      u = c - 'a';

++      if (u >= 6) break;

++      u += 10;

++    }

++    seconds <<= 4;

++    seconds += nanoseconds >> 28;

++    nanoseconds &= 0xfffffff;

++    nanoseconds <<= 4;

++    nanoseconds += u;