summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-11-01 16:22:07 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-11-01 16:22:07 +0000
commitc28bdfd345f2be519d51638e36f2e7e6f8cb2bde (patch)
tree1e0b570d263cd0718ba4822db0cf0be611269b85 /sys-freebsd/freebsd-sources
parentNew version (diff)
downloadhistorical-c28bdfd345f2be519d51638e36f2e7e6f8cb2bde.tar.gz
historical-c28bdfd345f2be519d51638e36f2e7e6f8cb2bde.tar.bz2
historical-c28bdfd345f2be519d51638e36f2e7e6f8cb2bde.zip
Bump to 6.2_beta3.
Package-Manager: portage-2.1.2_rc1-r1
Diffstat (limited to 'sys-freebsd/freebsd-sources')
-rw-r--r--sys-freebsd/freebsd-sources/ChangeLog8
-rw-r--r--sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta33
-rw-r--r--sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch526
-rw-r--r--sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild83
4 files changed, 619 insertions, 1 deletions
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 10ea331ac683..fce84e3430c8 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-freebsd/freebsd-sources
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.29 2006/10/23 22:05:40 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.30 2006/11/01 16:19:11 flameeyes Exp $
+
+*freebsd-sources-6.2_beta3 (01 Nov 2006)
+
+ 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+ +files/freebsd-sources-6.2-gcc41.patch, +freebsd-sources-6.2_beta3.ebuild:
+ Bump to 6.2_beta3.
23 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
freebsd-sources-6.2_beta2.ebuild:
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta3 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta3
new file mode 100644
index 000000000000..c97be3678ae2
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.2_beta3
@@ -0,0 +1,3 @@
+MD5 328ec3b03995fcab39126e3437cabb72 freebsd-sys-6.2_beta3.tar.bz2 18336143
+RMD160 c75040d96af463013459f3a3278d4cca1d78e828 freebsd-sys-6.2_beta3.tar.bz2 18336143
+SHA256 f52b0bf25d2ae5792503789a1bd47bc0db7924c13df55021c7740dcdd5a4225c freebsd-sys-6.2_beta3.tar.bz2 18336143
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch
new file mode 100644
index 000000000000..b6dd2cb72448
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.2-gcc41.patch
@@ -0,0 +1,526 @@
+Index: sys/conf/kern.pre.mk
+===================================================================
+--- sys/conf/kern.pre.mk.orig
++++ sys/conf/kern.pre.mk
+@@ -46,7 +46,7 @@ NOSTDINC= -X
+ NOSTDINC= -nostdinc
+ .endif
+
+-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S
++INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
+
+ # This hack lets us use the OpenBSD altq code without spamming a new
+ # include path into contrib'ed source files.
+Index: sys/conf/kmod.mk
+===================================================================
+--- sys/conf/kmod.mk.orig
++++ sys/conf/kmod.mk
+@@ -87,7 +87,7 @@ NOSTDINC= -X
+ .else
+ NOSTDINC= -nostdinc
+ .endif
+-CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*}
++CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
+ .if defined(KERNBUILDDIR)
+ CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
+ .endif
+Index: sys/ddb/db_command.c
+===================================================================
+--- sys/ddb/db_command.c.orig
++++ sys/ddb/db_command.c
+@@ -75,7 +75,7 @@ static db_cmdfcn_t db_stack_trace_all;
+ static db_cmdfcn_t db_watchdog;
+
+ /* XXX this is actually forward-static. */
+-extern struct command db_show_cmds[];
++static struct command db_show_cmds[];
+
+ /*
+ * if 'ed' style: 'dot' is set at start of last item printed,
+Index: sys/dev/cp/if_cp.c
+===================================================================
+--- sys/dev/cp/if_cp.c.orig
++++ sys/dev/cp/if_cp.c
+@@ -338,7 +338,7 @@ static void cp_intr (void *arg)
+ #endif
+ }
+
+-extern struct cdevsw cp_cdevsw;
++static struct cdevsw cp_cdevsw;
+
+ static void
+ cp_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error)
+Index: sys/dev/ctau/if_ct.c
+===================================================================
+--- sys/dev/ctau/if_ct.c.orig
++++ sys/dev/ctau/if_ct.c
+@@ -486,7 +486,7 @@ static int ct_probe (device_t dev)
+ return 0;
+ }
+
+-extern struct cdevsw ct_cdevsw;
++static struct cdevsw ct_cdevsw;
+
+ static void
+ ct_bus_dmamap_addr (void *arg, bus_dma_segment_t *segs, int nseg, int error)
+Index: sys/dev/cx/if_cx.c
+===================================================================
+--- sys/dev/cx/if_cx.c.orig
++++ sys/dev/cx/if_cx.c
+@@ -229,7 +229,7 @@ static cx_board_t *adapter [NCX];
+ static drv_t *channel [NCX*NCHAN];
+ static struct callout led_timo [NCX];
+ static struct callout timeout_handle;
+-extern struct cdevsw cx_cdevsw;
++static struct cdevsw cx_cdevsw;
+
+ static int MY_SOFT_INTR;
+
+Index: sys/dev/fb/vga.c
+===================================================================
+--- sys/dev/fb/vga.c.orig
++++ sys/dev/fb/vga.c
+@@ -206,7 +206,7 @@ typedef struct adp_state adp_state_t;
+ * with a physical address in the following table, as verify_adapter()
+ * will perform address conversion at run-time.
+ */
+-static video_adapter_t adapter_init_value[] = {
++video_adapter_t adapter_init_value[] = {
+ /* DCC_MONO */
+ { 0, KD_MONO, "mda", 0, 0, 0, IO_MDA, IO_MDASIZE, MONO_CRTC,
+ MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_BASE, MDA_BUF_SIZE, MDA_BUF_SIZE,
+@@ -748,10 +748,7 @@ static u_char
+ }
+
+ #ifndef VGA_NO_BIOS
+-static void
+-fill_adapter_param(int code, video_adapter_t *adp)
+-{
+- static struct {
++ struct {
+ int primary;
+ int secondary;
+ } dcc[] = {
+@@ -768,7 +765,9 @@ fill_adapter_param(int code, video_adapt
+ { DCC_EGAMONO, DCC_CGA40 },
+ { DCC_EGAMONO, DCC_CGA80 },
+ };
+-
++static void
++fill_adapter_param(int code, video_adapter_t *adp)
++{
+ if ((code < 0) || (code >= sizeof(dcc)/sizeof(dcc[0]))) {
+ adp[V_ADP_PRIMARY] = adapter_init_value[DCC_MONO];
+ adp[V_ADP_SECONDARY] = adapter_init_value[DCC_CGA80];
+Index: sys/dev/iicbus/iicbus.c
+===================================================================
+--- sys/dev/iicbus/iicbus.c.orig
++++ sys/dev/iicbus/iicbus.c
+@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD: src/sys/dev/iicbus/i
+
+ #define DEVTOIICBUS(dev) ((struct iicbus_device*)device_get_ivars(dev))
+
+-static devclass_t iicbus_devclass;
++static devclass_t iicbus_dev_class;
+
+ /* See comments below for why auto-scanning is a bad idea. */
+ #define SCAN_IICBUS 0
+@@ -187,8 +187,8 @@ iicbus_null_repeated_start(device_t dev,
+ return (IIC_ENOTSUPP);
+ }
+
+-DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_devclass, 0, 0);
+-DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_devclass, 0, 0);
+-DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_devclass, 0, 0);
+-DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_devclass, 0, 0);
++DRIVER_MODULE(iicbus, pcf, iicbus_driver, iicbus_dev_class, 0, 0);
++DRIVER_MODULE(iicbus, envctrl, iicbus_driver, iicbus_dev_class, 0, 0);
++DRIVER_MODULE(iicbus, iicbb, iicbus_driver, iicbus_dev_class, 0, 0);
++DRIVER_MODULE(iicbus, bti2c, iicbus_driver, iicbus_dev_class, 0, 0);
+ MODULE_VERSION(iicbus, IICBUS_MODVER);
+Index: sys/dev/ppbus/ppb_msq.c
+===================================================================
+--- sys/dev/ppbus/ppb_msq.c.orig
++++ sys/dev/ppbus/ppb_msq.c
+@@ -153,31 +153,32 @@ ppb_MS_exec(device_t bus, device_t dev,
+ * Execute a microseq loop
+ *
+ */
++struct ppb_microseq loop_microseq_1[] = {
++ MS_CALL(0), /* execute prolog */
++
++ MS_SET(MS_UNKNOWN), /* set size of transfer */
++ /* loop: */
++ MS_CALL(0), /* execute body */
++ MS_DBRA(-1 /* loop: */),
++
++ MS_CALL(0), /* execute epilog */
++ MS_RET(0)
++};
++
+ int
+ ppb_MS_loop(device_t bus, device_t dev, struct ppb_microseq *prolog,
+ struct ppb_microseq *body, struct ppb_microseq *epilog,
+ int iter, int *ret)
+ {
+- struct ppb_microseq loop_microseq[] = {
+- MS_CALL(0), /* execute prolog */
+-
+- MS_SET(MS_UNKNOWN), /* set size of transfer */
+- /* loop: */
+- MS_CALL(0), /* execute body */
+- MS_DBRA(-1 /* loop: */),
+-
+- MS_CALL(0), /* execute epilog */
+- MS_RET(0)
+- };
+
+ /* initialize the structure */
+- loop_microseq[0].arg[0].p = (void *)prolog;
+- loop_microseq[1].arg[0].i = iter;
+- loop_microseq[2].arg[0].p = (void *)body;
+- loop_microseq[4].arg[0].p = (void *)epilog;
++ loop_microseq_1[0].arg[0].p = (void *)prolog;
++ loop_microseq_1[1].arg[0].i = iter;
++ loop_microseq_1[2].arg[0].p = (void *)body;
++ loop_microseq_1[4].arg[0].p = (void *)epilog;
+
+ /* execute the loop */
+- return (ppb_MS_microseq(bus, dev, loop_microseq, ret));
++ return (ppb_MS_microseq(bus, dev, loop_microseq_1, ret));
+ }
+
+ /*
+Index: sys/fs/fdescfs/fdesc_vnops.c
+===================================================================
+--- sys/fs/fdescfs/fdesc_vnops.c.orig
++++ sys/fs/fdescfs/fdesc_vnops.c
+@@ -74,7 +74,7 @@ static vop_readdir_t fdesc_readdir;
+ static vop_reclaim_t fdesc_reclaim;
+ static vop_setattr_t fdesc_setattr;
+
+-extern struct vop_vector fdesc_vnodeops;
++static struct vop_vector fdesc_vnodeops;
+
+ /*
+ * Initialise cache headers
+Index: sys/fs/ntfs/ntfs_vfsops.c
+===================================================================
+--- sys/fs/ntfs/ntfs_vfsops.c.orig
++++ sys/fs/ntfs/ntfs_vfsops.c
+@@ -60,7 +60,7 @@
+ #include <fs/ntfs/ntfs_ihash.h>
+ #include <fs/ntfs/ntfsmount.h>
+
+-static MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure");
++static MALLOC_DEFINE(M_NTFS_MNT, "NTFS mount", "NTFS mount structure");
+ MALLOC_DEFINE(M_NTFSNTNODE,"NTFS ntnode", "NTFS ntnode information");
+ MALLOC_DEFINE(M_NTFSFNODE,"NTFS fnode", "NTFS fnode information");
+ MALLOC_DEFINE(M_NTFSDIR,"NTFS dir", "NTFS dir buffer");
+@@ -279,7 +279,7 @@ ntfs_mountfs(devvp, mp, td)
+ error = bread(devvp, BBLOCK, BBSIZE, NOCRED, &bp);
+ if (error)
+ goto out;
+- ntmp = malloc( sizeof *ntmp, M_NTFSMNT, M_WAITOK | M_ZERO);
++ ntmp = malloc( sizeof *ntmp, M_NTFS_MNT, M_WAITOK | M_ZERO);
+ bcopy( bp->b_data, &ntmp->ntm_bootfile, sizeof(struct bootfile) );
+ /*
+ * We must not cache the boot block if its size is not exactly
+@@ -404,7 +404,7 @@ ntfs_mountfs(devvp, mp, td)
+ /* Alloc memory for attribute definitions */
+ MALLOC(ntmp->ntm_ad, struct ntvattrdef *,
+ num * sizeof(struct ntvattrdef),
+- M_NTFSMNT, M_WAITOK);
++ M_NTFS_MNT, M_WAITOK);
+
+ ntmp->ntm_adnum = num;
+
+@@ -512,8 +512,8 @@ ntfs_unmount(
+ MNT_ILOCK(mp);
+ mp->mnt_flag &= ~MNT_LOCAL;
+ MNT_IUNLOCK(mp);
+- FREE(ntmp->ntm_ad, M_NTFSMNT);
+- FREE(ntmp, M_NTFSMNT);
++ FREE(ntmp->ntm_ad, M_NTFS_MNT);
++ FREE(ntmp, M_NTFS_MNT);
+ return (error);
+ }
+
+Index: sys/fs/unionfs/union_vfsops.c
+===================================================================
+--- sys/fs/unionfs/union_vfsops.c.orig
++++ sys/fs/unionfs/union_vfsops.c
+@@ -473,7 +473,7 @@ union_statfs(mp, sbp, td)
+ return (0);
+ }
+
+-static struct vfsops union_vfsops = {
++static struct vfsops union_vfs_ops = {
+ .vfs_init = union_init,
+ .vfs_mount = union_mount,
+ .vfs_root = union_root,
+@@ -481,4 +481,4 @@ static struct vfsops union_vfsops = {
+ .vfs_unmount = union_unmount,
+ };
+
+-VFS_SET(union_vfsops, unionfs, VFCF_LOOPBACK);
++VFS_SET(union_vfs_ops, unionfs, VFCF_LOOPBACK);
+Index: sys/i386/i386/vm86.c
+===================================================================
+--- sys/i386/i386/vm86.c.orig
++++ sys/i386/i386/vm86.c
+@@ -505,7 +505,7 @@ full:
+ panic("vm86_addpage: not enough room");
+ }
+
+-static void
++void
+ vm86_initflags(struct vm86frame *vmf)
+ {
+ int eflags = vmf->vmf_eflags;
+Index: sys/i386/include/segments.h
+===================================================================
+--- sys/i386/include/segments.h.orig
++++ sys/i386/include/segments.h
+@@ -244,7 +244,7 @@ extern union descriptor gdt[];
+ extern struct soft_segment_descriptor gdt_segs[];
+ extern struct gate_descriptor *idt;
+ extern union descriptor ldt[NLDT];
+-extern struct region_descriptor r_gdt, r_idt;
++//extern struct region_descriptor r_gdt, r_idt;
+
+ void lgdt(struct region_descriptor *rdp);
+ void sdtossd(struct segment_descriptor *sdp,
+Index: sys/kern/kern_tc.c
+===================================================================
+--- sys/kern/kern_tc.c.orig
++++ sys/kern/kern_tc.c
+@@ -61,7 +61,7 @@ struct timehands {
+ struct timehands *th_next;
+ };
+
+-extern struct timehands th0;
++static struct timehands th0;
+ static struct timehands th9 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th0};
+ static struct timehands th8 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th9};
+ static struct timehands th7 = { NULL, 0, 0, 0, {0, 0}, {0, 0}, {0, 0}, 0, &th8};
+Index: sys/net/rtsock.c
+===================================================================
+--- sys/net/rtsock.c.orig
++++ sys/net/rtsock.c
+@@ -1243,7 +1243,7 @@ SYSCTL_NODE(_net, PF_ROUTE, routetable,
+ * Definitions of protocols supported in the ROUTE domain.
+ */
+
+-extern struct domain routedomain; /* or at least forward */
++static struct domain routedomain; /* or at least forward */
+
+ static struct protosw routesw[] = {
+ {
+Index: sys/net/zlib.c
+===================================================================
+--- sys/net/zlib.c.orig
++++ sys/net/zlib.c
+@@ -94,7 +94,7 @@ typedef unsigned short ush;
+ typedef ush FAR ushf;
+ typedef unsigned long ulg;
+
+-extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
++static const char *z_errmsg[10]; /* indexed by 2-zlib_error */
+ /* (size given to avoid silly warnings with Visual C++) */
+
+ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+Index: sys/netinet6/in6_proto.c
+===================================================================
+--- sys/netinet6/in6_proto.c.orig
++++ sys/netinet6/in6_proto.c
+@@ -145,7 +145,7 @@
+ */
+
+ extern struct domain inet6domain;
+-static struct pr_usrreqs nousrreqs;
++static struct pr_usrreqs nousr_reqs;
+
+ #define PR_LISTEN 0
+ #define PR_ABRTACPTDIS 0
+@@ -158,7 +158,7 @@ struct ip6protosw inet6sw[] = {
+ .pr_init = ip6_init,
+ .pr_slowtimo = frag6_slowtimo,
+ .pr_drain = frag6_drain,
+- .pr_usrreqs = &nousrreqs,
++ .pr_usrreqs = &nousr_reqs,
+ },
+ {
+ .pr_type = SOCK_DGRAM,
+@@ -216,7 +216,7 @@ struct ip6protosw inet6sw[] = {
+ .pr_protocol = IPPROTO_DSTOPTS,
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = dest6_input,
+- .pr_usrreqs = &nousrreqs
++ .pr_usrreqs = &nousr_reqs
+ },
+ {
+ .pr_type = SOCK_RAW,
+@@ -224,7 +224,7 @@ struct ip6protosw inet6sw[] = {
+ .pr_protocol = IPPROTO_ROUTING,
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = route6_input,
+- .pr_usrreqs = &nousrreqs
++ .pr_usrreqs = &nousr_reqs
+ },
+ {
+ .pr_type = SOCK_RAW,
+@@ -232,7 +232,7 @@ struct ip6protosw inet6sw[] = {
+ .pr_protocol = IPPROTO_FRAGMENT,
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = frag6_input,
+- .pr_usrreqs = &nousrreqs
++ .pr_usrreqs = &nousr_reqs
+ },
+ #ifdef IPSEC
+ {
+@@ -241,7 +241,7 @@ struct ip6protosw inet6sw[] = {
+ .pr_protocol = IPPROTO_AH,
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = ah6_input,
+- .pr_usrreqs = &nousrreqs,
++ .pr_usrreqs = &nousr_reqs,
+ },
+ #ifdef IPSEC_ESP
+ {
+@@ -251,7 +251,7 @@ struct ip6protosw inet6sw[] = {
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = esp6_input,
+ .pr_ctlinput = esp6_ctlinput,
+- .pr_usrreqs = &nousrreqs,
++ .pr_usrreqs = &nousr_reqs,
+ },
+ #endif
+ {
+@@ -260,7 +260,7 @@ struct ip6protosw inet6sw[] = {
+ .pr_protocol = IPPROTO_IPCOMP,
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_input = ipcomp6_input,
+- .pr_usrreqs = &nousrreqs,
++ .pr_usrreqs = &nousr_reqs,
+ },
+ #endif /* IPSEC */
+ #ifdef INET
+Index: sys/netinet6/ip6_mroute.c
+===================================================================
+--- sys/netinet6/ip6_mroute.c.orig
++++ sys/netinet6/ip6_mroute.c
+@@ -188,7 +188,7 @@ static struct ifnet *multicast_register_
+ static mifi_t nummifs = 0;
+ static mifi_t reg_mif_num = (mifi_t)-1;
+
+-static struct pim6stat pim6stat;
++static struct pim6stat pim6_stat;
+ static int pim6;
+
+ /*
+@@ -1622,7 +1622,7 @@ register_send(ip6, mif, m)
+ log(LOG_DEBUG, "** IPv6 register_send **\n src %s dst %s\n",
+ ip6_sprintf(&ip6->ip6_src), ip6_sprintf(&ip6->ip6_dst));
+ #endif
+- ++pim6stat.pim6s_snd_registers;
++ ++pim6_stat.pim6s_snd_registers;
+
+ /* Make a copy of the packet to send to the user level process */
+ MGETHDR(mm, M_DONTWAIT, MT_HEADER);
+@@ -1690,7 +1690,7 @@ pim6_input(mp, offp, proto)
+ int minlen;
+ int off = *offp;
+
+- ++pim6stat.pim6s_rcv_total;
++ ++pim6_stat.pim6s_rcv_total;
+
+ ip6 = mtod(m, struct ip6_hdr *);
+ pimlen = m->m_pkthdr.len - *offp;
+@@ -1699,7 +1699,7 @@ pim6_input(mp, offp, proto)
+ * Validate lengths
+ */
+ if (pimlen < PIM_MINLEN) {
+- ++pim6stat.pim6s_rcv_tooshort;
++ ++pim6_stat.pim6s_rcv_tooshort;
+ #ifdef MRT6DEBUG
+ if (mrt6debug & DEBUG_PIM)
+ log(LOG_DEBUG,"pim6_input: PIM packet too short\n");
+@@ -1732,7 +1732,7 @@ pim6_input(mp, offp, proto)
+ #else
+ IP6_EXTHDR_GET(pim, struct pim *, m, off, minlen);
+ if (pim == NULL) {
+- pim6stat.pim6s_rcv_tooshort++;
++ pim6_stat.pim6s_rcv_tooshort++;
+ return (IPPROTO_DONE);
+ }
+ #endif
+@@ -1752,7 +1752,7 @@ pim6_input(mp, offp, proto)
+ cksumlen = pimlen;
+
+ if (in6_cksum(m, IPPROTO_PIM, off, cksumlen)) {
+- ++pim6stat.pim6s_rcv_badsum;
++ ++pim6_stat.pim6s_rcv_badsum;
+ #ifdef MRT6DEBUG
+ if (mrt6debug & DEBUG_PIM)
+ log(LOG_DEBUG,
+@@ -1766,7 +1766,7 @@ pim6_input(mp, offp, proto)
+
+ /* PIM version check */
+ if (pim->pim_ver != PIM_VERSION) {
+- ++pim6stat.pim6s_rcv_badversion;
++ ++pim6_stat.pim6s_rcv_badversion;
+ #ifdef MRT6DEBUG
+ log(LOG_ERR,
+ "pim6_input: incorrect version %d, expecting %d\n",
+@@ -1789,7 +1789,7 @@ pim6_input(mp, offp, proto)
+ u_int32_t *reghdr;
+ int rc;
+
+- ++pim6stat.pim6s_rcv_registers;
++ ++pim6_stat.pim6s_rcv_registers;
+
+ if ((reg_mif_num >= nummifs) || (reg_mif_num == (mifi_t) -1)) {
+ #ifdef MRT6DEBUG
+@@ -1811,8 +1811,8 @@ pim6_input(mp, offp, proto)
+ * Validate length
+ */
+ if (pimlen < PIM6_REG_MINLEN) {
+- ++pim6stat.pim6s_rcv_tooshort;
+- ++pim6stat.pim6s_rcv_badregisters;
++ ++pim6_stat.pim6s_rcv_tooshort;
++ ++pim6_stat.pim6s_rcv_badregisters;
+ #ifdef MRT6DEBUG
+ log(LOG_ERR,
+ "pim6_input: register packet size too "
+@@ -1836,7 +1836,7 @@ pim6_input(mp, offp, proto)
+
+ /* verify the version number of the inner packet */
+ if ((eip6->ip6_vfc & IPV6_VERSION_MASK) != IPV6_VERSION) {
+- ++pim6stat.pim6s_rcv_badregisters;
++ ++pim6_stat.pim6s_rcv_badregisters;
+ #ifdef MRT6DEBUG
+ log(LOG_DEBUG, "pim6_input: invalid IP version (%d) "
+ "of the inner packet\n",
+@@ -1848,7 +1848,7 @@ pim6_input(mp, offp, proto)
+
+ /* verify the inner packet is destined to a mcast group */
+ if (!IN6_IS_ADDR_MULTICAST(&eip6->ip6_dst)) {
+- ++pim6stat.pim6s_rcv_badregisters;
++ ++pim6_stat.pim6s_rcv_badregisters;
+ #ifdef MRT6DEBUG
+ if (mrt6debug & DEBUG_PIM)
+ log(LOG_DEBUG,
+Index: sys/sys/proc.h
+===================================================================
+--- sys/sys/proc.h.orig
++++ sys/sys/proc.h
+@@ -840,7 +840,7 @@ extern int lastpid;
+ extern int nprocs, maxproc; /* Current and max number of procs. */
+ extern int maxprocperuid; /* Max procs per uid. */
+ extern u_long ps_arg_cache_limit;
+-extern int sched_quantum; /* Scheduling quantum in ticks. */
++//extern int sched_quantum; /* Scheduling quantum in ticks. */
+
+ LIST_HEAD(proclist, proc);
+ TAILQ_HEAD(procqueue, proc);
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild
new file mode 100644
index 000000000000..2a01027b0444
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-6.2_beta3.ebuild,v 1.1 2006/11/01 16:19:11 flameeyes Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # This replaces the gentoover patch, it doesn't need reapply every time.
+ sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+ -e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+ -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+ "${S}/conf/newvers.sh"
+
+ epatch "${FILESDIR}/${PN}-gentoo.patch"
+ epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+ epatch "${FILESDIR}/${PN}-6.0-asm.patch"
+ epatch "${FILESDIR}/${PN}-6.0-werror.patch"
+ epatch "${FILESDIR}/${PN}-6.2-gcc41.patch"
+ epatch "${FILESDIR}/${PN}-6.2-sparc64.patch"
+ epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+
+ # Disable SSP for the kernel
+ grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
+ "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g"
+}
+
+src_compile() {
+ einfo "Nothing to compile.."
+}
+
+src_install() {
+ insinto "/usr/src/sys-${MY_PVR}"
+ doins -r "${S}/"*
+}
+
+pkg_postinst() {
+ if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+ einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ # just in case...
+ [[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ elif use symlink; then
+ einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+ rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't remove previous symlinks, please fix manually."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+ ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+ eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+ fi
+
+ if use sparc-fbsd ; then
+ ewarn "WARNING: kldload currently causes kernel panics"
+ ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+ ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+ ewarn "Please compile all modules you need into the kernel"
+ fi
+}