Hmm...after setting the patch to -p0, I get this error:
+ echo 'Patch #110 (squid-2.5.STABLE5-proxy_abuse.patch):'
Patch #110 (squid-2.5.STABLE5-proxy_abuse.patch):
+ patch -p1 -s
+ echo 'Patch #111 (follow_xff-2.5.patch):'
Patch #111 (follow_xff-2.5.patch):
+ patch -p0 -s
1 out of 5 hunks FAILED -- saving rejects to file src/structs.h.rej
error: Bad exit status from /var/tmp/rpm-tmp.21369 (%prep)
RPM build errors:
Bad exit status from /var/tmp/rpm-tmp.21369 (%prep)
-Devon
-----Original Message-----
From: Henrik Nordstrom [mailto:hno@squid-cache.org]
Sent: Thursday, December 16, 2004 5:33 PM
To: Harding, Devon
Cc: Henrik Nordstrom; Chris Robertson; squid-users@squid-cache.org
Subject: RE: [squid-users] follow_xff rpm?
On Thu, 16 Dec 2004, Harding, Devon wrote:
> Patch #111 (follow_xff-2.5.patch):
> + patch -p1 -s
> missing header for unified diff at line 4 of patch
> The text leading up to this was:
> --------------------------
> |Index: acconfig.h
Looks like this patch requires -p0, not -p1
man patch
if you want to know what this does.
Regards
Henrik
Received on Fri Dec 17 2004 - 07:09:52 MST
This archive was generated by hypermail pre-2.1.9 : Sat Jan 01 2005 - 12:00:02 MST