I am trying to build a FreeBSD 7.3 system to build pfSense 1.2.3.
The host system, jails ...etc are running. I am having problems with the
kernel patches for pfSense.
The question is
What is the best approach to generate the correct diff's to patch what current
versions of the files in 7.3?
Details:
The RELENG_7_3-supfile uses the cvs tag RELENG_7 this gives the following
patch errors:
Using RELENG_7
/usr/pfSensesrc/src/sys/dev/usb/uftdi.c.rej
/usr/pfSensesrc/src/sys/contrib/pf/net/pf.c.rej
/usr/pfSensesrc/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c.rej
/usr/pfSensesrc/src/contrib/pf/pfctl/parse.y.rej
/usr/pfSensesrc/src/contrib/tcsh/sh.c.rej
/usr/pfSensesrc/src/etc/rc.initdiskless.rej
If change the tag in RELENG_7_3-supfile to RELENG_7_3, RELENG_7_3_BP or
RELENG_7_3_0_RELEASE
I end with the just the following two errors.
/usr/pfSensesrc/src/sys/contrib/pf/net/pf.c.rej
/usr/pfSensesrc/src/contrib/pf/pfctl/parse.y.rej
Looking at the diff files for pf.c it is looking for
the version this is coming out of the FreeBSD cvs archive is
__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.46.2.7 2010/01/23 00:41:04
delphij Exp $");
I think this diff which is having a problem.
../patches/RELENG_7_3/dummynet.RELENG_7.diff
it is looking for revision 1.3
Which is in the MAIN branch and does not have any tags
*** 4667,4672 ****
{
struct pf_state_cmp key;
struct tcphdr *th = pd->hdr.tcp;
u_int16_t win = ntohs(th->th_win);
u_int32_t ack, end, seq, orig_seq;
u_int8_t sws, dws;
--- 4677,4683 ----
{
struct pf_state_cmp key;
struct tcphdr *th = pd->hdr.tcp;
+ struct pf_rule *r = NULL;
u_int16_t win = ntohs(th->th_win);
u_int32_t ack, end, seq, orig_seq;
u_int8_t sws, dws;
/usr/pfSensesrc/src/sys/contrib/pf/net/pf.c.rej
/usr/pfSensesrc/src/contrib/pf/pfctl/parse.y.rej
What is the best approach to generate the correct diff to patch what current
versions of pf.c and parse.y if use RELENG_7_3_0_RELEASE
or when using RELENG_7 for
/usr/pfSensesrc/src/sys/dev/usb/uftdi.c.rej
/usr/pfSensesrc/src/sys/contrib/pf/net/pf.c.rej
/usr/pfSensesrc/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c.rej
/usr/pfSensesrc/src/contrib/pf/pfctl/parse.y.rej
/usr/pfSensesrc/src/contrib/tcsh/sh.c.rej
/usr/pfSensesrc/src/etc/rc.initdiskless.rej
Eric Bruno
