diet-qmail

diff -r 2be82bdba73b source/dietlibc/diet-qmail/FrugalBuild

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

+++ b/source/dietlibc/diet-qmail/FrugalBuild	Wed Feb 15 15:10:10 2012 +0100

@@ -0,0 +1,293 @@

+# Patched qmail:

+#	errno

+#	ext_todo

+#	qregex

+#	qmailqueue

+#	smtpd.spam

+#	dietlibc

+# + queue-fix package with patches:

+#	errno

+#	dietlibc

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

+

+branch=diet

+pkgorig=qmail

+pkgname=$branch-$pkgorig

+pkgver=1.03

+pkgrel=2

+pkgdesc="A secure, reliable, efficient, SMTP/POP3 server."

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

+depends=('daemontools' 'ucspi-tcp' 'openssl')

+makedepends=('dietlibc')

+backup=(var/qmail/supervise/qmail-pop3d/run \

+        var/qmail/supervise/qmail-pop3d/log/run \

+        var/qmail/supervise/qmail-send/run \

+        var/qmail/supervise/qmail-send/log/run \

+        var/qmail/supervise/qmail-smtpd/run \

+        var/qmail/supervise/qmail-smtpd/log/run \

+        var/qmail/control/concurrencyincoming \

+        var/qmail/control/defaultdelivery \

+        var/qmail/control/me \

+        etc/tcp.smtp etc/tcp.pop3)

+provides=('smtp-server' 'pop3-server' 'qmail')

+install="$pkgorig.install"

+archs=(i686)

+up2date="1.03"

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

+	qmail-1.03.errno.patch \

+	ext_todo-20030105.patch \

+	qmailqueue-patch \

+	qregex-20060423-qmail.patch \

+	qmail-dietlibc.patch \

+	qmail-smtpd.spam.patch \

+	http://www.netmeridian.com/e-huss/queue-fix-1.4.tar.gz \

+	queue-fix-errno.patch \

+	queue-fix-dietlibc.patch \

+        rc smtpd_run pop3d_run qmail.profile qmail.rc send_log_run \

+        send_run smtpd_log_run pop3d_log_run tcp.smtp tcp.pop3 \

+        make_cert.sh)

+

+sha1sums=('18fb960481291a0503e93a94df3f6094edb7f27a' \

+          '5cab1d84f67987983d13f10be1577e3da274cb94' \

+          'a1ecb939a4aaeeb325d947f3e6416aa63ae97d80' \

+          '76240289d52f2aca88004af47e5bd41c969880cf' \

+          '40b18255da69a2f36cf8698d8eb907f5f039c0a7' \

+          '605e93734c82373383f0284fabc64f85c4c06bfc' \

+          '25f4ef231560bbc5fc3c2a82f2f0cd0696deded9' \

+          'ce42fcc4daf5076adcf8fea6a9a84f2e1716c67c' \

+          '72be22c7987ff3639692cda21c09dec340e06a4a' \

+          '7d3525ab4a2e0e2be2bcd074dd94ae2784309d1b' \

+          '3111cc689b5b1f6caa38997bf5f85aa3a516ef9c' \

+          '3a80e44c97fd3035ce16c68fd2f611a64c61d169' \

+          'f14f63c7b1bdc2d1f527249235551dc7f21ad47d' \

+          '36951a4c195c72f4194c2d98ce3478c11d85c5bf' \

+          '2b29cf70c6cbf52ef5af5da7840c72ae626ccb50' \

+          '80543d062529a1eefde0c8b288c411a0b896e950' \

+          '5877c8e1896f655bd8f4d98d52e67231c63d9e42' \

+          '87ebef35a931cdf43b9ffc6dfe42529a21e562ba' \

+          'e53e6248b347be058e3e1973434b2b885c65f091' \

+          '27ff6fcaa115d7b59b86f54f970b6271c84ca6d3' \

+          'ac0994b0ec0ada5bd28fdce6f8e37e9827357f43' \

+          '3e91eb05c9bf51e230f237d19633fc572fbc3540')

+

+# NOTE: This should be built only as root, 

+# not using fakeroot.

+

+# a small function to add required groups

+# & users before building.

+pre_build_qmail() {

+  # create a tmp dir

+  mkdir -p $startdir/src/tmp

+  # group: qmail

+  if [ ! `grep qmail /etc/group` ]; then

+    echo "==> Adding group qmail (temporarily)"

+    groupadd -g 2107 qmail &>/dev/null

+    touch $startdir/src/tmp/group_qmail

+  fi

+

+  # group: nofiles

+  if [ ! `grep nofiles /etc/group` ]; then

+    echo "==> Adding group nofiles (temporarily)"

+    groupadd -g 2108 nofiles &>/dev/null

+    touch $startdir/src/tmp/group_nofiles

+  fi

+

+  # user: alias

+  if ! id alias &>/dev/null; then 

+    echo "==> Adding user alias (temporarily)"

+    useradd -u 7790 -g nofiles -d /var/qmail/alias -s /bin/false alias

+    touch $startdir/src/tmp/user_alias

+  fi

+

+  # user: qmaild

+  if ! id qmaild &>/dev/null; then

+    echo "==> Adding user qmaild (temporarily)"

+    useradd -u 7791 -g nofiles -d /var/qmail -s /bin/false qmaild

+    touch $startdir/src/tmp/user_qmaild

+  fi

+

+  # user: qmaill

+  if ! id qmaill &>/dev/null; then

+    echo "==> Adding user qmaill (temporarily)"

+    useradd -u 7792 -g nofiles -d /var/qmail -s /bin/false qmaill

+    touch $startdir/src/tmp/user_qmaill

+  fi

+ 

+  # user: qmailp

+  if ! id qmailp &>/dev/null; then

+    echo "==> Adding user qmailp (temporarily)"

+    useradd -u 7793 -g nofiles -d /var/qmail -s /bin/false qmailp

+    touch $startdir/src/tmp/user_qmailp

+  fi

+

+  # user: qmailq

+  if ! id qmailq &>/dev/null; then

+    echo "==> Adding user qmailq (temporarily)"

+    useradd -u 7794 -g qmail -d /var/qmail -s /bin/false qmailq

+    touch $startdir/src/tmp/user_qmailq

+  fi

+

+  # user: qmailr

+  if ! id qmailr &>/dev/null; then

+    echo "==> Adding user: qmailr (temporarily)"

+    useradd -u 7795 -g qmail -d /var/qmail -s /bin/false qmailr

+    touch $startdir/src/tmp/user_qmailr

+  fi

+

+  # user: qmails

+  if ! id qmails &>/dev/null; then

+    echo "==> Adding user: qmails (temporarily)"

+    useradd -u 7796 -g qmail -d /var/qmail -s /bin/false qmails

+    touch $startdir/src/tmp/user_qmails

+  fi

+}

+

+# a small function to remove users

+# after the build.

+post_build_qmail() {

+  # remove users

+  for user in alias qmail{d,l,p,q,r,s}; do

+    if [ -f $startdir/src/tmp/user_${user} ]; then

+      echo "==> Removing user: ${user}"

+      userdel ${user} &> /dev/null

+    fi

+  done

+

+  # remove groups

+  for group in nofiles qmail; do

+    if [ -f $startdir/src/tmp/group_${group} ]; then 

+      echo "==> Removing group: ${group}"

+      groupdel ${group} &> /dev/null

+    fi

+  done

+

+  # remove temp dir

+  rm -rf $startdir/src/tmp

+}

+

+build() {

+  # save me some typing ;)

+  qmail_dir=$Fdestdir/var/qmail

+

+

+  # add the required groups & users 

+  pre_build_qmail || Fdie

+

+  # start playing with qmail :)

+  Fcd $pkgorig-$pkgver

+  Fpatch qmail-1.03.errno.patch

+  Fpatch ext_todo-20030105.patch

+  Fpatch qmailqueue-patch

+  Fpatch qregex-20060423-qmail.patch

+  Fpatch qmail-dietlibc.patch

+  Fpatch qmail-smtpd.spam.patch

+

+  # compile qmail

+  make it man || Fdie 

+

+  # create dirs

+  install -d -m 755 -o root -g qmail $qmail_dir

+  for i in bin boot control users; do

+    install -d -m 755 -o root -g qmail $qmail_dir/$i

+  done

+  install -d -m 755 -o alias -g qmail $qmail_dir/alias

+  install -d -m 755 -o qmaill $startdir/pkg/var/log/qmail

+  install -d -m 755 -o qmaill $startdir/pkg/var/log/qmail/smtpd

+  install -d -m 755 -o qmaill $startdir/pkg/var/log/qmail/pop3d

+  install -d -m 755 -o qmaill $startdir/pkg/var/log/qmail/send

+  mkdir -p $qmail_dir/supervise/qmail-{pop3d,send,smtpd}/log

+  install -d -m 710 -o qmailq -g qmail $qmail_dir/queue

+

+  # install binaries

+  for i in binm1{,+df} binm2{,+df} binm3{,+df} home{,+df} proc{,+df}; do

+    install -m 755 -o root -g qmail $i $qmail_dir/boot/$i

+  done

+  install -m 4711 -o qmailq -g qmail qmail-queue \

+    $qmail_dir/bin/qmail-queue

+  for i in qmail-lspawn qmail-start qmail-newu qmail-newmrh; do

+    install -m 700 -o root -g qmail $i $qmail_dir/bin/$i

+  done

+  for i in qmail-getpw qmail-local qmail-remote qmail-rspawn \

+           qmail-clean qmail-send splogger qmail-popup qmail-pw2u \

+           qmail-todo; do

+    install -m 711 -o root -g qmail $i $qmail_dir/bin/$i

+  done

+  for i in qmail-inject predate datemail mailsubj qmail-showctl \

+	   qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \

+           qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \

+           sendmail tcp-env qreceipt qsmhook qbiff forward preline \

+           condredirect bouncesaying except maildirmake maildir2mbox \

+           maildirwatch qail elq pinq config-fast; do

+    install -m 755 -o root -g qmail $i $qmail_dir/bin/$i

+  done

+

+  # install manpages

+  for i in bouncesaying except maildir2mbox maildirwatch preline qreceipt \

+           condredirect forward maildirmake mailsubj qbiff tcp-env; do

+    install -D -m 644 -o root -g qmail ${i}.1 $qmail_dir/man/man1/${i}.1

+  done

+  for i in addresses envelopes mbox qmail-header qmail-users dot-qmail \

+           maildir qmail-control qmail-log tcp-environ; do

+    install -D -m 644 -o root -g qmail ${i}.5 $qmail_dir/man/man5/${i}.5

+  done

+  for i in forgeries qmail-limits qmail; do

+    install -D -m 644 -o root -g qmail ${i}.7 $qmail_dir/man/man7/${i}.7

+  done

+  for i in qmail-clean qmail-newmrh qmail-qmqpd qmail-rspawn qmail-tcpto \

+           qmail-command qmail-newu qmail-qmtpd qmail-send splogger \

+           qmail-getpw qmail-pop3d qmail-qread qmail-showctl qmail-inject \

+           qmail-popup qmail-qstat qmail-smtpd qmail-local qmail-pw2u \

+           qmail-queue qmail-start qmail-lspawn qmail-qmqpc qmail-remote \

+           qmail-tcpok; do

+    install -D -m 644 -o root -g qmail ${i}.8 $qmail_dir/man/man8/${i}.8

+  done

+

+  # install supervise files

+  for i in pop3d send smtpd; do

+    install -m 755 $startdir/${i}_run \

+      $qmail_dir/supervise/qmail-${i}/run

+    install -m 755 $startdir/${i}_log_run \

+      $qmail_dir/supervise/qmail-${i}/log/run

+  done

+

+  # install rc

+  install -m 755 $startdir/rc \

+    $qmail_dir/rc

+

+  # install concurrencyicoming & defaultdelivery files

+  echo 20 > $qmail_dir/control/concurrencyincoming

+  echo ./Maildir/ > $qmail_dir/control/defaultdelivery

+  chmod 644 $qmail_dir/control/{concurrencyincoming,defaultdelivery}

+

+  # create sendmail symlinks for compatibility reasons

+  for i in sbin lib; do

+    mkdir -p $Fdestdir/usr/${i}

+    ln -sf /var/qmail/bin/sendmail $Fdestdir/usr/${i}/sendmail

+  done

+

+  # install profile.d file

+  install -D -m 755 $startdir/qmail.profile $Fdestdir/etc/profile.d/qmail.sh

+

+  # install tcp files

+  for i in smtp pop3; do

+    install -D -m 644 $startdir/tcp.${i} $Fdestdir/etc/tcp.${i}

+  done

+

+  # install cert making script

+  install -D -m755 $startdir/make_cert.sh $qmail_dir/bin/make_cert.sh

+  

+  # install rc.d file

+  install -D -m 755 $startdir/qmail.rc $Fdestdir/etc/rc.d/qmail

+

+  # build and install queue-fix

+  Fmessage "Now building queue-fix"

+  cd $Fsrcdir/queue-fix-1.4 || Fdie

+  Fpatch queue-fix-errno.patch

+  Fpatch queue-fix-dietlibc.patch

+  make || Fdie

+  install -D -m755 queue-fix $qmail_dir/bin/queue-fix

+ 

+  # remove groups & users

+  post_build_qmail || Fdie

+}

+

diff -r 2be82bdba73b source/dietlibc/diet-qmail/ext_todo-20030105.patch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000

+++ b/source/dietlibc/diet-qmail/ext_todo-20030105.patch	Wed Feb 15 15:10:10 2012 +0100

@@ -0,0 +1,1238 @@

+diff -uN qmail-1.03/EXTTODO qmail-exttodo/EXTTODO

+--- qmail-1.03/EXTTODO	Thu Jan  1 01:00:00 1970

++++ qmail-exttodo/EXTTODO	Sun Jan  5 22:12:01 2003

+@@ -0,0 +1,114 @@

++EXTTODO by Claudio Jeker <jeker@n-r-g.com> and 

++Andre Oppermann <opi@nrg4u.com>

++(c) 1998,1999,2000,2001,2002 Internet Business Solutions Ltd.

++

++The EXTTODO patch is a part of the qmail-ldap patch.

++This patches for qmail come with NO WARRANTY.

++

++These patches are under the BSD license.

++

++RELEASE: 5. Jan. 2003

++

++EXTTODO:

++======================

++

++TOC:

++ WHAT DOES IT DO

++ INSTALL

++ CONFIG FILES

++ SETUP

++ BIG PICTURE

++

++NEWS:

++ 

++ This is the first release of the EXTTODO patch.

++

++================================================================================

++

++WHAT DOES IT DO

++

++ The exttodo patch addresses a problem known as the silly qmail (queue)

++ problem. This problem is found only on system with high injection rates.

++

++ qmail with a big local and remote concurrency could deliver a tremendous 

++ amount of messages but normally this can not be achieved because qmail-send

++ becomes a bottleneck on those high volumes servers.

++ qmail-send preprocesses all new messages before distributing them for local

++ or remote delivering. In one run qmail-send does one todo run but has the 

++ ability to close multiple jobs. Because of this layout qmail-send can not 

++ feed all the new available (local/remote) delivery slots and therefor it is 

++ not possible to achieve the maximum throughput.

++ This would be a minor problem if one qmail-send run could be done in extreme

++ short time but because of many file system calls (fsync and (un)link) a todo

++ run is expensive and throttles the throughput.

++

++ The exttodo patch tries to solve the problem by moving the todo routine into 

++ an external program. This reduces the run time in qmail-send.

++

++ exttodo adds a new program to qmail called qmail-todo. qmail-todo prepares

++ incoming messages for local and remote delivering (by creating info/<messid>

++ local/<messid> and remote/<messid> and removing todo/<messid>). See also

++ INTERNALS. As next qmail-todo transmits the <messid> to qmail-send which will

++ add this message into the priority queue which schedules the message for 

++ delivery. 

++

++INSTALL

++

++ To enable the exttodo patch you need to define EXTERNAL_TODO while compiling

++ qmail(-ldap) this can be done with the -D flag of cc (e.g. cc -DEXTERNAL_TODO).

++

++ NOTE: the exttodo patch can also be used on qmail systems without the 

++ qmail-ldap patch.

++ 

++================================================================================

++

++CONFIG FILES

++

++ No additional control files are used or needed.

++

++================================================================================

++

++SETUP

++

++ qmail-todo will be started by qmail-start and therefor no additional setup

++ is needed.

++

++ To verify that exttodo is running just check if qmail-todo is running.

++

++================================================================================

++

++BIG PICTURE

++

++               +-------+   +-------+

++               | clean |   | clean |

++               +--0-1--+   +--0-1--+       +-----------+

++         trigger  ^ |         ^ |        +->0,1 lspawn |

++            |     | v         | v       /  +-----------+

++ +-------+  v  +--2-3--+   +--5-6--+   /

++ |       |  |  |       0<--7     1,2<-+

++ | queue |--+--| todo  |   | send  |

++ |       |  |  |       1-->8     3,4<-+

++ +-------+     +-------+   +---0---+   \

++                               |        \  +-----------+

++                               v         +->0,1 rspwan |

++                           +---0---+       +-----------+

++                           | logger|

++                           +-------+

++

++Communication between qmail-send and qmail-todo

++

++todo -> send:

++   D[LRB]<mesgid>\0

++          Start delivery for new message with id <messid>.

++          the character L, R or B defines the type

++          of delivery, local, remote or both respectively.

++   L<string>\0

++          Dump string to the logger without adding additional \n or similar.

++send -> todo:

++   H      Got a SIGHUP reread ~/control/locals and ~/control/virtualdomains

++   X      Quit ASAP.

++

++qmail-todo sends "\0" terminated messages whereas qmail-send just send one

++character to qmail-todo.

++

++

+diff -uN qmail-1.03/EXTTODO-INFO qmail-exttodo/EXTTODO-INFO

+--- qmail-1.03/EXTTODO-INFO	Thu Jan  1 01:00:00 1970

++++ qmail-exttodo/EXTTODO-INFO	Tue Apr 30 16:49:02 2002

+@@ -0,0 +1,11 @@

++Files modified:

++Makefile

++EXTTODO

++FILES

++TARGETS

++qmail-send.c

++qmail-todo.c

++qmail-start.c

++hier.c

++install-big.c

++

+diff -uN qmail-1.03/FILES qmail-exttodo/FILES

+--- qmail-1.03/FILES	Mon Jun 15 12:53:16 1998

++++ qmail-exttodo/FILES	Mon Apr 22 13:59:28 2002

+@@ -431,3 +431,4 @@

+ tcp-environ.5

+ constmap.h

+ constmap.c

++qmail-todo.c

+diff -uN qmail-1.03/Makefile qmail-exttodo/Makefile

+--- qmail-1.03/Makefile	Mon Jun 15 12:53:16 1998

++++ qmail-exttodo/Makefile	Mon Apr 22 14:55:59 2002

+@@ -1,5 +1,7 @@

+ # Don't edit Makefile! Use conf-* for configuration.

+ 

++DEFINES=-DEXTERNAL_TODO # use to enable external todo

++

+ SHELL=/bin/sh

+ 

+ default: it

+@@ -703,7 +705,7 @@

+ 

+ hier.o: \

+ compile hier.c auto_qmail.h auto_split.h auto_uids.h fmt.h fifo.h

+-	./compile hier.c

++	./compile $(DEFINES) hier.c

+ 

+ home: \

+ home.sh conf-qmail

+@@ -755,7 +757,7 @@

+ install-big.o: \

+ compile install-big.c auto_qmail.h auto_split.h auto_uids.h fmt.h \

+ fifo.h

+-	./compile install-big.c

++	./compile $(DEFINES) install-big.c

+ 

+ install.o: \

+ compile install.c substdio.h strerr.h error.h open.h readwrite.h \

+@@ -808,7 +810,7 @@

+ forward preline condredirect bouncesaying except maildirmake \

+ maildir2mbox maildirwatch qail elq pinq idedit install-big install \

+ instcheck home home+df proc proc+df binm1 binm1+df binm2 binm2+df \

+-binm3 binm3+df

++binm3 binm3+df qmail-todo

+ 

+ load: \

+ make-load warn-auto.sh systype

+@@ -1509,7 +1511,7 @@

+ scan.h case.h auto_qmail.h trigger.h newfield.h stralloc.h quote.h \

+ qmail.h substdio.h qsutil.h prioq.h datetime.h gen_alloc.h constmap.h \

+ fmtqfn.h readsubdir.h direntry.h

+-	./compile qmail-send.c

++	./compile $(DEFINES) qmail-send.c

+ 

+ qmail-showctl: \

+ load qmail-showctl.o auto_uids.o control.o open.a getln.a stralloc.a \

+@@ -1574,7 +1576,7 @@

+ 

+ qmail-start.o: \

+ compile qmail-start.c fd.h prot.h exit.h fork.h auto_uids.h

+-	./compile qmail-start.c

++	./compile $(DEFINES) qmail-start.c

+ 

+ qmail-tcpok: \

+ load qmail-tcpok.o open.a lock.a strerr.a substdio.a error.a str.a \

+@@ -1605,6 +1607,20 @@

+ compile qmail-tcpto.c substdio.h subfd.h substdio.h auto_qmail.h \

+ fmt.h ip.h lock.h error.h exit.h datetime.h now.h datetime.h

+ 	./compile qmail-tcpto.c

++

++qmail-todo: \

++load qmail-todo.o control.o constmap.o trigger.o fmtqfn.o now.o \

++readsubdir.o case.a ndelay.a getln.a sig.a open.a stralloc.a alloc.a \

++substdio.a error.a str.a fs.a auto_qmail.o auto_split.o

++	./load qmail-todo control.o constmap.o trigger.o fmtqfn.o now.o \

++	readsubdir.o case.a ndelay.a getln.a sig.a open.a stralloc.a \

++	alloc.a substdio.a error.a str.a fs.a auto_qmail.o auto_split.o

++

++qmail-todo.o: \

++compile alloc.h auto_qmail.h byte.h constmap.h control.h direntry.h error.h \

++exit.h fmt.h fmtqfn.h getln.h open.h ndelay.h now.h readsubdir.h readwrite.h \

++scan.h select.h str.h stralloc.h substdio.h trigger.h

++	./compile $(DEFINES) qmail-todo.c

+ 

+ qmail-upq: \

+ warn-auto.sh qmail-upq.sh conf-qmail conf-break conf-split

+diff -uN qmail-1.03/TARGETS qmail-exttodo/TARGETS

+--- qmail-1.03/TARGETS	Mon Jun 15 12:53:16 1998

++++ qmail-exttodo/TARGETS	Mon Apr 22 13:59:32 2002

+@@ -385,3 +385,5 @@

+ man

+ setup

+ check