svn commit: r243788 - stable/9/usr.sbin/wpa/wpa_supplicant
Author: issyl0 (doc committer) Date: Sun Dec 2 12:26:17 2012 New Revision: 243788 URL: http://svnweb.freebsd.org/changeset/base/243788 Log: MFC r242696 from HEAD: Document all of the options that wpa_supplicant accepts. PR: docs/171755 Approved by: gabor (mentor) Modified: stable/9/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Directory Properties: stable/9/usr.sbin/wpa/wpa_supplicant/ (props changed) Modified: stable/9/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 == --- stable/9/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Sun Dec 2 06:50:27 2012(r243787) +++ stable/9/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 Sun Dec 2 12:26:17 2012(r243788) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 24, 2008 +.Dd November 7, 2012 .Dt WPA_SUPPLICANT 8 .Os .Sh NAME @@ -32,9 +32,26 @@ .Nd "WPA/802.11i Supplicant for wireless network devices" .Sh SYNOPSIS .Nm -.Op Fl BdehLqsvw +.Op Fl BdhKLqstuvW +.Op Fl b Ar br_ifname +.Fl c Ar config-file +.Op Fl C Ar ctrl +.Op Fl D Ar driver +.Op Fl f Ar debug file +.Op Fl g Ar global ctrl +.Fl i Ar ifname +.Op Fl o Ar override driver +.Op Fl O Ar override ctrl +.Op Fl P Ar pid file +.Oo Fl N .Fl i Ar ifname .Fl c Ar config-file +.Op Fl C Ar ctrl +.Op Fl D driver +.Op Fl p Ar driver_param +.Op Fl b Ar br_ifname +.No ... +.Oc .Sh DESCRIPTION The .Nm @@ -87,15 +104,36 @@ utility, using .Sh OPTIONS The following options are available: .Bl -tag -width indent +.It Fl b +Optional bridge interface name. +.It Fl B +Detach from the controlling terminal and run as a daemon process +in the background. .It Fl d Enable debugging messages. If this option is supplied twice, more verbose messages are displayed. -.It Fl e -Use an external IEEE 802.1X Supplicant program and disable the -internal Supplicant. -This option is not normally used. +.It Fl D +Driver name (can be multiple drivers: nl80211,wext). +.It Fl f +Log output to debug file instead of stdout. +.It Fl g +Global ctrl_interface. .It Fl h Show help text. +.It Fl K +Include key information in debugging output. +.It Fl L +Display the license for this program on the terminal and exit. +.It Fl N +Start describing a new interface. +.It Fl o +Overrides driver parameter for new interfaces. +.It Fl O +Override ctrl_interface parameter for new interfaces. +.It Fl p +Specify driver parameters. +.It Fl P +File in which to save the process PID. .It Fl q Decrease debugging verbosity (i.e., counteract the use of the .Fl d @@ -104,23 +142,14 @@ flag). Send log messages through .Xr syslog 3 instead of to the terminal. +.It Fl t +Include timestamp in debug messages. +.It Fl u +Enable DBus control interface. .It Fl v Display version information on the terminal and exit. -.It Fl w -If the specified interface is not present, wait for it to be -added; e.g.\& a cardbus device to be inserted. -This option is not normally used; instead, -.Xr devd 8 -should be configured to launch -.Nm -when a device is created. -.It Fl B -Detach from the controlling terminal and run as a daemon process -in the background. -.It Fl K -Include key information in debugging output. -.It Fl L -Display the license for this program on the terminal and exit. +.It Fl W +Wait for a control interface monitor before starting. .El .Sh SEE ALSO .Xr an 4 , ___ 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: r243790 - vendor/llvm/llvm-release_32-r168974
Author: dim Date: Sun Dec 2 13:12:38 2012 New Revision: 243790 URL: http://svnweb.freebsd.org/changeset/base/243790 Log: Tag llvm release_32 branch r168974 (effectively, 3.2 RC2). Added: vendor/llvm/llvm-release_32-r168974/ - copied from r243789, vendor/llvm/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: r243792 - vendor/clang/clang-release_32-r168974
Author: dim Date: Sun Dec 2 13:22:23 2012 New Revision: 243792 URL: http://svnweb.freebsd.org/changeset/base/243792 Log: Tag clang release_32 branch r168974 (effectively, 3.2 RC2). Added: vendor/clang/clang-release_32-r168974/ - copied from r243791, vendor/clang/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"
Re: svn commit: r243762 - head/sys/cddl/contrib/opensolaris/uts/common/fs
On Sat, Dec 01, 2012 at 06:12:55PM +, Andriy Gapon wrote: > Author: avg > Date: Sat Dec 1 18:12:55 2012 > New Revision: 243762 > URL: http://svnweb.freebsd.org/changeset/base/243762 > > Log: > gfs_file_inactive: replace bad code with ugly code > > Also, make it explicit that V_XATTRDIR is not properly supported in gfs > code yet. > > The bad code was plain incorrect: (a) it spoiled handling of v_usecount > reaching zero and (b) it leaked v_holdcnt. > > The ugly code employs potentially unsafe locking tricks. > > Ideally we should separate vnode lifecycle and gfs node lifecycle. > A gfs node should have its own reference count where its child nodes > should be accounted. Very good you are touching this:) If you verify if it works, you should try .zfs/ directory when it is visible and not visible through local file system and through NFS. All those cases have their own bugs in the past. -- Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://tupytaj.pl pgpNWN1t8Sura.pgp Description: PGP signature
svn commit: r243793 - head/sys/dev/sound/pci/hda
Author: eadler
Date: Sun Dec 2 17:54:52 2012
New Revision: 243793
URL: http://svnweb.freebsd.org/changeset/base/243793
Log:
Add support for hdmi hda codec onboard nvidia gt 440 graphics card
PR: kern/174059
Submitted by: "4...@hushmail.com" <4...@hushmail.com>
Approved by: cperciva (implicit)
MFC after:2 weeks
Modified:
head/sys/dev/sound/pci/hda/hdac.h
head/sys/dev/sound/pci/hda/hdacc.c
Modified: head/sys/dev/sound/pci/hda/hdac.h
==
--- head/sys/dev/sound/pci/hda/hdac.h Sun Dec 2 13:22:23 2012
(r243792)
+++ head/sys/dev/sound/pci/hda/hdac.h Sun Dec 2 17:54:52 2012
(r243793)
@@ -573,6 +573,7 @@
#define HDA_CODEC_NVIDIAGT21X HDA_CODEC_CONSTRUCT(NVIDIA, 0x000b)
#define HDA_CODEC_NVIDIAMCP89 HDA_CODEC_CONSTRUCT(NVIDIA, 0x000c)
#define HDA_CODEC_NVIDIAGT240 HDA_CODEC_CONSTRUCT(NVIDIA, 0x000d)
+#define HDA_CODEC_NVIDIAGT440 HDA_CODEC_CONSTRUCT(NVIDIA, 0x0014)
#define HDA_CODEC_NVIDIAMCP67 HDA_CODEC_CONSTRUCT(NVIDIA, 0x0067)
#define HDA_CODEC_NVIDIAMCP73 HDA_CODEC_CONSTRUCT(NVIDIA, 0x8001)
#define HDA_CODEC_NVIDIA HDA_CODEC_CONSTRUCT(NVIDIA, 0x)
Modified: head/sys/dev/sound/pci/hda/hdacc.c
==
--- head/sys/dev/sound/pci/hda/hdacc.c Sun Dec 2 13:22:23 2012
(r243792)
+++ head/sys/dev/sound/pci/hda/hdacc.c Sun Dec 2 17:54:52 2012
(r243793)
@@ -307,6 +307,7 @@ static const struct {
{ HDA_CODEC_NVIDIAGT21X, 0, "NVIDIA GT21x" },
{ HDA_CODEC_NVIDIAMCP89, 0, "NVIDIA MCP89" },
{ HDA_CODEC_NVIDIAGT240, 0, "NVIDIA GT240" },
+ { HDA_CODEC_NVIDIAGT440, 0, "NVIDIA GT440" },
{ HDA_CODEC_INTELIP, 0, "Intel Ibex Peak" },
{ HDA_CODEC_INTELBL, 0, "Intel Bearlake" },
{ HDA_CODEC_INTELCA, 0, "Intel Cantiga" },
___
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: r243794 - head/sys/dev/sound/pci/hda
Author: eadler
Date: Sun Dec 2 18:41:22 2012
New Revision: 243794
URL: http://svnweb.freebsd.org/changeset/base/243794
Log:
Add a few more translations from IDs to model name.
Submitted by: "4...@hushmail.com" <4...@hushmail.com>
Approved by: cperciva (implicit)
MFC after:2 weeks
Modified:
head/sys/dev/sound/pci/hda/hdac.h
head/sys/dev/sound/pci/hda/hdacc.c
Modified: head/sys/dev/sound/pci/hda/hdac.h
==
--- head/sys/dev/sound/pci/hda/hdac.h Sun Dec 2 17:54:52 2012
(r243793)
+++ head/sys/dev/sound/pci/hda/hdac.h Sun Dec 2 18:41:22 2012
(r243794)
@@ -573,7 +573,10 @@
#define HDA_CODEC_NVIDIAGT21X HDA_CODEC_CONSTRUCT(NVIDIA, 0x000b)
#define HDA_CODEC_NVIDIAMCP89 HDA_CODEC_CONSTRUCT(NVIDIA, 0x000c)
#define HDA_CODEC_NVIDIAGT240 HDA_CODEC_CONSTRUCT(NVIDIA, 0x000d)
+#define HDA_CODEC_NVIDIAGTS450 HDA_CODEC_CONSTRUCT(NVIDIA, 0x0011)
#define HDA_CODEC_NVIDIAGT440 HDA_CODEC_CONSTRUCT(NVIDIA, 0x0014)
+#define HDA_CODEC_NVIDIAGTX550 HDA_CODEC_CONSTRUCT(NVIDIA, 0x0015)
+#define HDA_CODEC_NVIDIAGTX570 HDA_CODEC_CONSTRUCT(NVIDIA, 0x0018)
#define HDA_CODEC_NVIDIAMCP67 HDA_CODEC_CONSTRUCT(NVIDIA, 0x0067)
#define HDA_CODEC_NVIDIAMCP73 HDA_CODEC_CONSTRUCT(NVIDIA, 0x8001)
#define HDA_CODEC_NVIDIA HDA_CODEC_CONSTRUCT(NVIDIA, 0x)
Modified: head/sys/dev/sound/pci/hda/hdacc.c
==
--- head/sys/dev/sound/pci/hda/hdacc.c Sun Dec 2 17:54:52 2012
(r243793)
+++ head/sys/dev/sound/pci/hda/hdacc.c Sun Dec 2 18:41:22 2012
(r243794)
@@ -307,7 +307,10 @@ static const struct {
{ HDA_CODEC_NVIDIAGT21X, 0, "NVIDIA GT21x" },
{ HDA_CODEC_NVIDIAMCP89, 0, "NVIDIA MCP89" },
{ HDA_CODEC_NVIDIAGT240, 0, "NVIDIA GT240" },
+ { HDA_CODEC_NVIDIAGTS450, 0,"NVIDIA GTS450" },
{ HDA_CODEC_NVIDIAGT440, 0, "NVIDIA GT440" },
+ { HDA_CODEC_NVIDIAGTX550, 0,"NVIDIA GTX550" },
+ { HDA_CODEC_NVIDIAGTX570, 0,"NVIDIA GTX570" },
{ HDA_CODEC_INTELIP, 0, "Intel Ibex Peak" },
{ HDA_CODEC_INTELBL, 0, "Intel Bearlake" },
{ HDA_CODEC_INTELCA, 0, "Intel Cantiga" },
___
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: r243795 - head
Author: antoine Date: Sun Dec 2 18:57:02 2012 New Revision: 243795 URL: http://svnweb.freebsd.org/changeset/base/243795 Log: Add more obsolete files. Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sun Dec 2 18:41:22 2012(r243794) +++ head/ObsoleteFiles.inc Sun Dec 2 18:57:02 2012(r243795) @@ -52,6 +52,9 @@ OLD_FILES+=usr/include/clang/3.2/unwind. # 20120910: NetBSD compat shims removed OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h OLD_FILES+=usr/include/sys/device_port.h +# 20120909: doc and www supfiles removed +OLD_FILES+=usr/share/examples/cvsup/doc-supfile +OLD_FILES+=usr/share/examples/cvsup/www-supfile # 20120908: pf cleanup OLD_FILES+=usr/include/net/if_pflow.h # 20120816: new clang import which bumps version from 3.1 to 3.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"
Re: svn commit: r243779 - head/lib/libc/gen
Hi Marcel, On Sat, 1 Dec 2012, 21:26-, Marcel Moolenaar wrote: > Author: marcel > Date: Sat Dec 1 21:26:46 2012 > New Revision: 243779 > URL: http://svnweb.freebsd.org/changeset/base/243779 > > Log: > Protect against DoS attacks, such as being described in CVE-2010-2632. > The changes were derived from what has been committed to NetBSD, with > modifications. These are: [..] Do you have any plans to MFC this code eventually? -- Maxim Konovalov ___ 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: r243796 - head/sys
Author: rpaulo
Date: Sun Dec 2 20:51:24 2012
New Revision: 243796
URL: http://svnweb.freebsd.org/changeset/base/243796
Log:
Run cscope with the -v parameter to make it more user-friendly.
Modified:
head/sys/Makefile
Modified: head/sys/Makefile
==
--- head/sys/Makefile Sun Dec 2 18:57:02 2012(r243795)
+++ head/sys/Makefile Sun Dec 2 20:51:24 2012(r243796)
@@ -38,7 +38,7 @@ HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/
# You need the devel/cscope port for this.
cscope: cscope.out
cscope.out: ${.CURDIR}/cscope.files
- cd ${.CURDIR}; cscope -k -buq -p4
+ cd ${.CURDIR}; cscope -k -buq -p4 -v
${.CURDIR}/cscope.files: .PHONY
cd ${.CURDIR}; \
___
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: r243798 - head
Author: peter
Date: Sun Dec 2 21:32:45 2012
New Revision: 243798
URL: http://svnweb.freebsd.org/changeset/base/243798
Log:
Add auditdistd to the pre-install required uid check list.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Sun Dec 2 21:00:52 2012(r243797)
+++ head/Makefile.inc1 Sun Dec 2 21:32:45 2012(r243798)
@@ -611,7 +611,7 @@ installcheck_DESTDIR:
#
# Check for missing UIDs/GIDs.
#
-CHECK_UIDS=
+CHECK_UIDS=auditdistd
CHECK_GIDS=audit
.if ${MK_SENDMAIL} != "no"
CHECK_UIDS+= smmsp
___
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: r243799 - head/sys/net
Author: melifaro
Date: Sun Dec 2 21:43:37 2012
New Revision: 243799
URL: http://svnweb.freebsd.org/changeset/base/243799
Log:
Fix bpf_if structure leak introduced in r235745.
Move all such structures to delayed-free lists and
delete all matching on interface departure event.
MFC after:1 week
Modified:
head/sys/net/bpf.c
Modified: head/sys/net/bpf.c
==
--- head/sys/net/bpf.c Sun Dec 2 21:32:45 2012(r243798)
+++ head/sys/net/bpf.c Sun Dec 2 21:43:37 2012(r243799)
@@ -141,7 +141,7 @@ struct bpf_dltlist32 {
* structures registered by different layers in the stack (i.e., 802.11
* frames, ethernet frames, etc).
*/
-static LIST_HEAD(, bpf_if) bpf_iflist;
+static LIST_HEAD(, bpf_if) bpf_iflist, bpf_freelist;
static struct mtx bpf_mtx;/* bpf global lock */
static int bpf_bpfd_cnt;
@@ -2491,52 +2491,51 @@ bpfattach2(struct ifnet *ifp, u_int dlt,
void
bpfdetach(struct ifnet *ifp)
{
- struct bpf_if *bp;
+ struct bpf_if *bp, *bp_temp;
struct bpf_d*d;
-#ifdef INVARIANTS
int ndetached;
ndetached = 0;
-#endif
BPF_LOCK();
/* Find all bpf_if struct's which reference ifp and detach them. */
- do {
- LIST_FOREACH(bp, &bpf_iflist, bif_next) {
- if (ifp == bp->bif_ifp)
- break;
- }
- if (bp != NULL)
- LIST_REMOVE(bp, bif_next);
+ LIST_FOREACH_SAFE(bp, &bpf_iflist, bif_next, bp_temp) {
+ if (ifp != bp->bif_ifp)
+ continue;
- if (bp != NULL) {
-#ifdef INVARIANTS
- ndetached++;
-#endif
- while ((d = LIST_FIRST(&bp->bif_dlist)) != NULL) {
- bpf_detachd_locked(d);
- BPFD_LOCK(d);
- bpf_wakeup(d);
- BPFD_UNLOCK(d);
- }
- /* Free writer-only descriptors */
- while ((d = LIST_FIRST(&bp->bif_wlist)) != NULL) {
- bpf_detachd_locked(d);
- BPFD_LOCK(d);
- bpf_wakeup(d);
- BPFD_UNLOCK(d);
- }
+ LIST_REMOVE(bp, bif_next);
+ /* Add to to-be-freed list */
+ LIST_INSERT_HEAD(&bpf_freelist, bp, bif_next);
- /*
-* Delay freing bp till interface is detached
-* and all routes through this interface are removed.
-* Mark bp as detached to restrict new consumers.
-*/
- BPFIF_WLOCK(bp);
- bp->flags |= BPFIF_FLAG_DYING;
- BPFIF_WUNLOCK(bp);
+ ndetached++;
+ /*
+* Delay freeing bp till interface is detached
+* and all routes through this interface are removed.
+* Mark bp as detached to restrict new consumers.
+*/
+ BPFIF_WLOCK(bp);
+ bp->flags |= BPFIF_FLAG_DYING;
+ BPFIF_WUNLOCK(bp);
+
+ CTR4(KTR_NET, "%s: sheduling free for encap %d (%p) for if %p",
+ __func__, bp->bif_dlt, bp, ifp);
+
+ /* Free common descriptors */
+ while ((d = LIST_FIRST(&bp->bif_dlist)) != NULL) {
+ bpf_detachd_locked(d);
+ BPFD_LOCK(d);
+ bpf_wakeup(d);
+ BPFD_UNLOCK(d);
}
- } while (bp != NULL);
+
+ /* Free writer-only descriptors */
+ while ((d = LIST_FIRST(&bp->bif_wlist)) != NULL) {
+ bpf_detachd_locked(d);
+ BPFD_LOCK(d);
+ bpf_wakeup(d);
+ BPFD_UNLOCK(d);
+ }
+ }
BPF_UNLOCK();
#ifdef INVARIANTS
@@ -2548,32 +2547,46 @@ bpfdetach(struct ifnet *ifp)
/*
* Interface departure handler.
* Note departure event does not guarantee interface is going down.
+ * Interface renaming is currently done via departure/arrival event set.
+ *
+ * Departure handled is called after all routes pointing to
+ * given interface are removed and interface is in down state
+ * restricting any packets to be sent/received. We assume it is now safe
+ * to free data allocated by BPF.
*/
static void
bpf_ifdetach(void *arg __unused, struct ifnet *ifp)
{
- struct bpf_if *bp;
+ struct bpf_if *bp, *bp_temp;
+ int nmatched = 0;
BPF_LOCK();
- if ((bp = ifp->if_bpf) == NULL) {
- BPF_UNLOCK();
- return;
-
Re: svn commit: r243798 - head
On Sun, Dec 2, 2012 at 1:32 PM, Peter Wemm wrote: > Author: peter > Date: Sun Dec 2 21:32:45 2012 > New Revision: 243798 > URL: http://svnweb.freebsd.org/changeset/base/243798 > > Log: > Add auditdistd to the pre-install required uid check list. Thanks :). ___ 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: r243800 - head
Author: rwatson Date: Sun Dec 2 22:09:16 2012 New Revision: 243800 URL: http://svnweb.freebsd.org/changeset/base/243800 Log: Specifically point at the Handbook instructions for world updates in UPDATING by URL. As there has been some confusion over the need to run "mergemaster -p", part of our standard upgrade procedure, following the recent addition of an "auditdistd" user, add a note about it to UPDATING explicitly. Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Sun Dec 2 21:43:37 2012(r243799) +++ head/UPDATING Sun Dec 2 22:09:16 2012(r243800) @@ -4,7 +4,9 @@ This file is maintained and copyrighted See end of file for further details. For commonly done items, please see the COMMON ITEMS: section later in the file. These instructions assume that you basically know what you are doing. If not, then please consult the FreeBSD -handbook. +handbook: + +http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. @@ -24,6 +26,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20121201: + With the addition of auditdistd(8), a new auditdistd user is now + depended on during installworld. "mergemaster -p" can be used to add + the user prior to installworld, as documented in the handbook. + 20121117: The sin6_scope_id member variable in struct sockaddr_in6 is now filled by the kernel before passing the structure to the userland via ___ 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: r243798 - head
On Sun, 2 Dec 2012, Garrett Cooper wrote: On Sun, Dec 2, 2012 at 1:32 PM, Peter Wemm wrote: Author: peter Date: Sun Dec 2 21:32:45 2012 New Revision: 243798 URL: http://svnweb.freebsd.org/changeset/base/243798 Log: Add auditdistd to the pre-install required uid check list. Thanks :). I've also added an UPDATING entry. Note that running "mergemaster -p" is a documented (and necessary) part of the world upgrade process. Normally I wouldn't add an UPDATING entry, and in general we haven't done it for new users in the past, but it seems an inordinate number of people are running into this due to not using "mergemaster -p" (and on the whole not removing their feet), so a reminder was necessary. Robert ___ 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: r243798 - head
On Sun, Dec 2, 2012 at 2:13 PM, Robert Watson wrote: ... > I've also added an UPDATING entry. > > Note that running "mergemaster -p" is a documented (and necessary) part of > the world upgrade process. Normally I wouldn't add an UPDATING entry, and > in general we haven't done it for new users in the past, but it seems an > inordinate number of people are running into this due to not using > "mergemaster -p" (and on the whole not removing their feet), so a reminder > was necessary. Unfortunately I also propogated this fallacy (not needing mergemaster -p) as well. I'm rerunning a build with nanobsd on my 9/stable workstation, as I ran into problems in the last go-around with the user/group being missing, but we'll see if I run into it again (seems like we should have a slightly more intelligent mechanism for dealing with this issue in the build system itself instead of mergemaster). Thanks! -Garrett ___ 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: r243801 - head/sys/modules/iwn
Author: uqs
Date: Sun Dec 2 22:18:01 2012
New Revision: 243801
URL: http://svnweb.freebsd.org/changeset/base/243801
Log:
Fix make depend.
Modified:
head/sys/modules/iwn/Makefile
Modified: head/sys/modules/iwn/Makefile
==
--- head/sys/modules/iwn/Makefile Sun Dec 2 22:09:16 2012
(r243800)
+++ head/sys/modules/iwn/Makefile Sun Dec 2 22:18:01 2012
(r243801)
@@ -3,6 +3,6 @@
.PATH: ${.CURDIR}/../../dev/iwn
KMOD= if_iwn
-SRCS= if_iwn.c device_if.h bus_if.h pci_if.h
+SRCS= if_iwn.c device_if.h bus_if.h pci_if.h opt_wlan.h
.include
___
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: r243798 - head
On Sun, 2012-12-02 at 22:13 +, Robert Watson wrote: > On Sun, 2 Dec 2012, Garrett Cooper wrote: > > > On Sun, Dec 2, 2012 at 1:32 PM, Peter Wemm wrote: > >> Author: peter > >> Date: Sun Dec 2 21:32:45 2012 > >> New Revision: 243798 > >> URL: http://svnweb.freebsd.org/changeset/base/243798 > >> > >> Log: > >> Add auditdistd to the pre-install required uid check list. > > > > Thanks :). > > I've also added an UPDATING entry. > > Note that running "mergemaster -p" is a documented (and necessary) part of > the > world upgrade process. Normally I wouldn't add an UPDATING entry, and in > general we haven't done it for new users in the past, but it seems an > inordinate number of people are running into this due to not using > "mergemaster -p" (and on the whole not removing their feet), so a reminder > was > necessary. I wonder if more people are running into it also because of more cross-building these days? I had to manually add the new user to my 8.3 system that I use to cross-build 10.0 ARM stuff. -- Ian ___ 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: r243798 - head
On Sun, Dec 2, 2012 at 2:16 PM, Garrett Cooper wrote: > On Sun, Dec 2, 2012 at 2:13 PM, Robert Watson wrote: > > ... > >> I've also added an UPDATING entry. >> >> Note that running "mergemaster -p" is a documented (and necessary) part of >> the world upgrade process. Normally I wouldn't add an UPDATING entry, and >> in general we haven't done it for new users in the past, but it seems an >> inordinate number of people are running into this due to not using >> "mergemaster -p" (and on the whole not removing their feet), so a reminder >> was necessary. > > Unfortunately I also propogated this fallacy (not needing mergemaster > -p) as well. > > I'm rerunning a build with nanobsd on my 9/stable workstation, as I > ran into problems in the last go-around with the user/group being > missing, but we'll see if I run into it again (seems like we should > have a slightly more intelligent mechanism for dealing with this issue > in the build system itself instead of mergemaster). e-yup... same error. I'll see if I can hack this because it's a bit annoying. Thanks, -Garrett ___ 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: r243779 - head/lib/libc/gen
On Dec 2, 2012, at 11:25 AM, Maxim Konovalov wrote: > Hi Marcel, > > On Sat, 1 Dec 2012, 21:26-, Marcel Moolenaar wrote: > >> Author: marcel >> Date: Sat Dec 1 21:26:46 2012 >> New Revision: 243779 >> URL: http://svnweb.freebsd.org/changeset/base/243779 >> >> Log: >> Protect against DoS attacks, such as being described in CVE-2010-2632. >> The changes were derived from what has been committed to NetBSD, with >> modifications. These are: > [..] > > Do you have any plans to MFC this code eventually? Hi Maxim, I have not planned an MFC. What will happen eventually is an entirely different story :-) FYI, -- Marcel Moolenaar mar...@xcllnt.net ___ 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: r243803 - stable/9/share/misc
Author: eadler Date: Mon Dec 3 01:02:20 2012 New Revision: 243803 URL: http://svnweb.freebsd.org/changeset/base/243803 Log: MFC r243155: Correct spelling of "lily" [0] Correct spelling of Camellia PR: misc/173655 [0] Approved by: cperciva (implicit) Modified: stable/9/share/misc/flowers (contents, props changed) Directory Properties: stable/9/share/misc/ (props changed) Modified: stable/9/share/misc/flowers == --- stable/9/share/misc/flowers Sun Dec 2 22:21:40 2012(r243802) +++ stable/9/share/misc/flowers Mon Dec 3 01:02:20 2012(r243803) @@ -6,7 +6,7 @@ African violet:Such worth is rare. Apple blossom:Preference. Bachelor's button:Celibacy. Bay leaf:I change but in death. -Camelia:Reflected loveliness. +Camellia:Reflected loveliness. Chrysanthemum, other color:Slighted love. Chrysanthemum, red:I love. Chrysanthemum, white:Truth. @@ -21,8 +21,8 @@ Ivy:Friendship, fidelity, marriage. Jasmine:Amiability, transports of joy, sensuality. Leaves (dead):Melancholy. Lilac:Youthful innocence. -Lilly of the valley:Return of happiness. -Lilly:Purity, sweetness. +Lily of the valley:Return of happiness. +Lily:Purity, sweetness. Magnolia:Dignity, perseverance. Marigold:Jealousy. Mint:Virtue. ___ 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: r243804 - stable/8/share/misc
Author: eadler Date: Mon Dec 3 01:02:29 2012 New Revision: 243804 URL: http://svnweb.freebsd.org/changeset/base/243804 Log: MFC r243155: Correct spelling of "lily" [0] Correct spelling of Camellia PR: misc/173655 [0] Approved by: cperciva (implicit) Modified: stable/8/share/misc/flowers (contents, props changed) Directory Properties: stable/8/share/misc/ (props changed) Modified: stable/8/share/misc/flowers == --- stable/8/share/misc/flowers Mon Dec 3 01:02:20 2012(r243803) +++ stable/8/share/misc/flowers Mon Dec 3 01:02:29 2012(r243804) @@ -6,7 +6,7 @@ African violet:Such worth is rare. Apple blossom:Preference. Bachelor's button:Celibacy. Bay leaf:I change but in death. -Camelia:Reflected loveliness. +Camellia:Reflected loveliness. Chrysanthemum, other color:Slighted love. Chrysanthemum, red:I love. Chrysanthemum, white:Truth. @@ -21,8 +21,8 @@ Ivy:Friendship, fidelity, marriage. Jasmine:Amiability, transports of joy, sensuality. Leaves (dead):Melancholy. Lilac:Youthful innocence. -Lilly of the valley:Return of happiness. -Lilly:Purity, sweetness. +Lily of the valley:Return of happiness. +Lily:Purity, sweetness. Magnolia:Dignity, perseverance. Marigold:Jealousy. Mint:Virtue. ___ 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: r243805 - stable/7/share/misc
Author: eadler Date: Mon Dec 3 01:02:45 2012 New Revision: 243805 URL: http://svnweb.freebsd.org/changeset/base/243805 Log: MFC r243155: Correct spelling of "lily" [0] Correct spelling of Camellia PR: misc/173655 [0] Approved by: cperciva (implicit) Modified: stable/7/share/misc/flowers (contents, props changed) Directory Properties: stable/7/share/misc/ (props changed) Modified: stable/7/share/misc/flowers == --- stable/7/share/misc/flowers Mon Dec 3 01:02:29 2012(r243804) +++ stable/7/share/misc/flowers Mon Dec 3 01:02:45 2012(r243805) @@ -6,7 +6,7 @@ African violet:Such worth is rare. Apple blossom:Preference. Bachelor's button:Celibacy. Bay leaf:I change but in death. -Camelia:Reflected loveliness. +Camellia:Reflected loveliness. Chrysanthemum, other color:Slighted love. Chrysanthemum, red:I love. Chrysanthemum, white:Truth. @@ -21,8 +21,8 @@ Ivy:Friendship, fidelity, marriage. Jasmine:Amiability, transports of joy, sensuality. Leaves (dead):Melancholy. Lilac:Youthful innocence. -Lilly of the valley:Return of happiness. -Lilly:Purity, sweetness. +Lily of the valley:Return of happiness. +Lily:Purity, sweetness. Magnolia:Dignity, perseverance. Marigold:Jealousy. Mint:Virtue. ___ 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: r243807 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: delphij Date: Mon Dec 3 04:25:37 2012 New Revision: 243807 URL: http://svnweb.freebsd.org/changeset/base/243807 Log: Use SA_ZPL_CRTIME instead of SA_ZPL_CTIME for creation time. Submitted by: phil.stone at gmx.com MFC after:2 weeks Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Dec 3 01:05:36 2012(r243806) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Mon Dec 3 04:25:37 2012(r243807) @@ -2679,7 +2679,7 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, i SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL, &mtime, 16); SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL, &ctime, 16); - SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL, &crtime, 16); + SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CRTIME(zfsvfs), NULL, &crtime, 16); if (vp->v_type == VBLK || vp->v_type == VCHR) SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_RDEV(zfsvfs), NULL, &rdev, 8); ___ 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: r243807 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
On Sun, Dec 2, 2012 at 8:25 PM, Xin LI wrote: > Author: delphij > Date: Mon Dec 3 04:25:37 2012 > New Revision: 243807 > URL: http://svnweb.freebsd.org/changeset/base/243807 > > Log: > Use SA_ZPL_CRTIME instead of SA_ZPL_CTIME for creation time. > > Submitted by: phil.stone at gmx.com > MFC after:2 weeks Could you please also take/close kern/174067? Thanks! -Garrett ___ 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: r243808 - release/9.1.0
Author: kensmith Date: Mon Dec 3 05:03:33 2012 New Revision: 243808 URL: http://svnweb.freebsd.org/changeset/base/243808 Log: Copy releng/9.1 to release/9.1.0 as part of 9.1-RELEASE. Approved by: re (implicit) Added: - copied from r243807, releng/9.1/ Directory Properties: release/9.1.0/ (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"
