I recently downloaded the latest qmail-ldap patch and the latest
qmail-ldap-control patch, but after applying the qmail-ldap patch, the
qmail-ldap-control patch doesn't seem to apply cleanly:
adam@sunfish:~/tmp/qmail-1.03$ gzcat ../qmail-ldap-1.03-20010501.patch.gz | gpatch -p1
(applies cleanly)
adam@sunfish:~/tmp/qmail-1.03$ gzcat ../qmail-ldap-control_20010502.patch.gz |gpatch
-p1
patching file Makefile
Hunk #7 FAILED at 424.
Hunk #10 succeeded at 782 (offset 1 line).
Hunk #12 succeeded at 1357 (offset 1 line).
Hunk #14 succeeded at 1410 (offset 1 line).
Hunk #15 succeeded at 1431 with fuzz 2.
Hunk #16 succeeded at 1456 (offset 1 line).
Hunk #18 succeeded at 1552 (offset 1 line).
Hunk #20 succeeded at 1582 (offset 1 line).
Hunk #22 succeeded at 1616 (offset 1 line).
Hunk #24 succeeded at 1695 (offset 1 line).
Hunk #26 succeeded at 1719 (offset 1 line).
Hunk #28 succeeded at 1762 (offset 1 line).
Hunk #30 succeeded at 1793 (offset 1 line).
Hunk #32 succeeded at 1812 (offset 1 line).
1 out of 33 hunks FAILED -- saving rejects to file Makefile.rej
patching file QLDAPINSTALL
Hunk #4 succeeded at 733 (offset 34 lines).
Hunk #6 succeeded at 823 with fuzz 2 (offset 35 lines).
patching file QLDAPNEWS
Hunk #1 succeeded at 73 (offset 24 lines).
Hunk #3 succeeded at 152 (offset 24 lines).
Hunk #5 succeeded at 189 (offset 24 lines).
patching file QLDAPTODO
patching file auth_imap.c
patching file auth_pop.c
patching file checkpassword.c
Hunk #1 succeeded at 335 (offset 5 lines).
patching file control.c
patching file ldapcfg.sh
patching file qldap-ldaplib.c
Hunk #11 succeeded at 655 (offset 2 lines).
patching file qmail-inject.c
patching file qmail-ldap.h
patching file qmail-ldaplookup.c
Hunk #1 succeeded at 44 (offset -1 lines).
patching file qmail-local.c
Hunk #1 succeeded at 879 with fuzz 2 (offset 1 line).
patching file qmail-lspawn.c
patching file qmail-pw2u.c
patching file qmail-qmqpc.c
patching file qmail-qmtpd.c
patching file qmail-queue.c
patching file qmail-remote.c
patching file qmail-reply.c
Hunk #1 FAILED at 71.
1 out of 1 hunk FAILED -- saving rejects to file qmail-reply.c.rej
patching file qmail-rspawn.c
patching file qmail-send.c
Hunk #2 succeeded at 1477 (offset 6 lines).
patching file qmail-showctl.c
patching file qmail-smtpd.c
Hunk #2 succeeded at 231 (offset 3 lines).
patching file qmail-start.c
patching file qmailControl.schema
I'd rather not go into the source and attempt to edit things by hand. Does
anyone know if a clean patch exists, or will I need to go and use an older
version of qmail-ldap in order to have this apply cleanly? If so, does
anyone know which version?
Thanks,
--Adam
--
Adam McKenna <[EMAIL PROTECTED]> | Help stop animal abuse at Petco!
http://flounder.net/publickey.html | http://www.mickaboofriends.org
GPG: 17A4 11F7 5E7E C2E7 08AA |
38B0 05D0 8BF7 2C6D 110A |
