haproxy + stunnel + patch not working

Hi,

I can't get patch 'stunnel-4.22-xforwarded-for.diff' being executed successfully with stunnel-4.22 on my solaris box. To be honest, I am a bit loss how to apply this patch .

I did the following steps:

• cd /var/tmp/stunnel-4.22
• patch -p0 ../stunnel-4.22-xforwarded-for.diff Looks like a unified context diff. File to patch: /var/tmp/stunnel-4.22/src/client.c

I don't know to which file should be applied. Looking into the stunnel-4.22-xforwarded-for.diff file, there are some differences with several files. Most of them come from src/client.c. I tried with this file and some other (in different attempts) but I always get many fails:

Hunk #1 failed at line 534.
1 out of 1 hunks failed: saving rejects to
/var/tmp/stunnel-4.22/src/client.c.rej

 The next patch looks like a unified context diff. Hunk #1 failed at line 445.
1 out of 1 hunks failed: saving rejects to
/var/tmp/stunnel-4.22/src/client.c.rej

 The next patch looks like a unified context diff.  The next patch looks like a unified context diff. Hunk #1 failed at line 53.
1 out of 1 hunks failed: saving rejects to
/var/tmp/stunnel-4.22/src/client.c.rej

 The next patch looks like a unified context diff. Hunk #1 failed at line 765.
1 out of 1 hunks failed: saving rejects to
/var/tmp/stunnel-4.22/src/client.c.rej

 The next patch looks like a unified context diff. Hunk #1 failed at line 227.
Hunk #2 failed at line 330.
2 out of 2 hunks failed: saving rejects to
/var/tmp/stunnel-4.22/src/client.c.rej

done

Looking into the file.rej I see the commands are related to the "xforwardedfor". Then I compile and install stunnel but it complains with the command:

xforwardedfor=yes

Any hint on applying the patch will be appreciated! Thanks a lot,
Xavi Received on 2009/09/03 12:58