svn commit: r293401 - stable/10/lib/libc/rpc
Author: stas Date: Fri Jan 8 00:21:55 2016 New Revision: 293401 URL: https://svnweb.freebsd.org/changeset/base/293401 Log: MFC r292047: RPC: populate local address for rendezvous transporter. Modified: stable/10/lib/libc/rpc/svc_vc.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/rpc/svc_vc.c == --- stable/10/lib/libc/rpc/svc_vc.c Fri Jan 8 00:07:37 2016 (r293400) +++ stable/10/lib/libc/rpc/svc_vc.c Fri Jan 8 00:21:55 2016 (r293401) @@ -292,8 +292,8 @@ rendezvous_request(xprt, msg) int sock, flags; struct cf_rendezvous *r; struct cf_conn *cd; - struct sockaddr_storage addr; - socklen_t len; + struct sockaddr_storage addr, sslocal; + socklen_t len, slen; struct __rpc_sockinfo si; SVCXPRT *newxprt; fd_set cleanfds; @@ -358,6 +358,20 @@ again: __xdrrec_setnonblock(>xdrs, cd->maxrec); } else cd->nonblock = FALSE; + slen = sizeof(struct sockaddr_storage); + if(_getsockname(sock, (struct sockaddr *)(void *), ) < 0) { + warnx("svc_vc_create: could not retrieve local addr"); + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = 0; + } else { + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = sslocal.ss_len; + newxprt->xp_ltaddr.buf = mem_alloc((size_t)sslocal.ss_len); + if (newxprt->xp_ltaddr.buf == NULL) { + warnx("svc_vc_create: no mem for local addr"); + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = 0; + } else { + memcpy(newxprt->xp_ltaddr.buf, , (size_t)sslocal.ss_len); + } + } gettimeofday(>last_recv_time, NULL); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r293402 - stable/10/sys/netinet
Author: stas Date: Fri Jan 8 00:46:28 2016 New Revision: 293402 URL: https://svnweb.freebsd.org/changeset/base/293402 Log: MFC r277938 (by hiren): make syncookie_mac() use 'tcp_seq irs' in computing hash. Modified: stable/10/sys/netinet/tcp_syncache.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet/tcp_syncache.c == --- stable/10/sys/netinet/tcp_syncache.cFri Jan 8 00:21:55 2016 (r293401) +++ stable/10/sys/netinet/tcp_syncache.cFri Jan 8 00:46:28 2016 (r293402) @@ -1852,6 +1852,7 @@ syncookie_mac(struct in_conninfo *inc, t } SipHash_Update(, >inc_fport, sizeof(inc->inc_fport)); SipHash_Update(, >inc_lport, sizeof(inc->inc_lport)); + SipHash_Update(, , sizeof(irs)); SipHash_Update(, , sizeof(flags)); SipHash_Update(, , sizeof(secmod)); SipHash_Final((u_int8_t *), ); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r293413 - stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: stas Date: Fri Jan 8 03:45:28 2016 New Revision: 293413 URL: https://svnweb.freebsd.org/changeset/base/293413 Log: MFC r291545: make the number of fasttrap probes and the size of the trace points hash table tunable via sysctl or kernel tunables. Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c == --- stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Fri Jan 8 03:02:19 2016(r293412) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Fri Jan 8 03:45:28 2016(r293413) @@ -63,6 +63,8 @@ #if !defined(sun) #include #include +#include +#include #include #include #include @@ -172,13 +174,14 @@ static volatile uint64_t fasttrap_mod_ge /* * When the fasttrap provider is loaded, fasttrap_max is set to either - * FASTTRAP_MAX_DEFAULT or the value for fasttrap-max-probes in the - * fasttrap.conf file. Each time a probe is created, fasttrap_total is - * incremented by the number of tracepoints that may be associated with that - * probe; fasttrap_total is capped at fasttrap_max. + * FASTTRAP_MAX_DEFAULT, or the value for fasttrap-max-probes in the + * fasttrap.conf file (Illumos), or the value provied in the loader.conf (FreeBSD). + * Each time a probe is created, fasttrap_total is incremented by the number + * of tracepoints that may be associated with that probe; fasttrap_total is capped + * at fasttrap_max. */ #defineFASTTRAP_MAX_DEFAULT25 -static uint32_t fasttrap_max; +static uint32_t fasttrap_max = FASTTRAP_MAX_DEFAULT; static uint32_t fasttrap_total; /* @@ -226,6 +229,17 @@ static kmutex_t fasttrap_cpuc_pid_lock[M static eventhandler_tag fasttrap_thread_dtor_tag; #endif +static unsigned long tpoints_hash_size = FASTTRAP_TPOINTS_DEFAULT_SIZE; + +#ifdef __FreeBSD__ +SYSCTL_DECL(_kern_dtrace); +SYSCTL_NODE(_kern_dtrace, OID_AUTO, fasttrap, CTLFLAG_RD, 0, "DTrace fasttrap parameters"); +SYSCTL_UINT(_kern_dtrace_fasttrap, OID_AUTO, max_probes, CTLFLAG_RWTUN, _max, +FASTTRAP_MAX_DEFAULT, "Maximum number of fasttrap probes"); +SYSCTL_ULONG(_kern_dtrace_fasttrap, OID_AUTO, tpoints_hash_size, CTLFLAG_RDTUN, _hash_size, +FASTTRAP_TPOINTS_DEFAULT_SIZE, "Size of the tracepoint hash table"); +#endif + static int fasttrap_highbit(ulong_t i) { @@ -2466,8 +2480,6 @@ fasttrap_load(void) #if defined(sun) fasttrap_max = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS, "fasttrap-max-probes", FASTTRAP_MAX_DEFAULT); -#else - fasttrap_max = FASTTRAP_MAX_DEFAULT; #endif fasttrap_total = 0; @@ -2478,12 +2490,14 @@ fasttrap_load(void) nent = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS, "fasttrap-hash-size", FASTTRAP_TPOINTS_DEFAULT_SIZE); #else - nent = FASTTRAP_TPOINTS_DEFAULT_SIZE; + nent = tpoints_hash_size; #endif if (nent == 0 || nent > 0x100) nent = FASTTRAP_TPOINTS_DEFAULT_SIZE; + tpoints_hash_size = nent; + if (ISP2(nent)) fasttrap_tpoints.fth_nent = nent; else ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r293382 - svnadmin/conf
Author: stas Date: Thu Jan 7 22:36:10 2016 New Revision: 293382 URL: https://svnweb.freebsd.org/changeset/base/293382 Log: Remove myself from the sizelimit file. Noticed by: glebius Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confThu Jan 7 22:27:19 2016 (r293381) +++ svnadmin/conf/sizelimit.confThu Jan 7 22:36:10 2016 (r293382) @@ -29,6 +29,5 @@ lstewart obrien peter rwatson -stas thompsa rpaulo ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r292047 - head/lib/libc/rpc
Author: stas Date: Thu Dec 10 05:17:04 2015 New Revision: 292047 URL: https://svnweb.freebsd.org/changeset/base/292047 Log: RPC: populate local address for rendezvous transporter. When accepting a connection on underlying tcp socket rpc vc transporter fails to populate local address. This change rectifies this problem by modifying rendezvous_request() to fill out the xptr structure member with appropriate information. Submitted by: Alex BurlygaMFC after:2 weeks Differential Revision: https://reviews.freebsd.org/D4206 Modified: head/lib/libc/rpc/svc_vc.c Modified: head/lib/libc/rpc/svc_vc.c == --- head/lib/libc/rpc/svc_vc.c Thu Dec 10 03:20:10 2015(r292046) +++ head/lib/libc/rpc/svc_vc.c Thu Dec 10 05:17:04 2015(r292047) @@ -281,8 +281,8 @@ rendezvous_request(SVCXPRT *xprt, struct int sock, flags; struct cf_rendezvous *r; struct cf_conn *cd; - struct sockaddr_storage addr; - socklen_t len; + struct sockaddr_storage addr, sslocal; + socklen_t len, slen; struct __rpc_sockinfo si; SVCXPRT *newxprt; fd_set cleanfds; @@ -347,6 +347,20 @@ again: __xdrrec_setnonblock(>xdrs, cd->maxrec); } else cd->nonblock = FALSE; + slen = sizeof(struct sockaddr_storage); + if(_getsockname(sock, (struct sockaddr *)(void *), ) < 0) { + warnx("svc_vc_create: could not retrieve local addr"); + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = 0; + } else { + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = sslocal.ss_len; + newxprt->xp_ltaddr.buf = mem_alloc((size_t)sslocal.ss_len); + if (newxprt->xp_ltaddr.buf == NULL) { + warnx("svc_vc_create: no mem for local addr"); + newxprt->xp_ltaddr.maxlen = newxprt->xp_ltaddr.len = 0; + } else { + memcpy(newxprt->xp_ltaddr.buf, , (size_t)sslocal.ss_len); + } + } gettimeofday(>last_recv_time, NULL); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r291545 - head/sys/cddl/contrib/opensolaris/uts/common/dtrace
Author: stas Date: Tue Dec 1 00:24:54 2015 New Revision: 291545 URL: https://svnweb.freebsd.org/changeset/base/291545 Log: Make the number of fasttrap probes and the size of the trace points hash table tunable via sysctl or kernel tunables. Illumos allows this parameters to be changed via the fasttrap.conf configuration file, but FreeBSD code hardcoded the parameters. Expose them under the kern.dtrace.fasttrap sysctl tree. MFC after:2 weeks Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c == --- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Mon Nov 30 23:37:09 2015(r291544) +++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Tue Dec 1 00:24:54 2015(r291545) @@ -63,6 +63,7 @@ #ifndef illumos #include #include +#include #include #include #include @@ -172,13 +173,14 @@ static volatile uint64_t fasttrap_mod_ge /* * When the fasttrap provider is loaded, fasttrap_max is set to either - * FASTTRAP_MAX_DEFAULT or the value for fasttrap-max-probes in the - * fasttrap.conf file. Each time a probe is created, fasttrap_total is - * incremented by the number of tracepoints that may be associated with that - * probe; fasttrap_total is capped at fasttrap_max. + * FASTTRAP_MAX_DEFAULT, or the value for fasttrap-max-probes in the + * fasttrap.conf file (Illumos), or the value provied in the loader.conf (FreeBSD). + * Each time a probe is created, fasttrap_total is incremented by the number + * of tracepoints that may be associated with that probe; fasttrap_total is capped + * at fasttrap_max. */ #defineFASTTRAP_MAX_DEFAULT25 -static uint32_t fasttrap_max; +static uint32_t fasttrap_max = FASTTRAP_MAX_DEFAULT; static uint32_t fasttrap_total; /* @@ -226,6 +228,17 @@ static kmutex_t fasttrap_cpuc_pid_lock[M static eventhandler_tag fasttrap_thread_dtor_tag; #endif +static unsigned long tpoints_hash_size = FASTTRAP_TPOINTS_DEFAULT_SIZE; + +#ifdef __FreeBSD__ +SYSCTL_DECL(_kern_dtrace); +SYSCTL_NODE(_kern_dtrace, OID_AUTO, fasttrap, CTLFLAG_RD, 0, "DTrace fasttrap parameters"); +SYSCTL_UINT(_kern_dtrace_fasttrap, OID_AUTO, max_probes, CTLFLAG_RWTUN, _max, +FASTTRAP_MAX_DEFAULT, "Maximum number of fasttrap probes"); +SYSCTL_ULONG(_kern_dtrace_fasttrap, OID_AUTO, tpoints_hash_size, CTLFLAG_RDTUN, _hash_size, +FASTTRAP_TPOINTS_DEFAULT_SIZE, "Size of the tracepoint hash table"); +#endif + static int fasttrap_highbit(ulong_t i) { @@ -2480,8 +2493,6 @@ fasttrap_load(void) #ifdef illumos fasttrap_max = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS, "fasttrap-max-probes", FASTTRAP_MAX_DEFAULT); -#else - fasttrap_max = FASTTRAP_MAX_DEFAULT; #endif fasttrap_total = 0; @@ -2492,12 +2503,14 @@ fasttrap_load(void) nent = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS, "fasttrap-hash-size", FASTTRAP_TPOINTS_DEFAULT_SIZE); #else - nent = FASTTRAP_TPOINTS_DEFAULT_SIZE; + nent = tpoints_hash_size; #endif if (nent == 0 || nent > 0x100) nent = FASTTRAP_TPOINTS_DEFAULT_SIZE; + tpoints_hash_size = nent; + if (ISP2(nent)) fasttrap_tpoints.fth_nent = nent; else ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r282866 - head/usr.sbin/pmcstat
Author: stas Date: Wed May 13 18:52:18 2015 New Revision: 282866 URL: https://svnweb.freebsd.org/changeset/base/282866 Log: Fix pmcstat symbol resolution for userland processes. When examining existing processes pmcstat fails to correctly determine the locations of executable sections of the process due to a miscalculated virtual load address. This does not affect the newly launched processes as the same value passed as a start address to the pmcstat_image_link() thus nullifying the effect of it. The issue manifests itself in processes not being reported in the pmcstat(8) output and dubious frames being reported. Fix it for now by ignoring all the sections except the executable one. This won't fix the issue for objects with multiple executable sections but helps in majority of real world usecases. The real solution would be to modify the MAP-IN event to include the appropriate load address so pmcstat(8) won't have to manually parse object files to try to determine it. PR: 198147, 198148 Reviewed by: jhb, rpaulo MFC after:2 weeks Modified: head/usr.sbin/pmcstat/pmcstat_log.c Modified: head/usr.sbin/pmcstat/pmcstat_log.c == --- head/usr.sbin/pmcstat/pmcstat_log.c Wed May 13 17:38:07 2015 (r282865) +++ head/usr.sbin/pmcstat/pmcstat_log.c Wed May 13 18:52:18 2015 (r282866) @@ -716,7 +716,8 @@ pmcstat_image_get_elf_params(struct pmcs ph.p_offset); break; case PT_LOAD: - if ((ph.p_offset (-ph.p_align)) == 0) + if ((ph.p_flags PF_X) != 0 + (ph.p_offset (-ph.p_align)) == 0) image-pi_vaddr = ph.p_vaddr (-ph.p_align); break; } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r282673 - head/usr.sbin/pmcstat
On May 8, 2015, at 7:40 PM, NGie Cooper yaneurab...@gmail.com wrote: On Fri, May 8, 2015 at 5:48 PM, Stanislav Sedov s...@freebsd.org wrote: Author: stas Date: Sat May 9 00:48:44 2015 New Revision: 282673 URL: https://svnweb.freebsd.org/changeset/base/282673 Log: Fix the double space in comment. While here, change the comment style to match the rest of the file. Too bad the rest of the file isn't style(9) friendly :/.. Yeah, well, we can address that later. I just wanted to fix the comment which really stood out that I noticed while debugging another issue. -- ST4096-RIPE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r282673 - head/usr.sbin/pmcstat
Author: stas Date: Sat May 9 00:48:44 2015 New Revision: 282673 URL: https://svnweb.freebsd.org/changeset/base/282673 Log: Fix the double space in comment. While here, change the comment style to match the rest of the file. Modified: head/usr.sbin/pmcstat/pmcstat_log.c Modified: head/usr.sbin/pmcstat/pmcstat_log.c == --- head/usr.sbin/pmcstat/pmcstat_log.c Fri May 8 23:36:31 2015 (r282672) +++ head/usr.sbin/pmcstat/pmcstat_log.c Sat May 9 00:48:44 2015 (r282673) @@ -1531,7 +1531,9 @@ pmcstat_analyze_log(void) free(ppm); } - /* associate this process image */ + /* +* Associate this process image. +*/ image_path = pmcstat_string_intern( ev.pl_u.pl_x.pl_pathname); assert(image_path != NULL); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r280902 - svnadmin/conf
Author: stas Date: Tue Mar 31 08:44:46 2015 New Revision: 280902 URL: https://svnweb.freebsd.org/changeset/base/280902 Log: Release ganbold from mentorship. He won't have to wait patiently for my approvals anymore. Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Tue Mar 31 08:05:29 2015(r280901) +++ svnadmin/conf/mentors Tue Mar 31 08:44:46 2015(r280902) @@ -17,7 +17,6 @@ carl jimharris cherry gibbs erignn Co-mentor: thompsa erjgnn Co-mentor: jfv -ganboldstas jahkib jceel wkoszek Co-mentor: cognet jchjhb ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r280157 - head/share/man/man4
Author: stas Date: Tue Mar 17 00:12:29 2015 New Revision: 280157 URL: https://svnweb.freebsd.org/changeset/base/280157 Log: Document the `show devmap` DDB command. Modified: head/share/man/man4/ddb.4 Modified: head/share/man/man4/ddb.4 == --- head/share/man/man4/ddb.4 Mon Mar 16 21:09:11 2015(r280156) +++ head/share/man/man4/ddb.4 Tue Mar 17 00:12:29 2015(r280157) @@ -620,6 +620,13 @@ for more details. Show registers specific to the Cyrix processor. .\ .Pp +.It Ic show Cm devmap +Prints the contents of the static device mapping table. +Currently only available on the +ARM +architecture. +.\ +.Pp .It Ic show Cm domain Ar addr Print protocol domain structure .Vt struct domain ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r280158 - head/share/man/man4
Author: stas Date: Tue Mar 17 00:15:55 2015 New Revision: 280158 URL: https://svnweb.freebsd.org/changeset/base/280158 Log: Bump the date after the `show devmap` addition. Modified: head/share/man/man4/ddb.4 Modified: head/share/man/man4/ddb.4 == --- head/share/man/man4/ddb.4 Tue Mar 17 00:12:29 2015(r280157) +++ head/share/man/man4/ddb.4 Tue Mar 17 00:15:55 2015(r280158) @@ -60,7 +60,7 @@ .\ .\ $FreeBSD$ .\ -.Dd July 15, 2014 +.Dd March 16, 2015 .Dt DDB 4 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r279946 - head/lib/libproc
Author: stas Date: Fri Mar 13 04:26:48 2015 New Revision: 279946 URL: https://svnweb.freebsd.org/changeset/base/279946 Log: Fix debug symbols loading in libproc: 0 is a valid file descriptor. Reported by: Chris Torek chris.to...@gmail.com Modified: head/lib/libproc/proc_sym.c Modified: head/lib/libproc/proc_sym.c == --- head/lib/libproc/proc_sym.c Fri Mar 13 02:54:46 2015(r279945) +++ head/lib/libproc/proc_sym.c Fri Mar 13 04:26:48 2015(r279946) @@ -91,7 +91,7 @@ find_dbg_obj(const char *path) snprintf(dbg_path, sizeof(dbg_path), /usr/lib/debug/%s.debug, path); fd = open(dbg_path, O_RDONLY); - if (fd 0) + if (fd = 0) return (fd); else return (open(path, O_RDONLY)); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r278616 - in head: . contrib/netbsd-tests/games etc etc/mtree etc/root games games/caesar games/fortune/datfiles release/scripts share/man/man4 share/man/man6 share/man/man7 share/mk s
On Feb 11, 2015, at 10:17 PM, Devin Teske de...@shxd.cx wrote: PLEASE! Do NOT remove the grand digital clock (grdc). So many of us over the years have used it as a terminal keeper-aliver :) (and as a clock, to boot). I will be very sad if you remove grdc. +1 I’d also vote for keeping rot13 and caesar as it is routinely useful. They are quite small and does not require a lot of maintaining work to keep around. Just my 0.02. -- ST4096-RIPE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r255219 - in head: contrib/tcpdump lib/libc lib/libc/capability lib/libc/include lib/libc/sys lib/libprocstat sbin/dhclient sbin/hastd sys/amd64/linux32 sys/bsm sys/cddl/compat/opensol
On Jan 2, 2014, at 3:01 AM, Alfred Perlstein bri...@mu.org wrote: Well I agree strongly with what you are doing except the part where 9.x jails and earlier are broken because of this change. It seems like there is a way out and you agree. Perhaps since the cap fits in the spare area we can make do for the time being? The way to do a major re-org of the kinfo_file/proc/whatever is to either use libnv as you suggest, check the binary version (as you suggest) or to make an entirely new one and make the old one kinfo_file_old and make a new way to fetch the new data as we did with the various syscalls ostatfs, ostat, etc. It still seems like we have a way out that would even give capabilities another version (there are enough cells in _kf_ispare for the next version of the capabilities code. I agree that we should move to libnv or maybe even something more structured (like ASN.1 or protobufs) in the future for such usecases to avoid this situation altogether. I should have looked into doing that much earlier. :( It’d be really nice if we can avoid this issue by using the spare fields at the moment, and switch to a new struct/proper serialization by the time we need to export more capabilities data from the kernel. We actually did exactly that once between 7.x and 8.x, that is the reason why there is also kinfo_ofile struct in that file as well. It’s a pity I have not noticed that before it was merged to 10.x, as I’m not sure we can do anything about it at the moment. I agree with Pawel that it is questionable what will lead to more damage. PS: I should also note that the change does not entirely break programs that deal with proc/filedesc as most of the fields are at the same position. The ones that need to obtain the file path of a file descriptor won’t be able to do so (think procstat -f, procstat -v, fstat). -- ST4096-RIPE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r255219 - in head: contrib/tcpdump lib/libc lib/libc/capability lib/libc/include lib/libc/sys lib/libprocstat sbin/dhclient sbin/hastd sys/amd64/linux32 sys/bsm sys/cddl/compat/opensol
On Jan 2, 2014, at 1:27 PM, Pawel Jakub Dawidek p...@freebsd.org wrote: I personally don't consider it so awful and critical as you do, clearly, but I do recognize it as a problem. I'm happy to consume spares, which should fix compatibility with older releases at the cost of breaking compatibility with 10-RCs. At least for i386 and amd64, not sure how using ints for uint64_t will work for other arches. Personally, I’d prefer if we use spare fields for now. That will allow us to maintain ABI stability for the current release, and have enough time to implement the new, incompatible, interface in addition to the old one in HEAD. The interface is used a lot by 3rd party applications to obtain the information about open file descriptors (in place of the Linux’ /proc interface), and this change will leave 9.x and before binaries broken in a subtle way on 10.x and beyond. Most of the commercial applications are shipped compiled against 9.x or even 8.x and 7.x, and although the extent of the damage is unknown, it might turn out to be a problem. To me, it seems that breaking the ABI with 10.x RC is less dangerous. -- ST4096-RIPE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r255219 - in head: contrib/tcpdump lib/libc lib/libc/capability lib/libc/include lib/libc/sys lib/libprocstat sbin/dhclient sbin/hastd sys/amd64/linux32 sys/bsm sys/cddl/compat/opensol
On Sep 4, 2013, at 5:09 PM, Pawel Jakub Dawidek p...@freebsd.org wrote: This commit also breaks compatibility with some existing Capsicum system calls, but I see no other way to do that. This should be fine as Capsicum is still experimental and this change is not going to 9.x. Hi! This change also increases the size of kinfo_file structure, which won’t allow programs not compiled against HEAD and working with kern.info.filedesc sysctl to run properly on HEAD (e.g. 8.x, 9.x and 10.x jails won’t run properly on HEAD, and it also broke valgrind). Is there absolutely no way to avoid extending the size of this struct? Thanks! #if defined(__amd64__) || defined(__i386__) -#defineKINFO_FILE_SIZE 1392 +#defineKINFO_FILE_SIZE 1424 #endif struct kinfo_file { @@ -389,6 +390,7 @@ uint16_tkf_pad1;/* Round to 32 bit alignment. */ int _kf_ispare0;/* Space for more stuff. */ cap_rights_tkf_cap_rights; /* Capability rights. */ + uint64_t_kf_cap_spare[3]; /* Space for future cap_rights_t. */ int _kf_ispare[4]; /* Space for more stuff. */ /* Truncated before copyout in sysctl */ charkf_path[PATH_MAX]; /* Path to file, if any. */ -- ST4096-RIPE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r259643 - svnadmin/conf
Author: stas Date: Fri Dec 20 10:49:57 2013 New Revision: 259643 URL: http://svnweb.freebsd.org/changeset/base/259643 Log: - Welcome Ganbold Tsagaankhuu (ganbold) to the team of src committers. He's done a great job working on FreeBSD support for numerous ARM SoCs and now will be able to submit his work directly. I will be his mentor. Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessFri Dec 20 07:41:03 2013(r259642) +++ svnadmin/conf/accessFri Dec 20 10:49:57 2013(r259643) @@ -84,6 +84,7 @@ fjoe gabor gad gallatin +ganbold gavin gber ghelmer Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Fri Dec 20 07:41:03 2013(r259642) +++ svnadmin/conf/mentors Fri Dec 20 10:49:57 2013(r259643) @@ -20,6 +20,7 @@ cyandre Co-mentor: glebius edavis davidch erimlaier Co-mentor: thompsa erwin delphij +ganboldstas jceel wkoszek Co-mentor: cognet jkhrwatson jmmv rpaulo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r250264 - head/sys/geom/label
Author: stas Date: Sun May 5 08:00:16 2013 New Revision: 250264 URL: http://svnweb.freebsd.org/changeset/base/250264 Log: - Use int8_t type for the mftrecsz field in g_label_ntfs. char type used previously caused probe failure on platforms where char is unsigned (e.g. ARM), as mftrecsz can be negative. Submitted by: Ilya Bakulin i...@bakulin.de MFC after:2 weeks Modified: head/sys/geom/label/g_label_ntfs.c Modified: head/sys/geom/label/g_label_ntfs.c == --- head/sys/geom/label/g_label_ntfs.c Sun May 5 06:32:13 2013 (r250263) +++ head/sys/geom/label/g_label_ntfs.c Sun May 5 08:00:16 2013 (r250264) @@ -86,7 +86,7 @@ struct ntfs_bootfile { uint64_tbf_spv; uint64_tbf_mftcn; uint64_tbf_mftmirrcn; - uint8_t bf_mftrecsz; + int8_t bf_mftrecsz; uint32_tbf_ibsz; uint32_tbf_volsn; } __packed; @@ -100,7 +100,8 @@ g_label_ntfs_taste(struct g_consumer *cp struct ntfs_attr *atr; off_t voloff; char *filerecp, *ap; - char mftrecsz, vnchar; + int8_t mftrecsz; + char vnchar; int recsize, j; g_topology_assert_not(); @@ -113,7 +114,7 @@ g_label_ntfs_taste(struct g_consumer *cp if (bf == NULL || strncmp(bf-bf_sysid, NTFS, 8) != 0) goto done; - mftrecsz = (char)bf-bf_mftrecsz; + mftrecsz = bf-bf_mftrecsz; recsize = (mftrecsz 0) ? (mftrecsz * bf-bf_bps * bf-bf_spc) : (1 -mftrecsz); if (recsize == 0 || recsize % pp-sectorsize != 0) goto done; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r243554 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On Sat, 1 Dec 2012 08:52:52 + Chris Rees utis...@gmail.com mentioned: UPDATING, yes. Also as I reminded you in IRC last week, users of -CURRENT are expected to follow -current@. Users of ports are also strongly recommended to read -ports-announce. Repeating that several times does not make it true. What are you trying to achieve here? You discussed this previously, and got exactly the same answer. There were extensive discussions over it in ports@. I'm trying to point out, that this commit (and previous pkgng ones) was made without proper peer review and consulations, which is a recommended practice in THIS project. Doing so hurts not only the committer reputation (which I frankly do not care about), but the project image as a whole. I really don't want to go in and revert these changes, but I want to find a reasonable solution. It's not the first time an unreviewed ports-related change is being committed to a tree by that hurts us, who actually use FreeBSD and not consider it a personal playground. -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r243554 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On Thu, 29 Nov 2012 08:38:47 +0100 Baptiste Daroussin b...@freebsd.org mentioned: pkg is no more experimental at all, it is not perfect there are large rooms for improvements, but it is perfectly ready to be used, if you have any concern about some missing feature just report it; Concerning a landmine, when you have big flashy lights all over the place: http://lists.freebsd.org/pipermail/freebsd-ports-announce/2012-October/32.html http://lists.freebsd.org/pipermail/freebsd-current/2012-October/037001.html a fanfare playing in front of it saying beware landsmine: http://svnweb.freebsd.org/ports?view=revisionrevision=305637 and maps available all over the places to explains where the mine are how to workaround them, or be mine proof: http://svnweb.freebsd.org/ports/head/CHANGES (entry 20121010) http://svnweb.freebsd.org/ports/head/UPDATING (entry 20121010) I'd say in that case it is no more considered as a landmine but just a new safe way. It is a new way forced on users. I didn't ask to use pkgng on my system, neither I got any warning when it silently stopped creating entries in /var/db/pkg. Do you expect all users to read UPDATING and/or svn commit logs each time they update? Switching to pkgng was not a community descision, it was a decision made by a small group of people (alledgedly, considering input from the community). Personally, I don't see why it should be that way, and why the default had to be forceably changed. It is an open question (at least for me) whether pkgng is any better than the old tools, and there is at least on drawback in using pkgng, namely sqlite database, which will make you lose all packages in the case of a small fs corruption. That problem was raised before numerous times starting when developing a new pkg tool was proposed. But it is a design decision, and I respect it. What I don't like is that the switch to the new pkg system lacks any legitemacy, as it was largely a portmgr descision. If instead you ran it alongside for some time and it ended up being used by majority of users compared to the legacy pkg, and then pulled the switch, then it'd a different story. The bottom line is that I ended up with a corrupted pkg database for no particular reason. And it didn't have to be that way. -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r243554 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On Mon, 26 Nov 2012 05:11:07 + (UTC) Eitan Adler ead...@freebsd.org mentioned: Author: eadler Date: Mon Nov 26 05:11:07 2012 New Revision: 243554 URL: http://svnweb.freebsd.org/changeset/base/243554 Log: Provide an option to users to shoot themselves in the foot. This should probably be a default behavior. It's not good when all these warnings pop up everywhere just because local.sqlite file is present. -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r243554 - in head/usr.sbin/pkg_install: add create delete info lib updating version
On Wed, 28 Nov 2012 21:03:58 -0500 Eitan Adler ead...@freebsd.org mentioned: On 28 November 2012 20:00, Stanislav Sedov s...@freebsd.org wrote: On Mon, 26 Nov 2012 05:11:07 + (UTC) Eitan Adler ead...@freebsd.org mentioned: Author: eadler Date: Mon Nov 26 05:11:07 2012 New Revision: 243554 URL: http://svnweb.freebsd.org/changeset/base/243554 Log: Provide an option to users to shoot themselves in the foot. This should probably be a default behavior. It's not good when all these warnings pop up everywhere just because local.sqlite file is present. Making the foot shooting behavior default defeats the point. If local.sqlite exists it almost certainly means that you don't want to run the old pkg_ tools. For the few correct uses an opt-out option is provided. Well, it's not entirely true. I did end up with local.sqlite because I stepped on the landmine of portmgr-pkg becoming the default for some reason. So I did end up with half of my packages being in the pkgng sqlite database, and half in standard /var/db/pkg. I had to convert them back to standard format by hand, but I still have the sqlite database just in case. I guess if you really want to prevent a foot-shooting, you should add a message to pkgng sayng in all caps e.g. You are running experimental package manager and there's no migration plan from pkgng to old pkg exists. and maybe ask for confirmation. I don't really see how this message being in pkg_ tools helps to prevent a possible foot-shooting at all. At very least, it makes sense to make it conditional on WITH_PKGNG, so this code does not end up compiled in if PKGNG is disabled in src.conf. -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r235716 - head/contrib/com_err
Author: stas Date: Mon May 21 04:29:11 2012 New Revision: 235716 URL: http://svn.freebsd.org/changeset/base/235716 Log: - On FreeBSD, com_err.h is installed into /usr/include, not /usr/include/krb5. Reflect that in the manpage. PR: bin/167986 Reported by: truckman@ Modified: head/contrib/com_err/com_err.3 Modified: head/contrib/com_err/com_err.3 == --- head/contrib/com_err/com_err.3 Mon May 21 04:24:58 2012 (r235715) +++ head/contrib/com_err/com_err.3 Mon May 21 04:29:11 2012 (r235716) @@ -54,7 +54,7 @@ Common Error Library (libcom_err, -lcom_ .Sh SYNOPSIS .Fd #include stdio.h .Fd #include stdarg.h -.Fd #include krb5/com_err.h +.Fd #include com_err.h .Fd #include \XXX_err.h\ .Pp typedef void (*errf)(const char *, long, const char *, ...); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r235107 - in head/etc: defaults rc.d
Author: stas Date: Sun May 6 20:46:04 2012 New Revision: 235107 URL: http://svn.freebsd.org/changeset/base/235107 Log: - Change kfd rc script to be more conformant with rcNG conventions: o change rcname to kfd; o move mandatory options to command_args; o add missing shutdown keyword; o fix require line. Kfd doesn't really need to be started before daemons. Suggested by: dougb Modified: head/etc/defaults/rc.conf head/etc/rc.d/kfd Modified: head/etc/defaults/rc.conf == --- head/etc/defaults/rc.conf Sun May 6 20:40:18 2012(r235106) +++ head/etc/defaults/rc.conf Sun May 6 20:46:04 2012(r235107) @@ -297,8 +297,8 @@ kadmind5_server_enable=NO # Run kadmin kadmind5_server=/usr/libexec/kadmind # path to kerberos 5 admin daemon kpasswdd_server_enable=NO# Run kpasswdd (or NO) kpasswdd_server=/usr/libexec/kpasswdd# path to kerberos 5 passwd daemon -kfd_server_enable=NO # Run kfd (or NO) -kfd_server=/usr/libexec/kfd # path to kerberos 5 kfd daemon +kfd_enable=NO# Run kfd (or NO) +kfd_program=/usr/libexec/kfd # path to kerberos 5 kfd daemon gssd_enable=NO # Run the gssd daemon (or NO). gssd_flags= # Flags for gssd. Modified: head/etc/rc.d/kfd == --- head/etc/rc.d/kfd Sun May 6 20:40:18 2012(r235106) +++ head/etc/rc.d/kfd Sun May 6 20:46:04 2012(r235107) @@ -4,16 +4,14 @@ # # PROVIDE: kfd -# BEFORE: DAEMON +# REQUIRE: NETWORK +# KEYWORD: shutdown . /etc/rc.subr -name=kfd +name=kfd +rcvar=kfd_enable load_rc_config $name -rcvar=kfd_server_enable -unset start_cmd -command=${kfd_server} -kfd_flags=-i -command_args= +command_args=-i run_rc_command $1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r235108 - head/share/man/man5
Author: stas Date: Sun May 6 21:05:58 2012 New Revision: 235108 URL: http://svn.freebsd.org/changeset/base/235108 Log: - Document kfd(8) rc.conf variables in the manpage. Modified: head/share/man/man5/rc.conf.5 Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Sun May 6 20:46:04 2012 (r235107) +++ head/share/man/man5/rc.conf.5 Sun May 6 21:05:58 2012 (r235108) @@ -2086,6 +2086,19 @@ If is set to .Dq Li YES this is the path to Kerberos 5 Password-Changing Daemon. +.It Va kfd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start +.Xr kfd 8 , +the Kerberos 5 ticket forwarding daemon, at the boot time. +.It Va kfd_program +.Pq Vt str +Path to +.Xr kfd 8 +(default +.Pa /usr/libexec/kfd ) . .It Va rwhod_enable .Pq Vt bool If set to ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r235116 - head/share/man/man5
Author: stas Date: Mon May 7 02:50:52 2012 New Revision: 235116 URL: http://svn.freebsd.org/changeset/base/235116 Log: - Bump the manpage date after kfd addition. Reported by: gjb Modified: head/share/man/man5/rc.conf.5 Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Mon May 7 00:39:47 2012 (r235115) +++ head/share/man/man5/rc.conf.5 Mon May 7 02:50:52 2012 (r235116) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 27, 2012 +.Dd May 06, 2012 .Dt RC.CONF 5 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234688 - head/sys/arm/arm
Author: stas Date: Wed Apr 25 22:44:07 2012 New Revision: 234688 URL: http://svn.freebsd.org/changeset/base/234688 Log: - Disable MMU before reconfiguring the pagetables in the trampoline code. Otherwise we might end up overwriting the PTEs we're currently using for some reason. Reviewed by: cognet Modified: head/sys/arm/arm/elf_trampoline.c Modified: head/sys/arm/arm/elf_trampoline.c == --- head/sys/arm/arm/elf_trampoline.c Wed Apr 25 21:59:56 2012 (r234687) +++ head/sys/arm/arm/elf_trampoline.c Wed Apr 25 22:44:07 2012 (r234688) @@ -614,6 +614,17 @@ __start(void) (unsigned int)func_end + 800 , 0); if (altdst dst) dst = altdst; + + /* +* Disable MMU. Otherwise, setup_pagetables call below +* might overwrite the L1 table we are currently using. +*/ + cpu_idcache_wbinv_all(); + cpu_l2cache_wbinv_all(); + __asm __volatile(mrc p15, 0, %0, c1, c0, 0\n + bic %0, %0, #1\n /* MMU_DISABLE */ + mcr p15, 0, %0, c1, c0, 0\n + :=r (pt_addr)); } else #endif dst = 4 + load_kernel((unsigned int)kernel_start, ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234093 - in head/etc: defaults rc.d
Author: stas Date: Tue Apr 10 09:27:41 2012 New Revision: 234093 URL: http://svn.freebsd.org/changeset/base/234093 Log: - Add rc.d script for kfd, kerberos forwarded tickets daemon. Added: head/etc/rc.d/kfd (contents, props changed) Modified: head/etc/defaults/rc.conf head/etc/rc.d/Makefile Modified: head/etc/defaults/rc.conf == --- head/etc/defaults/rc.conf Tue Apr 10 07:38:58 2012(r234092) +++ head/etc/defaults/rc.conf Tue Apr 10 09:27:41 2012(r234093) @@ -297,6 +297,8 @@ kadmind5_server_enable=NO # Run kadmin kadmind5_server=/usr/libexec/kadmind # path to kerberos 5 admin daemon kpasswdd_server_enable=NO# Run kpasswdd (or NO) kpasswdd_server=/usr/libexec/kpasswdd# path to kerberos 5 passwd daemon +kfd_server_enable=NO # Run kfd (or NO) +kfd_server=/usr/libexec/kfd # path to kerberos 5 kfd daemon gssd_enable=NO # Run the gssd daemon (or NO). gssd_flags= # Flags for gssd. Modified: head/etc/rc.d/Makefile == --- head/etc/rc.d/Makefile Tue Apr 10 07:38:58 2012(r234092) +++ head/etc/rc.d/Makefile Tue Apr 10 09:27:41 2012(r234093) @@ -66,6 +66,7 @@ FILES=DAEMON \ kadmind \ kerberos \ keyserv \ + kfd \ kld \ kldxref \ kpasswdd \ Added: head/etc/rc.d/kfd == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/rc.d/kfd Tue Apr 10 09:27:41 2012(r234093) @@ -0,0 +1,19 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: kfd +# BEFORE: DAEMON + +. /etc/rc.subr + +name=kfd +load_rc_config $name +rcvar=kfd_server_enable +unset start_cmd +command=${kfd_server} +kfd_flags=-i +command_args= + +run_rc_command $1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r233991 - head/sys/dev/smc
Author: stas Date: Sat Apr 7 06:56:38 2012 New Revision: 233991 URL: http://svn.freebsd.org/changeset/base/233991 Log: - Do not reinitialize the card if it is already running. This fixes bootp on if_smc, as bootp code perform SIOCSIFADDR ioctl call immediately after sending the request (which causes if_init being called) which causes the adapter to drop all the packets received in the meantime. Modified: head/sys/dev/smc/if_smc.c Modified: head/sys/dev/smc/if_smc.c == --- head/sys/dev/smc/if_smc.c Sat Apr 7 05:51:43 2012(r233990) +++ head/sys/dev/smc/if_smc.c Sat Apr 7 06:56:38 2012(r233991) @@ -1237,9 +1237,10 @@ smc_init_locked(struct smc_softc *sc) { struct ifnet*ifp; - ifp = sc-smc_ifp; - SMC_ASSERT_LOCKED(sc); + ifp = sc-smc_ifp; + if ((ifp-if_drv_flags IFF_DRV_RUNNING) != 0) + return; smc_reset(sc); smc_enable(sc); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234004 - in head/sys: arm/xscale/pxa conf
Author: stas Date: Sat Apr 7 23:47:08 2012 New Revision: 234004 URL: http://svn.freebsd.org/changeset/base/234004 Log: - Add new ARM kernel option QEMU_WORKAROUNDS which can be used in the code which needs to implement some specific behaviour when being run under QEMU. - Make PXA UART probe code to work under QEMU gumstix, which doesn't emulate all the ports properly. Modified: head/sys/arm/xscale/pxa/uart_bus_pxa.c head/sys/conf/options.arm Modified: head/sys/arm/xscale/pxa/uart_bus_pxa.c == --- head/sys/arm/xscale/pxa/uart_bus_pxa.c Sat Apr 7 22:28:50 2012 (r234003) +++ head/sys/arm/xscale/pxa/uart_bus_pxa.c Sat Apr 7 23:47:08 2012 (r234004) @@ -72,12 +72,28 @@ uart_pxa_probe(device_t dev) bus_space_handle_t base; struct uart_softc *sc; - /* Check to see if the enable bit's on. */ base = (bus_space_handle_t)pxa_get_base(dev); +#ifdef QEMU_WORKAROUNDS + /* +* QEMU really exposes only the first uart unless +* you specify several of them in the configuration. +* Otherwise all the rest of UARTs stay unconnected, +* which causes problems in the ns16550 attach routine. +* Unfortunately, even if you provide qemu with 4 uarts +* on the command line, it has a bug where it segfaults +* trying to enable bluetooth on the HWUART. So we just +* allow the FFUART to be attached. +* Also, don't check the UUE (UART Unit Enable) bit, as +* the gumstix bootloader doesn't set it. +*/ + if (base != PXA2X0_FFUART_BASE) + return (ENXIO); +#else + /* Check to see if the enable bit's on. */ if ((bus_space_read_4(obio_tag, base, (REG_IER 2)) PXA_UART_UUE) == 0) return (ENXIO); - +#endif sc = device_get_softc(dev); sc-sc_class = uart_ns8250_class; Modified: head/sys/conf/options.arm == --- head/sys/conf/options.arm Sat Apr 7 22:28:50 2012(r234003) +++ head/sys/conf/options.arm Sat Apr 7 23:47:08 2012(r234004) @@ -23,6 +23,7 @@ KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h LOADERRAMADDR opt_global.h PHYSADDR opt_global.h +QEMU_WORKAROUNDS opt_global.h SKYEYE_WORKAROUNDS opt_global.h SOC_MV_DISCOVERY opt_global.h SOC_MV_KIRKWOODopt_global.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234005 - in head: lib/libc/arm/gen sys/arm/conf sys/arm/include
Author: stas Date: Sat Apr 7 23:48:51 2012 New Revision: 234005 URL: http://svn.freebsd.org/changeset/base/234005 Log: - Add kernel config file for QEMU-emulated gumstix board. Added: head/sys/arm/conf/GUMSTIX-QEMU (contents, props changed) Modified: head/lib/libc/arm/gen/Makefile.inc head/sys/arm/include/armreg.h Modified: head/lib/libc/arm/gen/Makefile.inc == --- head/lib/libc/arm/gen/Makefile.inc Sat Apr 7 23:47:08 2012 (r234004) +++ head/lib/libc/arm/gen/Makefile.inc Sat Apr 7 23:48:51 2012 (r234005) @@ -3,4 +3,4 @@ SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \ getcontextx.c infinity.c ldexp.c makecontext.c \ - __aeabi_read_tp.c setjmp.S signalcontext.c sigsetjmp.S divsi3.S flt_rounds.c + __aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S divsi3.S flt_rounds.c Added: head/sys/arm/conf/GUMSTIX-QEMU == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/arm/conf/GUMSTIX-QEMU Sat Apr 7 23:48:51 2012 (r234005) @@ -0,0 +1,92 @@ +# GUMSTIX-QEMU -- Custom configuration for the QEMU emulated Gumstix target +# +# For more information on this file, please read the handbook section on +# Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +ident GUMSTIX-QEMU +cpuCPU_XSCALE_PXA2X0 + +# This probably wants to move somewhere else. Maybe we can create a basic +# PXA2X0 config, then make a GUMSTIX config that includes the basic one, +# adds the smc and smcphy devices and pulls in this hints file. +hints GUMSTIX.hints + +optionsPHYSADDR=0xa000 +optionsKERNPHYSADDR=0xa020 +optionsKERNVIRTADDR=0xc020 # Used in ldscript.arm + +optionsSTARTUP_PAGETABLE_ADDR=0xa000 +include../xscale/pxa/std.pxa +makeoptionsMODULES_OVERRIDE= + +makeoptionsDEBUG=-g#Build kernel with gdb(1) debug symbols +optionsHZ=100 +#options DEVICE_POLLING + +optionsQEMU_WORKAROUNDS +nooptions ARM_CACHE_LOCK_ENABLE # QEMU does not implement this + +optionsSCHED_4BSD #4BSD scheduler +optionsINET#InterNETworking +#options INET6 #IPv6 communications protocols +optionsFFS #Berkeley Fast Filesystem +optionsSOFTUPDATES #Enable FFS soft updates support +optionsUFS_ACL #Support for access control lists +optionsUFS_DIRHASH #Improve performance on big directories +optionsNFSCL #New Network Filesystem Client +#options NFSD#New Network Filesystem Server +optionsNFS_ROOT#NFS usable as /, requires NFSCL +#options MSDOSFS #MSDOS Filesystem +#options CD9660 #ISO 9660 Filesystem +#options PROCFS #Process filesystem (requires PSEUDOFS) +optionsPSEUDOFS#Pseudo-filesystem framework +optionsCOMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] +optionsSCSI_DELAY=5000 #Delay (in ms) before probing SCSI +optionsKTRACE #ktrace(1) support +optionsSYSVSHM #SYSV-style shared memory +optionsSYSVMSG #SYSV-style message queues +optionsSYSVSEM #SYSV-style semaphores +options_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +optionsKBD_INSTALL_CDEV# install a CDEV entry in /dev +optionsBOOTP +optionsBOOTP_NFSROOT +optionsBOOTP_WIRED_TO=smc0 +optionsBOOTP_COMPAT +optionsBOOTP_NFSV3 +optionsBOOTP_BLOCKSIZE=4096 +optionsPREEMPTION +device loop +device ether +device mii +device mii_bitbang +device smc +device smcphy +device uart +device uart_ns8250 + +# Debugging for use in -current +optionsKDB +optionsDDB #Enable the kernel debugger +#options DEADLKRES #Enable the deadlock resolver +#options INVARIANTS #Enable calls of extra sanity
svn commit: r234006 - in head: lib/libc/arm/gen sys/arm/include
Author: stas Date: Sat Apr 7 23:51:16 2012 New Revision: 234006 URL: http://svn.freebsd.org/changeset/base/234006 Log: - Revert part of r234005, which I did not intend to commit. Sorry! :( Modified: head/lib/libc/arm/gen/Makefile.inc head/sys/arm/include/armreg.h Modified: head/lib/libc/arm/gen/Makefile.inc == --- head/lib/libc/arm/gen/Makefile.inc Sat Apr 7 23:48:51 2012 (r234005) +++ head/lib/libc/arm/gen/Makefile.inc Sat Apr 7 23:51:16 2012 (r234006) @@ -3,4 +3,4 @@ SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \ getcontextx.c infinity.c ldexp.c makecontext.c \ - __aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S divsi3.S flt_rounds.c + __aeabi_read_tp.c setjmp.S signalcontext.c sigsetjmp.S divsi3.S flt_rounds.c Modified: head/sys/arm/include/armreg.h == --- head/sys/arm/include/armreg.h Sat Apr 7 23:48:51 2012 (r234005) +++ head/sys/arm/include/armreg.h Sat Apr 7 23:51:16 2012 (r234006) @@ -317,7 +317,7 @@ * Address of the vector page, low and high versions. */ #defineARM_VECTORS_LOW 0xU -#defineARM_VECTORS_HIGH0x +#defineARM_VECTORS_HIGH0xU /* * ARM Instructions ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234011 - head/lib/libgssapi
Author: stas Date: Sun Apr 8 03:55:25 2012 New Revision: 234011 URL: http://svn.freebsd.org/changeset/base/234011 Log: - Use __NO_TLS preprocessor value to make assumptions about TLS support on a platform. Modified: head/lib/libgssapi/gss_display_status.c Modified: head/lib/libgssapi/gss_display_status.c == --- head/lib/libgssapi/gss_display_status.c Sun Apr 8 01:43:41 2012 (r234010) +++ head/lib/libgssapi/gss_display_status.c Sun Apr 8 03:55:25 2012 (r234011) @@ -173,7 +173,7 @@ supplementary_error(OM_uint32 v) return msgs[v]; } -#if defined(__sparc64__) || defined(__arm__) || defined(__mips__) +#if defined(__NO_TLS) /* * These platforms don't support TLS on FreeBSD - threads will just ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r234013 - in head/kerberos5/lib: libasn1 libkafs5
Author: stas Date: Sun Apr 8 04:22:09 2012 New Revision: 234013 URL: http://svn.freebsd.org/changeset/base/234013 Log: - Add a real symbol version map to libasn1. The upstream version of the version map just exported all the symbols, which caused a binutils bug being triggered when ld fails to link two objects, one of which exports a versioned version of the symbol, and another -- unversioned. [1] - Also add version map for libkafs5. Submitted by: jchandra@ (based on) Added: head/kerberos5/lib/libasn1/version.map (contents, props changed) head/kerberos5/lib/libkafs5/version.map (contents, props changed) Modified: head/kerberos5/lib/libasn1/Makefile head/kerberos5/lib/libkafs5/Makefile Modified: head/kerberos5/lib/libasn1/Makefile == --- head/kerberos5/lib/libasn1/Makefile Sun Apr 8 04:09:55 2012 (r234012) +++ head/kerberos5/lib/libasn1/Makefile Sun Apr 8 04:22:09 2012 (r234013) @@ -5,7 +5,7 @@ LDFLAGS=-Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h LDADD= -lcom_err -lroken DPADD= ${LIBCOM_ERR} ${LIBROKEN} -VERSION_MAP= ${KRB5DIR}/lib/asn1/version-script.map +VERSION_MAP= ${.CURDIR}/version.map SRCS= asn1_err.c \ asn1_err.h \ Added: head/kerberos5/lib/libasn1/version.map == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/kerberos5/lib/libasn1/version.map Sun Apr 8 04:22:09 2012 (r234013) @@ -0,0 +1,1592 @@ +# +# Export all symbols but _init and _fini. +# +# $FreeBSD$ +# +HEIMDAL_ASN1_1.0 { + global: + APOptions2int; + DigestTypes2int; + DistributionPointReasonFlags2int; + FastOptions2int; + KDCOptions2int; + KeyUsage2int; + SAMFlags2int; + TicketFlags2int; + _asn1_copy; + _asn1_copy_top; + _asn1_decode; + _asn1_decode_top; + _asn1_encode; + _asn1_free; + _asn1_length; + _der_gmtime; + _der_timegm; + _heim_der_set_sort; + _heim_fix_dce; + _heim_len_int; + _heim_len_unsigned; + _heim_time2generalizedtime; + add_AuthorizationData; + add_CRLDistributionPoints; + add_DigestAlgorithmIdentifiers; + add_ETYPE_INFO; + add_ETYPE_INFO2; + add_Extensions; + add_GeneralNames; + add_METHOD_DATA; + add_Principals; + asn1_APOptions_units; + asn1_DigestTypes_units; + asn1_DistributionPointReasonFlags_units; + asn1_FastOptions_units; + asn1_KDCOptions_units; + asn1_KeyUsage_units; + asn1_SAMFlags_units; + asn1_TicketFlags_units; + asn1_oid_id_Userid; + asn1_oid_id_aes_128_cbc; + asn1_oid_id_aes_192_cbc; + asn1_oid_id_aes_256_cbc; + asn1_oid_id_at_commonName; + asn1_oid_id_at_countryName; + asn1_oid_id_at_generationQualifier; + asn1_oid_id_at_givenName; + asn1_oid_id_at_initials; + asn1_oid_id_at_localityName; + asn1_oid_id_at_name; + asn1_oid_id_at_organizationName; + asn1_oid_id_at_organizationalUnitName; + asn1_oid_id_at_pseudonym; + asn1_oid_id_at_serialNumber; + asn1_oid_id_at_stateOrProvinceName; + asn1_oid_id_at_streetAddress; + asn1_oid_id_at_surname; + asn1_oid_id_dhpublicnumber; + asn1_oid_id_domainComponent; + asn1_oid_id_dsa; + asn1_oid_id_dsa_with_sha1; + asn1_oid_id_ecDH; + asn1_oid_id_ecMQV; + asn1_oid_id_ecPublicKey; + asn1_oid_id_ec_group_secp160r1; + asn1_oid_id_ec_group_secp160r2; + asn1_oid_id_ec_group_secp256r1; + asn1_oid_id_ecdsa_with_SHA1; + asn1_oid_id_ecdsa_with_SHA256; + asn1_oid_id_heim_rsa_pkcs1_x509; + asn1_oid_id_ms_cert_enroll_domaincontroller; + asn1_oid_id_ms_client_authentication; + asn1_oid_id_netscape; + asn1_oid_id_netscape_cert_comment; + asn1_oid_id_nistAlgorithm; + asn1_oid_id_nist_aes_algs; + asn1_oid_id_nist_sha_algs; + asn1_oid_id_pbeWithSHAAnd128BitRC2_CBC; + asn1_oid_id_pbeWithSHAAnd128BitRC4; + asn1_oid_id_pbeWithSHAAnd2_KeyTripleDES_CBC; +
svn commit: r234017 - vendor-crypto/heimdal/1.5.2
Author: stas Date: Sun Apr 8 04:48:59 2012 New Revision: 234017 URL: http://svn.freebsd.org/changeset/base/234017 Log: - Tag heimdal 1.5.2 import. Added: vendor-crypto/heimdal/1.5.2/ - copied from r234016, vendor-crypto/heimdal/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r233932 - in head: contrib/telnet/libtelnet lib/libtelnet
Author: stas Date: Fri Apr 6 00:03:45 2012 New Revision: 233932 URL: http://svn.freebsd.org/changeset/base/233932 Log: - Do not use deprecated krb5 error message reporting functions in libtelnet. Modified: head/contrib/telnet/libtelnet/kerberos5.c head/lib/libtelnet/Makefile Modified: head/contrib/telnet/libtelnet/kerberos5.c == --- head/contrib/telnet/libtelnet/kerberos5.c Thu Apr 5 22:40:31 2012 (r233931) +++ head/contrib/telnet/libtelnet/kerberos5.c Fri Apr 6 00:03:45 2012 (r233932) @@ -100,6 +100,16 @@ static krb5_ticket *ticket; static krb5_context context; static krb5_auth_context auth_context; +static void +print_krb5_error(krb5_context context, krb5_error_code code, const char *msg) +{ + const char *error_message; + + error_message = krb5_get_error_message(context, code); + printf(msg, error_message); + krb5_free_error_message(context, error_message); +} + static int Data(Authenticator *ap, int type, const char *d, int c) { @@ -182,8 +192,7 @@ kerberos5_send(const char *name, Authent ret = krb5_cc_default(context, ccache); if (ret) { if (auth_debug_mode) { - printf(Kerberos V5: could not get default ccache: %s\r\n, - krb5_get_err_text (context, ret)); + print_krb5_error(context, ret, Kerberos V5: could not get default ccache: %s\r\n); } return 0; } @@ -197,8 +206,7 @@ kerberos5_send(const char *name, Authent ret = krb5_auth_con_init (context, auth_context); if (ret) { if (auth_debug_mode) { - printf(Kerberos V5: krb5_auth_con_init failed (%s)\r\n, - krb5_get_err_text(context, ret)); + print_krb5_error(context, ret, Kerberos V5: krb5_auth_con_init failed (%s)\r\n); } return(0); } @@ -208,9 +216,8 @@ kerberos5_send(const char *name, Authent net); if (ret) { if (auth_debug_mode) { - printf (Kerberos V5: -krb5_auth_con_setaddrs_from_fd failed (%s)\r\n, - krb5_get_err_text(context, ret)); + print_krb5_error(context, ret, Kerberos V5: +krb5_auth_con_setaddrs_from_fd failed (%s)\r\n); } return(0); } @@ -236,18 +243,21 @@ kerberos5_send(const char *name, Authent service); if(ret) { if (auth_debug_mode) { - printf (Kerberos V5: + const char *err_str; + + err_str = krb5_get_error_message(context, ret); + printf(Kerberosr V5: krb5_sname_to_principal(%s) failed (%s)\r\n, - RemoteHostName, krb5_get_err_text(context, ret)); + RemoteHostName, err_str); + krb5_free_error_message(context, err_str); } return 0; } ret = krb5_unparse_name_fixed(context, service, sname, sizeof(sname)); if(ret) { if (auth_debug_mode) { - printf (Kerberos V5: -krb5_unparse_name_fixed failed (%s)\r\n, - krb5_get_err_text(context, ret)); + print_krb5_error(context, ret, Kerberos V5: +krb5_unparse_name_fixed failed (%s)\r\n); } return 0; } @@ -260,8 +270,7 @@ kerberos5_send(const char *name, Authent } if (ret) { if (1 || auth_debug_mode) { - printf(Kerberos V5: mk_req failed (%s)\r\n, - krb5_get_err_text(context, ret)); + print_krb5_error(context, ret, Kerberos V5: mk_req failed (%s)\r\n); } return(0); } @@ -319,8 +328,7 @@ kerberos5_is(Authenticator *ap, unsigned Data(ap, KRB_REJECT, krb5_auth_con_init failed, -1); auth_finished(ap, AUTH_REJECT); if (auth_debug_mode) - printf(Kerberos V5: krb5_auth_con_init failed (%s)\r\n, - krb5_get_err_text(context, ret)); + print_krb5_error(context, ret, Kerberos V5: krb5_auth_con_init failed (%s)\r\n); return; } @@ -331,9 +339,8 @@ kerberos5_is(Authenticator *ap, unsigned Data(ap, KRB_REJECT, krb5_auth_con_setaddrs_from_fd failed, -1); auth_finished(ap, AUTH_REJECT); if (auth_debug_mode) - printf(Kerberos V5: - krb5_auth_con_setaddrs_from_fd failed (%s)\r\n, - krb5_get_err_text(context, ret)); + print_krb5_error(context, ret, Kerberos V5: + krb5_auth_con_setaddrs_from_fd failed (%s)\r\n); return; } @@ -346,9 +353,8 @@ kerberos5_is(Authenticator *ap, unsigned Data(ap, KRB_REJECT, krb5_sock_to_principal failed, -1);
svn commit: r233343 - head
Author: stas Date: Fri Mar 23 07:45:11 2012 New Revision: 233343 URL: http://svn.freebsd.org/changeset/base/233343 Log: - Take krb5_verify_user.3.gz out of ObsoleteFiles as it's still being installed. - Add 32-bit compat old kerberos libraries to ObsoleteFiles as well. Reported by: pluknet@ Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri Mar 23 07:26:17 2012(r233342) +++ head/ObsoleteFiles.inc Fri Mar 23 07:45:11 2012(r233343) @@ -56,7 +56,6 @@ OLD_FILES+=usr/include/krb5-v4compat.h \ usr/share/man/man3/krb5_kt_cursor.3.gz \ usr/share/man/man3/krb5_kt_ops.3.gz \ usr/share/man/man3/krb5_set_warn_dest.3.gz \ -usr/share/man/man3/krb5_verify_user.3.gz \ usr/share/man/man3/krb5_verr.3.gz \ usr/share/man/man3/krb5_verrx.3.gz \ usr/share/man/man3/krb5_vwarnx.3.gz \ @@ -70,7 +69,16 @@ OLD_LIBS+=usr/lib/libasn1.so.10 \ usr/lib/libkadm5srv.so.10 \ usr/lib/libkafs5.so.10 \ usr/lib/libkrb5.so.10 \ - usr/lib/libroken.so.10 + usr/lib/libroken.so.10 \ + usr/lib32/libasn1.so.10 \ + usr/lib32/libhdb.so.10 \ + usr/lib32/libheimntlm.so.10 \ + usr/lib32/libhx509.so.10 \ + usr/lib32/libkadm5clnt.so.10 \ + usr/lib32/libkadm5srv.so.10 \ + usr/lib32/libkafs5.so.10 \ + usr/lib32/libkrb5.so.10 \ + usr/lib32/libroken.so.10 # 20120309: Remove fifofs header files. OLD_FILES+=usr/include/fs/fifofs/fifo.h OLD_DIRS+=usr/include/fs/fifofs ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r233344 - head
Author: stas Date: Fri Mar 23 07:52:37 2012 New Revision: 233344 URL: http://svn.freebsd.org/changeset/base/233344 Log: - Actually fill the date of the Heimdal update. Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Fri Mar 23 07:45:11 2012(r233343) +++ head/ObsoleteFiles.inc Fri Mar 23 07:52:37 2012(r233344) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# 201203XX: Update heimdal to 1.5.1. +# 20120322: Update heimdal to 1.5.1. OLD_FILES+=usr/include/krb5-v4compat.h \ usr/include/krb_err.h \ usr/include/hdb-private.h \ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r233405 - head/kerberos5/lib/libkafs5
Author: stas Date: Sat Mar 24 00:42:38 2012 New Revision: 233405 URL: http://svn.freebsd.org/changeset/base/233405 Log: - Apply binutils workaround on mips.mips as well. Though this TARGET_ARCH is deprecated, tinderbox uses it. Modified: head/kerberos5/lib/libkafs5/Makefile Modified: head/kerberos5/lib/libkafs5/Makefile == --- head/kerberos5/lib/libkafs5/MakefileSat Mar 24 00:37:56 2012 (r233404) +++ head/kerberos5/lib/libkafs5/MakefileSat Mar 24 00:42:38 2012 (r233405) @@ -10,7 +10,8 @@ MAN= kafs5.3 # Linking with libkrb5 uncovers a bug in binutils. # See http://repo.or.cz/w/binutils.git/commit/ee05170bf71819c99cb5a36a44735c231ae03c56 . # -.if ${MACHINE_ARCH} != mipsn32eb ${MACHINE_ARCH} != mipsel ${MACHINE_ARCH} != mipseb +.if ${MACHINE_ARCH} != mipsn32eb ${MACHINE_ARCH} != mipsel \ +${MACHINE_ARCH} != mipseb ${MACHINE_ARCH} != mips LDADD+=-lkrb5 LDFLAGS= -Wl,--no-undefined .endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r233406 - head/lib/libpam/modules/pam_krb5
Author: stas Date: Sat Mar 24 01:02:03 2012 New Revision: 233406 URL: http://svn.freebsd.org/changeset/base/233406 Log: - Avoid using deprecated heimdal functions in pam_krb5. Modified: head/lib/libpam/modules/pam_krb5/Makefile head/lib/libpam/modules/pam_krb5/pam_krb5.c Modified: head/lib/libpam/modules/pam_krb5/Makefile == --- head/lib/libpam/modules/pam_krb5/Makefile Sat Mar 24 00:42:38 2012 (r233405) +++ head/lib/libpam/modules/pam_krb5/Makefile Sat Mar 24 01:02:03 2012 (r233406) @@ -32,8 +32,6 @@ CFLAGS+=-D_FREEFALL_CONFIG WARNS?=3 .endif -NO_WERROR= yes - DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto Modified: head/lib/libpam/modules/pam_krb5/pam_krb5.c == --- head/lib/libpam/modules/pam_krb5/pam_krb5.c Sat Mar 24 00:42:38 2012 (r233405) +++ head/lib/libpam/modules/pam_krb5/pam_krb5.c Sat Mar 24 01:02:03 2012 (r233406) @@ -92,6 +92,13 @@ static void compat_free_data_contents(kr #define PAM_OPT_NO_USER_CHECK no_user_check #define PAM_OPT_REUSE_CCACHE reuse_ccache +#definePAM_LOG_KRB5_ERR(ctx, rv, fmt, ...) \ + do {\ + const char *krb5msg = krb5_get_error_message(ctx, rv); \ + PAM_LOG(fmt : %s, ##__VA_ARGS__, krb5msg);\ + krb5_free_error_message(ctx, krb5msg); \ + } while (0) + /* * authentication management */ @@ -104,7 +111,7 @@ pam_sm_authenticate(pam_handle_t *pamh, krb5_creds creds; krb5_principal princ; krb5_ccache ccache; - krb5_get_init_creds_opt opts; + krb5_get_init_creds_opt *opts; struct passwd *pwd; int retval; const void *ccache_data; @@ -139,13 +146,6 @@ pam_sm_authenticate(pam_handle_t *pamh, PAM_LOG(Context initialised); - krb5_get_init_creds_opt_init(opts); - - if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE)) - krb5_get_init_creds_opt_set_forwardable(opts, 1); - - PAM_LOG(Credentials initialised); - krbret = krb5_cc_register(pam_context, krb5_mcc_ops, FALSE); if (krbret != 0 krbret != KRB5_CC_TYPE_EXISTS) { PAM_VERBOSE_ERROR(Kerberos 5 error); @@ -166,8 +166,7 @@ pam_sm_authenticate(pam_handle_t *pamh, krbret = krb5_parse_name(pam_context, principal, princ); free(principal); if (krbret != 0) { - PAM_LOG(Error krb5_parse_name(): %s, - krb5_get_err_text(pam_context, krbret)); + PAM_LOG_KRB5_ERR(pam_context, krbret, Error krb5_parse_name()); PAM_VERBOSE_ERROR(Kerberos 5 error); retval = PAM_SERVICE_ERR; goto cleanup3; @@ -179,8 +178,8 @@ pam_sm_authenticate(pam_handle_t *pamh, princ_name = NULL; krbret = krb5_unparse_name(pam_context, princ, princ_name); if (krbret != 0) { - PAM_LOG(Error krb5_unparse_name(): %s, - krb5_get_err_text(pam_context, krbret)); + PAM_LOG_KRB5_ERR(pam_context, krbret, + Error krb5_unparse_name()); PAM_VERBOSE_ERROR(Kerberos 5 error); retval = PAM_SERVICE_ERR; goto cleanup2; @@ -206,8 +205,8 @@ pam_sm_authenticate(pam_handle_t *pamh, sizeof(luser), luser); if (krbret != 0) { PAM_VERBOSE_ERROR(Kerberos 5 error); - PAM_LOG(Error krb5_aname_to_localname(): %s, - krb5_get_err_text(pam_context, krbret)); + PAM_LOG_KRB5_ERR(pam_context, krbret, + Error krb5_aname_to_localname()); retval = PAM_USER_UNKNOWN; goto cleanup2; } @@ -228,14 +227,30 @@ pam_sm_authenticate(pam_handle_t *pamh, PAM_LOG(Done getpwnam()); } + /* Initialize credentials request options. */ + krbret = krb5_get_init_creds_opt_alloc(pam_context, opts); + if (krbret != 0) { + PAM_LOG_KRB5_ERR(pam_context, krbret, + Error krb5_get_init_creds_opt_alloc()); + PAM_VERBOSE_ERROR(Kerberos 5 error); + retval = PAM_SERVICE_ERR; + goto cleanup2; + } + + if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE)) + krb5_get_init_creds_opt_set_forwardable(opts, 1); + + PAM_LOG(Credential options initialised); + /* Get a TGT */ memset(creds, 0,
svn commit: r233302 - head/lib/libpam/modules/pam_ksu
Author: stas Date: Thu Mar 22 11:18:14 2012 New Revision: 233302 URL: http://svn.freebsd.org/changeset/base/233302 Log: - Avoid use of deprecated KRB5 functions. Modified: head/lib/libpam/modules/pam_ksu/Makefile head/lib/libpam/modules/pam_ksu/pam_ksu.c Modified: head/lib/libpam/modules/pam_ksu/Makefile == --- head/lib/libpam/modules/pam_ksu/MakefileThu Mar 22 10:26:53 2012 (r233301) +++ head/lib/libpam/modules/pam_ksu/MakefileThu Mar 22 11:18:14 2012 (r233302) @@ -31,6 +31,4 @@ MAN= pam_ksu.8 DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} LDADD= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto -NO_WERROR= yes - .include bsd.lib.mk Modified: head/lib/libpam/modules/pam_ksu/pam_ksu.c == --- head/lib/libpam/modules/pam_ksu/pam_ksu.c Thu Mar 22 10:26:53 2012 (r233301) +++ head/lib/libpam/modules/pam_ksu/pam_ksu.c Thu Mar 22 11:18:14 2012 (r233302) @@ -70,8 +70,9 @@ pam_sm_authenticate(pam_handle_t *pamh, PAM_LOG(Got ruser: %s, (const char *)ruser); rv = krb5_init_context(context); if (rv != 0) { - PAM_LOG(krb5_init_context failed: %s, - krb5_get_err_text(context, rv)); + const char *msg = krb5_get_error_message(context, rv); + PAM_LOG(krb5_init_context failed: %s, msg); + krb5_free_error_message(context, msg); return (PAM_SERVICE_ERR); } rv = get_su_principal(context, user, ruser, su_principal_name, su_principal); @@ -112,7 +113,7 @@ auth_krb5(pam_handle_t *pamh, krb5_conte krb5_principal su_principal) { krb5_creds creds; - krb5_get_init_creds_opt gic_opt; + krb5_get_init_creds_opt *gic_opt; krb5_verify_init_creds_opt vic_opt; const char *pass; char*prompt; @@ -120,7 +121,6 @@ auth_krb5(pam_handle_t *pamh, krb5_conte int pamret; prompt = NULL; - krb5_get_init_creds_opt_init(gic_opt); krb5_verify_init_creds_opt_init(vic_opt); if (su_principal_name != NULL) (void)asprintf(prompt, Password for %s:, su_principal_name); @@ -133,11 +133,20 @@ auth_krb5(pam_handle_t *pamh, krb5_conte free(prompt); if (pamret != PAM_SUCCESS) return (pamret); + rv = krb5_get_init_creds_opt_alloc(context, gic_opt); + if (rv != 0) { + const char *msg = krb5_get_error_message(context, rv); + PAM_LOG(krb5_get_init_creds_opt_alloc: %s, msg); + krb5_free_error_message(context, msg); + return (PAM_AUTH_ERR); + } rv = krb5_get_init_creds_password(context, creds, su_principal, - pass, NULL, NULL, 0, NULL, gic_opt); + pass, NULL, NULL, 0, NULL, gic_opt); + krb5_get_init_creds_opt_free(context, gic_opt); if (rv != 0) { - PAM_LOG(krb5_get_init_creds_password: %s, - krb5_get_err_text(context, rv)); + const char *msg = krb5_get_error_message(context, rv); + PAM_LOG(krb5_get_init_creds_password: %s, msg); + krb5_free_error_message(context, msg); return (PAM_AUTH_ERR); } krb5_verify_init_creds_opt_set_ap_req_nofail(vic_opt, 1); @@ -145,8 +154,9 @@ auth_krb5(pam_handle_t *pamh, krb5_conte vic_opt); krb5_free_cred_contents(context, creds); if (rv != 0) { - PAM_LOG(krb5_verify_init_creds: %s, - krb5_get_err_text(context, rv)); + const char *msg = krb5_get_error_message(context, rv); + PAM_LOG(krb5_verify_init_creds: %s, msg); + krb5_free_error_message(context, msg); return (PAM_AUTH_ERR); } return (PAM_SUCCESS); @@ -220,8 +230,9 @@ get_su_principal(krb5_context context, c rv = krb5_unparse_name(context, default_principal, principal_name); krb5_free_principal(context, default_principal); if (rv != 0) { - PAM_LOG(krb5_unparse_name: %s, - krb5_get_err_text(context, rv)); + const char *msg = krb5_get_error_message(context, rv); + PAM_LOG(krb5_unparse_name: %s, msg); + krb5_free_error_message(context, msg); return (rv); } PAM_LOG(Default principal name: %s, principal_name); @@ -243,8 +254,9 @@ get_su_principal(krb5_context context, c return (errno); rv = krb5_parse_name(context, *su_principal_name, default_principal); if (rv != 0) { - PAM_LOG(krb5_parse_name `%s': %s, *su_principal_name, - krb5_get_err_text(context, rv)); +
svn commit: r233337 - in head: . lib tools/build/mk usr.bin
Author: stas Date: Fri Mar 23 03:16:35 2012 New Revision: 27 URL: http://svn.freebsd.org/changeset/base/27 Log: - Do not build libcom_err and compile_et when kerberos is disabled. They depends on several heimdal libraries and not used by anything but kerberos tools. Modified: head/Makefile.inc1 head/lib/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/Makefile Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Fri Mar 23 00:11:54 2012(r26) +++ head/Makefile.inc1 Fri Mar 23 03:16:35 2012(r27) @@ -1254,7 +1254,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - lib/libbz2 lib/libcom_err lib/libcrypt \ + lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ @@ -1341,6 +1341,7 @@ _kerberos5_lib_libheimntlm= kerberos5/li _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind +_libcom_err= lib/libcom_err .endif .if ${MK_NIS} != no Modified: head/lib/Makefile == --- head/lib/Makefile Fri Mar 23 00:11:54 2012(r26) +++ head/lib/Makefile Fri Mar 23 03:16:35 2012(r27) @@ -33,7 +33,6 @@ SUBDIR_ORDERED= ${_csu} \ libc \ libbsm \ libauditd \ - libcom_err \ libcompiler_rt \ libcrypt \ libelf \ @@ -52,6 +51,10 @@ SUBDIR_ORDERED= ${_csu} \ ${_libcxxrt} \ ${_libcplusplus} +.if ${MK_KERBEROS_SUPPORT} != no +SUBDIR_ORDERED+= libcom_err +.endif + SUBDIR=${SUBDIR_ORDERED} \ libalias \ libarchive \ Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 23 00:11:54 2012(r26) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 23 03:16:35 2012(r27) @@ -2184,6 +2184,7 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz .endif .if ${MK_KERBEROS} == no +OLD_FILES+=usr/bin/compile_et OLD_FILES+=usr/bin/hxtool OLD_FILES+=usr/bin/kadmin OLD_FILES+=usr/bin/kdestroy @@ -2266,6 +2267,11 @@ OLD_FILES+=usr/lib/libasn1.a OLD_FILES+=usr/lib/libasn1.so OLD_LIBS+=usr/lib/libasn1.so.10 OLD_FILES+=usr/lib/libasn1_p.a +OLD_FILES+=usr/lib/libcom_err.a +OLD_FILES+=usr/lib/libcom_err.so +OLD_LIBS+=usr/lib/libcom_err.so.5 +OLD_FILES+=usr/lib/libcom_err_p.a +OLD_FILES+=usr/lib/libcom_err_p.a OLD_FILES+=usr/lib/libgssapi_krb5.a OLD_FILES+=usr/lib/libgssapi_krb5.so OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 Modified: head/usr.bin/Makefile == --- head/usr.bin/Makefile Fri Mar 23 00:11:54 2012(r26) +++ head/usr.bin/Makefile Fri Mar 23 03:16:35 2012(r27) @@ -261,6 +261,10 @@ SUBDIR+= csup SUBDIR+= locate .endif +.if ${MK_KERBEROS_SUPPORT} != no +SUBDIR+= compile_et +.endif + # XXX msgs? .if ${MK_MAIL} != no SUBDIR+= biff @@ -317,7 +321,6 @@ SUBDIR+=ul SUBDIR+= ar SUBDIR+= c89 SUBDIR+= c99 -SUBDIR+= compile_et SUBDIR+= ctags SUBDIR+= file2c SUBDIR+= gprof ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r233338 - head/tools/build/mk
Author: stas Date: Fri Mar 23 03:43:04 2012 New Revision: 28 URL: http://svn.freebsd.org/changeset/base/28 Log: - Add new kerberos libraries to the list of optional obsolete files. Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 23 03:16:35 2012(r27) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 23 03:43:04 2012(r28) @@ -2265,7 +2265,7 @@ OLD_FILES+=usr/include/wind_err.h OLD_FILES+=usr/include/xdbm.h OLD_FILES+=usr/lib/libasn1.a OLD_FILES+=usr/lib/libasn1.so -OLD_LIBS+=usr/lib/libasn1.so.10 +OLD_LIBS+=usr/lib/libasn1.so.11 OLD_FILES+=usr/lib/libasn1_p.a OLD_FILES+=usr/lib/libcom_err.a OLD_FILES+=usr/lib/libcom_err.so @@ -2288,10 +2288,18 @@ OLD_FILES+=usr/lib/libhdb.a OLD_FILES+=usr/lib/libhdb.so OLD_LIBS+=usr/lib/libhdb.so.11 OLD_FILES+=usr/lib/libhdb_p.a +OLD_FILES+=usr/lib/libheimbase.a +OLD_FILES+=usr/lib/libheimbase.so +OLD_LIBS+=usr/lib/libheimbase.so.11 +OLD_FILES+=usr/lib/libheimbase_p.a OLD_FILES+=usr/lib/libheimntlm.a OLD_FILES+=usr/lib/libheimntlm.so OLD_LIBS+=usr/lib/libheimntlm.so.11 OLD_FILES+=usr/lib/libheimntlm_p.a +OLD_FILES+=usr/lib/libheimsqlite.a +OLD_FILES+=usr/lib/libheimsqlite.so +OLD_LIBS+=usr/lib/libheimsqlite.so.11 +OLD_FILES+=usr/lib/libheimsqlite_p.a OLD_FILES+=usr/lib/libhx509.a OLD_FILES+=usr/lib/libhx509.so OLD_LIBS+=usr/lib/libhx509.so.11 @@ -2308,6 +2316,10 @@ OLD_FILES+=usr/lib/libkafs5.a OLD_FILES+=usr/lib/libkafs5.so OLD_LIBS+=usr/lib/libkafs5.so.11 OLD_FILES+=usr/lib/libkafs5_p.a +OLD_FILES+=usr/lib/libkdc.a +OLD_FILES+=usr/lib/libkdc.so +OLD_LIBS+=usr/lib/libkdc.so.11 +OLD_FILES+=usr/lib/libkdc_p.a OLD_FILES+=usr/lib/libkrb5.a OLD_FILES+=usr/lib/libkrb5.so OLD_LIBS+=usr/lib/libkrb5.so.11 @@ -2316,6 +2328,10 @@ OLD_FILES+=usr/lib/libroken.a OLD_FILES+=usr/lib/libroken.so OLD_LIBS+=usr/lib/libroken.so.11 OLD_FILES+=usr/lib/libroken_p.a +OLD_FILES+=usr/lib/libwind.a +OLD_FILES+=usr/lib/libwind.so +OLD_LIBS+=usr/lib/libwind.so.11 +OLD_FILES+=usr/lib/libwind_p.a OLD_FILES+=usr/lib/pam_krb5.so OLD_LIBS+=usr/lib/pam_krb5.so.5 OLD_FILES+=usr/lib/pam_ksu.so @@ -2341,10 +2357,18 @@ OLD_FILES+=usr/lib32/libhdb.a OLD_FILES+=usr/lib32/libhdb.so OLD_LIBS+=usr/lib32/libhdb.so.11 OLD_FILES+=usr/lib32/libhdb_p.a +OLD_FILES+=usr/lib32/libheimbase.a +OLD_FILES+=usr/lib32/libheimbase.so +OLD_LIBS+=usr/lib32/libheimbase.so.11 +OLD_FILES+=usr/lib32/libheimbase_p.a OLD_FILES+=usr/lib32/libheimntlm.a OLD_FILES+=usr/lib32/libheimntlm.so OLD_LIBS+=usr/lib32/libheimntlm.so.11 OLD_FILES+=usr/lib32/libheimntlm_p.a +OLD_FILES+=usr/lib32/libheimsqlite.a +OLD_FILES+=usr/lib32/libheimsqlite.so +OLD_LIBS+=usr/lib32/libheimsqlite.so.11 +OLD_FILES+=usr/lib32/libheimsqlite_p.a OLD_FILES+=usr/lib32/libhx509.a OLD_FILES+=usr/lib32/libhx509.so OLD_LIBS+=usr/lib32/libhx509.so.11 @@ -2361,6 +2385,10 @@ OLD_FILES+=usr/lib32/libkafs5.a OLD_FILES+=usr/lib32/libkafs5.so OLD_LIBS+=usr/lib32/libkafs5.so.11 OLD_FILES+=usr/lib32/libkafs5_p.a +OLD_FILES+=usr/lib32/libkdc.a +OLD_FILES+=usr/lib32/libkdc.so +OLD_LIBS+=usr/lib32/libkdc.so.11 +OLD_FILES+=usr/lib32/libkdc_p.a OLD_FILES+=usr/lib32/libkrb5.a OLD_FILES+=usr/lib32/libkrb5.so OLD_LIBS+=usr/lib32/libkrb5.so.11 @@ -2369,6 +2397,10 @@ OLD_FILES+=usr/lib32/libroken.a OLD_FILES+=usr/lib32/libroken.so OLD_LIBS+=usr/lib32/libroken.so.11 OLD_FILES+=usr/lib32/libroken_p.a +OLD_FILES+=usr/lib32/libwind.a +OLD_FILES+=usr/lib32/libwind.so +OLD_LIBS+=usr/lib32/libwind.so.11 +OLD_FILES+=usr/lib32/libwind_p.a OLD_FILES+=usr/lib32/pam_krb5.so OLD_LIBS+=usr/lib32/pam_krb5.so.5 OLD_FILES+=usr/lib32/pam_ksu.so @@ -3495,6 +3527,8 @@ OLD_FILES+=usr/lib/libgpib_p.a OLD_FILES+=usr/lib/libgssapi_krb5_p.a OLD_FILES+=usr/lib/libgssapi_p.a OLD_FILES+=usr/lib/libhdb_p.a +OLD_FILES+=usr/lib/libheimbase_p.a +OLD_FILES+=usr/lib/libheimsqlite_p.a OLD_FILES+=usr/lib/libhistory_p.a OLD_FILES+=usr/lib/libipsec_p.a OLD_FILES+=usr/lib/libipx_p.a @@ -3502,6 +3536,7 @@ OLD_FILES+=usr/lib/libjail_p.a OLD_FILES+=usr/lib/libkadm5clnt_p.a OLD_FILES+=usr/lib/libkadm5srv_p.a OLD_FILES+=usr/lib/libkafs5_p.a +OLD_FILES+=usr/lib/libkdc_p.a OLD_FILES+=usr/lib/libkiconv_p.a OLD_FILES+=usr/lib/libkrb5_p.a OLD_FILES+=usr/lib/libkvm_p.a @@ -3554,6 +3589,7 @@ OLD_FILES+=usr/lib/libugidfw_p.a OLD_FILES+=usr/lib/libusbhid_p.a OLD_FILES+=usr/lib/libutil_p.a OLD_FILES+=usr/lib/libvgl_p.a +OLD_FILES+=usr/lib/libwind_p.a OLD_FILES+=usr/lib/libwrap_p.a OLD_FILES+=usr/lib/liby_p.a OLD_FILES+=usr/lib/libypclnt_p.a ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r230242 - in head/sys/dev/usb: . serial
Author: stas Date: Mon Jan 16 23:14:23 2012 New Revision: 230242 URL: http://svn.freebsd.org/changeset/base/230242 Log: - Add ID for the BeagleBone FTDI serial over usb port. MFC after:3 days Modified: head/sys/dev/usb/serial/uftdi.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/serial/uftdi.c == --- head/sys/dev/usb/serial/uftdi.c Mon Jan 16 23:02:37 2012 (r230241) +++ head/sys/dev/usb/serial/uftdi.c Mon Jan 16 23:14:23 2012 (r230242) @@ -221,6 +221,7 @@ static STRUCT_USB_HOST_ID uftdi_devs[] = UFTDI_DEV(FTDI, SERIAL_4232H, 8U232AM), UFTDI_DEV(FTDI, SERIAL_8U232AM, 8U232AM), UFTDI_DEV(FTDI, SERIAL_8U232AM4, 8U232AM), + UFTDI_DEV(FTDI, SERIAL_BEAGLEBONE, 8U232AM), UFTDI_DEV(FTDI, SEMC_DSS20, 8U232AM), UFTDI_DEV(FTDI, CFA_631, 8U232AM), UFTDI_DEV(FTDI, CFA_632, 8U232AM), Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsMon Jan 16 23:02:37 2012(r230241) +++ head/sys/dev/usb/usbdevsMon Jan 16 23:14:23 2012(r230242) @@ -1606,6 +1606,7 @@ product FTDI SERIAL_2232C 0x6010 FT2232C product FTDI SERIAL_2232D 0x9e90 FT2232D Dual port Serial product FTDI BEAGLEBONE0xA6D0 BeagleBone product FTDI SERIAL_4232H 0x6011 FT4232H Quad port Serial +product FTDI SERIAL_BEAGLEBONE 0xa6d0 BeagleBone FTDI Serial /* Gude Analog- und Digitalsysteme products also uses FTDI's id: */ product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r226122 - head/share/mk
On Oct 8, 2011, at 12:33 AM, Ed Schouten e...@80386.nl wrote: Hi, * Stanislav Sedov s...@freebsd.org, 20111008 01:43: - ${WRKSRC} might be missing when the autotools fixup is running. Account for this. Maybe we should simplify this a bit? Sounds good! I didn't think about that way of ignoring the error code. -- ST4096-RIPE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226122 - head/share/mk
Author: stas Date: Fri Oct 7 23:43:51 2011 New Revision: 226122 URL: http://svn.freebsd.org/changeset/base/226122 Log: - ${WRKSRC} might be missing when the autotools fixup is running. Account for this. Reported by: Mykola Dzham i...@levsha.me Modified: head/share/mk/bsd.port.mk Modified: head/share/mk/bsd.port.mk == --- head/share/mk/bsd.port.mk Fri Oct 7 23:12:33 2011(r226121) +++ head/share/mk/bsd.port.mk Fri Oct 7 23:43:51 2011(r226122) @@ -18,10 +18,10 @@ _WITHOUT_SRCCONF= .if !defined(BEFOREPORTMK) !defined(INOPTIONSMK) # Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x. run-autotools-fixup: - find ${WRKSRC} -type f \( -name config.libpath -o \ + test -d ${WRKSRC} find ${WRKSRC} -type f \( -name config.libpath -o \ -name config.rpath -o -name configure -o -name libtool.m4 \) \ -exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \ - -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + + -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + || /usr/bin/true .ORDER: run-autotools run-autotools-fixup do-configure do-configure: run-autotools-fixup ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226124 - head/share/mk
Author: stas Date: Sat Oct 8 00:01:17 2011 New Revision: 226124 URL: http://svn.freebsd.org/changeset/base/226124 Log: - Add a couple of more sed subsitutions needed to get the correct libtool.m4. With these fixes libtool will correctly indentify the system as ELF (and not a.out). - While here, change the substitutions so they're still correctly match freebsd1.x, freebsd2.x etc. Modified: head/share/mk/bsd.port.mk Modified: head/share/mk/bsd.port.mk == --- head/share/mk/bsd.port.mk Sat Oct 8 00:00:54 2011(r226123) +++ head/share/mk/bsd.port.mk Sat Oct 8 00:01:17 2011(r226124) @@ -20,8 +20,12 @@ _WITHOUT_SRCCONF= run-autotools-fixup: test -d ${WRKSRC} find ${WRKSRC} -type f \( -name config.libpath -o \ -name config.rpath -o -name configure -o -name libtool.m4 \) \ - -exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \ - -e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + || /usr/bin/true + -exec sed -i '' -e 's|freebsd1\*)|freebsd1.\*)|g' \ + -e 's|freebsd\[12\]\*)|freebsd[12].*)|g' \ + -e 's|freebsd\[123\]\*)|freebsd[123].*)|g' \ + -e 's|freebsd\[\[12\]\]\*)|freebsd[[12]].*)|g' \ + -e 's|freebsd\[\[123\]\]\*)|freebsd[[123]].*)|g' \ + {} + || /usr/bin/true .ORDER: run-autotools run-autotools-fixup do-configure do-configure: run-autotools-fixup ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226127 - svnadmin/conf
Author: stas Date: Sat Oct 8 04:08:02 2011 New Revision: 226127 URL: http://svn.freebsd.org/changeset/base/226127 Log: - Add myself for heimdal 1.5.1 import. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confSat Oct 8 03:58:20 2011 (r226126) +++ svnadmin/conf/sizelimit.confSat Oct 8 04:08:02 2011 (r226127) @@ -33,4 +33,5 @@ obrien rpaulo rwatson sam +stas thompsa ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226129 - vendor-crypto/heimdal/1.5.1
Author: stas Date: Sat Oct 8 04:09:23 2011 New Revision: 226129 URL: http://svn.freebsd.org/changeset/base/226129 Log: - Add tag for heimdal 1.5.1. Added: vendor-crypto/heimdal/1.5.1/ - copied from r226128, vendor-crypto/heimdal/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226049 - in vendor/com_err/dist: . contrib
Author: stas Date: Thu Oct 6 06:56:53 2011 New Revision: 226049 URL: http://svn.freebsd.org/changeset/base/226049 Log: - Flatten the com_err vendor tree. Added: vendor/com_err/dist/ChangeLog - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/ChangeLog vendor/com_err/dist/Makefile.am - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/Makefile.am vendor/com_err/dist/Makefile.in - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/Makefile.in vendor/com_err/dist/com_err.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/com_err.c vendor/com_err/dist/com_err.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/com_err.h vendor/com_err/dist/com_right.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/com_right.h vendor/com_err/dist/compile_et.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/compile_et.c vendor/com_err/dist/compile_et.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/compile_et.h vendor/com_err/dist/error.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/error.c vendor/com_err/dist/lex.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/lex.c vendor/com_err/dist/lex.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/lex.h vendor/com_err/dist/lex.l - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/lex.l vendor/com_err/dist/parse.c - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/parse.c vendor/com_err/dist/parse.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/parse.h vendor/com_err/dist/parse.y - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/parse.y vendor/com_err/dist/roken_rename.h - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/roken_rename.h vendor/com_err/dist/version-script.map - copied unchanged from r226048, vendor/com_err/dist/contrib/com_err/version-script.map Deleted: vendor/com_err/dist/contrib/ Copied: vendor/com_err/dist/ChangeLog (from r226048, vendor/com_err/dist/contrib/com_err/ChangeLog) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ vendor/com_err/dist/ChangeLog Thu Oct 6 06:56:53 2011 (r226049, copy of r226048, vendor/com_err/dist/contrib/com_err/ChangeLog) @@ -0,0 +1,235 @@ +2007-07-17 Love H�rnquist �strand l...@it.su.se + + * Makefile.am: split source files in dist and nodist. + +2007-07-16 Love H�rnquist �strand l...@it.su.se + + * Makefile.am: Only do roken rename for the library. + +2007-07-15 Love H�rnquist �strand l...@it.su.se + + * Makefile.am: use version script. + + * version-script.map: use version script. + +2007-07-10 Love H�rnquist �strand l...@it.su.se + + * Makefile.am: New library version. + +2006-10-19 Love H�rnquist �strand l...@it.su.se + + * Makefile.am (compile_et_SOURCES): add lex.h + +2005-12-12 Love H�rnquist �strand l...@it.su.se + + * com_err.3: Document the _r functions. + +2005-07-07 Love H�rnquist �strand l...@it.su.se + + * com_err.h: Include stdarg.h for va_list to help AIX 5.2. + +2005-06-16 Love H�rnquist �strand l...@it.su.se + + * parse.y: rename base to base_id since flex defines a function + with the argument base + + * compile_et.h: rename base to base_id since flex defines a + function with the argument base + + * compile_et.c: rename base to base_id since flex defines a + function with the argument base + + * parse.y (name2number): rename base to num to avoid shadowing + + * compile_et.c: rename optind to optidx + +2005-05-16 Love H�rnquist �strand l...@it.su.se + + * parse.y: check allocation errors + + * lex.l: check allocation errors correctly + + * compile_et.h: include err.h + + * (main): compile_et.c: use strlcpy + +2005-04-29 Dave Love f...@gnu.org + + * Makefile.am (LDADD): Add libcom_err.la + +2005-04-24 Love H�rnquist �strand l...@it.su.se + + * include strlcpy and *printf and use them + +2005-02-03 Love H�rnquist �strand l...@it.su.se + + * com_right.h: de-__P + + * com_err.h: de-__P + +2002-08-20 Johan Danielsson j...@pdc.kth.se + + * compile_et.c: don't add comma after last enum member + +2002-08-12 Johan Danielsson j...@pdc.kth.se + + * compile_et.c: just declare er_list directly instead of including + com_right in generated header files + +2002-03-11 Assar Westerlund as...@sics.se + + * Makefile.am (libcom_err_la_LDFLAGS): set version to 2:1:1 + +2002-03-10 Assar Westerlund
svn commit: r226050 - vendor/com_err/dist
Author: stas Date: Thu Oct 6 06:58:53 2011 New Revision: 226050 URL: http://svn.freebsd.org/changeset/base/226050 Log: - Disable SVN keyword expansion. Modified: Directory Properties: vendor/com_err/dist/ChangeLog (props changed) vendor/com_err/dist/Makefile.am (props changed) vendor/com_err/dist/Makefile.in (props changed) vendor/com_err/dist/com_err.c (props changed) vendor/com_err/dist/com_err.h (props changed) vendor/com_err/dist/com_right.h (props changed) vendor/com_err/dist/compile_et.c (props changed) vendor/com_err/dist/compile_et.h (props changed) vendor/com_err/dist/error.c (props changed) vendor/com_err/dist/lex.c (props changed) vendor/com_err/dist/lex.h (props changed) vendor/com_err/dist/lex.l (props changed) vendor/com_err/dist/parse.c (props changed) vendor/com_err/dist/parse.h (props changed) vendor/com_err/dist/parse.y (props changed) vendor/com_err/dist/roken_rename.h (props changed) vendor/com_err/dist/version-script.map (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226051 - head/contrib/com_err
Author: stas Date: Thu Oct 6 07:07:09 2011 New Revision: 226051 URL: http://svn.freebsd.org/changeset/base/226051 Log: - Bootstrap merge history for contrib/com_err. Modified: Directory Properties: head/contrib/com_err/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226052 - vendor/com_err/dist
Author: stas Date: Thu Oct 6 07:54:28 2011 New Revision: 226052 URL: http://svn.freebsd.org/changeset/base/226052 Log: - Import com_err from heimdal 1.5.1 distribution. I used sources from GIT as we don't need autogenerated files, and for some reason the actual distribution tarball is missing the com_err.3 manpage. Added: vendor/com_err/dist/NTMakefile vendor/com_err/dist/com_err.3 vendor/com_err/dist/compile_et-version.rc vendor/com_err/dist/libcom_err-exports.def vendor/com_err/dist/libcom_err-version.rc Deleted: vendor/com_err/dist/Makefile.in vendor/com_err/dist/lex.c vendor/com_err/dist/parse.c vendor/com_err/dist/parse.h Modified: vendor/com_err/dist/ChangeLog (contents, props changed) vendor/com_err/dist/Makefile.am vendor/com_err/dist/com_err.c (contents, props changed) vendor/com_err/dist/com_err.h (contents, props changed) vendor/com_err/dist/com_right.h (contents, props changed) vendor/com_err/dist/compile_et.c (contents, props changed) vendor/com_err/dist/compile_et.h (contents, props changed) vendor/com_err/dist/error.c (contents, props changed) vendor/com_err/dist/lex.h (contents, props changed) vendor/com_err/dist/lex.l vendor/com_err/dist/parse.y vendor/com_err/dist/roken_rename.h (contents, props changed) vendor/com_err/dist/version-script.map Modified: vendor/com_err/dist/ChangeLog == --- vendor/com_err/dist/ChangeLog Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/ChangeLog Thu Oct 6 07:54:28 2011 (r226052) @@ -1,34 +1,34 @@ -2007-07-17 Love H�rnquist �strand l...@it.su.se +2007-07-17 Love Hörnquist Åstrand l...@it.su.se * Makefile.am: split source files in dist and nodist. -2007-07-16 Love H�rnquist �strand l...@it.su.se +2007-07-16 Love Hörnquist Åstrand l...@it.su.se * Makefile.am: Only do roken rename for the library. -2007-07-15 Love H�rnquist �strand l...@it.su.se +2007-07-15 Love Hörnquist Åstrand l...@it.su.se * Makefile.am: use version script. * version-script.map: use version script. -2007-07-10 Love H�rnquist �strand l...@it.su.se +2007-07-10 Love Hörnquist Åstrand l...@it.su.se * Makefile.am: New library version. -2006-10-19 Love H�rnquist �strand l...@it.su.se +2006-10-19 Love Hörnquist Åstrand l...@it.su.se * Makefile.am (compile_et_SOURCES): add lex.h -2005-12-12 Love H�rnquist �strand l...@it.su.se +2005-12-12 Love Hörnquist Åstrand l...@it.su.se * com_err.3: Document the _r functions. -2005-07-07 Love H�rnquist �strand l...@it.su.se +2005-07-07 Love Hörnquist Åstrand l...@it.su.se * com_err.h: Include stdarg.h for va_list to help AIX 5.2. -2005-06-16 Love H�rnquist �strand l...@it.su.se +2005-06-16 Love Hörnquist Åstrand l...@it.su.se * parse.y: rename base to base_id since flex defines a function with the argument base @@ -43,7 +43,7 @@ * compile_et.c: rename optind to optidx -2005-05-16 Love H�rnquist �strand l...@it.su.se +2005-05-16 Love Hörnquist Åstrand l...@it.su.se * parse.y: check allocation errors @@ -57,11 +57,11 @@ * Makefile.am (LDADD): Add libcom_err.la -2005-04-24 Love H�rnquist �strand l...@it.su.se +2005-04-24 Love Hörnquist Åstrand l...@it.su.se * include strlcpy and *printf and use them -2005-02-03 Love H�rnquist �strand l...@it.su.se +2005-02-03 Love Hörnquist Åstrand l...@it.su.se * com_right.h: de-__P Modified: vendor/com_err/dist/Makefile.am == --- vendor/com_err/dist/Makefile.am Thu Oct 6 07:07:09 2011 (r226051) +++ vendor/com_err/dist/Makefile.am Thu Oct 6 07:54:28 2011 (r226052) @@ -1,4 +1,4 @@ -# $Id: Makefile.am 21619 2007-07-17 07:34:00Z lha $ +# $Id$ include $(top_srcdir)/Makefile.am.common @@ -11,19 +11,23 @@ if versionscript libcom_err_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map endif +libcom_err_la_LIBADD = $(LIB_libintl) + bin_PROGRAMS = compile_et include_HEADERS = com_err.h com_right.h compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l lex.h -libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) +libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) $(INCLUDE_libintl) dist_libcom_err_la_SOURCES = error.c com_err.c roken_rename.h if do_roken_rename nodist_libcom_err_la_SOURCES = snprintf.c strlcpy.c endif +libcom_err_la_DEPENDENCIES = version-script.map + $(compile_et_OBJECTS): parse.h parse.c ## XXX broken automake 1.4s compile_et_LDADD = \ @@ -36,4 +40,9 @@ snprintf.c: strlcpy.c: $(LN_S) $(srcdir)/../roken/strlcpy.c . -EXTRA_DIST = version-script.map +EXTRA_DIST = \ + NTMakefile \ + compile_et-version.rc \ +
svn commit: r226053 - vendor/com_err/1.5.1
Author: stas Date: Thu Oct 6 07:56:18 2011 New Revision: 226053 URL: http://svn.freebsd.org/changeset/base/226053 Log: - Add tag for Heimdal com_err 1.5.1 version. Added: vendor/com_err/1.5.1/ - copied from r226052, vendor/com_err/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226030 - svnadmin/conf
Author: stas Date: Wed Oct 5 07:15:55 2011 New Revision: 226030 URL: http://svn.freebsd.org/changeset/base/226030 Log: - Disable sizelimit for myself to import the new heimdal revision. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confTue Oct 4 23:53:47 2011 (r226029) +++ svnadmin/conf/sizelimit.confWed Oct 5 07:15:55 2011 (r226030) @@ -33,4 +33,5 @@ obrien rpaulo rwatson sam +stas thompsa ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226032 - svnadmin/conf
Author: stas Date: Wed Oct 5 07:24:39 2011 New Revision: 226032 URL: http://svn.freebsd.org/changeset/base/226032 Log: - Heimdal 1.5 import is complete. Modified: svnadmin/conf/sizelimit.conf Modified: svnadmin/conf/sizelimit.conf == --- svnadmin/conf/sizelimit.confWed Oct 5 07:23:29 2011 (r226031) +++ svnadmin/conf/sizelimit.confWed Oct 5 07:24:39 2011 (r226032) @@ -33,5 +33,4 @@ obrien rpaulo rwatson sam -stas thompsa ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r226033 - vendor-crypto/heimdal/1.5
Author: stas Date: Wed Oct 5 07:28:23 2011 New Revision: 226033 URL: http://svn.freebsd.org/changeset/base/226033 Log: - Add tag for Heimdal 1.5. Added: vendor-crypto/heimdal/1.5/ - copied from r226032, vendor-crypto/heimdal/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r225867 - head/crypto/heimdal
Author: stas Date: Thu Sep 29 06:00:26 2011 New Revision: 225867 URL: http://svn.freebsd.org/changeset/base/225867 Log: - Bootstrap the heimdal merge history. Modified: Directory Properties: head/crypto/heimdal/ (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r225864 - in vendor-crypto/heimdal/dist: . admin appl cf crypto/heimdal crypto/heimdal/admin crypto/heimdal/appl crypto/heimdal/cf crypto/heimdal/doc crypto/heimdal/etc crypto/heimdal/i...
Author: stas Date: Thu Sep 29 05:23:57 2011 New Revision: 225864 URL: http://svn.freebsd.org/changeset/base/225864 Log: - Flatten the vendor heimdal tree. Added: vendor-crypto/heimdal/dist/ChangeLog - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog vendor-crypto/heimdal/dist/ChangeLog.1998 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.1998 vendor-crypto/heimdal/dist/ChangeLog.1999 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.1999 vendor-crypto/heimdal/dist/ChangeLog.2000 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.2000 vendor-crypto/heimdal/dist/ChangeLog.2001 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.2001 vendor-crypto/heimdal/dist/ChangeLog.2002 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.2002 vendor-crypto/heimdal/dist/ChangeLog.2003 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.2003 vendor-crypto/heimdal/dist/ChangeLog.2004 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.2004 vendor-crypto/heimdal/dist/ChangeLog.2005 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.2005 vendor-crypto/heimdal/dist/ChangeLog.2006 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/ChangeLog.2006 vendor-crypto/heimdal/dist/LICENSE - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/LICENSE vendor-crypto/heimdal/dist/Makefile.am - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/Makefile.am vendor-crypto/heimdal/dist/Makefile.am.common - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/Makefile.am.common vendor-crypto/heimdal/dist/Makefile.in - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/Makefile.in vendor-crypto/heimdal/dist/NEWS - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/NEWS vendor-crypto/heimdal/dist/README - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/README vendor-crypto/heimdal/dist/acinclude.m4 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/acinclude.m4 vendor-crypto/heimdal/dist/aclocal.m4 - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/aclocal.m4 vendor-crypto/heimdal/dist/admin/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/admin/ vendor-crypto/heimdal/dist/appl/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/appl/ vendor-crypto/heimdal/dist/autogen.sh - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/autogen.sh vendor-crypto/heimdal/dist/cf/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/cf/ vendor-crypto/heimdal/dist/compile - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/compile vendor-crypto/heimdal/dist/config.guess - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/config.guess vendor-crypto/heimdal/dist/config.sub - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/config.sub vendor-crypto/heimdal/dist/configure - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/configure vendor-crypto/heimdal/dist/configure.in - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/configure.in vendor-crypto/heimdal/dist/doc/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/doc/ vendor-crypto/heimdal/dist/etc/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/etc/ vendor-crypto/heimdal/dist/include/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/include/ vendor-crypto/heimdal/dist/install-sh - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/install-sh vendor-crypto/heimdal/dist/kadmin/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/kadmin/ vendor-crypto/heimdal/dist/kcm/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/kcm/ vendor-crypto/heimdal/dist/kdc/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/kdc/ vendor-crypto/heimdal/dist/kpasswd/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/kpasswd/ vendor-crypto/heimdal/dist/krb5.conf - copied unchanged from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/krb5.conf vendor-crypto/heimdal/dist/kuser/ - copied from r225862, vendor-crypto/heimdal/dist/crypto/heimdal/kuser/ vendor-crypto/heimdal/dist/lib/ - copied from r225862,
svn commit: r225866 - in vendor-crypto/heimdal/dist: . cf crypto kadmin kuser lib/asn1 lib/gssapi lib/hdb lib/kadm5 lib/krb5 lib/roken tools
Author: stas Date: Thu Sep 29 05:58:09 2011 New Revision: 225866 URL: http://svn.freebsd.org/changeset/base/225866 Log: - Kill files that do not belong to the laters heimdal version imported. Deleted: vendor-crypto/heimdal/dist/cf/broken-getnameinfo.m4 vendor-crypto/heimdal/dist/cf/check-declaration.m4 vendor-crypto/heimdal/dist/crypto/ vendor-crypto/heimdal/dist/kadmin/version4.c vendor-crypto/heimdal/dist/kuser/kauth_options.c vendor-crypto/heimdal/dist/kuser/kinit_options.c vendor-crypto/heimdal/dist/lib/asn1/gen.h vendor-crypto/heimdal/dist/lib/asn1/x509.asn1 vendor-crypto/heimdal/dist/lib/gssapi/8003.c vendor-crypto/heimdal/dist/lib/gssapi/accept_sec_context.c vendor-crypto/heimdal/dist/lib/gssapi/acquire_cred.c vendor-crypto/heimdal/dist/lib/gssapi/add_cred.c vendor-crypto/heimdal/dist/lib/gssapi/add_oid_set_member.c vendor-crypto/heimdal/dist/lib/gssapi/address_to_krb5addr.c vendor-crypto/heimdal/dist/lib/gssapi/arcfour.c vendor-crypto/heimdal/dist/lib/gssapi/arcfour.h vendor-crypto/heimdal/dist/lib/gssapi/canonicalize_name.c vendor-crypto/heimdal/dist/lib/gssapi/compare_name.c vendor-crypto/heimdal/dist/lib/gssapi/compat.c vendor-crypto/heimdal/dist/lib/gssapi/context_time.c vendor-crypto/heimdal/dist/lib/gssapi/copy_ccache.c vendor-crypto/heimdal/dist/lib/gssapi/create_emtpy_oid_set.c vendor-crypto/heimdal/dist/lib/gssapi/decapsulate.c vendor-crypto/heimdal/dist/lib/gssapi/delete_sec_context.c vendor-crypto/heimdal/dist/lib/gssapi/display_name.c vendor-crypto/heimdal/dist/lib/gssapi/display_status.c vendor-crypto/heimdal/dist/lib/gssapi/duplicate_name.c vendor-crypto/heimdal/dist/lib/gssapi/encapsulate.c vendor-crypto/heimdal/dist/lib/gssapi/export_name.c vendor-crypto/heimdal/dist/lib/gssapi/export_sec_context.c vendor-crypto/heimdal/dist/lib/gssapi/external.c vendor-crypto/heimdal/dist/lib/gssapi/get_mic.c vendor-crypto/heimdal/dist/lib/gssapi/gssapi_locl.h vendor-crypto/heimdal/dist/lib/gssapi/import_name.c vendor-crypto/heimdal/dist/lib/gssapi/import_sec_context.c vendor-crypto/heimdal/dist/lib/gssapi/indicate_mechs.c vendor-crypto/heimdal/dist/lib/gssapi/init.c vendor-crypto/heimdal/dist/lib/gssapi/init_sec_context.c vendor-crypto/heimdal/dist/lib/gssapi/inquire_context.c vendor-crypto/heimdal/dist/lib/gssapi/inquire_cred.c vendor-crypto/heimdal/dist/lib/gssapi/inquire_cred_by_mech.c vendor-crypto/heimdal/dist/lib/gssapi/inquire_mechs_for_name.c vendor-crypto/heimdal/dist/lib/gssapi/inquire_names_for_mech.c vendor-crypto/heimdal/dist/lib/gssapi/process_context_token.c vendor-crypto/heimdal/dist/lib/gssapi/release_buffer.c vendor-crypto/heimdal/dist/lib/gssapi/release_cred.c vendor-crypto/heimdal/dist/lib/gssapi/release_name.c vendor-crypto/heimdal/dist/lib/gssapi/release_oid_set.c vendor-crypto/heimdal/dist/lib/gssapi/test_oid_set_member.c vendor-crypto/heimdal/dist/lib/gssapi/unwrap.c vendor-crypto/heimdal/dist/lib/gssapi/v1.c vendor-crypto/heimdal/dist/lib/gssapi/verify_mic.c vendor-crypto/heimdal/dist/lib/gssapi/wrap.c vendor-crypto/heimdal/dist/lib/hdb/convert_db.c vendor-crypto/heimdal/dist/lib/kadm5/dump_log.c vendor-crypto/heimdal/dist/lib/kadm5/replay_log.c vendor-crypto/heimdal/dist/lib/kadm5/truncate_log.c vendor-crypto/heimdal/dist/lib/krb5/dump_config.c vendor-crypto/heimdal/dist/lib/krb5/krb5_build_principal.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_free_addresses.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_free_principal.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_principal_get_realm.3 vendor-crypto/heimdal/dist/lib/krb5/krb5_sname_to_principal.3 vendor-crypto/heimdal/dist/lib/roken/acconfig.h vendor-crypto/heimdal/dist/lib/roken/acinclude.m4 vendor-crypto/heimdal/dist/lib/roken/print_version.c vendor-crypto/heimdal/dist/lib/roken/resource.h vendor-crypto/heimdal/dist/ltconfig vendor-crypto/heimdal/dist/mkinstalldirs vendor-crypto/heimdal/dist/tools/build.sh ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r225778 - in head: . kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_ntlm kerberos5/lib/libgssapi_spnego kerberos5/lib/libhdb kerberos5/lib/libheimntlm kerber...
Author: stas Date: Tue Sep 27 07:14:12 2011 New Revision: 225778 URL: http://svn.freebsd.org/changeset/base/225778 Log: - Add missing interdependencies to kerberos libraries. Some of the kerberos libraries were not linked properly (missing dependencies), which causes 3rd party applications linking to fail when --as-needed ld flag is used. I also added the --no-undefined ld(1) flag to make sure that there're no missing dependencies. MFC after:3 days Modified: head/Makefile.inc1 head/kerberos5/lib/libasn1/Makefile head/kerberos5/lib/libgssapi_krb5/Makefile head/kerberos5/lib/libgssapi_ntlm/Makefile head/kerberos5/lib/libgssapi_spnego/Makefile head/kerberos5/lib/libhdb/Makefile head/kerberos5/lib/libheimntlm/Makefile head/kerberos5/lib/libhx509/Makefile head/kerberos5/lib/libkadm5clnt/Makefile head/kerberos5/lib/libkadm5srv/Makefile head/kerberos5/lib/libkafs5/Makefile head/kerberos5/lib/libkrb5/Makefile head/kerberos5/lib/libroken/Makefile head/tools/make_libdeps.sh Modified: head/Makefile.inc1 == --- head/Makefile.inc1 Tue Sep 27 07:06:02 2011(r225777) +++ head/Makefile.inc1 Tue Sep 27 07:14:12 2011(r225778) @@ -1218,7 +1218,8 @@ _startup_libs+= lib/libc gnu/lib/libgcc__L: lib/libc__L -_prebuild_libs=${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ +_prebuild_libs=${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \ + ${_kerberos5_lib_libheimntlm} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ lib/libbz2 lib/libcom_err lib/libcrypt \ @@ -1268,6 +1269,19 @@ secure/lib/libssh__L: lib/libgssapi__L k _secure_lib= secure/lib .endif +.if ${MK_KERBEROS} != no +kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L +kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ +kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L +kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L +kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ +secure/lib/libcrypto__L kerberos5/lib/libroken__L +kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ +lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \ +kerberos5/lib/libroken__L +kerberos5/lib/libroken__L: lib/libcrypt__L +.endif + .if ${MK_GSSAPI} != no _lib_libgssapi=lib/libgssapi .endif @@ -1279,6 +1293,7 @@ _lib_libipx= lib/libipx .if ${MK_KERBEROS} != no _kerberos5_lib=kerberos5/lib _kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libhdb= kerberos5/lib/libhdb _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken Modified: head/kerberos5/lib/libasn1/Makefile == --- head/kerberos5/lib/libasn1/Makefile Tue Sep 27 07:06:02 2011 (r225777) +++ head/kerberos5/lib/libasn1/Makefile Tue Sep 27 07:14:12 2011 (r225778) @@ -1,7 +1,10 @@ # $FreeBSD$ LIB= asn1 +LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h heim_asn1.h +LDADD= -lcom_err -lroken +DPADD= ${LIBCOM_ERR} ${LIBROKEN} SRCS= asn1_err.c \ asn1_err.h \ Modified: head/kerberos5/lib/libgssapi_krb5/Makefile == --- head/kerberos5/lib/libgssapi_krb5/Makefile Tue Sep 27 07:06:02 2011 (r225777) +++ head/kerberos5/lib/libgssapi_krb5/Makefile Tue Sep 27 07:14:12 2011 (r225778) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= gssapi_krb5 -LDFLAGS= -Wl,-Bsymbolic +LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBCRYPT} Modified: head/kerberos5/lib/libgssapi_ntlm/Makefile == --- head/kerberos5/lib/libgssapi_ntlm/Makefile Tue Sep 27 07:06:02 2011 (r225777) +++ head/kerberos5/lib/libgssapi_ntlm/Makefile Tue Sep 27 07:14:12 2011 (r225778) @@ -1,9 +1,9 @@ # $FreeBSD$ LIB= gssapi_ntlm -LDFLAGS= -Wl,-Bsymbolic -LDADD= -lkrb5 -lhx509 -lheimntlm -lroken -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} +LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined +LDADD= -lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken +DPADD= ${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} SRCS= accept_sec_context.c \ acquire_cred.c \ Modified: head/kerberos5/lib/libgssapi_spnego/Makefile == --- head/kerberos5/lib/libgssapi_spnego/MakefileTue
svn commit: r225780 - stable/8/sys/dev/smc
Author: stas Date: Tue Sep 27 07:33:04 2011 New Revision: 225780 URL: http://svn.freebsd.org/changeset/base/225780 Log: - MFC r225354: - Fix NULL pointer dereference when a packet of uneven size is being transmitted. Modified: stable/8/sys/dev/smc/if_smc.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/smc/if_smc.c == --- stable/8/sys/dev/smc/if_smc.c Tue Sep 27 07:19:01 2011 (r225779) +++ stable/8/sys/dev/smc/if_smc.c Tue Sep 27 07:33:04 2011 (r225780) @@ -538,6 +538,7 @@ smc_task_tx(void *context, int pending) struct smc_softc*sc; struct mbuf *m, *m0; u_int packet, len; + int last_len; uint8_t *data; (void)pending; @@ -590,16 +591,18 @@ smc_task_tx(void *context, int pending) * Push the data out to the device. */ data = NULL; + last_len = 0; for (; m != NULL; m = m-m_next) { data = mtod(m, uint8_t *); smc_write_multi_2(sc, DATA0, (uint16_t *)data, m-m_len / 2); + last_len = m-m_len; } /* * Push out the control byte and and the odd byte if needed. */ if ((len 1) != 0 data != NULL) - smc_write_2(sc, DATA0, (CTRL_ODD 8) | data[m-m_len - 1]); + smc_write_2(sc, DATA0, (CTRL_ODD 8) | data[last_len - 1]); else smc_write_2(sc, DATA0, 0); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r225811 - in stable/9: . kerberos5/lib/libasn1 kerberos5/lib/libgssapi_krb5 kerberos5/lib/libgssapi_ntlm kerberos5/lib/libgssapi_spnego kerberos5/lib/libhdb kerberos5/lib/libheimntlm ke...
Author: stas Date: Tue Sep 27 18:40:13 2011 New Revision: 225811 URL: http://svn.freebsd.org/changeset/base/225811 Log: - MFC r225778: - Add missing interdependencies to kerberos libraries. Some of the kerberos libraries were not linked properly (missing dependencies), which causes 3rd party applications linking to fail when --as-needed ld flag is used. I also added the --no-undefined ld(1) flag to make sure that there're no missing dependencies. Approved by: re (kib) Modified: stable/9/Makefile.inc1 (contents, props changed) stable/9/kerberos5/lib/libasn1/Makefile stable/9/kerberos5/lib/libgssapi_krb5/Makefile stable/9/kerberos5/lib/libgssapi_ntlm/Makefile stable/9/kerberos5/lib/libgssapi_spnego/Makefile stable/9/kerberos5/lib/libhdb/Makefile stable/9/kerberos5/lib/libheimntlm/Makefile stable/9/kerberos5/lib/libhx509/Makefile stable/9/kerberos5/lib/libkadm5clnt/Makefile stable/9/kerberos5/lib/libkadm5srv/Makefile stable/9/kerberos5/lib/libkafs5/Makefile stable/9/kerberos5/lib/libkrb5/Makefile stable/9/kerberos5/lib/libroken/Makefile stable/9/tools/make_libdeps.sh Directory Properties: stable/9/kerberos5/ (props changed) stable/9/tools/ (props changed) Modified: stable/9/Makefile.inc1 == --- stable/9/Makefile.inc1 Tue Sep 27 18:23:58 2011(r225810) +++ stable/9/Makefile.inc1 Tue Sep 27 18:40:13 2011(r225811) @@ -1218,7 +1218,8 @@ _startup_libs+= lib/libc gnu/lib/libgcc__L: lib/libc__L -_prebuild_libs=${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \ +_prebuild_libs=${_kerberos5_lib_libasn1} ${_kerberos5_lib_libhdb} \ + ${_kerberos5_lib_libheimntlm} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ lib/libbz2 lib/libcom_err lib/libcrypt \ @@ -1268,6 +1269,19 @@ secure/lib/libssh__L: lib/libgssapi__L k _secure_lib= secure/lib .endif +.if ${MK_KERBEROS} != no +kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L +kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ +kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L +kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L +kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ +secure/lib/libcrypto__L kerberos5/lib/libroken__L +kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \ +lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \ +kerberos5/lib/libroken__L +kerberos5/lib/libroken__L: lib/libcrypt__L +.endif + .if ${MK_GSSAPI} != no _lib_libgssapi=lib/libgssapi .endif @@ -1279,6 +1293,7 @@ _lib_libipx= lib/libipx .if ${MK_KERBEROS} != no _kerberos5_lib=kerberos5/lib _kerberos5_lib_libasn1= kerberos5/lib/libasn1 +_kerberos5_lib_libhdb= kerberos5/lib/libhdb _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5 _kerberos5_lib_libhx509= kerberos5/lib/libhx509 _kerberos5_lib_libroken= kerberos5/lib/libroken Modified: stable/9/kerberos5/lib/libasn1/Makefile == --- stable/9/kerberos5/lib/libasn1/Makefile Tue Sep 27 18:23:58 2011 (r225810) +++ stable/9/kerberos5/lib/libasn1/Makefile Tue Sep 27 18:40:13 2011 (r225811) @@ -1,7 +1,10 @@ # $FreeBSD$ LIB= asn1 +LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h heim_asn1.h +LDADD= -lcom_err -lroken +DPADD= ${LIBCOM_ERR} ${LIBROKEN} SRCS= asn1_err.c \ asn1_err.h \ Modified: stable/9/kerberos5/lib/libgssapi_krb5/Makefile == --- stable/9/kerberos5/lib/libgssapi_krb5/Makefile Tue Sep 27 18:23:58 2011(r225810) +++ stable/9/kerberos5/lib/libgssapi_krb5/Makefile Tue Sep 27 18:40:13 2011(r225811) @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= gssapi_krb5 -LDFLAGS= -Wl,-Bsymbolic +LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LDADD= -lgssapi -lkrb5 -lhx509 -lcrypto -lroken -lasn1 -lcom_err -lcrypt DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBCRYPTO} ${LIBROKEN} ${LIBASN1} \ ${LIBCOM_ERR} ${LIBCRYPT} Modified: stable/9/kerberos5/lib/libgssapi_ntlm/Makefile == --- stable/9/kerberos5/lib/libgssapi_ntlm/Makefile Tue Sep 27 18:23:58 2011(r225810) +++ stable/9/kerberos5/lib/libgssapi_ntlm/Makefile Tue Sep 27 18:40:13 2011(r225811) @@ -1,9 +1,9 @@ # $FreeBSD$ LIB= gssapi_ntlm -LDFLAGS= -Wl,-Bsymbolic -LDADD= -lkrb5 -lhx509 -lheimntlm -lroken -DPADD= ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBROKEN} +LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined +LDADD= -lcrypto -lgssapi -lkrb5 -lhx509 -lheimntlm -lroken +DPADD= ${LIBCRYPTO} ${LIBGSSAPI} ${LIBKRB5}
svn commit: r225354 - head/sys/dev/smc
Author: stas Date: Fri Sep 2 20:35:22 2011 New Revision: 225354 URL: http://svn.freebsd.org/changeset/base/225354 Log: - Fix NULL pointer dereference when a packet of uneven size is being transmitted. Approved by: re (kib) MFC after:3 days Modified: head/sys/dev/smc/if_smc.c Modified: head/sys/dev/smc/if_smc.c == --- head/sys/dev/smc/if_smc.c Fri Sep 2 19:29:37 2011(r225353) +++ head/sys/dev/smc/if_smc.c Fri Sep 2 20:35:22 2011(r225354) @@ -538,6 +538,7 @@ smc_task_tx(void *context, int pending) struct smc_softc*sc; struct mbuf *m, *m0; u_int packet, len; + int last_len; uint8_t *data; (void)pending; @@ -590,16 +591,18 @@ smc_task_tx(void *context, int pending) * Push the data out to the device. */ data = NULL; + last_len = 0; for (; m != NULL; m = m-m_next) { data = mtod(m, uint8_t *); smc_write_multi_2(sc, DATA0, (uint16_t *)data, m-m_len / 2); + last_len = m-m_len; } /* * Push out the control byte and and the odd byte if needed. */ if ((len 1) != 0 data != NULL) - smc_write_2(sc, DATA0, (CTRL_ODD 8) | data[m-m_len - 1]); + smc_write_2(sc, DATA0, (CTRL_ODD 8) | data[last_len - 1]); else smc_write_2(sc, DATA0, 0); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221807 - in head: lib lib/libprocstat lib/libprocstat/zfs lib/libutil sys/kern sys/sys usr.bin/fstat usr.bin/fstat/zfs usr.bin/procstat
On Thu, 12 May 2011 14:26:40 +0300 Kostik Belousov kostik...@gmail.com mentioned: The newly introduced fuser(1) utility also uses this library and able to operate via sysctl and kvm backends. The library is by no means complete (e.g. KVM backend is missing vnode name resolution routines, and there're no manpages for the library itself) so I plan to improve it further. I'm commiting it so it will get wider exposure and review. We won't be able to MFC this work as it relies on changes in HEAD, which was introduced some time ago, that break kernel ABI. OTOH we may be able to merge the library with KVM backend if we really need it there. Could you, please, point out the mentioned ABI changes ? Hi, Kostik! It seems I was wrong and that change was actually introduced in 8.0. It thus makes MFC possible. I don't have immediate plans for this though, but I might do it if there's enough demand and it demonstrates to be stable enough in HEAD. Sorry for being misleading! -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221931 - head/lib/libprocstat
Author: stas Date: Sat May 14 22:15:38 2011 New Revision: 221931 URL: http://svn.freebsd.org/changeset/base/221931 Log: - Add symbol versioning to libprocstat. Suggested by: kib Added: head/lib/libprocstat/Symbol.map (contents, props changed) head/lib/libprocstat/Versions.def (contents, props changed) Modified: head/lib/libprocstat/Makefile Modified: head/lib/libprocstat/Makefile == --- head/lib/libprocstat/Makefile Sat May 14 21:44:12 2011 (r221930) +++ head/lib/libprocstat/Makefile Sat May 14 22:15:38 2011 (r221931) @@ -12,6 +12,9 @@ SRCS= cd9660.c\ smbfs.c \ udf.c +VERSION_DEF= ${.CURDIR}/Versions.def +SYMBOL_MAPS= ${.CURDIR}/Symbol.map + INCS= libprocstat.h CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE SHLIB_MAJOR= 1 Added: head/lib/libprocstat/Symbol.map == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libprocstat/Symbol.map Sat May 14 22:15:38 2011 (r221931) @@ -0,0 +1,16 @@ +/* + * $FreeBSD$ + */ +FBSD_1.2 { + procstat_close; + procstat_freefiles; + procstat_freeprocs; + procstat_get_pipe_info; + procstat_get_pts_info; + procstat_get_socket_info; + procstat_get_vnode_info; + procstat_getfiles; + procstat_getprocs; + procstat_open_kvm; + procstat_open_sysctl; +}; Added: head/lib/libprocstat/Versions.def == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libprocstat/Versions.def Sat May 14 22:15:38 2011 (r221931) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +# This version was first added to 9.0-current. +FBSD_1.2 { +}; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221936 - head/lib/libprocstat
Author: stas Date: Sun May 15 00:46:25 2011 New Revision: 221936 URL: http://svn.freebsd.org/changeset/base/221936 Log: - Whitespace fix. Modified: head/lib/libprocstat/libprocstat.c Modified: head/lib/libprocstat/libprocstat.c == --- head/lib/libprocstat/libprocstat.c Sun May 15 00:43:51 2011 (r221935) +++ head/lib/libprocstat/libprocstat.c Sun May 15 00:46:25 2011 (r221936) @@ -253,7 +253,7 @@ procstat_getfiles(struct procstat *procs if (procstat-type == PROCSTAT_SYSCTL) return (procstat_getfiles_sysctl(procstat, kp, mmapped)); else if (procstat-type == PROCSTAT_KVM) -return (procstat_getfiles_kvm(procstat, kp, mmapped)); + return (procstat_getfiles_kvm(procstat, kp, mmapped)); else return (NULL); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221862 - head/sys/sys
Author: stas Date: Fri May 13 23:10:55 2011 New Revision: 221862 URL: http://svn.freebsd.org/changeset/base/221862 Log: - Bump __FreeBSD_version to note the revision when libprocstat(3) and fuser(1) have been added to the tree. Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hFri May 13 22:48:44 2011(r221861) +++ head/sys/sys/param.hFri May 13 23:10:55 2011(r221862) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 900036 /* Master, propagated to newvers */ +#define __FreeBSD_version 900037 /* Master, propagated to newvers */ #ifdef _KERNEL #defineP_OSREL_SIGSEGV 74 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221874 - head/usr.bin/fstat
Author: stas Date: Sat May 14 04:02:56 2011 New Revision: 221874 URL: http://svn.freebsd.org/changeset/base/221874 Log: - Fix several typos [1] - fuser(1) writes usernames to stderr, not stdout [1] - Add history section. Submitted by: Pieter de Goeje pie...@degoeje.nl [1] Modified: head/usr.bin/fstat/fuser.1 Modified: head/usr.bin/fstat/fuser.1 == --- head/usr.bin/fstat/fuser.1 Sat May 14 03:00:55 2011(r221873) +++ head/usr.bin/fstat/fuser.1 Sat May 14 04:02:56 2011(r221874) @@ -1,4 +1,4 @@ -.\ Copyright (c) 2005-2009 Stanislav Sedov s...@freebsd.org +.\ Copyright (c) 2005-2011 Stanislav Sedov s...@freebsd.org .\ All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd July 31, 2009 +.Dd May 13, 2011 .Dt FUSER 1 .Os .Sh NAME @@ -66,7 +66,7 @@ Send signal to reported processes .It Fl m Search through mmapped files too. .It Fl u -Write the user name associated with each process to stdout. +Write the user name associated with each process to stderr. .It Fl M Extract values associated with the name list from the specified core instead of the default @@ -114,9 +114,9 @@ utility returns 0 on successful completi .Sh EXAMPLES The command: .Dq Li fuser -fu . -writes to standart output the process IDs of processes that are using the +writes to standard output the process IDs of processes that are using the current directory and writes to stderr an indication of how those processes are -using the direcory and user names associated with the processes that are using +using the directory and user names associated with the processes that are using this directory. .Sh SEE ALSO .Xr fstat 1 , @@ -125,7 +125,7 @@ this directory. .Xr iostat 8 , .Xr pstat 8 , .Xr vmstat 8 -.Sh STANDARTS +.Sh STANDARDS The .Nm utility is expected to conform to @@ -141,6 +141,11 @@ interface the report will be limited to .Nm utility knows about (currently only cd9660, devfs, nfs, ntfs, nwfs, udf, ufs and zfs). +.Sh HISTORY +The +.Nm +utility appeared in +.Fx 9.0 . .Sh AUTHORS The .Nm ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221703 - in head/sys: amd64/include i386/include x86/isa x86/x86
On Mon, 9 May 2011 17:34:00 + (UTC) Jung-uk Kim j...@freebsd.org mentioned: Author: jkim Date: Mon May 9 17:34:00 2011 New Revision: 221703 URL: http://svn.freebsd.org/changeset/base/221703 Log: Implement boot-time TSC synchronization test for SMP. This test is executed when the user has indicated that the system has synchronized TSCs or it has P-state invariant TSCs. For the former case, we may clear the tunable if it fails the test to prevent accidental foot-shooting. For the latter case, we may set it if it passes the test to notify the user that it may be usable. Hi, Jung-uk! My kernel no longer boots on my Dual Xeon Dell Precision after this commit. It hangs immediately after the AP launched messages. I uploaded my verbose boot log from the old kernel to http://www.SpringDaemons.com/stas/boot.verbose Thanks! -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221807 - in head: lib lib/libprocstat lib/libprocstat/zfs lib/libutil sys/kern sys/sys usr.bin/fstat usr.bin/fstat/zfs usr.bin/procstat
+ @cd ${.CURDIR}/zfs ${MAKE} zfs.po +.endif + +.include bsd.lib.mk Added: head/lib/libprocstat/cd9660.c == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libprocstat/cd9660.c Thu May 12 10:11:39 2011 (r221807) @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2000 Peter Edwards + * Copyright (c) 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by Peter Edwards + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + *may be used to endorse or promote products derived from this software + *without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * XXX - + * This had to be separated from fstat.c because cd9660s has namespace + * conflicts with UFS. + */ + +#include sys/cdefs.h +__FBSDID($FreeBSD$); + +#include sys/param.h +#include sys/stat.h +#include sys/time.h +#include sys/vnode.h +#include sys/mount.h + +#include netinet/in.h + +#include err.h + +#include isofs/cd9660/cd9660_node.h +#define _KERNEL +#include isofs/cd9660/iso.h +#undef _KERNEL + +#include kvm.h +#include stdio.h + +#include libprocstat.h +#include common_kvm.h + +int +isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn) +{ + struct iso_node isonode; + struct iso_mnt mnt; + + if (!kvm_read_all(kd, (unsigned long)VTOI(vp), isonode, + sizeof(isonode))) { + warnx(can't read iso_node at %p, + (void *)VTOI(vp)); + return (1); + } + if (!kvm_read_all(kd, (unsigned long)isonode.i_mnt, mnt, + sizeof(mnt))) { + warnx(can't read iso_mnt at %p, + (void *)VTOI(vp)); + return (1); + } + vn-vn_fsid = dev2udev(kd, mnt.im_dev); + vn-vn_mode = (mode_t)isonode.inode.iso_mode; + vn-vn_fileid = (long)isonode.i_number; + vn-vn_size = (u_long)isonode.i_size; + return (0); +} Added: head/lib/libprocstat/common_kvm.c == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/libprocstat/common_kvm.c Thu May 12 10:11:39 2011 (r221807) @@ -0,0 +1,207 @@ +/*- + * Copyright (c) 2009 Stanislav Sedov s...@freebsd.org + * Copyright (c) 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + *must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + *may be used to endorse or promote products
Re: svn commit: r221703 - in head/sys: amd64/include i386/include x86/isa x86/x86
On Thu, 12 May 2011 13:43:58 +0300 Andriy Gapon a...@freebsd.org mentioned: Theory: - smp_rv_waiters[2] becomes equal to smp_rv_ncpus - [at least] one slave CPU is still in the last call to cpu_spinwait() in smp_rendezvous_action() - master CPU notices that the condition is true, exits smp_rendezvous_cpus() and calls it again - the slave CPU is still in spinwait - the master CPU resets smp_rv_waiters[2] to zero - the slave CPU exits spinwait, see smp_rv_waiters[2] with zero value - endless loop That might explain it. Do you have a patch for me to try? Thanks! -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221808 - head/sys/kern
Author: stas Date: Thu May 12 10:56:33 2011 New Revision: 221808 URL: http://svn.freebsd.org/changeset/base/221808 Log: - Do no try to drop a NULL filedesc pointer. Modified: head/sys/kern/kern_descrip.c Modified: head/sys/kern/kern_descrip.c == --- head/sys/kern/kern_descrip.cThu May 12 10:11:39 2011 (r221807) +++ head/sys/kern/kern_descrip.cThu May 12 10:56:33 2011 (r221808) @@ -3224,7 +3224,8 @@ sysctl_kern_proc_filedesc(SYSCTL_HANDLER } FILEDESC_SUNLOCK(fdp); fail: - fddrop(fdp); + if (fdp != NULL) + fddrop(fdp); free(kif, M_TEMP); return (error); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221816 - head/usr.bin/fstat
On Thu, 12 May 2011 17:02:56 + (UTC) Warner Losh i...@freebsd.org mentioned: Author: imp Date: Thu May 12 17:02:56 2011 New Revision: 221816 URL: http://svn.freebsd.org/changeset/base/221816 Log: Fix printf int mismatch on 32-bit architectures... Thanks a lot! Apparently I did `make universe` in the wrong tree... -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221824 - head/lib/libprocstat
Author: stas Date: Thu May 12 22:21:39 2011 New Revision: 221824 URL: http://svn.freebsd.org/changeset/base/221824 Log: - Don't try to build NWFS support module if NCP/IPX is disabled in the build. - Rename ZFS definition to LIBPROCSTAT_ZFS to be consistent with NWFS and to prevent possible collisions. Reported by: many Modified: head/lib/libprocstat/Makefile head/lib/libprocstat/libprocstat.c Modified: head/lib/libprocstat/Makefile == --- head/lib/libprocstat/Makefile Thu May 12 21:30:46 2011 (r221823) +++ head/lib/libprocstat/Makefile Thu May 12 22:21:39 2011 (r221824) @@ -9,7 +9,6 @@ SRCS= cd9660.c\ libprocstat.c \ msdosfs.c \ ntfs.c \ - nwfs.c \ smbfs.c \ udf.c @@ -18,9 +17,14 @@ CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE SHLIB_MAJOR= 1 WITHOUT_MAN= yes +.if ${MK_NCP} != no +CFLAGS+= -DLIBPROCSTAT_NWFS +SRCS+= nwfs.c +.endif + # XXX This is a hack. .if ${MK_CDDL} != no -CFLAGS+= -DZFS +CFLAGS+= -DLIBPROCSTAT_ZFS OBJS+= zfs/zfs.o SOBJS+=zfs/zfs.So POBJS+=zfs/zfs.po Modified: head/lib/libprocstat/libprocstat.c == --- head/lib/libprocstat/libprocstat.c Thu May 12 21:30:46 2011 (r221823) +++ head/lib/libprocstat/libprocstat.c Thu May 12 22:21:39 2011 (r221824) @@ -873,11 +873,13 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s FSTYPE(msdosfs), FSTYPE(nfs), FSTYPE(ntfs), +#ifdef LIBPROCSTAT_NWFS FSTYPE(nwfs), +#endif FSTYPE(smbfs), FSTYPE(udf), FSTYPE(ufs), -#ifdef ZFS +#ifdef LIBPROCSTAT_ZFS FSTYPE(zfs), #endif }; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r218938 - head/tools/regression/aio/kqueue
On Tue, 22 Feb 2011 05:13:27 + (UTC) Martin Wilke m...@freebsd.org mentioned: Author: miwi Date: Tue Feb 22 05:13:26 2011 New Revision: 218938 URL: http://svn.freebsd.org/changeset/base/218938 Log: - Fix QA issues What kind these QA issues are of? Also, style(9) does not encourage extra bland lines for now reason. -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments pgpEt1nUkz1zg.pgp Description: PGP signature
svn commit: r217119 - head/usr.sbin/cpucontrol
Author: stas Date: Fri Jan 7 18:52:08 2011 New Revision: 217119 URL: http://svn.freebsd.org/changeset/base/217119 Log: - Save some space relying on the fact that all ioctl commands prefixes are the same. Suggested by: Carlos A. M. dos Santos unixma...@gmail.com Modified: head/usr.sbin/cpucontrol/cpucontrol.c Modified: head/usr.sbin/cpucontrol/cpucontrol.c == --- head/usr.sbin/cpucontrol/cpucontrol.c Fri Jan 7 18:41:59 2011 (r217118) +++ head/usr.sbin/cpucontrol/cpucontrol.c Fri Jan 7 18:52:08 2011 (r217119) @@ -246,19 +246,19 @@ do_msr(const char *cmdarg, const char *d switch (op) { case OP_READ: command = CPUCTL_RDMSR; - command_name = CPUCTL_RDMSR; + command_name = RDMSR; break; case OP_WRITE: command = CPUCTL_WRMSR; - command_name = CPUCTL_WRMSR; + command_name = WRMSR; break; case OP_OR: command = CPUCTL_MSRSBIT; - command_name = CPUCTL_MSRSBIT; + command_name = MSRSBIT; break; case OP_AND: command = CPUCTL_MSRCBIT; - command_name = CPUCTL_MSRCBIT; + command_name = MSRCBIT; break; default: abort(); @@ -271,7 +271,7 @@ do_msr(const char *cmdarg, const char *d } error = ioctl(fd, command, args); if (error 0) { - WARN(0, ioctl(%s, %s (%lu)), dev, command_name, command); + WARN(0, ioctl(%s, CPUCTL_%s (%lu)), dev, command_name, command); close(fd); return (1); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r217046 - head/usr.sbin/cpucontrol
Author: stas Date: Thu Jan 6 07:13:23 2011 New Revision: 217046 URL: http://svn.freebsd.org/changeset/base/217046 Log: - Show textual representation of ioctl command in warning message if ioctl(4) is failed besides the command number. Suggested by: delphij MFC after:2 weeks Modified: head/usr.sbin/cpucontrol/cpucontrol.c Modified: head/usr.sbin/cpucontrol/cpucontrol.c == --- head/usr.sbin/cpucontrol/cpucontrol.c Thu Jan 6 04:38:10 2011 (r217045) +++ head/usr.sbin/cpucontrol/cpucontrol.c Thu Jan 6 07:13:23 2011 (r217046) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Stanislav Sedov s...@freebsd.org. + * Copyright (c) 2008-2011 Stanislav Sedov s...@freebsd.org. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -177,6 +177,7 @@ do_msr(const char *cmdarg, const char *d unsigned long command; int do_invert = 0, op; int fd, error; + const char *command_name; char *endptr; char *p; @@ -245,15 +246,19 @@ do_msr(const char *cmdarg, const char *d switch (op) { case OP_READ: command = CPUCTL_RDMSR; + command_name = CPUCTL_RDMSR; break; case OP_WRITE: command = CPUCTL_WRMSR; + command_name = CPUCTL_WRMSR; break; case OP_OR: command = CPUCTL_MSRSBIT; + command_name = CPUCTL_MSRSBIT; break; case OP_AND: command = CPUCTL_MSRCBIT; + command_name = CPUCTL_MSRCBIT; break; default: abort(); @@ -266,7 +271,7 @@ do_msr(const char *cmdarg, const char *d } error = ioctl(fd, command, args); if (error 0) { - WARN(0, ioctl(%s, %lu), dev, command); + WARN(0, ioctl(%s, %s (%lu)), dev, command_name, command); close(fd); return (1); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216473 - head/sbin/geom/class/eli
On Fri, 17 Dec 2010 09:22:02 -0600 Nathan Whitehorn nwhiteh...@freebsd.org mentioned: I have a patch at http://people.freebsd.org/~nwhitehorn/universe.diff that fixes both of these problems, by teaching the universe rule in src/Makefile about MACHINEs with multiple MACHINE_ARCHs and by enabling the build of the FDT tools by default, which adds about 300K to world. The way these are done is probably not optimal, but it is a better than the current situation and is a good stopgap. With the patch, all architectures succeed except for the ARM AVILA kernel, which seems genuinely broken, and the various 64-bit MIPS kernels, since 64-bit MIPS is not hooked up to the build yet. If I don't hear any objections, I would like to commit it on Wednesday the 22nd. Please, do! And I can look into Avila build problems if you like. -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201477 - head/games/fortune/datfiles
On Tue, 05 Jan 2010 10:28:51 -0800 Doug Barton do...@freebsd.org mentioned: First off, thanks for sorting these, that's a step in the right direction. :) However, a few quibbles. First, our rule is that anything which might offend someone belongs in fortunes-o, and political quotes are always in the category of might offend someone. (FWIW, neither of these are offensive to me, I'm just pointing out the general procedure.) Second, while it's clear at this point in time who these people are, and what the context is, read through the fortune files sometime and try to place who some of the people referenced are, when the quote was relevant, etc. At minimum the quotes should be dated (IMO). Finally, let's pretend for a second that this is an international project, and not assume that titles like defense secretary are meaningful everywhere. :) Oh, and in the Rumsfeld quote you have there're twice, and in the actual quote it's spelled out both times, there are. I would change the citation in the first quote to read: -- United States Secretary of Defense Donald Rumsfeld 12 February 2002 Personally I don't see the need to mention the context, but if you do you could add ... 2002, On the invasion of Iraq For the second, you could do something like: -- Daniel Fass, Chairman of United States President Barack Obama's financial-industry fundraising party I'll leave finding a date for that quote up to you. :) Thanks for suggestions! What's regarding the there're spelling --- I'm not sure what the correct version is: I took this quote from the San Francisco Chronicle newspaper, and it saved the original spelling. -- Stanislav Sedov ST4096-RIPE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r201626 - head/games/fortune/datfiles
Author: stas Date: Tue Jan 5 23:35:43 2010 New Revision: 201626 URL: http://svn.freebsd.org/changeset/base/201626 Log: - Move potentially offensive quotes I committed recently to fortunes-o. - Reference date. - Be more clear on context. Suggested by: dougb Modified: head/games/fortune/datfiles/fortunes head/games/fortune/datfiles/fortunes-o.real Modified: head/games/fortune/datfiles/fortunes == --- head/games/fortune/datfiles/fortunesTue Jan 5 23:33:29 2010 (r201625) +++ head/games/fortune/datfiles/fortunesTue Jan 5 23:35:43 2010 (r201626) @@ -1604,13 +1604,6 @@ friends and family, and then justify thi for doing it. -- Bruce Feirstein, Nice Guys Sleep Alone % - As we know, there are known knowns. There are things we know we -know. We also know there are known unknowns. That is to say, we know -there're some things we do not know. But there're also unknown unknowns; -the ones we don't know we don't know. - -- Defense Secretary Donald Rumsfeld, - about the invasion to Iraq. -% At a recent meeting in Snowmass, Colorado, a participant from Los Angeles fainted from hyperoxygenation, and we had to hold his head under the exhaust of a bus until he revived. @@ -46195,13 +46188,6 @@ constitutions, displaying the utmost imp overturning everything. -- Plato, Republic, 370 B.C. % -The investment community feels very putupon. They feel there is no -reason why they shouldn't earn $1 million to $200 million a year, -and they don't want to be held responsible for the global financial -meltdown. - -- Daniel Fass, chairman of Obama's - financial-industry fundraising party -% The IQ of the group is the lowest IQ of a member of the group divided by the number of people in the group. % Modified: head/games/fortune/datfiles/fortunes-o.real == --- head/games/fortune/datfiles/fortunes-o.real Tue Jan 5 23:33:29 2010 (r201625) +++ head/games/fortune/datfiles/fortunes-o.real Tue Jan 5 23:35:43 2010 (r201626) @@ -663,6 +663,13 @@ posh hotel. Why, yes, young man, said the gentleman. Would you bring me a postcard? % + As we know, there are known knowns. There are things we know we +know. We also know there are known unknowns. That is to say, we know +there're some things we do not know. But there're also unknown unknowns; +the ones we don't know we don't know. + -- United States Secretary of Defense Donald Rumsfeld + 12 February 2002, on the invasion to Iraq. +% Are pirates an ethnic group? Or are they just people who burn illegal cds? A! We prefer to be called Buccaneer-Americans. @@ -12873,6 +12880,14 @@ Contraception, has been withdrawn after pull it out at the last minute. -- Not the Nine O'Clock News % +The investment community feels very putupon. They feel there is no +reason why they shouldn't earn $1 million to $200 million a year, +and they don't want to be held responsible for the global financial +meltdown. + -- Daniel Fass, Chairman of United States President + Barack Obama's financial-industry fundraising party + 20 October 2009 +% The king arranged a regal marriage for his daughter -- a bond that would unite two great kingdoms. Yet, because the young couple seemed so formal to each other, he posted a spy outside the royal wedding chamber and demanded a full ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r201477 - head/games/fortune/datfiles
On Tue, 05 Jan 2010 16:03:18 -0800 Doug Barton do...@freebsd.org mentioned: Stanislav Sedov wrote: Thanks for suggestions! And thank you for making the changes. :) What's regarding the there're spelling --- I'm not sure what the correct version is: I took this quote from the San Francisco Chronicle newspaper, and it saved the original spelling. Couple of things regarding that. First, there're is very far from being a common English construction, especially in formal speech such as the context of this quote. Second, I found numerous citations that have it spelled out on line, I didn't find any that had the contraction (although I admit that I did not do an exhaustive search). Finally, the chronicle is not who I would choose to be objective in regards to a quotation from someone with whom they share an opposite political viewpoint. :) Yeah, true :-) In regards to what you appended to the date, On would be fine, after thinking about it Regarding would probably be more clear. Either way it should be capitalized. The to should definitely be changed to of however, for proper English'ification. Hmm, I'm not by any means the English language expert [just learning], but isn't invasion of in this context is somewhat vague? I mean, from what I see from dictionaries invasion of smth could mean both the action by smth, and action against smth. Is invasion to grammatically incorrect? BTW, why it should be capitalized, it's not a start of a sentence? I'm happy to make the changes if you'd rather, since I realize that it's annoying having to fix grammar nits, especially about something as trivial as the fortune files. :) Yeah, please do. I'm clearly not competent enough at this area. -- Stanislav Sedov ST4096-RIPE pgpPS35Np5YW2.pgp Description: PGP signature
svn commit: r201477 - head/games/fortune/datfiles
Author: stas Date: Mon Jan 4 09:16:35 2010 New Revision: 201477 URL: http://svn.freebsd.org/changeset/base/201477 Log: - Add two particulary interesting quotes from the past decade. Modified: head/games/fortune/datfiles/fortunes Modified: head/games/fortune/datfiles/fortunes == --- head/games/fortune/datfiles/fortunesMon Jan 4 09:02:39 2010 (r201476) +++ head/games/fortune/datfiles/fortunesMon Jan 4 09:16:35 2010 (r201477) @@ -1604,6 +1604,13 @@ friends and family, and then justify thi for doing it. -- Bruce Feirstein, Nice Guys Sleep Alone % + As we know, there are known knowns. There are things we know we +know. We also know there are known unknowns. That is to say, we know +there're some things we do not know. But there're also unknown unknowns; +the ones we don't know we don't know. + -- Defense Secretary Donald Rumsfeld, + about the invasion to Iraq. +% At a recent meeting in Snowmass, Colorado, a participant from Los Angeles fainted from hyperoxygenation, and we had to hold his head under the exhaust of a bus until he revived. @@ -46372,6 +46379,13 @@ constitutions, displaying the utmost imp overturning everything. -- Plato, Republic, 370 B.C. % +The investment community feels very putupon. They feel there is no +reason why they shouldn't earn $1 million to $200 million a year, +and they don't want to be held responsible for the global financial +meltdown. + -- Daniel Fass, chairman of Obama's + financial-industry fundraising party +% The IQ of the group is the lowest IQ of a member of the group divided by the number of people in the group. % ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r200806 - head/usr.sbin/newsyslog
On Tue, 22 Dec 2009 14:10:22 -0800 Xin LI delp...@delphij.net mentioned: On 2009/12/22 13:32, Stanislav Sedov wrote: On Mon, 21 Dec 2009 20:12:02 + (UTC) Xin LIdelp...@freebsd.org mentioned: Author: delphij Date: Mon Dec 21 20:12:01 2009 New Revision: 200806 URL: http://svn.freebsd.org/changeset/base/200806 Log: Don't consider non-existence of a PID file an error, we should be able to proceed anyway as this most likely mean that the process has been terminated. Or the process has not created the PID file and can be screwed up by rotating its log file. What about making this optional controlled by a command line switch? It might be a more safe alternative. Yes probably. I think the both case (can't find the PID file, or the PID file is empty) should be counted, as they may represent the similar situation, however, I think we'd better leave the current behavior default, since it's the most case. Do you think the attached patch makes sense? Yeah, thank you, it looks fine. In my opinion, though, I'd left the old behavior as default, as it is somewhat safer. But maybe I'm just too paranoic.:-) -- Stanislav Sedov ST4096-RIPE pgpSlrHEiGQ1H.pgp Description: PGP signature
svn commit: r200630 - head/usr.bin/make
Author: stas Date: Thu Dec 17 12:42:45 2009 New Revision: 200630 URL: http://svn.freebsd.org/changeset/base/200630 Log: - Partially revert r200417. config.h brings several definitions, that appears to be actually used. Without config.h included cross-build of world failed (at least for ARM). Modified: head/usr.bin/make/arch.c head/usr.bin/make/make.c Modified: head/usr.bin/make/arch.c == --- head/usr.bin/make/arch.cThu Dec 17 12:27:54 2009(r200629) +++ head/usr.bin/make/arch.cThu Dec 17 12:42:45 2009(r200630) @@ -103,6 +103,7 @@ __FBSDID($FreeBSD$); #include arch.h #include buf.h +#include config.h #include dir.h #include globals.h #include GNode.h Modified: head/usr.bin/make/make.c == --- head/usr.bin/make/make.cThu Dec 17 12:27:54 2009(r200629) +++ head/usr.bin/make/make.cThu Dec 17 12:42:45 2009(r200630) @@ -73,6 +73,7 @@ __FBSDID($FreeBSD$); */ #include arch.h +#include config.h #include dir.h #include globals.h #include GNode.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r200630 - head/usr.bin/make
On Thu, 17 Dec 2009 11:12:22 -0800 Xin LI delp...@gmail.com mentioned: Hi, On Thu, Dec 17, 2009 at 4:42 AM, Stanislav Sedov s...@freebsd.org wrote: Author: stas Date: Thu Dec 17 12:42:45 2009 New Revision: 200630 URL: http://svn.freebsd.org/changeset/base/200630 Log: - Partially revert r200417. config.h brings several definitions, that appears to be actually used. Without config.h included cross-build of world failed (at least for ARM). Sorry for the breakage, I was shock that this was not caught by ``make universe'', could you please send me a copy of the build log so I will be able to see why? Sure, here is it: http://www.SpringDaemons.com/stas/broken_log.Z And this log is after my fix: http://www.SpringDaemons.com/stas/log1.z I'm not entirely sure why it fails, but it seem to have something to do with LIBRARIES and RECHECK definitions. Thanks! -- Stanislav Sedov ST4096-RIPE pgpaWTSommV7n.pgp Description: PGP signature
svn commit: r200568 - in stable/8: share/man/man4 sys/dev/bge
Author: stas Date: Tue Dec 15 10:00:00 2009 New Revision: 200568 URL: http://svn.freebsd.org/changeset/base/200568 Log: - MFC r197832, r197834, r197837: - Add support for new BGE chips (5761, 5784 and 57780). These chips uses new BGE_PCI_PRODID_ASICREV register to store the chip identifier and its revision. - Add new grouping macro for 7575+ chips (BGE_IS_5755_PLUS). - Add IDs for Fujitsu-branded Broadcom adapters. Modified: stable/8/share/man/man4/bge.4 stable/8/sys/dev/bge/if_bge.c stable/8/sys/dev/bge/if_bgereg.h Directory Properties: stable/8/share/man/man4/ (props changed) stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/share/man/man4/bge.4 == --- stable/8/share/man/man4/bge.4 Tue Dec 15 09:46:27 2009 (r200567) +++ stable/8/share/man/man4/bge.4 Tue Dec 15 10:00:00 2009 (r200568) @@ -31,12 +31,12 @@ .\ .\ $FreeBSD$ .\ -.Dd Oct 21, 2009 +.Dd December 15, 2009 .Dt BGE 4 .Os .Sh NAME .Nm bge -.Nd Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver +.Nd Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5761/5784/5789/57780 PCI Gigabit Ethernet adapter driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -56,8 +56,8 @@ if_bge_load=YES The .Nm driver provides support for various NICs based on the Broadcom BCM570x, -5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet -controller chips. +5714, 5721, 5722, 5750, 5751, 5752, 5761, 5784, 5789 and 57780 families +of Gigabit Ethernet controller chips. .Pp All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5 copper cable, except for the SysKonnect SK-9D41 which supports only Modified: stable/8/sys/dev/bge/if_bge.c == --- stable/8/sys/dev/bge/if_bge.c Tue Dec 15 09:46:27 2009 (r200567) +++ stable/8/sys/dev/bge/if_bge.c Tue Dec 15 10:00:00 2009 (r200568) @@ -170,6 +170,7 @@ static const struct bge_type { { BCOM_VENDORID,BCOM_DEVICEID_BCM5720 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5721 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5722 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5723 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5750 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5750M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5751 }, @@ -184,12 +185,21 @@ static const struct bge_type { { BCOM_VENDORID,BCOM_DEVICEID_BCM5754M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5755 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5755M }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761E }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761S }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761SE }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5764 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5780 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5780S }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5781 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5782 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5784 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5785F }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5785G }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5786 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5787 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5787F }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5787M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5788 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5789 }, @@ -198,11 +208,19 @@ static const struct bge_type { { BCOM_VENDORID,BCOM_DEVICEID_BCM5903M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5906 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5906M }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM57760 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM57780 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM57788 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM57790 }, { SK_VENDORID, SK_DEVICEID_ALTIMA }, { TC_VENDORID, TC_DEVICEID_3C996 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE4 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PW008GE5 }, + { FJTSU_VENDORID, FJTSU_DEVICEID_PP250450 }, + { 0, 0 } }; @@ -216,6 +234,7 @@ static const struct bge_vendor { { BCOM_VENDORID,Broadcom }, { SK_VENDORID, SysKonnect },
svn commit: r200569 - stable/8/sys/dev/bge
Author: stas Date: Tue Dec 15 10:16:57 2009 New Revision: 200569 URL: http://svn.freebsd.org/changeset/base/200569 Log: MFC r198318: - On entrance to the rx_eof sync RX rings maps with POSTWRITE flag instead of POSTREAD: the hardware do not touch this memory (CPU updates it). It is already synchronized as PREWRITE after the processing is done. Modified: stable/8/sys/dev/bge/if_bge.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/bge/if_bge.c == --- stable/8/sys/dev/bge/if_bge.c Tue Dec 15 10:00:00 2009 (r200568) +++ stable/8/sys/dev/bge/if_bge.c Tue Dec 15 10:16:57 2009 (r200569) @@ -3122,10 +3122,10 @@ bge_rxeof(struct bge_softc *sc) bus_dmamap_sync(sc-bge_cdata.bge_rx_return_ring_tag, sc-bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_POSTREAD); bus_dmamap_sync(sc-bge_cdata.bge_rx_std_ring_tag, - sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTREAD); + sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTWRITE); if (BGE_IS_JUMBO_CAPABLE(sc)) bus_dmamap_sync(sc-bge_cdata.bge_rx_jumbo_ring_tag, - sc-bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTREAD); + sc-bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTWRITE); while (rx_cons != rx_prod) { struct bge_rx_bd*cur_rx; @@ -3251,6 +3251,8 @@ bge_rxeof(struct bge_softc *sc) return (rx_npkts); } + bus_dmamap_sync(sc-bge_cdata.bge_rx_return_ring_tag, + sc-bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_PREREAD); if (stdcnt 0) bus_dmamap_sync(sc-bge_cdata.bge_rx_std_ring_tag, sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREWRITE); @@ -3423,8 +3425,6 @@ bge_intr(void *xsc) /* Make sure the descriptor ring indexes are coherent. */ bus_dmamap_sync(sc-bge_cdata.bge_status_tag, sc-bge_cdata.bge_status_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc-bge_cdata.bge_status_tag, - sc-bge_cdata.bge_status_map, BUS_DMASYNC_PREREAD); if ((sc-bge_asicrev == BGE_ASICREV_BCM5700 sc-bge_chipid != BGE_CHIPID_BCM5700_B2) || @@ -3445,6 +3445,9 @@ bge_intr(void *xsc) !IFQ_DRV_IS_EMPTY(ifp-if_snd)) bge_start_locked(ifp); + bus_dmamap_sync(sc-bge_cdata.bge_status_tag, + sc-bge_cdata.bge_status_map, BUS_DMASYNC_PREREAD); + BGE_UNLOCK(sc); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r200570 - in stable/7: share/man/man4 sys/dev/bge
Author: stas Date: Tue Dec 15 10:34:05 2009 New Revision: 200570 URL: http://svn.freebsd.org/changeset/base/200570 Log: - MFC r197832, r197834, r197837: - Add support for new BGE chips (5761, 5784 and 57780). These chips uses new BGE_PCI_PRODID_ASICREV register to store the chip identifier and its revision. - Add new grouping macro for 7575+ chips (BGE_IS_5755_PLUS). - Add IDs for Fujitsu-branded Broadcom adapters. PR:If a GNATS PR is affected by the change. Submitted by: If someone else sent in the change. Reviewed by: If someone else reviewed your modification. Approved by: If you needed approval for this commit. Obtained from: If the change is from a third party. MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email. Security: Vulnerability reference (one per line) or description. Empty fields above will be automatically removed. _M 7/share/man/man4 M7/share/man/man4/bge.4 _M 7/sys M7/sys/dev/bge/if_bgereg.h M7/sys/dev/bge/if_bge.c _M 7/sys/contrib/pf _M 7/sys/contrib/dev/acpica _M 7/sys/cddl/contrib/opensolaris Modified: stable/7/share/man/man4/bge.4 stable/7/sys/dev/bge/if_bge.c stable/7/sys/dev/bge/if_bgereg.h Directory Properties: stable/7/share/man/man4/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/share/man/man4/bge.4 == --- stable/7/share/man/man4/bge.4 Tue Dec 15 10:16:57 2009 (r200569) +++ stable/7/share/man/man4/bge.4 Tue Dec 15 10:34:05 2009 (r200570) @@ -31,12 +31,12 @@ .\ .\ $FreeBSD$ .\ -.Dd January 15, 2009 +.Dd December 15, 2009 .Dt BGE 4 .Os .Sh NAME .Nm bge -.Nd Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver +.Nd Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5761/5784/5789/57780 PCI Gigabit Ethernet adapter driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -56,8 +56,8 @@ if_bge_load=YES The .Nm driver provides support for various NICs based on the Broadcom BCM570x, -5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet -controller chips. +5714, 5721, 5722, 5750, 5751, 5752, 5761, 5784, 5789 and 57780 families +of Gigabit Ethernet controller chips. .Pp All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5 copper cable, except for the SysKonnect SK-9D41 which supports only Modified: stable/7/sys/dev/bge/if_bge.c == --- stable/7/sys/dev/bge/if_bge.c Tue Dec 15 10:16:57 2009 (r200569) +++ stable/7/sys/dev/bge/if_bge.c Tue Dec 15 10:34:05 2009 (r200570) @@ -170,6 +170,7 @@ static const struct bge_type { { BCOM_VENDORID,BCOM_DEVICEID_BCM5720 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5721 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5722 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5723 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5750 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5750M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5751 }, @@ -184,12 +185,21 @@ static const struct bge_type { { BCOM_VENDORID,BCOM_DEVICEID_BCM5754M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5755 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5755M }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761E }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761S }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5761SE }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5764 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5780 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5780S }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5781 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5782 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5784 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5785F }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5785G }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5786 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5787 }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM5787F }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5787M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5788 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5789 }, @@ -198,11 +208,19 @@ static const struct bge_type { { BCOM_VENDORID,BCOM_DEVICEID_BCM5903M }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5906 }, { BCOM_VENDORID,BCOM_DEVICEID_BCM5906M }, + { BCOM_VENDORID,BCOM_DEVICEID_BCM57760 }, + {
svn commit: r200571 - stable/7/sys/dev/bge
Author: stas Date: Tue Dec 15 10:36:08 2009 New Revision: 200571 URL: http://svn.freebsd.org/changeset/base/200571 Log: - MFC r198318: - On entrance to the rx_eof sync RX rings maps with POSTWRITE flag instead of POSTREAD: the hardware do not touch this memory (CPU updates it). It is already synchronized as PREWRITE after the processing is done. - Synchronize RX return ring memory in rx_eof. This is needed as the deviced updates this memory when receives packets. - Decouple the synchronization of BGE status block in the interrupt service routine: perfrom PREREAD synchronization only all accesses to this block are finished. This seems to be more natural. Modified: stable/7/sys/dev/bge/if_bge.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/bge/if_bge.c == --- stable/7/sys/dev/bge/if_bge.c Tue Dec 15 10:34:05 2009 (r200570) +++ stable/7/sys/dev/bge/if_bge.c Tue Dec 15 10:36:08 2009 (r200571) @@ -3120,10 +3120,10 @@ bge_rxeof(struct bge_softc *sc) bus_dmamap_sync(sc-bge_cdata.bge_rx_return_ring_tag, sc-bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_POSTREAD); bus_dmamap_sync(sc-bge_cdata.bge_rx_std_ring_tag, - sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTREAD); + sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTWRITE); if (BGE_IS_JUMBO_CAPABLE(sc)) bus_dmamap_sync(sc-bge_cdata.bge_rx_jumbo_ring_tag, - sc-bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTREAD); + sc-bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTWRITE); while(sc-bge_rx_saved_considx != sc-bge_ldata.bge_status_block-bge_idx[0].bge_rx_prod_idx) { @@ -3250,6 +3250,8 @@ bge_rxeof(struct bge_softc *sc) return; } + bus_dmamap_sync(sc-bge_cdata.bge_rx_return_ring_tag, + sc-bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_PREREAD); if (stdcnt 0) bus_dmamap_sync(sc-bge_cdata.bge_rx_std_ring_tag, sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREWRITE); @@ -3418,8 +3420,6 @@ bge_intr(void *xsc) /* Make sure the descriptor ring indexes are coherent. */ bus_dmamap_sync(sc-bge_cdata.bge_status_tag, sc-bge_cdata.bge_status_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc-bge_cdata.bge_status_tag, - sc-bge_cdata.bge_status_map, BUS_DMASYNC_PREREAD); if ((sc-bge_asicrev == BGE_ASICREV_BCM5700 sc-bge_chipid != BGE_CHIPID_BCM5700_B2) || @@ -3440,6 +3440,9 @@ bge_intr(void *xsc) !IFQ_DRV_IS_EMPTY(ifp-if_snd)) bge_start_locked(ifp); + bus_dmamap_sync(sc-bge_cdata.bge_status_tag, + sc-bge_cdata.bge_status_map, BUS_DMASYNC_PREREAD); + BGE_UNLOCK(sc); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn: stable/7/sys: conf dev/bce
On Mon, 30 Nov 2009 20:30:55 -0800 Maxim Sobolev sobo...@freebsd.org mentioned: Maxim Sobolev wrote: Tom Judge wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Maxim Sobolev wrote: Is the option related to Jumbo Frames in any way? If not, IMHO the name should be changed to avoid any confusion. The bug is easier to reproduce when jumbo frames are turned on however we have seen it with normal frames also. Can we change the name then? We've seen the similar issue without the jumbo frames, which made me wonder. Also, perhaps we should make it a default and/or tunable. Having user to recompile kernel just to save 20 bytes of text segment is not very practical these days. Here is the patch: http://sobomax.sippysoft.com/~sobomax/bce.diff Please let me know if you have any objection to it, otherwise I will check it in. Thanks, it looks great! But better pass this through davidch@, as he might have objections regarding this modification. My first intention was to enable the header splitting by default, but he seemed to have some concerns, so the compile-time option was a kind of consensus. -- Stanislav Sedov ST4096-RIPE pgpmcyteIZ0MX.pgp Description: PGP signature
Re: svn: stable/7/sys: conf dev/bce
On Mon, 30 Nov 2009 13:25:03 -0800 Maxim Sobolev sobo...@freebsd.org mentioned: Can we change the name then? We've seen the similar issue without the jumbo frames, which made me wonder. It's strange, because 'normal' frames are less than a page size in length, so the issue I was experiencing should not be reproducable with jumbo frames disabled. Can you describe a bit more what kind of problem you're experiencing? -- Stanislav Sedov ST4096-RIPE pgpMVHQRxZpt6.pgp Description: PGP signature
Re: svn commit: r198320 - in head/sys: conf dev/bce
On Tue, 03 Nov 2009 19:29:25 + Tom Judge t...@tomjudge.com mentioned: Hi Stanislav, Any chance this can be MFC'd to stable/8, stable/7 and releng/8.0? Hi, Tom! I did MFC to STABLE_7 and STABLE_8. It was not allowed to merge to RELENG as it was too late for this :-( -- Stanislav Sedov ST4096-RIPE pgpMcW7IKzE1i.pgp Description: PGP signature
svn commit: r198318 - head/sys/dev/bge
Author: stas Date: Wed Oct 21 11:50:18 2009 New Revision: 198318 URL: http://svn.freebsd.org/changeset/base/198318 Log: - On entrance to the rx_eof sync RX rings maps with POSTWRITE flag instead of POSTREAD: the hardware do not touch this memory (CPU updates it). It is already synchronized as PREWRITE after the processing is done. - Synchronize RX return ring memory in rx_eof. This is needed as the deviced updates this memory when receives packets. - Decouple the synchronization of BGE status block in the interrupt service routine: perfrom PREREAD synchronization only all accesses to this block are finished. This seems to be more natural. Reviewed by: yongari, marius MFC after:2 weeks Modified: head/sys/dev/bge/if_bge.c Modified: head/sys/dev/bge/if_bge.c == --- head/sys/dev/bge/if_bge.c Wed Oct 21 11:10:34 2009(r198317) +++ head/sys/dev/bge/if_bge.c Wed Oct 21 11:50:18 2009(r198318) @@ -3122,10 +3122,10 @@ bge_rxeof(struct bge_softc *sc) bus_dmamap_sync(sc-bge_cdata.bge_rx_return_ring_tag, sc-bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_POSTREAD); bus_dmamap_sync(sc-bge_cdata.bge_rx_std_ring_tag, - sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTREAD); + sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTWRITE); if (BGE_IS_JUMBO_CAPABLE(sc)) bus_dmamap_sync(sc-bge_cdata.bge_rx_jumbo_ring_tag, - sc-bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTREAD); + sc-bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTWRITE); while (rx_cons != rx_prod) { struct bge_rx_bd*cur_rx; @@ -3251,6 +3251,8 @@ bge_rxeof(struct bge_softc *sc) return (rx_npkts); } + bus_dmamap_sync(sc-bge_cdata.bge_rx_return_ring_tag, + sc-bge_cdata.bge_rx_return_ring_map, BUS_DMASYNC_PREREAD); if (stdcnt 0) bus_dmamap_sync(sc-bge_cdata.bge_rx_std_ring_tag, sc-bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_PREWRITE); @@ -3423,8 +3425,6 @@ bge_intr(void *xsc) /* Make sure the descriptor ring indexes are coherent. */ bus_dmamap_sync(sc-bge_cdata.bge_status_tag, sc-bge_cdata.bge_status_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_sync(sc-bge_cdata.bge_status_tag, - sc-bge_cdata.bge_status_map, BUS_DMASYNC_PREREAD); if ((sc-bge_asicrev == BGE_ASICREV_BCM5700 sc-bge_chipid != BGE_CHIPID_BCM5700_B2) || @@ -3445,6 +3445,9 @@ bge_intr(void *xsc) !IFQ_DRV_IS_EMPTY(ifp-if_snd)) bge_start_locked(ifp); + bus_dmamap_sync(sc-bge_cdata.bge_status_tag, + sc-bge_cdata.bge_status_map, BUS_DMASYNC_PREREAD); + BGE_UNLOCK(sc); } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r198320 - in head/sys: conf dev/bce
Author: stas Date: Wed Oct 21 12:47:09 2009 New Revision: 198320 URL: http://svn.freebsd.org/changeset/base/198320 Log: - Introduce new option BCE_JUMBO_HDRSPLIT that allows user to enable header splitting in bce(4) instead of (ab)using ZERO_COPY_SOCKETS that was not propagated into if_bce.c anyway. It is disabled by default. Approved by: davidch MFC after:3 days Modified: head/sys/conf/NOTES head/sys/conf/options head/sys/dev/bce/if_bce.c head/sys/dev/bce/if_bcereg.h Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Wed Oct 21 12:42:25 2009(r198319) +++ head/sys/conf/NOTES Wed Oct 21 12:47:09 2009(r198320) @@ -1985,6 +1985,12 @@ device lmc # only works for Tigon II chips, and has no effect for Tigon I chips. optionsTI_JUMBO_HDRSPLIT +# +# Use header splitting feature on bce(4) adapters. +# This may help to reduce the amount of jumbo-sized memory buffers used. +# +optionsBCE_JUMBO_HDRSPLIT + # These two options allow manipulating the mbuf cluster size and mbuf size, # respectively. Be very careful with NIC driver modules when changing # these from their default values, because that can potentially cause a Modified: head/sys/conf/options == --- head/sys/conf/options Wed Oct 21 12:42:25 2009(r198319) +++ head/sys/conf/options Wed Oct 21 12:47:09 2009(r198320) @@ -511,6 +511,7 @@ DRM_DEBUG opt_drm.h ZERO_COPY_SOCKETS opt_zero.h TI_PRIVATE_JUMBOS opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h +BCE_JUMBO_HDRSPLIT opt_bce.h # XXX Conflict: # of devices vs network protocol (Native ATM). # This makes atm.h unusable. Modified: head/sys/dev/bce/if_bce.c == --- head/sys/dev/bce/if_bce.c Wed Oct 21 12:42:25 2009(r198319) +++ head/sys/dev/bce/if_bce.c Wed Oct 21 12:47:09 2009(r198320) @@ -293,12 +293,12 @@ static void bce_dump_enet (str static void bce_dump_mbuf (struct bce_softc *, struct mbuf *); static void bce_dump_tx_mbuf_chain (struct bce_softc *, u16, int); static void bce_dump_rx_mbuf_chain (struct bce_softc *, u16, int); -#ifdef ZERO_COPY_SOCKETS +#ifdef BCE_JUMBO_HDRSPLIT static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); #endif static void bce_dump_txbd (struct bce_softc *, int, struct tx_bd *); static void bce_dump_rxbd (struct bce_softc *, int, struct rx_bd *); -#ifdef ZERO_COPY_SOCKETS +#ifdef BCE_JUMBO_HDRSPLIT static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); #endif static void bce_dump_l2fhdr(struct bce_softc *, int, struct l2_fhdr *); @@ -306,7 +306,7 @@ static void bce_dump_ctx(struct bce_s static void bce_dump_ftqs (struct bce_softc *); static void bce_dump_tx_chain (struct bce_softc *, u16, int); static void bce_dump_rx_chain (struct bce_softc *, u16, int); -#ifdef ZERO_COPY_SOCKETS +#ifdef BCE_JUMBO_HDRSPLIT static void bce_dump_pg_chain (struct bce_softc *, u16, int); #endif static void bce_dump_status_block (struct bce_softc *); @@ -393,7 +393,7 @@ static int bce_init_rx_chain (struct b static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); -#ifdef ZERO_COPY_SOCKETS +#ifdef BCE_JUMBO_HDRSPLIT static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); @@ -602,7 +602,7 @@ bce_print_adapter_info(struct bce_softc /* Firmware version and device features. */ printf(B/C (%s); Flags (, sc-bce_bc_ver); -#ifdef ZERO_COPY_SOCKETS +#ifdef BCE_JUMBO_HDRSPLIT printf(SPLT ); i++; #endif @@ -1066,7 +1066,7 @@ bce_attach(device_t dev) * This may change later if the MTU size is set to * something other than 1500. */ -#ifdef ZERO_COPY_SOCKETS +#ifdef BCE_JUMBO_HDRSPLIT sc-rx_bd_mbuf_alloc_size = MHLEN; /* Make sure offset is 16 byte aligned for hardware. */ sc-rx_bd_mbuf_align_pad = roundup2((MSIZE - MHLEN), 16) - @@ -2835,7 +2835,7 @@ bce_dma_free(struct bce_softc *sc) } -#ifdef ZERO_COPY_SOCKETS +#ifdef BCE_JUMBO_HDRSPLIT /* Free, unmap and destroy all page buffer descriptor chain pages. */ for (i = 0; i PG_PAGES; i++ ) { if (sc-pg_bd_chain[i] != NULL) { @@ -2899,7 +2899,7 @@ bce_dma_free(struct bce_softc *sc) sc-rx_mbuf_tag = NULL; } -#ifdef ZERO_COPY_SOCKETS +#ifdef
svn commit: r198296 - stable/8/sys/dev/bge
Author: stas Date: Tue Oct 20 16:41:23 2009 New Revision: 198296 URL: http://svn.freebsd.org/changeset/base/198296 Log: - Disable ASF by default in STABLE_8. This causes a lot of problems on non-DELL branded machines with IPMI support. The proposed fix was committed to HEAD but has not received much test coverage yet. Discussed with: bz Approved by: re (kensmith) Modified: stable/8/sys/dev/bge/if_bge.c Modified: stable/8/sys/dev/bge/if_bge.c == --- stable/8/sys/dev/bge/if_bge.c Tue Oct 20 16:36:51 2009 (r198295) +++ stable/8/sys/dev/bge/if_bge.c Tue Oct 20 16:41:23 2009 (r198296) @@ -446,7 +446,7 @@ static devclass_t bge_devclass; DRIVER_MODULE(bge, pci, bge_driver, bge_devclass, 0, 0); DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0); -static int bge_allow_asf = 1; +static int bge_allow_asf = 0; TUNABLE_INT(hw.bge.allow_asf, bge_allow_asf); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r198296 - stable/8/sys/dev/bge
On Tue, 20 Oct 2009 20:51:45 +0200 Marius Strobl mar...@alchemy.franken.de mentioned: On Tue, Oct 20, 2009 at 04:41:23PM +, Stanislav Sedov wrote: Author: stas Date: Tue Oct 20 16:41:23 2009 New Revision: 198296 URL: http://svn.freebsd.org/changeset/base/198296 Log: - Disable ASF by default in STABLE_8. This causes a lot of problems on non-DELL branded machines with IPMI support. The proposed fix was committed to HEAD but has not received much test coverage yet. You probably want to adjust bge.4 to indicate that the default has changed as well. Sure, thanks! -- Stanislav Sedov ST4096-RIPE pgpBNwKU1rrNw.pgp Description: PGP signature
svn commit: r198309 - stable/8/share/man/man4
Author: stas Date: Tue Oct 20 22:11:17 2009 New Revision: 198309 URL: http://svn.freebsd.org/changeset/base/198309 Log: - Note that ASF is now disabled by default in 8.0. Approved by: re (kib) Modified: stable/8/share/man/man4/bge.4 Modified: stable/8/share/man/man4/bge.4 == --- stable/8/share/man/man4/bge.4 Tue Oct 20 21:36:56 2009 (r198308) +++ stable/8/share/man/man4/bge.4 Tue Oct 20 22:11:17 2009 (r198309) @@ -31,7 +31,7 @@ .\ .\ $FreeBSD$ .\ -.Dd May 19, 2009 +.Dd Oct 21, 2009 .Dt BGE 4 .Os .Sh NAME @@ -217,7 +217,7 @@ prompt before booting the kernel, or sto .It Va hw.bge.allow_asf Allow the ASF feature for cooperating with IPMI. Can cause system lockup problems on a small number of systems. -Enabled by default. +Disabled by default. .El .Sh DIAGNOSTICS .Bl -diag ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r197834 - head/share/man/man4
Author: stas Date: Wed Oct 7 13:25:24 2009 New Revision: 197834 URL: http://svn.freebsd.org/changeset/base/197834 Log: - Document new revisions of chips supported. Modified: head/share/man/man4/bge.4 Modified: head/share/man/man4/bge.4 == --- head/share/man/man4/bge.4 Wed Oct 7 13:25:22 2009(r197833) +++ head/share/man/man4/bge.4 Wed Oct 7 13:25:24 2009(r197834) @@ -31,12 +31,12 @@ .\ .\ $FreeBSD$ .\ -.Dd May 19, 2009 +.Dd Oct 7, 2009 .Dt BGE 4 .Os .Sh NAME .Nm bge -.Nd Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5789 PCI Gigabit Ethernet adapter driver +.Nd Broadcom BCM570x/5714/5721/5722/5750/5751/5752/5761/5784/5789/57780 PCI Gigabit Ethernet adapter driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -56,8 +56,8 @@ if_bge_load=YES The .Nm driver provides support for various NICs based on the Broadcom BCM570x, -5714, 5721, 5722, 5750, 5751, 5752 and 5789 families of Gigabit Ethernet -controller chips. +5714, 5721, 5722, 5750, 5751, 5752, 5761, 5784, 5789 and 57780 families +of Gigabit Ethernet controller chips. .Pp All of these NICs are capable of 10, 100 and 1000Mbps speeds over CAT5 copper cable, except for the SysKonnect SK-9D41 which supports only ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org