[Glibc-bsd-commits] r1865 - in trunk/kfreebsd-6: . debian
debian/patches
Petr Salinger
ps-guest at alioth.debian.org
Fri Jan 12 15:13:21 CET 2007
Author: ps-guest
Date: 2007-01-12 15:13:20 +0100 (Fri, 12 Jan 2007)
New Revision: 1865
Removed:
trunk/kfreebsd-6/debian/patches/000_kmem.diff
trunk/kfreebsd-6/debian/patches/000_net.diff
trunk/kfreebsd-6/debian/patches/000_ppp.diff
trunk/kfreebsd-6/debian/patches/000_smbfs.diff
trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff
trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff
trunk/kfreebsd-6/freebsd-6.2.txt
Modified:
trunk/kfreebsd-6/debian/changelog
trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-6/debian/patches/999_config.diff
trunk/kfreebsd-6/fetch
Log:
* kfreebsd-6: new upstream version from RELENG_6_2_0_RELEASE
Modified: trunk/kfreebsd-6/debian/changelog
===================================================================
--- trunk/kfreebsd-6/debian/changelog 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/changelog 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,3 +1,15 @@
+kfreebsd-6 (6.2-0.1) UNRELEASED; urgency=low
+
+ [ Petr Salinger ]
+ * New upstream version (RELENG_6_2_0_RELEASE)
+ - drop obsolete 000_kmem, 000_net, 000_ppp, 000_smbfs,
+ 002_glibc_dev_isp, 006_proc_mounts patches
+ - update 009_disable_duped_modules,
+ 903_disable_non-free_drivers,
+ 999_config patches
+
+ -- Aurelien Jarno <aurel32 at debian.org> Thu, 4 Jan 2007 21:56:16 +0100
+
kfreebsd-6 (6.1-4) unreleased; urgency=low
[ Petr Salinger ]
Deleted: trunk/kfreebsd-6/debian/patches/000_kmem.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_kmem.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/000_kmem.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,16 +0,0 @@
-Index: sys/dev/firewire/fwdev.c
-===================================================================
-RCS file: /home/ncvs/src/sys/dev/firewire/fwdev.c,v
-retrieving revision 1.47
-diff -u -I__FBSDID -r1.47 fwdev.c
---- sys/dev/firewire/fwdev.c 8 Aug 2005 19:55:30 -0000 1.47
-+++ sys/dev/firewire/fwdev.c 30 Nov 2006 22:15:06 -0000
-@@ -712,7 +712,7 @@
- else
- len = fwdev->rommax - CSRROMOFF + 4;
- }
-- if (crom_buf->len < len)
-+ if (crom_buf->len < len && crom_buf->len >= 0)
- len = crom_buf->len;
- else
- crom_buf->len = len;
Deleted: trunk/kfreebsd-6/debian/patches/000_net.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_net.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/000_net.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,147 +0,0 @@
-
-Topic: Networking Issues
-
-# fetch http://security.FreeBSD.org/patches/EN-06:02/net.patch
-
-
-Index: sys/netinet/ip_output.c
-===================================================================
-RCS file: /home/cvs/src/sys/netinet/ip_output.c,v
-retrieving revision 1.242.2.8
-diff -u -r1.242.2.8 ip_output.c
---- sys/netinet/ip_output.c 31 Jan 2006 16:06:05 -0000 1.242.2.8
-+++ sys/netinet/ip_output.c 25 Aug 2006 15:07:44 -0000
-@@ -1162,6 +1162,9 @@
- return (EINVAL);
- }
-
-+ if (inp == NULL)
-+ return (EINVAL);
-+
- switch (sopt->sopt_dir) {
- case SOPT_SET:
- switch (sopt->sopt_name) {
-Index: sys/netinet6/in6.c
-===================================================================
-RCS file: /home/cvs/src/sys/netinet6/in6.c,v
-retrieving revision 1.51.2.8
-diff -u -r1.51.2.8 in6.c
---- sys/netinet6/in6.c 9 Mar 2006 11:59:03 -0000 1.51.2.8
-+++ sys/netinet6/in6.c 25 Aug 2006 15:07:56 -0000
-@@ -1720,20 +1720,55 @@
-
- /* we could do in(6)_socktrim here, but just omit it at this moment. */
-
-+ if (newhost && nd6_need_cache(ifp) != 0) {
-+ /* set the rtrequest function to create llinfo */
-+ ia->ia_ifa.ifa_rtrequest = nd6_rtrequest;
-+ }
-+
- /*
- * Special case:
- * If a new destination address is specified for a point-to-point
- * interface, install a route to the destination as an interface
-- * direct route.
-+ * direct route. In addition, if the link is expected to have neighbor
-+ * cache entries, specify RTF_LLINFO so that a cache entry for the
-+ * destination address will be created.
-+ * created
- * XXX: the logic below rejects assigning multiple addresses on a p2p
-- * interface that share a same destination.
-+ * interface that share the same destination.
- */
- plen = in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL); /* XXX */
- if (!(ia->ia_flags & IFA_ROUTE) && plen == 128 &&
- ia->ia_dstaddr.sin6_family == AF_INET6) {
-- if ((error = rtinit(&(ia->ia_ifa), (int)RTM_ADD,
-- RTF_UP | RTF_HOST)) != 0)
-+ int rtflags = RTF_UP | RTF_HOST;
-+ struct rtentry *rt = NULL, **rtp = NULL;
-+
-+ if (nd6_need_cache(ifp) != 0) {
-+ rtflags |= RTF_LLINFO;
-+ rtp = &rt;
-+ }
-+
-+ error = rtrequest(RTM_ADD, (struct sockaddr *)&ia->ia_dstaddr,
-+ (struct sockaddr *)&ia->ia_addr,
-+ (struct sockaddr *)&ia->ia_prefixmask,
-+ ia->ia_flags | rtflags, rtp);
-+ if (error != 0)
- return (error);
-+ if (rt != NULL) {
-+ struct llinfo_nd6 *ln;
-+
-+ RT_LOCK(rt);
-+ ln = (struct llinfo_nd6 *)rt->rt_llinfo;
-+ if (ln != NULL) {
-+ /*
-+ * Set the state to STALE because we don't
-+ * have to perform address resolution on this
-+ * link.
-+ */
-+ ln->ln_state = ND6_LLINFO_STALE;
-+ }
-+ RT_REMREF(rt);
-+ RT_UNLOCK(rt);
-+ }
- ia->ia_flags |= IFA_ROUTE;
- }
- if (plen < 128) {
-@@ -1744,11 +1779,8 @@
- }
-
- /* Add ownaddr as loopback rtentry, if necessary (ex. on p2p link). */
-- if (newhost) {
-- /* set the rtrequest function to create llinfo */
-- ia->ia_ifa.ifa_rtrequest = nd6_rtrequest;
-+ if (newhost)
- in6_ifaddloop(&(ia->ia_ifa));
-- }
-
- return (error);
- }
-Index: sys/netinet6/nd6.c
-===================================================================
-RCS file: /home/cvs/src/sys/netinet6/nd6.c,v
-retrieving revision 1.48.2.12
-diff -u -r1.48.2.12 nd6.c
---- sys/netinet6/nd6.c 29 Mar 2006 21:05:11 -0000 1.48.2.12
-+++ sys/netinet6/nd6.c 25 Aug 2006 15:08:02 -0000
-@@ -512,6 +512,19 @@
- ln->ln_asked++;
- nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000);
- nd6_ns_output(ifp, dst, dst, ln, 0);
-+ } else if (rt->rt_ifa != NULL &&
-+ rt->rt_ifa->ifa_addr->sa_family == AF_INET6 &&
-+ (((struct in6_ifaddr *)rt->rt_ifa)->ia_flags & IFA_ROUTE)) {
-+ /*
-+ * This is an unreachable neighbor whose address is
-+ * specified as the destination of a p2p interface
-+ * (see in6_ifinit()). We should not free the entry
-+ * since this is sort of a "static" entry generated
-+ * via interface address configuration.
-+ */
-+ ln->ln_asked = 0;
-+ ln->ln_expire = 0; /* make it permanent */
-+ ln->ln_state = ND6_LLINFO_STALE;
- } else {
- (void)nd6_free(rt, 0);
- ln = NULL;
-Index: sys/vm/uma_core.c
-===================================================================
-RCS file: /home/cvs/src/sys/vm/uma_core.c,v
-retrieving revision 1.119.2.15
-diff -u -r1.119.2.15 uma_core.c
---- sys/vm/uma_core.c 14 Feb 2006 03:37:58 -0000 1.119.2.15
-+++ sys/vm/uma_core.c 25 Aug 2006 15:08:12 -0000
-@@ -2417,8 +2417,7 @@
- * If nothing else caught this, we'll just do an internal free.
- */
- zfree_internal:
-- uma_zfree_internal(zone, item, udata, SKIP_DTOR, ZFREE_STATFAIL |
-- ZFREE_STATFREE);
-+ uma_zfree_internal(zone, item, udata, SKIP_DTOR, ZFREE_STATFREE);
-
- return;
- }
Deleted: trunk/kfreebsd-6/debian/patches/000_ppp.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_ppp.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/000_ppp.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,134 +0,0 @@
-
-Topic: Buffer overflow in sppp
-CVE Name: CVE-2006-4304
-
-# fetch http://security.FreeBSD.org/patches/SA-06:18/ppp.patch
-
-
-Index: sys/net/if_spppsubr.c
-===================================================================
-RCS file: /home/ncvs/src/sys/net/if_spppsubr.c,v
-retrieving revision 1.124
-diff -u -I__FBSDID -r1.124 if_spppsubr.c
---- sys/net/if_spppsubr.c 15 Jul 2006 02:49:35 -0000 1.124
-+++ sys/net/if_spppsubr.c 21 Aug 2006 11:32:49 -0000
-@@ -2363,7 +2363,8 @@
-
- /* pass 1: check for things that need to be rejected */
- p = (void*) (h+1);
-- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
-+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len-=p[1], p+=p[1]) {
- if (debug)
- log(-1, " %s ", sppp_lcp_opt_name(*p));
- switch (*p) {
-@@ -2442,7 +2443,8 @@
-
- p = (void*) (h+1);
- len = origlen;
-- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
-+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len-=p[1], p+=p[1]) {
- if (debug)
- log(-1, " %s ", sppp_lcp_opt_name(*p));
- switch (*p) {
-@@ -2584,7 +2586,8 @@
- SPP_ARGS(ifp));
-
- p = (void*) (h+1);
-- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
-+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len -= p[1], p += p[1]) {
- if (debug)
- log(-1, " %s ", sppp_lcp_opt_name(*p));
- switch (*p) {
-@@ -2648,7 +2651,8 @@
- SPP_ARGS(ifp));
-
- p = (void*) (h+1);
-- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
-+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len -= p[1], p += p[1]) {
- if (debug)
- log(-1, " %s ", sppp_lcp_opt_name(*p));
- switch (*p) {
-@@ -3039,7 +3043,8 @@
- log(LOG_DEBUG, SPP_FMT "ipcp parse opts: ",
- SPP_ARGS(ifp));
- p = (void*) (h+1);
-- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
-+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len-=p[1], p+=p[1]) {
- if (debug)
- log(-1, " %s ", sppp_ipcp_opt_name(*p));
- switch (*p) {
-@@ -3108,7 +3113,8 @@
- SPP_ARGS(ifp));
- p = (void*) (h+1);
- len = origlen;
-- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
-+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len-=p[1], p+=p[1]) {
- if (debug)
- log(-1, " %s ", sppp_ipcp_opt_name(*p));
- switch (*p) {
-@@ -3239,7 +3245,8 @@
- SPP_ARGS(ifp));
-
- p = (void*) (h+1);
-- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
-+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len -= p[1], p += p[1]) {
- if (debug)
- log(-1, " %s ", sppp_ipcp_opt_name(*p));
- switch (*p) {
-@@ -3285,7 +3292,8 @@
- SPP_ARGS(ifp));
-
- p = (void*) (h+1);
-- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
-+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len -= p[1], p += p[1]) {
- if (debug)
- log(-1, " %s ", sppp_ipcp_opt_name(*p));
- switch (*p) {
-@@ -3511,7 +3519,8 @@
- SPP_ARGS(ifp));
- p = (void*) (h+1);
- ifidcount = 0;
-- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
-+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len-=p[1], p+=p[1]) {
- if (debug)
- log(-1, " %s", sppp_ipv6cp_opt_name(*p));
- switch (*p) {
-@@ -3561,7 +3570,8 @@
- p = (void*) (h+1);
- len = origlen;
- type = CONF_ACK;
-- for (rlen=0; len>1 && p[1]; len-=p[1], p+=p[1]) {
-+ for (rlen=0; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len-=p[1], p+=p[1]) {
- if (debug)
- log(-1, " %s", sppp_ipv6cp_opt_name(*p));
- switch (*p) {
-@@ -3660,7 +3670,8 @@
- SPP_ARGS(ifp));
-
- p = (void*) (h+1);
-- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
-+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len -= p[1], p += p[1]) {
- if (debug)
- log(-1, " %s", sppp_ipv6cp_opt_name(*p));
- switch (*p) {
-@@ -3706,7 +3717,8 @@
- SPP_ARGS(ifp));
-
- p = (void*) (h+1);
-- for (; len > 1 && p[1]; len -= p[1], p += p[1]) {
-+ for (; len >= 2 && p[1] >= 2 && len >= p[1];
-+ len -= p[1], p += p[1]) {
- if (debug)
- log(-1, " %s", sppp_ipv6cp_opt_name(*p));
- switch (*p) {
Deleted: trunk/kfreebsd-6/debian/patches/000_smbfs.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/000_smbfs.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/000_smbfs.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,31 +0,0 @@
-
-Topic: smbfs chroot escape
-CVE Name: CVE-2006-2654
-
-# fetch http://security.FreeBSD.org/patches/SA-06:16/smbfs.patch
-
-
-Index: sys/fs/smbfs/smbfs_vnops.c
-===================================================================
---- sys/fs/smbfs/smbfs_vnops.c.orig 2006-06-24 18:07:45.070269000 +0200
-+++ sys/fs/smbfs/smbfs_vnops.c 2006-06-24 18:08:48.000000000 +0200
-@@ -1018,11 +1018,18 @@
- static int
- smbfs_pathcheck(struct smbmount *smp, const char *name, int nmlen, int nameiop)
- {
-- static const char *badchars = "*/\\:<>;?";
-+ static const char *badchars = "*/:<>;?";
- static const char *badchars83 = " +|,[]=";
- const char *cp;
- int i, error;
-
-+ /*
-+ * Backslash characters, being a path delimiter, are prohibited
-+ * within a path component even for LOOKUP operations.
-+ */
-+ if (index(name, '\\') != NULL)
-+ return ENOENT;
-+
- if (nameiop == LOOKUP)
- return 0;
- error = ENOENT;
Deleted: trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/002_glibc_dev_isp.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,299 +0,0 @@
-
-Merged in 7-CURRENT as of 2006-02-15.
-
-Note: This isn't actualy needed for the kernel, since it doesn't use Glibc
- headers. But since ispvar.h is exported to userland we need to patch it.
- (maybe we should move this to kfreebsd-kernel-headers?)
-
-Index: sys/dev/isp/ispvar.h
-===================================================================
---- sys/dev/isp/ispvar.h.orig 2006-02-03 15:43:57.000000000 +0100
-+++ sys/dev/isp/ispvar.h 2006-06-24 17:31:48.000000000 +0200
-@@ -61,20 +61,20 @@
- struct ispsoftc;
- struct ispmdvec {
- int (*dv_rd_isr)
-- (struct ispsoftc *, u_int16_t *, u_int16_t *, u_int16_t *);
-- u_int16_t (*dv_rd_reg) (struct ispsoftc *, int);
-- void (*dv_wr_reg) (struct ispsoftc *, int, u_int16_t);
-+ (struct ispsoftc *, uint16_t *, uint16_t *, uint16_t *);
-+ uint16_t (*dv_rd_reg) (struct ispsoftc *, int);
-+ void (*dv_wr_reg) (struct ispsoftc *, int, uint16_t);
- int (*dv_mbxdma) (struct ispsoftc *);
- int (*dv_dmaset) (struct ispsoftc *,
-- XS_T *, ispreq_t *, u_int16_t *, u_int16_t);
-+ XS_T *, ispreq_t *, uint16_t *, uint16_t);
- void (*dv_dmaclr)
-- (struct ispsoftc *, XS_T *, u_int16_t);
-+ (struct ispsoftc *, XS_T *, uint16_t);
- void (*dv_reset0) (struct ispsoftc *);
- void (*dv_reset1) (struct ispsoftc *);
- void (*dv_dregs) (struct ispsoftc *, const char *);
-- u_int16_t *dv_ispfw; /* ptr to f/w */
-- u_int16_t dv_conf1;
-- u_int16_t dv_clock; /* clock frequency */
-+ uint16_t *dv_ispfw; /* ptr to f/w */
-+ uint16_t dv_conf1;
-+ uint16_t dv_clock; /* clock frequency */
- };
-
- /*
-@@ -89,9 +89,9 @@
- * 'Types'
- */
- #ifdef ISP_DAC_SUPPORTED
--typedef u_int64_t isp_dma_addr_t;
-+typedef uint64_t isp_dma_addr_t;
- #else
--typedef u_int32_t isp_dma_addr_t;
-+typedef uint32_t isp_dma_addr_t;
- #endif
-
- /*
-@@ -186,14 +186,14 @@
- isp_fast_mttr : 1, /* fast sram */
- isp_initiator_id : 4,
- isp_async_data_setup : 4;
-- u_int16_t isp_selection_timeout;
-- u_int16_t isp_max_queue_depth;
-- u_int8_t isp_tag_aging;
-- u_int8_t isp_bus_reset_delay;
-- u_int8_t isp_retry_count;
-- u_int8_t isp_retry_delay;
-+ uint16_t isp_selection_timeout;
-+ uint16_t isp_max_queue_depth;
-+ uint8_t isp_tag_aging;
-+ uint8_t isp_bus_reset_delay;
-+ uint8_t isp_retry_count;
-+ uint8_t isp_retry_delay;
- struct {
-- u_int32_t
-+ uint32_t
- exc_throttle : 8,
- : 1,
- dev_enable : 1, /* ignored */
-@@ -202,12 +202,12 @@
- actv_offset : 4,
- goal_offset : 4,
- nvrm_offset : 4;
-- u_int8_t actv_period; /* current sync period */
-- u_int8_t goal_period; /* goal sync period */
-- u_int8_t nvrm_period; /* nvram sync period */
-- u_int16_t actv_flags; /* current device flags */
-- u_int16_t goal_flags; /* goal device flags */
-- u_int16_t nvrm_flags; /* nvram device flags */
-+ uint8_t actv_period; /* current sync period */
-+ uint8_t goal_period; /* goal sync period */
-+ uint8_t nvrm_period; /* nvram sync period */
-+ uint16_t actv_flags; /* current device flags */
-+ uint16_t goal_flags; /* goal device flags */
-+ uint16_t nvrm_flags; /* nvram device flags */
- } isp_devparam[MAX_TARGETS];
- } sdparam;
-
-@@ -251,7 +251,7 @@
- #endif
-
- typedef struct {
-- u_int32_t : 13,
-+ uint32_t : 13,
- isp_gbspeed : 3,
- : 2,
- isp_iid_set : 1,
-@@ -261,20 +261,20 @@
- isp_gotdparms : 1,
- isp_topo : 3,
- isp_onfabric : 1;
-- u_int32_t : 8,
-+ uint32_t : 8,
- isp_portid : 24; /* S_ID */
-- u_int16_t isp_fwoptions;
-- u_int16_t isp_iid; /* 'initiator' id */
-- u_int16_t isp_loopid; /* hard loop id */
-- u_int16_t isp_fwattr; /* firmware attributes */
-- u_int8_t isp_execthrottle;
-- u_int8_t isp_retry_delay;
-- u_int8_t isp_retry_count;
-- u_int8_t isp_reserved;
-- u_int16_t isp_maxalloc;
-- u_int16_t isp_maxfrmlen;
-- u_int64_t isp_nodewwn;
-- u_int64_t isp_portwwn;
-+ uint16_t isp_fwoptions;
-+ uint16_t isp_iid; /* 'initiator' id */
-+ uint16_t isp_loopid; /* hard loop id */
-+ uint16_t isp_fwattr; /* firmware attributes */
-+ uint8_t isp_execthrottle;
-+ uint8_t isp_retry_delay;
-+ uint8_t isp_retry_count;
-+ uint8_t isp_reserved;
-+ uint16_t isp_maxalloc;
-+ uint16_t isp_maxfrmlen;
-+ uint64_t isp_nodewwn;
-+ uint64_t isp_portwwn;
- /*
- * Port Data Base. This is indexed by 'target', which is invariate.
- * However, elements within can move around due to loop changes,
-@@ -285,7 +285,7 @@
- * to move around.
- */
- struct lportdb {
-- u_int32_t loopid : 16,
-+ uint32_t loopid : 16,
- : 2,
- fc4_type : 4,
- last_fabric_dev : 1,
-@@ -297,10 +297,10 @@
- roles : 2,
- tvalid : 1,
- valid : 1;
-- u_int32_t port_type : 8,
-+ uint32_t port_type : 8,
- portid : 24;
-- u_int64_t node_wwn;
-- u_int64_t port_wwn;
-+ uint64_t node_wwn;
-+ uint64_t port_wwn;
- } portdb[MAX_FC_TARG], tport[FC_PORT_ID];
-
- /*
-@@ -309,7 +309,7 @@
- caddr_t isp_scratch;
- isp_dma_addr_t isp_scdma;
- #ifdef ISP_FW_CRASH_DUMP
-- u_int16_t *isp_dump_data;
-+ uint16_t *isp_dump_data;
- #endif
- } fcparam;
-
-@@ -358,14 +358,14 @@
- */
-
- void * isp_param; /* type specific */
-- u_int16_t isp_fwrev[3]; /* Loaded F/W revision */
-- u_int16_t isp_romfw_rev[3]; /* PROM F/W revision */
-- u_int16_t isp_maxcmds; /* max possible I/O cmds */
-- u_int8_t isp_type; /* HBA Chip Type */
-- u_int8_t isp_revision; /* HBA Chip H/W Revision */
-- u_int32_t isp_maxluns; /* maximum luns supported */
-+ uint16_t isp_fwrev[3]; /* Loaded F/W revision */
-+ uint16_t isp_romfw_rev[3]; /* PROM F/W revision */
-+ uint16_t isp_maxcmds; /* max possible I/O cmds */
-+ uint8_t isp_type; /* HBA Chip Type */
-+ uint8_t isp_revision; /* HBA Chip H/W Revision */
-+ uint32_t isp_maxluns; /* maximum luns supported */
-
-- u_int32_t isp_clock : 8, /* input clock */
-+ uint32_t isp_clock : 8, /* input clock */
- : 4,
- isp_port : 1, /* 23XX only */
- isp_failed : 1, /* board failed */
-@@ -376,24 +376,24 @@
- isp_role : 2, /* roles supported */
- isp_dblev : 12; /* debug log mask */
-
-- u_int32_t isp_confopts; /* config options */
-+ uint32_t isp_confopts; /* config options */
-
-- u_int16_t isp_rqstinrp; /* register for REQINP */
-- u_int16_t isp_rqstoutrp; /* register for REQOUTP */
-- u_int16_t isp_respinrp; /* register for RESINP */
-- u_int16_t isp_respoutrp; /* register for RESOUTP */
-+ uint16_t isp_rqstinrp; /* register for REQINP */
-+ uint16_t isp_rqstoutrp; /* register for REQOUTP */
-+ uint16_t isp_respinrp; /* register for RESINP */
-+ uint16_t isp_respoutrp; /* register for RESOUTP */
-
- /*
- * Instrumentation
- */
-- u_int64_t isp_intcnt; /* total int count */
-- u_int64_t isp_intbogus; /* spurious int count */
-- u_int64_t isp_intmboxc; /* mbox completions */
-- u_int64_t isp_intoasync; /* other async */
-- u_int64_t isp_rsltccmplt; /* CMDs on result q */
-- u_int64_t isp_fphccmplt; /* CMDs via fastpost */
-- u_int16_t isp_rscchiwater;
-- u_int16_t isp_fpcchiwater;
-+ uint64_t isp_intcnt; /* total int count */
-+ uint64_t isp_intbogus; /* spurious int count */
-+ uint64_t isp_intmboxc; /* mbox completions */
-+ uint64_t isp_intoasync; /* other async */
-+ uint64_t isp_rsltccmplt; /* CMDs on result q */
-+ uint64_t isp_fphccmplt; /* CMDs via fastpost */
-+ uint16_t isp_rscchiwater;
-+ uint16_t isp_fpcchiwater;
-
- /*
- * Volatile state
-@@ -406,17 +406,17 @@
- isp_sendmarker : 2, /* send a marker entry */
- isp_update : 2, /* update parameters */
- isp_nactive : 16; /* how many commands active */
-- volatile u_int16_t isp_reqodx; /* index of last ISP pickup */
-- volatile u_int16_t isp_reqidx; /* index of next request */
-- volatile u_int16_t isp_residx; /* index of next result */
-- volatile u_int16_t isp_resodx; /* index of next result */
-- volatile u_int16_t isp_rspbsy;
-- volatile u_int16_t isp_lasthdls; /* last handle seed */
-- volatile u_int16_t isp_mboxtmp[MAILBOX_STORAGE];
-- volatile u_int16_t isp_lastmbxcmd; /* last mbox command sent */
-- volatile u_int16_t isp_mbxwrk0;
-- volatile u_int16_t isp_mbxwrk1;
-- volatile u_int16_t isp_mbxwrk2;
-+ volatile uint16_t isp_reqodx; /* index of last ISP pickup */
-+ volatile uint16_t isp_reqidx; /* index of next request */
-+ volatile uint16_t isp_residx; /* index of next result */
-+ volatile uint16_t isp_resodx; /* index of next result */
-+ volatile uint16_t isp_rspbsy;
-+ volatile uint16_t isp_lasthdls; /* last handle seed */
-+ volatile uint16_t isp_mboxtmp[MAILBOX_STORAGE];
-+ volatile uint16_t isp_lastmbxcmd; /* last mbox command sent */
-+ volatile uint16_t isp_mbxwrk0;
-+ volatile uint16_t isp_mbxwrk1;
-+ volatile uint16_t isp_mbxwrk2;
- void * isp_mbxworkp;
-
- /*
-@@ -625,7 +625,7 @@
- * semaphore register and first mailbox register (if appropriate). This also
- * means that most spurious/bogus interrupts not for us can be filtered first.
- */
--void isp_intr(struct ispsoftc *, u_int16_t, u_int16_t, u_int16_t);
-+void isp_intr(struct ispsoftc *, uint16_t, uint16_t, uint16_t);
-
-
- /*
-@@ -808,7 +808,7 @@
- *
- * GET_NANOTIME(NANOTIME_T *) get current nanotime.
- *
-- * GET_NANOSEC(NANOTIME_T *) get u_int64_t from NANOTIME_T
-+ * GET_NANOSEC(NANOTIME_T *) get uint64_t from NANOTIME_T
- *
- * NANOTIME_SUB(NANOTIME_T *, NANOTIME_T *)
- * subtract two NANOTIME_T values
-@@ -897,15 +897,15 @@
- *
- * (XXX these do endian specific transformations- in transition XXX)
- *
-- * ISP_IOXPUT_8(struct ispsoftc *, u_int8_t srcval, u_int8_t *dstptr)
-- * ISP_IOXPUT_16(struct ispsoftc *, u_int16_t srcval, u_int16_t *dstptr)
-- * ISP_IOXPUT_32(struct ispsoftc *, u_int32_t srcval, u_int32_t *dstptr)
-- *
-- * ISP_IOXGET_8(struct ispsoftc *, u_int8_t *srcptr, u_int8_t dstrval)
-- * ISP_IOXGET_16(struct ispsoftc *, u_int16_t *srcptr, u_int16_t dstrval)
-- * ISP_IOXGET_32(struct ispsoftc *, u_int32_t *srcptr, u_int32_t dstrval)
-+ * ISP_IOXPUT_8(struct ispsoftc *, uint8_t srcval, uint8_t *dstptr)
-+ * ISP_IOXPUT_16(struct ispsoftc *, uint16_t srcval, uint16_t *dstptr)
-+ * ISP_IOXPUT_32(struct ispsoftc *, uint32_t srcval, uint32_t *dstptr)
-+ *
-+ * ISP_IOXGET_8(struct ispsoftc *, uint8_t *srcptr, uint8_t dstrval)
-+ * ISP_IOXGET_16(struct ispsoftc *, uint16_t *srcptr, uint16_t dstrval)
-+ * ISP_IOXGET_32(struct ispsoftc *, uint32_t *srcptr, uint32_t dstrval)
- *
-- * ISP_SWIZZLE_NVRAM_WORD(struct ispsoftc *, u_int16_t *)
-+ * ISP_SWIZZLE_NVRAM_WORD(struct ispsoftc *, uint16_t *)
- */
-
- #endif /* _ISPVAR_H */
Deleted: trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/006_proc_mounts.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,41 +0,0 @@
-
-Status: Reported as kern/78464.
-
-Index: sys/compat/linprocfs/linprocfs.c
-===================================================================
---- sys/compat/linprocfs/linprocfs.c.orig 2005-12-14 20:06:48.000000000 +0100
-+++ sys/compat/linprocfs/linprocfs.c 2006-06-24 17:33:15.000000000 +0200
-@@ -345,13 +345,11 @@
- #endif /* __i386__ || __amd64__ */
-
- /*
-- * Filler function for proc/mtab
-+ * Filler function for proc/mounts
- *
-- * This file doesn't exist in Linux' procfs, but is included here so
-- * users can symlink /compat/linux/etc/mtab to /proc/mtab
- */
- static int
--linprocfs_domtab(PFS_FILL_ARGS)
-+linprocfs_domounts(PFS_FILL_ARGS)
- {
- struct nameidata nd;
- struct mount *mp;
-@@ -402,7 +400,7 @@
- ADD_OPTION(MNT_NOSYMFOLLOW, "nosymfollow");
- ADD_OPTION(MNT_NOATIME, "noatime");
- #undef ADD_OPTION
-- /* a real Linux mtab will also show NFS options */
-+ /* a real Linux mounts will also show NFS options */
- sbuf_printf(sb, " 0 0\n");
- }
- mtx_unlock(&mountlist_mtx);
-@@ -1032,7 +1030,7 @@
- pfs_create_file(root, "modules", &linprocfs_domodules,
- NULL, NULL, PFS_RD);
- #endif
-- pfs_create_file(root, "mtab", &linprocfs_domtab,
-+ pfs_create_file(root, "mounts", &linprocfs_domounts,
- NULL, NULL, PFS_RD);
- pfs_create_link(root, "self", &procfs_docurproc,
- NULL, NULL, 0);
Modified: trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/009_disable_duped_modules.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -31,11 +31,10 @@
===================================================================
--- sys/conf/Makefile.arm.orig 2005-10-28 21:04:03.000000000 +0200
+++ sys/conf/Makefile.arm 2006-06-24 17:33:28.000000000 +0200
-@@ -44,6 +44,9 @@
- .if !defined(DEBUG)
- CFLAGS += -mno-apcs-frame
- .endif
-+
+@@ -101,6 +101,8 @@
+ rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
+ inflate-tramp.o
+
+%WITHOUT_MODULES
+
%BEFORE_DEPEND
Modified: trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/903_disable_non-free_drivers.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -2,23 +2,22 @@
===================================================================
--- sys/conf/files.orig 2006-06-25 11:13:23.564594000 +0200
+++ sys/conf/files 2006-06-25 11:13:30.000000000 +0200
-@@ -240,7 +240,6 @@
- contrib/dev/acpica/utmisc.c optional acpi
- contrib/dev/acpica/utobject.c optional acpi
- contrib/dev/acpica/utxface.c optional acpi
--contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal
- contrib/ipfilter/netinet/fil.c optional ipfilter inet
- contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet
- contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet
-@@ -431,11 +430,6 @@
+@@ -438,18 +437,6 @@
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
--dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr
--dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe
--dev/ath/ath_rate/sample/sample.c optional ath_rate_sample
--dev/ath/if_ath.c optional ath
--dev/ath/if_ath_pci.c optional ath pci
+-dev/ath/ah_osdep.c optional ath_hal \
+- compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \
+- compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
+- compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
+- compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/if_ath.c optional ath \
+- compile-with "${NORMAL_C} -I$S/dev/ath"
+-dev/ath/if_ath_pci.c optional ath pci \
+- compile-with "${NORMAL_C} -I$S/dev/ath"
dev/awi/am79c930.c optional awi
dev/awi/awi.c optional awi
dev/awi/if_awi_pccard.c optional awi pccard
@@ -104,7 +103,7 @@
INCLUDES+= -I$S/contrib/pf
-# ... and the same for Atheros HAL
--INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
+-INCLUDES+= -I$S/dev/ath
-
# ... and the same for the NgATM stuff
INCLUDES+= -I$S/contrib/ngatm
@@ -180,7 +179,7 @@
_pccard= pccard
_pcfclock= pcfclock
_pecoff= pecoff
-@@ -398,14 +388,12 @@
+@@ -406,7 +396,6 @@
_dpt= dpt
_el= el
_ex= ex
@@ -188,13 +187,21 @@
_ichwd= ichwd
_ida= ida
_idt= idt
- _iir= iir
- _ips= ips
+@@ -417,14 +406,12 @@
+ _iwi= iwi
+ _ixgb= ixgb
_mly= mly
-_nve= nve
.if !defined(NO_CRYPT) || defined(ALL_MODULES)
.if exists(${.CURDIR}/../crypto/via)
_padlock= padlock
+ .endif
+ .endif
+ _ppc= ppc
+-_rr232x= rr232x
+ _s3= s3
+ _twa= twa
+ _vesa= vesa
@@ -438,14 +426,12 @@
#_acpi= acpi # doesn't work on amd64 yet
_agp= agp
@@ -210,11 +217,11 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -456,7 +442,6 @@
- #_lnc= lnc
+@@ -476,7 +461,6 @@
_mly= mly
_ndis= ndis
--_nve= nve
+ _ppc= ppc
+-_rr232x= rr232x
_safe= safe
_scsi_low= scsi_low
_smbfs= smbfs
Modified: trunk/kfreebsd-6/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-6/debian/patches/999_config.diff 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/debian/patches/999_config.diff 2007-01-12 14:13:20 UTC (rev 1865)
@@ -71,6 +71,16 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
+@@ -215,9 +215,6 @@
+ device wlan_ccmp # 802.11 CCMP support
+ device wlan_tkip # 802.11 TKIP support
+ device an # Aironet 4500/4800 802.11 wireless NICs.
+-device ath # Atheros pci/cardbus NIC's
+-device ath_hal # Atheros HAL (Hardware Access Layer)
+-device ath_rate_sample # SampleRate tx rate control for ath
+ device awi # BayStack 660 and others
+ device ral # Ralink Technology RT2500 wireless NICs.
+ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
@@ -228,13 +217,8 @@
device loop # Network loopback
device random # Entropy device
@@ -177,6 +187,16 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
+@@ -228,9 +228,6 @@
+ device wlan_ccmp # 802.11 CCMP support
+ device wlan_tkip # 802.11 TKIP support
+ device an # Aironet 4500/4800 802.11 wireless NICs.
+-device ath # Atheros pci/cardbus NIC's
+-device ath_hal # Atheros HAL (Hardware Access Layer)
+-device ath_rate_sample # SampleRate tx rate control for ath
+ device awi # BayStack 660 and others
+ device ral # Ralink Technology RT2500 wireless NICs.
+ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
@@ -243,13 +234,8 @@
device loop # Network loopback
device random # Entropy device
Modified: trunk/kfreebsd-6/fetch
===================================================================
--- trunk/kfreebsd-6/fetch 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/fetch 2007-01-12 14:13:20 UTC (rev 1865)
@@ -2,7 +2,7 @@
set -ex
ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_6_1_0_RELEASE
+RELENG=RELENG_6_2_0_RELEASE
rm -rf src
Deleted: trunk/kfreebsd-6/freebsd-6.2.txt
===================================================================
--- trunk/kfreebsd-6/freebsd-6.2.txt 2007-01-12 12:42:19 UTC (rev 1864)
+++ trunk/kfreebsd-6/freebsd-6.2.txt 2007-01-12 14:13:20 UTC (rev 1865)
@@ -1,188 +0,0 @@
-
-* update fetch to use RELENG_6_2_0_RELEASE for final release
- or RELENG_6_2 before final release
-
-* may be update fetch to use another CVS server
- see http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/anoncvs.html
- anoncvs at anoncvs1.freebsd.org:/home/ncvs
- anoncvs at anoncvs2.de.freebsd.org:/home/ncvs
- anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-
-* update version in debian/changelog
-
-* drop obsolete patches
- 000_net.diff
- 000_ppp.diff
- 000_smbfs.diff
- 000_kmem.diff
- 002_glibc_dev_isp.diff
- 006_proc_mounts.diff
-
-* update some patches by this file
- 009_disable_duped_modules.diff
- 903_disable_non-free_drivers.diff
- 999_config.diff
-
-* build it
- cp debian/control.in debian/control
- debian/rules control
- sh fetch
- nohup dpkg-buildpackage -b -uc &
-
-
-Index: debian/patches/009_disable_duped_modules.diff
-===================================================================
---- debian/patches/009_disable_duped_modules.diff (revision 1739)
-+++ debian/patches/009_disable_duped_modules.diff (working copy)
-@@ -31,11 +31,10 @@
- ===================================================================
- --- sys/conf/Makefile.arm.orig 2005-10-28 21:04:03.000000000 +0200
- +++ sys/conf/Makefile.arm 2006-06-24 17:33:28.000000000 +0200
--@@ -44,6 +44,9 @@
-- .if !defined(DEBUG)
-- CFLAGS += -mno-apcs-frame
-- .endif
--+
-+@@ -101,6 +101,8 @@
-+ rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
-+ inflate-tramp.o
-+
- +%WITHOUT_MODULES
- +
- %BEFORE_DEPEND
-Index: debian/patches/903_disable_non-free_drivers.diff
-===================================================================
---- debian/patches/903_disable_non-free_drivers.diff (revision 1739)
-+++ debian/patches/903_disable_non-free_drivers.diff (working copy)
-@@ -2,23 +2,22 @@
- ===================================================================
- --- sys/conf/files.orig 2006-06-25 11:13:23.564594000 +0200
- +++ sys/conf/files 2006-06-25 11:13:30.000000000 +0200
--@@ -240,7 +240,6 @@
-- contrib/dev/acpica/utmisc.c optional acpi
-- contrib/dev/acpica/utobject.c optional acpi
-- contrib/dev/acpica/utxface.c optional acpi
---contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal
-- contrib/ipfilter/netinet/fil.c optional ipfilter inet
-- contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet
-- contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet
--@@ -431,11 +430,6 @@
-+@@ -438,18 +437,6 @@
- dev/ata/atapi-cd.c optional atapicd
- dev/ata/atapi-fd.c optional atapifd
- dev/ata/atapi-tape.c optional atapist
---dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr
---dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe
---dev/ath/ath_rate/sample/sample.c optional ath_rate_sample
---dev/ath/if_ath.c optional ath
---dev/ath/if_ath_pci.c optional ath pci
-+-dev/ath/ah_osdep.c optional ath_hal \
-+- compile-with "${NORMAL_C} -I$S/dev/ath"
-+-dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \
-+- compile-with "${NORMAL_C} -I$S/dev/ath"
-+-dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
-+- compile-with "${NORMAL_C} -I$S/dev/ath"
-+-dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
-+- compile-with "${NORMAL_C} -I$S/dev/ath"
-+-dev/ath/if_ath.c optional ath \
-+- compile-with "${NORMAL_C} -I$S/dev/ath"
-+-dev/ath/if_ath_pci.c optional ath pci \
-+- compile-with "${NORMAL_C} -I$S/dev/ath"
- dev/awi/am79c930.c optional awi
- dev/awi/awi.c optional awi
- dev/awi/if_awi_pccard.c optional awi pccard
-@@ -104,7 +103,7 @@
- INCLUDES+= -I$S/contrib/pf
-
- -# ... and the same for Atheros HAL
---INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
-+-INCLUDES+= -I$S/dev/ath
- -
- # ... and the same for the NgATM stuff
- INCLUDES+= -I$S/contrib/ngatm
-@@ -180,7 +179,7 @@
- _pccard= pccard
- _pcfclock= pcfclock
- _pecoff= pecoff
--@@ -398,14 +388,12 @@
-+@@ -406,7 +396,6 @@
- _dpt= dpt
- _el= el
- _ex= ex
-@@ -188,13 +187,21 @@
- _ichwd= ichwd
- _ida= ida
- _idt= idt
-- _iir= iir
-- _ips= ips
-+@@ -417,14 +406,12 @@
-+ _iwi= iwi
-+ _ixgb= ixgb
- _mly= mly
- -_nve= nve
- .if !defined(NO_CRYPT) || defined(ALL_MODULES)
- .if exists(${.CURDIR}/../crypto/via)
- _padlock= padlock
-+ .endif
-+ .endif
-+ _ppc= ppc
-+-_rr232x= rr232x
-+ _s3= s3
-+ _twa= twa
-+ _vesa= vesa
- @@ -438,14 +426,12 @@
- #_acpi= acpi # doesn't work on amd64 yet
- _agp= agp
-@@ -210,11 +217,11 @@
- _i2c= i2c
- _ichwd= ichwd
- _ida= ida
--@@ -456,7 +442,6 @@
-- #_lnc= lnc
-+@@ -476,7 +461,6 @@
- _mly= mly
- _ndis= ndis
---_nve= nve
-+ _ppc= ppc
-+-_rr232x= rr232x
- _safe= safe
- _scsi_low= scsi_low
- _smbfs= smbfs
-Index: debian/patches/999_config.diff
-===================================================================
---- debian/patches/999_config.diff (revision 1739)
-+++ debian/patches/999_config.diff (working copy)
-@@ -71,6 +71,16 @@
-
- # If you've got a "dumb" serial or parallel PCI card that is
- # supported by the puc(4) glue driver, uncomment the following
-+@@ -215,9 +215,6 @@
-+ device wlan_ccmp # 802.11 CCMP support
-+ device wlan_tkip # 802.11 TKIP support
-+ device an # Aironet 4500/4800 802.11 wireless NICs.
-+-device ath # Atheros pci/cardbus NIC's
-+-device ath_hal # Atheros HAL (Hardware Access Layer)
-+-device ath_rate_sample # SampleRate tx rate control for ath
-+ device awi # BayStack 660 and others
-+ device ral # Ralink Technology RT2500 wireless NICs.
-+ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
- @@ -228,13 +217,8 @@
- device loop # Network loopback
- device random # Entropy device
-@@ -177,6 +187,16 @@
-
- # If you've got a "dumb" serial or parallel PCI card that is
- # supported by the puc(4) glue driver, uncomment the following
-+@@ -228,9 +228,6 @@
-+ device wlan_ccmp # 802.11 CCMP support
-+ device wlan_tkip # 802.11 TKIP support
-+ device an # Aironet 4500/4800 802.11 wireless NICs.
-+-device ath # Atheros pci/cardbus NIC's
-+-device ath_hal # Atheros HAL (Hardware Access Layer)
-+-device ath_rate_sample # SampleRate tx rate control for ath
-+ device awi # BayStack 660 and others
-+ device ral # Ralink Technology RT2500 wireless NICs.
-+ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
- @@ -243,13 +234,8 @@
- device loop # Network loopback
- device random # Entropy device
More information about the Glibc-bsd-commits
mailing list