Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.bi
On 3/23/2020 6:54 PM, Conrad Meyer wrote: > On Mon, Mar 23, 2020 at 6:25 PM Bryan Drewery wrote: >> >> On 3/23/2020 12:01 PM, Brooks Davis wrote: >>> Author: brooks >>> Date: Mon Mar 23 19:01:23 2020 >>> New Revision: 359260 >>> URL: https://svnweb.freebsd.org/changeset/base/359260 >>> >>> Log: >>> Import the kyua test framework. >> >> Dumb question but are we allowed to modify this code without a google >> contributor agreement? I was under the impression that the license was >> restrictive in some regard like that. > > Not a dumb question. Yes, we're allowed to modify the code. The > license is just a boring BSD 3-clause: > https://svnweb.freebsd.org/base/head/contrib/kyua/LICENSE?view=markup > > The restrictions around Google contributor CLA only applied to > submissions to Github.com/jmmv/kyua. FreeBSD no longer considers jmmv > (and thus, Google) upstream for ATF and Kyua. Instead the projects > are forked into the github.com/freebsd/ organization. > Great. I wasn't far off then. Infeasible to modify it pre-fork but now it's not a problem. Thanks. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.bi
On Mon, Mar 23, 2020 at 6:25 PM Bryan Drewery wrote: > > On 3/23/2020 12:01 PM, Brooks Davis wrote: > > Author: brooks > > Date: Mon Mar 23 19:01:23 2020 > > New Revision: 359260 > > URL: https://svnweb.freebsd.org/changeset/base/359260 > > > > Log: > > Import the kyua test framework. > > Dumb question but are we allowed to modify this code without a google > contributor agreement? I was under the impression that the license was > restrictive in some regard like that. Not a dumb question. Yes, we're allowed to modify the code. The license is just a boring BSD 3-clause: https://svnweb.freebsd.org/base/head/contrib/kyua/LICENSE?view=markup The restrictions around Google contributor CLA only applied to submissions to Github.com/jmmv/kyua. FreeBSD no longer considers jmmv (and thus, Google) upstream for ATF and Kyua. Instead the projects are forked into the github.com/freebsd/ organization. Best, Conrad ___ 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: r359268 - in head: . share/mk
Author: manu
Date: Tue Mar 24 01:29:18 2020
New Revision: 359268
URL: https://svnweb.freebsd.org/changeset/base/359268
Log:
Revert r359267.
This is not the correct solution and I should have done a clean buildworld.
Modified:
head/ObsoleteFiles.inc
head/share/mk/bsd.lib.mk
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Tue Mar 24 01:09:04 2020(r359267)
+++ head/ObsoleteFiles.inc Tue Mar 24 01:29:18 2020(r359268)
@@ -36,11 +36,6 @@
# xargs -n1 | sort | uniq -d;
# done
-# 20200323: INTERNALLIB don't install headers anymore
-OLD_FILES+=/usr/include/libelftc.h
-OLD_FILES+=/usr/include/libifconfig.h
-OLD_FILES+=/usr/include/libpmcstat.h
-
# 20200320: cx and ctau drivers retired
OLD_FILES+=usr/share/man/man4/ctau.4.gz
OLD_FILES+=usr/share/man/man4/cx.4.gz
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Mar 24 01:09:04 2020(r359267)
+++ head/share/mk/bsd.lib.mkTue Mar 24 01:29:18 2020(r359268)
@@ -489,10 +489,7 @@ _libinstall:
.include
.include
.include
-#No need to install header for INTERNALLIB
-.if !defined(INTERNALLIB)
.include
-.endif
.endif
LINKOWN?= ${LIBOWN}
___
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"
Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.bi
On 3/23/2020 12:01 PM, Brooks Davis wrote: > Author: brooks > Date: Mon Mar 23 19:01:23 2020 > New Revision: 359260 > URL: https://svnweb.freebsd.org/changeset/base/359260 > > Log: > Import the kyua test framework. > > Having kyua in the base system will simplify automated testing in CI and > eliminates bootstrapping issues on new platforms. > > The build of kyua is controlled by WITH(OUT)_TESTS_SUPPORT. > > Reviewed by:emaste > Obtained from: CheriBSD > Sponsored by: DARPA > Differential Revision: https://reviews.freebsd.org/D24103 Dumb question but are we allowed to modify this code without a google contributor agreement? I was under the impression that the license was restrictive in some regard like that. -- Regards, Bryan Drewery signature.asc Description: OpenPGP digital signature
Re: svn commit: r359267 - in head: . share/mk
On 3/23/2020 6:09 PM, Emmanuel Vadot wrote:
> Author: manu
> Date: Tue Mar 24 01:09:04 2020
> New Revision: 359267
> URL: https://svnweb.freebsd.org/changeset/base/359267
>
> Log:
> bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB
>
> If we're building an internal lib do not bother including bsd.incs.mk so we
> will not install the headers.
> This also "solves" a problem with pkgbase where a libXXX-development package
> is created and due to how packages are created we add a dependency to a
> libXXX package that doesn't exists.
>
> Reported by:pizzamig
> Reviewed by:pizzamig bapt emaste
> Differential Revision: https://reviews.freebsd.org/D24166
>
> Modified:
> head/ObsoleteFiles.inc
> head/share/mk/bsd.lib.mk
>
> Modified: head/ObsoleteFiles.inc
> ==
> --- head/ObsoleteFiles.incTue Mar 24 01:08:06 2020(r359266)
> +++ head/ObsoleteFiles.incTue Mar 24 01:09:04 2020 (r359267)
> @@ -36,6 +36,11 @@
> # xargs -n1 | sort | uniq -d;
> # done
>
> +# 20200323: INTERNALLIB don't install headers anymore
> +OLD_FILES+=/usr/include/libelftc.h
> +OLD_FILES+=/usr/include/libifconfig.h
> +OLD_FILES+=/usr/include/libpmcstat.h
> +
lib/libelftc/Makefile:INCS= libelftc.h
lib/libifconfig/Makefile:INCSDIR= ${INCLUDEDIR}
lib/libifconfig/Makefile:INCS= libifconfig.h
lib/libpmcstat/Makefile:INCS= libpmcstat.h
This commit seems incomplete or wrong due to the leftover logic.
> # 20200320: cx and ctau drivers retired
> OLD_FILES+=usr/share/man/man4/ctau.4.gz
> OLD_FILES+=usr/share/man/man4/cx.4.gz
>
> Modified: head/share/mk/bsd.lib.mk
> ==
> --- head/share/mk/bsd.lib.mk Tue Mar 24 01:08:06 2020(r359266)
> +++ head/share/mk/bsd.lib.mk Tue Mar 24 01:09:04 2020(r359267)
> @@ -489,7 +489,10 @@ _libinstall:
> .include
> .include
> .include
> +#No need to install header for INTERNALLIB
> +.if !defined(INTERNALLIB)
> .include
> +.endif
> .endif
>
> LINKOWN?=${LIBOWN}
>
--
Regards,
Bryan Drewery
signature.asc
Description: OpenPGP digital signature
svn commit: r359267 - in head: . share/mk
Author: manu
Date: Tue Mar 24 01:09:04 2020
New Revision: 359267
URL: https://svnweb.freebsd.org/changeset/base/359267
Log:
bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB
If we're building an internal lib do not bother including bsd.incs.mk so we
will not install the headers.
This also "solves" a problem with pkgbase where a libXXX-development package
is created and due to how packages are created we add a dependency to a
libXXX package that doesn't exists.
Reported by: pizzamig
Reviewed by: pizzamig bapt emaste
Differential Revision:https://reviews.freebsd.org/D24166
Modified:
head/ObsoleteFiles.inc
head/share/mk/bsd.lib.mk
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Tue Mar 24 01:08:06 2020(r359266)
+++ head/ObsoleteFiles.inc Tue Mar 24 01:09:04 2020(r359267)
@@ -36,6 +36,11 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20200323: INTERNALLIB don't install headers anymore
+OLD_FILES+=/usr/include/libelftc.h
+OLD_FILES+=/usr/include/libifconfig.h
+OLD_FILES+=/usr/include/libpmcstat.h
+
# 20200320: cx and ctau drivers retired
OLD_FILES+=usr/share/man/man4/ctau.4.gz
OLD_FILES+=usr/share/man/man4/cx.4.gz
Modified: head/share/mk/bsd.lib.mk
==
--- head/share/mk/bsd.lib.mkTue Mar 24 01:08:06 2020(r359266)
+++ head/share/mk/bsd.lib.mkTue Mar 24 01:09:04 2020(r359267)
@@ -489,7 +489,10 @@ _libinstall:
.include
.include
.include
+#No need to install header for INTERNALLIB
+.if !defined(INTERNALLIB)
.include
+.endif
.endif
LINKOWN?= ${LIBOWN}
___
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: r359266 - head/lib/libpam/pam.d
Author: manu
Date: Tue Mar 24 01:08:06 2020
New Revision: 359266
URL: https://svnweb.freebsd.org/changeset/base/359266
Log:
pkgbase: Move telnetd and ftpd pam file to the utilities package
Both programs are in this package so put the pam.d file in there too.
Reported by: emaste
Reviewed by: emaste
Differential Revision:https://reviews.freebsd.org/D24161
Modified:
head/lib/libpam/pam.d/Makefile
Modified: head/lib/libpam/pam.d/Makefile
==
--- head/lib/libpam/pam.d/Makefile Tue Mar 24 01:07:01 2020
(r359265)
+++ head/lib/libpam/pam.d/Makefile Tue Mar 24 01:08:06 2020
(r359266)
@@ -26,7 +26,6 @@ ATPACKAGE+= at
.if ${MK_FTP} != "no"
CONFGROUPS+= FTP
FTP+= ftpd
-FTPPACKAGE+= ftp
afterinstallconfig:
${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd
${DESTDIR}${CONFDIR}/ftp
@@ -35,7 +34,6 @@ afterinstallconfig:
.if ${MK_TELNET} != "no"
CONFGROUPS+= TELNET
TELNET+= telnetd
-TELNETPACKAGE+=telnet
.endif
.include
___
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: r359265 - in head: etc release/scripts
Author: manu
Date: Tue Mar 24 01:07:01 2020
New Revision: 359265
URL: https://svnweb.freebsd.org/changeset/base/359265
Log:
pkgbase: Move device.hints from the runtime to the bootloader package
Also mark it as config file so if a user changes this file pkg will attempt
to merge the new file upon an update.
device.hints is neither related to runtime or loader but it make more sense
to have it in loader in case some user delete /boot/ and wants to recreate it,
now only two packages are required FreeBSD-bootloader and the kernel package.
While here change where we override the package for files installed in /boot,
this allow us to keep other tags (such as config).
Reported by: pizzamig
Reviewed by: bapt pizzamig emaste
Differential Revision:https://reviews.freebsd.org/D24159
Modified:
head/etc/Makefile
head/release/scripts/mtree-to-plist.awk
Modified: head/etc/Makefile
==
--- head/etc/Makefile Mon Mar 23 23:00:13 2020(r359264)
+++ head/etc/Makefile Tue Mar 24 01:07:01 2020(r359265)
@@ -93,7 +93,7 @@ distribution:
.if ${MK_BOOT} != "no"
.if exists(${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
- -T "package=runtime" \
+ -T "package=bootloader,config" \
${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
${DESTDIR}/boot/device.hints
.endif
Modified: head/release/scripts/mtree-to-plist.awk
==
--- head/release/scripts/mtree-to-plist.awk Mon Mar 23 23:00:13 2020
(r359264)
+++ head/release/scripts/mtree-to-plist.awk Tue Mar 24 01:07:01 2020
(r359265)
@@ -28,9 +28,6 @@
tags=tags""_kernconf
}
}
- if ($1 ~ /^\/boot\//) {
- tags="package=bootloader"
- }
if (length(tags) == 0)
next
if (tags ~ /package=/) {
@@ -39,6 +36,8 @@
for (i in a) {
if (a[i] ~ /^package=/) {
pkgname=a[i]
+ if ($1 ~ /^\/boot\//)
+ pkgname="bootloader"
gsub(/package=/, "", pkgname)
} else if (a[i] == "config") {
type="config"
___
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: r359264 - head/sys/arm/include
Author: cem
Date: Mon Mar 23 23:00:13 2020
New Revision: 359264
URL: https://svnweb.freebsd.org/changeset/base/359264
Log:
arm: Fix atomic long APIs to correct 'u_long' signedness
As defined in atomic(9) and implemented on other architectures, the
atomic(9) functions all act on unsigned pointers and types. Prior to this
revision, arm implemented some atomic(9) 'long' sized routines with correct
unsigned type, but others were incorrectly signed.
Reviewed by: tinderbox
Sponsored by: Dell EMC Isilon
Modified:
head/sys/arm/include/atomic-v6.h
Modified: head/sys/arm/include/atomic-v6.h
==
--- head/sys/arm/include/atomic-v6.hMon Mar 23 21:26:32 2020
(r359263)
+++ head/sys/arm/include/atomic-v6.hMon Mar 23 23:00:13 2020
(r359264)
@@ -325,31 +325,31 @@ atomic_fcmpset_rel_32(volatile uint32_t *_ptr, uint32_
}
static __inline int
-atomic_fcmpset_long(volatile long *_ptr, long *_old, long _new)
+atomic_fcmpset_long(volatile u_long *_ptr, u_long *_old, u_long _new)
{
int ret;
- ATOMIC_FCMPSET_CODE(ret, long, "");
+ ATOMIC_FCMPSET_CODE(ret, u_long, "");
return (ret);
}
static __inline int
-atomic_fcmpset_acq_long(volatile long *_ptr, long *_old, long _new)
+atomic_fcmpset_acq_long(volatile u_long *_ptr, u_long *_old, u_long _new)
{
int ret;
- ATOMIC_FCMPSET_CODE(ret, long, "");
+ ATOMIC_FCMPSET_CODE(ret, u_long, "");
dmb();
return (ret);
}
static __inline int
-atomic_fcmpset_rel_long(volatile long *_ptr, long *_old, long _new)
+atomic_fcmpset_rel_long(volatile u_long *_ptr, u_long *_old, u_long _new)
{
int ret;
dmb();
- ATOMIC_FCMPSET_CODE(ret, long, "");
+ ATOMIC_FCMPSET_CODE(ret, u_long, "");
return (ret);
}
@@ -509,7 +509,7 @@ atomic_cmpset_rel_32(volatile uint32_t *_ptr, uint32_t
}
static __inline int
-atomic_cmpset_long(volatile long *_ptr, long _old, long _new)
+atomic_cmpset_long(volatile u_long *_ptr, u_long _old, u_long _new)
{
int ret;
@@ -518,7 +518,7 @@ atomic_cmpset_long(volatile long *_ptr, long _old, lon
}
static __inline int
-atomic_cmpset_acq_long(volatile long *_ptr, long _old, long _new)
+atomic_cmpset_acq_long(volatile u_long *_ptr, u_long _old, u_long _new)
{
int ret;
@@ -528,7 +528,7 @@ atomic_cmpset_acq_long(volatile long *_ptr, long _old,
}
static __inline int
-atomic_cmpset_rel_long(volatile long *_ptr, long _old, long _new)
+atomic_cmpset_rel_long(volatile u_long *_ptr, u_long _old, u_long _new)
{
int ret;
___
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: r359263 - head/sys/geom/eli
Author: jhb
Date: Mon Mar 23 21:26:32 2020
New Revision: 359263
URL: https://svnweb.freebsd.org/changeset/base/359263
Log:
Use the newer EINTEGRITY error when authentication fails.
GELI used to fail with EINVAL when a read request spanned a disk
sector whose contents did not match the sector's authentication tag.
The recently-added EINTEGRITY more closely matches to the error in
this case.
Reviewed by: cem, mckusick
MFC after:2 weeks
Sponsored by: Chelsio Communications
Differential Revision:https://reviews.freebsd.org/D24131
Modified:
head/sys/geom/eli/g_eli_integrity.c
Modified: head/sys/geom/eli/g_eli_integrity.c
==
--- head/sys/geom/eli/g_eli_integrity.c Mon Mar 23 21:21:38 2020
(r359262)
+++ head/sys/geom/eli/g_eli_integrity.c Mon Mar 23 21:26:32 2020
(r359263)
@@ -232,7 +232,7 @@ g_eli_auth_read_done(struct cryptop *crp)
bp->bio_driver2 = NULL;
if (bp->bio_error != 0) {
if (bp->bio_error == -1)
- bp->bio_error = EINVAL;
+ bp->bio_error = EINTEGRITY;
else {
G_ELI_LOGREQ(0, bp,
"Crypto READ request failed (error=%d).",
___
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: r359262 - in head: lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk
Author: brooks
Date: Mon Mar 23 21:21:38 2020
New Revision: 359262
URL: https://svnweb.freebsd.org/changeset/base/359262
Log:
Improve LIBADD/_DP_* for kyua libraries.
This fixes build with ld.bfd as the linker (e.g. on powerpc).
This corrects a bug in D24103.
Sponsored by: DARPA
Modified:
head/lib/kyua/cli/Makefile
head/lib/kyua/drivers/Makefile
head/lib/kyua/engine/Makefile
head/lib/kyua/model/Makefile
head/lib/kyua/store/Makefile
head/lib/kyua/utils/Makefile
head/share/mk/src.libnames.mk
Modified: head/lib/kyua/cli/Makefile
==
--- head/lib/kyua/cli/Makefile Mon Mar 23 19:28:24 2020(r359261)
+++ head/lib/kyua/cli/Makefile Mon Mar 23 21:21:38 2020(r359262)
@@ -2,6 +2,7 @@
KYUA_LIB= cli
INTERNALLIB=
+LIBADD=kyua_drivers kyua_engine kyua_model kyua_store
kyua_utils
CFLAGS+= -DKYUA_CONFDIR=\"${KYUA_CONFDIR}\" \
-DKYUA_DOCDIR=\"${KYUA_CONFDIR}\" \
-DKYUA_MISCDIR=\"${KYUA_MISCDIR}\" \
Modified: head/lib/kyua/drivers/Makefile
==
--- head/lib/kyua/drivers/Makefile Mon Mar 23 19:28:24 2020
(r359261)
+++ head/lib/kyua/drivers/Makefile Mon Mar 23 21:21:38 2020
(r359262)
@@ -1,6 +1,7 @@
# $FreeBSD$
KYUA_LIB= drivers
+LIBADD=kyua_model kyua_engine kyua_store
SRCS= debug_test.cpp \
list_tests.cpp \
Modified: head/lib/kyua/engine/Makefile
==
--- head/lib/kyua/engine/Makefile Mon Mar 23 19:28:24 2020
(r359261)
+++ head/lib/kyua/engine/Makefile Mon Mar 23 21:21:38 2020
(r359262)
@@ -1,6 +1,7 @@
# $FreeBSD$
KYUA_LIB= engine
+LIBADD=lutok kyua_utils
CFLAGS=-DKYUA_ARCHITECTURE=\"${MACHINE_ARCH}\" \
-DKYUA_PLATFORM=\"${MACHINE}\"
Modified: head/lib/kyua/model/Makefile
==
--- head/lib/kyua/model/MakefileMon Mar 23 19:28:24 2020
(r359261)
+++ head/lib/kyua/model/MakefileMon Mar 23 21:21:38 2020
(r359262)
@@ -1,6 +1,7 @@
# $FreeBSD$
KYUA_LIB= model
+LIBADD=lutok
SRCS= context.cpp \
exceptions.cpp \
Modified: head/lib/kyua/store/Makefile
==
--- head/lib/kyua/store/MakefileMon Mar 23 19:28:24 2020
(r359261)
+++ head/lib/kyua/store/MakefileMon Mar 23 21:21:38 2020
(r359262)
@@ -1,6 +1,7 @@
# $FreeBSD$
KYUA_LIB= store
+LIBADD=kyua_model kyua_utils sqlite3
CFLAGS+= -DKYUA_STOREDIR=\"${KYUA_STOREDIR}\"
Modified: head/lib/kyua/utils/Makefile
==
--- head/lib/kyua/utils/MakefileMon Mar 23 19:28:24 2020
(r359261)
+++ head/lib/kyua/utils/MakefileMon Mar 23 21:21:38 2020
(r359262)
@@ -1,6 +1,7 @@
# $FreeBSD$
KYUA_LIB= utils
+LIBADD=lutok
CFLAGS+= -I${SRCTOP}/contrib/sqlite3
CFLAGS+= -DGDB=\"/usr/local/bin/gdb\"
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Mar 23 19:28:24 2020
(r359261)
+++ head/share/mk/src.libnames.mk Mon Mar 23 21:21:38 2020
(r359262)
@@ -263,8 +263,12 @@ _DP_bsnmp= crypto
_DP_geom= bsdxml sbuf
_DP_cam= sbuf
_DP_kvm= elf
-_DP_kyua_cli= lutok kyua_utils
-_DP_kyua_store=sqlite3
+_DP_kyua_cli= kyua_drivers kyua_engine kyua_model kyua_store
kyua_utils
+_DP_kyua_drivers= kyua_model kyua_engine kyua_store
+_DP_kyua_engine= lutok kyua_utils
+_DP_kyua_model=lutok
+_DP_kyua_utils=lutok
+_DP_kyua_store=kyua_model kyua_utils sqlite3
_DP_casper=nv
_DP_cap_dns= nv
_DP_cap_fileargs= nv
___
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"
Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.bi
On Mon, Mar 23, 2020 at 08:15:22PM +, Alexey Dokuchaev wrote: > On Mon, Mar 23, 2020 at 07:01:24PM +, Brooks Davis wrote: > > New Revision: 359260 > > URL: https://svnweb.freebsd.org/changeset/base/359260 > > > > Log: > > Import the kyua test framework. > > > > Having kyua in the base system will simplify automated testing in CI > > and eliminates bootstrapping issues on new platforms. > > > > The build of kyua is controlled by WITH(OUT)_TESTS_SUPPORT. > > What's WITH(OUT)_TESTS_SUPPORT relationship with MK_TESTS? I often put > MK_TESTS=no in /etc/make.conf on space-limited machines, do I also have > to add WITHOUT_TESTS_SUPPORT there now? Perhaps it makes sense to fold > two knobs into one? WITHOUT_TESTS set MK_TESTS_SUPPORT=no unless WITH_TESTS_SUPPORT is specified (src.conf.5 documents this fairly clearly). This allows the test framework to be available without tests. -- Brooks signature.asc Description: PGP signature
Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.bi
On Mon, Mar 23, 2020 at 07:01:24PM +, Brooks Davis wrote: > New Revision: 359260 > URL: https://svnweb.freebsd.org/changeset/base/359260 > > Log: > Import the kyua test framework. > > Having kyua in the base system will simplify automated testing in CI > and eliminates bootstrapping issues on new platforms. > > The build of kyua is controlled by WITH(OUT)_TESTS_SUPPORT. What's WITH(OUT)_TESTS_SUPPORT relationship with MK_TESTS? I often put MK_TESTS=no in /etc/make.conf on space-limited machines, do I also have to add WITHOUT_TESTS_SUPPORT there now? Perhaps it makes sense to fold two knobs into one? ./danfe ___ 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: r359261 - head/sys/sys
Author: brooks Date: Mon Mar 23 19:28:24 2020 New Revision: 359261 URL: https://svnweb.freebsd.org/changeset/base/359261 Log: Bump for kyua import. Reported by: cy Sponsored by: DARPA Modified: head/sys/sys/param.h Modified: head/sys/sys/param.h == --- head/sys/sys/param.hMon Mar 23 19:01:23 2020(r359260) +++ head/sys/sys/param.hMon Mar 23 19:28:24 2020(r359261) @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300084 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300085 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, ___ 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"
Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.bi
On Mon, Mar 23, 2020 at 12:09:06PM -0700, Cy Schubert wrote: > In message <202003231901.02nj1olx063...@repo.freebsd.org>, Brooks Davis > writes: > > Author: brooks > > Date: Mon Mar 23 19:01:23 2020 > > New Revision: 359260 > > URL: https://svnweb.freebsd.org/changeset/base/359260 > > > > Log: > > Import the kyua test framework. > > > > Having kyua in the base system will simplify automated testing in CI and > > eliminates bootstrapping issues on new platforms. > > > > The build of kyua is controlled by WITH(OUT)_TESTS_SUPPORT. > > > > Reviewed by: emaste > > Obtained from:CheriBSD > > Sponsored by: DARPA > > Differential Revision:https://reviews.freebsd.org/D24103 > > Can we remove the kyua port? Unless of course has options that base will > not provide, which I cannot see it would. We'll be retaining the kyua port at least until all supported releases contain kyua which could be quite some time if we don't MFC for 11.4. We'll probably also want to keep it as a -devel port to allow people to get the latest features on release branches. -- Brooks P.S. At the moment, the import lacks unit tests. Hooking those up is on my todo list, but currently the port covers those... signature.asc Description: PGP signature
Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.
In message <202003231909.02nj969a067...@slippy.cwsent.com>, Cy Schubert writes: > In message <202003231901.02nj1olx063...@repo.freebsd.org>, Brooks Davis > writes: > > Author: brooks > > Date: Mon Mar 23 19:01:23 2020 > > New Revision: 359260 > > URL: https://svnweb.freebsd.org/changeset/base/359260 > > > > Log: > > Import the kyua test framework. > > > > Having kyua in the base system will simplify automated testing in CI and > > eliminates bootstrapping issues on new platforms. > > > > The build of kyua is controlled by WITH(OUT)_TESTS_SUPPORT. > > > > Reviewed by: emaste > > Obtained from:CheriBSD > > Sponsored by: DARPA > > Differential Revision:https://reviews.freebsd.org/D24103 > > > > Can we remove the kyua port? Unless of course has options that base will > not provide, which I cannot see it would. This also needs a __FreeBSD_version bump. At least the port could check for this and refuse to install if it's already in base. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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"
Re: svn commit: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.
In message <202003231901.02nj1olx063...@repo.freebsd.org>, Brooks Davis writes: > Author: brooks > Date: Mon Mar 23 19:01:23 2020 > New Revision: 359260 > URL: https://svnweb.freebsd.org/changeset/base/359260 > > Log: > Import the kyua test framework. > > Having kyua in the base system will simplify automated testing in CI and > eliminates bootstrapping issues on new platforms. > > The build of kyua is controlled by WITH(OUT)_TESTS_SUPPORT. > > Reviewed by:emaste > Obtained from: CheriBSD > Sponsored by: DARPA > Differential Revision: https://reviews.freebsd.org/D24103 > Can we remove the kyua port? Unless of course has options that base will not provide, which I cannot see it would. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. ___ 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: r359260 - in head: contrib/kyua etc/mtree lib lib/kyua lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk tools/build/mk usr.bin usr.bin...
Author: brooks
Date: Mon Mar 23 19:01:23 2020
New Revision: 359260
URL: https://svnweb.freebsd.org/changeset/base/359260
Log:
Import the kyua test framework.
Having kyua in the base system will simplify automated testing in CI and
eliminates bootstrapping issues on new platforms.
The build of kyua is controlled by WITH(OUT)_TESTS_SUPPORT.
Reviewed by: emaste
Obtained from:CheriBSD
Sponsored by: DARPA
Differential Revision:https://reviews.freebsd.org/D24103
Added:
head/contrib/kyua/
- copied from r359255, vendor/kyua/dist/
head/lib/kyua/
head/lib/kyua/Makefile (contents, props changed)
head/lib/kyua/Makefile.inc (contents, props changed)
head/lib/kyua/Makefile.kyua (contents, props changed)
head/lib/kyua/cli/
head/lib/kyua/cli/Makefile (contents, props changed)
head/lib/kyua/config.h (contents, props changed)
head/lib/kyua/drivers/
head/lib/kyua/drivers/Makefile (contents, props changed)
head/lib/kyua/engine/
head/lib/kyua/engine/Makefile (contents, props changed)
head/lib/kyua/model/
head/lib/kyua/model/Makefile (contents, props changed)
head/lib/kyua/store/
head/lib/kyua/store/Makefile (contents, props changed)
head/lib/kyua/utils/
head/lib/kyua/utils/Makefile (contents, props changed)
head/lib/kyua/utils/defs.hpp (contents, props changed)
head/usr.bin/kyua/
head/usr.bin/kyua/Makefile (contents, props changed)
Modified:
head/etc/mtree/BSD.root.dist
head/etc/mtree/BSD.usr.dist
head/lib/Makefile
head/share/mk/src.libnames.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/Makefile
Modified: head/etc/mtree/BSD.root.dist
==
--- head/etc/mtree/BSD.root.distMon Mar 23 18:52:57 2020
(r359259)
+++ head/etc/mtree/BSD.root.distMon Mar 23 19:01:23 2020
(r359260)
@@ -54,6 +54,8 @@
..
gss
..
+kyua
+..
mail
..
mtree
Modified: head/etc/mtree/BSD.usr.dist
==
--- head/etc/mtree/BSD.usr.dist Mon Mar 23 18:52:57 2020(r359259)
+++ head/etc/mtree/BSD.usr.dist Mon Mar 23 19:01:23 2020(r359260)
@@ -313,6 +313,8 @@
..
..
..
+kyua
+..
libusb20
..
libvgl
@@ -448,6 +450,12 @@
..
trusted tags=package=runtime
..
+..
+..
+kyua
+misc
+..
+store
..
..
locale
Modified: head/lib/Makefile
==
--- head/lib/Makefile Mon Mar 23 18:52:57 2020(r359259)
+++ head/lib/Makefile Mon Mar 23 19:01:23 2020(r359260)
@@ -205,6 +205,7 @@ SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
SUBDIR.${MK_SENDMAIL}+=libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet
SUBDIR.${MK_TESTS_SUPPORT}+= atf
+SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= kyua
SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= liblutok
SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_UNBOUND}+= libunbound
Added: head/lib/kyua/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/kyua/Makefile Mon Mar 23 19:01:23 2020(r359260)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+SUBDIR=cli \
+ drivers \
+ engine \
+ model \
+ store \
+ utils
+
+.include
Added: head/lib/kyua/Makefile.inc
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/kyua/Makefile.inc Mon Mar 23 19:01:23 2020(r359260)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+KYUA_LIBDIR:= ${.PARSEDIR}
+
+.include "${KYUA_LIBDIR}/Makefile.kyua"
+
+LIB_CXX=kyua_${KYUA_LIB}
+INTERNALLIB=
+
+.PATH: ${KYUA_SRCDIR}/${KYUA_LIB}
+CFLAGS+= -I${KYUA_LIBDIR} \
+ -I${KYUA_SRCDIR} \
+ -I${SRCTOP}/contrib/lutok/include
+
+CFLAGS+= -DHAVE_CONFIG_H
+
+# kyua uses auto_ptr
+CFLAGS+=-Wno-deprecated-declarations
+
+.include "${.PARSEDIR}/../Makefile.inc"
Added: head/lib/kyua/Makefile.kyua
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/kyua/Makefile.kyua Mon Mar 23 19:01:23 2020(r359260)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+KYUA_VERSION= 0.13
+
+KYUA_CONFDIR= /etc/kyua
+KYUA_DOCDIR= /nonexistant
+KYUA_EGDIR=/usr/share/examples/kyua
+KYUA_MISCDIR= /usr/share/kyua/misc
+KYUA_STOREDIR= /usr/share/kyua/store
+
svn commit: r359259 - in stable/11/sys/dev/usb: . serial
Author: hselasky
Date: Mon Mar 23 18:52:57 2020
New Revision: 359259
URL: https://svnweb.freebsd.org/changeset/base/359259
Log:
MFC r359031:
Add new USB device ID to u3g driver.
Submitted by: super_gro...@hotmail.com
PR: 244798
Sponsored by: Mellanox Technologies
Modified:
stable/11/sys/dev/usb/serial/u3g.c
stable/11/sys/dev/usb/usbdevs
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/usb/serial/u3g.c
==
--- stable/11/sys/dev/usb/serial/u3g.c Mon Mar 23 18:51:33 2020
(r359258)
+++ stable/11/sys/dev/usb/serial/u3g.c Mon Mar 23 18:52:57 2020
(r359259)
@@ -238,6 +238,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
U3G_DEV(DLINK, DWR510, 0),
U3G_DEV(DLINK, DWM157_CD, U3GINIT_SCSIEJECT),
U3G_DEV(DLINK, DWM157, 0),
+ U3G_DEV(DLINK, DWM157_CD_2, U3GINIT_SCSIEJECT),
+ U3G_DEV(DLINK, DWM157_2, 0),
U3G_DEV(DLINK, DWM222_CD, U3GINIT_SCSIEJECT),
U3G_DEV(DLINK, DWM222, 0),
U3G_DEV(DLINK3, DWM652, 0),
Modified: stable/11/sys/dev/usb/usbdevs
==
--- stable/11/sys/dev/usb/usbdevs Mon Mar 23 18:51:33 2020
(r359258)
+++ stable/11/sys/dev/usb/usbdevs Mon Mar 23 18:52:57 2020
(r359259)
@@ -1668,8 +1668,10 @@ product DLINK DSB650TX3 0x400b 10/100 Ethernet
product DLINK DSB650TX20x4102 10/100 Ethernet
product DLINK DUB1312 0x4a00 10/100/1000 Ethernet
product DLINK DWM157 0x7d02 DWM-157
+product DLINK DWM157_2 0x7d0e DWM-157
product DLINK DWR510 0x7e12 DWR-510
product DLINK DWM222 0x7e35 DWM-222
+product DLINK DWM157_CD_2 0xa407 DWM-157 CD-ROM Mode
product DLINK DWM157_CD0xa707 DWM-157 CD-ROM Mode
product DLINK DWR510_CD0xa805 DWR-510 CD-ROM Mode
product DLINK DWM222_CD0xab00 DWM-222 CD-ROM Mode
___
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: r359258 - in stable/11/sys/dev/usb: . serial
Author: hselasky
Date: Mon Mar 23 18:51:33 2020
New Revision: 359258
URL: https://svnweb.freebsd.org/changeset/base/359258
Log:
MFC r324607:
Support the D-Link DWM-222 LTE Dongle
Submitted by: Daniel H?nschke
Modified:
stable/11/sys/dev/usb/serial/u3g.c
stable/11/sys/dev/usb/usbdevs
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/usb/serial/u3g.c
==
--- stable/11/sys/dev/usb/serial/u3g.c Mon Mar 23 18:50:23 2020
(r359257)
+++ stable/11/sys/dev/usb/serial/u3g.c Mon Mar 23 18:51:33 2020
(r359258)
@@ -238,6 +238,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
U3G_DEV(DLINK, DWR510, 0),
U3G_DEV(DLINK, DWM157_CD, U3GINIT_SCSIEJECT),
U3G_DEV(DLINK, DWM157, 0),
+ U3G_DEV(DLINK, DWM222_CD, U3GINIT_SCSIEJECT),
+ U3G_DEV(DLINK, DWM222, 0),
U3G_DEV(DLINK3, DWM652, 0),
U3G_DEV(HP, EV2200, 0),
U3G_DEV(HP, HS2300, 0),
Modified: stable/11/sys/dev/usb/usbdevs
==
--- stable/11/sys/dev/usb/usbdevs Mon Mar 23 18:50:23 2020
(r359257)
+++ stable/11/sys/dev/usb/usbdevs Mon Mar 23 18:51:33 2020
(r359258)
@@ -1669,8 +1669,10 @@ product DLINK DSB650TX2 0x4102 10/100 Ethernet
product DLINK DUB1312 0x4a00 10/100/1000 Ethernet
product DLINK DWM157 0x7d02 DWM-157
product DLINK DWR510 0x7e12 DWR-510
+product DLINK DWM222 0x7e35 DWM-222
product DLINK DWM157_CD0xa707 DWM-157 CD-ROM Mode
product DLINK DWR510_CD0xa805 DWR-510 CD-ROM Mode
+product DLINK DWM222_CD0xab00 DWM-222 CD-ROM Mode
product DLINK DSB650 0xabc1 10/100 Ethernet
product DLINK DUBH70xf103 DUB-H7 USB 2.0 7-Port Hub
product DLINK2 RTL8192SU_1 0x3300 RTL8192SU
___
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: r359257 - stable/11/sys/dev/usb
Author: hselasky Date: Mon Mar 23 18:50:23 2020 New Revision: 359257 URL: https://svnweb.freebsd.org/changeset/base/359257 Log: MFC r308460: Sort DLINK section and add USB device ID of D-Link DWA-131 rev E1. Modified: stable/11/sys/dev/usb/usbdevs Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/usb/usbdevs == --- stable/11/sys/dev/usb/usbdevs Mon Mar 23 18:31:13 2020 (r359256) +++ stable/11/sys/dev/usb/usbdevs Mon Mar 23 18:50:23 2020 (r359257) @@ -1634,8 +1634,14 @@ product DLINK DUBE1000x1a00 10/100 Ethernet product DLINK DUBE100C10x1a02 DUB-E100 rev C1 product DLINK DSB650TX40x200c 10/100 Ethernet product DLINK DWL120E 0x3200 DWL-120 rev E +product DLINK RTL8192CU_1 0x3307 RTL8192CU +product DLINK RTL8188CU0x3308 RTL8188CU +product DLINK RTL8192CU_2 0x3309 RTL8192CU +product DLINK RTL8192CU_3 0x330a RTL8192CU +product DLINK DWA131B 0x330d DWA-131 rev B product DLINK DWA125D1 0x330f DWA-125 rev D1 product DLINK DWA123D1 0x3310 DWA-123 rev D1 +product DLINK DWA131E1 0x3319 DWA-131 rev E1 product DLINK DWL122 0x3700 DWL-122 product DLINK DWLG120 0x3701 DWL-G120 product DLINK DWL120F 0x3702 DWL-120 rev F @@ -1661,17 +1667,12 @@ product DLINK DSB650TX_PNA 0x4003 1/10/100 Ethernet product DLINK DSB650TX30x400b 10/100 Ethernet product DLINK DSB650TX20x4102 10/100 Ethernet product DLINK DUB1312 0x4a00 10/100/1000 Ethernet -product DLINK DSB650 0xabc1 10/100 Ethernet -product DLINK DUBH70xf103 DUB-H7 USB 2.0 7-Port Hub -product DLINK DWR510_CD0xa805 DWR-510 CD-ROM Mode -product DLINK DWR510 0x7e12 DWR-510 product DLINK DWM157 0x7d02 DWM-157 +product DLINK DWR510 0x7e12 DWR-510 product DLINK DWM157_CD0xa707 DWM-157 CD-ROM Mode -product DLINK RTL8188CU0x3308 RTL8188CU -productDLINK RTL8192CU_1 0x3307 RTL8192CU -productDLINK RTL8192CU_2 0x3309 RTL8192CU -productDLINK RTL8192CU_3 0x330a RTL8192CU -productDLINK DWA131B 0x330d DWA-131 rev B +product DLINK DWR510_CD0xa805 DWR-510 CD-ROM Mode +product DLINK DSB650 0xabc1 10/100 Ethernet +product DLINK DUBH70xf103 DUB-H7 USB 2.0 7-Port Hub product DLINK2 RTL8192SU_1 0x3300 RTL8192SU product DLINK2 RTL8192SU_2 0x3302 RTL8192SU product DLINK2 DWA131A10x3303 DWA-131 A1 @@ -1682,8 +1683,8 @@ product DLINK2 DWA130D1 0x3a0f DWA-130 D1 product DLINK2 DWLG122C1 0x3c03 DWL-G122 c1 product DLINK2 WUA1340 0x3c04 WUA-1340 product DLINK2 DWA111 0x3c06 DWA-111 -product DLINK2 RT2870_10x3c09 RT2870 product DLINK2 DWA110 0x3c07 DWA-110 +product DLINK2 RT2870_10x3c09 RT2870 product DLINK2 RT3072 0x3c0a RT3072 product DLINK2 RT3072_10x3c0b RT3072 product DLINK2 RT3070_10x3c0d RT3070 @@ -4497,6 +4498,7 @@ product TOSHIBA TRANSMEMORY 0x6545 USB ThumbDrive /* TP-Link products */ product TPLINK T4U 0x0101 Archer T4U +product TPLINK WN823NV20x0109 TL-WN823N v2 product TPLINK WN722NV20x010c TL-WN722N v2 /* Trek Technology products */ ___ 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: r359256 - in stable/12/sys/dev/usb: . serial
Author: hselasky
Date: Mon Mar 23 18:31:13 2020
New Revision: 359256
URL: https://svnweb.freebsd.org/changeset/base/359256
Log:
MFC r359031:
Add new USB device ID to u3g driver.
Submitted by: super_gro...@hotmail.com
PR: 244798
Sponsored by: Mellanox Technologies
Modified:
stable/12/sys/dev/usb/serial/u3g.c
stable/12/sys/dev/usb/usbdevs
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/usb/serial/u3g.c
==
--- stable/12/sys/dev/usb/serial/u3g.c Mon Mar 23 18:26:23 2020
(r359255)
+++ stable/12/sys/dev/usb/serial/u3g.c Mon Mar 23 18:31:13 2020
(r359256)
@@ -238,6 +238,8 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
U3G_DEV(DLINK, DWR510, 0),
U3G_DEV(DLINK, DWM157_CD, U3GINIT_SCSIEJECT),
U3G_DEV(DLINK, DWM157, 0),
+ U3G_DEV(DLINK, DWM157_CD_2, U3GINIT_SCSIEJECT),
+ U3G_DEV(DLINK, DWM157_2, 0),
U3G_DEV(DLINK, DWM222_CD, U3GINIT_SCSIEJECT),
U3G_DEV(DLINK, DWM222, 0),
U3G_DEV(DLINK3, DWM652, 0),
Modified: stable/12/sys/dev/usb/usbdevs
==
--- stable/12/sys/dev/usb/usbdevs Mon Mar 23 18:26:23 2020
(r359255)
+++ stable/12/sys/dev/usb/usbdevs Mon Mar 23 18:31:13 2020
(r359256)
@@ -1736,8 +1736,10 @@ product DLINK DSB650TX3 0x400b 10/100 Ethernet
product DLINK DSB650TX20x4102 10/100 Ethernet
product DLINK DUB1312 0x4a00 10/100/1000 Ethernet
product DLINK DWM157 0x7d02 DWM-157
+product DLINK DWM157_2 0x7d0e DWM-157
product DLINK DWR510 0x7e12 DWR-510
product DLINK DWM222 0x7e35 DWM-222
+product DLINK DWM157_CD_2 0xa407 DWM-157 CD-ROM Mode
product DLINK DWM157_CD0xa707 DWM-157 CD-ROM Mode
product DLINK DWR510_CD0xa805 DWR-510 CD-ROM Mode
product DLINK DWM222_CD0xab00 DWM-222 CD-ROM Mode
___
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: r359255 - in head: contrib/lutok lib lib/liblutok share/mk
Author: brooks
Date: Mon Mar 23 18:26:23 2020
New Revision: 359255
URL: https://svnweb.freebsd.org/changeset/base/359255
Log:
Add liblutok a lightweight C++ API for lua.
It is added an INTERNALLIB and not installed. It will be used by kyua.
This is a preparatory commit for D24103.
Reviewed by: emaste
Obtained from:CheriBSD
Sponsored by: DARPA
Added:
head/contrib/lutok/
- copied from r359045, vendor/lutok/dist/
head/lib/liblutok/
head/lib/liblutok/Makefile (contents, props changed)
Modified:
head/lib/Makefile
head/share/mk/src.libnames.mk
Modified: head/lib/Makefile
==
--- head/lib/Makefile Mon Mar 23 18:17:56 2020(r359254)
+++ head/lib/Makefile Mon Mar 23 18:26:23 2020(r359255)
@@ -205,6 +205,7 @@ SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
SUBDIR.${MK_SENDMAIL}+=libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet
SUBDIR.${MK_TESTS_SUPPORT}+= atf
+SUBDIR.${MK_TESTS_SUPPORT}.${MK_CXX}+= liblutok
SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_UNBOUND}+= libunbound
SUBDIR.${MK_USB}+= libusbhid libusb
Added: head/lib/liblutok/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/liblutok/Makefile Mon Mar 23 18:26:23 2020(r359255)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+LIB_CXX= lutok
+INTERNALLIB=
+
+LIBADD=lua
+
+.PATH: ${SRCTOP}/contrib/lutok
+SRCS= c_gate.cpp \
+ debug.cpp \
+ exceptions.cpp \
+ operations.cpp \
+ stack_cleaner.cpp \
+ state.cpp
+
+CFLAGS+= -I${SRCTOP}/contrib/lutok/include \
+ -I${SRCTOP}/lib/liblua \
+ -I${SRCTOP}/contrib/lua/src
+
+WARNS?=3
+SHLIB_MAJOR= 0
+
+# lutok uses auto_ptr
+CFLAGS+= -Wno-deprecated-declarations
+
+.include
Modified: head/share/mk/src.libnames.mk
==
--- head/share/mk/src.libnames.mk Mon Mar 23 18:17:56 2020
(r359254)
+++ head/share/mk/src.libnames.mk Mon Mar 23 18:26:23 2020
(r359255)
@@ -42,6 +42,7 @@ _INTERNALLIBS=\
ipf \
lpr \
lua \
+ lutok \
netbsd \
ntp \
ntpevent \
@@ -295,6 +296,7 @@ _DP_magic= z
_DP_mt=sbuf bsdxml
_DP_ldns= ssl crypto
_DP_lua= m
+_DP_lutok= lua
.if ${MK_OPENSSL} != "no"
_DP_fetch= ssl crypto
.else
@@ -472,6 +474,9 @@ LIBELFTC?= ${LIBELFTCDIR}/libelftc${PIE_SUFFIX}.a
LIBLUADIR= ${_LIB_OBJTOP}/lib/liblua
LIBLUA?= ${LIBLUADIR}/liblua${PIE_SUFFIX}.a
+
+LIBLUTOKDIR= ${_LIB_OBJTOP}/lib/liblutok
+LIBLUTOK?= ${LIBLUTOKDIR}/liblutok${PIE_SUFFIX}.a
LIBPEDIR= ${_LIB_OBJTOP}/lib/libpe
LIBPE?=${LIBPEDIR}/libpe${PIE_SUFFIX}.a
___
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: r359254 - head/share/man/man7
Author: emaste Date: Mon Mar 23 18:17:56 2020 New Revision: 359254 URL: https://svnweb.freebsd.org/changeset/base/359254 Log: arch.7: remove Default Tool Chain footnote about xtoolchain MIPS was the last arch to use external toolchain by default but uses in-tree Clang and lld as of r359233, and now no table entries reference the footnote. Modified: head/share/man/man7/arch.7 Modified: head/share/man/man7/arch.7 == --- head/share/man/man7/arch.7 Mon Mar 23 18:14:04 2020(r359253) +++ head/share/man/man7/arch.7 Mon Mar 23 18:17:56 2020(r359254) @@ -317,8 +317,6 @@ This table shows the default tool chain for each archi .It riscv64 Ta Clang Ta lld .It riscv64sf Ta Clang Ta lld .El -.Pp -(1) External toolchain provided by ports/packages. .Ss MACHINE_ARCH vs MACHINE_CPUARCH vs MACHINE .Dv MACHINE_CPUARCH should be preferred in Makefiles when the generic ___ 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: r359253 - head/share/man/man7
Author: emaste Date: Mon Mar 23 18:14:04 2020 New Revision: 359253 URL: https://svnweb.freebsd.org/changeset/base/359253 Log: arch.7: update Default Tool Chain intro text All FreeBSD archs now use an in-tree toolchain - Clang and ELF Tool Chain everywhere, and lld everywhere but 32-bit PowerPC (which still uses ld.bfd). No archs use external toolchain by default. Sponsored by: The FreeBSD Foundation Modified: head/share/man/man7/arch.7 Modified: head/share/man/man7/arch.7 == --- head/share/man/man7/arch.7 Mon Mar 23 17:51:44 2020(r359252) +++ head/share/man/man7/arch.7 Mon Mar 23 18:14:04 2020(r359253) @@ -283,17 +283,17 @@ is 8 bytes on all supported architectures except i386. .It riscv64sf Ta soft Ta soft, double precision .El .Ss Default Tool Chain -.Fx uses a variety of tool chain components for the supported CPU -architectures: +.Fx +uses .Xr clang 1 +as the default compiler on all supported CPU architectures, +as well as ELF Tool Chain binary utilities such as +.Xr objcopy 1 and +.Xr readelf 1 . +Most supported CPU architectures also use LLVM's .Xr ld.lld 1 -provided by the base system, -GNU -.Xr gcc 1 -and Binutils -.Xr ld 1 , -or an external toolchain compiler and linker provided by a port or package. +as the linker. This table shows the default tool chain for each architecture. .Bl -column -offset indent "Architecture" "Compiler" "Linker" .It Sy Architecture Ta Sy Compiler Ta Sy Linker ___ 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: r359251 - head/share/man/man7
Author: arichardson Date: Mon Mar 23 17:51:39 2020 New Revision: 359251 URL: https://svnweb.freebsd.org/changeset/base/359251 Log: Update arch.7 .Dd for r359233 Suggested by: lwhsu Modified: head/share/man/man7/arch.7 Modified: head/share/man/man7/arch.7 == --- head/share/man/man7/arch.7 Mon Mar 23 17:50:00 2020(r359250) +++ head/share/man/man7/arch.7 Mon Mar 23 17:51:39 2020(r359251) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 8, 2020 +.Dd March 23, 2020 .Dt ARCH 7 .Os .Sh NAME ___ 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: r359252 - head/sys/conf
Author: arichardson Date: Mon Mar 23 17:51:44 2020 New Revision: 359252 URL: https://svnweb.freebsd.org/changeset/base/359252 Log: Fix newvers.sh on macOS 10.15 It appears that the macOS /bin/sh echo now defaults to -e and therefore the `#define VERSTR` included newline characters instead of \n. This caused compiler errors due to unterminated strings. Fix by using printf instead of echo. A less fragile solution might be to bootstrap the in-tree /bin/sh but that requires more changes. Reviewed By: brooks Differential Revision: https://reviews.freebsd.org/D24136 Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh == --- head/sys/conf/newvers.shMon Mar 23 17:51:39 2020(r359251) +++ head/sys/conf/newvers.shMon Mar 23 17:51:44 2020(r359252) @@ -343,7 +343,7 @@ EOF ) vers_content_old=$(cat vers.c 2>/dev/null || true) if [ "$vers_content_new" != "$vers_content_old" ]; then - echo "$vers_content_new" > vers.c + printf "%s" "$vers_content_new" > vers.c fi echo $((v + 1)) > version ___ 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: r359250 - stable/11/share/mk
Author: brooks
Date: Mon Mar 23 17:50:00 2020
New Revision: 359250
URL: https://svnweb.freebsd.org/changeset/base/359250
Log:
MFC r359046:
Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions.
This allows simplification of Makefiles where some SUBDIR entries depend
on two things (e.g. something that depends on C++ and some other knob).
Discussed with: imp, jhb
Obtained from:CheriBSD
Sponsored by: DARPA
Modified:
stable/11/share/mk/bsd.subdir.mk
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.subdir.mk
==
--- stable/11/share/mk/bsd.subdir.mkMon Mar 23 17:45:31 2020
(r359249)
+++ stable/11/share/mk/bsd.subdir.mkMon Mar 23 17:50:00 2020
(r359250)
@@ -16,8 +16,8 @@
#
# SUBDIR A list of subdirectories that should be built as well.
# Each of the targets will execute the same target in the
-# subdirectories. SUBDIR.yes is automatically appended
-# to this list.
+# subdirectories. SUBDIR.yes and SUBDIR.yes.yes are
+# automatically appended to this list.
#
# +++ targets +++
#
@@ -113,8 +113,8 @@ install:beforeinstall realinstall afterinstall
# SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD
.if !target(_SUBDIR)
-.if defined(SUBDIR) || defined(SUBDIR.yes)
-SUBDIR:=${SUBDIR} ${SUBDIR.yes}
+.if defined(SUBDIR) || defined(SUBDIR.yes) || defined(SUBDIR.yes.yes)
+SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes}
SUBDIR:=${SUBDIR:u}
.endif
___
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: r359249 - stable/12/share/mk
Author: brooks
Date: Mon Mar 23 17:45:31 2020
New Revision: 359249
URL: https://svnweb.freebsd.org/changeset/base/359249
Log:
MFC r359046:
Support SUBDIR.${MK_FOO}.${MK_BAR} expresssions.
This allows simplification of Makefiles where some SUBDIR entries depend
on two things (e.g. something that depends on C++ and some other knob).
Discussed with: imp, jhb
Obtained from:CheriBSD
Sponsored by: DARPA
Modified:
stable/12/share/mk/bsd.subdir.mk
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/mk/bsd.subdir.mk
==
--- stable/12/share/mk/bsd.subdir.mkMon Mar 23 17:38:20 2020
(r359248)
+++ stable/12/share/mk/bsd.subdir.mkMon Mar 23 17:45:31 2020
(r359249)
@@ -16,8 +16,8 @@
#
# SUBDIR A list of subdirectories that should be built as well.
# Each of the targets will execute the same target in the
-# subdirectories. SUBDIR.yes is automatically appended
-# to this list.
+# subdirectories. SUBDIR.yes and SUBDIR.yes.yes are
+# automatically appended to this list.
#
# +++ targets +++
#
@@ -122,8 +122,8 @@ install:beforeinstall realinstall afterinstall
# SUBDIR recursing may be disabled for MK_DIRDEPS_BUILD
.if !target(_SUBDIR)
-.if defined(SUBDIR) || defined(SUBDIR.yes)
-SUBDIR:=${SUBDIR} ${SUBDIR.yes}
+.if defined(SUBDIR) || defined(SUBDIR.yes) || defined(SUBDIR.yes.yes)
+SUBDIR:=${SUBDIR} ${SUBDIR.yes} ${SUBDIR.yes.yes}
SUBDIR:=${SUBDIR:u}
.endif
___
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: r359248 - head/lib/libc/gen
Author: trasz Date: Mon Mar 23 17:38:20 2020 New Revision: 359248 URL: https://svnweb.freebsd.org/changeset/base/359248 Log: Add STANDARDS and HISTORY to getcontext(3), makecontext(3), and ucontext(3). Obtained from:NetBSD MFC after:2 weeks Sponsored by: DARPA Modified: head/lib/libc/gen/getcontext.3 head/lib/libc/gen/makecontext.3 head/lib/libc/gen/ucontext.3 Modified: head/lib/libc/gen/getcontext.3 == --- head/lib/libc/gen/getcontext.3 Mon Mar 23 17:11:27 2020 (r359247) +++ head/lib/libc/gen/getcontext.3 Mon Mar 23 17:38:20 2020 (r359248) @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 13, 2013 +.Dd March 23, 2020 .Dt GETCONTEXT 3 .Os .Sh NAME @@ -148,3 +148,35 @@ No memory was available to allocate for the context or .Xr sigaltstack 2 , .Xr makecontext 3 , .Xr ucontext 3 +.Sh STANDARDS +The +.Fn getcontext +and +.Fn setcontext +functions conform to +.St -xsh5 +and +.St -p1003.1-2001 . +The +.Va errno +indications are an extension to the standard. +.Pp +The +.St -p1003.1-2004 +revision marked the functions +.Fn getcontext +and +.Fn setcontext +as obsolete, citing portability issues and recommending the use of +.Tn POSIX +threads instead. +The +.St -p1003.1-2008 +revision removed the functions from the specification. +.Sh HISTORY +The +.Fn getcontext +and +.Fn setcontext +functions first appeared in +.At V.4 . Modified: head/lib/libc/gen/makecontext.3 == --- head/lib/libc/gen/makecontext.3 Mon Mar 23 17:11:27 2020 (r359247) +++ head/lib/libc/gen/makecontext.3 Mon Mar 23 17:38:20 2020 (r359248) @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 31, 2018 +.Dd March 23, 2020 .Dt MAKECONTEXT 3 .Os .Sh NAME @@ -123,3 +123,41 @@ to complete the operation. .Sh SEE ALSO .Xr setcontext 3 , .Xr ucontext 3 +.Sh STANDARDS +The +.Fn makecontext +and +.Fn swapcontext +functions conform to +.St -xsh5 +and +.St -p1003.1-2001 . +.Pp +The +.St -p1003.1-2004 +revision marked the functions +.Fn makecontext +and +.Fn swapcontext +as obsolete, citing portability issues and recommending the use of +.Tn POSIX +threads instead. +The +.St -p1003.1-2008 +revision removed the functions from the specification. +.Pp +.Bf -symbolic +The standard does not clearly define the type of integer arguments +passed to +.Fa func +via +.Fn makecontext ; +portable applications should not rely on the implementation detail that +it may be possible to pass pointer arguments to functions. +.Sh HISTORY +The +.Fn makecontext +and +.Fn swapcontext +functions first appeared in +.At V.4 . Modified: head/lib/libc/gen/ucontext.3 == --- head/lib/libc/gen/ucontext.3Mon Mar 23 17:11:27 2020 (r359247) +++ head/lib/libc/gen/ucontext.3Mon Mar 23 17:38:20 2020 (r359248) @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 10, 2002 +.Dd March 23, 2020 .Dt UCONTEXT 3 .Os .Sh NAME @@ -109,3 +109,15 @@ structures: .Xr getcontext 3 , .Xr getcontextx 3 , .Xr makecontext 3 +.Sh STANDARDS +The +.Vt ucontext_t +type conforms to +.St -xsh5 +and +.St -p1003.1-2001 . +The +.St -p1003.1-2008 +revision removed the +.Vt ucontext_t +from the specification. ___ 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: r359247 - head/etc
Author: brooks Date: Mon Mar 23 17:11:27 2020 New Revision: 359247 URL: https://svnweb.freebsd.org/changeset/base/359247 Log: Add the tests user, an unprivileged user from the default kyua config. This is a preparatory commit for D24103. Reviewed by: emaste Obtained from:CheriBSD MFC after:3 days Sponsored by: DARPA Modified: head/etc/master.passwd Modified: head/etc/master.passwd == --- head/etc/master.passwd Mon Mar 23 16:02:01 2020(r359246) +++ head/etc/master.passwd Mon Mar 23 17:11:27 2020(r359247) @@ -25,4 +25,5 @@ www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/us ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin _ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +tests:*:977:65534::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin ___ 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: r359246 - head/lib/libc/gen
Author: imp Date: Mon Mar 23 16:02:01 2020 New Revision: 359246 URL: https://svnweb.freebsd.org/changeset/base/359246 Log: Document when execl and execp entered unix. For this, things are complicated. The first mention in the manual was in the 4th edition manual (as an add on to exec(II)). The 2nd and 3rd editions didn't have these in the manual (either as a separate page, or as an add-on to exec(II)). We don't have good 1st, 2nd or 3rd edition distributions to look in. However, there's a tape labeled 'last1120c' that we do have. This tape contains the last version of the V2 edition of the C compiler on it (just after C got struct). On this tape there was a libc.sa archive that contains source for execl and execp. This source is sufficiently different from the V5 sources (which are the next ones we have sources for) and have a slightly different calling convention than later sources, suggesting that the early date for the last1120c tape is correct (in that era, the epoch changed every year, leading to a one or two year ambiguity on when the files could have been modified) and it should be though of as V2. Since this was also a time of compiler development, and the calling convetions are known to be under evolution, and since the rest of the sources in libc.sa are consistent, that's further evidence that V2 is likely. Finally, 2nd edition was the last version to fully support the 11/20 because it lacked many basic features and bell labs moved off it to the 11/45 as soon as they could afford to buy one, around this time era. The unix manuals make it sound like V3 might have supported the 11/20, but the same intro could also be read to mean it didn't, at all, and that V3 was the first rewrite for the 11/45 ahead of the rewrite in C that came with V4. Taken together, the evidence leans most heavily to V2 (90% IMHO), and slightly to V3 (8%) or possibly V4 (2%). I've not put all this in the man page, but have left it here in case someone notices in the future that V4 is the first manual page for it. Modified: head/lib/libc/gen/exec.3 Modified: head/lib/libc/gen/exec.3 == --- head/lib/libc/gen/exec.3Mon Mar 23 15:39:42 2020(r359245) +++ head/lib/libc/gen/exec.3Mon Mar 23 16:02:01 2020(r359246) @@ -316,6 +316,12 @@ The function appeared in .At v1 . The +.Fn execl +and +.Fn execv +functions appeared in +.At v2 . +The .Fn execvP function first appeared in .Fx 5.2 . ___ 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: r359245 - head/share/man/man5
Author: 0mp (doc,ports committer) Date: Mon Mar 23 15:39:42 2020 New Revision: 359245 URL: https://svnweb.freebsd.org/changeset/base/359245 Log: Start sentences from new lines Also, bump date after 359244. Modified: head/share/man/man5/rc.conf.5 Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Mon Mar 23 15:27:10 2020 (r359244) +++ head/share/man/man5/rc.conf.5 Mon Mar 23 15:39:42 2020 (r359245) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 9, 2020 +.Dd March 23, 2020 .Dt RC.CONF 5 .Os .Sh NAME @@ -1183,11 +1183,12 @@ break some legitimate applications. .Pq Vt bool Set to .Dq Li AUTO -by default. This setting will be identical to +by default. +This setting will be identical to .Dq Li YES , if a dynamicrouting daemon is enabled, because redirect processing may -cause perfomance issues for large routing tables. If no such service -is enabled, this setting behaves like a +cause perfomance issues for large routing tables. +If no such service is enabled, this setting behaves like a .Dq Li NO . Setting to .Dq Li YES @@ -1673,7 +1674,8 @@ This static setting may be overridden by commands started with dynamic interface configuration utilities like .Xr dhclient 8 -hooks. The description can be seen with +hooks. +The description can be seen with .Xr ifconfig 8 command and it may be exported with .Xr bsnmpd 1 ___ 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: r359244 - in head: libexec/rc libexec/rc/rc.d share/man/man5
Author: melifaro
Date: Mon Mar 23 15:27:10 2020
New Revision: 359244
URL: https://svnweb.freebsd.org/changeset/base/359244
Log:
Make ICMP redirect processing depend on routing daemon.
Submitted by: lutz at donnerhacke.de
Reviewed by: melifaro,rgrimes
Differential Revision:https://reviews.freebsd.org/D23329
Modified:
head/libexec/rc/rc.conf
head/libexec/rc/rc.d/routed
head/libexec/rc/rc.d/routing
head/share/man/man5/rc.conf.5
Modified: head/libexec/rc/rc.conf
==
--- head/libexec/rc/rc.conf Mon Mar 23 14:53:55 2020(r359243)
+++ head/libexec/rc/rc.conf Mon Mar 23 15:27:10 2020(r359244)
@@ -235,7 +235,7 @@ log_in_vain="0" # >=1 to log connects
to ports w/o l
tcp_keepalive="YES"# Enable stale TCP connection timeout (or NO).
tcp_drop_synfin="NO" # Set to YES to drop TCP packets with SYN+FIN
# NOTE: this violates the TCP specification
-icmp_drop_redirect="NO"# Set to YES to ignore ICMP REDIRECT packets
+icmp_drop_redirect="auto" # Set to YES to ignore ICMP REDIRECT packets
icmp_log_redirect="NO" # Set to YES to log ICMP REDIRECT packets
network_interfaces="auto" # List of network interfaces (or "auto").
cloned_interfaces="" # List of cloned network interfaces to create.
Modified: head/libexec/rc/rc.d/routed
==
--- head/libexec/rc/rc.d/routed Mon Mar 23 14:53:55 2020(r359243)
+++ head/libexec/rc/rc.d/routed Mon Mar 23 15:27:10 2020(r359244)
@@ -3,7 +3,7 @@
# $FreeBSD$
#
-# PROVIDE: routed
+# PROVIDE: routed dynamicrouting
# REQUIRE: netif routing
# BEFORE: NETWORK
# KEYWORD: nojailvnet
Modified: head/libexec/rc/rc.d/routing
==
--- head/libexec/rc/rc.d/routingMon Mar 23 14:53:55 2020
(r359243)
+++ head/libexec/rc/rc.d/routingMon Mar 23 15:27:10 2020
(r359244)
@@ -292,8 +292,29 @@ ropts_init()
fi
}
+_check_dynamicrouting()
+{
+ local skip file name rcvar
+
+ # copied from /etc/rc
+ skip="-s nostart"
+ if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
+ skip="$skip -s nojail"
+ fi
+ [ -n "$local_startup" ] && find_local_scripts_new
+
+ for file in $( rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null |
+ xargs grep -lE '^# PROVIDE:.*\' ); do
+ (set -- enabled; . $file) && return 0;
+ done
+
+ return 1
+}
+
options_inet()
{
+ local _icmp_drop_redirect
+
_ropts_initdone=
if checkyesno icmp_bmcastecho; then
ropts_init inet
@@ -303,7 +324,17 @@ options_inet()
${SYSCTL} net.inet.icmp.bmcastecho=0 > /dev/null
fi
- if checkyesno icmp_drop_redirect; then
+ _icmp_drop_redirect="${icmp_drop_redirect}"
+ case "${_icmp_drop_redirect}" in
+ [Aa][Uu][Tt][Oo] | "")
+ if _check_dynamicrouting; then
+ _icmp_drop_redirect="yes"
+ else
+ _icmp_drop_redirect="no"
+ fi
+ ;;
+ esac
+ if checkyesno _icmp_drop_redirect; then
ropts_init inet
echo -n ' ignore ICMP redirect=YES'
${SYSCTL} net.inet.icmp.drop_redirect=1 > /dev/null
Modified: head/share/man/man5/rc.conf.5
==
--- head/share/man/man5/rc.conf.5 Mon Mar 23 14:53:55 2020
(r359243)
+++ head/share/man/man5/rc.conf.5 Mon Mar 23 15:27:10 2020
(r359244)
@@ -1182,11 +1182,19 @@ break some legitimate applications.
.It Va icmp_drop_redirect
.Pq Vt bool
Set to
-.Dq Li NO
-by default.
+.Dq Li AUTO
+by default. This setting will be identical to
+.Dq Li YES ,
+if a dynamicrouting daemon is enabled, because redirect processing may
+cause perfomance issues for large routing tables. If no such service
+is enabled, this setting behaves like a
+.Dq Li NO .
Setting to
.Dq Li YES
will cause the kernel to ignore ICMP REDIRECT packets.
+Setting to
+.Dq Li NO
+will cause the kernel to process ICMP REDIRECT packets.
Refer to
.Xr icmp 4
for more information.
___
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: r359243 - head/tools/bsdbox
Author: kevans Date: Mon Mar 23 14:53:55 2020 New Revision: 359243 URL: https://svnweb.freebsd.org/changeset/base/359243 Log: bsdbox: remove useless linking against libl All is good without it; just remove it. Requested by: bapt Modified: head/tools/bsdbox/Makefile Modified: head/tools/bsdbox/Makefile == --- head/tools/bsdbox/Makefile Mon Mar 23 14:44:23 2020(r359242) +++ head/tools/bsdbox/Makefile Mon Mar 23 14:53:55 2020(r359243) @@ -57,7 +57,7 @@ CRUNCH_SRCDIRS+= bin # statically - and that ends very badly. CRUNCH_SHLIBS+=-lc -lutil -lcrypt -lxo -lgpio CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph -CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcapw +CRUNCH_LIBS+= -lcrypt -ledit -ltermcapw ### # Programs from standard /sbin ___ 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: r359242 - head/usr.sbin/tcpdump/tcpdump
Author: bapt
Date: Mon Mar 23 14:44:23 2020
New Revision: 359242
URL: https://svnweb.freebsd.org/changeset/base/359242
Log:
Remove useless linking to libl
Modified:
head/usr.sbin/tcpdump/tcpdump/Makefile
Modified: head/usr.sbin/tcpdump/tcpdump/Makefile
==
--- head/usr.sbin/tcpdump/tcpdump/Makefile Mon Mar 23 14:37:00 2020
(r359241)
+++ head/usr.sbin/tcpdump/tcpdump/Makefile Mon Mar 23 14:44:23 2020
(r359242)
@@ -186,7 +186,7 @@ CFLAGS+=-DINET6 -DHAVE_OS_IPV6_SUPPORT
CFLAGS+= -DLBL_ALIGN
.endif
-LIBADD=l pcap
+LIBADD=pcap
.if ${MK_CASPER} != "no"
LIBADD+= casper
LIBADD+= cap_dns
___
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: r359241 - head/sbin/setkey
Author: bapt
Date: Mon Mar 23 14:37:00 2020
New Revision: 359241
URL: https://svnweb.freebsd.org/changeset/base/359241
Log:
Remove the link to libl which only contains a stub function
on yywrap, if the flex is told yywrap is not in use, then this linkage becomes
unnecessary
Modified:
head/sbin/setkey/Makefile
head/sbin/setkey/token.l
Modified: head/sbin/setkey/Makefile
==
--- head/sbin/setkey/Makefile Mon Mar 23 14:33:29 2020(r359240)
+++ head/sbin/setkey/Makefile Mon Mar 23 14:37:00 2020(r359241)
@@ -37,8 +37,6 @@ WARNS?= 1
CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec
YFLAGS=-d
-LIBADD=l
-
CLEANFILES=y.tab.c y.tab.h key_test.o keytest
# libpfkey
Modified: head/sbin/setkey/token.l
==
--- head/sbin/setkey/token.lMon Mar 23 14:33:29 2020(r359240)
+++ head/sbin/setkey/token.lMon Mar 23 14:37:00 2020(r359241)
@@ -67,6 +67,8 @@ int parse(FILE **);
int yyparse(void);
%}
+%option noyywrap
+
/* common section */
nl \n
ws [ \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: r359240 - head/sys/dev/aic7xxx/aicasm
Author: bapt
Date: Mon Mar 23 14:33:29 2020
New Revision: 359240
URL: https://svnweb.freebsd.org/changeset/base/359240
Log:
Remove unneeded dependency on libl
Modified:
head/sys/dev/aic7xxx/aicasm/Makefile
Modified: head/sys/dev/aic7xxx/aicasm/Makefile
==
--- head/sys/dev/aic7xxx/aicasm/MakefileMon Mar 23 14:11:49 2020
(r359239)
+++ head/sys/dev/aic7xxx/aicasm/MakefileMon Mar 23 14:33:29 2020
(r359240)
@@ -13,7 +13,6 @@ GENHDRS= aicasm_gram.h aicasm_macro_gram.h
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
-LIBADD=l
WARNS?=0
# Correct path for kernel builds
___
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: r359239 - head/sbin/setkey
Author: bapt
Date: Mon Mar 23 14:11:49 2020
New Revision: 359239
URL: https://svnweb.freebsd.org/changeset/base/359239
Log:
Revove useless linking to yacc
Modified:
head/sbin/setkey/Makefile
Modified: head/sbin/setkey/Makefile
==
--- head/sbin/setkey/Makefile Mon Mar 23 14:04:42 2020(r359238)
+++ head/sbin/setkey/Makefile Mon Mar 23 14:11:49 2020(r359239)
@@ -37,7 +37,7 @@ WARNS?= 1
CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec
YFLAGS=-d
-LIBADD=l y
+LIBADD=l
CLEANFILES=y.tab.c y.tab.h key_test.o keytest
___
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: r359238 - head/share/man/man9
Author: 0mp (doc,ports committer) Date: Mon Mar 23 14:04:42 2020 New Revision: 359238 URL: https://svnweb.freebsd.org/changeset/base/359238 Log: Sort UMA macros and create MLINKS for them This patch is a follow-up to r344518. Reported by: ngie Reviewed by: hselasky Differential Revision:https://reviews.freebsd.org/D24165 Modified: head/share/man/man9/Makefile head/share/man/man9/sysctl.9 Modified: head/share/man/man9/Makefile == --- head/share/man/man9/MakefileMon Mar 23 12:39:18 2020 (r359237) +++ head/share/man/man9/MakefileMon Mar 23 14:04:42 2020 (r359238) @@ -2049,6 +2049,8 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \ sysctl.9 SYSCTL_ADD_UAUTO.9 \ sysctl.9 SYSCTL_ADD_UINT.9 \ sysctl.9 SYSCTL_ADD_ULONG.9 \ + sysctl.9 SYSCTL_ADD_UMA_CUR.9 \ + sysctl.9 SYSCTL_ADD_UMA_MAX.9 \ sysctl.9 SYSCTL_ADD_UQUAD.9 \ sysctl.9 SYSCTL_CHILDREN.9 \ sysctl.9 SYSCTL_STATIC_CHILDREN.9 \ @@ -2077,6 +2079,8 @@ MLINKS+=sysctl.9 SYSCTL_DECL.9 \ sysctl.9 SYSCTL_U64.9 \ sysctl.9 SYSCTL_UINT.9 \ sysctl.9 SYSCTL_ULONG.9 \ + sysctl.9 SYSCTL_UMA_CUR.9 \ + sysctl.9 SYSCTL_UMA_MAX.9 \ sysctl.9 SYSCTL_UQUAD.9 MLINKS+=sysctl_add_oid.9 sysctl_move_oid.9 \ sysctl_add_oid.9 sysctl_remove_oid.9 \ Modified: head/share/man/man9/sysctl.9 == --- head/share/man/man9/sysctl.9Mon Mar 23 12:39:18 2020 (r359237) +++ head/share/man/man9/sysctl.9Mon Mar 23 14:04:42 2020 (r359238) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 11, 2019 +.Dd March 23, 2020 .Dt SYSCTL 9 .Os .Sh NAME @@ -58,9 +58,9 @@ .Nm SYSCTL_ADD_UAUTO , .Nm SYSCTL_ADD_UINT , .Nm SYSCTL_ADD_ULONG , -.Nm SYSCTL_ADD_UQUAD , .Nm SYSCTL_ADD_UMA_CUR , .Nm SYSCTL_ADD_UMA_MAX , +.Nm SYSCTL_ADD_UQUAD , .Nm SYSCTL_CHILDREN , .Nm SYSCTL_STATIC_CHILDREN , .Nm SYSCTL_NODE_CHILDREN , @@ -94,9 +94,9 @@ .Nm SYSCTL_U64 , .Nm SYSCTL_UINT , .Nm SYSCTL_ULONG , -.Nm SYSCTL_UQUAD , .Nm SYSCTL_UMA_CUR , .Nm SYSCTL_UMA_MAX +.Nm SYSCTL_UQUAD , .Nd Dynamic and static sysctl MIB creation functions .Sh SYNOPSIS .In sys/param.h ___ 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: r359237 - stable/11/sys/cam/nvme
Author: dab Date: Mon Mar 23 12:39:18 2020 New Revision: 359237 URL: https://svnweb.freebsd.org/changeset/base/359237 Log: MFC r359129: Fix parameter reversal potentially causing buffer overrun. Two arguments were reversed in calls to cam_strvis() in nvme_da.c. This was found by a Coverity scan of this code within Dell (Isilon). These are also marked in the FreeBSD Coverity scan as CIDs 1400526 & 1400531. Sponsored by: Dell EMC Isilon Modified: stable/11/sys/cam/nvme/nvme_da.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cam/nvme/nvme_da.c == --- stable/11/sys/cam/nvme/nvme_da.cMon Mar 23 12:38:44 2020 (r359236) +++ stable/11/sys/cam/nvme/nvme_da.cMon Mar 23 12:39:18 2020 (r359237) @@ -774,9 +774,9 @@ ndaregister(struct cam_periph *periph, void *arg) * the serial or model number strings. */ nvme_strvis(disk->d_descr, cd->mn, - sizeof(disk->d_descr), NVME_MODEL_NUMBER_LENGTH); + NVME_MODEL_NUMBER_LENGTH, sizeof(disk->d_descr)); nvme_strvis(disk->d_ident, cd->sn, - sizeof(disk->d_ident), NVME_SERIAL_NUMBER_LENGTH); + NVME_SERIAL_NUMBER_LENGTH, sizeof(disk->d_ident)); disk->d_hba_vendor = cpi.hba_vendor; disk->d_hba_device = cpi.hba_device; disk->d_hba_subvendor = cpi.hba_subvendor; ___ 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: r359236 - stable/12/sys/cam/nvme
Author: dab Date: Mon Mar 23 12:38:44 2020 New Revision: 359236 URL: https://svnweb.freebsd.org/changeset/base/359236 Log: MFC r359129: Fix parameter reversal potentially causing buffer overrun. Two arguments were reversed in calls to cam_strvis() in nvme_da.c. This was found by a Coverity scan of this code within Dell (Isilon). These are also marked in the FreeBSD Coverity scan as CIDs 1400526 & 1400531. Sponsored by: Dell EMC Isilon Modified: stable/12/sys/cam/nvme/nvme_da.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cam/nvme/nvme_da.c == --- stable/12/sys/cam/nvme/nvme_da.cMon Mar 23 12:21:32 2020 (r359235) +++ stable/12/sys/cam/nvme/nvme_da.cMon Mar 23 12:38:44 2020 (r359236) @@ -798,9 +798,9 @@ ndaregister(struct cam_periph *periph, void *arg) * the serial or model number strings. */ cam_strvis(disk->d_descr, cd->mn, - sizeof(disk->d_descr), NVME_MODEL_NUMBER_LENGTH); + NVME_MODEL_NUMBER_LENGTH, sizeof(disk->d_descr)); cam_strvis(disk->d_ident, cd->sn, - sizeof(disk->d_ident), NVME_SERIAL_NUMBER_LENGTH); + NVME_SERIAL_NUMBER_LENGTH, sizeof(disk->d_ident)); disk->d_hba_vendor = cpi.hba_vendor; disk->d_hba_device = cpi.hba_device; disk->d_hba_subvendor = cpi.hba_subvendor; ___ 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: r359235 - in head/tests/sys: common netinet netinet6
Author: melifaro
Date: Mon Mar 23 12:21:32 2020
New Revision: 359235
URL: https://svnweb.freebsd.org/changeset/base/359235
Log:
Add tests verifying IPv4/IPv6 output for TCP/UDP/raw paths.
Reviewed by: kp
MFC after:2 weeks
Differential Revision:https://reviews.freebsd.org/D24138
Added:
head/tests/sys/common/net_receiver.py (contents, props changed)
head/tests/sys/netinet/output.sh (contents, props changed)
head/tests/sys/netinet6/output6.sh (contents, props changed)
Modified:
head/tests/sys/common/Makefile
head/tests/sys/common/vnet.subr
head/tests/sys/netinet/Makefile
head/tests/sys/netinet6/Makefile
Modified: head/tests/sys/common/Makefile
==
--- head/tests/sys/common/Makefile Mon Mar 23 12:17:13 2020
(r359234)
+++ head/tests/sys/common/Makefile Mon Mar 23 12:21:32 2020
(r359235)
@@ -5,8 +5,10 @@ TESTSDIR= ${TESTSBASE}/sys/common
${PACKAGE}FILES+= vnet.subr
${PACKAGE}FILES+= divert.py
${PACKAGE}FILES+= sender.py
+${PACKAGE}FILES+= net_receiver.py
${PACKAGE}FILESMODE_divert.py=0555
${PACKAGE}FILESMODE_sender.py=0555
+${PACKAGE}FILESMODE_net_receiver.py=0555
.include
Added: head/tests/sys/common/net_receiver.py
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/common/net_receiver.py Mon Mar 23 12:21:32 2020
(r359235)
@@ -0,0 +1,116 @@
+#!/usr/bin/env python
+# -
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020 Alexander V. Chernikov
+#
+# 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.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+#
+# $FreeBSD$
+#
+
+
+from functools import partial
+import socket
+import select
+import argparse
+import time
+
+
+def parse_args():
+parser = argparse.ArgumentParser(description='divert socket tester')
+parser.add_argument('--sip', type=str, default='', help='IP to listen on')
+parser.add_argument('--family', type=str, help='inet/inet6')
+parser.add_argument('--ports', type=str, help='packet ports 1,2,3')
+parser.add_argument('--match_str', type=str, help='match string to use')
+parser.add_argument('--count', type=int, default=1,
+help='Number of messages to receive')
+parser.add_argument('--test_name', type=str, required=True,
+help='test name to run')
+return parser.parse_args()
+
+
+def test_listen_tcp(args):
+if args.family == 'inet6':
+fam = socket.AF_INET6
+else:
+fam = socket.AF_INET
+sockets = []
+ports = [int(port) for port in args.ports.split(',')]
+for port in ports:
+s = socket.socket(fam, socket.SOCK_STREAM)
+s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+s.setblocking(0)
+s.bind((args.sip, port))
+print('binding on {}:{}'.format(args.sip, port))
+s.listen(5)
+sockets.append(s)
+inputs = sockets
+count = 0
+while count < args.count:
+readable, writable, exceptional = select.select(inputs, [], inputs)
+for s in readable:
+(c, address) = s.accept()
+print('C: {}'.format(address))
+data = c.recv(9000)
+if args.match_str and args.match_str.encode('utf-8') != data:
+raise Exception('Expected "{}" but got "{}"'.format(
+args.match_str, data.decode('utf-8')))
+count += 1
+c.close()
+
+
+def test_listen_udp(args):
+if args.family == 'inet6':
+fam = socket.AF_INET6
+else:
+fam = socket.AF_INET
+sockets = []
+ports = [int(port)
svn commit: r359234 - head/sys/netinet
Author: tuexen
Date: Mon Mar 23 12:17:13 2020
New Revision: 359234
URL: https://svnweb.freebsd.org/changeset/base/359234
Log:
Cleanup the file and add two ASSERT variants for locks, which will be
used shortly.
MFC after:1 week
Modified:
head/sys/netinet/sctp_lock_bsd.h
Modified: head/sys/netinet/sctp_lock_bsd.h
==
--- head/sys/netinet/sctp_lock_bsd.hMon Mar 23 10:36:32 2020
(r359233)
+++ head/sys/netinet/sctp_lock_bsd.hMon Mar 23 12:17:13 2020
(r359234)
@@ -64,10 +64,6 @@ __FBSDID("$FreeBSD$");
* synchronize. So the CREATE_INP lock is also another one we must use
* extreme caution in locking to make sure we don't hit a re-entrancy issue.
*
- * For non FreeBSD 5.x we provide a bunch of EMPTY lock macros so we can
- * blatantly put locks everywhere and they reduce to nothing on
- * NetBSD/OpenBSD and FreeBSD 4.x
- *
*/
/*
@@ -77,229 +73,275 @@ __FBSDID("$FreeBSD$");
* the SCTP_BASE_INFO() list's we will do a SCTP_INP_INFO_WLOCK().
*/
-extern struct sctp_foo_stuff sctp_logoff[];
-extern int sctp_logoff_stuff;
-
#define SCTP_IPI_COUNT_INIT()
#define SCTP_STATLOG_INIT_LOCK()
+#define SCTP_STATLOG_DESTROY()
#define SCTP_STATLOG_LOCK()
#define SCTP_STATLOG_UNLOCK()
-#define SCTP_STATLOG_DESTROY()
-#define SCTP_INP_INFO_LOCK_DESTROY() do { \
-if(rw_wowned(_BASE_INFO(ipi_ep_mtx))) { \
- rw_wunlock(_BASE_INFO(ipi_ep_mtx)); \
-} \
-rw_destroy(_BASE_INFO(ipi_ep_mtx)); \
- } while (0)
+#define SCTP_INP_INFO_LOCK_INIT() do { \
+ rw_init(_BASE_INFO(ipi_ep_mtx), "sctp-info"); \
+} while (0)
-#define SCTP_INP_INFO_LOCK_INIT() \
-rw_init(_BASE_INFO(ipi_ep_mtx), "sctp-info");
+#define SCTP_INP_INFO_LOCK_DESTROY() do { \
+ if (rw_wowned(_BASE_INFO(ipi_ep_mtx))) { \
+ rw_wunlock(_BASE_INFO(ipi_ep_mtx));\
+ } \
+ rw_destroy(_BASE_INFO(ipi_ep_mtx));\
+} while (0)
+#define SCTP_INP_INFO_RLOCK() do { \
+ rw_rlock(_BASE_INFO(ipi_ep_mtx)); \
+} while (0)
-#define SCTP_INP_INFO_RLOCK() do {\
- rw_rlock(_BASE_INFO(ipi_ep_mtx)); \
+#define SCTP_INP_INFO_WLOCK() do { \
+ rw_wlock(_BASE_INFO(ipi_ep_mtx)); \
} while (0)
-#define SCTP_MCORE_QLOCK_INIT(cpstr) do { \
- mtx_init(&(cpstr)->que_mtx, \
-"sctp-mcore_queue","queue_lock", \
-MTX_DEF|MTX_DUPOK);\
+#define SCTP_INP_INFO_RUNLOCK() do { \
+ rw_runlock(_BASE_INFO(ipi_ep_mtx));\
} while (0)
-#define SCTP_MCORE_QLOCK(cpstr) do { \
- mtx_lock(&(cpstr)->que_mtx);\
+#define SCTP_INP_INFO_WUNLOCK() do { \
+ rw_wunlock(_BASE_INFO(ipi_ep_mtx));\
} while (0)
-#define SCTP_MCORE_QUNLOCK(cpstr) do { \
- mtx_unlock(&(cpstr)->que_mtx); \
+
+#define SCTP_MCORE_QLOCK_INIT(cpstr) do { \
+ mtx_init(&(cpstr)->que_mtx, "sctp-mcore_queue","queue_lock",\
+MTX_DEF | MTX_DUPOK); \
} while (0)
-#define SCTP_MCORE_QDESTROY(cpstr) do { \
- if(mtx_owned(&(cpstr)->core_mtx)) { \
- mtx_unlock(&(cpstr)->que_mtx); \
-} \
- mtx_destroy(&(cpstr)->que_mtx); \
+#define SCTP_MCORE_QDESTROY(cpstr) do {
\
+ if (mtx_owned(&(cpstr)->core_mtx)) {\
+ mtx_unlock(&(cpstr)->que_mtx); \
+ } \
+ mtx_destroy(&(cpstr)->que_mtx); \
} while (0)
+#define SCTP_MCORE_QLOCK(cpstr) do { \
+ mtx_lock(&(cpstr)->que_mtx);\
+} while (0)
-#define SCTP_MCORE_LOCK_INIT(cpstr) do { \
- mtx_init(&(cpstr)->core_mtx, \
-"sctp-cpulck","cpu_proc_lock", \
-MTX_DEF|MTX_DUPOK);\
+#define SCTP_MCORE_QUNLOCK(cpstr) do { \
+ mtx_unlock(&(cpstr)->que_mtx); \
} while (0)
-#define SCTP_MCORE_LOCK(cpstr) do { \
- mtx_lock(&(cpstr)->core_mtx); \
+
+#define SCTP_MCORE_LOCK_INIT(cpstr) do { \
+ mtx_init(&(cpstr)->core_mtx,
svn commit: r359233 - in head: . share/man/man7 share/mk
Author: arichardson
Date: Mon Mar 23 10:36:32 2020
New Revision: 359233
URL: https://svnweb.freebsd.org/changeset/base/359233
Log:
Use Clang and LLD as the default toolchain for MIPS
Now that we have updated the in-tree version of LLVM to 10.0, we have all the
necessary LLVM changes to use Clang+LLD as the default toolchain for MIPS.
Relnotes: yes
Reviewed By: emaste, jhb, brooks, kevans
Differential Revision: https://reviews.freebsd.org/D23204
Modified:
head/Makefile
head/share/man/man7/arch.7
head/share/mk/src.opts.mk
Modified: head/Makefile
==
--- head/Makefile Mon Mar 23 08:23:22 2020(r359232)
+++ head/Makefile Mon Mar 23 10:36:32 2020(r359233)
@@ -500,13 +500,13 @@ TARGET_ARCHES_riscv?= riscv64 riscv64sf
TARGET_ARCHES_${target}?= ${target}
.endfor
-MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc6
-
-TOOLCHAINS_mips= mips-gcc6
-
# Remove architectures only supported by external toolchain from
# universe if required toolchain packages are missing.
-.for target in mips
+# Note: We no longer have targets that require an external toolchain, but for
+# now keep this block in case a new non-LLVM architecture is added and to reuse
+# it for a future extenal GCC make universe variant.
+_external_toolchain_targets=
+.for target in ${_external_toolchain_targets}
.if ${_UNIVERSE_TARGETS:M${target}}
.for toolchain in ${TOOLCHAINS_${target}}
.if !exists(/usr/local/share/toolchains/${toolchain}.mk)
Modified: head/share/man/man7/arch.7
==
--- head/share/man/man7/arch.7 Mon Mar 23 08:23:22 2020(r359232)
+++ head/share/man/man7/arch.7 Mon Mar 23 10:36:32 2020(r359233)
@@ -302,15 +302,15 @@ This table shows the default tool chain for each archi
.It armv6 Ta Clang Ta lld
.It armv7 Ta Clang Ta lld
.It i386Ta Clang Ta lld
-.It mipsTa GCC(1)Ta GNU ld(1)
-.It mipsel Ta GCC(1)Ta GNU ld(1)
-.It mipselhfTa GCC(1)Ta GNU ld(1)
-.It mipshf Ta GCC(1)Ta GNU ld(1)
-.It mipsn32 Ta GCC(1)Ta GNU ld(1)
-.It mips64 Ta GCC(1)Ta GNU ld(1)
-.It mips64elTa GCC(1)Ta GNU ld(1)
-.It mips64elhf Ta GCC(1)Ta GNU ld(1)
-.It mips64hfTa GCC(1)Ta GNU ld(1)
+.It mipsTa Clang Ta lld
+.It mipsel Ta Clang Ta lld
+.It mipselhfTa Clang Ta lld
+.It mipshf Ta Clang Ta lld
+.It mipsn32 Ta Clang Ta lld
+.It mips64 Ta Clang Ta lld
+.It mips64elTa Clang Ta lld
+.It mips64elhf Ta Clang Ta lld
+.It mips64hfTa Clang Ta lld
.It powerpc Ta Clang Ta GNU ld 2.17.50
.It powerpcspe Ta Clang Ta GNU ld 2.17.50
.It powerpc64 Ta Clang Ta lld
Modified: head/share/mk/src.opts.mk
==
--- head/share/mk/src.opts.mk Mon Mar 23 08:23:22 2020(r359232)
+++ head/share/mk/src.opts.mk Mon Mar 23 10:36:32 2020(r359233)
@@ -79,6 +79,8 @@ __DEFAULT_YES_OPTIONS = \
CCD \
CDDL \
CLANG \
+CLANG_BOOTSTRAP \
+CLANG_IS_CC \
CPP \
CROSS_COMPILER \
CRYPT \
@@ -283,13 +285,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
.include
-.if ${__T:Mmips*} == ""
-# Clang is installed as the default /usr/bin/cc.
-__DEFAULT_YES_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
-.else
-# Clang is enabled but we still require an external toolchain.
-__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
-.endif
# In-tree binutils/gcc are older versions without modern architecture support.
.if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB
@@ -302,7 +297,7 @@ __DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP
.if ${__T:Mriscv*} != ""
BROKEN_OPTIONS+=OFED
.endif
-.if ${__T:Mmips*} != "mips" && ${__T} != "powerpc" && ${__T} != "powerpcspe"
+.if ${__T} != "powerpc" && ${__T} != "powerpcspe"
__DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
.else
__DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
___
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: r359232 - in head/usr.sbin/pw: . tests
Author: bapt
Date: Mon Mar 23 08:23:22 2020
New Revision: 359232
URL: https://svnweb.freebsd.org/changeset/base/359232
Log:
pw: do not removed home directories if not owned
When deleting a user, if its home directory does not belong to it, it should
not be removed. This is the promise that the manpage makes, the tool should
ensure that it respects that promise.
Add a regression test about it
PR: 244967
Submitted by: Eric Hanneken
MFC after:3 days
Modified:
head/usr.sbin/pw/rm_r.c
head/usr.sbin/pw/tests/pw_userdel_test.sh
Modified: head/usr.sbin/pw/rm_r.c
==
--- head/usr.sbin/pw/rm_r.c Sun Mar 22 22:18:06 2020(r359231)
+++ head/usr.sbin/pw/rm_r.c Mon Mar 23 08:23:22 2020(r359232)
@@ -71,5 +71,8 @@ rm_r(int rootfd, const char *path, uid_t uid)
closedir(d);
if (fstatat(rootfd, path, , AT_SYMLINK_NOFOLLOW) != 0)
return;
- unlinkat(rootfd, path, S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0);
+ if (S_ISLNK(st.st_mode))
+ unlinkat(rootfd, path, 0);
+ else if (st.st_uid == uid)
+ unlinkat(rootfd, path, AT_REMOVEDIR);
}
Modified: head/usr.sbin/pw/tests/pw_userdel_test.sh
==
--- head/usr.sbin/pw/tests/pw_userdel_test.sh Sun Mar 22 22:18:06 2020
(r359231)
+++ head/usr.sbin/pw/tests/pw_userdel_test.sh Mon Mar 23 08:23:22 2020
(r359232)
@@ -67,10 +67,30 @@ home_not_a_dir_body() {
atf_check ${RPW} userdel foo -r
}
+atf_test_case home_shared
+home_shared_body() {
+ populate_root_etc_skel
+ mkdir ${HOME}/shared
+ atf_check ${RPW} useradd -n testuser1 -d /shared
+ atf_check ${RPW} useradd -n testuser2 -d /shared
+ atf_check ${RPW} userdel -n testuser1 -r
+ test -d ${HOME}/shared || atf_fail "Shared home has been removed"
+}
+
+atf_test_case home_regular_dir
+home_regular_dir_body() {
+ populate_root_etc_skel
+ atf_check ${RPW} useradd -n foo -d /foo
+ atf_check ${RPW} userdel -n foo -r
+ [ ! -d ${HOME}/foo ] || atf_fail "Home has not been removed"
+}
+
atf_init_test_cases() {
atf_add_test_case rmuser_seperate_group
atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown
atf_add_test_case delete_files
atf_add_test_case delete_numeric_name
atf_add_test_case home_not_a_dir
+ atf_add_test_case home_shared
+ atf_add_test_case home_regular_dir
}
___
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"
