This fix patch corrects the errors caused by patching
netqmail-1.05 with Shupp's netqmail-1.05-tls-smtpauth-20041111.patch
then Russell Nelson's qmail-smtpd-viruscan-1.3 patch.
Get Shupp's patch from http://www.shupp.org
Get Russell's patch from http://www.qmail.org
I do not mean to say there is anything wrong with their patches. There isn't. I think
they are both great. But, they were made separately, and just don't apply
cleanly together, no matter which order you apply them in. This little patch
just makes netqmail-1.05 completely patched with both patches.
One gotcha. Shupp's patch uses the syntax 'chown user.group' in the
Makefile-cert script. My system (FreeBSD) doesn't like the '.' separating
the user from the group. If yours doesn't either, open Shupp's patch with
an editor, like vi. Search for the 'chown' command. Change the 'chown
qmaild.qmail' parts to 'chown qmaild:qmail' BEFORE applying his patch.
There are only five 'chown' commands.
Usage (assuming you have downloaded all source files patches to /usr/local/src):
cd /usr/local/src
rm -rf ./netqmail-1.05
tar -zxf netqmail-1.05.tar.gz
cd netqmail-1.05
./collate.sh
cd netqmail-1.05
patch -p0 < ../../netqmail-1.05-tls-smtpauth-20041111.patch
patch < ../../qmail-smtpd-viruscan-1.3.patch
----
Do not worry about that "Hunk #6 FAILED at 569." line generated from the qmail-viruscan-1.3.patch. This next patch fixes that.
----
patch < ../../fixshupp-nelson.patch