ZDB -Z?

[Andrew Heybey]

On Dec 10, 2014, at 3:58 PM, Zaphod Beeblebrox <zbeeble at gmail.com> wrote:
> 
> I tried applying the patch to 10.1 and to -CURRENT (11) ... and I get:
> 
> [2:9:309]root at test-c1:/usr/src/cddl/contrib/opensolaris/cmd/zdb> patch <~dgilbert/zdb-z-patch
> Hmm...  Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
> |index c265c99..bf43ea1 100644
> |--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c
> |+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
> --------------------------
> Patching file zdb.c using Plan A...
> Hunk #1 succeeded at 59.
> Hunk #2 succeeded at 3085 with fuzz 1 (offset 339 lines).
> Hunk #3 succeeded at 3305 with fuzz 2 (offset 339 lines).
> Hunk #4 succeeded at 3329 with fuzz 2 (offset 339 lines).
> Hunk #5 failed at 3408.
> Hunk #6 failed at 3644.
> Hunk #7 failed at 3659.
> Hunk #8 failed at 3718.
> Hunk #9 failed at 3849.
> 5 out of 9 hunks failed--saving rejects to zdb.c.rej
> done
> 
> ... what version of FreeBSD is this patch against?

It is against tip of releng/10.0 as of Sep 16.  Last commit before my patch was:

Author: delphij <delphij at FreeBSD.org>
Date:   Tue Sep 16 09:50:19 2014 +0000

    Fix Denial of Service in TCP packet processing.
    
    Security:   FreeBSD-SA-14:19.tcp
    Approved by:        so

which is SVN revision r271669 as far as I can tell.

What does the .rej file tell you?

andrew