I'm experimenting with RELENG_1/FreeBSD-RELENG_6, and I noticed a couple
patches fail (error excerpt at the bottom)
I'm a little paranoid about error-less builds, so please accept the
attached patch that fixes the failures (you need to apply from
/home/pfsense/tools)
Angelo.
======================================= error log
--------------------------
|Index: dev/ral/if_ral.c
|===================================================================
|RCS file: /home/ncvs/src/sys/dev/ral/Attic/if_ral.c,v
|retrieving revision 1.10.2.7
|diff -u -r1.10.2.7 if_ral.c
|--- dev/ral/if_ral.c 25 Feb 2006 00:50:19 -0000 1.10.2.7
|+++ dev/ral/if_ral.c 3 Jun 2006 20:19:06 -0000
--------------------------
No file to patch. Skipping...
Hunk #1 ignored at 1517.
Hunk #2 ignored at 2109.
Hunk #3 ignored at 2145.
(...)
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: net/bpf.h
|===================================================================
|RCS file: /home/ncvs/src/sys/net/bpf.h,v
|retrieving revision 1.39.2.1
|diff -u -r1.39.2.1 bpf.h
|--- net/bpf.h 29 Sep 2005 23:48:04 -0000 1.39.2.1
|+++ net/bpf.h 3 Jun 2006 21:30:52 -0000
--------------------------
Patching file net/bpf.h using Plan A...
Hunk #1 failed at 34.
Hunk #2 succeeded at 615 (offset 12 lines).
Hunk #3 succeeded at 638 (offset 12 lines).
1 out of 3 hunks failed--saving rejects to net/bpf.h.rej
(.....)
Patching ip_input.c.diff
./cvsup_current: cannot open
/home/pfsense/tools/patches/RELENG_6/ip_input.c.diff: No such file or
directory
Index: builder_scripts/patches.RELENG_6
===================================================================
RCS file: /home/pfsense/cvsroot/tools/builder_scripts/patches.RELENG_6,v
retrieving revision 1.19
diff -u -u -r1.19 patches.RELENG_6
--- builder_scripts/patches.RELENG_6 19 Nov 2006 18:09:52 -0000 1.19
+++ builder_scripts/patches.RELENG_6 11 Jan 2007 12:56:20 -0000
@@ -15,7 +15,6 @@
~sys/netipsec~key.c.diff~
-p0~~hostapd_iapp.diff~
-p0~~billm-pfctl-expose-queues.patch~
-~sys/netinet~ip_input.c.diff~
~~~/sys/conf/options
~~~/sys/netinet/udp_var.h
~~~/sys/netinet/udp.h
Index: patches/RELENG_6/bpf_fixes.diff
===================================================================
RCS file: /home/pfsense/cvsroot/tools/patches/RELENG_6/bpf_fixes.diff,v
retrieving revision 1.3
diff -u -u -r1.3 bpf_fixes.diff
--- patches/RELENG_6/bpf_fixes.diff 6 Oct 2006 15:14:09 -0000 1.3
+++ patches/RELENG_6/bpf_fixes.diff 11 Jan 2007 12:55:29 -0000
@@ -153,40 +153,6 @@
bpf_mtap(ic->ic_rawbpf, m0);
if (iwi_tx_start(ifp, m0, ni, ac) != 0) {
-Index: dev/ral/if_ral.c
-===================================================================
-RCS file: /home/ncvs/src/sys/dev/ral/Attic/if_ral.c,v
-retrieving revision 1.10.2.7
-diff -u -r1.10.2.7 if_ral.c
---- dev/ral/if_ral.c 25 Feb 2006 00:50:19 -0000 1.10.2.7
-+++ dev/ral/if_ral.c 3 Jun 2006 20:19:06 -0000
-@@ -1517,7 +1517,7 @@
-
- ieee80211_beacon_update(ic, data->ni, &sc->sc_bo, data->m, 1);
-
-- if (ic->ic_rawbpf != NULL)
-+ if (bpf_peers_present(ic->ic_rawbpf))
- bpf_mtap(ic->ic_rawbpf, data->m);
-
- ral_tx_bcn(sc, data->m, data->ni);
-@@ -2109,7 +2109,7 @@
- ni = (struct ieee80211_node *)m0->m_pkthdr.rcvif;
- m0->m_pkthdr.rcvif = NULL;
-
-- if (ic->ic_rawbpf != NULL)
-+ if (bpf_peers_present(ic->ic_rawbpf))
- bpf_mtap(ic->ic_rawbpf, m0);
-
- if (ral_tx_mgt(sc, m0, ni) != 0)
-@@ -2145,7 +2145,7 @@
- continue;
- }
-
-- if (ic->ic_rawbpf != NULL)
-+ if (bpf_peers_present(ic->ic_rawbpf))
- bpf_mtap(ic->ic_rawbpf, m0);
-
- if (ral_tx_data(sc, m0, ni) != 0) {
Index: dev/usb/if_ural.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/if_ural.c,v
@@ -448,15 +414,6 @@
diff -u -r1.39.2.1 bpf.h
--- net/bpf.h 29 Sep 2005 23:48:04 -0000 1.39.2.1
+++ net/bpf.h 3 Jun 2006 21:30:52 -0000
-@@ -34,7 +34,7 @@
- * @(#)bpf.h 8.1 (Berkeley) 6/10/93
- * @(#)bpf.h 1.34 (LBL) 6/16/96
- *
-- * $FreeBSD: src/sys/net/bpf.h,v 1.39.2.1 2005/09/29 23:48:04 csjp Exp $
-+ * $FreeBSD: src/sys/net/bpf.h,v 1.44 2006/06/03 18:48:14 csjp Exp $
- */
-
- #ifndef _NET_BPF_H_
@@ -603,7 +603,18 @@
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
