[PATCH] pf(4) patch from OpenBSD 4.5

[Fabian Keil]

Max Laier <max at laiers.net> wrote:

> C'mon ... where are the testers at?
> 
> On 18.10.2010 11:10, Ermal Luçi wrote:
> > Feedback is very welcome.
> 
> Is there no-one testing Ermal's exciting patch?  Let's help getting this 
> tested ... before we put it into SVN!
> 
> fetch http://people.freebsd.org/~eri/pf45_1.diff
> patch -p1 < pf45_1.diff

I think that should be -p0.

> make buildworld buildkernel
> etc. ...
> 
> Let's go!!!  And do not forget to reply if it works just, too.

I got a bunch of rejections:

fk at r500 /usr/src $patch -C -p0 < /home/fk/test/freebsd/pf45_1.diff 2>&1 | grep .rej
1 out of 6 hunks failed--saving rejects to contrib/pf/pfctl/pfctl_table.c.rej
1 out of 114 hunks failed--saving rejects to contrib/pf/pfctl/parse.y.rej
1 out of 37 hunks failed--saving rejects to contrib/pf/pfctl/pfctl.c.rej
1 out of 4 hunks failed--saving rejects to contrib/pf/pfctl/pfctl_parser.h.rej
1 out of 15 hunks failed--saving rejects to contrib/pf/pfctl/pfctl.8.rej
1 out of 6 hunks failed--saving rejects to contrib/pf/pfctl/pfctl.h.rej
1 out of 56 hunks failed--saving rejects to sys/contrib/pf/net/pf_norm.c.rej
1 out of 16 hunks failed--saving rejects to sys/contrib/pf/net/if_pflog.c.rej
1 out of 15 hunks failed--saving rejects to sys/contrib/pf/net/pf_osfp.c.rej

They can be fixed by running the files through
perl -i'' -pe 's@\$FreeBSD[^\$]+\$@\$FreeBSD\$@' *
before applying the patch.

Afterwards the patch applies cleanly. However the build still fails for me:

/usr/obj/usr/src/make.amd64/make -V CFILES -V SYSTEM_CFILES -V GEN_CFILES |  MKDEP_CPP="cc -E" CC="cc" xargs mkdep -a -f .newdep -O2 -frename-registers -pipe -fno-strict-aliasing  -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc  -I. -I/usr/src/sys -I/usr/src/sys/contrib/altq -I/usr/src/sys/contrib/ipfilter -I/usr/src/sys/contrib/pf -I/usr/src/sys/dev/ath -I/usr/src/sys/dev/ath/ath_hal -I/usr/src/sys/contrib/ngatm -I/usr/src/sys/dev/twa -I/usr/src/sys/gnu/fs/xfs/FreeBSD -I/usr/src/sys/gnu/fs/xfs/FreeBSD/support -I/usr/src/sys/gnu/fs/xfs -I/usr/src/sys/contrib/opensolaris/compat -I/usr/src/sys/dev/cxgb -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000  -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone  -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow  -msoft-float -fno-asynchronous-unwind-tables -ffreestanding -fstack-protector
/usr/src/sys/contrib/pf/net/pf.c:149:26: error: net/if_pflow.h: No such file or directory
mkdep: compile failed
*** Error code 1

Stop in /usr/obj/usr/src/sys/ZOEY.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.

I'm using HEAD from yesterday and if_pflow.h indeed doesn't seem to exist.

Fabian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-pf/attachments/20101024/e27fdc4b/signature.pgp