svn commit: r270165 - head/sys/dev/usb
Author: kevlo Date: Tue Aug 19 09:02:58 2014 New Revision: 270165 URL: http://svnweb.freebsd.org/changeset/base/270165 Log: Sort ASUS section and add USB device ID of ASUS USB-AC51. Modified: head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsTue Aug 19 06:50:54 2014(r270164) +++ head/sys/dev/usb/usbdevsTue Aug 19 09:02:58 2014(r270165) @@ -1173,6 +1173,7 @@ product ASIX AX88772B_1 0x7e2b AX88772B /* ASUS products */ product ASUS2 USBN11 0x0b05 USB-N11 +product ASUS RT25700x1706 RT2500USB Wireless Adapter product ASUS WL167G0x1707 WL-167g Wireless Adapter product ASUS WL159G0x170c WL-159g product ASUS A9T_WIFI 0x171b A9T wireless @@ -1186,17 +1187,17 @@ product ASUS RT2870_3 0x1742 RT2870 product ASUS RT2870_4 0x1760 RT2870 product ASUS RT2870_5 0x1761 RT2870 productASUS USBN13 0x1784 USB-N13 -productASUS RT3070_1 0x1790 RT3070 product ASUS USBN100x1786 USB-N10 +product ASUS RT3070_1 0x1790 RT3070 +product ASUS RTL8192SU 0x1791 RTL8192SU +product ASUS USB_N53 0x179d ASUS Black Diamond Dual Band USB-N53 product ASUS RTL8192CU 0x17ab RTL8192CU product ASUS USBN660x17ad USB-N66 product ASUS USBN10NANO0x17ba USB-N10 Nano -product ASUS RTL8192SU 0x1791 RTL8192SU +product ASUS AC51 0x17d1 USB-AC51 product ASUS A730W 0x4202 ASUS MyPal A730W product ASUS P535 0x420f ASUS P535 PDA -productASUS GMSC 0x422f ASUS Generic Mass Storage -product ASUS RT25700x1706 RT2500USB Wireless Adapter -product ASUS USB_N53 0x179d ASUS Black Diamond Dual Band USB-N53 +product ASUS GMSC 0x422f ASUS Generic Mass Storage /* ATen products */ product ATEN UC12840x2001 Parallel printer ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270168 - in head: . bin/rmail gnu/usr.bin/binutils/addr2line gnu/usr.bin/binutils/nm gnu/usr.bin/binutils/objcopy gnu/usr.bin/binutils/objdump gnu/usr.bin/binutils/readelf gnu/usr.bin/...
Author: bdrewery Date: Tue Aug 19 15:04:32 2014 New Revision: 270168 URL: http://svnweb.freebsd.org/changeset/base/270168 Log: Revert r267233 for now. PIE support needs to be reworked. 1. 50+% of NO_PIE use is fixed by adding -fPIC to INTERNALLIB and other build-only utility libraries. 2. Another 40% is fixed by generating _pic.a variants of various libraries. 3. Some of the NO_PIE use is a bit absurd as it is disabling PIE (and ASLR) where it never would work anyhow, such as csu or loader. This suggests there may be better ways of adding support to the tree. Many of these cases can be fixed such that -fPIE will work but there is really no reason to have it in those cases. 4. Some of the uses are working around hacks done to some Makefiles that are really building libraries but have been using bsd.prog.mk because the code is cleaner. Had they been using bsd.lib.mk then NO_PIE would not have been needed. We likely do want to enable PIE by default (opt-out) for non-tree consumers (such as ports). For in-tree though we probably want to only enable PIE (opt-in) for common attack targets such as remote service daemons and setuid utilities. This is also a great performance compromise since ASLR is expected to reduce performance. As such it does not make sense to enable it in all utilities such as ls(1) that have little benefit to having it enabled. Reported by: kib Deleted: head/tools/build/options/WITH_PIE Modified: head/Makefile.inc1 head/bin/rmail/Makefile head/gnu/usr.bin/binutils/addr2line/Makefile head/gnu/usr.bin/binutils/nm/Makefile head/gnu/usr.bin/binutils/objcopy/Makefile head/gnu/usr.bin/binutils/objdump/Makefile head/gnu/usr.bin/binutils/readelf/Makefile head/gnu/usr.bin/binutils/size/Makefile head/gnu/usr.bin/binutils/strings/Makefile head/gnu/usr.bin/binutils/strip/Makefile head/gnu/usr.bin/gdb/gdb/Makefile head/gnu/usr.bin/gdb/gdbtui/Makefile head/gnu/usr.bin/gdb/kgdb/Makefile head/gnu/usr.bin/groff/src/devices/grodvi/Makefile head/gnu/usr.bin/groff/src/devices/grohtml/Makefile head/gnu/usr.bin/groff/src/devices/grolbp/Makefile head/gnu/usr.bin/groff/src/devices/grolj4/Makefile head/gnu/usr.bin/groff/src/devices/grops/Makefile head/gnu/usr.bin/groff/src/devices/grotty/Makefile head/gnu/usr.bin/groff/src/preproc/eqn/Makefile head/gnu/usr.bin/groff/src/preproc/grn/Makefile head/gnu/usr.bin/groff/src/preproc/html/Makefile head/gnu/usr.bin/groff/src/preproc/pic/Makefile head/gnu/usr.bin/groff/src/preproc/refer/Makefile head/gnu/usr.bin/groff/src/preproc/soelim/Makefile head/gnu/usr.bin/groff/src/preproc/tbl/Makefile head/gnu/usr.bin/groff/src/roff/groff/Makefile head/gnu/usr.bin/groff/src/roff/troff/Makefile head/gnu/usr.bin/groff/src/utils/addftinfo/Makefile head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile head/gnu/usr.bin/groff/src/utils/indxbib/Makefile head/gnu/usr.bin/groff/src/utils/lkbib/Makefile head/gnu/usr.bin/groff/src/utils/lookbib/Makefile head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile head/gnu/usr.bin/rcs/Makefile.inc head/gnu/usr.bin/texinfo/info/Makefile head/gnu/usr.bin/texinfo/infokey/Makefile head/gnu/usr.bin/texinfo/install-info/Makefile head/gnu/usr.bin/texinfo/makeinfo/Makefile head/gnu/usr.bin/texinfo/texindex/Makefile head/kerberos5/libexec/digest-service/Makefile head/kerberos5/libexec/hprop/Makefile head/kerberos5/libexec/hpropd/Makefile head/kerberos5/libexec/ipropd-master/Makefile head/kerberos5/libexec/ipropd-slave/Makefile head/kerberos5/libexec/kadmind/Makefile head/kerberos5/libexec/kcm/Makefile head/kerberos5/libexec/kdc/Makefile head/kerberos5/libexec/kdigest/Makefile head/kerberos5/libexec/kfd/Makefile head/kerberos5/libexec/kimpersonate/Makefile head/kerberos5/libexec/kpasswdd/Makefile head/kerberos5/tools/asn1_compile/Makefile head/kerberos5/tools/slc/Makefile head/kerberos5/usr.bin/hxtool/Makefile head/kerberos5/usr.bin/kadmin/Makefile head/kerberos5/usr.bin/kcc/Makefile head/kerberos5/usr.bin/kdestroy/Makefile head/kerberos5/usr.bin/kf/Makefile head/kerberos5/usr.bin/kgetcred/Makefile head/kerberos5/usr.bin/kinit/Makefile head/kerberos5/usr.bin/kpasswd/Makefile head/kerberos5/usr.bin/ksu/Makefile head/kerberos5/usr.bin/string2key/Makefile head/kerberos5/usr.bin/verify_krb5_conf/Makefile head/kerberos5/usr.sbin/iprop-log/Makefile head/kerberos5/usr.sbin/kstash/Makefile head/kerberos5/usr.sbin/ktutil/Makefile head/lib/csu/amd64/Makefile head/lib/csu/i386-elf/Makefile head/libexec/mail.local/Makefile head/libexec/rtld-elf/Makefile head/libexec/smrsh/Makefile head/libexec/telnetd/Makefile head/sbin/fsck/Makefile head/sbin/ipf/ipf/Makefile head/sbin/ipf/ipfstat/Makefile head/sbin/ipf/ipftest/Makefile head/sbin/ipf/ipmon/Makefile head/sbin/ipf/ipnat/Makefile head/sbin/ipf/ippool/Makefile head/sbin/ipf/ipresend/Makefile hea
svn commit: r270169 - head/share/man/man5
Author: bdrewery Date: Tue Aug 19 15:09:24 2014 New Revision: 270169 URL: http://svnweb.freebsd.org/changeset/base/270169 Log: Regen after r270168 Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Tue Aug 19 15:04:32 2014 (r270168) +++ head/share/man/man5/src.conf.5 Tue Aug 19 15:09:24 2014 (r270169) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd July 16, 2014 +.Dd August 19, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -885,9 +885,6 @@ When set, it also enforces the following .It .Va WITHOUT_AUTHPF .El -.It Va WITH_PIE -.\" from FreeBSD: head/tools/build/options/WITH_PIE 267233 2014-06-08 17:29:31Z bdrewery -Enable building of Position-Independent Executables (PIEs). .It Va WITHOUT_PKGBOOTSTRAP .\" from FreeBSD: head/tools/build/options/WITHOUT_PKGBOOTSTRAP 258924 2013-12-04 15:58:42Z bdrewery Set to not build ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r267440 - in head: lib share/mk sys/modules sys/sys
On 6/13/2014 3:53 AM, Hans Petter Selasky wrote:
> Author: hselasky
> Date: Fri Jun 13 08:53:49 2014
> New Revision: 267440
> URL: http://svnweb.freebsd.org/changeset/base/267440
>
> Log:
> Attach the CUSE library and kernel module to the default FreeBSD
> builds. Bump the FreeBSD version number.
>
> Modified:
> head/lib/Makefile
> head/share/mk/src.opts.mk
> head/sys/modules/Makefile
> head/sys/sys/param.h
>
> Modified: head/lib/Makefile
> ==
> --- head/lib/Makefile Fri Jun 13 08:44:03 2014(r267439)
> +++ head/lib/Makefile Fri Jun 13 08:53:49 2014(r267440)
> @@ -136,6 +136,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
> libz \
> ${_atf} \
> ${_clang} \
> + ${_cuse} \
> ${_tests}
>
> .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
> @@ -172,6 +173,10 @@ _libcasper= libcasper
> _clang= clang
> .endif
>
> +.if ${MK_CUSE} != "no"
> +_cuse= libcuse
> +.endif
> +
> .if ${MK_GPIB} != "no"
> _libgpib=libgpib
> .endif
>
> Modified: head/share/mk/src.opts.mk
> ==
> --- head/share/mk/src.opts.mk Fri Jun 13 08:44:03 2014(r267439)
> +++ head/share/mk/src.opts.mk Fri Jun 13 08:53:49 2014(r267440)
> @@ -68,6 +68,7 @@ __DEFAULT_YES_OPTIONS = \
> CROSS_COMPILER \
> CRYPT \
> CTM \
> +CUSE \
You forgot to define a tools/build/options/WITHOUT_CUSE so it is added
to src.conf(5).
~/svn/base/tools/build/options # ./makeman >
../../../share/man/man5/src.conf.5
no description found for WITHOUT_CUSE, skipping
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
Re: svn commit: r270168 - in head: . bin/rmail gnu/usr.bin/binutils/addr2line gnu/usr.bin/binutils/nm gnu/usr.bin/binutils/objcopy gnu/usr.bin/binutils/objdump gnu/usr.bin/binutils/readelf gnu/usr.bin
On Tue, Aug 19, 2014 at 03:04:33PM +, Bryan Drewery wrote: > Author: bdrewery > Date: Tue Aug 19 15:04:32 2014 > New Revision: 270168 > URL: http://svnweb.freebsd.org/changeset/base/270168 > > Log: > Revert r267233 for now. PIE support needs to be reworked. Thank you. pgppwTRsEfb7m.pgp Description: PGP signature
svn commit: r270170 - head/lib/csu/i386-elf
Author: bdrewery
Date: Tue Aug 19 15:30:56 2014
New Revision: 270170
URL: http://svnweb.freebsd.org/changeset/base/270170
Log:
Use bsd.lib.mk here as all other csu Makefiles do.
This effectively reverts r124752.
There's no reason this should be different. It resulted in needing NO_PIE in
the original opt-out NO_PIE commit as this was not using the proper framework.
Reported by: peter
Modified:
head/lib/csu/i386-elf/Makefile
Modified: head/lib/csu/i386-elf/Makefile
==
--- head/lib/csu/i386-elf/Makefile Tue Aug 19 15:09:24 2014
(r270169)
+++ head/lib/csu/i386-elf/Makefile Tue Aug 19 15:30:56 2014
(r270170)
@@ -3,14 +3,14 @@
.PATH: ${.CURDIR}/../common
SRCS= crti.S crtn.S
-FILES= ${SRCS:N*.h:R:S/$/.o/g} gcrt1.o crt1.o Scrt1.o
-FILESOWN= ${LIBOWN}
-FILESGRP= ${LIBGRP}
-FILESMODE= ${LIBMODE}
-FILESDIR= ${LIBDIR}
+OBJS= ${SRCS:N*.h:R:S/$/.o/g}
+OBJS+= gcrt1.o crt1.o Scrt1.o
CFLAGS+= -I${.CURDIR}/../common \
-I${.CURDIR}/../../libc/include
-CLEANFILES=${FILES} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
+
+all: ${OBJS}
+
+CLEANFILES=${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s
# See the comment in lib/csu/common/crtbrand.c for the reason crt1_c.c is not
@@ -48,4 +48,8 @@ Scrt1.o: Scrt1_c.o crt1_s.o
${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
objcopy --localize-symbol _start1 Scrt1.o
-.include
+realinstall:
+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${OBJS} ${DESTDIR}${LIBDIR}
+
+.include
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270171 - head/tools/build/options
Author: hselasky Date: Tue Aug 19 15:40:26 2014 New Revision: 270171 URL: http://svnweb.freebsd.org/changeset/base/270171 Log: Add missing WITHOUT_CUSE file. Added: head/tools/build/options/WITHOUT_CUSE (contents, props changed) Added: head/tools/build/options/WITHOUT_CUSE == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_CUSE Tue Aug 19 15:40:26 2014 (r270171) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build CUSE-related programs and libraries. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r267440 - in head: lib share/mk sys/modules sys/sys
Hi, You forgot to define a tools/build/options/WITHOUT_CUSE so it is added to src.conf(5). ~/svn/base/tools/build/options # ./makeman > ../../../share/man/man5/src.conf.5 no description found for WITHOUT_CUSE, skipping See: http://svnweb.freebsd.org/changeset/base/270171 Thank you! --HPS ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r267440 - in head: lib share/mk sys/modules sys/sys
On 8/19/2014 10:41 AM, Hans Petter Selasky wrote: > Hi, > >> You forgot to define a tools/build/options/WITHOUT_CUSE so it is added >> to src.conf(5). >> >> ~/svn/base/tools/build/options # ./makeman > >> ../../../share/man/man5/src.conf.5 >> no description found for WITHOUT_CUSE, skipping >> >> > > See: > > http://svnweb.freebsd.org/changeset/base/270171 > > Thank you! > > --HPS Thanks, I rengerated src.conf.5 for you. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
svn commit: r270172 - head/share/man/man5
Author: bdrewery Date: Tue Aug 19 15:46:40 2014 New Revision: 270172 URL: http://svnweb.freebsd.org/changeset/base/270172 Log: Regen after r270171 Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Tue Aug 19 15:40:26 2014 (r270171) +++ head/share/man/man5/src.conf.5 Tue Aug 19 15:46:40 2014 (r270172) @@ -327,6 +327,9 @@ similar to DWARF and the venerable stabs Set to not build .Xr ctm 1 and related utilities. +.It Va WITHOUT_CUSE +.\" from FreeBSD: head/tools/build/options/WITHOUT_CUSE 270171 2014-08-19 15:40:26Z hselasky +Set to not build CUSE-related programs and libraries. .It Va WITHOUT_CXX .\" from FreeBSD: head/tools/build/options/WITHOUT_CXX 220402 2011-04-06 20:19:07Z uqs Set to not build ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270173 - head/sys/sys
Author: bdrewery Date: Tue Aug 19 15:47:51 2014 New Revision: 270173 URL: http://svnweb.freebsd.org/changeset/base/270173 Log: Bump __FreeBSD_version after r269489 so ports can use it. Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hTue Aug 19 15:46:40 2014(r270172) +++ head/sys/sys/param.hTue Aug 19 15:47:51 2014(r270173) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100028 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100029 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270176 - head/sys/cam/ctl
Author: mav
Date: Tue Aug 19 17:04:18 2014
New Revision: 270176
URL: http://svnweb.freebsd.org/changeset/base/270176
Log:
Fix lock recursion on LUN shutdown, introduced on r269497.
MFC after:3 days
Modified:
head/sys/cam/ctl/ctl_tpc.c
Modified: head/sys/cam/ctl/ctl_tpc.c
==
--- head/sys/cam/ctl/ctl_tpc.c Tue Aug 19 15:51:43 2014(r270175)
+++ head/sys/cam/ctl/ctl_tpc.c Tue Aug 19 17:04:18 2014(r270176)
@@ -228,7 +228,7 @@ ctl_tpc_lun_shutdown(struct ctl_lun *lun
}
/* Free ROD tokens for this LUN. */
- mtx_lock(&control_softc->ctl_lock);
+ mtx_assert(&control_softc->ctl_lock, MA_OWNED);
TAILQ_FOREACH_SAFE(token, &control_softc->tpc_tokens, links, ttoken) {
if (token->lun != lun->lun || token->active)
continue;
@@ -236,7 +236,6 @@ ctl_tpc_lun_shutdown(struct ctl_lun *lun
free(token->params, M_CTL);
free(token, M_CTL);
}
- mtx_unlock(&control_softc->ctl_lock);
}
int
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270178 - head/secure/usr.bin/ssh
Author: ngie
Date: Tue Aug 19 18:27:43 2014
New Revision: 270178
URL: http://svnweb.freebsd.org/changeset/base/270178
Log:
Fix typo (LIBLDNSADD -> LIBLDNS) to fix "make checkdpadd"
X-MFC with: r269648
Phabric: D634
Approved by: jmmv (mentor)
Modified:
head/secure/usr.bin/ssh/Makefile
Modified: head/secure/usr.bin/ssh/Makefile
==
--- head/secure/usr.bin/ssh/MakefileTue Aug 19 17:54:15 2014
(r270177)
+++ head/secure/usr.bin/ssh/MakefileTue Aug 19 18:27:43 2014
(r270178)
@@ -22,7 +22,7 @@ USEPRIVATELIB= ssh
.if ${MK_LDNS} != "no"
CFLAGS+= -DHAVE_LDNS=1
DPADD+=${LIBLDNS}
-LDADD+=${LIBLDNSADD}
+LDADD+=${LDLDNS}
USEPRIVATELIB+= ldns
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270179 - head/usr.sbin/ctld
Author: ngie
Date: Tue Aug 19 18:31:20 2014
New Revision: 270179
URL: http://svnweb.freebsd.org/changeset/base/270179
Log:
Add missing libraries to DPADD; sort DPADD so DPADD and LDADD match up
This fixes "make checkdpadd"
Approved by: jmmv (mentor)
MFC after: 2 weeks
Phabric: D630
PR: 192765
Modified:
head/usr.sbin/ctld/Makefile
Modified: head/usr.sbin/ctld/Makefile
==
--- head/usr.sbin/ctld/Makefile Tue Aug 19 18:27:43 2014(r270178)
+++ head/usr.sbin/ctld/Makefile Tue Aug 19 18:31:20 2014(r270179)
@@ -9,8 +9,8 @@ CFLAGS+=-I${.CURDIR}/../../sys/dev/iscs
#CFLAGS+= -DICL_KERNEL_PROXY
MAN= ctld.8 ctl.conf.5
-DPADD= ${LIBCAM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
-LDADD= -lbsdxml -lcam -lcrypto -lfl -lsbuf -lssl -lutil
+DPADD= ${LIBBSDXML} ${LIBCAM} ${LIBCRYPTO} ${LIBL} ${LIBSBUF}
${LIBSSL} ${LIBUTIL}
+LDADD= -lbsdxml -lcam -lcrypto -ll -lsbuf -lssl -lutil
YFLAGS+= -v
CLEANFILES=y.tab.c y.tab.h y.output
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270180 - head/usr.sbin/nmtree
Author: ngie
Date: Tue Aug 19 18:47:47 2014
New Revision: 270180
URL: http://svnweb.freebsd.org/changeset/base/270180
Log:
Add LIBMD and LIBUTIL to DPADD to fix "make checkdpadd"
Approved by: jmmv (mentor)
MFC after: 5 days
Phabric: D633
PR: 192763
Modified:
head/usr.sbin/nmtree/Makefile
Modified: head/usr.sbin/nmtree/Makefile
==
--- head/usr.sbin/nmtree/Makefile Tue Aug 19 18:31:20 2014
(r270179)
+++ head/usr.sbin/nmtree/Makefile Tue Aug 19 18:47:47 2014
(r270180)
@@ -8,6 +8,7 @@ PROG= mtree
MAN= mtree.5 mtree.8
SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
only.c spec.c specspec.c verify.c
+DPADD+=${LIBMD} ${LIBUTIL}
LDADD+=-lmd -lutil
CFLAGS+= -I${.CURDIR}/../../contrib/mknod
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r269729 - in head/usr.bin/sed: . tests
On 11.08.2014 22:29, Jeremie Le Hen wrote: >> sed(1): Don't force a newline on last line, if input stream doesn't have >> one > > Any plan to MFC this? Sorry Jérémie, I missed your mail... I'm not sure what to think because the out-of-the-box behavior differs from previous version. This could break some scripts and it would be quite difficult to debug. Of course, the problem will come with 11.0-RELEASE. I'd personnaly love to have that in stable/10, but that may not be the case for anyone :) Do you need this in a particular branch? -- Jean-Sébastien Pédron signature.asc Description: OpenPGP digital signature
Re: svn commit: r270117 - head/sbin/hastd
On Mon, Aug 18, 2014 at 12:50:09AM +, Garrett Cooper wrote:
Hi Garrett,
> Log:
> Add -ll to LDADD to fix "make checkdpadd"
> Modified: head/sbin/hastd/Makefile
> ==
> --- head/sbin/hastd/Makefile Sun Aug 17 23:30:45 2014(r270116)
> +++ head/sbin/hastd/Makefile Mon Aug 18 00:50:09 2014(r270117)
> @@ -31,7 +31,7 @@ CFLAGS+=-DINET6
> .endif
>
> DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBL} ${LIBPTHREAD}
> ${LIBUTIL}
> -LDADD= -lgeom -lbsdxml -lsbuf -lpthread -lutil
> +LDADD= -lgeom -lbsdxml -lsbuf -ll -lpthread -lutil
I think the proper fix is to remove ${LIBL} from DPADD instead. In
r250503 the intention was to remove libl dependency. It looks like I
forgot to update DPADD then.
--
Mikolaj Golub
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270181 - head/share/misc
Author: bdrewery Date: Tue Aug 19 20:35:09 2014 New Revision: 270181 URL: http://svnweb.freebsd.org/changeset/base/270181 Log: Add recent DragonFly releases. Submitted by: Zach Crownover MFC after:1 week Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree == --- head/share/misc/bsd-family-tree Tue Aug 19 18:47:47 2014 (r270180) +++ head/share/misc/bsd-family-tree Tue Aug 19 20:35:09 2014 (r270181) @@ -303,9 +303,18 @@ FreeBSD 5.2 | | | | | |NetBSD 6.1.4 | | | | | | | | | | | |OpenBSD 5.5 | + | | | | | | | | | | | DragonFly 3.8.0 + | | | | | | + | | | | | | + | | | | | DragonFly 3.8.1 + | | | | | | + | | | | | | + | | | | | DragonFly 3.6.3 + | | | | | | | FreeBSD | | | | |9.3 | | | | + || | | DragonFly 3.8.2 || | | | || | | | || | | | @@ -640,7 +649,10 @@ NetBSD 6.0.5 2014-04-19 [NDB] NetBSD 6.1.4 2014-04-19 [NDB] OpenBSD 5.52014-05-01 [OBD] DragonFly 3.8.02014-06-04 [DFB] +DragonFly 3.8.12014-06-16 [DFB] +DragonFly 3.6.32014-06-17 [DFB] FreeBSD 9.32014-07-05 [FBD] +DragonFly 3.8.22014-08-08 [DFB] Bibliography ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270183 - head/usr.sbin/mountd
Author: bdrewery
Date: Tue Aug 19 21:04:31 2014
New Revision: 270183
URL: http://svnweb.freebsd.org/changeset/base/270183
Log:
Avoid showing stale errors when nmount(2) fails.
Sometimes nmount(2) will fail without setting errmsg. The previous (ignored)
error would then be shown as the reason for the failed call if the next
nmount(2) also fails without [ENOENT,ENOTSUP].
An example is when there is a tmpfs mounted with -o size. vfs_filteropt() adds
'size' as an error in errmsg due to 'size' not being in tmpfs_updateopts. Then
tmpfs_mount returns [ENOTSUP] from nmount(2), which is then ignored. The next
call may race with an unmount causing an invalid [EINVAL] that then does log
an
error, with the tmpfs errmsg.
The race itself is a separate issue to fix as it is expected to have an
[ENOENT] returned instead.
In this example the mount being shown is actually nullfs, not tmpfs that the
error is from.
mountd[740]: can't delete exports for
/poudriere/data/.m/exp-head-commit-test-devel/04/.npkg: Invalid argument mount
option is unknown
It should only show:
mountd[740]: can't delete exports for
/poudriere/data/.m/exp-head-commit-test-devel/04/.npkg: Invalid argument
MFC after:2 weeks
Modified:
head/usr.sbin/mountd/mountd.c
Modified: head/usr.sbin/mountd/mountd.c
==
--- head/usr.sbin/mountd/mountd.c Tue Aug 19 20:53:28 2014
(r270182)
+++ head/usr.sbin/mountd/mountd.c Tue Aug 19 21:04:31 2014
(r270183)
@@ -1744,6 +1744,7 @@ get_exportlist(void)
iov[3].iov_len = strlen(fsp->f_mntonname) + 1;
iov[5].iov_base = fsp->f_mntfromname;
iov[5].iov_len = strlen(fsp->f_mntfromname) + 1;
+ errmsg[0] = '\0';
if (nmount(iov, iovlen, fsp->f_flags) < 0 &&
errno != ENOENT && errno != ENOTSUP) {
@@ -2501,6 +2502,7 @@ do_mount(struct exportlist *ep, struct g
iov[3].iov_len = strlen(fsb->f_mntonname) + 1;
iov[5].iov_base = fsb->f_mntfromname; /* "from" */
iov[5].iov_len = strlen(fsb->f_mntfromname) + 1;
+ errmsg[0] = '\0';
while (nmount(iov, iovlen, fsb->f_flags) < 0) {
if (cp)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r270183 - head/usr.sbin/mountd
On Tue, Aug 19, 2014 at 2:04 PM, Bryan Drewery wrote: > Author: bdrewery > Date: Tue Aug 19 21:04:31 2014 > New Revision: 270183 > URL: http://svnweb.freebsd.org/changeset/base/270183 > > Log: > Avoid showing stale errors when nmount(2) fails. > > Sometimes nmount(2) will fail without setting errmsg. The previous (ignored) > error would then be shown as the reason for the failed call if the next > nmount(2) also fails without [ENOENT,ENOTSUP]. > > An example is when there is a tmpfs mounted with -o size. vfs_filteropt() > adds > 'size' as an error in errmsg due to 'size' not being in tmpfs_updateopts. > Then > tmpfs_mount returns [ENOTSUP] from nmount(2), which is then ignored. The > next > call may race with an unmount causing an invalid [EINVAL] that then does > log an > error, with the tmpfs errmsg. > > The race itself is a separate issue to fix as it is expected to have an > [ENOENT] returned instead. > > In this example the mount being shown is actually nullfs, not tmpfs that the > error is from. > > mountd[740]: can't delete exports for > /poudriere/data/.m/exp-head-commit-test-devel/04/.npkg: Invalid argument > mount option is unknown > > It should only show: > > mountd[740]: can't delete exports for > /poudriere/data/.m/exp-head-commit-test-devel/04/.npkg: Invalid argument > > MFC after:2 weeks Hmm -- I wonder if this is related to https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191218 ... Guess I get to retest that bug after this commit :)! ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r270183 - head/usr.sbin/mountd
On 8/19/2014 4:04 PM, Bryan Drewery wrote:
> Author: bdrewery
> Date: Tue Aug 19 21:04:31 2014
> New Revision: 270183
> URL: http://svnweb.freebsd.org/changeset/base/270183
>
> Log:
> Avoid showing stale errors when nmount(2) fails.
>
> Sometimes nmount(2) will fail without setting errmsg. The previous (ignored)
> error would then be shown as the reason for the failed call if the next
> nmount(2) also fails without [ENOENT,ENOTSUP].
>
> An example is when there is a tmpfs mounted with -o size. vfs_filteropt()
> adds
> 'size' as an error in errmsg due to 'size' not being in tmpfs_updateopts.
> Then
> tmpfs_mount returns [ENOTSUP] from nmount(2), which is then ignored. The
> next
> call may race with an unmount causing an invalid [EINVAL] that then does
> log an
> error, with the tmpfs errmsg.
>
> The race itself is a separate issue to fix as it is expected to have an
> [ENOENT] returned instead.
The actual race causing the EINVAL is here with a proposed patch:
http://lists.freebsd.org/pipermail/freebsd-fs/2013-August/018008.html
I have not spent time analyzing/testing it yet.
>
> In this example the mount being shown is actually nullfs, not tmpfs that the
> error is from.
>
> mountd[740]: can't delete exports for
> /poudriere/data/.m/exp-head-commit-test-devel/04/.npkg: Invalid argument
> mount option is unknown
>
> It should only show:
>
> mountd[740]: can't delete exports for
> /poudriere/data/.m/exp-head-commit-test-devel/04/.npkg: Invalid argument
>
> MFC after: 2 weeks
>
> Modified:
> head/usr.sbin/mountd/mountd.c
>
> Modified: head/usr.sbin/mountd/mountd.c
> ==
> --- head/usr.sbin/mountd/mountd.c Tue Aug 19 20:53:28 2014
> (r270182)
> +++ head/usr.sbin/mountd/mountd.c Tue Aug 19 21:04:31 2014
> (r270183)
> @@ -1744,6 +1744,7 @@ get_exportlist(void)
> iov[3].iov_len = strlen(fsp->f_mntonname) + 1;
> iov[5].iov_base = fsp->f_mntfromname;
> iov[5].iov_len = strlen(fsp->f_mntfromname) + 1;
> + errmsg[0] = '\0';
>
> if (nmount(iov, iovlen, fsp->f_flags) < 0 &&
> errno != ENOENT && errno != ENOTSUP) {
> @@ -2501,6 +2502,7 @@ do_mount(struct exportlist *ep, struct g
> iov[3].iov_len = strlen(fsb->f_mntonname) + 1;
> iov[5].iov_base = fsb->f_mntfromname; /* "from" */
> iov[5].iov_len = strlen(fsb->f_mntfromname) + 1;
> + errmsg[0] = '\0';
>
> while (nmount(iov, iovlen, fsb->f_flags) < 0) {
> if (cp)
>
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
svn commit: r270189 - head/rescue/rescue
Author: delphij
Date: Wed Aug 20 00:14:41 2014
New Revision: 270189
URL: http://svnweb.freebsd.org/changeset/base/270189
Log:
Add zdb into rescue environment.
On amd64, this would increase the binary size by 1.1MiB and
make it possible to examine zpool status offline, useful for
recovery and diagnostic purposes.
Submitted by: sef
Obtained from:FreeNAS
MFC after:2 weeks
Modified:
head/rescue/rescue/Makefile
Modified: head/rescue/rescue/Makefile
==
--- head/rescue/rescue/Makefile Wed Aug 20 00:06:54 2014(r270188)
+++ head/rescue/rescue/Makefile Wed Aug 20 00:14:41 2014(r270189)
@@ -113,6 +113,7 @@ CRUNCH_PROGS_sbin+= ipf
.if ${MK_ZFS} != "no"
CRUNCH_PROGS_sbin+= zfs
CRUNCH_PROGS_sbin+= zpool
+CRUNCH_PROGS_usr.sbin+= zdb
.endif
# crunchgen does not like C++ programs; this should be fixed someday
@@ -120,7 +121,7 @@ CRUNCH_PROGS_sbin+= zpool
CRUNCH_LIBS+= -lalias -lcam -lncursesw -ldevstat -lipsec
.if ${MK_ZFS} != "no"
-CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
+CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
.endif
CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
.if ${MK_OPENSSL} == "no"
@@ -158,6 +159,7 @@ CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin
.if ${MK_ZFS} != "no"
CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs
CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool
+CRUNCH_SRCDIR_zdb= ${.CURDIR}/../../cddl/usr.sbin/zdb
.endif
CRUNCH_ALIAS_reboot= fastboot halt fasthalt
CRUNCH_ALIAS_restore= rrestore
@@ -208,7 +210,7 @@ CRUNCH_ALIAS_id= groups whoami
#
CRUNCH_SRCDIRS+= usr.sbin
-CRUNCH_PROGS_usr.sbin= chroot
+CRUNCH_PROGS_usr.sbin+= chroot
CRUNCH_PROGS_usr.sbin+= chown
CRUNCH_ALIAS_chown= chgrp
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270190 - head/tools/build/make_check
Author: ian Date: Wed Aug 20 00:33:37 2014 New Revision: 270190 URL: http://svnweb.freebsd.org/changeset/base/270190 Log: Don't stop other legs of a parallel build due to a failure in make_check. The whole point is to see if there's any failure, which is handled by building a newer version of make. Modified: head/tools/build/make_check/Makefile Modified: head/tools/build/make_check/Makefile == --- head/tools/build/make_check/MakefileWed Aug 20 00:14:41 2014 (r270189) +++ head/tools/build/make_check/MakefileWed Aug 20 00:33:37 2014 (r270190) @@ -2,6 +2,9 @@ .MAKE.MODE=normal +# Failure is handled by the invoker, don't kill other legs of a parallel build. +MAKE_JOB_ERROR_TOKEN=no + # Test for broken LHS expansion. # This *must* cause make(1) to detect a recursive variable, and fail as such. .if make(lhs_expn) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270191 - in head: share/man/man4 sys/dev/usb sys/dev/usb/wlan
Author: kevlo Date: Wed Aug 20 01:26:27 2014 New Revision: 270191 URL: http://svnweb.freebsd.org/changeset/base/270191 Log: Add the D-Link DWA-125 rev D1. Tested by myself. Modified: head/share/man/man4/urtwn.4 head/sys/dev/usb/usbdevs head/sys/dev/usb/wlan/if_urtwn.c Modified: head/share/man/man4/urtwn.4 == --- head/share/man/man4/urtwn.4 Wed Aug 20 00:33:37 2014(r270190) +++ head/share/man/man4/urtwn.4 Wed Aug 20 01:26:27 2014(r270191) @@ -88,6 +88,7 @@ IEEE 802.11b/g/n wireless network adapte .Bl -tag -width Ds -offset indent -compact .It ASUS USB-N10 NANO .It Belkin F7D1102 Surf Wireless Micro +.It D-Link DWA-125 rev D1 .It D-Link DWA-131 .It Edimax EW-7811Un .It Netgear WNA1000M Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsWed Aug 20 00:33:37 2014(r270190) +++ head/sys/dev/usb/usbdevsWed Aug 20 01:26:27 2014(r270191) @@ -1194,7 +1194,7 @@ product ASUS USB_N53 0x179d ASUS Black product ASUS RTL8192CU 0x17ab RTL8192CU product ASUS USBN660x17ad USB-N66 product ASUS USBN10NANO0x17ba USB-N10 Nano -product ASUS AC51 0x17d1 USB-AC51 +product ASUS USBAC51 0x17d1 USB-AC51 product ASUS A730W 0x4202 ASUS MyPal A730W product ASUS P535 0x420f ASUS P535 PDA product ASUS GMSC 0x422f ASUS Generic Mass Storage @@ -1593,6 +1593,7 @@ product DLINK DUBE100 0x1a00 10/100 Eth product DLINK DUBE100C10x1a02 DUB-E100 rev C1 product DLINK DSB650TX40x200c 10/100 Ethernet product DLINK DWL120E 0x3200 DWL-120 rev E +product DLINK DWA125D1 0x330f DWA-125 rev D1 product DLINK DWL122 0x3700 DWL-122 product DLINK DWLG120 0x3701 DWL-G120 product DLINK DWL120F 0x3702 DWL-120 rev F Modified: head/sys/dev/usb/wlan/if_urtwn.c == --- head/sys/dev/usb/wlan/if_urtwn.cWed Aug 20 00:33:37 2014 (r270190) +++ head/sys/dev/usb/wlan/if_urtwn.cWed Aug 20 01:26:27 2014 (r270191) @@ -152,6 +152,7 @@ static const STRUCT_USB_HOST_ID urtwn_de URTWN_DEV(TRENDNET, RTL8192CU), URTWN_DEV(ZYXEL,RTL8192CU), /* URTWN_RTL8188E */ + URTWN_RTL8188E_DEV(DLINK, DWA125D1), URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV), URTWN_RTL8188E_DEV(REALTEK, RTL8188EU), #undef URTWN_RTL8188E_DEV ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r270192 - head/sys/dev/usb/wlan
Author: kevlo
Date: Wed Aug 20 01:32:04 2014
New Revision: 270192
URL: http://svnweb.freebsd.org/changeset/base/270192
Log:
If eapol packets are sent at the lowest rate, key negotiation will
become more reliable.
Submitted by: Akinori Furukoshi
Modified:
head/sys/dev/usb/wlan/if_run.c
Modified: head/sys/dev/usb/wlan/if_run.c
==
--- head/sys/dev/usb/wlan/if_run.c Wed Aug 20 01:26:27 2014
(r270191)
+++ head/sys/dev/usb/wlan/if_run.c Wed Aug 20 01:32:04 2014
(r270192)
@@ -3255,13 +3255,13 @@ run_set_tx_desc(struct run_softc *sc, st
txwi = (struct rt2860_txwi *)(txd + 1);
txwi->len = htole16(m->m_pkthdr.len - pad);
if (rt2860_rates[ridx].phy == IEEE80211_T_DS) {
- txwi->phy = htole16(RT2860_PHY_CCK);
+ mcs |= RT2860_PHY_CCK;
if (ridx != RT2860_RIDX_CCK1 &&
(ic->ic_flags & IEEE80211_F_SHPREAMBLE))
mcs |= RT2860_PHY_SHPRE;
} else
- txwi->phy = htole16(RT2860_PHY_OFDM);
- txwi->phy |= htole16(mcs);
+ mcs |= RT2860_PHY_OFDM;
+ txwi->phy = htole16(mcs);
/* check if RTS/CTS or CTS-to-self protection is required */
if (!IEEE80211_IS_MULTICAST(wh->i_addr1) &&
@@ -3338,7 +3338,7 @@ run_tx(struct run_softc *sc, struct mbuf
/* pickup a rate index */
if (IEEE80211_IS_MULTICAST(wh->i_addr1) ||
- type != IEEE80211_FC0_TYPE_DATA) {
+ type != IEEE80211_FC0_TYPE_DATA || m->m_flags & M_EAPOL) {
ridx = (ic->ic_curmode == IEEE80211_MODE_11A) ?
RT2860_RIDX_OFDM6 : RT2860_RIDX_CCK1;
ctl_ridx = rt2860_rates[ridx].ctl_ridx;
@@ -4998,7 +4998,7 @@ run_updateprot_cb(void *arg)
tmp = RT2860_RTSTH_EN | RT2860_PROT_NAV_SHORT | RT2860_TXOP_ALLOW_ALL;
/* setup protection frame rate (MCS code) */
tmp |= (ic->ic_curmode == IEEE80211_MODE_11A) ?
- rt2860_rates[RT2860_RIDX_OFDM6].mcs :
+ rt2860_rates[RT2860_RIDX_OFDM6].mcs | RT2860_PHY_OFDM :
rt2860_rates[RT2860_RIDX_CCK11].mcs;
/* CCK frames don't require protection */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
