[eside-ghost] problemas con qmail y sus parches

[.oO RaY Oo.]

Buenas, a ver si tengo suerte y alguien puede echarme un cable con 
qmail, que me tiene un poco frito.

El tema es quiero hacer que qmail utilice spf y tambien domainkeys. Como 
para la mayoria de cosas en qmail hay que aplicar un parche para cada 
uno. El problema es que si los aplico por separado ambos funcionan bien, 
pero si aplico los 2 me dan algun que otro error.

Si instalo primero el parche para spf al aplicar el de domainkeys me 
sale este error:

PFC-Correo:~/dk/qmail-1.03# patch < qmail-1.03-qdk-0.50.patch
patching file Makefile
Hunk #1 FAILED at 808.
Hunk #2 succeeded at 1128 (offset 20 lines).
1 out of 2 hunks FAILED -- saving rejects to file Makefile.rej
patching file qmail-dk.8
patching file qmail-dk.

El contenido del Makefile.rej por si sirve de algo:

***************
*** 808,813 ****
  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

  load: \
--- 808,814 ----
  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 \
+ qmail-dk \
  binm3 binm3+df

  load: \



Si primero pongo el de domainkeys es el de spf el que falla:

PFC-Correo:~/dk/qmail-1.03# patch -p1 < qmail-spf-rc5.patch
patching file byte_cspn.c
patching file byte.h
patching file byte_rcspn.c
patching file dns.c
patching file dnsfq.c
patching file dns.h
patching file dnsptr.c
patching file dnstxt.c
patching file FILES
patching file Makefile
Hunk #5 FAILED at 824.
Hunk #6 succeeded at 1484 (offset 25 lines).
Hunk #7 succeeded at 1500 (offset 25 lines).
Hunk #8 succeeded at 1573 (offset 25 lines).
Hunk #9 succeeded at 1596 (offset 25 lines).
Hunk #10 succeeded at 1824 (offset 25 lines).
Hunk #11 succeeded at 1858 (offset 25 lines).
Hunk #12 succeeded at 1870 (offset 25 lines).
Hunk #13 succeeded at 1943 (offset 25 lines).
Hunk #14 succeeded at 1975 (offset 25 lines).
Hunk #15 succeeded at 1990 (offset 25 lines).
Hunk #16 succeeded at 2073 (offset 25 lines).
Hunk #17 succeeded at 2138 (offset 25 lines).
1 out of 17 hunks FAILED -- saving rejects to file Makefile.rej
patching file qmail-control.9
patching file qmail-showctl.c
patching file qmail-smtpd.8
patching file qmail-smtpd.c
patching file spf.c
patching file spf.h
patching file spfquery.c
patching file str_cpyb.c
patching file str.h
patching file strsalloc.c
patching file strsalloc.h
patching file TARGETS
patching file tcp-env.c

y su respectivo Makefile.rej:

***************
*** 804,814 ****
  qmail-pw2u qmail-qread qmail-qstat qmail-tcpto qmail-tcpok \
  qmail-pop3d qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd \
  qmail-smtpd sendmail tcp-env qmail-newmrh config config-fast dnscname \
- dnsptr dnsip dnsmxip dnsfq hostname ipmeprint qreceipt qsmhook qbiff \
  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

  load: \
  make-load warn-auto.sh systype
--- 824,834 ----
  qmail-pw2u qmail-qread qmail-qstat qmail-tcpto qmail-tcpok \
  qmail-pop3d qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd \
  qmail-smtpd sendmail tcp-env qmail-newmrh config config-fast dnscname \
+ dnsptr dnsip dnsmxip dnsfq dnstxt hostname ipmeprint qreceipt qsmhook 
qbiff \
  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 spfquery

  load: \
  make-load warn-auto.sh systype


Un saludo y gracias por adelantado ;)