svn commit: r302324 - head/lib/libc/locale
Author: bapt
Date: Sun Jul 3 15:00:12 2016
New Revision: 302324
URL: https://svnweb.freebsd.org/changeset/base/302324
Log:
Fix a bad test resulting in a segfault with ISO-8859-5 locales
Reported by: Lauri Tirkkonen from Illumos
Approved by: re@ (gjb)
Modified:
head/lib/libc/locale/collate.c
Modified: head/lib/libc/locale/collate.c
==
--- head/lib/libc/locale/collate.c Sun Jul 3 11:45:54 2016
(r302323)
+++ head/lib/libc/locale/collate.c Sun Jul 3 15:00:12 2016
(r302324)
@@ -310,7 +310,7 @@ _collate_lookup(struct xlocale_collate *
if ((sptr = *state) != NULL) {
*pri = *sptr;
sptr++;
- if ((sptr == *state) || (sptr == NULL))
+ if ((sptr == *state) || (*sptr == 0))
*state = NULL;
else
*state = sptr;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r302325 - head/libexec/rtld-elf
Author: bdrewery
Date: Sun Jul 3 17:28:39 2016
New Revision: 302325
URL: https://svnweb.freebsd.org/changeset/base/302325
Log:
Fix race for incrementally rebuilding VERSION_MAP.
The dependency is needed in PROG_FULL since only the build of PROG_FULL
is using the LDFLAGS and depending on VERSION_MAP. This was not a problem
with MK_DEBUG_FILES==no since it only builds PROG.
This should probably be using bsd.lib.mk instead [1]
Reported by: swills, gjb
Reviewed by: emaste
Noted by: rgrimes [1]
Sponsored by: EMC / Isilon Storage Division
Approved by: re (kib)
Modified:
head/libexec/rtld-elf/Makefile
Modified: head/libexec/rtld-elf/Makefile
==
--- head/libexec/rtld-elf/Makefile Sun Jul 3 15:00:12 2016
(r302324)
+++ head/libexec/rtld-elf/Makefile Sun Jul 3 17:28:39 2016
(r302325)
@@ -69,8 +69,6 @@ SYMBOL_MAPS= ${.CURDIR}/Symbol.map
VERSION_MAP= Version.map
LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
-${PROG}: ${VERSION_MAP}
-
.if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map)
SYMBOL_MAPS+= ${.CURDIR}/${RTLD_ARCH}/Symbol.map
.endif
@@ -92,4 +90,5 @@ SUBDIR+= tests
.endif
.include
+${PROG_FULL}: ${VERSION_MAP}
.include
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r302326 - head/usr.bin/lastcomm/tests
Author: ngie
Date: Sun Jul 3 17:51:24 2016
New Revision: 302326
URL: https://svnweb.freebsd.org/changeset/base/302326
Log:
Output the diffs to standard error when comparing the expected vs the
obtained output from lastcomm instead of just printing out a summary, e.g.
"they differed".
This will make failures with results more apparent when running kyua debug,
kyua report-html, etc.
Differential Revision: https://reviews.freebsd.org/D7079 (as part of a larger
diff)
MFC after: 1 week
Approved by: re (gjb)
Reviewed by: cem
Sponsored by: EMC / Isilon Storage Division
Modified:
head/usr.bin/lastcomm/tests/legacy_test.sh
Modified: head/usr.bin/lastcomm/tests/legacy_test.sh
==
--- head/usr.bin/lastcomm/tests/legacy_test.sh Sun Jul 3 17:28:39 2016
(r302325)
+++ head/usr.bin/lastcomm/tests/legacy_test.sh Sun Jul 3 17:51:24 2016
(r302326)
@@ -14,7 +14,7 @@ check()
shift
# Remove tty field, which varies between systems.
awk '{$4 = ""; print}' |
- if diff -q - $1
+ if diff -a - $1 >&2
then
echo "ok $NUM"
else
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r302327 - head/usr.bin/lastcomm/tests
Author: ngie Date: Sun Jul 3 17:52:21 2016 New Revision: 302327 URL: https://svnweb.freebsd.org/changeset/base/302327 Log: Fix .../usr.bin/lastcomm/legacy_test:main on i386 The time in the output files was ahead by 3 hours on i386. Fix the incorrect offset. Differential Revision: https://reviews.freebsd.org/D7079 (as part of a larger diff) MFC after: 1 week PR: 210329 Reported by: asomers Approved by: re (gjb) Reviewed by: cem Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/lastcomm/tests/v1-i386.out head/usr.bin/lastcomm/tests/v2-i386.out Modified: head/usr.bin/lastcomm/tests/v1-i386.out == --- head/usr.bin/lastcomm/tests/v1-i386.out Sun Jul 3 17:51:24 2016 (r302326) +++ head/usr.bin/lastcomm/tests/v1-i386.out Sun Jul 3 17:52:21 2016 (r302327) @@ -1,28 +1,28 @@ -core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 11:34 -ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 11:34 -as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 11:34 -cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 11:34 -diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34 -sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 11:34 -find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 11:33 -egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 11:33 -time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 11:33 -awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 11:33 -accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:33 +core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 08:34 +ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 08:34 +as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 08:34 +cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 08:34 +diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 +sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 08:34 +find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 08:33 +egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 08:33 +time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 08:33 +awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 08:33 +accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:33 Modified: head/usr.bin/lastcomm/tests/v2-i386.out == --- head/usr.bin/las
svn commit: r302328 - in head/sys: kern sys
Author: kib
Date: Sun Jul 3 18:19:48 2016
New Revision: 302328
URL: https://svnweb.freebsd.org/changeset/base/302328
Log:
Provide helper macros to detect 'non-silent SBDRY' state and to
calculate appropriate return value for stops. Simplify the code by
using them.
Fix typo in sig_suspend_threads(). The thread which sleep must be
aborted is td2. (*)
In issignal(), when handling stopping signal for thread in
TD_SBDRY_INTR state, do not stop, this is wrong and fires assert.
This is yet another place where execution should be forced out of
SBDRY-protected region. For such case, return -1 from issignal() and
translate it to corresponding error code in sleepq_catch_signals().
Assert that other consumers of cursig() are not affected by the new
return value. (*)
Micro-optimize, mostly VFS and VOP methods, by avoiding calling the
functions when SIGDEFERSTOP_NOP non-change is requested. (**)
Reported and tested by: pho (*)
Requested by: bde (**)
Sponsored by: The FreeBSD Foundation
MFC after:2 weeks
Approved by: re (gjb)
Modified:
head/sys/kern/kern_sig.c
head/sys/kern/kern_thread.c
head/sys/kern/subr_sleepqueue.c
head/sys/sys/proc.h
head/sys/sys/signalvar.h
Modified: head/sys/kern/kern_sig.c
==
--- head/sys/kern/kern_sig.cSun Jul 3 17:52:21 2016(r302327)
+++ head/sys/kern/kern_sig.cSun Jul 3 18:19:48 2016(r302328)
@@ -1251,6 +1251,7 @@ kern_sigtimedwait(struct thread *td, sig
mtx_lock(&ps->ps_mtx);
sig = cursig(td);
mtx_unlock(&ps->ps_mtx);
+ KASSERT(sig >= 0, ("sig %d", sig));
if (sig != 0 && SIGISMEMBER(waitset, sig)) {
if (sigqueue_get(&td->td_sigqueue, sig, ksi) != 0 ||
sigqueue_get(&p->p_sigqueue, sig, ksi) != 0) {
@@ -1512,8 +1513,10 @@ kern_sigsuspend(struct thread *td, sigse
/* void */;
thread_suspend_check(0);
mtx_lock(&p->p_sigacts->ps_mtx);
- while ((sig = cursig(td)) != 0)
+ while ((sig = cursig(td)) != 0) {
+ KASSERT(sig >= 0, ("sig %d", sig));
has_sig += postsig(sig);
+ }
mtx_unlock(&p->p_sigacts->ps_mtx);
}
PROC_UNLOCK(p);
@@ -2476,11 +2479,9 @@ sig_suspend_threads(struct thread *td, s
*/
KASSERT(!TD_IS_SUSPENDED(td2),
("thread with deferred stops suspended"));
- if ((td2->td_flags & (TDF_SERESTART |
- TDF_SEINTR)) != 0 && sending) {
- wakeup_swapper |= sleepq_abort(td,
- (td2->td_flags & TDF_SERESTART)
- != 0 ? ERESTART : EINTR);
+ if (TD_SBDRY_INTR(td2) && sending) {
+ wakeup_swapper |= sleepq_abort(td2,
+ TD_SBDRY_ERRNO(td2));
}
} else if (!TD_IS_SUSPENDED(td2)) {
thread_suspend_one(td2);
@@ -2628,7 +2629,7 @@ sigdeferstop_curr_flags(int cflags)
* accesses below.
*/
int
-sigdeferstop(int mode)
+sigdeferstop_impl(int mode)
{
struct thread *td;
int cflags, nflags;
@@ -2655,11 +2656,11 @@ sigdeferstop(int mode)
panic("sigdeferstop: invalid mode %x", mode);
break;
}
- if (cflags != nflags) {
- thread_lock(td);
- td->td_flags = (td->td_flags & ~cflags) | nflags;
- thread_unlock(td);
- }
+ if (cflags == nflags)
+ return (SIGDEFERSTOP_VAL_NCHG);
+ thread_lock(td);
+ td->td_flags = (td->td_flags & ~cflags) | nflags;
+ thread_unlock(td);
return (cflags);
}
@@ -2670,11 +2671,12 @@ sigdeferstop(int mode)
* either via ast() or a subsequent interruptible sleep.
*/
void
-sigallowstop(int prev)
+sigallowstop_impl(int prev)
{
struct thread *td;
int cflags;
+ KASSERT(prev != SIGDEFERSTOP_VAL_NCHG, ("failed sigallowstop"));
KASSERT((prev & ~(TDF_SBDRY | TDF_SEINTR | TDF_SERESTART)) == 0,
("sigallowstop: incorrect previous mode %x", prev));
td = curthread;
@@ -2835,6 +2837,11 @@ issignal(struct thread *td)
(p->p_pgrp->pg_jobc == 0 &&
prop & SA_TTYSTOP))
break; /* == ignore */
+ if (TD_SBDRY_INTR(td)) {
+ KASSERT((td->td_flags & TDF_SBDRY) != 0,
+
svn commit: r302329 - in head: . etc/mtree share share/colldef share/ctypedef share/locale-links share/monetdef share/msgdef share/numericdef share/timedef tools/build/mk tools/tools/locale/tools
/share/timedef/kk_Cyrl_KZ.UTF-8.src head/share/timedef/mn_Cyrl_MN.UTF-8.src head/share/timedef/sr_Cyrl_RS.ISO8859-5.src head/share/timedef/sr_Cyrl_RS.UTF-8.src head/share/timedef/sr_Latn_RS.ISO8859-2.src head/share/timedef/sr_Latn_RS.UTF-8.src head/share/timedef/zh_Hans_CN.GB2312.src head/share/timedef/zh_Hans_CN.GBK.src head/share/timedef/zh_Hans_CN.UTF-8.src head/share/timedef/zh_Hans_CN.eucCN.src head/share/timedef/zh_Hant_HK.UTF-8.src head/share/timedef/zh_Hant_TW.Big5.src head/share/timedef/zh_Hant_TW.UTF-8.src Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.usr.dist head/share/Makefile head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/monetdef/Makefile head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/timedef/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/tools/locale/tools/cldr2def.pl head/tools/tools/locale/tools/finalize Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sun Jul 3 18:19:48 2016(r302328) +++ head/ObsoleteFiles.inc Sun Jul 3 18:21:11 2016(r302329) @@ -38,6 +38,105 @@ # xargs -n1 | sort | uniq -d; # done +# 20160703: POSIXify locales with variants +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8 +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5 +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8 +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8 +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312 +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC +OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME +OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030 +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC +OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME +OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8 +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE +OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES +OLD_FILES+=usr/share/locale
svn commit: r302330 - head/tools/build/mk
Author: ngie
Date: Sun Jul 3 18:27:00 2016
New Revision: 302330
URL: https://svnweb.freebsd.org/changeset/base/302330
Log:
Remove ftp(1) related files when MK_FTP == no
Approved by: re (gjb)
Differential Revision: https://reviews.freebsd.org/D6969
MFC after: 1 week
Reviewed by: ngie
Submitted by: rakuco
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jul 3 18:21:11
2016(r302329)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jul 3 18:27:00
2016(r302330)
@@ -1345,6 +1345,20 @@ OLD_FILES+=usr/sbin/fmtree
OLD_FILES+=usr/share/man/man8/fmtree.8.gz
.endif
+.if ${MK_FTP} == no
+OLD_FILES+=etc/ftpusers
+OLD_FILES+=etc/rc.d/ftpd
+OLD_FILES+=usr/bin/ftp
+OLD_FILES+=usr/bin/gate-ftp
+OLD_FILES+=usr/bin/pftp
+OLD_FILES+=usr/libexec/ftpd
+OLD_FILES+=usr/share/man/man1/ftp.1.gz
+OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz
+OLD_FILES+=usr/share/man/man1/pftp.1.gz
+OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz
+OLD_FILES+=usr/share/man/man8/ftpd.8.gz
+.endif
+
.if ${MK_GNUCXX} == no
OLD_FILES+=usr/bin/g++
OLD_FILES+=usr/include/c++/4.2/algorithm
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r302329 - in head: . etc/mtree share share/colldef share/ctypedef share/locale-links share/monetdef share/msgdef share/numericdef share/timedef tools/build/mk tools/tools/locale/tools
On Sun, 3 Jul 2016 18:21:11 + (UTC) Baptiste Daroussin wrote: > Author: bapt > Date: Sun Jul 3 18:21:11 2016 > New Revision: 302329 > URL: https://svnweb.freebsd.org/changeset/base/302329 > > Log: > Posixify the locales name for variants > > For all locales with variants: > - if no ambiguity on the locale (only one variant) just use the > regular name > - if ambiguity, pick one as default and append @ to the > others respecting POSIX > > As a result: > - All the 3 components locales added recently are renamed to the > usual 2 components version for all but sr_RS.UTF-8 > - Set sr_RS.UTF-8 to the cyrillic variant > - Add sr_RS.UTF-8@latin > - Remove the symlinks aliases they were created to represent the 2 > components version as aliasas and are now useless > - Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to > reflect those changes > > Discussed with: ache@ > Approved by:re@ (gjb) > .. --- ipf_make --- (cd /usr/src/rescue/rescue/../../sbin/ipf/ipf && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no DIRPRFX=rescue/rescue/ipf/ depend && make -DRESCUE CRUNCH_CFLAGS=-DRESCUE MK_AUTO_OBJ=no DIRPRFX=rescue/rescue/ipf/ ipf.o ipfcomp.o ipf_y.o ipf_l.o bpf_filter.o addicmp.o addipopt.o alist_free.o alist_new.o allocmbt.o assigndefined.o bcopywrap.o binprint.o buildopts.o checkrev.o connecttcp.o count4bits.o count6bits.o debug.o dupmbt.o facpri.o familyname.o fill6bits.o findword.o flags.o freembt.o ftov.o genmask.o gethost.o getifname.o geticmptype.o getnattype.o getport.o getportproto.o getproto.o getsumd.o hostname.o icmpcode.o icmptypename.o icmptypes.o initparse.o interror.o ionames.o ipf_dotuning.o ipf_perror.o ipft_hx.o ipft_pc.o ipft_tx.o ipoptsec.o kmem.o kmemcpywrap.o kvatoname.o load_dstlist.o load_dstlistnode.o load_file.o load_hash.o load_hashnode.o load_http.o load_pool.o load_poolnode.o load_url.o mb_hexdump.o msgdsize.o mutex_emul.o nametokva.o nat_setgroupmap.o ntomask.o optname.o optprint.o optprintv6.o optvalue.o parsefields.o parseipfexpr.o parsewhoisline.o poolio.o portname.o prependmbt.o print_toif.o printactiveaddr.o printactivenat.o printaddr.o printaps.o printbuf.o printdstl_live.o printdstlist.o printdstlistdata.o printdstlistnode.o printdstlistpolicy.o printfieldhdr.o printfr.o printfraginfo.o printhash.o printhash_live.o printhashdata.o printhashnode.o printhost.o printhostmap.o printhostmask.o printifname.o printip.o printipfexpr.o printiphdr.o printlog.o printlookup.o printmask.o printnat.o printnataddr.o printnatfield.o printnatside.o printpacket.o printpacket6.o printpool.o printpool_live.o printpooldata.o printpoolfield.o printpoolnode.o printportcmp.o printproto.o printsbuf.o printstate.o printstatefields.o printtcpflags.o printtqtable.o printtunable.o printunit.o remove_hash.o remove_hashnode.o remove_pool.o remove_poolnode.o resetlexer.o rwlock_emul.o save_execute.o save_file.o save_nothing.o save_syslog.o save_v1trap.o save_v2trap.o vtof.o tcp_flags.o tcpflags.o tcpoptnames.o v6ionames.o v6optvalue.o var.o verbose.o) --- all_subdir_share --- ===> share (all) --- all_subdir_share/colldef --- ===> share/colldef (all) make[4]: make[4]: don't know how to make zh_CN.GB2312.LC_COLLATE. Stop make[4]: stopped in /usr/src/share/colldef *** [all_subdir_share/colldef] Error code 2 make[3]: stopped in /usr/src/share 1 error make[3]: stopped in /usr/src/share *** [all_subdir_share] Error code 2 make[2]: stopped in /usr/src --- all_subdir_secure --- A failure has been detected in another branch of the parallel make make[5]: stopped in /usr/src/secure/usr.bin/openssl *** [all_subdir_secure/usr.bin/openssl] Error code 2 make[4]: stopped in /usr/src/secure/usr.bin 1 error make[4]: stopped in /usr/src/secure/usr.bin *** [all_subdir_secure/usr.bin] Error code 2 make[3]: stopped in /usr/src/secure 1 error make[3]: stopped in /usr/src/secure *** [all_subdir_secure] Error code 2 make[2]: stopped in /usr/src --- all_subdir_gnu --- A failure has been detected in another branch of the parallel make make[8]: stopped in /usr/src/gnu/usr.bin/groff/src/roff/troff *** [all_subdir_gnu/usr.bin/groff/src/roff/troff] Error code 2 make[7]: stopped in /usr/src/gnu/usr.bin/groff/src/roff 1 error make[7]: stopped in /usr/src/gnu/usr.bin/groff/src/roff *** [all_subdir_gnu/usr.bin/groff/src/roff] Error code 2 make[6]: stopped in /usr/src/gnu/usr.bin/groff/src 1 error make[6]: stopped in /usr/src/gnu/usr.bin/groff/src *** [all_subdir_gnu/usr.bin/groff/src] Error code 2 make[5]: stopped in /usr/src/gnu/usr.bin/groff 1 error make[5]: stopped in /usr/src/gnu/usr.bin/groff *** [all_subdir_gnu/usr.bin/groff] Error code 2 make[4]: stopped in /usr/src/gnu/usr.bin 1 error make[4]: stopped in /usr/src/gnu/usr.bin *** [all_subdir_gnu/usr.bin] Error code 2 make[3]: stopped in /usr/src/gnu 1 error make[3]: stopped in /usr/src/gnu *** [all_subdir_gnu] Error code 2 make[2]: stopped in /usr/src --- all_subdir_sbin --- A failure has been detecte
svn commit: r302331 - head/share/colldef
Author: bapt Date: Sun Jul 3 19:31:21 2016 New Revision: 302331 URL: https://svnweb.freebsd.org/changeset/base/302331 Log: Add the forgotten "svn mv" from r302329 Reported by: Ivan Klymenko Approved by: re (implicit) Added: head/share/colldef/zh_CN.GB2312.src - copied unchanged from r302330, head/share/colldef/zh_Hans_CN.GB2312.src head/share/colldef/zh_CN.eucCN.src - copied unchanged from r302330, head/share/colldef/zh_Hans_CN.eucCN.src Deleted: head/share/colldef/zh_Hans_CN.GB2312.src head/share/colldef/zh_Hans_CN.eucCN.src Copied: head/share/colldef/zh_CN.GB2312.src (from r302330, head/share/colldef/zh_Hans_CN.GB2312.src) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/colldef/zh_CN.GB2312.src Sun Jul 3 19:31:21 2016 (r302331, copy of r302330, head/share/colldef/zh_Hans_CN.GB2312.src) @@ -0,0 +1,19817 @@ +# Warning: Do not edit. This is automatically extracted +# from CLDR project data, obtained from http://cldr.unicode.org/ +# - +comment_char * +escape_char / +LC_COLLATE +* + +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" +collating-element from "" + + +* Define collation weights as symbols + +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-symbol +collating-sy
Re: svn commit: r302329 - in head: . etc/mtree share share/colldef share/ctypedef share/locale-links share/monetdef share/msgdef share/numericdef share/timedef tools/build/mk tools/tools/locale/tools
On Sun, Jul 03, 2016 at 10:06:07PM +0300, Ivan Klymenko wrote: > On Sun, 3 Jul 2016 18:21:11 + (UTC) > Baptiste Daroussin wrote: > > > Author: bapt > > Date: Sun Jul 3 18:21:11 2016 > > New Revision: 302329 > > URL: https://svnweb.freebsd.org/changeset/base/302329 > > > > Log: > > Posixify the locales name for variants > > > > For all locales with variants: > > - if no ambiguity on the locale (only one variant) just use the > > regular name > > - if ambiguity, pick one as default and append @ to the > > others respecting POSIX > > > > As a result: > > - All the 3 components locales added recently are renamed to the > > usual 2 components version for all but sr_RS.UTF-8 > > - Set sr_RS.UTF-8 to the cyrillic variant > > - Add sr_RS.UTF-8@latin > > - Remove the symlinks aliases they were created to represent the 2 > > components version as aliasas and are now useless > > - Update the OptionalObsoleteFiles.inc and ObsoleteFiles.inc to > > reflect those changes > > > > Discussed with: ache@ > > Approved by: re@ (gjb) > > > .. Fixed sorry I have forgotten a svn mv... Bapt signature.asc Description: PGP signature
Re: svn commit: r302252 - head/sys/kern
On Sat, Jul 2, 2016 at 3:04 AM, Bruce Evans wrote:
> + .th_counter = &dummy_timecounter,
>> + .th_scale = (uint64_t)-1 / 100,
>> + .th_offset = {1, 0},
>>
>
> Is there a syntax for avoiding the explicit 0 in a nested initializer?
> Something like th_offset.tv_sec = 1.
C99 does not require complete initializers (though my habit of running with
clang -Weverything does). Just .th_offset = {1} should give the desired
result here. I did not think that .th_offset.tv_sec was valid, though, so
when not-the-initial element is nonzero some zeros would still be needed.
-Ben
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r302252 - head/sys/kern
On Sun, Jul 03, 2016 at 07:47:15PM -0500, Benjamin Kaduk wrote:
> On Sat, Jul 2, 2016 at 3:04 AM, Bruce Evans wrote:
>
> > + .th_counter = &dummy_timecounter,
> >> + .th_scale = (uint64_t)-1 / 100,
> >> + .th_offset = {1, 0},
> >>
> >
> > Is there a syntax for avoiding the explicit 0 in a nested initializer?
> > Something like th_offset.tv_sec = 1.
>
>
> C99 does not require complete initializers (though my habit of running with
> clang -Weverything does). Just .th_offset = {1} should give the desired
> result here. I did not think that .th_offset.tv_sec was valid, though, so
> when not-the-initial element is nonzero some zeros would still be needed.
Of course .th_offset.sec is not valid, but the patch posted later contained
the correct expression
.th_offset = { .sec = 1 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r302332 - head/usr.sbin/bhyve
Author: grehan
Date: Mon Jul 4 03:19:06 2016
New Revision: 302332
URL: https://svnweb.freebsd.org/changeset/base/302332
Log:
Import bhyve_graphics into CURRENT. Thanks to all who tested
this on the branch.
Original commit message:
Initial bhyve native graphics support.
This adds emulations for a raw framebuffer device, PS2 keyboard/mouse,
XHCI USB controller and a USB tablet.
A simple VNC server is provided for keyboard/mouse input, and graphics
output.
A VGA emulation is included, but is currently disconnected until an
additional bhyve change to block out VGA memory is committed.
Credits:
- raw framebuffer, VNC server, XHCI controller, USB bus/device emulation
and UEFI f/w support by Leon Dang
- VGA, console/g, initial VNC server by tychon@
- PS2 keyboard/mouse jointly done by tychon@ and Leon Dang
- hypervisor framebuffer mem support by neel@
Tested by: Michael Dexter, in a number of revisions of this code.
With the appropriate UEFI image, FreeBSD, Windows and Linux guests can
installed and run in graphics mode using the UEFI/GOP framebuffer.
Approved by: re (gjb)
Added:
- copied unchanged from r302324, projects/bhyve_graphics/atkbdc.h
- copied unchanged from r302324, projects/bhyve_graphics/bhyvegc.c
- copied unchanged from r302324, projects/bhyve_graphics/bhyvegc.h
- copied unchanged from r302324, projects/bhyve_graphics/console.c
- copied unchanged from r302324, projects/bhyve_graphics/console.h
- copied unchanged from r302324, projects/bhyve_graphics/pci_fbuf.c
- copied unchanged from r302324, projects/bhyve_graphics/pci_xhci.c
- copied unchanged from r302324, projects/bhyve_graphics/pci_xhci.h
- copied unchanged from r302324, projects/bhyve_graphics/ps2kbd.c
- copied unchanged from r302324, projects/bhyve_graphics/ps2kbd.h
- copied unchanged from r302324, projects/bhyve_graphics/ps2mouse.c
- copied unchanged from r302324, projects/bhyve_graphics/ps2mouse.h
- copied unchanged from r302324, projects/bhyve_graphics/rfb.c
- copied unchanged from r302324, projects/bhyve_graphics/rfb.h
- copied unchanged from r302324, projects/bhyve_graphics/sockstream.c
- copied unchanged from r302324, projects/bhyve_graphics/sockstream.h
- copied unchanged from r302324, projects/bhyve_graphics/usb_emul.c
- copied unchanged from r302324, projects/bhyve_graphics/usb_emul.h
- copied unchanged from r302324, projects/bhyve_graphics/usb_mouse.c
- copied unchanged from r302324, projects/bhyve_graphics/vga.c
- copied unchanged from r302324, projects/bhyve_graphics/vga.h
Directory Properties:
head/usr.sbin/bhyve/atkbdc.h (props changed)
head/usr.sbin/bhyve/bhyvegc.c (props changed)
head/usr.sbin/bhyve/bhyvegc.h (props changed)
head/usr.sbin/bhyve/console.c (props changed)
head/usr.sbin/bhyve/console.h (props changed)
head/usr.sbin/bhyve/pci_fbuf.c (props changed)
head/usr.sbin/bhyve/pci_xhci.c (props changed)
head/usr.sbin/bhyve/pci_xhci.h (props changed)
head/usr.sbin/bhyve/ps2kbd.c (props changed)
head/usr.sbin/bhyve/ps2kbd.h (props changed)
head/usr.sbin/bhyve/ps2mouse.c (props changed)
head/usr.sbin/bhyve/ps2mouse.h (props changed)
head/usr.sbin/bhyve/rfb.c (props changed)
head/usr.sbin/bhyve/rfb.h (props changed)
head/usr.sbin/bhyve/sockstream.c (props changed)
head/usr.sbin/bhyve/sockstream.h (props changed)
head/usr.sbin/bhyve/usb_emul.c (props changed)
head/usr.sbin/bhyve/usb_emul.h (props changed)
head/usr.sbin/bhyve/usb_mouse.c (props changed)
head/usr.sbin/bhyve/vga.c (props changed)
head/usr.sbin/bhyve/vga.h (props changed)
Modified:
head/usr.sbin/bhyve/Makefile
head/usr.sbin/bhyve/atkbdc.c
head/usr.sbin/bhyve/bhyverun.c
Modified: head/usr.sbin/bhyve/Makefile
==
--- head/usr.sbin/bhyve/MakefileSun Jul 3 19:31:21 2016
(r302331)
+++ head/usr.sbin/bhyve/MakefileMon Jul 4 03:19:06 2016
(r302332)
@@ -14,9 +14,11 @@ BHYVE_SYSDIR?=${SRCTOP}
SRCS= \
atkbdc.c\
acpi.c \
+ bhyvegc.c \
bhyverun.c \
block_if.c \
bootrom.c \
+ console.c \
consport.c \
dbgport.c \
fwctl.c \
@@ -27,6 +29,7 @@ SRCS= \
mptbl.c \
pci_ahci.c \
pci_emul.c \
+ pci_fbuf.c \
pci_hostbridge.c\
pci_irq.c \
pci_lpc.c \
@@ -35,20 +38,30 @@ SRCS= \
pci_virtio_net.c\
pci_virtio_rnd.c\
pci_uart.c \
+ pci_xhci.c \
Re: svn commit: r302297 - in head/sys/cddl/contrib/opensolaris: common/acl uts/common/fs/zfs uts/common/sys
False On Sat, Jul 2, 2016, 11:09 AM Edward Tomasz Napierała wrote: > On 0630T1455, Alexander Motin wrote: > > Author: mav > > Date: Thu Jun 30 14:55:49 2016 > > New Revision: 302297 > > URL: https://svnweb.freebsd.org/changeset/base/302297 > > > > Log: > > Revert r299454 and r299448. > > > > Those changes were found confusing FreeBSD libc ACL code, that doesn't > > differentiate ACL for directories and files, and report ACLs for all > > directories created after those patches as non-trivial. On the other > > side these changes were considered wrong from POSIX and NFSv4 points of > > view. Until further investigation done upstream, revert those changes > > locally in preparation for FreeBSD 11.0 release. > > Thanks! But it still doesn't pass the regression tests, due to broken > (or at least incompatible) interaction between inheritance and umask. > > ___ > svn-src-...@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" > -- Daniel Torres ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r302332 - head/usr.sbin/bhyve
On 2016-07-03 23:19, Peter Grehan wrote: > Author: grehan > Date: Mon Jul 4 03:19:06 2016 > New Revision: 302332 > URL: https://svnweb.freebsd.org/changeset/base/302332 > > Log: > Import bhyve_graphics into CURRENT. Thanks to all who tested > this on the branch. > > Original commit message: > Initial bhyve native graphics support. > > This adds emulations for a raw framebuffer device, PS2 keyboard/mouse, > XHCI USB controller and a USB tablet. > > A simple VNC server is provided for keyboard/mouse input, and graphics > output. > > A VGA emulation is included, but is currently disconnected until an > additional bhyve change to block out VGA memory is committed. > > Credits: > - raw framebuffer, VNC server, XHCI controller, USB bus/device emulation > and UEFI f/w support by Leon Dang > - VGA, console/g, initial VNC server by tychon@ > - PS2 keyboard/mouse jointly done by tychon@ and Leon Dang > - hypervisor framebuffer mem support by neel@ > > Tested by: Michael Dexter, in a number of revisions of this code. > > With the appropriate UEFI image, FreeBSD, Windows and Linux guests can > installed and run in graphics mode using the UEFI/GOP framebuffer. > > Approved by:re (gjb) > Thank you very much for this work. -- Allan Jude signature.asc Description: OpenPGP digital signature
Re: svn commit: r302163 - in head/sys: cam conf
Warner Losh writes: > Author: imp > Date: Thu Jun 23 23:20:58 2016 > New Revision: 302163 > URL: https://svnweb.freebsd.org/changeset/base/302163 > > Log: > Rename CAM_NETFLIX_IOSCHED to CAM_IOSCHED_DYNAMIC to better reflect > its nature. > > Approved by: re > Reviewed By: jhb > Differential Revision: https://reviews.freebsd.org/D6811 Do you plan to rename kern.cam.do_netflix_iosched sysctl as well? signature.asc Description: PGP signature
