# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1329315021 -3600
# Node ID ee6165a0b4ed5aad3288c2cbe15fb6deffaabd66
# Parent  f232929781d63c0e8414c97f9eb878e03d630b7f
diet-qmail.patch: folded w/ upgrade-0.9-diet-qmail.patch

diff -r f232929781d6 -r ee6165a0b4ed diet-qmail.patch
--- a/diet-qmail.patch	Wed Feb 15 15:09:58 2012 +0100
+++ b/diet-qmail.patch	Wed Feb 15 15:10:21 2012 +0100
@@ -1,10 +1,8 @@
 diet-qmail
 
-diff --git a/source/dietlibc/diet-qmail/FrugalBuild b/source/dietlibc/diet-qmail/FrugalBuild
-new file mode 100644
-index 0000000..c973246
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/FrugalBuild
+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
@@ -22,7 +20,7 @@
 +pkgorig=qmail
 +pkgname=$branch-$pkgorig
 +pkgver=1.03
-+pkgrel=1
++pkgrel=2
 +pkgdesc="A secure, reliable, efficient, SMTP/POP3 server."
 +url="http://cr.yp.to/qmail.html"
 +depends=('daemontools' 'ucspi-tcp' 'openssl')
@@ -299,11 +297,9 @@
 +  post_build_qmail || Fdie
 +}
 +
-diff --git a/source/dietlibc/diet-qmail/ext_todo-20030105.patch b/source/dietlibc/diet-qmail/ext_todo-20030105.patch
-new file mode 100644
-index 0000000..466fb4d
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/ext_todo-20030105.patch
+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
@@ -1543,11 +1539,9 @@
 ++  /* NOTREACHED */
 ++}
 ++
-diff --git a/source/dietlibc/diet-qmail/make_cert.sh b/source/dietlibc/diet-qmail/make_cert.sh
-new file mode 100644
-index 0000000..8b17499
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/make_cert.sh
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/make_cert.sh
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/make_cert.sh	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,57 @@
 +#!/bin/sh
 +#
@@ -1606,11 +1600,9 @@
 +  ;;
 +esac
 +
-diff --git a/source/dietlibc/diet-qmail/pop3d_log_run b/source/dietlibc/diet-qmail/pop3d_log_run
-new file mode 100644
-index 0000000..941cde1
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/pop3d_log_run
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/pop3d_log_run
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/pop3d_log_run	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,20 @@
 +#!/bin/sh
 +# 
@@ -1632,11 +1624,9 @@
 +  /usr/bin/multilog t \
 +  n${LOGS} s${LOG_SIZE} \
 +  /var/log/qmail/pop3d 2>&1
-diff --git a/source/dietlibc/diet-qmail/pop3d_run b/source/dietlibc/diet-qmail/pop3d_run
-new file mode 100644
-index 0000000..a61f0cd
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/pop3d_run
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/pop3d_run
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/pop3d_run	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,33 @@
 +#!/bin/sh
 +#
@@ -1671,11 +1661,9 @@
 +  -v -x $TCP_CDB \
 +  -c $MAX_CON -R 0 $PORT \
 +  $POPUP $LOCAL $PASSPROG $POP3D Maildir 2>&1
-diff --git a/source/dietlibc/diet-qmail/qmail-1.03.errno.patch b/source/dietlibc/diet-qmail/qmail-1.03.errno.patch
-new file mode 100644
-index 0000000..75e0b7b
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmail-1.03.errno.patch
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail-1.03.errno.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qmail-1.03.errno.patch	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,47 @@
 +diff -u qmail-1.03.old/cdb_seek.c qmail-1.03/cdb_seek.c
 +--- qmail-1.03.old/cdb_seek.c	1998-06-15 05:52:55.000000000 -0500
@@ -1724,11 +1712,9 @@
 + 
 + extern int error_intr;
 + extern int error_nomem;
-diff --git a/source/dietlibc/diet-qmail/qmail-dietlibc.patch b/source/dietlibc/diet-qmail/qmail-dietlibc.patch
-new file mode 100644
-index 0000000..52e404c
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmail-dietlibc.patch
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail-dietlibc.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qmail-dietlibc.patch	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,40 @@
 +dietlibc compile
 +
@@ -1770,11 +1756,9 @@
 + #include "stralloc.h"
 + #include "substdio.h"
 + #include "subfd.h"
-diff --git a/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch b/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch
-new file mode 100644
-index 0000000..5ef6b6e
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail-smtpd.spam.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qmail-smtpd.spam.patch	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,74 @@
 +stika.net antispam
 +
@@ -1850,11 +1834,9 @@
 +   if (!stralloc_cats(&rcptto,"T")) die_nomem();
 +   if (!stralloc_cats(&rcptto,addr.s)) die_nomem();
 +   if (!stralloc_0(&rcptto)) die_nomem();
-diff --git a/source/dietlibc/diet-qmail/qmail.install b/source/dietlibc/diet-qmail/qmail.install
-new file mode 100644
-index 0000000..1fa4a33
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmail.install
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail.install
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qmail.install	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,82 @@
 +post_install() {
 +
@@ -1938,22 +1920,18 @@
 +shift
 +
 +$op $*
-diff --git a/source/dietlibc/diet-qmail/qmail.profile b/source/dietlibc/diet-qmail/qmail.profile
-new file mode 100644
-index 0000000..3b5fcd0
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmail.profile
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail.profile
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qmail.profile	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,5 @@
 +#!/bin/sh
 +
 +export QMAILDIR=/var/qmail
 +export PATH=$PATH:$QMAILDIR/bin
 +export MANPATH=$MANPATH:$QMAILDIR/man
-diff --git a/source/dietlibc/diet-qmail/qmail.rc b/source/dietlibc/diet-qmail/qmail.rc
-new file mode 100644
-index 0000000..45e716e
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmail.rc
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmail.rc
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qmail.rc	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,167 @@
 +#!/bin/sh
 +#
@@ -2122,11 +2100,9 @@
 +    ;;
 +esac
 +exit 0
-diff --git a/source/dietlibc/diet-qmail/qmailqueue-patch b/source/dietlibc/diet-qmail/qmailqueue-patch
-new file mode 100644
-index 0000000..ec304b6
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qmailqueue-patch
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qmailqueue-patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qmailqueue-patch	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,72 @@
 +From: Bruce Guenter <bguenter-djb-qmail@qcc.sk.ca>
 +To: qmail@list.cr.yp.to
@@ -2200,11 +2176,9 @@
 +   if (pipe(pim) == -1) return -1;
 +   if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; }
 +
-diff --git a/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch b/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch
-new file mode 100644
-index 0000000..6d08258
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/qregex-20060423-qmail.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/qregex-20060423-qmail.patch	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,688 @@
 +Fixed qregex-20060423 (pristine is against netqmail)
 +
@@ -2894,11 +2868,9 @@
 ++#define _QREGEX_H_
 ++int matchregex(char *text, char *regex);
 ++#endif
-diff --git a/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch b/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch
-new file mode 100644
-index 0000000..6d967ed
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/queue-fix-dietlibc.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/queue-fix-dietlibc.patch	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,18 @@
 +Compile with dietlibc
 +
@@ -2918,11 +2890,9 @@
 ++diet gcc -s -static
 + 
 + This will be used to link .o files into an executable.
-diff --git a/source/dietlibc/diet-qmail/queue-fix-errno.patch b/source/dietlibc/diet-qmail/queue-fix-errno.patch
-new file mode 100644
-index 0000000..72f9fcd
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/queue-fix-errno.patch
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/queue-fix-errno.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/queue-fix-errno.patch	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,14 @@
 +errno fix
 +
@@ -2938,11 +2908,9 @@
 + 
 + extern int error_intr;
 + extern int error_nomem;
-diff --git a/source/dietlibc/diet-qmail/rc b/source/dietlibc/diet-qmail/rc
-new file mode 100644
-index 0000000..0f82f9e
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/rc
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/rc
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/rc	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,7 @@
 +#!/bin/sh
 +#
@@ -2951,11 +2919,9 @@
 +#
 +exec env - PATH="/var/qmail/bin:$PATH" \
 +  qmail-start "`cat /var/qmail/control/defaultdelivery`"
-diff --git a/source/dietlibc/diet-qmail/send_log_run b/source/dietlibc/diet-qmail/send_log_run
-new file mode 100644
-index 0000000..0c4fd21
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/send_log_run
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/send_log_run
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/send_log_run	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,20 @@
 +#!/bin/sh
 +# 
@@ -2977,11 +2943,9 @@
 +  /usr/bin/multilog t \
 +  n${LOGS} s${LOG_SIZE} \
 +  /var/log/qmail/send 2>&1
-diff --git a/source/dietlibc/diet-qmail/send_run b/source/dietlibc/diet-qmail/send_run
-new file mode 100644
-index 0000000..1724b2c
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/send_run
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/send_run
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/send_run	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,8 @@
 +#!/bin/sh
 +#
@@ -2991,11 +2955,9 @@
 +#
 +
 +exec /var/qmail/rc
-diff --git a/source/dietlibc/diet-qmail/smtpd_log_run b/source/dietlibc/diet-qmail/smtpd_log_run
-new file mode 100644
-index 0000000..68027b6
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/smtpd_log_run
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/smtpd_log_run
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/smtpd_log_run	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,20 @@
 +#!/bin/sh
 +#
@@ -3017,11 +2979,9 @@
 +  /usr/bin/multilog t \
 +  n${LOGS} s${LOG_SIZE} \
 +  /var/log/qmail/smtpd 2>&1
-diff --git a/source/dietlibc/diet-qmail/smtpd_run b/source/dietlibc/diet-qmail/smtpd_run
-new file mode 100644
-index 0000000..ffd4451
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/smtpd_run
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/smtpd_run
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/smtpd_run	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,45 @@
 +#!/bin/sh
 +# 
@@ -3068,11 +3028,9 @@
 +  /usr/bin/rblsmtpd -b -C \
 +  -r $RELAY_DENIED -t 5 \
 +  $SMTPD $PASSPROG /bin/true 2>&1
-diff --git a/source/dietlibc/diet-qmail/tcp.pop3 b/source/dietlibc/diet-qmail/tcp.pop3
-new file mode 100644
-index 0000000..4437128
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/tcp.pop3
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/tcp.pop3
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/tcp.pop3	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,6 @@
 +# to update the database after changing this file, run:
 +# /etc/rc.d/qmail cdb
@@ -3080,11 +3038,9 @@
 +# If people are abusing POP3 such as denial-of-service on POP3,
 +# you can add their ips here to block them out
 +:allow
-diff --git a/source/dietlibc/diet-qmail/tcp.smtp b/source/dietlibc/diet-qmail/tcp.smtp
-new file mode 100644
-index 0000000..a5faa17
---- /dev/null
-+++ b/source/dietlibc/diet-qmail/tcp.smtp
+diff -r 2be82bdba73b source/dietlibc/diet-qmail/tcp.smtp
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/dietlibc/diet-qmail/tcp.smtp	Wed Feb 15 15:10:10 2012 +0100
 @@ -0,0 +1,81 @@
 +#------------------------------------------------------
 +# DESCRIPTION OF THE RULES TO REMIND ME OF HOW THIS FILE WORKS
diff -r f232929781d6 -r ee6165a0b4ed series
--- a/series	Wed Feb 15 15:09:58 2012 +0100
+++ b/series	Wed Feb 15 15:10:21 2012 +0100
@@ -16,7 +16,6 @@
 diet-openssl.patch
 diet-ucspi-ssl.patch
 diet-qmail.patch
-upgrade-0.9-diet-qmail.patch
 diet-qmail-autoresponder.patch
 upgrade-0.9-diet-qmail-autoresponder.patch
 diet-ucspi-proxy.patch
diff -r f232929781d6 -r ee6165a0b4ed upgrade-0.9-diet-qmail.patch
--- a/upgrade-0.9-diet-qmail.patch	Wed Feb 15 15:09:58 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diet-qmail: Upgrade for Frugalware 0.9
-
-diff --git a/source/dietlibc/diet-qmail/FrugalBuild b/source/dietlibc/diet-qmail/FrugalBuild
-index c973246..99ee747 100644
---- a/source/dietlibc/diet-qmail/FrugalBuild
-+++ b/source/dietlibc/diet-qmail/FrugalBuild
-@@ -14,7 +14,7 @@ branch=diet
- pkgorig=qmail
- pkgname=$branch-$pkgorig
- pkgver=1.03
--pkgrel=1
-+pkgrel=2
- pkgdesc="A secure, reliable, efficient, SMTP/POP3 server."
- url="http://cr.yp.to/qmail.html"
- depends=('daemontools' 'ucspi-tcp' 'openssl')