[SA-exim] patch question for exim-4.42 and sa-exim-4.2.1

[Edward Brown]

Patch is reporting failure for local_scan.c

I'm not sure if I'm executing the patch correctly or not. Here are the
details:


System = FreeBSD 6.2

pwd = /usr/home/mail/src/exim-4.42/

patch -C -p1 <
/usr/home/mail/src/sa-exim-4.2.1/localscan_dlopen_exim_4.20_or_better.patch

executing thiscommand yields the following:


Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|The initial version of this patch was originally posted David
Woodhouse, and
|dman gets the credit for first integrating it with SA-Exim.
|
|I have since then maintained it by first making a few minor changes, and
|later switching it to a major/minor number scheme to support upgrades in
|the exim API that don't affect backward compatibility (you can rely on
|a feature denoted by the minor number and be compatible with future
versions
|of exim until Philip has to break the API and increase the major number)
|
|Marc MERLIN <***@merlins.org>
|
|diff -urN exim-4.14-0/src/EDITME exim-4.14-1/src/EDITME
|--- exim-4.14-0/src/EDITME Tue Mar 11 04:20:18 2003
|+++ exim-4.14-1/src/EDITME Sun Mar 23 15:34:15 2003
--------------------------
Patching file src/EDITME using Plan A...
Hunk #1 succeeded at 525 (offset 137 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urNad 50_localscan_dlopen.tmp/src/config.h.defaults
50_localscan_dlopen/src/config.h.defaults
|--- 50_localscan_dlopen.tmp/src/config.h.defaults Sun Dec 29
11:55:42 2002
|+++ 50_localscan_dlopen/src/config.h.defaults Sun Dec 29 11:56:44 2002
--------------------------
Patching file src/config.h.defaults using Plan A...
Hunk #1 succeeded at 20 (offset 3 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN exim-4.14-0/src/globals.c exim-4.14-1/src/globals.c
|--- exim-4.14-0/src/globals.c Tue Mar 11 04:20:20 2003
|+++ exim-4.14-1/src/globals.c Sun Mar 23 15:34:15 2003
--------------------------
Patching file src/globals.c using Plan A...
Hunk #1 succeeded at 110 (offset 7 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN exim-4.14-0/src/globals.h exim-4.14-1/src/globals.h
|--- exim-4.14-0/src/globals.h Tue Mar 11 04:20:20 2003
|+++ exim-4.14-1/src/globals.h Sun Mar 23 15:34:15 2003
--------------------------
Patching file src/globals.h using Plan A...
Hunk #1 succeeded at 74 (offset 7 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN exim-4.14-0/src/local_scan.c exim-4.14-1/src/local_scan.c
|--- exim-4.14-0/src/local_scan.c Tue Mar 11 04:20:20 2003
|+++ exim-4.14-1/src/local_scan.c Sun Mar 23 15:34:15 2003
--------------------------
Patching file src/local_scan.c using Plan A...
Hunk #1 failed at 5.
1 out of 1 hunks failed--saving rejects to src/local_scan.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN exim-4.14-0/src/readconf.c exim-4.14-1/src/readconf.c
|--- exim-4.14-0/src/readconf.c Tue Mar 11 04:20:22 2003
|+++ exim-4.14-1/src/readconf.c Sun Mar 23 15:34:15 2003
--------------------------
Patching file src/readconf.c using Plan A...
Hunk #1 succeeded at 223 (offset 41 lines).
done


I haven't run the command without -C yet. If need be, I can run without
-C and produce results in local_scan.c.rej

-E

[Marc MERLIN]

Post by Edward Brown
Patching file src/local_scan.c using Plan A...
Hunk #1 failed at 5.
1 out of 1 hunks failed--saving rejects to src/local_scan.c.rej

Ok, so it looks like everything applied except one line.

Look at the .rej, look at the .c, they should be easy to hand apply.

If something changed in the recent exim source code tree, I can provide a
new diff (I don't look anymore because many/most exim packages on linux seem
to come with the patch already applied)

Marc