From owner-svn-src-projects@freebsd.org Sun Nov 1 12:00:57 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04AACA235AC for ; Sun, 1 Nov 2015 12:00:57 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B765513DF; Sun, 1 Nov 2015 12:00:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA1C0tnc067375; Sun, 1 Nov 2015 12:00:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA1C0tEi067372; Sun, 1 Nov 2015 12:00:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511011200.tA1C0tEi067372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 1 Nov 2015 12:00:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290233 - in projects/collation: lib/libc/locale usr.bin/localedef X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Nov 2015 12:00:57 -0000 Author: bapt Date: Sun Nov 1 12:00:55 2015 New Revision: 290233 URL: https://svnweb.freebsd.org/changeset/base/290233 Log: libc: Fix (and improve) nl_langinfo (CODESET) The output of "locale charmap" is identical to the result of nl_langinfo (CODESET) for any given locale. The logic for returning the codeset was very simplistic. It just returned portion of the locale name after the period (e.g. en_FR.ISO8859-1 returned "ISO8859-1"). When softlinks were added to locales, this broke. e.g.: en_US returned "" en_FR.UTF8 returned "UTF8" en_FR.UTF-8 returned "UTF-8" zh_Hant_HK.Big5HKSCS returned "Big5HKSCS" zh_Hant_TW.Big5 returned "Big5" es_ES@euro returned "" In order to fix this properly, the named locale cannot be used to determine the encoding. This information was almost available in the rune data. Unfortunately, all the single byte encodings were listed as "NONE" encoding. So I adjusted localedef tool to provide more information about the encoding. For example, instead of "NONE", the LC_CTYPE used by fr_FR.ISO8859-15 is now encoded as "NONE:ISO8859-15". The locale handlers now check if the first four characters of the encoding is "NONE" and if so, treats it as a single-byte encoding. The nl_langinfo handling of CODESET was adjusting accordingly. Now the following is returned: en_US returns "ISO8859-1" fr_FR.UTF8 returns "UTF-8" fr_FR.UTF-8 returns "UTF-8" zh_Hant_HK.Big5HKSCS returns "Big5" zh_Hant_TW.Big5 returns "Big5" es_ES@euro returns "ISO8859-15" as before, "C" and "POSIX" locales return "US-ASCII". This is a big improvement. The result of nl_langinfo can never be a zero-length string and it will always exclusively one of the values of the character maps of /usr/src/tools/tools/locale/etc/final-maps. Submitted by: marino Obtained from: DragonflyBSD Modified: projects/collation/lib/libc/locale/nl_langinfo.c projects/collation/lib/libc/locale/setrunelocale.c projects/collation/usr.bin/localedef/wide.c Modified: projects/collation/lib/libc/locale/nl_langinfo.c ============================================================================== --- projects/collation/lib/libc/locale/nl_langinfo.c Sun Nov 1 08:40:15 2015 (r290232) +++ projects/collation/lib/libc/locale/nl_langinfo.c Sun Nov 1 12:00:55 2015 (r290233) @@ -37,7 +37,10 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include +#include "mblocal.h" #include "lnumeric.h" #include "lmessages.h" #include "lmonetary.h" @@ -54,14 +57,25 @@ nl_langinfo_l(nl_item item, locale_t loc switch (item) { case CODESET: - ret = ""; - if ((s = querylocale(LC_CTYPE_MASK, loc)) != NULL) { - if ((cs = strchr(s, '.')) != NULL) - ret = cs + 1; - else if (strcmp(s, "C") == 0 || - strcmp(s, "POSIX") == 0) - ret = "US-ASCII"; - } + s = XLOCALE_CTYPE(loc)->runes->__encoding; + if (strcmp(s, "EUC-CN") == 0) + ret = "eucCN"; + else if (strcmp(s, "EUC-JP") == 0) + ret = "eucJP"; + else if (strcmp(s, "EUC-KR") == 0) + ret = "eucKR"; + else if (strcmp(s, "EUC-TW") == 0) + ret = "eucTW"; + else if (strcmp(s, "BIG5") == 0) + ret = "Big5"; + else if (strcmp(s, "MSKanji") == 0) + ret = "SJIS"; + else if (strcmp(s, "NONE") == 0) + ret = "US-ASCII"; + else if (strncmp(s, "NONE:", 5) == 0) + ret = (char *)(s + 5); + else + ret = (char *)s; break; case D_T_FMT: ret = (char *) __get_current_time_locale(loc)->c_fmt; Modified: projects/collation/lib/libc/locale/setrunelocale.c ============================================================================== --- projects/collation/lib/libc/locale/setrunelocale.c Sun Nov 1 08:40:15 2015 (r290232) +++ projects/collation/lib/libc/locale/setrunelocale.c Sun Nov 1 12:00:55 2015 (r290233) @@ -129,7 +129,7 @@ __setrunelocale(struct xlocale_ctype *l, rl->__sputrune = NULL; rl->__sgetrune = NULL; - if (strcmp(rl->__encoding, "NONE") == 0) + if (strncmp(rl->__encoding, "NONE", 4) == 0) ret = _none_init(l, rl); else if (strcmp(rl->__encoding, "UTF-8") == 0) ret = _UTF8_init(l, rl); Modified: projects/collation/usr.bin/localedef/wide.c ============================================================================== --- projects/collation/usr.bin/localedef/wide.c Sun Nov 1 08:40:15 2015 (r290232) +++ projects/collation/usr.bin/localedef/wide.c Sun Nov 1 12:00:55 2015 (r290233) @@ -37,7 +37,6 @@ #include __FBSDID("$FreeBSD$"); -#include #include #include #include @@ -62,7 +61,8 @@ static int tomb_mbs(char *, wchar_t); static int (*_towide)(wchar_t *, const char *, unsigned) = towide_none; static int (*_tomb)(char *, wchar_t) = tomb_none; -static const char *_encoding = "NONE"; +static char _encoding_buffer[20] = {'N','O','N','E'}; +static const char *_encoding = _encoding_buffer; static int _nbits = 7; /* @@ -642,9 +642,9 @@ set_wide_encoding(const char *encoding) _towide = towide_none; _tomb = tomb_none; - _encoding = "NONE"; _nbits = 8; + snprint(_encoding_buffer, sizeof(_encoding_buffer), "NONE:%s", encoding); for (i = 0; mb_encodings[i].name; i++) { if (strcasecmp(encoding, mb_encodings[i].name) == 0) { _towide = mb_encodings[i].towide; From owner-svn-src-projects@freebsd.org Sun Nov 1 21:02:31 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC1AAA24235 for ; Sun, 1 Nov 2015 21:02:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A81901339; Sun, 1 Nov 2015 21:02:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA1L2UUS026120; Sun, 1 Nov 2015 21:02:30 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA1L2Ubi026119; Sun, 1 Nov 2015 21:02:30 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511012102.tA1L2Ubi026119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 1 Nov 2015 21:02:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290240 - projects/collation/lib/libc/locale X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Nov 2015 21:02:32 -0000 Author: bapt Date: Sun Nov 1 21:02:30 2015 New Revision: 290240 URL: https://svnweb.freebsd.org/changeset/base/290240 Log: locales: Fix eucJP sorting (broken upstream?) Sorting eucJP text with "sort" resulted in an illegal sequence while "gsort" worked. This was traced back to mbrtowc handling which was broken for eucJP (probably eucCN, eucKR, and eucTW as well). This small fix took hours to figure out. The OR operation to build the wide character requires an unsigned character to work correctly. The euc wcrtowc conversion is probably broken upstream in Illumos as well. Triggered by: misc/freebsd-doc-ja in ports (encoded in eucJP) Submitted by: marino Obtained from: DragonflyBSD Modified: projects/collation/lib/libc/locale/euc.c Modified: projects/collation/lib/libc/locale/euc.c ============================================================================== --- projects/collation/lib/libc/locale/euc.c Sun Nov 1 19:59:04 2015 (r290239) +++ projects/collation/lib/libc/locale/euc.c Sun Nov 1 21:02:30 2015 (r290240) @@ -317,8 +317,8 @@ _EUC_mbrtowc_impl(wchar_t * __restrict p { _EucState *es; int i, want; - wchar_t wc; - unsigned char ch; + wchar_t wc = 0; + unsigned char ch, chs; es = (_EucState *)ps; @@ -367,7 +367,8 @@ _EUC_mbrtowc_impl(wchar_t * __restrict p for (i = 0; i < MIN(want, n); i++) { wc <<= 8; - wc |= *s; + chs = *s; + wc |= chs; s++; } if (i < want) { From owner-svn-src-projects@freebsd.org Sun Nov 1 21:17:43 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D79FA243C2 for ; Sun, 1 Nov 2015 21:17:43 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C8E5718AD; Sun, 1 Nov 2015 21:17:42 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA1LHgJg029227; Sun, 1 Nov 2015 21:17:42 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA1LHeqa029206; Sun, 1 Nov 2015 21:17:40 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511012117.tA1LHeqa029206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 1 Nov 2015 21:17:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290241 - in projects/collation: . bin/csh bin/ls/tests cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/tools/ctf/cvt cddl/usr.sbin/dtrace/tests contrib/bmake contrib/bmake/mk... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Nov 2015 21:17:43 -0000 Author: bapt Date: Sun Nov 1 21:17:38 2015 New Revision: 290241 URL: https://svnweb.freebsd.org/changeset/base/290241 Log: Merge from head Added: projects/collation/contrib/bmake/metachar.c - copied unchanged from r290240, head/contrib/bmake/metachar.c projects/collation/contrib/bmake/metachar.h - copied unchanged from r290240, head/contrib/bmake/metachar.h projects/collation/contrib/libucl/CMakeLists.txt - copied unchanged from r290240, head/contrib/libucl/CMakeLists.txt projects/collation/contrib/libucl/examples/ - copied from r290240, head/contrib/libucl/examples/ projects/collation/contrib/libucl/include/ucl++.h - copied unchanged from r290240, head/contrib/libucl/include/ucl++.h projects/collation/contrib/libucl/m4/ - copied from r290240, head/contrib/libucl/m4/ projects/collation/contrib/libucl/python/ - copied from r290240, head/contrib/libucl/python/ projects/collation/contrib/libucl/src/ucl_msgpack.c - copied unchanged from r290240, head/contrib/libucl/src/ucl_msgpack.c projects/collation/contrib/libucl/src/ucl_sexp.c - copied unchanged from r290240, head/contrib/libucl/src/ucl_sexp.c projects/collation/contrib/libucl/tests/basic/15.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/15.in projects/collation/contrib/libucl/tests/basic/15.inc - copied unchanged from r290240, head/contrib/libucl/tests/basic/15.inc projects/collation/contrib/libucl/tests/basic/15.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/15.res projects/collation/contrib/libucl/tests/basic/16.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/16.in projects/collation/contrib/libucl/tests/basic/16.inc - copied unchanged from r290240, head/contrib/libucl/tests/basic/16.inc projects/collation/contrib/libucl/tests/basic/16.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/16.res projects/collation/contrib/libucl/tests/basic/17.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/17.in projects/collation/contrib/libucl/tests/basic/17.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/17.res projects/collation/contrib/libucl/tests/basic/18.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/18.in projects/collation/contrib/libucl/tests/basic/18.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/18.res projects/collation/contrib/libucl/tests/basic/19-append.inc - copied unchanged from r290240, head/contrib/libucl/tests/basic/19-append.inc projects/collation/contrib/libucl/tests/basic/19-merge.inc - copied unchanged from r290240, head/contrib/libucl/tests/basic/19-merge.inc projects/collation/contrib/libucl/tests/basic/19-rewrite.inc - copied unchanged from r290240, head/contrib/libucl/tests/basic/19-rewrite.inc projects/collation/contrib/libucl/tests/basic/19.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/19.in projects/collation/contrib/libucl/tests/basic/19.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/19.res projects/collation/contrib/libucl/tests/basic/20.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/20.in projects/collation/contrib/libucl/tests/basic/20.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/20.res projects/collation/contrib/libucl/tests/basic/21.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/21.in projects/collation/contrib/libucl/tests/basic/21.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/21.res projects/collation/contrib/libucl/tests/basic/22.in - copied unchanged from r290240, head/contrib/libucl/tests/basic/22.in projects/collation/contrib/libucl/tests/basic/22.res - copied unchanged from r290240, head/contrib/libucl/tests/basic/22.res projects/collation/contrib/libucl/tests/msgpack.test - copied unchanged from r290240, head/contrib/libucl/tests/msgpack.test projects/collation/contrib/libucl/tests/test_msgpack.c - copied unchanged from r290240, head/contrib/libucl/tests/test_msgpack.c projects/collation/contrib/libucl/utils/ucl-tool.c - copied unchanged from r290240, head/contrib/libucl/utils/ucl-tool.c projects/collation/contrib/ntp/include/rc_cmdlength.h - copied unchanged from r290240, head/contrib/ntp/include/rc_cmdlength.h projects/collation/contrib/ntp/sntp/m4/ntp_problemtests.m4 - copied unchanged from r290240, head/contrib/ntp/sntp/m4/ntp_problemtests.m4 projects/collation/contrib/ntp/sntp/tests/fileHandlingTest.c - copied unchanged from r290240, head/contrib/ntp/sntp/tests/fileHandlingTest.c projects/collation/contrib/ntp/sntp/tests/run-t-log.c - copied unchanged from r290240, head/contrib/ntp/sntp/tests/run-t-log.c projects/collation/contrib/ntp/sntp/tests/sntptest.c - copied unchanged from r290240, head/contrib/ntp/sntp/tests/sntptest.c projects/collation/contrib/ntp/sntp/tests/t-log.c - copied unchanged from r290240, head/contrib/ntp/sntp/tests/t-log.c projects/collation/contrib/ntp/sntp/unity/auto/parseOutput.rb - copied unchanged from r290240, head/contrib/ntp/sntp/unity/auto/parseOutput.rb projects/collation/contrib/ntp/sntp/unity/auto/type_sanitizer.rb - copied unchanged from r290240, head/contrib/ntp/sntp/unity/auto/type_sanitizer.rb projects/collation/contrib/ntp/sntp/unity/auto/unity_test_summary.py - copied unchanged from r290240, head/contrib/ntp/sntp/unity/auto/unity_test_summary.py projects/collation/contrib/ntp/sntp/unity/unity_config.h - copied unchanged from r290240, head/contrib/ntp/sntp/unity/unity_config.h projects/collation/contrib/ntp/tests/libntp/lfptest.c - copied unchanged from r290240, head/contrib/ntp/tests/libntp/lfptest.c projects/collation/contrib/ntp/tests/libntp/sockaddrtest.c - copied unchanged from r290240, head/contrib/ntp/tests/libntp/sockaddrtest.c projects/collation/contrib/ntp/tests/ntpd/leapsec.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/leapsec.c projects/collation/contrib/ntp/tests/ntpd/ntp_prio_q.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/ntp_prio_q.c projects/collation/contrib/ntp/tests/ntpd/ntp_restrict.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/ntp_restrict.c projects/collation/contrib/ntp/tests/ntpd/rc_cmdlength.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/rc_cmdlength.c projects/collation/contrib/ntp/tests/ntpd/run-leapsec.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/run-leapsec.c projects/collation/contrib/ntp/tests/ntpd/run-ntp_prio_q.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/run-ntp_prio_q.c projects/collation/contrib/ntp/tests/ntpd/run-ntp_restrict.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/run-ntp_restrict.c projects/collation/contrib/ntp/tests/ntpd/run-rc_cmdlength.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/run-rc_cmdlength.c projects/collation/contrib/ntp/tests/ntpd/run-t-ntp_scanner.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/run-t-ntp_scanner.c projects/collation/contrib/ntp/tests/ntpd/run-t-ntp_signd.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/run-t-ntp_signd.c projects/collation/contrib/ntp/tests/ntpd/t-ntp_scanner.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/t-ntp_scanner.c projects/collation/contrib/ntp/tests/ntpd/t-ntp_signd.c - copied unchanged from r290240, head/contrib/ntp/tests/ntpd/t-ntp_signd.c projects/collation/contrib/ntp/tests/ntpq/ - copied from r290240, head/contrib/ntp/tests/ntpq/ projects/collation/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl - copied unchanged from r290240, head/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl projects/collation/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl - copied unchanged from r290240, head/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl projects/collation/crypto/openssl/crypto/aes/asm/aesp8-ppc.pl - copied unchanged from r290240, head/crypto/openssl/crypto/aes/asm/aesp8-ppc.pl projects/collation/crypto/openssl/crypto/aes/asm/aest4-sparcv9.pl - copied unchanged from r290240, head/crypto/openssl/crypto/aes/asm/aest4-sparcv9.pl projects/collation/crypto/openssl/crypto/aes/asm/aesv8-armx.pl - copied unchanged from r290240, head/crypto/openssl/crypto/aes/asm/aesv8-armx.pl projects/collation/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl - copied unchanged from r290240, head/crypto/openssl/crypto/aes/asm/bsaes-armv7.pl projects/collation/crypto/openssl/crypto/aes/asm/vpaes-ppc.pl - copied unchanged from r290240, head/crypto/openssl/crypto/aes/asm/vpaes-ppc.pl projects/collation/crypto/openssl/crypto/arm64cpuid.S - copied unchanged from r290240, head/crypto/openssl/crypto/arm64cpuid.S projects/collation/crypto/openssl/crypto/bn/asm/mips3.s - copied unchanged from r290240, head/crypto/openssl/crypto/bn/asm/mips3.s projects/collation/crypto/openssl/crypto/bn/asm/rsaz-avx2.pl - copied unchanged from r290240, head/crypto/openssl/crypto/bn/asm/rsaz-avx2.pl projects/collation/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl - copied unchanged from r290240, head/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl projects/collation/crypto/openssl/crypto/bn/asm/sparct4-mont.pl - copied unchanged from r290240, head/crypto/openssl/crypto/bn/asm/sparct4-mont.pl projects/collation/crypto/openssl/crypto/bn/asm/sparcv9-gf2m.pl - copied unchanged from r290240, head/crypto/openssl/crypto/bn/asm/sparcv9-gf2m.pl projects/collation/crypto/openssl/crypto/bn/asm/vis3-mont.pl - copied unchanged from r290240, head/crypto/openssl/crypto/bn/asm/vis3-mont.pl projects/collation/crypto/openssl/crypto/bn/rsaz_exp.c - copied unchanged from r290240, head/crypto/openssl/crypto/bn/rsaz_exp.c projects/collation/crypto/openssl/crypto/bn/rsaz_exp.h - copied unchanged from r290240, head/crypto/openssl/crypto/bn/rsaz_exp.h projects/collation/crypto/openssl/crypto/camellia/asm/cmllt4-sparcv9.pl - copied unchanged from r290240, head/crypto/openssl/crypto/camellia/asm/cmllt4-sparcv9.pl projects/collation/crypto/openssl/crypto/cms/cms_kari.c - copied unchanged from r290240, head/crypto/openssl/crypto/cms/cms_kari.c projects/collation/crypto/openssl/crypto/des/asm/dest4-sparcv9.pl - copied unchanged from r290240, head/crypto/openssl/crypto/des/asm/dest4-sparcv9.pl projects/collation/crypto/openssl/crypto/dh/dh_kdf.c - copied unchanged from r290240, head/crypto/openssl/crypto/dh/dh_kdf.c projects/collation/crypto/openssl/crypto/dh/dh_rfc5114.c - copied unchanged from r290240, head/crypto/openssl/crypto/dh/dh_rfc5114.c projects/collation/crypto/openssl/crypto/ec/asm/ - copied from r290240, head/crypto/openssl/crypto/ec/asm/ projects/collation/crypto/openssl/crypto/ec/ecp_nistz256.c - copied unchanged from r290240, head/crypto/openssl/crypto/ec/ecp_nistz256.c projects/collation/crypto/openssl/crypto/ec/ecp_nistz256_table.c - copied unchanged from r290240, head/crypto/openssl/crypto/ec/ecp_nistz256_table.c projects/collation/crypto/openssl/crypto/ecdh/ech_kdf.c - copied unchanged from r290240, head/crypto/openssl/crypto/ecdh/ech_kdf.c projects/collation/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c - copied unchanged from r290240, head/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha256.c projects/collation/crypto/openssl/crypto/md5/asm/md5-sparcv9.pl - copied unchanged from r290240, head/crypto/openssl/crypto/md5/asm/md5-sparcv9.pl projects/collation/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl - copied unchanged from r290240, head/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl projects/collation/crypto/openssl/crypto/modes/asm/ghashp8-ppc.pl - copied unchanged from r290240, head/crypto/openssl/crypto/modes/asm/ghashp8-ppc.pl projects/collation/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl - copied unchanged from r290240, head/crypto/openssl/crypto/modes/asm/ghashv8-armx.pl projects/collation/crypto/openssl/crypto/modes/wrap128.c - copied unchanged from r290240, head/crypto/openssl/crypto/modes/wrap128.c projects/collation/crypto/openssl/crypto/perlasm/sparcv9_modes.pl - copied unchanged from r290240, head/crypto/openssl/crypto/perlasm/sparcv9_modes.pl projects/collation/crypto/openssl/crypto/ppc_arch.h - copied unchanged from r290240, head/crypto/openssl/crypto/ppc_arch.h projects/collation/crypto/openssl/crypto/sha/asm/sha1-armv8.pl - copied unchanged from r290240, head/crypto/openssl/crypto/sha/asm/sha1-armv8.pl projects/collation/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl - copied unchanged from r290240, head/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl projects/collation/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl - copied unchanged from r290240, head/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-armv8.pl - copied unchanged from r290240, head/crypto/openssl/crypto/sha/asm/sha512-armv8.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512p8-ppc.pl - copied unchanged from r290240, head/crypto/openssl/crypto/sha/asm/sha512p8-ppc.pl projects/collation/crypto/openssl/crypto/sparc_arch.h - copied unchanged from r290240, head/crypto/openssl/crypto/sparc_arch.h projects/collation/crypto/openssl/crypto/x509/vpm_int.h - copied unchanged from r290240, head/crypto/openssl/crypto/x509/vpm_int.h projects/collation/crypto/openssl/crypto/x509v3/v3_scts.c - copied unchanged from r290240, head/crypto/openssl/crypto/x509v3/v3_scts.c projects/collation/crypto/openssl/crypto/x509v3/v3nametest.c - copied unchanged from r290240, head/crypto/openssl/crypto/x509v3/v3nametest.c projects/collation/crypto/openssl/doc/crypto/ASN1_TIME_set.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/ASN1_TIME_set.pod projects/collation/crypto/openssl/doc/crypto/EC_GFp_simple_method.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/EC_GFp_simple_method.pod projects/collation/crypto/openssl/doc/crypto/EC_GROUP_copy.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/EC_GROUP_copy.pod projects/collation/crypto/openssl/doc/crypto/EC_GROUP_new.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/EC_GROUP_new.pod projects/collation/crypto/openssl/doc/crypto/EC_KEY_new.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/EC_KEY_new.pod projects/collation/crypto/openssl/doc/crypto/EC_POINT_add.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/EC_POINT_add.pod projects/collation/crypto/openssl/doc/crypto/EC_POINT_new.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/EC_POINT_new.pod projects/collation/crypto/openssl/doc/crypto/OPENSSL_instrument_bus.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/OPENSSL_instrument_bus.pod projects/collation/crypto/openssl/doc/crypto/SSLeay_version.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/SSLeay_version.pod projects/collation/crypto/openssl/doc/crypto/X509_check_host.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/X509_check_host.pod projects/collation/crypto/openssl/doc/crypto/d2i_ECPKParameters.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/d2i_ECPKParameters.pod projects/collation/crypto/openssl/doc/crypto/ec.pod - copied unchanged from r290240, head/crypto/openssl/doc/crypto/ec.pod projects/collation/crypto/openssl/doc/ssl/SSL_CONF_CTX_new.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CONF_CTX_new.pod projects/collation/crypto/openssl/doc/ssl/SSL_CONF_CTX_set1_prefix.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CONF_CTX_set1_prefix.pod projects/collation/crypto/openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CONF_CTX_set_flags.pod projects/collation/crypto/openssl/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod projects/collation/crypto/openssl/doc/ssl/SSL_CONF_cmd.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CONF_cmd.pod projects/collation/crypto/openssl/doc/ssl/SSL_CONF_cmd_argv.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CONF_cmd_argv.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_add1_chain_cert.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CTX_add1_chain_cert.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_get0_param.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CTX_get0_param.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_set1_curves.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CTX_set1_curves.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_set1_verify_cert_store.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CTX_set1_verify_cert_store.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_set_cert_cb.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CTX_set_cert_cb.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_set_custom_cli_ext.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CTX_set_custom_cli_ext.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_use_serverinfo.pod - copied unchanged from r290240, head/crypto/openssl/doc/ssl/SSL_CTX_use_serverinfo.pod projects/collation/crypto/openssl/ssl/ssl_conf.c - copied unchanged from r290240, head/crypto/openssl/ssl/ssl_conf.c projects/collation/crypto/openssl/ssl/t1_ext.c - copied unchanged from r290240, head/crypto/openssl/ssl/t1_ext.c projects/collation/crypto/openssl/ssl/t1_trce.c - copied unchanged from r290240, head/crypto/openssl/ssl/t1_trce.c projects/collation/crypto/openssl/util/copy-if-different.pl - copied unchanged from r290240, head/crypto/openssl/util/copy-if-different.pl projects/collation/etc/mtree/BSD.lib32.dist - copied unchanged from r290240, head/etc/mtree/BSD.lib32.dist projects/collation/libexec/dma/dma-mbox-create/Makefile.depend - copied unchanged from r290240, head/libexec/dma/dma-mbox-create/Makefile.depend projects/collation/libexec/dma/dmagent/Makefile.depend - copied unchanged from r290240, head/libexec/dma/dmagent/Makefile.depend projects/collation/libexec/rtld-elf/paths.h - copied unchanged from r290240, head/libexec/rtld-elf/paths.h projects/collation/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/aesni-gcm-x86_64.S projects/collation/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/aesni-mb-x86_64.S projects/collation/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/aesni-sha256-x86_64.S projects/collation/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/ecp_nistz256-x86_64.S projects/collation/secure/lib/libcrypto/amd64/rsaz-avx2.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/rsaz-avx2.S projects/collation/secure/lib/libcrypto/amd64/rsaz-x86_64.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/rsaz-x86_64.S projects/collation/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/sha1-mb-x86_64.S projects/collation/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S - copied unchanged from r290240, head/secure/lib/libcrypto/amd64/sha256-mb-x86_64.S projects/collation/secure/lib/libcrypto/engines/libcapi/ - copied from r290240, head/secure/lib/libcrypto/engines/libcapi/ projects/collation/secure/lib/libcrypto/man/ASN1_TIME_set.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/ASN1_TIME_set.3 projects/collation/secure/lib/libcrypto/man/EC_GFp_simple_method.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/EC_GFp_simple_method.3 projects/collation/secure/lib/libcrypto/man/EC_GROUP_copy.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/EC_GROUP_copy.3 projects/collation/secure/lib/libcrypto/man/EC_GROUP_new.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/EC_GROUP_new.3 projects/collation/secure/lib/libcrypto/man/EC_KEY_new.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/EC_KEY_new.3 projects/collation/secure/lib/libcrypto/man/EC_POINT_add.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/EC_POINT_add.3 projects/collation/secure/lib/libcrypto/man/EC_POINT_new.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/EC_POINT_new.3 projects/collation/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3 projects/collation/secure/lib/libcrypto/man/SSLeay_version.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/SSLeay_version.3 projects/collation/secure/lib/libcrypto/man/X509_check_host.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/X509_check_host.3 projects/collation/secure/lib/libcrypto/man/d2i_ECPKParameters.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/d2i_ECPKParameters.3 projects/collation/secure/lib/libcrypto/man/ec.3 - copied unchanged from r290240, head/secure/lib/libcrypto/man/ec.3 projects/collation/secure/lib/libssl/man/SSL_CONF_CTX_new.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CONF_CTX_new.3 projects/collation/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3 projects/collation/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3 projects/collation/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3 projects/collation/secure/lib/libssl/man/SSL_CONF_cmd.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CONF_cmd.3 projects/collation/secure/lib/libssl/man/SSL_CONF_cmd_argv.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CONF_cmd_argv.3 projects/collation/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3 projects/collation/secure/lib/libssl/man/SSL_CTX_get0_param.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CTX_get0_param.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set1_curves.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CTX_set1_curves.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3 projects/collation/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3 - copied unchanged from r290240, head/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3 projects/collation/share/man/man9/cpuset.9 - copied unchanged from r290240, head/share/man/man9/cpuset.9 projects/collation/sys/arm64/cloudabi64/ - copied from r290240, head/sys/arm64/cloudabi64/ projects/collation/sys/compat/cloudabi64/cloudabi64_module.c - copied unchanged from r290240, head/sys/compat/cloudabi64/cloudabi64_module.c projects/collation/sys/compat/linuxkpi/ - copied from r290240, head/sys/compat/linuxkpi/ projects/collation/sys/dev/etherswitch/e6000sw/ - copied from r290240, head/sys/dev/etherswitch/e6000sw/ projects/collation/sys/libkern/ffsll.c - copied unchanged from r290240, head/sys/libkern/ffsll.c projects/collation/sys/mips/conf/TL-WR740Nv4 - copied unchanged from r290240, head/sys/mips/conf/TL-WR740Nv4 projects/collation/sys/mips/conf/TL-WR740Nv4.hints - copied unchanged from r290240, head/sys/mips/conf/TL-WR740Nv4.hints projects/collation/sys/modules/dtrace/systrace_linux/ - copied from r290240, head/sys/modules/dtrace/systrace_linux/ projects/collation/sys/modules/linuxkpi/ - copied from r290240, head/sys/modules/linuxkpi/ projects/collation/sys/x86/include/xen/ - copied from r290240, head/sys/x86/include/xen/ projects/collation/tests/sys/kern/kern_copyin.c - copied unchanged from r290240, head/tests/sys/kern/kern_copyin.c projects/collation/tools/build/options/WITHOUT_DEBUG_FILES - copied unchanged from r290240, head/tools/build/options/WITHOUT_DEBUG_FILES projects/collation/tools/test/net/ - copied from r290240, head/tools/test/net/ projects/collation/usr.bin/systat/sctp.c - copied unchanged from r290240, head/usr.bin/systat/sctp.c projects/collation/usr.bin/truss/aarch64-cloudabi64.c - copied unchanged from r290240, head/usr.bin/truss/aarch64-cloudabi64.c projects/collation/usr.bin/truss/cloudabi.c - copied unchanged from r290240, head/usr.bin/truss/cloudabi.c projects/collation/usr.bin/truss/cloudabi.h - copied unchanged from r290240, head/usr.bin/truss/cloudabi.h projects/collation/usr.sbin/makefs/tests/ - copied from r290240, head/usr.sbin/makefs/tests/ projects/collation/usr.sbin/mpsutil/ - copied from r290240, head/usr.sbin/mpsutil/ Deleted: projects/collation/contrib/libucl/cmake/ projects/collation/contrib/ntp/FREEBSD-Xlist projects/collation/contrib/ntp/FREEBSD-upgrade projects/collation/contrib/ntp/sntp/libevent/sample/ projects/collation/contrib/ntp/sntp/tests/fileHandlingTest.h projects/collation/contrib/ntp/sntp/tests/g_fileHandlingTest.h projects/collation/contrib/ntp/sntp/tests/g_networking.cpp projects/collation/contrib/ntp/sntp/tests/g_packetHandling.cpp projects/collation/contrib/ntp/sntp/tests/g_packetProcessing.cpp projects/collation/contrib/ntp/sntp/tests/g_sntptest.h projects/collation/contrib/ntp/sntp/tests_main.cpp projects/collation/contrib/ntp/sntp/tests_main.h projects/collation/contrib/ntp/tests/libntp/g_a_md5encrypt.cpp projects/collation/contrib/ntp/tests/libntp/g_atoint.cpp projects/collation/contrib/ntp/tests/libntp/g_atouint.cpp projects/collation/contrib/ntp/tests/libntp/g_authkeys.cpp projects/collation/contrib/ntp/tests/libntp/g_buftvtots.cpp projects/collation/contrib/ntp/tests/libntp/g_calendar.cpp projects/collation/contrib/ntp/tests/libntp/g_caljulian.cpp projects/collation/contrib/ntp/tests/libntp/g_caltontp.cpp projects/collation/contrib/ntp/tests/libntp/g_calyearstart.cpp projects/collation/contrib/ntp/tests/libntp/g_clocktime.cpp projects/collation/contrib/ntp/tests/libntp/g_decodenetnum.cpp projects/collation/contrib/ntp/tests/libntp/g_hextoint.cpp projects/collation/contrib/ntp/tests/libntp/g_hextolfp.cpp projects/collation/contrib/ntp/tests/libntp/g_humandate.cpp projects/collation/contrib/ntp/tests/libntp/g_lfpfunc.cpp projects/collation/contrib/ntp/tests/libntp/g_lfptest.h projects/collation/contrib/ntp/tests/libntp/g_lfptostr.cpp projects/collation/contrib/ntp/tests/libntp/g_libntptest.cpp projects/collation/contrib/ntp/tests/libntp/g_libntptest.h projects/collation/contrib/ntp/tests/libntp/g_modetoa.cpp projects/collation/contrib/ntp/tests/libntp/g_msyslog.cpp projects/collation/contrib/ntp/tests/libntp/g_netof.cpp projects/collation/contrib/ntp/tests/libntp/g_numtoa.cpp projects/collation/contrib/ntp/tests/libntp/g_numtohost.cpp projects/collation/contrib/ntp/tests/libntp/g_octtoint.cpp projects/collation/contrib/ntp/tests/libntp/g_prettydate.cpp projects/collation/contrib/ntp/tests/libntp/g_recvbuff.cpp projects/collation/contrib/ntp/tests/libntp/g_refnumtoa.cpp projects/collation/contrib/ntp/tests/libntp/g_sfptostr.cpp projects/collation/contrib/ntp/tests/libntp/g_sockaddrtest.h projects/collation/contrib/ntp/tests/libntp/g_socktoa.cpp projects/collation/contrib/ntp/tests/libntp/g_ssl_init.cpp projects/collation/contrib/ntp/tests/libntp/g_statestr.cpp projects/collation/contrib/ntp/tests/libntp/g_strtolfp.cpp projects/collation/contrib/ntp/tests/libntp/g_timespecops.cpp projects/collation/contrib/ntp/tests/libntp/g_timestructs.cpp projects/collation/contrib/ntp/tests/libntp/g_timestructs.h projects/collation/contrib/ntp/tests/libntp/g_timevalops.cpp projects/collation/contrib/ntp/tests/libntp/g_tstotv.cpp projects/collation/contrib/ntp/tests/libntp/g_tvtots.cpp projects/collation/contrib/ntp/tests/libntp/g_uglydate.cpp projects/collation/contrib/ntp/tests/libntp/g_vi64ops.cpp projects/collation/contrib/ntp/tests/libntp/g_ymd2yd.cpp projects/collation/contrib/ntp/tests/ntpd/leapsec.cpp projects/collation/contrib/ntp/tests/ntpd/ntpdtest.cpp projects/collation/contrib/ntp/tests/ntpd/ntpdtest.h projects/collation/crypto/openssl/crypto/bn/asm/modexp512-x86_64.pl projects/collation/crypto/openssl/crypto/engine/eng_rsax.c projects/collation/crypto/openssl/crypto/evp/evp_fips.c projects/collation/crypto/openssl/ssl/d1_enc.c projects/collation/gnu/usr.bin/groff/src/devices/xditview/ projects/collation/lib/libgpib/ projects/collation/secure/lib/libcrypto/amd64/modexp512-x86_64.S projects/collation/secure/lib/libcrypto/i386/cast-586.s projects/collation/sys/arm/conf/EP80219 projects/collation/sys/arm/conf/IQ31244 projects/collation/sys/arm/conf/LN2410SBC projects/collation/sys/arm/samsung/s3c2xx0/ projects/collation/sys/dev/usb/usb_compat_linux.c projects/collation/sys/dev/usb/usb_compat_linux.h projects/collation/sys/modules/ispfw/isp_2400_multi/ projects/collation/sys/modules/ispfw/isp_2500_multi/ projects/collation/sys/modules/linuxapi/ projects/collation/sys/ofed/include/asm/ projects/collation/sys/ofed/include/linux/bitops.h projects/collation/sys/ofed/include/linux/cache.h projects/collation/sys/ofed/include/linux/cdev.h projects/collation/sys/ofed/include/linux/clocksource.h projects/collation/sys/ofed/include/linux/compat.h projects/collation/sys/ofed/include/linux/compiler.h projects/collation/sys/ofed/include/linux/completion.h projects/collation/sys/ofed/include/linux/delay.h projects/collation/sys/ofed/include/linux/device.h projects/collation/sys/ofed/include/linux/dma-attrs.h projects/collation/sys/ofed/include/linux/dma-mapping.h projects/collation/sys/ofed/include/linux/dmapool.h projects/collation/sys/ofed/include/linux/err.h projects/collation/sys/ofed/include/linux/errno.h projects/collation/sys/ofed/include/linux/etherdevice.h projects/collation/sys/ofed/include/linux/file.h projects/collation/sys/ofed/include/linux/fs.h projects/collation/sys/ofed/include/linux/gfp.h projects/collation/sys/ofed/include/linux/hardirq.h projects/collation/sys/ofed/include/linux/idr.h projects/collation/sys/ofed/include/linux/if_arp.h projects/collation/sys/ofed/include/linux/if_ether.h projects/collation/sys/ofed/include/linux/if_vlan.h projects/collation/sys/ofed/include/linux/in.h projects/collation/sys/ofed/include/linux/in6.h projects/collation/sys/ofed/include/linux/inetdevice.h projects/collation/sys/ofed/include/linux/interrupt.h projects/collation/sys/ofed/include/linux/io-mapping.h projects/collation/sys/ofed/include/linux/io.h projects/collation/sys/ofed/include/linux/ioctl.h projects/collation/sys/ofed/include/linux/jhash.h projects/collation/sys/ofed/include/linux/jiffies.h projects/collation/sys/ofed/include/linux/kdev_t.h projects/collation/sys/ofed/include/linux/kernel.h projects/collation/sys/ofed/include/linux/kmod.h projects/collation/sys/ofed/include/linux/kobject.h projects/collation/sys/ofed/include/linux/kref.h projects/collation/sys/ofed/include/linux/kthread.h projects/collation/sys/ofed/include/linux/ktime.h projects/collation/sys/ofed/include/linux/linux_compat.c projects/collation/sys/ofed/include/linux/linux_idr.c projects/collation/sys/ofed/include/linux/linux_kmod.c projects/collation/sys/ofed/include/linux/linux_pci.c projects/collation/sys/ofed/include/linux/linux_radix.c projects/collation/sys/ofed/include/linux/list.h projects/collation/sys/ofed/include/linux/lockdep.h projects/collation/sys/ofed/include/linux/log2.h projects/collation/sys/ofed/include/linux/math64.h projects/collation/sys/ofed/include/linux/miscdevice.h projects/collation/sys/ofed/include/linux/mm.h projects/collation/sys/ofed/include/linux/module.h projects/collation/sys/ofed/include/linux/moduleparam.h projects/collation/sys/ofed/include/linux/mutex.h projects/collation/sys/ofed/include/linux/net.h projects/collation/sys/ofed/include/linux/netdevice.h projects/collation/sys/ofed/include/linux/notifier.h projects/collation/sys/ofed/include/linux/page.h projects/collation/sys/ofed/include/linux/pci.h projects/collation/sys/ofed/include/linux/poll.h projects/collation/sys/ofed/include/linux/printk.h projects/collation/sys/ofed/include/linux/radix-tree.h projects/collation/sys/ofed/include/linux/random.h projects/collation/sys/ofed/include/linux/rbtree.h projects/collation/sys/ofed/include/linux/rwlock.h projects/collation/sys/ofed/include/linux/rwsem.h projects/collation/sys/ofed/include/linux/scatterlist.h projects/collation/sys/ofed/include/linux/sched.h projects/collation/sys/ofed/include/linux/semaphore.h projects/collation/sys/ofed/include/linux/slab.h projects/collation/sys/ofed/include/linux/socket.h projects/collation/sys/ofed/include/linux/spinlock.h projects/collation/sys/ofed/include/linux/string.h projects/collation/sys/ofed/include/linux/sysfs.h projects/collation/sys/ofed/include/linux/timer.h projects/collation/sys/ofed/include/linux/types.h projects/collation/sys/ofed/include/linux/uaccess.h projects/collation/sys/ofed/include/linux/vmalloc.h projects/collation/sys/ofed/include/linux/wait.h projects/collation/sys/ofed/include/linux/workqueue.h projects/collation/sys/ofed/include/net/ Modified: projects/collation/MAINTAINERS (contents, props changed) projects/collation/Makefile.inc1 projects/collation/ObsoleteFiles.inc projects/collation/UPDATING projects/collation/bin/csh/config_p.h projects/collation/bin/ls/tests/ls_tests.sh projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/collation/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c projects/collation/cddl/usr.sbin/dtrace/tests/Makefile.inc1 projects/collation/contrib/bmake/ChangeLog projects/collation/contrib/bmake/FILES projects/collation/contrib/bmake/Makefile projects/collation/contrib/bmake/arch.c projects/collation/contrib/bmake/compat.c projects/collation/contrib/bmake/cond.c projects/collation/contrib/bmake/configure.in projects/collation/contrib/bmake/for.c projects/collation/contrib/bmake/job.c projects/collation/contrib/bmake/main.c projects/collation/contrib/bmake/make-bootstrap.sh.in projects/collation/contrib/bmake/make.c projects/collation/contrib/bmake/make.h projects/collation/contrib/bmake/meta.c projects/collation/contrib/bmake/mk/ChangeLog projects/collation/contrib/bmake/mk/auto.obj.mk projects/collation/contrib/bmake/mk/dirdeps.mk projects/collation/contrib/bmake/mk/doc.mk projects/collation/contrib/bmake/mk/gendirdeps.mk projects/collation/contrib/bmake/mk/host-target.mk projects/collation/contrib/bmake/mk/install-mk projects/collation/contrib/bmake/mk/meta.autodep.mk projects/collation/contrib/bmake/mk/meta.stage.mk projects/collation/contrib/bmake/mk/meta.sys.mk projects/collation/contrib/bmake/mk/own.mk projects/collation/contrib/bmake/mk/rst2htm.mk projects/collation/contrib/bmake/nonints.h projects/collation/contrib/bmake/os.sh projects/collation/contrib/bmake/parse.c projects/collation/contrib/bmake/suff.c projects/collation/contrib/bmake/unit-tests/varmisc.exp projects/collation/contrib/bmake/unit-tests/varmisc.mk projects/collation/contrib/bmake/var.c projects/collation/contrib/gdb/gdb/arm-tdep.c projects/collation/contrib/groff/tmac/doc-syms projects/collation/contrib/groff/tmac/groff_mdoc.man projects/collation/contrib/jemalloc/ChangeLog projects/collation/contrib/jemalloc/FREEBSD-diffs projects/collation/contrib/jemalloc/VERSION projects/collation/contrib/jemalloc/doc/jemalloc.3 projects/collation/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h projects/collation/contrib/jemalloc/include/jemalloc/jemalloc.h projects/collation/contrib/jemalloc/src/arena.c projects/collation/contrib/jemalloc/src/huge.c projects/collation/contrib/jemalloc/src/prof.c projects/collation/contrib/jemalloc/src/tsd.c projects/collation/contrib/libucl/ChangeLog.md projects/collation/contrib/libucl/README.md projects/collation/contrib/libucl/configure.ac projects/collation/contrib/libucl/doc/Makefile.am projects/collation/contrib/libucl/doc/lua_api.md projects/collation/contrib/libucl/include/ucl.h projects/collation/contrib/libucl/klib/kvec.h projects/collation/contrib/libucl/lua/lua_ucl.c projects/collation/contrib/libucl/src/Makefile.am projects/collation/contrib/libucl/src/tree.h projects/collation/contrib/libucl/src/ucl_chartable.h projects/collation/contrib/libucl/src/ucl_emitter.c projects/collation/contrib/libucl/src/ucl_emitter_utils.c projects/collation/contrib/libucl/src/ucl_hash.c projects/collation/contrib/libucl/src/ucl_internal.h projects/collation/contrib/libucl/src/ucl_parser.c projects/collation/contrib/libucl/src/ucl_util.c projects/collation/contrib/libucl/src/xxhash.c projects/collation/contrib/libucl/src/xxhash.h projects/collation/contrib/libucl/tests/Makefile.am projects/collation/contrib/libucl/tests/basic/13.in projects/collation/contrib/libucl/tests/test_basic.c projects/collation/contrib/libucl/tests/test_schema.c projects/collation/contrib/libucl/utils/Makefile.am projects/collation/contrib/libucl/utils/chargen.c projects/collation/contrib/libucl/utils/objdump.c projects/collation/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/POSIXThread.cpp projects/collation/contrib/mdocml/lib.in projects/collation/contrib/netbsd-tests/lib/libc/ssp/h_readlink.c projects/collation/contrib/ntp/ChangeLog projects/collation/contrib/ntp/CommitLog projects/collation/contrib/ntp/Makefile.am projects/collation/contrib/ntp/Makefile.in projects/collation/contrib/ntp/NEWS projects/collation/contrib/ntp/aclocal.m4 projects/collation/contrib/ntp/adjtimed/Makefile.in projects/collation/contrib/ntp/adjtimed/adjtimed.c projects/collation/contrib/ntp/clockstuff/Makefile.in projects/collation/contrib/ntp/clockstuff/chutest.c projects/collation/contrib/ntp/clockstuff/propdelay.c projects/collation/contrib/ntp/configure projects/collation/contrib/ntp/configure.ac projects/collation/contrib/ntp/html/decode.html projects/collation/contrib/ntp/html/miscopt.html projects/collation/contrib/ntp/html/stats.html projects/collation/contrib/ntp/include/Makefile.am projects/collation/contrib/ntp/include/Makefile.in projects/collation/contrib/ntp/include/isc/Makefile.in projects/collation/contrib/ntp/include/ntp_assert.h projects/collation/contrib/ntp/include/ntp_calendar.h projects/collation/contrib/ntp/include/ntp_config.h projects/collation/contrib/ntp/include/ntp_control.h projects/collation/contrib/ntp/include/ntp_lists.h projects/collation/contrib/ntp/include/ntp_stdlib.h projects/collation/contrib/ntp/include/ntp_syslog.h projects/collation/contrib/ntp/include/ntp_types.h projects/collation/contrib/ntp/kernel/Makefile.in projects/collation/contrib/ntp/kernel/sys/Makefile.in projects/collation/contrib/ntp/libntp/Makefile.in projects/collation/contrib/ntp/libntp/atolfp.c projects/collation/contrib/ntp/libntp/audio.c projects/collation/contrib/ntp/libntp/authkeys.c projects/collation/contrib/ntp/libntp/authreadkeys.c projects/collation/contrib/ntp/libntp/caljulian.c projects/collation/contrib/ntp/libntp/caltontp.c projects/collation/contrib/ntp/libntp/decodenetnum.c projects/collation/contrib/ntp/libntp/emalloc.c projects/collation/contrib/ntp/libntp/icom.c projects/collation/contrib/ntp/libntp/machines.c projects/collation/contrib/ntp/libntp/msyslog.c projects/collation/contrib/ntp/libntp/ntp_calendar.c projects/collation/contrib/ntp/libntp/ntp_intres.c projects/collation/contrib/ntp/libntp/ntp_lineedit.c projects/collation/contrib/ntp/libntp/ntp_rfc2553.c projects/collation/contrib/ntp/libntp/ntp_worker.c projects/collation/contrib/ntp/libntp/prettydate.c projects/collation/contrib/ntp/libntp/recvbuff.c projects/collation/contrib/ntp/libntp/socket.c projects/collation/contrib/ntp/libntp/socktohost.c projects/collation/contrib/ntp/libntp/statestr.c projects/collation/contrib/ntp/libparse/Makefile.in projects/collation/contrib/ntp/ntpd/Makefile.am projects/collation/contrib/ntp/ntpd/Makefile.in projects/collation/contrib/ntp/ntpd/invoke-ntp.conf.texi projects/collation/contrib/ntp/ntpd/invoke-ntp.keys.texi projects/collation/contrib/ntp/ntpd/invoke-ntpd.texi projects/collation/contrib/ntp/ntpd/ntp.conf.5man projects/collation/contrib/ntp/ntpd/ntp.conf.5mdoc projects/collation/contrib/ntp/ntpd/ntp.conf.def projects/collation/contrib/ntp/ntpd/ntp.conf.html projects/collation/contrib/ntp/ntpd/ntp.conf.man.in projects/collation/contrib/ntp/ntpd/ntp.conf.mdoc.in projects/collation/contrib/ntp/ntpd/ntp.keys.5man projects/collation/contrib/ntp/ntpd/ntp.keys.5mdoc projects/collation/contrib/ntp/ntpd/ntp.keys.html projects/collation/contrib/ntp/ntpd/ntp.keys.man.in projects/collation/contrib/ntp/ntpd/ntp.keys.mdoc.in projects/collation/contrib/ntp/ntpd/ntp_config.c projects/collation/contrib/ntp/ntpd/ntp_control.c projects/collation/contrib/ntp/ntpd/ntp_crypto.c projects/collation/contrib/ntp/ntpd/ntp_io.c projects/collation/contrib/ntp/ntpd/ntp_loopfilter.c projects/collation/contrib/ntp/ntpd/ntp_monitor.c projects/collation/contrib/ntp/ntpd/ntp_parser.c projects/collation/contrib/ntp/ntpd/ntp_parser.h projects/collation/contrib/ntp/ntpd/ntp_peer.c projects/collation/contrib/ntp/ntpd/ntp_proto.c projects/collation/contrib/ntp/ntpd/ntp_refclock.c projects/collation/contrib/ntp/ntpd/ntp_request.c projects/collation/contrib/ntp/ntpd/ntp_restrict.c projects/collation/contrib/ntp/ntpd/ntp_timer.c projects/collation/contrib/ntp/ntpd/ntpd-opts.c projects/collation/contrib/ntp/ntpd/ntpd-opts.def projects/collation/contrib/ntp/ntpd/ntpd-opts.h projects/collation/contrib/ntp/ntpd/ntpd.1ntpdman projects/collation/contrib/ntp/ntpd/ntpd.1ntpdmdoc projects/collation/contrib/ntp/ntpd/ntpd.c projects/collation/contrib/ntp/ntpd/ntpd.html projects/collation/contrib/ntp/ntpd/ntpd.man.in projects/collation/contrib/ntp/ntpd/ntpd.mdoc.in projects/collation/contrib/ntp/ntpd/rc_cmdlength.c (contents, props changed) projects/collation/contrib/ntp/ntpd/refclock_arc.c projects/collation/contrib/ntp/ntpd/refclock_chu.c projects/collation/contrib/ntp/ntpd/refclock_gpsdjson.c projects/collation/contrib/ntp/ntpd/refclock_local.c projects/collation/contrib/ntp/ntpd/refclock_nmea.c projects/collation/contrib/ntp/ntpd/refclock_palisade.c projects/collation/contrib/ntp/ntpd/refclock_parse.c projects/collation/contrib/ntp/ntpd/refclock_wwv.c projects/collation/contrib/ntp/ntpdate/Makefile.in projects/collation/contrib/ntp/ntpdate/ntpdate.c projects/collation/contrib/ntp/ntpdc/Makefile.in projects/collation/contrib/ntp/ntpdc/invoke-ntpdc.texi projects/collation/contrib/ntp/ntpdc/ntpdc-opts.c projects/collation/contrib/ntp/ntpdc/ntpdc-opts.h projects/collation/contrib/ntp/ntpdc/ntpdc.1ntpdcman projects/collation/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc projects/collation/contrib/ntp/ntpdc/ntpdc.c projects/collation/contrib/ntp/ntpdc/ntpdc.html projects/collation/contrib/ntp/ntpdc/ntpdc.man.in projects/collation/contrib/ntp/ntpdc/ntpdc.mdoc.in projects/collation/contrib/ntp/ntpq/Makefile.in projects/collation/contrib/ntp/ntpq/invoke-ntpq.texi projects/collation/contrib/ntp/ntpq/libntpq.h projects/collation/contrib/ntp/ntpq/ntpq-opts.c projects/collation/contrib/ntp/ntpq/ntpq-opts.h projects/collation/contrib/ntp/ntpq/ntpq-subs.c projects/collation/contrib/ntp/ntpq/ntpq.1ntpqman projects/collation/contrib/ntp/ntpq/ntpq.1ntpqmdoc projects/collation/contrib/ntp/ntpq/ntpq.c projects/collation/contrib/ntp/ntpq/ntpq.html projects/collation/contrib/ntp/ntpq/ntpq.man.in projects/collation/contrib/ntp/ntpq/ntpq.mdoc.in projects/collation/contrib/ntp/ntpsnmpd/Makefile.in projects/collation/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi projects/collation/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c projects/collation/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h projects/collation/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman projects/collation/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc projects/collation/contrib/ntp/ntpsnmpd/ntpsnmpd.html projects/collation/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in projects/collation/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in projects/collation/contrib/ntp/packageinfo.sh projects/collation/contrib/ntp/parseutil/Makefile.in projects/collation/contrib/ntp/scripts/Makefile.in projects/collation/contrib/ntp/scripts/build/Makefile.in projects/collation/contrib/ntp/scripts/calc_tickadj/Makefile.in projects/collation/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman projects/collation/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc projects/collation/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html projects/collation/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in projects/collation/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in projects/collation/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi projects/collation/contrib/ntp/scripts/invoke-plot_summary.texi projects/collation/contrib/ntp/scripts/invoke-summary.texi projects/collation/contrib/ntp/scripts/lib/Makefile.in projects/collation/contrib/ntp/scripts/lib/NTP/Util.pm projects/collation/contrib/ntp/scripts/ntp-wait/Makefile.in projects/collation/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi projects/collation/contrib/ntp/scripts/ntp-wait/ntp-wait-opts projects/collation/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman projects/collation/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc projects/collation/contrib/ntp/scripts/ntp-wait/ntp-wait.html projects/collation/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in projects/collation/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in projects/collation/contrib/ntp/scripts/ntpsweep/Makefile.in projects/collation/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi projects/collation/contrib/ntp/scripts/ntpsweep/ntpsweep-opts projects/collation/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman projects/collation/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc projects/collation/contrib/ntp/scripts/ntpsweep/ntpsweep.html projects/collation/contrib/ntp/scripts/ntpsweep/ntpsweep.in projects/collation/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in projects/collation/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in projects/collation/contrib/ntp/scripts/ntptrace/Makefile.in projects/collation/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi projects/collation/contrib/ntp/scripts/ntptrace/ntptrace-opts projects/collation/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman projects/collation/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc projects/collation/contrib/ntp/scripts/ntptrace/ntptrace.html projects/collation/contrib/ntp/scripts/ntptrace/ntptrace.man.in projects/collation/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in projects/collation/contrib/ntp/scripts/plot_summary-opts projects/collation/contrib/ntp/scripts/plot_summary.1plot_summaryman projects/collation/contrib/ntp/scripts/plot_summary.1plot_summarymdoc projects/collation/contrib/ntp/scripts/plot_summary.html projects/collation/contrib/ntp/scripts/plot_summary.man.in projects/collation/contrib/ntp/scripts/plot_summary.mdoc.in projects/collation/contrib/ntp/scripts/summary-opts projects/collation/contrib/ntp/scripts/summary.1summaryman projects/collation/contrib/ntp/scripts/summary.1summarymdoc projects/collation/contrib/ntp/scripts/summary.html projects/collation/contrib/ntp/scripts/summary.man.in projects/collation/contrib/ntp/scripts/summary.mdoc.in projects/collation/contrib/ntp/scripts/update-leap/Makefile.in (contents, props changed) projects/collation/contrib/ntp/scripts/update-leap/invoke-update-leap.texi projects/collation/contrib/ntp/scripts/update-leap/update-leap-opts projects/collation/contrib/ntp/scripts/update-leap/update-leap.1update-leapman projects/collation/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc projects/collation/contrib/ntp/scripts/update-leap/update-leap.html (contents, props changed) projects/collation/contrib/ntp/scripts/update-leap/update-leap.man.in (contents, props changed) projects/collation/contrib/ntp/scripts/update-leap/update-leap.mdoc.in (contents, props changed) projects/collation/contrib/ntp/sntp/Makefile.am projects/collation/contrib/ntp/sntp/Makefile.in projects/collation/contrib/ntp/sntp/configure projects/collation/contrib/ntp/sntp/configure.ac projects/collation/contrib/ntp/sntp/include/Makefile.in projects/collation/contrib/ntp/sntp/include/version.def projects/collation/contrib/ntp/sntp/include/version.texi projects/collation/contrib/ntp/sntp/invoke-sntp.texi projects/collation/contrib/ntp/sntp/libevent/Makefile.am projects/collation/contrib/ntp/sntp/libevent/Makefile.in projects/collation/contrib/ntp/sntp/libevent/test/bench_httpclient.c projects/collation/contrib/ntp/sntp/libevent/test/regress.c projects/collation/contrib/ntp/sntp/libevent/test/regress_dns.c projects/collation/contrib/ntp/sntp/libevent/test/regress_http.c projects/collation/contrib/ntp/sntp/libevent/test/regress_minheap.c projects/collation/contrib/ntp/sntp/libevent/test/test-ratelim.c projects/collation/contrib/ntp/sntp/libevent/test/test-time.c projects/collation/contrib/ntp/sntp/libopts/Makefile.in projects/collation/contrib/ntp/sntp/libopts/compat/pathfind.c projects/collation/contrib/ntp/sntp/log.c projects/collation/contrib/ntp/sntp/log.h projects/collation/contrib/ntp/sntp/m4/ntp_libevent.m4 projects/collation/contrib/ntp/sntp/m4/ntp_libntp.m4 projects/collation/contrib/ntp/sntp/m4/ntp_rlimit.m4 projects/collation/contrib/ntp/sntp/m4/openldap-thread-check.m4 projects/collation/contrib/ntp/sntp/m4/os_cflags.m4 projects/collation/contrib/ntp/sntp/m4/version.m4 projects/collation/contrib/ntp/sntp/networking.c projects/collation/contrib/ntp/sntp/scripts/Makefile.in projects/collation/contrib/ntp/sntp/sntp-opts.c projects/collation/contrib/ntp/sntp/sntp-opts.h projects/collation/contrib/ntp/sntp/sntp.1sntpman projects/collation/contrib/ntp/sntp/sntp.1sntpmdoc projects/collation/contrib/ntp/sntp/sntp.html projects/collation/contrib/ntp/sntp/sntp.man.in projects/collation/contrib/ntp/sntp/sntp.mdoc.in projects/collation/contrib/ntp/sntp/tests/Makefile.am projects/collation/contrib/ntp/sntp/tests/Makefile.in projects/collation/contrib/ntp/sntp/tests/crypto.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/fileHandlingTest.h.in (contents, props changed) projects/collation/contrib/ntp/sntp/tests/keyFile.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/kodDatabase.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/kodFile.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/packetHandling.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/packetProcessing.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-crypto.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-keyFile.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-kodDatabase.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-kodFile.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-networking.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-packetHandling.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-packetProcessing.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/run-utilities.c (contents, props changed) projects/collation/contrib/ntp/sntp/tests/sntptest.h projects/collation/contrib/ntp/sntp/tests/utilities.c (contents, props changed) projects/collation/contrib/ntp/sntp/unity/Makefile.am (contents, props changed) projects/collation/contrib/ntp/sntp/unity/Makefile.in (contents, props changed) projects/collation/contrib/ntp/sntp/unity/auto/generate_test_runner.rb (contents, props changed) projects/collation/contrib/ntp/sntp/unity/auto/unity_test_summary.rb (contents, props changed) projects/collation/contrib/ntp/sntp/unity/unity.c (contents, props changed) projects/collation/contrib/ntp/sntp/unity/unity_internals.h (contents, props changed) projects/collation/contrib/ntp/sntp/version.c (contents, props changed) projects/collation/contrib/ntp/tests/Makefile.am projects/collation/contrib/ntp/tests/Makefile.in projects/collation/contrib/ntp/tests/bug-2803/Makefile.am (contents, props changed) projects/collation/contrib/ntp/tests/bug-2803/Makefile.in (contents, props changed) projects/collation/contrib/ntp/tests/bug-2803/run-bug-2803.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/Makefile.am projects/collation/contrib/ntp/tests/libntp/Makefile.in projects/collation/contrib/ntp/tests/libntp/a_md5encrypt.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/atoint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/atouint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/authkeys.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/buftvtots.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/calendar.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/caljulian.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/caltontp.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/calyearstart.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/clocktime.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/decodenetnum.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/hextoint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/hextolfp.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/humandate.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/lfpfunc.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/lfptest.h projects/collation/contrib/ntp/tests/libntp/lfptostr.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/modetoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/msyslog.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/netof.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/numtoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/numtohost.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/octtoint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/prettydate.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/recvbuff.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/refidsmear.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/refnumtoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-a_md5encrypt.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-atoint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-atouint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-authkeys.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-buftvtots.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-calendar.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-caljulian.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-caltontp.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-calyearstart.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-clocktime.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-decodenetnum.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-hextoint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-hextolfp.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-humandate.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-lfpfunc.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-lfptostr.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-modetoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-msyslog.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-netof.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-numtoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-numtohost.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-octtoint.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-prettydate.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-recvbuff.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-refidsmear.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-refnumtoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-sfptostr.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-socktoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-ssl_init.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-statestr.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-strtolfp.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-timespecops.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-timevalops.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-tstotv.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-tvtots.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-uglydate.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-vi64ops.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/run-ymd2yd.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/sfptostr.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/sockaddrtest.h projects/collation/contrib/ntp/tests/libntp/socktoa.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/ssl_init.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/statestr.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/strtolfp.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/test-libntp.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/test-libntp.h (contents, props changed) projects/collation/contrib/ntp/tests/libntp/timespecops.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/timevalops.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/tstotv.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/tvtots.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/uglydate.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/vi64ops.c (contents, props changed) projects/collation/contrib/ntp/tests/libntp/ymd2yd.c (contents, props changed) projects/collation/contrib/ntp/tests/ntpd/Makefile.am projects/collation/contrib/ntp/tests/ntpd/Makefile.in projects/collation/contrib/ntp/tests/sandbox/Makefile.am (contents, props changed) projects/collation/contrib/ntp/tests/sandbox/Makefile.in (contents, props changed) projects/collation/contrib/ntp/tests/sandbox/run-modetoa.c (contents, props changed) projects/collation/contrib/ntp/tests/sandbox/run-uglydate.c (contents, props changed) projects/collation/contrib/ntp/tests/sandbox/run-ut-2803.c (contents, props changed) projects/collation/contrib/ntp/tests/sandbox/smeartest.c (contents, props changed) projects/collation/contrib/ntp/tests/sec-2853/Makefile.am (contents, props changed) projects/collation/contrib/ntp/tests/sec-2853/Makefile.in (contents, props changed) projects/collation/contrib/ntp/tests/sec-2853/run-sec-2853.c (contents, props changed) projects/collation/contrib/ntp/tests/sec-2853/sec-2853.c (contents, props changed) projects/collation/contrib/ntp/util/Makefile.in projects/collation/contrib/ntp/util/invoke-ntp-keygen.texi projects/collation/contrib/ntp/util/ntp-keygen-opts.c projects/collation/contrib/ntp/util/ntp-keygen-opts.h projects/collation/contrib/ntp/util/ntp-keygen.1ntp-keygenman projects/collation/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc projects/collation/contrib/ntp/util/ntp-keygen.c projects/collation/contrib/ntp/util/ntp-keygen.html projects/collation/contrib/ntp/util/ntp-keygen.man.in projects/collation/contrib/ntp/util/ntp-keygen.mdoc.in projects/collation/contrib/ntp/util/ntptime.c projects/collation/crypto/openssl/CHANGES projects/collation/crypto/openssl/Configure projects/collation/crypto/openssl/FAQ projects/collation/crypto/openssl/Makefile projects/collation/crypto/openssl/Makefile.org projects/collation/crypto/openssl/NEWS projects/collation/crypto/openssl/README projects/collation/crypto/openssl/apps/apps.c projects/collation/crypto/openssl/apps/apps.h projects/collation/crypto/openssl/apps/ca.c projects/collation/crypto/openssl/apps/ciphers.c projects/collation/crypto/openssl/apps/cms.c projects/collation/crypto/openssl/apps/crl.c projects/collation/crypto/openssl/apps/dgst.c projects/collation/crypto/openssl/apps/dhparam.c projects/collation/crypto/openssl/apps/ecparam.c projects/collation/crypto/openssl/apps/genrsa.c projects/collation/crypto/openssl/apps/ocsp.c projects/collation/crypto/openssl/apps/openssl.cnf projects/collation/crypto/openssl/apps/pkcs8.c projects/collation/crypto/openssl/apps/s_apps.h projects/collation/crypto/openssl/apps/s_cb.c projects/collation/crypto/openssl/apps/s_client.c projects/collation/crypto/openssl/apps/s_server.c projects/collation/crypto/openssl/apps/s_socket.c projects/collation/crypto/openssl/apps/smime.c projects/collation/crypto/openssl/apps/speed.c projects/collation/crypto/openssl/apps/verify.c projects/collation/crypto/openssl/apps/x509.c projects/collation/crypto/openssl/config projects/collation/crypto/openssl/crypto/Makefile projects/collation/crypto/openssl/crypto/aes/Makefile projects/collation/crypto/openssl/crypto/aes/aes_wrap.c projects/collation/crypto/openssl/crypto/aes/aes_x86core.c projects/collation/crypto/openssl/crypto/aes/asm/aes-586.pl projects/collation/crypto/openssl/crypto/aes/asm/aes-armv4.pl projects/collation/crypto/openssl/crypto/aes/asm/aes-mips.pl projects/collation/crypto/openssl/crypto/aes/asm/aes-ppc.pl projects/collation/crypto/openssl/crypto/aes/asm/aes-x86_64.pl projects/collation/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl projects/collation/crypto/openssl/crypto/aes/asm/aesni-x86.pl projects/collation/crypto/openssl/crypto/aes/asm/aesni-x86_64.pl projects/collation/crypto/openssl/crypto/aes/asm/bsaes-x86_64.pl projects/collation/crypto/openssl/crypto/aes/asm/vpaes-x86.pl projects/collation/crypto/openssl/crypto/aes/asm/vpaes-x86_64.pl projects/collation/crypto/openssl/crypto/arm_arch.h projects/collation/crypto/openssl/crypto/armcap.c projects/collation/crypto/openssl/crypto/armv4cpuid.S projects/collation/crypto/openssl/crypto/asn1/Makefile projects/collation/crypto/openssl/crypto/asn1/a_gentm.c projects/collation/crypto/openssl/crypto/asn1/a_time.c projects/collation/crypto/openssl/crypto/asn1/a_utctm.c projects/collation/crypto/openssl/crypto/asn1/ameth_lib.c projects/collation/crypto/openssl/crypto/asn1/asn1.h projects/collation/crypto/openssl/crypto/asn1/asn1_locl.h projects/collation/crypto/openssl/crypto/asn1/t_x509.c projects/collation/crypto/openssl/crypto/asn1/x_crl.c projects/collation/crypto/openssl/crypto/asn1/x_x509.c projects/collation/crypto/openssl/crypto/bio/b_dump.c projects/collation/crypto/openssl/crypto/bio/b_sock.c projects/collation/crypto/openssl/crypto/bio/bio.h projects/collation/crypto/openssl/crypto/bio/bio_err.c projects/collation/crypto/openssl/crypto/bio/bss_acpt.c projects/collation/crypto/openssl/crypto/bio/bss_conn.c projects/collation/crypto/openssl/crypto/bio/bss_dgram.c projects/collation/crypto/openssl/crypto/bio/bss_fd.c projects/collation/crypto/openssl/crypto/bn/Makefile projects/collation/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl projects/collation/crypto/openssl/crypto/bn/asm/armv4-mont.pl projects/collation/crypto/openssl/crypto/bn/asm/mips-mont.pl projects/collation/crypto/openssl/crypto/bn/asm/mips.pl projects/collation/crypto/openssl/crypto/bn/asm/ppc-mont.pl projects/collation/crypto/openssl/crypto/bn/asm/ppc.pl projects/collation/crypto/openssl/crypto/bn/asm/ppc64-mont.pl projects/collation/crypto/openssl/crypto/bn/asm/x86_64-gcc.c projects/collation/crypto/openssl/crypto/bn/asm/x86_64-mont.pl projects/collation/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl projects/collation/crypto/openssl/crypto/bn/bn.h projects/collation/crypto/openssl/crypto/bn/bn_asm.c projects/collation/crypto/openssl/crypto/bn/bn_exp.c projects/collation/crypto/openssl/crypto/bn/bn_gf2m.c projects/collation/crypto/openssl/crypto/bn/bn_lcl.h projects/collation/crypto/openssl/crypto/bn/bntest.c projects/collation/crypto/openssl/crypto/buffer/buf_str.c projects/collation/crypto/openssl/crypto/buffer/buffer.h projects/collation/crypto/openssl/crypto/camellia/Makefile projects/collation/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl projects/collation/crypto/openssl/crypto/cast/cast_lcl.h projects/collation/crypto/openssl/crypto/cms/Makefile projects/collation/crypto/openssl/crypto/cms/cms.h projects/collation/crypto/openssl/crypto/cms/cms_asn1.c projects/collation/crypto/openssl/crypto/cms/cms_env.c projects/collation/crypto/openssl/crypto/cms/cms_err.c projects/collation/crypto/openssl/crypto/cms/cms_lcl.h projects/collation/crypto/openssl/crypto/cms/cms_lib.c projects/collation/crypto/openssl/crypto/cms/cms_sd.c projects/collation/crypto/openssl/crypto/cms/cms_smime.c projects/collation/crypto/openssl/crypto/cryptlib.c projects/collation/crypto/openssl/crypto/cversion.c projects/collation/crypto/openssl/crypto/des/Makefile projects/collation/crypto/openssl/crypto/des/asm/des-586.pl projects/collation/crypto/openssl/crypto/des/asm/des_enc.m4 projects/collation/crypto/openssl/crypto/des/des_locl.h projects/collation/crypto/openssl/crypto/des/read_pwd.c projects/collation/crypto/openssl/crypto/dh/Makefile projects/collation/crypto/openssl/crypto/dh/dh.h projects/collation/crypto/openssl/crypto/dh/dh_ameth.c projects/collation/crypto/openssl/crypto/dh/dh_asn1.c projects/collation/crypto/openssl/crypto/dh/dh_check.c projects/collation/crypto/openssl/crypto/dh/dh_err.c projects/collation/crypto/openssl/crypto/dh/dh_key.c projects/collation/crypto/openssl/crypto/dh/dh_pmeth.c projects/collation/crypto/openssl/crypto/dh/dhtest.c projects/collation/crypto/openssl/crypto/dsa/dsa.h projects/collation/crypto/openssl/crypto/dsa/dsa_ameth.c projects/collation/crypto/openssl/crypto/dsa/dsa_err.c projects/collation/crypto/openssl/crypto/dsa/dsa_gen.c projects/collation/crypto/openssl/crypto/dsa/dsa_locl.h projects/collation/crypto/openssl/crypto/dsa/dsa_ossl.c projects/collation/crypto/openssl/crypto/dsa/dsa_pmeth.c projects/collation/crypto/openssl/crypto/ebcdic.c projects/collation/crypto/openssl/crypto/ec/Makefile projects/collation/crypto/openssl/crypto/ec/ec.h projects/collation/crypto/openssl/crypto/ec/ec_ameth.c projects/collation/crypto/openssl/crypto/ec/ec_curve.c projects/collation/crypto/openssl/crypto/ec/ec_cvt.c projects/collation/crypto/openssl/crypto/ec/ec_err.c projects/collation/crypto/openssl/crypto/ec/ec_lcl.h projects/collation/crypto/openssl/crypto/ec/ec_lib.c projects/collation/crypto/openssl/crypto/ec/ec_pmeth.c projects/collation/crypto/openssl/crypto/ec/eck_prn.c projects/collation/crypto/openssl/crypto/ec/ecp_nistp521.c projects/collation/crypto/openssl/crypto/ecdh/Makefile projects/collation/crypto/openssl/crypto/ecdh/ecdh.h projects/collation/crypto/openssl/crypto/ecdh/ecdhtest.c projects/collation/crypto/openssl/crypto/ecdh/ech_ossl.c projects/collation/crypto/openssl/crypto/ecdsa/ecdsa.h projects/collation/crypto/openssl/crypto/ecdsa/ecs_err.c projects/collation/crypto/openssl/crypto/ecdsa/ecs_lib.c projects/collation/crypto/openssl/crypto/ecdsa/ecs_locl.h projects/collation/crypto/openssl/crypto/ecdsa/ecs_ossl.c projects/collation/crypto/openssl/crypto/engine/Makefile projects/collation/crypto/openssl/crypto/engine/eng_all.c projects/collation/crypto/openssl/crypto/engine/eng_cryptodev.c projects/collation/crypto/openssl/crypto/engine/engine.h projects/collation/crypto/openssl/crypto/evp/Makefile projects/collation/crypto/openssl/crypto/evp/c_allc.c projects/collation/crypto/openssl/crypto/evp/digest.c projects/collation/crypto/openssl/crypto/evp/e_aes.c projects/collation/crypto/openssl/crypto/evp/e_aes_cbc_hmac_sha1.c projects/collation/crypto/openssl/crypto/evp/e_camellia.c projects/collation/crypto/openssl/crypto/evp/e_des.c projects/collation/crypto/openssl/crypto/evp/e_des3.c projects/collation/crypto/openssl/crypto/evp/e_null.c projects/collation/crypto/openssl/crypto/evp/encode.c projects/collation/crypto/openssl/crypto/evp/evp.h projects/collation/crypto/openssl/crypto/evp/evp_enc.c projects/collation/crypto/openssl/crypto/evp/evp_err.c projects/collation/crypto/openssl/crypto/evp/evp_extra_test.c projects/collation/crypto/openssl/crypto/evp/evp_lib.c projects/collation/crypto/openssl/crypto/evp/evp_locl.h projects/collation/crypto/openssl/crypto/evp/evp_test.c projects/collation/crypto/openssl/crypto/evp/evptests.txt projects/collation/crypto/openssl/crypto/evp/m_dss.c projects/collation/crypto/openssl/crypto/evp/m_dss1.c projects/collation/crypto/openssl/crypto/evp/m_ecdsa.c projects/collation/crypto/openssl/crypto/evp/m_sha1.c projects/collation/crypto/openssl/crypto/evp/m_sigver.c projects/collation/crypto/openssl/crypto/evp/p_lib.c projects/collation/crypto/openssl/crypto/evp/pmeth_lib.c projects/collation/crypto/openssl/crypto/hmac/hm_ameth.c projects/collation/crypto/openssl/crypto/hmac/hmac.c projects/collation/crypto/openssl/crypto/hmac/hmactest.c projects/collation/crypto/openssl/crypto/jpake/jpake.c projects/collation/crypto/openssl/crypto/md32_common.h projects/collation/crypto/openssl/crypto/md5/Makefile projects/collation/crypto/openssl/crypto/md5/md5_locl.h projects/collation/crypto/openssl/crypto/modes/Makefile projects/collation/crypto/openssl/crypto/modes/asm/ghash-armv4.pl projects/collation/crypto/openssl/crypto/modes/asm/ghash-s390x.pl projects/collation/crypto/openssl/crypto/modes/asm/ghash-sparcv9.pl projects/collation/crypto/openssl/crypto/modes/asm/ghash-x86.pl projects/collation/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl projects/collation/crypto/openssl/crypto/modes/cbc128.c projects/collation/crypto/openssl/crypto/modes/gcm128.c projects/collation/crypto/openssl/crypto/modes/modes.h projects/collation/crypto/openssl/crypto/modes/modes_lcl.h projects/collation/crypto/openssl/crypto/o_str.c projects/collation/crypto/openssl/crypto/o_time.c projects/collation/crypto/openssl/crypto/o_time.h projects/collation/crypto/openssl/crypto/objects/obj_dat.h projects/collation/crypto/openssl/crypto/objects/obj_mac.h projects/collation/crypto/openssl/crypto/objects/obj_mac.num projects/collation/crypto/openssl/crypto/objects/obj_xref.h projects/collation/crypto/openssl/crypto/objects/obj_xref.txt projects/collation/crypto/openssl/crypto/objects/objects.txt projects/collation/crypto/openssl/crypto/objects/objxref.pl projects/collation/crypto/openssl/crypto/ocsp/ocsp.h projects/collation/crypto/openssl/crypto/ocsp/ocsp_ht.c projects/collation/crypto/openssl/crypto/ocsp/ocsp_lib.c projects/collation/crypto/openssl/crypto/opensslconf.h projects/collation/crypto/openssl/crypto/opensslv.h projects/collation/crypto/openssl/crypto/ossl_typ.h projects/collation/crypto/openssl/crypto/pem/Makefile projects/collation/crypto/openssl/crypto/pem/pem.h projects/collation/crypto/openssl/crypto/pem/pem_all.c projects/collation/crypto/openssl/crypto/pem/pem_err.c projects/collation/crypto/openssl/crypto/pem/pem_lib.c projects/collation/crypto/openssl/crypto/pem/pem_pkey.c projects/collation/crypto/openssl/crypto/perlasm/ppc-xlate.pl projects/collation/crypto/openssl/crypto/perlasm/x86_64-xlate.pl projects/collation/crypto/openssl/crypto/perlasm/x86asm.pl projects/collation/crypto/openssl/crypto/perlasm/x86gas.pl projects/collation/crypto/openssl/crypto/perlasm/x86masm.pl projects/collation/crypto/openssl/crypto/perlasm/x86nasm.pl projects/collation/crypto/openssl/crypto/pkcs12/p12_decr.c projects/collation/crypto/openssl/crypto/pkcs12/p12_p8e.c projects/collation/crypto/openssl/crypto/ppccap.c projects/collation/crypto/openssl/crypto/ppccpuid.pl projects/collation/crypto/openssl/crypto/rc4/Makefile projects/collation/crypto/openssl/crypto/rc4/asm/rc4-586.pl projects/collation/crypto/openssl/crypto/rc4/rc4_enc.c projects/collation/crypto/openssl/crypto/rc5/rc5_locl.h projects/collation/crypto/openssl/crypto/rsa/Makefile projects/collation/crypto/openssl/crypto/rsa/rsa.h projects/collation/crypto/openssl/crypto/rsa/rsa_ameth.c projects/collation/crypto/openssl/crypto/rsa/rsa_asn1.c projects/collation/crypto/openssl/crypto/rsa/rsa_err.c projects/collation/crypto/openssl/crypto/rsa/rsa_oaep.c projects/collation/crypto/openssl/crypto/rsa/rsa_pmeth.c projects/collation/crypto/openssl/crypto/rsa/rsa_sign.c projects/collation/crypto/openssl/crypto/sha/Makefile projects/collation/crypto/openssl/crypto/sha/asm/sha1-586.pl projects/collation/crypto/openssl/crypto/sha/asm/sha1-armv4-large.pl projects/collation/crypto/openssl/crypto/sha/asm/sha1-mips.pl projects/collation/crypto/openssl/crypto/sha/asm/sha1-ppc.pl projects/collation/crypto/openssl/crypto/sha/asm/sha1-sparcv9.pl projects/collation/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl projects/collation/crypto/openssl/crypto/sha/asm/sha256-586.pl projects/collation/crypto/openssl/crypto/sha/asm/sha256-armv4.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-586.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-armv4.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-ia64.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-mips.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-ppc.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-sparcv9.pl projects/collation/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl projects/collation/crypto/openssl/crypto/sha/sha512.c projects/collation/crypto/openssl/crypto/sparccpuid.S projects/collation/crypto/openssl/crypto/sparcv9cap.c projects/collation/crypto/openssl/crypto/srp/Makefile projects/collation/crypto/openssl/crypto/srp/srptest.c projects/collation/crypto/openssl/crypto/stack/safestack.h projects/collation/crypto/openssl/crypto/stack/stack.c projects/collation/crypto/openssl/crypto/stack/stack.h projects/collation/crypto/openssl/crypto/symhacks.h projects/collation/crypto/openssl/crypto/ts/ts_rsp_sign.c projects/collation/crypto/openssl/crypto/ts/ts_rsp_verify.c projects/collation/crypto/openssl/crypto/ui/ui_openssl.c projects/collation/crypto/openssl/crypto/whrlpool/asm/wp-mmx.pl projects/collation/crypto/openssl/crypto/whrlpool/asm/wp-x86_64.pl projects/collation/crypto/openssl/crypto/x509/Makefile projects/collation/crypto/openssl/crypto/x509/verify_extra_test.c projects/collation/crypto/openssl/crypto/x509/x509.h projects/collation/crypto/openssl/crypto/x509/x509_cmp.c projects/collation/crypto/openssl/crypto/x509/x509_err.c projects/collation/crypto/openssl/crypto/x509/x509_lu.c projects/collation/crypto/openssl/crypto/x509/x509_set.c projects/collation/crypto/openssl/crypto/x509/x509_trs.c projects/collation/crypto/openssl/crypto/x509/x509_txt.c projects/collation/crypto/openssl/crypto/x509/x509_vfy.c projects/collation/crypto/openssl/crypto/x509/x509_vfy.h projects/collation/crypto/openssl/crypto/x509/x509_vpm.c projects/collation/crypto/openssl/crypto/x509/x_all.c projects/collation/crypto/openssl/crypto/x509v3/Makefile projects/collation/crypto/openssl/crypto/x509v3/ext_dat.h projects/collation/crypto/openssl/crypto/x509v3/v3_lib.c projects/collation/crypto/openssl/crypto/x509v3/v3_purp.c projects/collation/crypto/openssl/crypto/x509v3/v3_utl.c projects/collation/crypto/openssl/crypto/x509v3/v3err.c projects/collation/crypto/openssl/crypto/x509v3/x509v3.h projects/collation/crypto/openssl/crypto/x86_64cpuid.pl projects/collation/crypto/openssl/crypto/x86cpuid.pl projects/collation/crypto/openssl/doc/apps/c_rehash.pod projects/collation/crypto/openssl/doc/apps/ciphers.pod projects/collation/crypto/openssl/doc/apps/cms.pod projects/collation/crypto/openssl/doc/apps/genpkey.pod projects/collation/crypto/openssl/doc/apps/ocsp.pod projects/collation/crypto/openssl/doc/apps/pkcs8.pod projects/collation/crypto/openssl/doc/apps/req.pod projects/collation/crypto/openssl/doc/apps/s_client.pod projects/collation/crypto/openssl/doc/apps/s_server.pod projects/collation/crypto/openssl/doc/apps/smime.pod projects/collation/crypto/openssl/doc/apps/verify.pod projects/collation/crypto/openssl/doc/apps/x509.pod projects/collation/crypto/openssl/doc/crypto/ASN1_STRING_length.pod projects/collation/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod projects/collation/crypto/openssl/doc/crypto/BIO_f_ssl.pod projects/collation/crypto/openssl/doc/crypto/BIO_find_type.pod projects/collation/crypto/openssl/doc/crypto/BIO_s_accept.pod projects/collation/crypto/openssl/doc/crypto/BIO_s_connect.pod projects/collation/crypto/openssl/doc/crypto/BN_BLINDING_new.pod projects/collation/crypto/openssl/doc/crypto/BN_CTX_new.pod projects/collation/crypto/openssl/doc/crypto/BN_generate_prime.pod projects/collation/crypto/openssl/doc/crypto/BN_rand.pod projects/collation/crypto/openssl/doc/crypto/CMS_add0_cert.pod projects/collation/crypto/openssl/doc/crypto/CMS_get0_RecipientInfos.pod projects/collation/crypto/openssl/doc/crypto/CMS_get0_SignerInfos.pod projects/collation/crypto/openssl/doc/crypto/CMS_verify.pod projects/collation/crypto/openssl/doc/crypto/DH_generate_parameters.pod projects/collation/crypto/openssl/doc/crypto/DSA_generate_parameters.pod projects/collation/crypto/openssl/doc/crypto/ERR_remove_state.pod projects/collation/crypto/openssl/doc/crypto/EVP_BytesToKey.pod projects/collation/crypto/openssl/doc/crypto/EVP_DigestInit.pod projects/collation/crypto/openssl/doc/crypto/EVP_DigestVerifyInit.pod projects/collation/crypto/openssl/doc/crypto/EVP_EncryptInit.pod projects/collation/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod projects/collation/crypto/openssl/doc/crypto/EVP_PKEY_cmp.pod projects/collation/crypto/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod projects/collation/crypto/openssl/doc/crypto/OPENSSL_config.pod projects/collation/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod projects/collation/crypto/openssl/doc/crypto/OPENSSL_load_builtin_modules.pod projects/collation/crypto/openssl/doc/crypto/OpenSSL_add_all_algorithms.pod projects/collation/crypto/openssl/doc/crypto/PKCS7_verify.pod projects/collation/crypto/openssl/doc/crypto/RAND_egd.pod projects/collation/crypto/openssl/doc/crypto/RSA_generate_key.pod projects/collation/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod projects/collation/crypto/openssl/doc/crypto/X509_STORE_CTX_get_error.pod projects/collation/crypto/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod projects/collation/crypto/openssl/doc/crypto/crypto.pod projects/collation/crypto/openssl/doc/crypto/d2i_DSAPublicKey.pod projects/collation/crypto/openssl/doc/crypto/d2i_X509.pod projects/collation/crypto/openssl/doc/crypto/d2i_X509_CRL.pod projects/collation/crypto/openssl/doc/crypto/ecdsa.pod projects/collation/crypto/openssl/doc/crypto/evp.pod projects/collation/crypto/openssl/doc/crypto/hmac.pod projects/collation/crypto/openssl/doc/crypto/i2d_PKCS7_bio_stream.pod projects/collation/crypto/openssl/doc/crypto/rand.pod projects/collation/crypto/openssl/doc/crypto/sha.pod projects/collation/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod projects/collation/crypto/openssl/doc/ssl/SSL_COMP_add_compression_method.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_sess_set_cache_size.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_rsa_callback.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod projects/collation/crypto/openssl/doc/ssl/SSL_CTX_use_psk_identity_hint.pod projects/collation/crypto/openssl/doc/ssl/SSL_accept.pod projects/collation/crypto/openssl/doc/ssl/SSL_do_handshake.pod projects/collation/crypto/openssl/doc/ssl/SSL_shutdown.pod projects/collation/crypto/openssl/doc/ssl/ssl.pod projects/collation/crypto/openssl/doc/ssleay.txt projects/collation/crypto/openssl/e_os.h projects/collation/crypto/openssl/e_os2.h projects/collation/crypto/openssl/engines/Makefile projects/collation/crypto/openssl/engines/ccgost/Makefile projects/collation/crypto/openssl/engines/ccgost/gost89.c projects/collation/crypto/openssl/engines/ccgost/gost_crypt.c projects/collation/crypto/openssl/engines/ccgost/gost_pmeth.c projects/collation/crypto/openssl/engines/e_capi.c projects/collation/crypto/openssl/engines/vendor_defns/hwcryptohook.h projects/collation/crypto/openssl/ssl/Makefile projects/collation/crypto/openssl/ssl/d1_both.c projects/collation/crypto/openssl/ssl/d1_clnt.c projects/collation/crypto/openssl/ssl/d1_lib.c projects/collation/crypto/openssl/ssl/d1_meth.c projects/collation/crypto/openssl/ssl/d1_pkt.c projects/collation/crypto/openssl/ssl/d1_srtp.c projects/collation/crypto/openssl/ssl/d1_srvr.c projects/collation/crypto/openssl/ssl/dtls1.h projects/collation/crypto/openssl/ssl/heartbeat_test.c projects/collation/crypto/openssl/ssl/s23_clnt.c projects/collation/crypto/openssl/ssl/s23_srvr.c projects/collation/crypto/openssl/ssl/s2_clnt.c projects/collation/crypto/openssl/ssl/s2_lib.c projects/collation/crypto/openssl/ssl/s3_both.c projects/collation/crypto/openssl/ssl/s3_cbc.c projects/collation/crypto/openssl/ssl/s3_clnt.c projects/collation/crypto/openssl/ssl/s3_enc.c projects/collation/crypto/openssl/ssl/s3_lib.c projects/collation/crypto/openssl/ssl/s3_pkt.c projects/collation/crypto/openssl/ssl/s3_srvr.c projects/collation/crypto/openssl/ssl/srtp.h projects/collation/crypto/openssl/ssl/ssl.h projects/collation/crypto/openssl/ssl/ssl3.h projects/collation/crypto/openssl/ssl/ssl_algs.c projects/collation/crypto/openssl/ssl/ssl_cert.c projects/collation/crypto/openssl/ssl/ssl_ciph.c projects/collation/crypto/openssl/ssl/ssl_err.c projects/collation/crypto/openssl/ssl/ssl_lib.c projects/collation/crypto/openssl/ssl/ssl_locl.h projects/collation/crypto/openssl/ssl/ssl_rsa.c projects/collation/crypto/openssl/ssl/ssl_sess.c projects/collation/crypto/openssl/ssl/ssl_txt.c projects/collation/crypto/openssl/ssl/ssltest.c projects/collation/crypto/openssl/ssl/t1_clnt.c projects/collation/crypto/openssl/ssl/t1_enc.c projects/collation/crypto/openssl/ssl/t1_lib.c projects/collation/crypto/openssl/ssl/t1_meth.c projects/collation/crypto/openssl/ssl/t1_srvr.c projects/collation/crypto/openssl/ssl/tls1.h projects/collation/crypto/openssl/util/files.pl projects/collation/crypto/openssl/util/libeay.num projects/collation/crypto/openssl/util/mk1mf.pl projects/collation/crypto/openssl/util/mkdef.pl projects/collation/crypto/openssl/util/mkerr.pl projects/collation/crypto/openssl/util/mkstack.pl projects/collation/crypto/openssl/util/pl/BC-32.pl projects/collation/crypto/openssl/util/pl/VC-32.pl projects/collation/crypto/openssl/util/pl/unix.pl projects/collation/crypto/openssl/util/ssleay.num projects/collation/etc/Makefile projects/collation/etc/defaults/rc.conf projects/collation/etc/etc.amd64/ttys projects/collation/etc/etc.i386/ttys projects/collation/etc/etc.mips/ttys projects/collation/etc/etc.pc98/ttys projects/collation/etc/etc.powerpc/ttys projects/collation/etc/etc.sparc64/ttys projects/collation/etc/mtree/BSD.debug.dist projects/collation/etc/mtree/BSD.tests.dist projects/collation/etc/mtree/BSD.usr.dist projects/collation/etc/mtree/Makefile projects/collation/etc/netstart projects/collation/etc/rc.d/jail projects/collation/etc/rc.d/local_unbound projects/collation/etc/rc.d/mdconfig projects/collation/etc/rc.d/mdconfig2 projects/collation/etc/rc.d/mountcritlocal projects/collation/etc/rc.d/othermta projects/collation/etc/rc.shutdown projects/collation/etc/rc.subr projects/collation/gnu/usr.bin/gdb/kgdb/trgt_arm.c projects/collation/include/stdio.h projects/collation/lib/libc/gen/getgrent.c projects/collation/lib/libc/gen/getpwent.c projects/collation/lib/libc/iconv/bsd_iconv.c projects/collation/lib/libc/iconv/citrus_esdb.c projects/collation/lib/libc/resolv/res_data.c projects/collation/lib/libc/stdio/fdopen.c projects/collation/lib/libc/stdio/findfp.c projects/collation/lib/libc/stdio/fmemopen.c projects/collation/lib/libc/stdio/fopen.c projects/collation/lib/libc/stdio/freopen.c projects/collation/lib/libc/stdio/ftell.c projects/collation/lib/libc/stdio/stdio.c projects/collation/lib/libc/sys/cpuset.2 projects/collation/lib/libc/sys/cpuset_getaffinity.2 projects/collation/lib/libc/sys/ptrace.2 projects/collation/lib/libc/tests/Makefile projects/collation/lib/libc/tests/ssp/Makefile projects/collation/lib/libdpv/dpv.3 projects/collation/lib/libedit/vi.c projects/collation/lib/libfigpar/figpar.3 projects/collation/lib/libucl/Makefile projects/collation/lib/msun/tests/Makefile projects/collation/libexec/rtld-elf/libmap.c projects/collation/libexec/rtld-elf/malloc.c projects/collation/libexec/rtld-elf/rtld.c projects/collation/libexec/rtld-elf/rtld.h projects/collation/sbin/atm/atmconfig/Makefile projects/collation/sbin/camcontrol/modeedit.c projects/collation/sbin/devd/devd.cc projects/collation/sbin/fsck_ffs/fsck.h projects/collation/sbin/fsck_ffs/globs.c projects/collation/sbin/ipfw/tables.c projects/collation/sbin/natd/natd.c projects/collation/sbin/newfs_msdos/mkfs_msdos.h projects/collation/sbin/newfs_nandfs/newfs_nandfs.c projects/collation/sbin/pfctl/pfctl.c projects/collation/sbin/rcorder/rcorder.c projects/collation/sbin/savecore/savecore.c projects/collation/sbin/sysctl/sysctl.c projects/collation/secure/lib/libcrypto/Makefile projects/collation/secure/lib/libcrypto/Makefile.asm projects/collation/secure/lib/libcrypto/Makefile.inc projects/collation/secure/lib/libcrypto/Makefile.man projects/collation/secure/lib/libcrypto/amd64/aes-x86_64.S projects/collation/secure/lib/libcrypto/amd64/aesni-sha1-x86_64.S projects/collation/secure/lib/libcrypto/amd64/aesni-x86_64.S projects/collation/secure/lib/libcrypto/amd64/bsaes-x86_64.S projects/collation/secure/lib/libcrypto/amd64/cmll-x86_64.S projects/collation/secure/lib/libcrypto/amd64/ghash-x86_64.S projects/collation/secure/lib/libcrypto/amd64/md5-x86_64.S projects/collation/secure/lib/libcrypto/amd64/rc4-x86_64.S projects/collation/secure/lib/libcrypto/amd64/sha1-x86_64.S projects/collation/secure/lib/libcrypto/amd64/sha256-x86_64.S projects/collation/secure/lib/libcrypto/amd64/sha512-x86_64.S projects/collation/secure/lib/libcrypto/amd64/vpaes-x86_64.S projects/collation/secure/lib/libcrypto/amd64/wp-x86_64.S projects/collation/secure/lib/libcrypto/amd64/x86_64-gf2m.S projects/collation/secure/lib/libcrypto/amd64/x86_64-mont.S projects/collation/secure/lib/libcrypto/amd64/x86_64-mont5.S projects/collation/secure/lib/libcrypto/amd64/x86_64cpuid.S projects/collation/secure/lib/libcrypto/engines/Makefile projects/collation/secure/lib/libcrypto/engines/libgost/Makefile projects/collation/secure/lib/libcrypto/i386/aes-586.s projects/collation/secure/lib/libcrypto/i386/aesni-x86.s projects/collation/secure/lib/libcrypto/i386/bn-586.s projects/collation/secure/lib/libcrypto/i386/des-586.s projects/collation/secure/lib/libcrypto/i386/ghash-x86.s projects/collation/secure/lib/libcrypto/i386/rc4-586.s projects/collation/secure/lib/libcrypto/i386/sha1-586.s projects/collation/secure/lib/libcrypto/i386/sha256-586.s projects/collation/secure/lib/libcrypto/i386/sha512-586.s projects/collation/secure/lib/libcrypto/i386/vpaes-x86.s projects/collation/secure/lib/libcrypto/i386/wp-mmx.s projects/collation/secure/lib/libcrypto/i386/x86-gf2m.s projects/collation/secure/lib/libcrypto/i386/x86-mont.s projects/collation/secure/lib/libcrypto/i386/x86cpuid.s projects/collation/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/collation/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/collation/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/collation/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/collation/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/collation/secure/lib/libcrypto/man/BIO_ctrl.3 projects/collation/secure/lib/libcrypto/man/BIO_f_base64.3 projects/collation/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/collation/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/collation/secure/lib/libcrypto/man/BIO_f_md.3 projects/collation/secure/lib/libcrypto/man/BIO_f_null.3 projects/collation/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/collation/secure/lib/libcrypto/man/BIO_find_type.3 projects/collation/secure/lib/libcrypto/man/BIO_new.3 projects/collation/secure/lib/libcrypto/man/BIO_new_CMS.3 projects/collation/secure/lib/libcrypto/man/BIO_push.3 projects/collation/secure/lib/libcrypto/man/BIO_read.3 projects/collation/secure/lib/libcrypto/man/BIO_s_accept.3 projects/collation/secure/lib/libcrypto/man/BIO_s_bio.3 projects/collation/secure/lib/libcrypto/man/BIO_s_connect.3 projects/collation/secure/lib/libcrypto/man/BIO_s_fd.3 projects/collation/secure/lib/libcrypto/man/BIO_s_file.3 projects/collation/secure/lib/libcrypto/man/BIO_s_mem.3 projects/collation/secure/lib/libcrypto/man/BIO_s_null.3 projects/collation/secure/lib/libcrypto/man/BIO_s_socket.3 projects/collation/secure/lib/libcrypto/man/BIO_set_callback.3 projects/collation/secure/lib/libcrypto/man/BIO_should_retry.3 projects/collation/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/collation/secure/lib/libcrypto/man/BN_CTX_new.3 projects/collation/secure/lib/libcrypto/man/BN_CTX_start.3 projects/collation/secure/lib/libcrypto/man/BN_add.3 projects/collation/secure/lib/libcrypto/man/BN_add_word.3 projects/collation/secure/lib/libcrypto/man/BN_bn2bin.3 projects/collation/secure/lib/libcrypto/man/BN_cmp.3 projects/collation/secure/lib/libcrypto/man/BN_copy.3 projects/collation/secure/lib/libcrypto/man/BN_generate_prime.3 projects/collation/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/collation/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/collation/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/collation/secure/lib/libcrypto/man/BN_new.3 projects/collation/secure/lib/libcrypto/man/BN_num_bytes.3 projects/collation/secure/lib/libcrypto/man/BN_rand.3 projects/collation/secure/lib/libcrypto/man/BN_set_bit.3 projects/collation/secure/lib/libcrypto/man/BN_swap.3 projects/collation/secure/lib/libcrypto/man/BN_zero.3 projects/collation/secure/lib/libcrypto/man/CMS_add0_cert.3 projects/collation/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 projects/collation/secure/lib/libcrypto/man/CMS_add1_signer.3 projects/collation/secure/lib/libcrypto/man/CMS_compress.3 projects/collation/secure/lib/libcrypto/man/CMS_decrypt.3 projects/collation/secure/lib/libcrypto/man/CMS_encrypt.3 projects/collation/secure/lib/libcrypto/man/CMS_final.3 projects/collation/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 projects/collation/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 projects/collation/secure/lib/libcrypto/man/CMS_get0_type.3 projects/collation/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 projects/collation/secure/lib/libcrypto/man/CMS_sign.3 projects/collation/secure/lib/libcrypto/man/CMS_sign_receipt.3 projects/collation/secure/lib/libcrypto/man/CMS_uncompress.3 projects/collation/secure/lib/libcrypto/man/CMS_verify.3 projects/collation/secure/lib/libcrypto/man/CMS_verify_receipt.3 projects/collation/secure/lib/libcrypto/man/CONF_modules_free.3 projects/collation/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/collation/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/collation/secure/lib/libcrypto/man/DH_generate_key.3 projects/collation/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/collation/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/collation/secure/lib/libcrypto/man/DH_new.3 projects/collation/secure/lib/libcrypto/man/DH_set_method.3 projects/collation/secure/lib/libcrypto/man/DH_size.3 projects/collation/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/collation/secure/lib/libcrypto/man/DSA_do_sign.3 projects/collation/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/collation/secure/lib/libcrypto/man/DSA_generate_key.3 projects/collation/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/collation/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/collation/secure/lib/libcrypto/man/DSA_new.3 projects/collation/secure/lib/libcrypto/man/DSA_set_method.3 projects/collation/secure/lib/libcrypto/man/DSA_sign.3 projects/collation/secure/lib/libcrypto/man/DSA_size.3 projects/collation/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/collation/secure/lib/libcrypto/man/ERR_clear_error.3 projects/collation/secure/lib/libcrypto/man/ERR_error_string.3 projects/collation/secure/lib/libcrypto/man/ERR_get_error.3 projects/collation/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/collation/secure/lib/libcrypto/man/ERR_load_strings.3 projects/collation/secure/lib/libcrypto/man/ERR_print_errors.3 projects/collation/secure/lib/libcrypto/man/ERR_put_error.3 projects/collation/secure/lib/libcrypto/man/ERR_remove_state.3 projects/collation/secure/lib/libcrypto/man/ERR_set_mark.3 projects/collation/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/collation/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/collation/secure/lib/libcrypto/man/EVP_DigestSignInit.3 projects/collation/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 projects/collation/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/collation/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_derive.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_sign.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_verify.3 projects/collation/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 projects/collation/secure/lib/libcrypto/man/EVP_SealInit.3 projects/collation/secure/lib/libcrypto/man/EVP_SignInit.3 projects/collation/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/collation/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/collation/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/collation/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/collation/secure/lib/libcrypto/man/OPENSSL_config.3 projects/collation/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/collation/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/collation/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/collation/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 projects/collation/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 projects/collation/secure/lib/libcrypto/man/PKCS12_create.3 projects/collation/secure/lib/libcrypto/man/PKCS12_parse.3 projects/collation/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/collation/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/collation/secure/lib/libcrypto/man/PKCS7_sign.3 projects/collation/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 projects/collation/secure/lib/libcrypto/man/PKCS7_verify.3 projects/collation/secure/lib/libcrypto/man/RAND_add.3 projects/collation/secure/lib/libcrypto/man/RAND_bytes.3 projects/collation/secure/lib/libcrypto/man/RAND_cleanup.3 projects/collation/secure/lib/libcrypto/man/RAND_egd.3 projects/collation/secure/lib/libcrypto/man/RAND_load_file.3 projects/collation/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/collation/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/collation/secure/lib/libcrypto/man/RSA_check_key.3 projects/collation/secure/lib/libcrypto/man/RSA_generate_key.3 projects/collation/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/collation/secure/lib/libcrypto/man/RSA_new.3 projects/collation/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/collation/secure/lib/libcrypto/man/RSA_print.3 projects/collation/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/collation/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/collation/secure/lib/libcrypto/man/RSA_set_method.3 projects/collation/secure/lib/libcrypto/man/RSA_sign.3 projects/collation/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/collation/secure/lib/libcrypto/man/RSA_size.3 projects/collation/secure/lib/libcrypto/man/SMIME_read_CMS.3 projects/collation/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/collation/secure/lib/libcrypto/man/SMIME_write_CMS.3 projects/collation/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/collation/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/collation/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/collation/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/collation/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/collation/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 projects/collation/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 projects/collation/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 projects/collation/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 projects/collation/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 projects/collation/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 projects/collation/secure/lib/libcrypto/man/X509_new.3 projects/collation/secure/lib/libcrypto/man/X509_verify_cert.3 projects/collation/secure/lib/libcrypto/man/bio.3 projects/collation/secure/lib/libcrypto/man/blowfish.3 projects/collation/secure/lib/libcrypto/man/bn.3 projects/collation/secure/lib/libcrypto/man/bn_internal.3 projects/collation/secure/lib/libcrypto/man/buffer.3 projects/collation/secure/lib/libcrypto/man/crypto.3 projects/collation/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/collation/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3 projects/collation/secure/lib/libcrypto/man/d2i_DHparams.3 projects/collation/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/collation/secure/lib/libcrypto/man/d2i_ECPrivateKey.3 projects/collation/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/collation/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/collation/secure/lib/libcrypto/man/d2i_X509.3 projects/collation/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/collation/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/collation/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/collation/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/collation/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/collation/secure/lib/libcrypto/man/des.3 projects/collation/secure/lib/libcrypto/man/dh.3 projects/collation/secure/lib/libcrypto/man/dsa.3 projects/collation/secure/lib/libcrypto/man/ecdsa.3 projects/collation/secure/lib/libcrypto/man/engine.3 projects/collation/secure/lib/libcrypto/man/err.3 projects/collation/secure/lib/libcrypto/man/evp.3 projects/collation/secure/lib/libcrypto/man/hmac.3 projects/collation/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 projects/collation/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 projects/collation/secure/lib/libcrypto/man/lh_stats.3 projects/collation/secure/lib/libcrypto/man/lhash.3 projects/collation/secure/lib/libcrypto/man/md5.3 projects/collation/secure/lib/libcrypto/man/mdc2.3 projects/collation/secure/lib/libcrypto/man/pem.3 projects/collation/secure/lib/libcrypto/man/rand.3 projects/collation/secure/lib/libcrypto/man/rc4.3 projects/collation/secure/lib/libcrypto/man/ripemd.3 projects/collation/secure/lib/libcrypto/man/rsa.3 projects/collation/secure/lib/libcrypto/man/sha.3 projects/collation/secure/lib/libcrypto/man/threads.3 projects/collation/secure/lib/libcrypto/man/ui.3 projects/collation/secure/lib/libcrypto/man/ui_compat.3 projects/collation/secure/lib/libcrypto/man/x509.3 projects/collation/secure/lib/libcrypto/opensslconf-aarch64.h projects/collation/secure/lib/libcrypto/opensslconf-arm.h projects/collation/secure/lib/libcrypto/opensslconf-mips.h projects/collation/secure/lib/libcrypto/opensslconf-powerpc.h projects/collation/secure/lib/libcrypto/opensslconf-sparc64.h projects/collation/secure/lib/libcrypto/opensslconf-x86.h projects/collation/secure/lib/libssl/Makefile projects/collation/secure/lib/libssl/Makefile.man projects/collation/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/collation/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/collation/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/collation/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/collation/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/collation/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/collation/secure/lib/libssl/man/SSL_CTX_free.3 projects/collation/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/collation/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/collation/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/collation/secure/lib/libssl/man/SSL_CTX_new.3 projects/collation/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/collation/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/collation/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/collation/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/collation/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/collation/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/collation/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 projects/collation/secure/lib/libssl/man/SSL_SESSION_free.3 projects/collation/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/collation/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/collation/secure/lib/libssl/man/SSL_accept.3 projects/collation/secure/lib/libssl/man/SSL_alert_type_string.3 projects/collation/secure/lib/libssl/man/SSL_clear.3 projects/collation/secure/lib/libssl/man/SSL_connect.3 projects/collation/secure/lib/libssl/man/SSL_do_handshake.3 projects/collation/secure/lib/libssl/man/SSL_free.3 projects/collation/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/collation/secure/lib/libssl/man/SSL_get_ciphers.3 projects/collation/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/collation/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/collation/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/collation/secure/lib/libssl/man/SSL_get_error.3 projects/collation/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/collation/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/collation/secure/lib/libssl/man/SSL_get_fd.3 projects/collation/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/collation/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/collation/secure/lib/libssl/man/SSL_get_psk_identity.3 projects/collation/secure/lib/libssl/man/SSL_get_rbio.3 projects/collation/secure/lib/libssl/man/SSL_get_session.3 projects/collation/secure/lib/libssl/man/SSL_get_verify_result.3 projects/collation/secure/lib/libssl/man/SSL_get_version.3 projects/collation/secure/lib/libssl/man/SSL_library_init.3 projects/collation/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/collation/secure/lib/libssl/man/SSL_new.3 projects/collation/secure/lib/libssl/man/SSL_pending.3 projects/collation/secure/lib/libssl/man/SSL_read.3 projects/collation/secure/lib/libssl/man/SSL_rstate_string.3 projects/collation/secure/lib/libssl/man/SSL_session_reused.3 projects/collation/secure/lib/libssl/man/SSL_set_bio.3 projects/collation/secure/lib/libssl/man/SSL_set_connect_state.3 projects/collation/secure/lib/libssl/man/SSL_set_fd.3 projects/collation/secure/lib/libssl/man/SSL_set_session.3 projects/collation/secure/lib/libssl/man/SSL_set_shutdown.3 projects/collation/secure/lib/libssl/man/SSL_set_verify_result.3 projects/collation/secure/lib/libssl/man/SSL_shutdown.3 projects/collation/secure/lib/libssl/man/SSL_state_string.3 projects/collation/secure/lib/libssl/man/SSL_want.3 projects/collation/secure/lib/libssl/man/SSL_write.3 projects/collation/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/collation/secure/lib/libssl/man/ssl.3 projects/collation/secure/usr.bin/openssl/man/CA.pl.1 projects/collation/secure/usr.bin/openssl/man/asn1parse.1 projects/collation/secure/usr.bin/openssl/man/c_rehash.1 projects/collation/secure/usr.bin/openssl/man/ca.1 projects/collation/secure/usr.bin/openssl/man/ciphers.1 projects/collation/secure/usr.bin/openssl/man/cms.1 projects/collation/secure/usr.bin/openssl/man/crl.1 projects/collation/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/collation/secure/usr.bin/openssl/man/dgst.1 projects/collation/secure/usr.bin/openssl/man/dhparam.1 projects/collation/secure/usr.bin/openssl/man/dsa.1 projects/collation/secure/usr.bin/openssl/man/dsaparam.1 projects/collation/secure/usr.bin/openssl/man/ec.1 projects/collation/secure/usr.bin/openssl/man/ecparam.1 projects/collation/secure/usr.bin/openssl/man/enc.1 projects/collation/secure/usr.bin/openssl/man/errstr.1 projects/collation/secure/usr.bin/openssl/man/gendsa.1 projects/collation/secure/usr.bin/openssl/man/genpkey.1 projects/collation/secure/usr.bin/openssl/man/genrsa.1 projects/collation/secure/usr.bin/openssl/man/nseq.1 projects/collation/secure/usr.bin/openssl/man/ocsp.1 projects/collation/secure/usr.bin/openssl/man/openssl.1 projects/collation/secure/usr.bin/openssl/man/passwd.1 projects/collation/secure/usr.bin/openssl/man/pkcs12.1 projects/collation/secure/usr.bin/openssl/man/pkcs7.1 projects/collation/secure/usr.bin/openssl/man/pkcs8.1 projects/collation/secure/usr.bin/openssl/man/pkey.1 projects/collation/secure/usr.bin/openssl/man/pkeyparam.1 projects/collation/secure/usr.bin/openssl/man/pkeyutl.1 projects/collation/secure/usr.bin/openssl/man/rand.1 projects/collation/secure/usr.bin/openssl/man/req.1 projects/collation/secure/usr.bin/openssl/man/rsa.1 projects/collation/secure/usr.bin/openssl/man/rsautl.1 projects/collation/secure/usr.bin/openssl/man/s_client.1 projects/collation/secure/usr.bin/openssl/man/s_server.1 projects/collation/secure/usr.bin/openssl/man/s_time.1 projects/collation/secure/usr.bin/openssl/man/sess_id.1 projects/collation/secure/usr.bin/openssl/man/smime.1 projects/collation/secure/usr.bin/openssl/man/speed.1 projects/collation/secure/usr.bin/openssl/man/spkac.1 projects/collation/secure/usr.bin/openssl/man/ts.1 projects/collation/secure/usr.bin/openssl/man/tsget.1 projects/collation/secure/usr.bin/openssl/man/verify.1 projects/collation/secure/usr.bin/openssl/man/version.1 projects/collation/secure/usr.bin/openssl/man/x509.1 projects/collation/secure/usr.bin/openssl/man/x509v3_config.1 projects/collation/share/colldef/Makefile projects/collation/share/ctypedef/Makefile projects/collation/share/examples/smbfs/Makefile projects/collation/share/examples/smbfs/print/Makefile projects/collation/share/keys/pkg/trusted/Makefile projects/collation/share/man/man4/Makefile projects/collation/share/man/man4/cloudabi.4 projects/collation/share/man/man4/ioat.4 projects/collation/share/man/man4/isp.4 projects/collation/share/man/man4/tcp.4 projects/collation/share/man/man4/wlan.4 projects/collation/share/man/man5/style.Makefile.5 projects/collation/share/man/man7/build.7 projects/collation/share/man/man9/BUS_ADD_CHILD.9 projects/collation/share/man/man9/Makefile projects/collation/share/man/man9/bitset.9 projects/collation/share/man/man9/device_add_child.9 projects/collation/share/man/man9/getenv.9 projects/collation/share/man/man9/sysctl.9 projects/collation/share/misc/bsd-family-tree projects/collation/share/misc/committers-src.dot projects/collation/share/misc/scsi_modes projects/collation/share/mk/bsd.README projects/collation/share/mk/bsd.compiler.mk projects/collation/share/mk/bsd.confs.mk projects/collation/share/mk/bsd.crunchgen.mk projects/collation/share/mk/bsd.files.mk projects/collation/share/mk/bsd.man.mk projects/collation/share/mk/bsd.progs.mk projects/collation/share/mk/bsd.subdir.mk projects/collation/share/mk/src.opts.mk projects/collation/share/monetdef/Makefile projects/collation/share/msgdef/Makefile projects/collation/share/numericdef/Makefile projects/collation/share/sendmail/Makefile projects/collation/share/skel/Makefile projects/collation/sys/amd64/Makefile projects/collation/sys/amd64/amd64/initcpu.c projects/collation/sys/amd64/amd64/pmap.c projects/collation/sys/amd64/cloudabi64/cloudabi64_sysvec.c projects/collation/sys/amd64/include/cpufunc.h projects/collation/sys/amd64/include/xen/xen-os.h projects/collation/sys/amd64/linux/linux_proto.h projects/collation/sys/amd64/linux/linux_syscall.h projects/collation/sys/amd64/linux/linux_syscalls.c projects/collation/sys/amd64/linux/linux_sysent.c projects/collation/sys/amd64/linux/linux_systrace_args.c projects/collation/sys/amd64/linux/syscalls.master projects/collation/sys/amd64/linux32/linux.h projects/collation/sys/amd64/linux32/linux32_locore.s projects/collation/sys/amd64/linux32/linux32_proto.h projects/collation/sys/amd64/linux32/linux32_syscall.h projects/collation/sys/amd64/linux32/linux32_syscalls.c projects/collation/sys/amd64/linux32/linux32_sysent.c projects/collation/sys/amd64/linux32/linux32_sysvec.c projects/collation/sys/amd64/linux32/syscalls.conf projects/collation/sys/amd64/linux32/syscalls.master projects/collation/sys/arm/amlogic/aml8726/aml8726_machdep.c projects/collation/sys/arm/arm/busdma_machdep-v6.c projects/collation/sys/arm/arm/busdma_machdep.c projects/collation/sys/arm/arm/cpufunc.c projects/collation/sys/arm/arm/cpuinfo.c projects/collation/sys/arm/arm/gic.c projects/collation/sys/arm/arm/locore-v6.S projects/collation/sys/arm/arm/mp_machdep.c projects/collation/sys/arm/arm/pmap-v6-new.c projects/collation/sys/arm/arm/pmap-v6.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h projects/collation/sys/arm/conf/ARMADAXP projects/collation/sys/arm/conf/DB-78XXX projects/collation/sys/arm/conf/DB-88F5XXX projects/collation/sys/arm/conf/DB-88F6XXX projects/collation/sys/arm/conf/DOCKSTAR projects/collation/sys/arm/conf/DREAMPLUG-1001 projects/collation/sys/arm/conf/NOTES projects/collation/sys/arm/conf/SHEEVAPLUG projects/collation/sys/arm/conf/TS7800 projects/collation/sys/arm/include/cpu-v6.h projects/collation/sys/arm/include/cpuinfo.h projects/collation/sys/arm/include/pmap-v6.h projects/collation/sys/arm/include/pmap.h projects/collation/sys/arm/ti/am335x/am335x_pmic.c projects/collation/sys/arm/ti/am335x/tda19988.c projects/collation/sys/arm64/arm64/busdma_bounce.c projects/collation/sys/arm64/arm64/gic_v3_its.c projects/collation/sys/arm64/arm64/locore.S projects/collation/sys/arm64/arm64/trap.c projects/collation/sys/arm64/cavium/thunder_pcie.c projects/collation/sys/arm64/conf/GENERIC projects/collation/sys/arm64/include/armreg.h projects/collation/sys/arm64/include/asm.h projects/collation/sys/boot/common/newvers.sh projects/collation/sys/cam/ctl/ctl.c projects/collation/sys/cam/ctl/ctl.h projects/collation/sys/cam/ctl/ctl_backend_block.c projects/collation/sys/cam/ctl/ctl_frontend_cam_sim.c projects/collation/sys/cam/ctl/ctl_frontend_iscsi.c projects/collation/sys/cam/ctl/scsi_ctl.c projects/collation/sys/cam/scsi/scsi_message.h projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/collation/sys/cddl/dev/systrace/systrace.c projects/collation/sys/compat/cloudabi64/cloudabi64_util.h projects/collation/sys/compat/linux/linux_misc.c projects/collation/sys/conf/NOTES projects/collation/sys/conf/files projects/collation/sys/conf/files.arm projects/collation/sys/conf/files.arm64 projects/collation/sys/conf/files.i386 projects/collation/sys/conf/files.mips projects/collation/sys/conf/files.pc98 projects/collation/sys/conf/files.powerpc projects/collation/sys/conf/files.sparc64 projects/collation/sys/conf/kern.pre.mk projects/collation/sys/conf/options projects/collation/sys/contrib/rdma/krping/krping.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/collation/sys/dev/ata/chipsets/ata-jmicron.c projects/collation/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c projects/collation/sys/dev/cxgbe/iw_cxgbe/device.c projects/collation/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h projects/collation/sys/dev/cxgbe/iw_cxgbe/qp.c projects/collation/sys/dev/cxgbe/tom/t4_cpl_io.c projects/collation/sys/dev/drm2/i915/i915_dma.c projects/collation/sys/dev/drm2/i915/i915_drv.c projects/collation/sys/dev/drm2/i915/i915_gem_execbuffer.c projects/collation/sys/dev/drm2/i915/i915_irq.c projects/collation/sys/dev/drm2/i915/intel_crt.c projects/collation/sys/dev/drm2/i915/intel_display.c projects/collation/sys/dev/drm2/i915/intel_pm.c projects/collation/sys/dev/drm2/i915/intel_ringbuffer.c projects/collation/sys/dev/drm2/i915/intel_ringbuffer.h projects/collation/sys/dev/etherswitch/arswitch/arswitch_8327.c projects/collation/sys/dev/filemon/filemon.c projects/collation/sys/dev/iicbus/icee.c projects/collation/sys/dev/iicbus/iicbb.c projects/collation/sys/dev/iicbus/iicbus.c projects/collation/sys/dev/iicbus/iicoc.c projects/collation/sys/dev/iicbus/iiconf.c projects/collation/sys/dev/iicbus/iiconf.h projects/collation/sys/dev/iicbus/iicsmb.c projects/collation/sys/dev/ioat/ioat.c projects/collation/sys/dev/ioat/ioat.h projects/collation/sys/dev/ioat/ioat_hw.h projects/collation/sys/dev/ioat/ioat_internal.h projects/collation/sys/dev/ioat/ioat_test.c projects/collation/sys/dev/ioat/ioat_test.h projects/collation/sys/dev/isp/isp.c projects/collation/sys/dev/isp/isp_freebsd.c projects/collation/sys/dev/isp/isp_freebsd.h projects/collation/sys/dev/isp/isp_library.c projects/collation/sys/dev/isp/isp_library.h projects/collation/sys/dev/isp/isp_pci.c projects/collation/sys/dev/isp/isp_sbus.c projects/collation/sys/dev/isp/isp_stds.h projects/collation/sys/dev/isp/isp_target.c projects/collation/sys/dev/isp/isp_target.h projects/collation/sys/dev/isp/ispmbox.h projects/collation/sys/dev/isp/ispreg.h projects/collation/sys/dev/isp/ispvar.h projects/collation/sys/dev/ispfw/asm_2400.h projects/collation/sys/dev/ispfw/asm_2500.h projects/collation/sys/dev/ispfw/ispfw.c projects/collation/sys/dev/iwm/if_iwm.c projects/collation/sys/dev/iwn/if_iwn.c projects/collation/sys/dev/mge/if_mge.c projects/collation/sys/dev/mge/if_mgevar.h projects/collation/sys/dev/ntb/if_ntb/if_ntb.c projects/collation/sys/dev/ntb/ntb_hw/ntb_hw.c projects/collation/sys/dev/ntb/ntb_hw/ntb_hw.h projects/collation/sys/dev/ntb/ntb_hw/ntb_regs.h projects/collation/sys/dev/nvd/nvd.c projects/collation/sys/dev/nvme/nvme.h projects/collation/sys/dev/nvme/nvme_ns.c projects/collation/sys/dev/ofw/ofw_iicbus.c projects/collation/sys/dev/otus/if_otus.c projects/collation/sys/dev/otus/if_otusreg.h projects/collation/sys/dev/qlxgbe/ql_hw.c projects/collation/sys/dev/qlxgbe/ql_os.c projects/collation/sys/dev/qlxgbe/ql_ver.h projects/collation/sys/dev/ral/rt2860.c projects/collation/sys/dev/ral/rt2860var.h projects/collation/sys/dev/sound/midi/midi.c projects/collation/sys/dev/usb/controller/dwc_otg.c projects/collation/sys/dev/usb/usb_device.c projects/collation/sys/dev/usb/usb_dynamic.c projects/collation/sys/dev/usb/usb_dynamic.h projects/collation/sys/dev/usb/wlan/if_run.c projects/collation/sys/dev/usb/wlan/if_urtwn.c projects/collation/sys/dev/usb/wlan/if_urtwnreg.h projects/collation/sys/dev/usb/wlan/if_urtwnvar.h projects/collation/sys/dev/wpi/if_wpi.c projects/collation/sys/dev/wtap/if_wtap.c projects/collation/sys/dev/xen/balloon/balloon.c projects/collation/sys/dev/xen/blkback/blkback.c projects/collation/sys/dev/xen/control/control.c projects/collation/sys/dev/xen/grant_table/grant_table.c projects/collation/sys/dev/xen/netback/netback.c projects/collation/sys/dev/xen/netfront/netfront.c projects/collation/sys/dev/xen/xenpci/xenpci.c projects/collation/sys/dev/xen/xenstore/xenstore.c projects/collation/sys/i386/i386/exception.s projects/collation/sys/i386/i386/initcpu.c projects/collation/sys/i386/i386/pmap.c projects/collation/sys/i386/include/asmacros.h projects/collation/sys/i386/include/cpufunc.h projects/collation/sys/i386/include/xen/xen-os.h projects/collation/sys/kern/Make.tags.inc projects/collation/sys/kern/bus_if.m projects/collation/sys/kern/init_sysent.c projects/collation/sys/kern/kern_fork.c projects/collation/sys/kern/kern_physio.c projects/collation/sys/kern/kern_sysctl.c projects/collation/sys/kern/kern_thread.c projects/collation/sys/kern/kern_umtx.c projects/collation/sys/kern/makesyscalls.sh projects/collation/sys/kern/subr_busdma_bufalloc.c projects/collation/sys/kern/subr_syscall.c projects/collation/sys/kern/sys_process.c projects/collation/sys/kern/syscalls.c projects/collation/sys/kern/vfs_aio.c projects/collation/sys/kern/vfs_bio.c projects/collation/sys/kern/vfs_mountroot.c projects/collation/sys/libkern/ffs.c projects/collation/sys/libkern/ffsl.c projects/collation/sys/libkern/fls.c projects/collation/sys/libkern/flsl.c projects/collation/sys/libkern/flsll.c projects/collation/sys/mips/atheros/if_arge.c projects/collation/sys/mips/atheros/if_argevar.h projects/collation/sys/mips/conf/TP-MR3020 projects/collation/sys/mips/include/cpuregs.h projects/collation/sys/mips/include/pmap.h projects/collation/sys/mips/mips/busdma_machdep.c projects/collation/sys/mips/mips/pmap.c projects/collation/sys/modules/Makefile projects/collation/sys/modules/cloudabi64/Makefile projects/collation/sys/modules/cxgb/iw_cxgb/Makefile projects/collation/sys/modules/cxgbe/iw_cxgbe/Makefile projects/collation/sys/modules/dtrace/Makefile projects/collation/sys/modules/dtrace/systrace_linux32/Makefile projects/collation/sys/modules/hwpmc/Makefile projects/collation/sys/modules/i2c/iicbb/Makefile projects/collation/sys/modules/ibcore/Makefile projects/collation/sys/modules/ipoib/Makefile projects/collation/sys/modules/ispfw/Makefile projects/collation/sys/modules/mlx4/Makefile projects/collation/sys/modules/mlx4ib/Makefile projects/collation/sys/modules/mlxen/Makefile projects/collation/sys/modules/mthca/Makefile projects/collation/sys/modules/rdma/krping/Makefile projects/collation/sys/modules/uart/Makefile projects/collation/sys/modules/usb/usb/Makefile projects/collation/sys/net/if.c projects/collation/sys/net/if_gre.c projects/collation/sys/net/if_lagg.c projects/collation/sys/net/if_lagg.h projects/collation/sys/net/if_tap.c projects/collation/sys/net/pfvar.h projects/collation/sys/net/route.c projects/collation/sys/net80211/ieee80211.c projects/collation/sys/net80211/ieee80211_proto.c projects/collation/sys/net80211/ieee80211_proto.h projects/collation/sys/net80211/ieee80211_var.h projects/collation/sys/netgraph/bluetooth/hci/ng_hci_evnt.c projects/collation/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c projects/collation/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h projects/collation/sys/netgraph/bluetooth/include/ng_btsocket.h projects/collation/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h projects/collation/sys/netgraph/bluetooth/include/ng_hci.h projects/collation/sys/netgraph/bluetooth/include/ng_l2cap.h projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h projects/collation/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h projects/collation/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/collation/sys/netinet/ip_ipsec.c projects/collation/sys/netinet/sctp_input.c projects/collation/sys/netinet/tcp_input.c projects/collation/sys/netinet/tcp_sack.c projects/collation/sys/netinet/tcp_subr.c projects/collation/sys/netinet/tcp_var.h projects/collation/sys/netinet6/frag6.c projects/collation/sys/netipsec/ipsec.c projects/collation/sys/netpfil/pf/pf.c projects/collation/sys/ofed/drivers/infiniband/core/cma.c projects/collation/sys/ofed/drivers/infiniband/core/device.c projects/collation/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/collation/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/collation/sys/ofed/drivers/infiniband/hw/mlx4/main.c projects/collation/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c projects/collation/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/collation/sys/ofed/drivers/net/mlx4/en_main.c projects/collation/sys/ofed/drivers/net/mlx4/en_netdev.c projects/collation/sys/ofed/drivers/net/mlx4/main.c projects/collation/sys/powerpc/powerpc/machdep.c projects/collation/sys/sys/_bitset.h projects/collation/sys/sys/imgact_elf.h projects/collation/sys/sys/ktr_class.h projects/collation/sys/sys/libkern.h projects/collation/sys/sys/param.h projects/collation/sys/sys/proc.h projects/collation/sys/sys/ptrace.h projects/collation/sys/sys/syscall.h projects/collation/sys/sys/syscall.mk projects/collation/sys/sys/sysctl.h projects/collation/sys/sys/sysproto.h projects/collation/sys/sys/umtx.h projects/collation/sys/ufs/ffs/ffs_balloc.c projects/collation/sys/vm/vm_page.h projects/collation/sys/vm/vnode_pager.c projects/collation/sys/x86/include/apicvar.h projects/collation/sys/x86/x86/busdma_bounce.c projects/collation/sys/x86/x86/identcpu.c projects/collation/sys/x86/xen/xen_intr.c projects/collation/sys/xen/blkif.h projects/collation/sys/xen/hypervisor.h projects/collation/sys/xen/xen-os.h projects/collation/sys/xen/xen_intr.h projects/collation/targets/pseudo/userland/Makefile.depend projects/collation/targets/pseudo/userland/lib/Makefile.depend projects/collation/tests/sys/kern/Makefile projects/collation/tools/bsdbox/Makefile.base projects/collation/tools/build/mk/OptionalObsoleteFiles.inc projects/collation/tools/regression/net80211/ccmp/test_ccmp.c projects/collation/tools/regression/net80211/tkip/test_tkip.c projects/collation/tools/regression/net80211/wep/test_wep.c projects/collation/tools/regression/security/open_to_operation/Makefile projects/collation/tools/regression/security/open_to_operation/open_to_operation.c projects/collation/tools/test/README projects/collation/tools/tools/ioat/Makefile projects/collation/tools/tools/ioat/ioatcontrol.8 projects/collation/tools/tools/ioat/ioatcontrol.c projects/collation/usr.bin/Makefile projects/collation/usr.bin/ar/write.c projects/collation/usr.bin/bmake/Makefile projects/collation/usr.bin/calendar/parsedata.c projects/collation/usr.bin/dpv/dpv.1 projects/collation/usr.bin/dtc/HACKING projects/collation/usr.bin/dtc/Makefile projects/collation/usr.bin/dtc/checking.cc projects/collation/usr.bin/dtc/checking.hh projects/collation/usr.bin/dtc/dtb.cc projects/collation/usr.bin/dtc/dtb.hh projects/collation/usr.bin/dtc/dtc.cc projects/collation/usr.bin/dtc/fdt.cc projects/collation/usr.bin/dtc/fdt.hh projects/collation/usr.bin/dtc/input_buffer.cc projects/collation/usr.bin/dtc/input_buffer.hh projects/collation/usr.bin/dtc/string.hh projects/collation/usr.bin/getconf/sysconf.gperf projects/collation/usr.bin/gzip/gzip.1 projects/collation/usr.bin/gzip/gzip.c projects/collation/usr.bin/indent/indent.1 projects/collation/usr.bin/locale/locale.c projects/collation/usr.bin/look/look.1 projects/collation/usr.bin/mkdep/mkdep.1 projects/collation/usr.bin/mkimg/mkimg.1 projects/collation/usr.bin/mt/mt.c projects/collation/usr.bin/patch/pch.c projects/collation/usr.bin/pr/egetopt.c projects/collation/usr.bin/sed/compile.c projects/collation/usr.bin/sockstat/sockstat.c projects/collation/usr.bin/sort/sort.1.in projects/collation/usr.bin/sort/sort.c projects/collation/usr.bin/systat/Makefile projects/collation/usr.bin/systat/cmdtab.c projects/collation/usr.bin/systat/extern.h projects/collation/usr.bin/systat/systat.1 projects/collation/usr.bin/timeout/timeout.c projects/collation/usr.bin/truss/Makefile projects/collation/usr.bin/truss/amd64-cloudabi64.c projects/collation/usr.bin/vgrind/regexp.c projects/collation/usr.bin/vi/catalog/Makefile projects/collation/usr.sbin/Makefile projects/collation/usr.sbin/bhyve/bhyverun.c projects/collation/usr.sbin/bhyve/pci_emul.c projects/collation/usr.sbin/bluetooth/sdpcontrol/search.c projects/collation/usr.sbin/bsdconfig/bsdconfig projects/collation/usr.sbin/config/config.h projects/collation/usr.sbin/ctld/ctld.c projects/collation/usr.sbin/fwcontrol/fwmpegts.c projects/collation/usr.sbin/jail/command.c projects/collation/usr.sbin/jail/jailp.h projects/collation/usr.sbin/jail/jailparse.y projects/collation/usr.sbin/jls/jls.c projects/collation/usr.sbin/makefs/Makefile projects/collation/usr.sbin/makefs/cd9660.c projects/collation/usr.sbin/makefs/cd9660/cd9660_write.c projects/collation/usr.sbin/makefs/cd9660/iso9660_rrip.c projects/collation/usr.sbin/makefs/makefs.8 projects/collation/usr.sbin/makefs/makefs.c projects/collation/usr.sbin/mfiutil/mfiutil.8 projects/collation/usr.sbin/mptable/mptable.c projects/collation/usr.sbin/nandsim/nandsim.8 projects/collation/usr.sbin/nandsim/nandsim.c projects/collation/usr.sbin/nandsim/nandsim_cfgparse.c projects/collation/usr.sbin/ndiscvt/Makefile projects/collation/usr.sbin/ndp/ndp.c projects/collation/usr.sbin/newsyslog/newsyslog.c projects/collation/usr.sbin/newsyslog/newsyslog.conf.5 projects/collation/usr.sbin/ntp/config.h projects/collation/usr.sbin/ntp/doc/ntp-keygen.8 projects/collation/usr.sbin/ntp/doc/ntp.conf.5 projects/collation/usr.sbin/ntp/doc/ntp.keys.5 projects/collation/usr.sbin/ntp/doc/ntpd.8 projects/collation/usr.sbin/ntp/doc/ntpdc.8 projects/collation/usr.sbin/ntp/doc/ntpq.8 projects/collation/usr.sbin/ntp/doc/sntp.8 projects/collation/usr.sbin/ntp/scripts/mkver projects/collation/usr.sbin/pmcstudy/eval_expr.c projects/collation/usr.sbin/ppp/ip.c projects/collation/usr.sbin/ppp/ppp.8 projects/collation/usr.sbin/pw/pw_group.c projects/collation/usr.sbin/pw/pw_user.c projects/collation/usr.sbin/rtadvd/config.c projects/collation/usr.sbin/rtadvd/if.c projects/collation/usr.sbin/rtsold/rtsold.c projects/collation/usr.sbin/rtsold/rtsold.h projects/collation/usr.sbin/tzsetup/tzsetup.c projects/collation/usr.sbin/uefisign/magic.h projects/collation/usr.sbin/uefisign/pe.c projects/collation/usr.sbin/ypbind/ypbind.c projects/collation/usr.sbin/ypserv/ypinit.sh projects/collation/usr.sbin/zic/zdump/Makefile projects/collation/usr.sbin/zic/zic/Makefile Directory Properties: projects/collation/ (props changed) projects/collation/cddl/ (props changed) projects/collation/cddl/contrib/opensolaris/ (props changed) projects/collation/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed) projects/collation/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/collation/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/collation/contrib/apr/ (props changed) projects/collation/contrib/binutils/ (props changed) projects/collation/contrib/bmake/ (props changed) projects/collation/contrib/compiler-rt/ (props changed) projects/collation/contrib/dma/ (props changed) projects/collation/contrib/dtc/ (props changed) projects/collation/contrib/elftoolchain/ (props changed) projects/collation/contrib/elftoolchain/ar/ (props changed) projects/collation/contrib/elftoolchain/brandelf/ (props changed) projects/collation/contrib/elftoolchain/elfdump/ (props changed) projects/collation/contrib/expat/ (props changed) projects/collation/contrib/file/ (props changed) projects/collation/contrib/gcc/ (props changed) projects/collation/contrib/gdb/ (props changed) projects/collation/contrib/groff/ (props changed) projects/collation/contrib/ipfilter/ (props changed) projects/collation/contrib/ipfilter/ml_ipl.c (props changed) projects/collation/contrib/ipfilter/mlfk_ipl.c (props changed) projects/collation/contrib/ipfilter/mlh_rule.c (props changed) projects/collation/contrib/ipfilter/mli_ipl.c (props changed) projects/collation/contrib/ipfilter/mln_ipl.c (props changed) projects/collation/contrib/ipfilter/mls_ipl.c (props changed) projects/collation/contrib/libarchive/ (props changed) projects/collation/contrib/libarchive/libarchive/ (props changed) projects/collation/contrib/libc++/ (props changed) projects/collation/contrib/libcxxrt/ (props changed) projects/collation/contrib/libucl/ (props changed) projects/collation/contrib/llvm/ (props changed) projects/collation/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp (props changed) projects/collation/contrib/llvm/lib/Target/Sparc/Disassembler/SparcDisassembler.cpp (props changed) projects/collation/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp (props changed) projects/collation/contrib/llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.h (props changed) projects/collation/contrib/llvm/projects/libunwind/ (props changed) projects/collation/contrib/llvm/tools/clang/ (props changed) projects/collation/contrib/llvm/tools/lldb/ (props changed) projects/collation/contrib/llvm/tools/llvm-dwarfdump/ (props changed) projects/collation/contrib/llvm/tools/llvm-lto/ (props changed) projects/collation/contrib/mdocml/ (props changed) projects/collation/contrib/ncurses/ (props changed) projects/collation/contrib/netcat/ (props changed) projects/collation/contrib/ntp/ (props changed) projects/collation/contrib/ntp/html/drivers/driver40-ja.html (props changed) projects/collation/contrib/ntp/include/refidsmear.h (props changed) projects/collation/contrib/ntp/libjsmn/example/jsondump.c (props changed) projects/collation/contrib/ntp/libjsmn/example/simple.c (props changed) projects/collation/contrib/ntp/libntp/refidsmear.c (props changed) projects/collation/contrib/ntp/scripts/update-leap/Makefile.am (props changed) projects/collation/contrib/ntp/scripts/update-leap/update-leap.in (props changed) projects/collation/contrib/ntp/scripts/update-leap/update-leap.sh (props changed) projects/collation/contrib/ntp/sntp/ag-tpl/Mdoc.pm (props changed) projects/collation/contrib/ntp/sntp/libpkgver/colcomp.c (props changed) projects/collation/contrib/ntp/sntp/libpkgver/pkgver.h (props changed) projects/collation/contrib/ntp/sntp/tests/networking.c (props changed) projects/collation/contrib/ntp/sntp/unity/auto/colour_prompt.rb (props changed) projects/collation/contrib/ntp/sntp/unity/auto/colour_reporter.rb (props changed) projects/collation/contrib/ntp/sntp/unity/auto/generate_module.rb (props changed) projects/collation/contrib/ntp/sntp/unity/auto/runner_maybe.c (props changed) projects/collation/contrib/ntp/sntp/unity/auto/test_file_filter.rb (props changed) projects/collation/contrib/ntp/sntp/unity/unity.h (props changed) projects/collation/contrib/ntp/sntp/unity/unity_fixture.c (props changed) projects/collation/contrib/ntp/sntp/unity/unity_fixture.h (props changed) projects/collation/contrib/ntp/sntp/unity/unity_fixture_internals.h (props changed) projects/collation/contrib/ntp/sntp/unity/unity_fixture_malloc_overrides.h (props changed) projects/collation/contrib/ntp/tests/bug-2803/bug-2803.c (props changed) projects/collation/contrib/ntp/tests/sandbox/bug-2803.c (props changed) projects/collation/contrib/ntp/tests/sandbox/modetoa.c (props changed) projects/collation/contrib/ntp/tests/sandbox/uglydate.c (props changed) projects/collation/contrib/ntp/tests/sandbox/ut-2803.c (props changed) projects/collation/contrib/openpam/ (props changed) projects/collation/contrib/pf/ (props changed) projects/collation/contrib/sendmail/ (props changed) projects/collation/contrib/serf/ (props changed) projects/collation/contrib/sqlite3/ (props changed) projects/collation/contrib/subversion/ (props changed) projects/collation/contrib/tcpdump/ (props changed) projects/collation/contrib/top/ (props changed) projects/collation/contrib/tzcode/stdtime/ (props changed) projects/collation/contrib/tzdata/ (props changed) projects/collation/contrib/unbound/ (props changed) projects/collation/contrib/wpa/ (props changed) projects/collation/crypto/openssh/ (props changed) projects/collation/crypto/openssl/ (props changed) projects/collation/gnu/lib/ (props changed) projects/collation/gnu/usr.bin/binutils/ (props changed) projects/collation/gnu/usr.bin/cc/cc_tools/ (props changed) projects/collation/gnu/usr.bin/gdb/ (props changed) projects/collation/include/ (props changed) projects/collation/lib/libc/ (props changed) projects/collation/lib/libc/stdtime/ (props changed) projects/collation/lib/libutil/ (props changed) projects/collation/lib/libvmmapi/ (props changed) projects/collation/lib/libz/ (props changed) projects/collation/sbin/ (props changed) projects/collation/sbin/dumpon/ (props changed) projects/collation/sbin/ipfw/ (props changed) projects/collation/share/ (props changed) projects/collation/share/man/man4/ (props changed) projects/collation/share/zoneinfo/ (props changed) projects/collation/sys/ (props changed) projects/collation/sys/amd64/include/vmm.h (props changed) projects/collation/sys/amd64/include/vmm_dev.h (props changed) projects/collation/sys/amd64/include/xen/ (props changed) projects/collation/sys/amd64/vmm/ (props changed) projects/collation/sys/boot/ (props changed) projects/collation/sys/boot/powerpc/kboot/ (props changed) projects/collation/sys/boot/powerpc/ofw/ (props changed) projects/collation/sys/cddl/contrib/opensolaris/ (props changed) projects/collation/sys/conf/ (props changed) projects/collation/sys/contrib/dev/acpica/ (props changed) projects/collation/sys/contrib/ipfilter/ (props changed) projects/collation/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c (props changed) projects/collation/sys/dev/hyperv/ (props changed) projects/collation/sys/modules/hyperv/ (props changed) projects/collation/targets/ (props changed) projects/collation/usr.bin/calendar/ (props changed) projects/collation/usr.bin/mkimg/ (props changed) projects/collation/usr.bin/procstat/ (props changed) projects/collation/usr.sbin/bhyve/ (props changed) projects/collation/usr.sbin/bhyvectl/ (props changed) projects/collation/usr.sbin/bhyveload/ (props changed) projects/collation/usr.sbin/jail/ (props changed) projects/collation/usr.sbin/ndiscvt/ (props changed) projects/collation/usr.sbin/rtadvctl/ (props changed) projects/collation/usr.sbin/rtadvd/ (props changed) projects/collation/usr.sbin/rtsold/ (props changed) projects/collation/usr.sbin/zic/ (props changed) Modified: projects/collation/MAINTAINERS ============================================================================== --- projects/collation/MAINTAINERS Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/MAINTAINERS Sun Nov 1 21:17:38 2015 (r290241) @@ -18,6 +18,12 @@ However, this is not a 'big stick', it i of guidance. It does not override the communal nature of the tree. It is not a registry of 'turf' or private property. +*** +This list is prone to becoming stale quickly. The best way to find the recent +maintainer of a sub-system is to check recent logs for that directory or +sub-system. +*** + subsystem login notes ----------------------------- kqueue jmg Pre-commit review requested. Documentation Required. @@ -31,8 +37,6 @@ sys/security/audit rwatson Pre-commit re ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. -PC Card imp Pre-commit review requested. -CardBus imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. @@ -66,8 +70,7 @@ net80211 adrian Pre-commit review reques nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. -share/mk ru This is a vital component of the build system, so I - offer a pre-commit review for anything non-trivial. +share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org drm rnoland Just keep me informed of changes, try not to break it. unifdef(1) fanf Pre-commit review requested. @@ -81,6 +84,7 @@ file obrien Insists to keep file blocke contrib/bzip2 obrien Pre-commit review required. contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. contrib/pjdfstest freebsd-testing,ngie Pre-commit review requested. +geom freebsd-geom@FreeBSD.org geom_concat pjd Pre-commit review preferred. geom_eli pjd Pre-commit review preferred. geom_gate pjd Pre-commit review preferred. @@ -92,16 +96,16 @@ geom_shsec pjd Pre-commit review preferr geom_stripe pjd Pre-commit review preferred. geom_zero pjd Pre-commit review preferred. sbin/geom pjd Pre-commit review preferred. -zfs pjd Pre-commit review preferred. -nfs alfred Will be happy to review code, but not mandatory. -rpc.lockd alfred Will be happy to review code, but not mandatory. -truss alfred Will be happy to review code, but not mandatory. -rpc alfred Pre-commit review requested. +zfs freebsd-fs@FreeBSD.org +nfs freebsd-fs@FreeBSD.org, rmacklem is best for reviews. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. openssl benl,jkim Pre-commit review requested. +sys/dev/usb hselasky If in doubt, ask. +sys/dev/sound/usb hselasky If in doubt, ask. +sys/compat/linuxkpi hselasky If in doubt, ask. sys/netgraph/bluetooth emax Pre-commit review preferred. lib/libbluetooth emax Pre-commit review preferred. lib/libsdp emax Pre-commit review preferred. Modified: projects/collation/Makefile.inc1 ============================================================================== --- projects/collation/Makefile.inc1 Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/Makefile.inc1 Sun Nov 1 21:17:38 2015 (r290241) @@ -30,6 +30,8 @@ # BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh) # WORLD_FLAGS= additional flags to pass to make(1) during buildworld # KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel +# SUBDIR_OVERRIDE="list of dirs" to build rather than everything. +# All libraries and includes, and some build tools will still build. # # The intended user-driven targets are: @@ -59,7 +61,7 @@ # system here would require fine-grained ordering of all components based # on their dependencies. SRCDIR?= ${.CURDIR} -.if defined(SUBDIR_OVERRIDE) +.if !empty(SUBDIR_OVERRIDE) SUBDIR= ${SUBDIR_OVERRIDE} .else SUBDIR= lib libexec @@ -113,7 +115,6 @@ SUBDIR+= ${_DIR} .warning ${_DIR} not added to SUBDIR list. See UPDATING 20141121. .endif .endfor -.endif # We must do etc/ last as it hooks into building the man whatis file # by calling 'makedb' in share/man. This is only relevant for @@ -124,7 +125,10 @@ SUBDIR+=.WAIT .endif SUBDIR+=etc +.endif # !empty(SUBDIR_OVERRIDE) + .if defined(NOCLEAN) +.warning NOCLEAN option is deprecated. Use NO_CLEAN instead. NO_CLEAN= ${NOCLEAN} .endif .if defined(NO_CLEANDIR) @@ -394,6 +398,9 @@ TARGET_ABI= gnueabi .if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc XCFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib XCXXFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11 -L${WORLDTMP}/../lib/libc++ +# XXX: DEPFLAGS is a workaround for not properly passing CXXFLAGS to sub-makes +# due to CXX="${XCXX} ${XCXXFLAGS}". bsd.dep.mk does use CXXFLAGS when +# building C++ files so this can come out if passing CXXFLAGS down is fixed. DEPFLAGS+= -I${WORLDTMP}/usr/include/c++/v1 .else TARGET_ABI?= unknown @@ -513,7 +520,7 @@ KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -_worldtmp: +_worldtmp: .PHONY .if ${.CURDIR:C/[^,]//g} != "" # The m4 build of sendmail files doesn't like it if ',' is used # anywhere in the path of it's files. @@ -560,6 +567,16 @@ _worldtmp: mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${WORLDTMP}/usr/lib >/dev/null .endif +.if ${MK_LIB32} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${WORLDTMP}/usr >/dev/null +.if ${MK_DEBUG_FILES} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null +.endif +.endif .if ${MK_TESTS} != "no" mkdir -p ${WORLDTMP}${TESTSBASE} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ @@ -620,8 +637,16 @@ _includes: @echo "--------------------------------------------------------------" @echo ">>> stage 4.1: building includes" @echo "--------------------------------------------------------------" +# Special handling for SUBDIR_OVERRIDE in buildworld as they most likely need +# headers from default SUBDIR. Do SUBDIR_OVERRIDE includes last. + ${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \ + buildincludes + ${_+_}cd ${.CURDIR}; ${WMAKE} SUBDIR_OVERRIDE= SHARED=symlinks \ + installincludes +.if !empty(SUBDIR_OVERRIDE) && make(buildworld) ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks buildincludes ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks installincludes +.endif _libraries: @echo @echo "--------------------------------------------------------------" @@ -643,7 +668,7 @@ everything: @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all .if defined(LIB32TMP) -build32: +build32: .PHONY @echo @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit shim libraries" @@ -653,73 +678,76 @@ build32: -p ${LIB32TMP}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${LIB32TMP}/usr/include >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${LIB32TMP}/usr >/dev/null .if ${MK_DEBUG_FILES} != "no" mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${LIB32TMP}/usr/lib >/dev/null + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${LIB32TMP}/usr/lib/debug/usr >/dev/null .endif mkdir -p ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP} .for _t in obj includes - cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t} - cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t} + ${_+_}cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t} + ${_+_}cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t} .if ${MK_CDDL} != "no" - cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t} + ${_+_}cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t} .endif - cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=gnu/lib/ ${_t} + ${_+_}cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=gnu/lib/ ${_t} .if ${MK_CRYPT} != "no" - cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=secure/lib/ ${_t} + ${_+_}cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=secure/lib/ ${_t} .endif .if ${MK_KERBEROS} != "no" - cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=kerberos5/lib ${_t} + ${_+_}cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=kerberos5/lib ${_t} .endif .endfor .for _dir in usr.bin/lex/lib - cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=${_dir}/ obj + ${_+_}cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=${_dir}/ obj .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic - cd ${.CURDIR}/${_dir}; \ + ${_+_}cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor - cd ${.CURDIR}; \ + ${_+_}cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries .for _t in obj depend all - cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \ + ${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \ DIRPRFX=libexec/rtld-elf/ ${_t} - cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \ + ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \ DIRPRFX=usr.bin/ldd ${_t} .endfor -distribute32 install32: - cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} +distribute32 install32: .MAKE .PHONY + ${_+_}cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .if ${MK_CDDL} != "no" - cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} + ${_+_}cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} + ${_+_}cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .if ${MK_CRYPT} != "no" - cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} + ${_+_}cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif .if ${MK_KERBEROS} != "no" - cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} + ${_+_}cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif - cd ${.CURDIR}/libexec/rtld-elf; \ + ${_+_}cd ${.CURDIR}/libexec/rtld-elf; \ PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} - cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//} + ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} \ + ${.TARGET:S/32$//} .endif WMAKE_TGTS= -.if !defined(SUBDIR_OVERRIDE) -WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools -.endif -WMAKE_TGTS+= _cleanobj _obj _build-tools -.if !defined(SUBDIR_OVERRIDE) -WMAKE_TGTS+= _cross-tools +WMAKE_TGTS+= _worldtmp _legacy +.if empty(SUBDIR_OVERRIDE) +WMAKE_TGTS+= _bootstrap-tools .endif +WMAKE_TGTS+= _cleanobj _obj _build-tools _cross-tools WMAKE_TGTS+= _includes _libraries _depend everything -.if defined(LIB32TMP) && ${MK_LIB32} != "no" +.if defined(LIB32TMP) && ${MK_LIB32} != "no" && empty(SUBDIR_OVERRIDE) WMAKE_TGTS+= build32 .endif @@ -901,6 +929,14 @@ distributeworld installworld: _installch mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null .endif +.if ${MK_LIB32} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null +.if ${MK_DEBUG_FILES} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null +.endif +.endif .if ${MK_TESTS} != "no" && ${dist} == "tests" -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ @@ -917,10 +953,14 @@ distributeworld installworld: _installch sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG} ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \ sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG} +.if ${MK_LIB32} != "no" + ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib32.dist | \ + sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG} +.endif .endif .endfor -mkdir ${DESTDIR}/${DISTDIR}/base - cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ + ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs @@ -988,7 +1028,7 @@ packageworld: # and do a 'make reinstall' on the *client* to install new binaries from the # most recent server build. # -reinstall: .MAKE +reinstall: .MAKE .PHONY @echo "--------------------------------------------------------------" @echo ">>> Making hierarchy" @echo "--------------------------------------------------------------" @@ -1003,7 +1043,7 @@ reinstall: .MAKE ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32 .endif -redistribute: .MAKE +redistribute: .MAKE .PHONY @echo "--------------------------------------------------------------" @echo ">>> Distributing everything" @echo "--------------------------------------------------------------" @@ -1013,12 +1053,12 @@ redistribute: .MAKE DISTRIBUTION=lib32 .endif -distrib-dirs: .MAKE - cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ +distrib-dirs: .MAKE .PHONY + ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} -distribution: .MAKE - cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ +distribution: .MAKE .PHONY + ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ @@ -1071,14 +1111,14 @@ INSTALLKERNEL= ${_kernel} .endif .endfor -buildkernel ${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY +${WMAKE_TGTS:N_worldtmp:Nbuild32} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY # # buildkernel # # Builds all kernels defined by BUILDKERNELS. # -buildkernel: +buildkernel: .MAKE .PHONY .if empty(BUILDKERNELS) @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \ false @@ -1105,14 +1145,14 @@ buildkernel: @echo "--------------------------------------------------------------" @echo ">>> stage 2.1: cleaning up the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} + ${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} .endif .if !defined(NO_KERNELOBJ) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj + ${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj .endif @echo @echo "--------------------------------------------------------------" @@ -1124,13 +1164,13 @@ buildkernel: @echo "--------------------------------------------------------------" @echo ">>> stage 3.1: making dependencies" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ + ${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ .endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 3.2: building everything" @echo "--------------------------------------------------------------" - cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ + ${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -1231,12 +1271,12 @@ packagekernel: # # Build the API documentation with doxygen # -doxygen: +doxygen: .PHONY @if [ ! -x `/usr/bin/which doxygen` ]; then \ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi - cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all + ${_+_}cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all # # update @@ -1471,7 +1511,6 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue=rescue/rescue .endif -build-tools: .MAKE .for _tool in \ bin/csh \ bin/sh \ @@ -1485,18 +1524,22 @@ build-tools: .MAKE usr.bin/mkesdb_static \ usr.bin/mkcsmapper_static \ usr.bin/vi/catalog +build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ ${MAKE} DIRPRFX=${_tool}/ build-tools +build-tools: build-tools_${_tool} .endfor .for _tool in \ ${_gcc_tools} +build-tools_${_tool}: .PHONY ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ cd ${.CURDIR}/${_tool} && \ ${MAKE} DIRPRFX=${_tool}/ obj && \ ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all +build-tools: build-tools_${_tool} .endfor # @@ -1562,7 +1605,7 @@ _cc= gnu/usr.bin/cc _usb_tools= sys/boot/usb/tools .endif -cross-tools: .MAKE +cross-tools: .MAKE .PHONY .for _tool in \ ${_clang_libs} \ ${_clang} \ @@ -1581,12 +1624,13 @@ cross-tools: .MAKE ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor +NXBDESTDIR= ${OBJTREE}/nxb-bin NXBENV= MAKEOBJDIRPREFIX=${OBJTREE}/nxb \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin NXBMAKE= ${NXBENV} ${MAKE} \ - TBLGEN=${OBJTREE}/nxb-bin/usr/bin/tblgen \ - CLANG_TBLGEN=${OBJTREE}/nxb-bin/usr/bin/clang-tblgen \ + TBLGEN=${NXBDESTDIR}/usr/bin/tblgen \ + CLANG_TBLGEN=${NXBDESTDIR}/usr/bin/clang-tblgen \ MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \ MK_GDB=no MK_TESTS=no \ SSP_CFLAGS= \ @@ -1601,7 +1645,7 @@ NXBMAKE= ${NXBENV} ${MAKE} \ # For non-clang enabled targets that are still using the in tree gcc # we must build a gperf binary for one instance of its Makefiles. On # clang-enabled systems, the gperf binary is obsolete. -native-xtools: +native-xtools: .PHONY .if ${MK_GCC_BOOTSTRAP} != "no" mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin ${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \ @@ -1611,13 +1655,15 @@ native-xtools: ${NXBMAKE} DIRPRFX=${_gperf}/ all && \ ${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install .endif - mkdir -p ${OBJTREE}/nxb-bin/bin - mkdir -p ${OBJTREE}/nxb-bin/sbin - mkdir -p ${OBJTREE}/nxb-bin/usr + mkdir -p ${NXBDESTDIR}/bin ${NXBDESTDIR}/sbin ${NXBDESTDIR}/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ - -p ${OBJTREE}/nxb-bin/usr >/dev/null + -p ${NXBDESTDIR}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${OBJTREE}/nxb-bin/usr/include >/dev/null + -p ${NXBDESTDIR}/usr/include >/dev/null +.if ${MK_DEBUG_FILES} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ + -p ${NXBDESTDIR}/usr/lib >/dev/null +.endif .for _tool in \ bin/cat \ bin/chmod \ @@ -1682,14 +1728,14 @@ native-xtools: ${NXBMAKE} DIRPRFX=${_tool}/ obj && \ ${NXBMAKE} DIRPRFX=${_tool}/ depend && \ ${NXBMAKE} DIRPRFX=${_tool}/ all && \ - ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${OBJTREE}/nxb-bin install + ${NXBMAKE} DIRPRFX=${_tool}/ DESTDIR=${NXBDESTDIR} install .endfor # # hierarchy - ensure that all the needed directories are present # -hierarchy hier: .MAKE - cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs +hierarchy hier: .MAKE .PHONY + ${_+_}cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs # # libraries - build all libraries, and install them under ${DESTDIR}. @@ -1698,8 +1744,8 @@ hierarchy hier: .MAKE # interdependencies (__L) are built automatically by the # ${.CURDIR}/tools/make_libdeps.sh script. # -libraries: .MAKE - cd ${.CURDIR} && \ +libraries: .MAKE .PHONY + ${_+_}cd ${.CURDIR} && \ ${MAKE} -f Makefile.inc1 _prereq_libs && \ ${MAKE} -f Makefile.inc1 _startup_libs && \ ${MAKE} -f Makefile.inc1 _prebuild_libs && \ @@ -2197,12 +2243,12 @@ xdev: xdev-build xdev-install .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools -_xb-worldtmp: +_xb-worldtmp: .PHONY mkdir -p ${CDTMP}/usr mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ -p ${CDTMP}/usr >/dev/null -_xb-bootstrap-tools: +_xb-bootstrap-tools: .PHONY .for _tool in \ ${_clang_tblgen} \ ${_gperf} @@ -2214,11 +2260,11 @@ _xb-bootstrap-tools: ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor -_xb-build-tools: +_xb-build-tools: .PHONY ${_+_}@cd ${.CURDIR}; \ ${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools -_xb-cross-tools: +_xb-cross-tools: .PHONY .for _tool in \ ${_binutils} \ ${_elftctools} \ @@ -2233,7 +2279,7 @@ _xb-cross-tools: ${CDMAKE} DIRPRFX=${_tool}/ all .endfor -_xi-mtree: +_xi-mtree: .PHONY ${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" mkdir -p ${XDDESTDIR} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ @@ -2242,6 +2288,10 @@ _xi-mtree: -p ${XDDESTDIR}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ -p ${XDDESTDIR}/usr/include >/dev/null +.if ${MK_LIB32} != "no" + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ + -p ${XDDESTDIR}/usr >/dev/null +.endif .if ${MK_TESTS} != "no" mkdir -p ${XDDESTDIR}${TESTSBASE} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ @@ -2251,7 +2301,7 @@ _xi-mtree: .ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries -_xi-cross-tools: +_xi-cross-tools: .PHONY @echo "_xi-cross-tools" .for _tool in \ ${_binutils} \ @@ -2265,17 +2315,17 @@ _xi-cross-tools: ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} .endfor -_xi-includes: +_xi-includes: .PHONY ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 buildincludes \ DESTDIR=${XDDESTDIR} ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 installincludes \ DESTDIR=${XDDESTDIR} -_xi-libraries: +_xi-libraries: .PHONY ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \ DESTDIR=${XDDESTDIR} -xdev-links: +xdev-links: .PHONY ${_+_}cd ${XDDESTDIR}/usr/bin; \ mkdir -p ../../../../usr/bin; \ for i in *; do \ Modified: projects/collation/ObsoleteFiles.inc ============================================================================== --- projects/collation/ObsoleteFiles.inc Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/ObsoleteFiles.inc Sun Nov 1 21:17:38 2015 (r290241) @@ -97,6 +97,15 @@ OLD_FILES+=usr/bin/colldef OLD_FILES+=usr/share/man/man1/colldef.1.gz OLD_FILES+=usr/bin/mklocale OLD_FILES+=usr/share/man/man1/mklocale.1.gz +# 20151030: OpenSSL 1.0.2d import +OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz +OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl_str.3.gz +OLD_FILES+=usr/share/openssl/man/man3/d2i_509_CRL_fp.3.gz +OLD_LIBS+=lib/libcrypto.so.7 +OLD_LIBS+=usr/lib/libssl.so.7 +OLD_LIBS+=usr/lib32/libcrypto.so.7 +OLD_LIBS+=usr/lib32/libssl.so.7 # 20151015: test symbols moved to /usr/lib/debug OLD_DIRS+=usr/tests/lib/atf/libatf-c++/.debug OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/atf_c++_test.debug @@ -503,6 +512,8 @@ OLD_DIRS+=usr/share/doc/legal/intel_wpi OLD_FILES+=usr/share/doc/legal/intel_wpi/LICENSE # 20151006: new libc++ import OLD_FILES+=usr/include/c++/__tuple_03 +OLD_FILES+=usr/include/c++/v1/__tuple_03 +OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03 # 20151006: new clang import which bumps version from 3.6.1 to 3.7.0. OLD_FILES+=usr/lib/clang/3.6.1/include/__stddef_max_align_t.h OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h @@ -589,11 +600,16 @@ OLD_FILES+=usr/share/man/man4/dtrace-pro OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz +# 20150704: nvlist private headers no longer installed +OLD_FILES+=usr/include/sys/nv_impl.h +OLD_FILES+=usr/include/sys/nvlist_impl.h +OLD_FILES+=usr/include/sys/nvpair_impl.h # 20150624 OLD_LIBS+=usr/lib/libugidfw.so.4 OLD_LIBS+=usr/lib32/libugidfw.so.4 # 20150604: Move nvlist man pages to section 9. OLD_FILES+=usr/share/man/man3/libnv.3.gz +OLD_FILES+=usr/share/man/man3/nv.3.gz OLD_FILES+=usr/share/man/man3/nvlist.3.gz OLD_FILES+=usr/share/man/man3/nvlist_add_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_add_bool.3.gz Modified: projects/collation/UPDATING ============================================================================== --- projects/collation/UPDATING Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/UPDATING Sun Nov 1 21:17:38 2015 (r290241) @@ -31,6 +31,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20151030: + The OpenSSL has been upgraded to 1.0.2d. Any binaries requiring + libcrypto.so.7 or libssl.so.7 must be recompiled. + +20151020: + Qlogic 24xx/25xx firmware images were updated from 5.5.0 to 7.3.0. + Kernel modules isp_2400_multi and isp_2500_multi were removed and + should be replaced with isp_2400 and isp_2500 modules respectively. + 20151017: The build previously allowed using 'make -n' to not recurse into sub-directories while showing what commands would be executed, and Modified: projects/collation/bin/csh/config_p.h ============================================================================== --- projects/collation/bin/csh/config_p.h Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/bin/csh/config_p.h Sun Nov 1 21:17:38 2015 (r290241) @@ -9,7 +9,7 @@ #ifndef _h_config #define _h_config -/****************** System dependant compilation flags ****************/ +/****************** System dependent compilation flags ****************/ /* * POSIX This system supports IEEE Std 1003.1-1988 (POSIX). */ Modified: projects/collation/bin/ls/tests/ls_tests.sh ============================================================================== --- projects/collation/bin/ls/tests/ls_tests.sh Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/bin/ls/tests/ls_tests.sh Sun Nov 1 21:17:38 2015 (r290241) @@ -418,10 +418,10 @@ T_flag_body() atf_check -e empty -o empty -s exit:0 touch a.file - birthtime_in_secs=$(stat -f %B -t %s a.file) - birthtime=$(date -j -f %s $birthtime_in_secs +"[[:space:]]+%b[[:space:]]+%e[[:space:]]+%H:%M:%S[[:space:]]+%Y") + mtime_in_secs=$(stat -f %m -t %s a.file) + mtime=$(date -j -f %s $mtime_in_secs +"[[:space:]]+%b[[:space:]]+%e[[:space:]]+%H:%M:%S[[:space:]]+%Y") - atf_check -e empty -o match:"$birthtime"'[[:space:]]+a\.file' \ + atf_check -e empty -o match:"$mtime"'[[:space:]]+a\.file' \ -s exit:0 ls -lT a.file } @@ -626,10 +626,10 @@ l_flag_body() atf_check -e empty -o empty -s exit:0 touch a.file - birthtime_in_secs=$(stat -f "%B" -t "%s" a.file) - birthtime=$(date -j -f "%s" $birthtime_in_secs +"%b[[:space:]]+%e[[:space:]]+%H:%M") + mtime_in_secs=$(stat -f "%m" -t "%s" a.file) + mtime=$(date -j -f "%s" $mtime_in_secs +"%b[[:space:]]+%e[[:space:]]+%H:%M") - expected_output=$(stat -f "%Sp[[:space:]]+%l[[:space:]]+%Su[[:space:]]+%Sg[[:space:]]+%z[[:space:]]+$birthtime[[:space:]]+a\\.file" a.file) + expected_output=$(stat -f "%Sp[[:space:]]+%l[[:space:]]+%Su[[:space:]]+%Sg[[:space:]]+%z[[:space:]]+$mtime[[:space:]]+a\\.file" a.file) atf_check -e empty -o match:"$expected_output" -s exit:0 ls -l a.file } Modified: projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sun Nov 1 21:17:38 2015 (r290241) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 14, 2015 +.Dd October 24, 2015 .Dt ZFS 8 .Os .Sh NAME @@ -272,8 +272,10 @@ .Ar tag snapshot Ns ... .Nm .Cm holds -.Op Fl r -.Ar snapshot Ns ... +.Op Fl Hp +.Op Fl r Ns | Ns Fl d Ar depth +.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns +.Ns ... .Nm .Cm release .Op Fl r @@ -3159,15 +3161,26 @@ snapshots of all descendent file systems .It Xo .Nm .Cm holds -.Op Fl r -.Ar snapshot Ns ... +.Op Fl Hp +.Op Fl r Ns | Ns Fl d Ar depth +.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns +.Ns ... .Xc .Pp -Lists all existing user references for the given snapshot or snapshots. +Lists all existing user references for the given dataset or datasets. .Bl -tag -width indent +.It Fl H +Used for scripting mode. Do not print headers and separate fields by a single +tab instead of arbitrary white space. +.It Fl p +Display numbers in parsable (exact) values. .It Fl r -Lists the holds that are set on the named descendent snapshots, in addition to -listing the holds on the named snapshot. +Lists the holds that are set on the descendent snapshots of the named datasets +or snapshots, in addition to listing the holds on the named snapshots, if any. +.It Fl d Ar depth +Recursively display any holds on the named snapshots, or descendent snapshots of +the named datasets or snapshots, limiting the recursion to +.Ar depth . .El .It Xo .Nm Modified: projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sun Nov 1 21:17:38 2015 (r290241) @@ -329,7 +329,8 @@ get_usage(zfs_help_t idx) case HELP_HOLD: return (gettext("\thold [-r] ...\n")); case HELP_HOLDS: - return (gettext("\tholds [-r] ...\n")); + return (gettext("\tholds [-Hp] [-r|-d depth] " + " ...\n")); case HELP_RELEASE: return (gettext("\trelease [-r] ...\n")); case HELP_DIFF: @@ -5543,7 +5544,8 @@ typedef struct holds_cbdata { * */ static void -print_holds(boolean_t scripted, size_t nwidth, size_t tagwidth, nvlist_t *nvl) +print_holds(boolean_t scripted, boolean_t literal, size_t nwidth, + size_t tagwidth, nvlist_t *nvl) { int i; nvpair_t *nvp = NULL; @@ -5576,10 +5578,14 @@ print_holds(boolean_t scripted, size_t n size_t sepnum = scripted ? 1 : 2; (void) nvpair_value_uint64(nvp2, &val); - time = (time_t)val; - (void) localtime_r(&time, &t); - (void) strftime(tsbuf, DATETIME_BUF_LEN, - gettext(STRFTIME_FMT_STR), &t); + if (literal) + snprintf(tsbuf, DATETIME_BUF_LEN, "%llu", val); + else { + time = (time_t)val; + (void) localtime_r(&time, &t); + (void) strftime(tsbuf, DATETIME_BUF_LEN, + gettext(STRFTIME_FMT_STR), &t); + } (void) printf("%-*s%*c%-*s%*c%s\n", nwidth, zname, sepnum, sep, tagwidth, tagname, sepnum, sep, tsbuf); @@ -5600,7 +5606,7 @@ holds_callback(zfs_handle_t *zhp, void * const char *zname = zfs_get_name(zhp); size_t znamelen = strnlen(zname, ZFS_MAXNAMELEN); - if (cbp->cb_recursive) { + if (cbp->cb_recursive && cbp->cb_snapname != NULL) { const char *snapname; char *delim = strchr(zname, '@'); if (delim == NULL) @@ -5628,9 +5634,12 @@ holds_callback(zfs_handle_t *zhp, void * } /* - * zfs holds [-r] ... + * zfs holds [-Hp] [-r | -d max] ... * - * -r Recursively hold + * -H Suppress header output + * -p Output literal values + * -r Recursively search for holds + * -d max Limit depth of recursive search */ static int zfs_do_holds(int argc, char **argv) @@ -5639,8 +5648,9 @@ zfs_do_holds(int argc, char **argv) int c; int i; boolean_t scripted = B_FALSE; + boolean_t literal = B_FALSE; boolean_t recursive = B_FALSE; - const char *opts = "rH"; + const char *opts = "d:rHp"; nvlist_t *nvl; int types = ZFS_TYPE_SNAPSHOT; @@ -5653,12 +5663,19 @@ zfs_do_holds(int argc, char **argv) /* check options */ while ((c = getopt(argc, argv, opts)) != -1) { switch (c) { + case 'd': + limit = parse_depth(optarg, &flags); + recursive = B_TRUE; + break; case 'r': recursive = B_TRUE; break; case 'H': scripted = B_TRUE; break; + case 'p': + literal = B_TRUE; + break; case '?': (void) fprintf(stderr, gettext("invalid option '%c'\n"), optopt); @@ -5684,18 +5701,14 @@ zfs_do_holds(int argc, char **argv) for (i = 0; i < argc; ++i) { char *snapshot = argv[i]; const char *delim; - const char *snapname; + const char *snapname = NULL; delim = strchr(snapshot, '@'); - if (delim == NULL) { - (void) fprintf(stderr, - gettext("'%s' is not a snapshot\n"), snapshot); - ++errors; - continue; + if (delim != NULL) { + snapname = delim + 1; + if (recursive) + snapshot[delim - snapshot] = '\0'; } - snapname = delim + 1; - if (recursive) - snapshot[delim - snapshot] = '\0'; cb.cb_recursive = recursive; cb.cb_snapname = snapname; @@ -5713,7 +5726,8 @@ zfs_do_holds(int argc, char **argv) /* * 2. print holds data */ - print_holds(scripted, cb.cb_max_namelen, cb.cb_max_taglen, nvl); + print_holds(scripted, literal, cb.cb_max_namelen, cb.cb_max_taglen, + nvl); if (nvlist_empty(nvl)) (void) printf(gettext("no datasets available\n")); Modified: projects/collation/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c ============================================================================== --- projects/collation/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c Sun Nov 1 21:17:38 2015 (r290241) @@ -683,6 +683,10 @@ tdesc_array_create(dwarf_t *dw, Dwarf_Di ar->ad_nelems = uval + 1; else if (die_signed(dw, dim, DW_AT_upper_bound, &sval, 0)) ar->ad_nelems = sval + 1; + else if (die_unsigned(dw, dim, DW_AT_count, &uval, 0)) + ar->ad_nelems = uval; + else if (die_signed(dw, dim, DW_AT_count, &sval, 0)) + ar->ad_nelems = sval; else ar->ad_nelems = 0; Modified: projects/collation/cddl/usr.sbin/dtrace/tests/Makefile.inc1 ============================================================================== --- projects/collation/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/cddl/usr.sbin/dtrace/tests/Makefile.inc1 Sun Nov 1 21:17:38 2015 (r290241) @@ -4,7 +4,6 @@ TESTGROUP= ${.CURDIR:H:T}/${.CURDIR:T} TESTSRC= ${.CURDIR:H:H:H:H:H}/contrib/opensolaris/cmd/dtrace/test/tst/${TESTGROUP} TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/${TESTGROUP} -.if !defined(_RECURSING_PROGS) FILESGROUPS+= FILES ${TESTGROUP} ${TESTGROUP}EXE ${TESTGROUP}= ${TESTFILES} @@ -25,7 +24,6 @@ ${TESTWRAPPER}.sh: ${GENTEST} ${EXCLUDE} sh ${GENTEST} -e ${EXCLUDE} ${TESTGROUP} ${${TESTGROUP}:S/ */ /} > ${.TARGET} CLEANFILES+= ${TESTWRAPPER}.sh -.endif # !defined(_RECURSING_PROGS) .PATH: ${TESTSRC} Modified: projects/collation/contrib/bmake/ChangeLog ============================================================================== --- projects/collation/contrib/bmake/ChangeLog Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/contrib/bmake/ChangeLog Sun Nov 1 21:17:38 2015 (r290241) @@ -1,3 +1,40 @@ +2015-10-20 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151020 + Merge with NetBSD make, pick up + o var.c: fix uninitialized var + +2015-10-12 Simon J. Gerraty + + * var.c: the conditional expressions used with ':?' can be + expensive, if already discarding do not evaluate or expand + anything. + +2015-10-10 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151010 + Merge with NetBSD make, pick up + o Add Boolean wantit flag to Var_Subst and Var_Parse + when FALSE we know we are discarding the result and can + skip operations like Cmd_Exec. + +2015-10-09 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20151009 + Merge with NetBSD make, pick up + o var.c: don't check for NULL before free() + o meta.c: meta_oodate, do not hard code ignore of makeDependfile + +2015-09-10 Simon J. Gerraty + + * Makefile (MAKE_VERSION): 20150910 + Merge with NetBSD make, pick up + o main.c: with -w print Enter/Leaving messages for objdir too + if necessary. + o centralize shell metachar handling + + * FILES: add metachar.[ch] + 2015-06-06 Simon J. Gerraty * Makefile (MAKE_VERSION): 20150606 Modified: projects/collation/contrib/bmake/FILES ============================================================================== --- projects/collation/contrib/bmake/FILES Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/contrib/bmake/FILES Sun Nov 1 21:17:38 2015 (r290241) @@ -71,6 +71,8 @@ make_malloc.h makefile.in meta.c meta.h +metachar.c +metachar.h missing/sys/cdefs.h mkdeps.sh nonints.h Modified: projects/collation/contrib/bmake/Makefile ============================================================================== --- projects/collation/contrib/bmake/Makefile Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/contrib/bmake/Makefile Sun Nov 1 21:17:38 2015 (r290241) @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.39 2015/06/07 15:54:37 sjg Exp $ +# $Id: Makefile,v 1.44 2015/10/20 21:41:40 sjg Exp $ # Base version on src date -MAKE_VERSION= 20150606 +MAKE_VERSION= 20151020 PROG= bmake @@ -18,6 +18,7 @@ SRCS= \ make.c \ make_malloc.c \ meta.c \ + metachar.c \ parse.c \ str.c \ strlist.c \ Modified: projects/collation/contrib/bmake/arch.c ============================================================================== --- projects/collation/contrib/bmake/arch.c Sun Nov 1 21:02:30 2015 (r290240) +++ projects/collation/contrib/bmake/arch.c Sun Nov 1 21:17:38 2015 (r290241) @@ -1,4 +1,4 @@ -/* $NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $ */ +/* $NetBSD: arch.c,v 1.64 2015/10/11 04:51:24 sjg Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: arch.c,v 1.63 2012/06/12 19:21:50 joerg Exp $"; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sun Nov 1 21:20:31 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A5E8A24429 for ; Sun, 1 Nov 2015 21:20:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E66A91AC1; Sun, 1 Nov 2015 21:20:30 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA1LKTGT029568; Sun, 1 Nov 2015 21:20:29 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA1LKTwc029567; Sun, 1 Nov 2015 21:20:29 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511012120.tA1LKTwc029567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 1 Nov 2015 21:20:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290242 - projects/collation/tools/tools/locale/tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Nov 2015 21:20:31 -0000 Author: bapt Date: Sun Nov 1 21:20:29 2015 New Revision: 290242 URL: https://svnweb.freebsd.org/changeset/base/290242 Log: Make generated makefiles respects ${SHAREDIR} Modified: projects/collation/tools/tools/locale/tools/cldr2def.pl Modified: projects/collation/tools/tools/locale/tools/cldr2def.pl ============================================================================== --- projects/collation/tools/tools/locale/tools/cldr2def.pl Sun Nov 1 21:17:38 2015 (r290241) +++ projects/collation/tools/tools/locale/tools/cldr2def.pl Sun Nov 1 21:20:29 2015 (r290242) @@ -808,7 +808,7 @@ sub make_makefile { # Warning: Do not edit. This file is automatically generated from the # tools in /usr/src/tools/tools/locale. -LOCALEDIR= /usr/share/locale +LOCALEDIR= \${SHAREDIR}/locale FILESNAME= $FILESNAMES{$TYPE} .SUFFIXES: .src .${SRCOUT2} ${MAPLOC} From owner-svn-src-projects@freebsd.org Sun Nov 1 23:48:18 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06618A24BA3 for ; Sun, 1 Nov 2015 23:48:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0D171893; Sun, 1 Nov 2015 23:48:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA1NmGMx073051; Sun, 1 Nov 2015 23:48:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA1NmGo7073050; Sun, 1 Nov 2015 23:48:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511012348.tA1NmGo7073050@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 1 Nov 2015 23:48:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290248 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Nov 2015 23:48:18 -0000 Author: bapt Date: Sun Nov 1 23:48:16 2015 New Revision: 290248 URL: https://svnweb.freebsd.org/changeset/base/290248 Log: Fix symlink for zh_TW.Big5 locale Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Sun Nov 1 22:30:23 2015 (r290247) +++ projects/collation/share/locale-links/Makefile Sun Nov 1 23:48:16 2015 (r290248) @@ -63,7 +63,7 @@ SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/ SYMLINKS+= zh_Hans_CN.${CN} ${LOCALEDIR}/zh_CN.${CN} .endfor -.for TW in BIG5 UTF-8 +.for TW in Big5 UTF-8 SYMLINKS+= zh_Hant_TW.${TW} ${LOCALEDIR}/zh_TW.${TW} .endfor From owner-svn-src-projects@freebsd.org Mon Nov 2 07:59:19 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25D85A2302C for ; Mon, 2 Nov 2015 07:59:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D507F13B6; Mon, 2 Nov 2015 07:59:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA27xHev027276; Mon, 2 Nov 2015 07:59:17 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA27xHLU027275; Mon, 2 Nov 2015 07:59:17 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511020759.tA27xHLU027275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 2 Nov 2015 07:59:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290263 - projects/collation/contrib/netbsd-tests/lib/libc/locale X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2015 07:59:19 -0000 Author: bapt Date: Mon Nov 2 07:59:17 2015 New Revision: 290263 URL: https://svnweb.freebsd.org/changeset/base/290263 Log: Fix regression test on multibytes 0x07FF and 0x0800 are valid multibyte characters: 'DOUBLE QUESTION MARK' and 'QUESTION EXCLAMATION MARK' Modified: projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Modified: projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c ============================================================================== --- projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Mon Nov 2 07:46:47 2015 (r290262) +++ projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Mon Nov 2 07:59:17 2015 (r290263) @@ -87,7 +87,7 @@ static struct test { 0x5B, 0x01, 0x7F, 0x5D, 0x5B, 0x80, 0x07FF, 0x5D, 0x5B, 0x0800, 0xFFFF, 0x5D, 0x5B, 0x10000, 0x10FFFF, 0x5D, 0x0A }, - { 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, + { 1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, 1, -1 }, -1 From owner-svn-src-projects@freebsd.org Mon Nov 2 08:05:06 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B842CA23532 for ; Mon, 2 Nov 2015 08:05:06 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pa0-x230.google.com (mail-pa0-x230.google.com [IPv6:2607:f8b0:400e:c03::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8483418C6; Mon, 2 Nov 2015 08:05:06 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pasz6 with SMTP id z6so141491739pas.2; Mon, 02 Nov 2015 00:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=Mm+HykyMvq1TQxOn4dB8HQls/SFpgjBNsVF/hXq+8+c=; b=caAKCCdN0aCPBUz/gLEn7kHpjEjVZVP4xljLKIu1Ku9av82RZun1aN4IL2mTrdVm7m CB1ro6fYiZGeMVzfFeFRYKnfwIPKl0npmfw0RbWbeiRp/PGzhdwV8hEszkd32Qe0aCjn HNe+90QiqpUJo1S0Ahws1TVH7o/fpevuZqPwlpJYhyDUSgjY+MSfrXJzauMDeaHFFxsp HoPKcNg0B4JT/6idRjb+WYhDu7+IajpaW0ze8DAisU55Pl9sDybRLlwQW9s2j3mf90wh R58iGFgXIv66bLKTZseGPs2m7RB2Lw1YrBtAwFP1cIhRbfohrUt5G9BT16axoqTyy8/a +axA== X-Received: by 10.68.178.131 with SMTP id cy3mr25527959pbc.125.1446451506102; Mon, 02 Nov 2015 00:05:06 -0800 (PST) Received: from ?IPv6:2601:601:800:126d:541b:f764:9c9c:ea2b? ([2601:601:800:126d:541b:f764:9c9c:ea2b]) by smtp.gmail.com with ESMTPSA id qb7sm22382914pab.47.2015.11.02.00.05.05 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Nov 2015 00:05:05 -0800 (PST) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: svn commit: r290263 - projects/collation/contrib/netbsd-tests/lib/libc/locale From: NGie Cooper In-Reply-To: <201511020759.tA27xHLU027275@repo.freebsd.org> Date: Mon, 2 Nov 2015 00:05:04 -0800 Cc: src-committers , svn-src-projects@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2B614865-4775-4DF2-8EF7-D820E114F811@gmail.com> References: <201511020759.tA27xHLU027275@repo.freebsd.org> To: Baptiste Daroussin X-Mailer: Apple Mail (2.2104) X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2015 08:05:06 -0000 > On Nov 1, 2015, at 23:59, Baptiste Daroussin wrote: >=20 > Author: bapt > Date: Mon Nov 2 07:59:17 2015 > New Revision: 290263 > URL: https://svnweb.freebsd.org/changeset/base/290263 >=20 > Log: > Fix regression test on multibytes >=20 > 0x07FF and 0x0800 are valid multibyte characters: > 'DOUBLE QUESTION MARK' and 'QUESTION EXCLAMATION MARK' >=20 > Modified: > projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c >=20 > Modified: = projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- = projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c = Mon Nov 2 07:46:47 2015 (r290262) > +++ = projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c = Mon Nov 2 07:59:17 2015 (r290263) > @@ -87,7 +87,7 @@ static struct test { > 0x5B, 0x01, 0x7F, 0x5D, 0x5B, 0x80, 0x07FF, 0x5D, 0x5B, = 0x0800, > 0xFFFF, 0x5D, 0x5B, 0x10000, 0x10FFFF, 0x5D, 0x0A > }, > - { 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, = -1, > + { 1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1, -1, = -1, > 1, 1, -1, -1, 1, 1, -1, -1, 1, -1 Please file an upstream PR for this (and any other failures you find) = and if possible CC me. I=E2=80=99ve been adding... #ifdef __FreeBSD__ /* FreeBSD-specific fix */ #else /* Old code from NetBSD */ #endif =E2=80=A6 to track what needs to be upstreamed. Thanks! -NGie= From owner-svn-src-projects@freebsd.org Mon Nov 2 08:08:49 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7DF8BA23575 for ; Mon, 2 Nov 2015 08:08:49 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x236.google.com (mail-wi0-x236.google.com [IPv6:2a00:1450:400c:c05::236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 128461A0C; Mon, 2 Nov 2015 08:08:49 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wikq8 with SMTP id q8so45766852wik.1; Mon, 02 Nov 2015 00:08:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=Kmu1S2mSXuRY/05TlSjCBLD8ppsFFl4yharnv2zDclY=; b=tA+nvItSf20mbe6Xu4pTbwjcLq6s/8F0mcYsbJbXWgXr9cqk4bDHc9P7udQ6DsFWeA ef9i8TRhKVU31loboo7GoIqVvzYp43gaf6gN+WY2PsCPlO4hh5KNnhVQNeircHBbBabY HAJmCItBaoD++OrQT6O/M537AoWVkgmNN8EphzvR542u0pqEsNIvJJkcUvw7vWiteJx9 mJsdkyM5lwBAMAmebuqJ616ihehJVsh/41c7JkvJBJ6BQa2yDfHFcfHD2kWuvBvUoSMH vLUKiASwCN6Wu8lVEiPW7i3KaSs3LqedYRQ1p4IwYbS202dwCKSulHJzvrzxl+UvYkbG pTHw== X-Received: by 10.194.157.9 with SMTP id wi9mr21761451wjb.154.1446451727348; Mon, 02 Nov 2015 00:08:47 -0800 (PST) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id u64sm16684023wmd.6.2015.11.02.00.08.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Nov 2015 00:08:46 -0800 (PST) Sender: Baptiste Daroussin Date: Mon, 2 Nov 2015 09:08:45 +0100 From: Baptiste Daroussin To: NGie Cooper Cc: src-committers , svn-src-projects@freebsd.org Subject: Re: svn commit: r290263 - projects/collation/contrib/netbsd-tests/lib/libc/locale Message-ID: <20151102080844.GA19972@ivaldir.etoilebsd.net> References: <201511020759.tA27xHLU027275@repo.freebsd.org> <2B614865-4775-4DF2-8EF7-D820E114F811@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZGiS0Q5IWpPtfppv" Content-Disposition: inline In-Reply-To: <2B614865-4775-4DF2-8EF7-D820E114F811@gmail.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2015 08:08:49 -0000 --ZGiS0Q5IWpPtfppv Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Nov 02, 2015 at 12:05:04AM -0800, NGie Cooper wrote: >=20 > > On Nov 1, 2015, at 23:59, Baptiste Daroussin wrote: > >=20 > > Author: bapt > > Date: Mon Nov 2 07:59:17 2015 > > New Revision: 290263 > > URL: https://svnweb.freebsd.org/changeset/base/290263 > >=20 > > Log: > > Fix regression test on multibytes > >=20 > > 0x07FF and 0x0800 are valid multibyte characters: > > 'DOUBLE QUESTION MARK' and 'QUESTION EXCLAMATION MARK' > >=20 > > Modified: > > projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c > >=20 > > Modified: projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbs= towcs.c > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.= c Mon Nov 2 07:46:47 2015 (r290262) > > +++ projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.= c Mon Nov 2 07:59:17 2015 (r290263) > > @@ -87,7 +87,7 @@ static struct test { > > 0x5B, 0x01, 0x7F, 0x5D, 0x5B, 0x80, 0x07FF, 0x5D, 0x5B, 0x0800, > > 0xFFFF, 0x5D, 0x5B, 0x10000, 0x10FFFF, 0x5D, 0x0A > > }, > > - { 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, > > + { 1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1, -1, -1, > > 1, 1, -1, -1, 1, 1, -1, -1, 1, -1 >=20 > Please file an upstream PR for this (and any other failures you find) and= if possible CC me. >=20 Sure I can do that > I=E2=80=99ve been adding... >=20 > #ifdef __FreeBSD__ > /* FreeBSD-specific fix */ > #else > /* Old code from NetBSD */ > #endif >=20 I can do that if you prefer > =E2=80=A6 to track what needs to be upstreamed. There is another one needed, but this time I think the regression test is r= ight, I'll dig a bit more. Best regards, Bapt --ZGiS0Q5IWpPtfppv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlY3GgwACgkQ8kTtMUmk6Ez7aACfanrL8PZ6N0qoqdaQVbIrc7KY hkQAoLm7yxaOLghGGqgVbT9Jgn7JdJSh =Ejfe -----END PGP SIGNATURE----- --ZGiS0Q5IWpPtfppv-- From owner-svn-src-projects@freebsd.org Mon Nov 2 22:56:25 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A6511A24AB7 for ; Mon, 2 Nov 2015 22:56:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 713A61902; Mon, 2 Nov 2015 22:56:25 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA2MuO72092346; Mon, 2 Nov 2015 22:56:24 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA2MuOwC092345; Mon, 2 Nov 2015 22:56:24 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511022256.tA2MuOwC092345@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 2 Nov 2015 22:56:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290313 - projects/collation/lib/libc/locale X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2015 22:56:25 -0000 Author: bapt Date: Mon Nov 2 22:56:24 2015 New Revision: 290313 URL: https://svnweb.freebsd.org/changeset/base/290313 Log: Fix mbtowc not setting EILSEQ on an Incomplete multibyte sequence for eucJP encoding Modified: projects/collation/lib/libc/locale/euc.c Modified: projects/collation/lib/libc/locale/euc.c ============================================================================== --- projects/collation/lib/libc/locale/euc.c Mon Nov 2 22:56:10 2015 (r290312) +++ projects/collation/lib/libc/locale/euc.c Mon Nov 2 22:56:24 2015 (r290313) @@ -375,6 +375,7 @@ _EUC_mbrtowc_impl(wchar_t * __restrict p /* Incomplete multibyte sequence */ es->want = want - i; es->ch = wc; + errno = EILSEQ; return ((size_t)-2); } if (pwc != NULL) From owner-svn-src-projects@freebsd.org Mon Nov 2 23:04:51 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54534A24CC0 for ; Mon, 2 Nov 2015 23:04:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1EDEC1D9E; Mon, 2 Nov 2015 23:04:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA2N4odV095221; Mon, 2 Nov 2015 23:04:50 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA2N4ofN095220; Mon, 2 Nov 2015 23:04:50 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511022304.tA2N4ofN095220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 2 Nov 2015 23:04:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290314 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2015 23:04:51 -0000 Author: bapt Date: Mon Nov 2 23:04:49 2015 New Revision: 290314 URL: https://svnweb.freebsd.org/changeset/base/290314 Log: locales: Remove symlinks UTF8 => UTF-8 In retrospect, having an alias for UTF-8 does not bring any real benefits and it can cause confusion. Let's remove this *.UTF8 locale symlinks which is closer to the convention of the other BSDs. GCC testsuite is also removing utf8 and UTF8 locales for portability with BSD. Submitted by: marino Obtained from: DragonflyBSD Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Mon Nov 2 22:56:24 2015 (r290313) +++ projects/collation/share/locale-links/Makefile Mon Nov 2 23:04:49 2015 (r290314) @@ -53,7 +53,6 @@ SYMLINKS+= ${symdir}.ISO8859-15 ${LOCALE ${STD5:M${symdir}} || ${STD15:M${symdir}} || ${MANUAL:M${symdir}}) SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/${symdir} . endif -SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/${symdir}.UTF8 .endfor # We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some From owner-svn-src-projects@freebsd.org Mon Nov 2 23:09:23 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38C06A24DCC for ; Mon, 2 Nov 2015 23:09:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 01F881F20; Mon, 2 Nov 2015 23:09:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA2N9ML0095415; Mon, 2 Nov 2015 23:09:22 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA2N9MAY095414; Mon, 2 Nov 2015 23:09:22 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511022309.tA2N9MAY095414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 2 Nov 2015 23:09:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290315 - projects/collation/contrib/netbsd-tests/lib/libc/locale X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2015 23:09:23 -0000 Author: bapt Date: Mon Nov 2 23:09:21 2015 New Revision: 290315 URL: https://svnweb.freebsd.org/changeset/base/290315 Log: Push the FreeBSD changes under a specific #ifdef to easier tracking what needs to be upstreamed. Modified: projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Modified: projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c ============================================================================== --- projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Mon Nov 2 23:04:49 2015 (r290314) +++ projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c Mon Nov 2 23:09:21 2015 (r290315) @@ -87,7 +87,11 @@ static struct test { 0x5B, 0x01, 0x7F, 0x5D, 0x5B, 0x80, 0x07FF, 0x5D, 0x5B, 0x0800, 0xFFFF, 0x5D, 0x5B, 0x10000, 0x10FFFF, 0x5D, 0x0A }, +#ifdef __FreeBSD__ { 1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1, -1, -1, +#else + { 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, -1, +#endif 1, 1, -1, -1, 1, 1, -1, -1, 1, -1 }, -1 From owner-svn-src-projects@freebsd.org Tue Nov 3 21:58:00 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 21FC1A24A4F for ; Tue, 3 Nov 2015 21:58:00 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CB4FE1ECE; Tue, 3 Nov 2015 21:57:59 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA3LvwxL093438; Tue, 3 Nov 2015 21:57:58 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA3Lvwri093437; Tue, 3 Nov 2015 21:57:58 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511032157.tA3Lvwri093437@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 3 Nov 2015 21:57:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290341 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2015 21:58:00 -0000 Author: bapt Date: Tue Nov 3 21:57:58 2015 New Revision: 290341 URL: https://svnweb.freebsd.org/changeset/base/290341 Log: Make all new shortname locales point use the UTF-8 encoding Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Tue Nov 3 21:19:46 2015 (r290340) +++ projects/collation/share/locale-links/Makefile Tue Nov 3 21:57:58 2015 (r290341) @@ -17,42 +17,14 @@ UTF8= af_ZA am_ET be_BY bg_BG ca_AD ca_E zh_Hant_HK \ zh_Hant_TW -STD1= af_ZA en_AU en_CA en_HK en_NZ en_SG en_US en_ZA \ - es_AR es_MX fr_CA pt_BR -STD2= cs_CZ hr_HR hu_HU ro_RO sr_Latn_RS -STD5= be_BY ru_RU sr_Cyrl_RS -STD15= ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \ - en_GB en_IE es_ES et_EE eu_ES fi_FI fr_BE fr_CH \ - fr_FR is_IS it_CH it_IT nb_NO nl_BE nl_NL nn_NO \ - pt_PT sv_FI sv_SE - -MANUAL= lt_LT el_GR lv_LV - LOCALEDIR= /usr/share/locale -SYMLINKS= lt_LT.ISO8859-13 ${LOCALEDIR}/lt_LT \ - el_GR.ISO8859-7 ${LOCALEDIR}/el_GR \ - lv_LV.ISO8859-13 ${LOCALEDIR}/lv_LV \ - en_US.ISO8859-1 ${LOCALEDIR}/en_US.ISO-8859-1 \ - ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp +SYMLINKS= en_US.ISO8859-1 ${LOCALEDIR}/en_US.ISO-8859-1 \ + ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp \ + zh_Hant_TW.UTF-8 ${LOCALEDIR}/zh_TW -.for symdir in ${STD1} -SYMLINKS+= ${symdir}.ISO8859-1 ${LOCALEDIR}/${symdir} -.endfor -.for symdir in ${STD2} -SYMLINKS+= ${symdir}.ISO8859-2 ${LOCALEDIR}/${symdir} -.endfor -.for symdir in ${STD5} -SYMLINKS+= ${symdir}.ISO8859-5 ${LOCALEDIR}/${symdir} -.endfor -.for symdir in ${STD15} -SYMLINKS+= ${symdir}.ISO8859-15 ${LOCALEDIR}/${symdir} -.endfor .for symdir in ${UTF8} -. if ! (${STD1:M${symdir}} || ${STD2:M${symdir}} || \ - ${STD5:M${symdir}} || ${STD15:M${symdir}} || ${MANUAL:M${symdir}}) SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/${symdir} -. endif .endfor # We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some @@ -66,6 +38,4 @@ SYMLINKS+= zh_Hans_CN.${CN} ${LOCALEDIR} SYMLINKS+= zh_Hant_TW.${TW} ${LOCALEDIR}/zh_TW.${TW} .endfor -SYMLINKS+= zh_Hant_TW.UTF-8 ${LOCALEDIR}/zh_TW - .include From owner-svn-src-projects@freebsd.org Tue Nov 3 21:58:34 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38AD4A24A89 for ; Tue, 3 Nov 2015 21:58:34 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03DB31FD8; Tue, 3 Nov 2015 21:58:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA3LwXJ6093503; Tue, 3 Nov 2015 21:58:33 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA3LwXPN093502; Tue, 3 Nov 2015 21:58:33 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511032158.tA3LwXPN093502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 3 Nov 2015 21:58:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290342 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2015 21:58:34 -0000 Author: bapt Date: Tue Nov 3 21:58:32 2015 New Revision: 290342 URL: https://svnweb.freebsd.org/changeset/base/290342 Log: Use ${SHAREDIR} instead of hardcoding /usr/share Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Tue Nov 3 21:57:58 2015 (r290341) +++ projects/collation/share/locale-links/Makefile Tue Nov 3 21:58:32 2015 (r290342) @@ -17,7 +17,7 @@ UTF8= af_ZA am_ET be_BY bg_BG ca_AD ca_E zh_Hant_HK \ zh_Hant_TW -LOCALEDIR= /usr/share/locale +LOCALEDIR= ${SHAREDIR}/locale SYMLINKS= en_US.ISO8859-1 ${LOCALEDIR}/en_US.ISO-8859-1 \ ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp \ From owner-svn-src-projects@freebsd.org Tue Nov 3 22:02:35 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E397EA24BCB for ; Tue, 3 Nov 2015 22:02:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A92AB130B; Tue, 3 Nov 2015 22:02:35 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA3M2YbF096233; Tue, 3 Nov 2015 22:02:34 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA3M2Yre096232; Tue, 3 Nov 2015 22:02:34 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511032202.tA3M2Yre096232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 3 Nov 2015 22:02:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290343 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2015 22:02:36 -0000 Author: bapt Date: Tue Nov 3 22:02:34 2015 New Revision: 290343 URL: https://svnweb.freebsd.org/changeset/base/290343 Log: There is no point in providing en_US.ISO-8859-1 and en_US.ISO8859-1 let's be consistent with other locale and only provide en_US.ISO8859-1 Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Tue Nov 3 21:58:32 2015 (r290342) +++ projects/collation/share/locale-links/Makefile Tue Nov 3 22:02:34 2015 (r290343) @@ -19,8 +19,7 @@ UTF8= af_ZA am_ET be_BY bg_BG ca_AD ca_E LOCALEDIR= ${SHAREDIR}/locale -SYMLINKS= en_US.ISO8859-1 ${LOCALEDIR}/en_US.ISO-8859-1 \ - ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp \ +SYMLINKS= ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp \ zh_Hant_TW.UTF-8 ${LOCALEDIR}/zh_TW .for symdir in ${UTF8} From owner-svn-src-projects@freebsd.org Tue Nov 3 22:06:26 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52FB6A24C0F for ; Tue, 3 Nov 2015 22:06:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DA2114B4; Tue, 3 Nov 2015 22:06:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA3M6PUq096406; Tue, 3 Nov 2015 22:06:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA3M6PuX096405; Tue, 3 Nov 2015 22:06:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511032206.tA3M6PuX096405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 3 Nov 2015 22:06:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290344 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2015 22:06:26 -0000 Author: bapt Date: Tue Nov 3 22:06:24 2015 New Revision: 290344 URL: https://svnweb.freebsd.org/changeset/base/290344 Log: On FreeBSD users have the habbit of ja_JP.eucJP there is no point in added a lowercase alias Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Tue Nov 3 22:02:34 2015 (r290343) +++ projects/collation/share/locale-links/Makefile Tue Nov 3 22:06:24 2015 (r290344) @@ -19,8 +19,7 @@ UTF8= af_ZA am_ET be_BY bg_BG ca_AD ca_E LOCALEDIR= ${SHAREDIR}/locale -SYMLINKS= ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp \ - zh_Hant_TW.UTF-8 ${LOCALEDIR}/zh_TW +SYMLINKS= zh_Hant_TW.UTF-8 ${LOCALEDIR}/zh_TW .for symdir in ${UTF8} SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/${symdir} From owner-svn-src-projects@freebsd.org Tue Nov 3 22:24:03 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE6D5A25039 for ; Tue, 3 Nov 2015 22:24:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 87A871E40; Tue, 3 Nov 2015 22:24:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA3MO2Mf002139; Tue, 3 Nov 2015 22:24:02 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA3MO2d3002138; Tue, 3 Nov 2015 22:24:02 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511032224.tA3MO2d3002138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 3 Nov 2015 22:24:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290346 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2015 22:24:03 -0000 Author: bapt Date: Tue Nov 3 22:24:02 2015 New Revision: 290346 URL: https://svnweb.freebsd.org/changeset/base/290346 Log: Remove short versions of locales totally for now They were never supported, and the encoding they should use is somehow controversial, they could be added later if we really need them and once one has decided which encoding they should use Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Tue Nov 3 22:23:09 2015 (r290345) +++ projects/collation/share/locale-links/Makefile Tue Nov 3 22:24:02 2015 (r290346) @@ -1,29 +1,3 @@ -# This creates short versions of locales as symlinks to full versions -# e.g. zh_Hant_TW is a symlink to zh_Hant_TW.UTF-8. - -UTF8= af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT \ - cs_CZ da_DK de_AT de_CH de_DE el_GR en_AU en_CA \ - en_GB en_HK en_IE en_NZ en_PH en_SG en_US es_AR \ - es_CR es_ES es_MX et_EE eu_ES fi_FI fr_BE fr_CA \ - fr_CH fr_FR he_IL hi_IN hr_HR hu_HU hy_AM is_IS \ - it_CH it_IT ja_JP ko_KR lt_LT lv_LV nb_NO \ - nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT ro_RO ru_RU \ - se_FI se_NO sk_SK sl_SI sv_FI sv_SE tr_TR uk_UA \ - kk_Cyrl_KZ \ - mn_Cyrl_MN \ - sr_Cyrl_RS \ - sr_Latn_RS \ - zh_Hans_CN \ - zh_Hant_HK \ - zh_Hant_TW - -LOCALEDIR= ${SHAREDIR}/locale - -SYMLINKS= zh_Hant_TW.UTF-8 ${LOCALEDIR}/zh_TW - -.for symdir in ${UTF8} -SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/${symdir} -.endfor # We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some # of the lang catalogs use zh_CN still (e.g. vi), plus people may expect it From owner-svn-src-projects@freebsd.org Thu Nov 5 00:50:26 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1282A256CD for ; Thu, 5 Nov 2015 00:50:26 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8EBC8122A; Thu, 5 Nov 2015 00:50:26 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA50oPs7048771; Thu, 5 Nov 2015 00:50:25 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA50oPd9048767; Thu, 5 Nov 2015 00:50:25 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511050050.tA50oPd9048767@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Thu, 5 Nov 2015 00:50:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290376 - projects/cxl_iscsi/sys/dev/cxgbe/tom X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2015 00:50:27 -0000 Author: np Date: Thu Nov 5 00:50:25 2015 New Revision: 290376 URL: https://svnweb.freebsd.org/changeset/base/290376 Log: cxgbe/tom: redo the TOM bits that support the iSCSI driver. - There is no reason to have a special case for iSCSI in t4_rcvd. Either there is data in the socket buffer (from when the connection was plain TOE, before being promoted to ulp_mode iSCSI) and sbused _should_ be taken into account, or sbused is 0 and doesn't affect the calculation of rx_credits. - write_tx_wr doesn't need special handling for iSCSI either. Its caller should specify the ulp_submode. - Replace t4_ulp_push_frames with t4_push_pdus that can deal with PDUs in an mbufq hanging off the toepcb. This eliminates the "backwards" calls from t4_tom's tx into the iSCSI driver. - The iSCSI driver installs a handler for RX_ISCSI_DDP already and the iSCSI handler for RX_DATA_DDP is identical to the one for RX_ISCSI_DDP. Take advantage of this to eliminate the last remaining "backwards" call from do_rx_data_ddp into the iSCSI driver. - Eliminate the CXGBE_ISCSI_MBUF_TAG abomination. - For tx, it makes no sense to allocate an mbuf tag just to stash 2 bits worth of information. Use a spare byte from the mbuf header instead. - For rx, the per-connection ulpcb is a more natural place to keep information about the PDU currently being assembled. Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_ddp.c projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.c projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Wed Nov 4 23:52:19 2015 (r290375) +++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Thu Nov 5 00:50:25 2015 (r290376) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Chelsio Communications, Inc. + * Copyright (c) 2012, 2015 Chelsio Communications, Inc. * All rights reserved. * Written by: Navdeep Parhar * @@ -71,33 +71,6 @@ VNET_DECLARE(int, tcp_autorcvbuf_inc); VNET_DECLARE(int, tcp_autorcvbuf_max); #define V_tcp_autorcvbuf_max VNET(tcp_autorcvbuf_max) -/* - * For ULP connections HW may add headers, e.g., for digests, that aren't part - * of the messages sent by the host but that are part of the TCP payload and - * therefore consume TCP sequence space. Tx connection parameters that - * operate in TCP sequence space are affected by the HW additions and need to - * compensate for them to accurately track TCP sequence numbers. This array - * contains the compensating extra lengths for ULP packets. It is indexed by - * a packet's ULP submode. - */ -const unsigned int t4_ulp_extra_len[] = {0, 4, 4, 8}; - -/* - * Return the length of any HW additions that will be made to a Tx packet. - * Such additions can happen for some types of ULP packets. - */ -static inline unsigned int -ulp_extra_len(struct mbuf *m, int *ulp_mode) -{ - struct m_tag *mtag; - - if ((mtag = m_tag_find(m, CXGBE_ISCSI_MBUF_TAG, NULL)) == NULL) - return (0); - *ulp_mode = *((int *)(mtag + 1)); - - return (t4_ulp_extra_len[*ulp_mode & 3]); -} - void send_flowc_wr(struct toepcb *toep, struct flowc_tx_params *ftxp) { @@ -383,13 +356,10 @@ t4_rcvd(struct toedev *tod, struct tcpcb KASSERT(toep->sb_cc >= sbused(sb), ("%s: sb %p has more data (%d) than last time (%d).", __func__, sb, sbused(sb), toep->sb_cc)); - if (toep->ulp_mode == ULP_MODE_ISCSI) { - toep->rx_credits += toep->sb_cc; - toep->sb_cc = 0; - } else { - toep->rx_credits += toep->sb_cc - sbused(sb); - toep->sb_cc = sbused(sb); - } + + toep->rx_credits += toep->sb_cc - sbused(sb); + toep->sb_cc = sbused(sb); + if (toep->rx_credits > 0 && (tp->rcv_wnd <= 32 * 1024 || toep->rx_credits >= 64 * 1024 || (toep->rx_credits >= 16 * 1024 && tp->rcv_wnd <= 128 * 1024) || @@ -489,25 +459,16 @@ max_dsgl_nsegs(int tx_credits) static inline void write_tx_wr(void *dst, struct toepcb *toep, unsigned int immdlen, - unsigned int plen, uint8_t credits, int shove, int ulp_mode, int txalign) + unsigned int plen, uint8_t credits, int shove, int ulp_submode, int txalign) { struct fw_ofld_tx_data_wr *txwr = dst; - unsigned int wr_ulp_mode; txwr->op_to_immdlen = htobe32(V_WR_OP(FW_OFLD_TX_DATA_WR) | V_FW_WR_IMMDLEN(immdlen)); txwr->flowid_len16 = htobe32(V_FW_WR_FLOWID(toep->tid) | V_FW_WR_LEN16(credits)); - - /* for iscsi, the mode & submode setting is per-packet */ - if (toep->ulp_mode == ULP_MODE_ISCSI) - wr_ulp_mode = V_TX_ULP_MODE(ulp_mode >> 4) | - V_TX_ULP_SUBMODE(ulp_mode & 3); - else - wr_ulp_mode = V_TX_ULP_MODE(toep->ulp_mode); - - txwr->lsodisable_to_flags = htobe32(wr_ulp_mode | V_TX_URG(0) | /*XXX*/ - V_TX_SHOVE(shove)); + txwr->lsodisable_to_flags = htobe32(V_TX_ULP_MODE(toep->ulp_mode) | + V_TX_ULP_SUBMODE(ulp_submode) | V_TX_URG(0) | V_TX_SHOVE(shove)); txwr->plen = htobe32(plen); if (txalign > 0) { @@ -801,59 +762,67 @@ t4_push_frames(struct adapter *sc, struc close_conn(sc, toep); } -void (*cxgbei_fw4_ack)(struct toepcb *, int); -struct mbuf *(*cxgbei_writeq_len)(struct toepcb *, int *); -struct mbuf *(*cxgbei_writeq_next)(struct toepcb *); +static inline void +rqdrop_locked(struct mbufq *q, int plen) +{ + struct mbuf *m; + + while (plen > 0) { + m = mbufq_dequeue(q); + + /* Too many credits. */ + MPASS(m != NULL); + M_ASSERTPKTHDR(m); + + /* Partial credits. */ + MPASS(plen >= m->m_pkthdr.len); + + plen -= m->m_pkthdr.len; + m_freem(m); + } +} -/* Send ULP data over TOE using TX_DATA_WR. We send whole mbuf at once */ void -t4_ulp_push_frames(struct adapter *sc, struct toepcb *toep, int drop) +t4_push_pdus(struct adapter *sc, struct toepcb *toep, int drop) { - struct mbuf *sndptr, *m = NULL; + struct mbuf *sndptr, *m; struct fw_ofld_tx_data_wr *txwr; struct wrqe *wr; - unsigned int plen, nsegs, credits, max_imm, max_nsegs, max_nsegs_1mbuf; + u_int plen, nsegs, credits, max_imm, max_nsegs, max_nsegs_1mbuf; + u_int adjusted_plen, ulp_submode; struct inpcb *inp = toep->inp; - struct tcpcb *tp; - struct socket *so; - struct sockbuf *sb; - int tx_credits, ulp_len = 0, ulp_mode = 0, qlen = 0; - int shove, compl; - struct ofld_tx_sdesc *txsd; + struct tcpcb *tp = intotcpcb(inp); + int tx_credits, shove; + struct ofld_tx_sdesc *txsd = &toep->txsd[toep->txsd_pidx]; + struct mbufq *pduq = &toep->ulp_pduq; + static const u_int ulp_extra_len[] = {0, 4, 4, 8}; INP_WLOCK_ASSERT(inp); - if (toep->flags & TPF_ABORT_SHUTDOWN) - return; - - tp = intotcpcb(inp); - so = inp->inp_socket; - sb = &so->so_snd; - txsd = &toep->txsd[toep->txsd_pidx]; - KASSERT(toep->flags & TPF_FLOWC_WR_SENT, ("%s: flowc_wr not sent for tid %u.", __func__, toep->tid)); + KASSERT(toep->ulp_mode == ULP_MODE_ISCSI, + ("%s: ulp_mode %u for toep %p", __func__, toep->ulp_mode, toep)); /* * This function doesn't resume by itself. Someone else must clear the * flag and call this function. */ - if (__predict_false(toep->flags & TPF_TX_SUSPENDED)) + if (__predict_false(toep->flags & TPF_TX_SUSPENDED)) { + KASSERT(drop == 0, + ("%s: drop (%d) != 0 but tx is suspended", __func__, drop)); return; + } - sndptr = cxgbei_writeq_len(toep, &qlen); - if (!qlen) - return; + if (drop) + rqdrop_locked(&toep->ulp_pdu_reclaimq, drop); + + while ((sndptr = mbufq_first(pduq)) != NULL) { + M_ASSERTPKTHDR(sndptr); - do { tx_credits = min(toep->tx_credits, MAX_OFLD_TX_CREDITS); max_imm = max_imm_payload(tx_credits); max_nsegs = max_dsgl_nsegs(tx_credits); - if (drop) { - cxgbei_fw4_ack(toep, drop); - drop = 0; - } - plen = 0; nsegs = 0; max_nsegs_1mbuf = 0; /* max # of SGL segments in any one mbuf */ @@ -863,7 +832,10 @@ t4_ulp_push_frames(struct adapter *sc, s nsegs += n; plen += m->m_len; - /* This mbuf sent us _over_ the nsegs limit, return */ + /* + * This mbuf would send us _over_ the nsegs limit. + * Suspend tx because the PDU can't be sent out. + */ if (plen > max_imm && nsegs > max_nsegs) { toep->flags |= TPF_TX_SUSPENDED; return; @@ -871,30 +843,35 @@ t4_ulp_push_frames(struct adapter *sc, s if (max_nsegs_1mbuf < n) max_nsegs_1mbuf = n; - - /* This mbuf put us right at the max_nsegs limit */ - if (plen > max_imm && nsegs == max_nsegs) { - toep->flags |= TPF_TX_SUSPENDED; - return; - } - } - - shove = m == NULL && !(tp->t_flags & TF_MORETOCOME); - /* nothing to send */ - if (plen == 0) { - KASSERT(m == NULL, - ("%s: nothing to send, but m != NULL", __func__)); - break; } if (__predict_false(toep->flags & TPF_FIN_SENT)) panic("%s: excess tx.", __func__); - ulp_len = plen + ulp_extra_len(sndptr, &ulp_mode); + /* + * We have a PDU to send. All of it goes out in one WR so 'm' + * is NULL. A PDU's length is always a multiple of 4. + */ + MPASS(m == NULL); + MPASS((plen & 3) == 0); + MPASS(sndptr->m_pkthdr.len == plen); + + shove = !(tp->t_flags & TF_MORETOCOME); + ulp_submode = mbuf_ulp_submode(sndptr); + MPASS(ulp_submode < nitems(ulp_extra_len)); + + /* + * plen doesn't include header and data digests, which are + * generated and inserted in the right places by the TOE, but + * they do occupy TCP sequence space and need to be accounted + * for. + */ + adjusted_plen = plen + ulp_extra_len[ulp_submode]; if (plen <= max_imm) { /* Immediate data tx */ - wr = alloc_wrqe(roundup(sizeof(*txwr) + plen, 16), + + wr = alloc_wrqe(roundup2(sizeof(*txwr) + plen, 16), toep->ofld_txq); if (wr == NULL) { /* XXX: how will we recover from this? */ @@ -903,16 +880,17 @@ t4_ulp_push_frames(struct adapter *sc, s } txwr = wrtod(wr); credits = howmany(wr->wr_len, 16); - write_tx_wr(txwr, toep, plen, ulp_len, credits, shove, - ulp_mode, 0); + write_tx_wr(txwr, toep, plen, adjusted_plen, credits, + shove, ulp_submode, sc->tt.tx_align); m_copydata(sndptr, 0, plen, (void *)(txwr + 1)); + nsegs = 0; } else { int wr_len; /* DSGL tx */ wr_len = sizeof(*txwr) + sizeof(struct ulptx_sgl) + ((3 * (nsegs - 1)) / 2 + ((nsegs - 1) & 1)) * 8; - wr = alloc_wrqe(roundup(wr_len, 16), toep->ofld_txq); + wr = alloc_wrqe(roundup2(wr_len, 16), toep->ofld_txq); if (wr == NULL) { /* XXX: how will we recover from this? */ toep->flags |= TPF_TX_SUSPENDED; @@ -920,8 +898,8 @@ t4_ulp_push_frames(struct adapter *sc, s } txwr = wrtod(wr); credits = howmany(wr_len, 16); - write_tx_wr(txwr, toep, 0, ulp_len, credits, shove, - ulp_mode, 0); + write_tx_wr(txwr, toep, 0, adjusted_plen, credits, + shove, ulp_submode, sc->tt.tx_align); write_tx_sgl(txwr + 1, sndptr, m, nsegs, max_nsegs_1mbuf); if (wr_len & 0xf) { @@ -934,28 +912,26 @@ t4_ulp_push_frames(struct adapter *sc, s KASSERT(toep->tx_credits >= credits, ("%s: not enough credits", __func__)); + m = mbufq_dequeue(pduq); + MPASS(m == sndptr); + mbufq_enqueue(&toep->ulp_pdu_reclaimq, m); + toep->tx_credits -= credits; toep->tx_nocompl += credits; toep->plen_nocompl += plen; if (toep->tx_credits <= toep->tx_total * 3 / 8 && - toep->tx_nocompl >= toep->tx_total / 4) - compl = 1; - - if (compl) { + toep->tx_nocompl >= toep->tx_total / 4) { txwr->op_to_immdlen |= htobe32(F_FW_WR_COMPL); toep->tx_nocompl = 0; toep->plen_nocompl = 0; } - tp->snd_nxt += ulp_len; - tp->snd_max += ulp_len; - /* goto next mbuf */ - sndptr = m = cxgbei_writeq_next(toep); + tp->snd_nxt += adjusted_plen; + tp->snd_max += adjusted_plen; toep->flags |= TPF_TX_DATA_SENT; - if (toep->tx_credits < MIN_OFLD_TX_CREDITS) { + if (toep->tx_credits < MIN_OFLD_TX_CREDITS) toep->flags |= TPF_TX_SUSPENDED; - } KASSERT(toep->txsd_avail > 0, ("%s: no txsd", __func__)); txsd->plen = plen; @@ -968,10 +944,10 @@ t4_ulp_push_frames(struct adapter *sc, s toep->txsd_avail--; t4_l2t_send(sc, wr, toep->l2te); - } while (m != NULL); + } - /* Send a FIN if requested, but only if there's no more data to send */ - if (m == NULL && toep->flags & TPF_SEND_FIN) + /* Send a FIN if requested, but only if there are no more PDUs to send */ + if (mbufq_first(pduq) == NULL && toep->flags & TPF_SEND_FIN) close_conn(sc, toep); } @@ -990,7 +966,7 @@ t4_tod_output(struct toedev *tod, struct KASSERT(toep != NULL, ("%s: toep is NULL", __func__)); if (toep->ulp_mode == ULP_MODE_ISCSI) - t4_ulp_push_frames(sc, toep, 0); + t4_push_pdus(sc, toep, 0); else t4_push_frames(sc, toep, 0); @@ -1014,7 +990,7 @@ t4_send_fin(struct toedev *tod, struct t toep->flags |= TPF_SEND_FIN; if (tp->t_state >= TCPS_ESTABLISHED) { if (toep->ulp_mode == ULP_MODE_ISCSI) - t4_ulp_push_frames(sc, toep, 0); + t4_push_pdus(sc, toep, 0); else t4_push_frames(sc, toep, 0); } @@ -1653,7 +1629,7 @@ do_fw4_ack(struct sge_iq *iq, const stru toep->tx_credits >= toep->tx_total / 4) { toep->flags &= ~TPF_TX_SUSPENDED; if (toep->ulp_mode == ULP_MODE_ISCSI) - t4_ulp_push_frames(sc, toep, plen); + t4_push_pdus(sc, toep, plen); else t4_push_frames(sc, toep, plen); } else if (plen > 0) { Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_ddp.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_ddp.c Wed Nov 4 23:52:19 2015 (r290375) +++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_ddp.c Thu Nov 5 00:50:25 2015 (r290376) @@ -505,8 +505,6 @@ handle_ddp_close(struct toepcb *toep, st F_DDP_INVALID_TAG | F_DDP_COLOR_ERR | F_DDP_TID_MISMATCH |\ F_DDP_INVALID_PPOD | F_DDP_HDRCRC_ERR | F_DDP_DATACRC_ERR) -void (*cxgbei_rx_data_ddp)(struct toepcb *, const struct cpl_rx_data_ddp *); - static int do_rx_data_ddp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) { @@ -528,9 +526,9 @@ do_rx_data_ddp(struct sge_iq *iq, const } if (toep->ulp_mode == ULP_MODE_ISCSI) { - cxgbei_rx_data_ddp(toep, cpl); + sc->cpl_handler[CPL_RX_ISCSI_DDP](iq, rss, m); return (0); - } + } handle_ddp_data(toep, cpl->u.ddp_report, cpl->seq, be16toh(cpl->len)); Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.c Wed Nov 4 23:52:19 2015 (r290375) +++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.c Thu Nov 5 00:50:25 2015 (r290376) @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -157,6 +158,8 @@ alloc_toepcb(struct port_info *pi, int t toep->ofld_txq = &sc->sge.ofld_txq[txqid]; toep->ofld_rxq = &sc->sge.ofld_rxq[rxqid]; toep->ctrlq = &sc->sge.ctrlq[pi->port_id]; + mbufq_init(&toep->ulp_pduq, INT_MAX); + mbufq_init(&toep->ulp_pdu_reclaimq, INT_MAX); toep->txsd_total = txsd_total; toep->txsd_avail = txsd_total; toep->txsd_pidx = 0; @@ -272,6 +275,14 @@ release_offload_resources(struct toepcb CTR5(KTR_CXGBE, "%s: toep %p (tid %d, l2te %p, ce %p)", __func__, toep, tid, toep->l2te, toep->ce); + /* + * These queues should have been emptied at approximately the same time + * that a normal connection's socket's so_snd would have been purged or + * drained. Do _not_ clean up here. + */ + MPASS(mbufq_len(&toep->ulp_pduq) == 0); + MPASS(mbufq_len(&toep->ulp_pdu_reclaimq) == 0); + if (toep->ulp_mode == ULP_MODE_TCPDDP) release_ddp_resources(toep); Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h Wed Nov 4 23:52:19 2015 (r290375) +++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_tom.h Thu Nov 5 00:50:25 2015 (r290376) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Chelsio Communications, Inc. + * Copyright (c) 2012, 2015 Chelsio Communications, Inc. * All rights reserved. * Written by: Navdeep Parhar * @@ -116,6 +116,8 @@ struct toepcb { u_int ulp_mode; /* ULP mode */ void *ulpcb; + struct mbufq ulp_pduq; /* PDUs waiting to be sent out. */ + struct mbufq ulp_pdu_reclaimq; u_int ddp_flags; struct ddp_buffer *db[2]; @@ -221,6 +223,22 @@ td_adapter(struct tom_data *td) return (td->tod.tod_softc); } +static inline void +set_mbuf_ulp_submode(struct mbuf *m, uint8_t ulp_submode) +{ + + M_ASSERTPKTHDR(m); + m->m_pkthdr.PH_per.eight[0] = ulp_submode; +} + +static inline uint8_t +mbuf_ulp_submode(struct mbuf *m) +{ + + M_ASSERTPKTHDR(m); + return (m->m_pkthdr.PH_per.eight[0]); +} + /* t4_tom.c */ struct toepcb *alloc_toepcb(struct port_info *, int, int, int); void free_toepcb(struct toepcb *); @@ -276,6 +294,7 @@ int t4_send_rst(struct toedev *, struct void t4_set_tcb_field(struct adapter *, struct toepcb *, int, uint16_t, uint64_t, uint64_t); void t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop); +void t4_push_pdus(struct adapter *sc, struct toepcb *toep, int drop); /* t4_ddp.c */ void t4_init_ddp(struct adapter *, struct tom_data *); @@ -288,7 +307,4 @@ void handle_ddp_close(struct toepcb *, s uint32_t); void insert_ddp_data(struct toepcb *, uint32_t); -/* ULP related */ -#define CXGBE_ISCSI_MBUF_TAG 50 -void t4_ulp_push_frames(struct adapter *sc, struct toepcb *toep, int); #endif From owner-svn-src-projects@freebsd.org Fri Nov 6 22:22:39 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B1D6A28C21 for ; Fri, 6 Nov 2015 22:22:39 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E687B158D; Fri, 6 Nov 2015 22:22:38 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA6MMcOQ079612; Fri, 6 Nov 2015 22:22:38 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA6MMcYH079611; Fri, 6 Nov 2015 22:22:38 GMT (envelope-from np@FreeBSD.org) Message-Id: <201511062222.tA6MMcYH079611@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Fri, 6 Nov 2015 22:22:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290469 - projects/cxl_iscsi/sys/dev/cxgbe/tom X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2015 22:22:39 -0000 Author: np Date: Fri Nov 6 22:22:37 2015 New Revision: 290469 URL: https://svnweb.freebsd.org/changeset/base/290469 Log: cxgbe/tom: do not attempt to transmit if the connection is being aborted. Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Nov 6 22:08:05 2015 (r290468) +++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Nov 6 22:22:37 2015 (r290469) @@ -576,6 +576,9 @@ t4_push_frames(struct adapter *sc, struc toep->ulp_mode == ULP_MODE_RDMA, ("%s: ulp_mode %u for toep %p", __func__, toep->ulp_mode, toep)); + if (__predict_false(toep->flags & TPF_ABORT_SHUTDOWN)) + return; + /* * This function doesn't resume by itself. Someone else must clear the * flag and call this function. @@ -803,6 +806,9 @@ t4_push_pdus(struct adapter *sc, struct KASSERT(toep->ulp_mode == ULP_MODE_ISCSI, ("%s: ulp_mode %u for toep %p", __func__, toep->ulp_mode, toep)); + if (__predict_false(toep->flags & TPF_ABORT_SHUTDOWN)) + return; + /* * This function doesn't resume by itself. Someone else must clear the * flag and call this function. From owner-svn-src-projects@freebsd.org Sat Nov 7 11:02:38 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEA73A27E3E for ; Sat, 7 Nov 2015 11:02:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 688CB1327; Sat, 7 Nov 2015 11:02:38 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7B2blk005265; Sat, 7 Nov 2015 11:02:37 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7B2YFl005230; Sat, 7 Nov 2015 11:02:34 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511071102.tA7B2YFl005230@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 11:02:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290484 - in projects/collation: . bin/rm bin/sh contrib/libexecinfo contrib/libxo/libxo etc/defaults etc/periodic/daily etc/periodic/security gnu/usr.bin/grep include lib lib/libc/net ... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 11:02:38 -0000 Author: bapt Date: Sat Nov 7 11:02:33 2015 New Revision: 290484 URL: https://svnweb.freebsd.org/changeset/base/290484 Log: Merge from head r290483 Added: projects/collation/etc/periodic/daily/430.status-uptime - copied unchanged from r290483, head/etc/periodic/daily/430.status-uptime projects/collation/lib/libopenbsd/ - copied from r290483, head/lib/libopenbsd/ projects/collation/share/mk/src.init.mk - copied unchanged from r290483, head/share/mk/src.init.mk projects/collation/sys/arm/broadcom/bcm2835/bcm2835_vcio.c - copied unchanged from r290483, head/sys/arm/broadcom/bcm2835/bcm2835_vcio.c projects/collation/sys/cddl/contrib/opensolaris/common/atomic/aarch64/ - copied from r290483, head/sys/cddl/contrib/opensolaris/common/atomic/aarch64/ projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.c - copied unchanged from r290483, head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.h - copied unchanged from r290483, head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_debugfs.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_killable.h - copied unchanged from r290483, head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_killable.h projects/collation/tools/build/options/WITH_FAST_DEPEND - copied unchanged from r290483, head/tools/build/options/WITH_FAST_DEPEND Deleted: projects/collation/etc/periodic/daily/430.status-rwho projects/collation/lib/libohash/ projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_proc.c Modified: projects/collation/MAINTAINERS (contents, props changed) projects/collation/Makefile.inc1 projects/collation/ObsoleteFiles.inc projects/collation/bin/rm/rm.1 projects/collation/bin/rm/rm.c projects/collation/bin/sh/eval.c projects/collation/bin/sh/expand.c projects/collation/bin/sh/expand.h projects/collation/contrib/libexecinfo/backtrace.3 projects/collation/contrib/libxo/libxo/xo_format.5 projects/collation/etc/defaults/periodic.conf projects/collation/etc/periodic/daily/Makefile projects/collation/etc/periodic/security/520.pfdenied projects/collation/gnu/usr.bin/grep/savedir.c projects/collation/include/unistd.h projects/collation/lib/Makefile projects/collation/lib/libc/net/getnameinfo.c projects/collation/lib/libc/rpc/clnt_bcast.c projects/collation/lib/libc/rpc/clnt_vc.c projects/collation/lib/libc/rpc/getnetconfig.c projects/collation/lib/libc/rpc/mt_misc.c projects/collation/lib/libc/rpc/rpc_soc.c projects/collation/lib/libc/rpc/rpcb_clnt.c projects/collation/lib/libc/rpc/svc.c projects/collation/lib/libc/rpc/svc_dg.c projects/collation/lib/libc/rpc/svc_simple.c projects/collation/lib/libc/rpc/svc_vc.c projects/collation/lib/libc/tests/c063/Makefile projects/collation/lib/libc/tests/setjmp/Makefile projects/collation/lib/libc/tests/string/Makefile projects/collation/lib/libc/tests/tls_dso/Makefile projects/collation/lib/libdpv/dialogrc.c projects/collation/lib/libdpv/dialogrc.h projects/collation/lib/libfigpar/figpar.3 projects/collation/lib/libfigpar/figpar.c projects/collation/lib/libfigpar/figpar.h projects/collation/lib/libnetbsd/README projects/collation/lib/libutil/pty.3 projects/collation/sbin/ifconfig/ifconfig.8 projects/collation/sbin/ifconfig/ifieee80211.c projects/collation/sbin/ipfw/ipfw2.c projects/collation/sbin/ipfw/ipfw2.h projects/collation/sbin/savecore/savecore.c projects/collation/sbin/sysctl/sysctl.c projects/collation/secure/lib/libcrypto/Makefile projects/collation/secure/lib/libcrypto/Makefile.inc projects/collation/secure/lib/libssl/Makefile projects/collation/secure/usr.bin/openssl/Makefile projects/collation/share/man/man4/Makefile projects/collation/share/man/man4/ddb.4 projects/collation/share/man/man4/lagg.4 projects/collation/share/man/man4/xnb.4 projects/collation/share/man/man5/src.conf.5 projects/collation/share/man/man9/Makefile projects/collation/share/man/man9/pci.9 projects/collation/share/man/man9/sysctl.9 projects/collation/share/man/man9/sysctl_add_oid.9 projects/collation/share/mk/bsd.dep.mk projects/collation/share/mk/bsd.lib.mk projects/collation/share/mk/bsd.opts.mk projects/collation/share/mk/bsd.own.mk projects/collation/share/mk/bsd.prog.mk projects/collation/share/mk/local.init.mk projects/collation/share/mk/src.libnames.mk projects/collation/sys/arm/arm/busdma_machdep-v6.c projects/collation/sys/arm/arm/busdma_machdep.c projects/collation/sys/arm/arm/db_interface.c projects/collation/sys/arm/arm/machdep.c projects/collation/sys/arm/arm/trap-v6.c projects/collation/sys/arm/at91/at91_pmc.c projects/collation/sys/arm/at91/if_macb.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_intr.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/collation/sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h projects/collation/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/collation/sys/arm/broadcom/bcm2835/bcm2836.c projects/collation/sys/arm/broadcom/bcm2835/bcm2836.h projects/collation/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c projects/collation/sys/arm/broadcom/bcm2835/files.bcm283x projects/collation/sys/arm/include/armreg.h projects/collation/sys/arm/include/bus_dma.h projects/collation/sys/arm/include/db_machdep.h projects/collation/sys/arm/include/machdep.h projects/collation/sys/arm/include/proc.h projects/collation/sys/arm/include/vfp.h projects/collation/sys/arm/ti/ti_common.c projects/collation/sys/arm/xscale/ixp425/ixp425_pci.c projects/collation/sys/arm64/arm64/busdma_bounce.c projects/collation/sys/arm64/arm64/mp_machdep.c projects/collation/sys/arm64/arm64/nexus.c projects/collation/sys/arm64/conf/GENERIC projects/collation/sys/boot/fdt/dts/arm/bcm2835.dtsi projects/collation/sys/boot/fdt/dts/arm/bcm2836.dtsi projects/collation/sys/boot/fdt/dts/arm/rpi.dts projects/collation/sys/boot/fdt/dts/arm/rpi2.dts projects/collation/sys/cam/ata/ata_da.c projects/collation/sys/cam/ata/ata_pmp.c projects/collation/sys/cam/ctl/ctl.c projects/collation/sys/cam/scsi/scsi_da.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/collation/sys/compat/linuxkpi/common/include/asm/byteorder.h projects/collation/sys/compat/linuxkpi/common/include/asm/types.h projects/collation/sys/compat/linuxkpi/common/include/linux/bitops.h projects/collation/sys/compat/linuxkpi/common/include/linux/cdev.h projects/collation/sys/compat/linuxkpi/common/include/linux/clocksource.h projects/collation/sys/compat/linuxkpi/common/include/linux/device.h projects/collation/sys/compat/linuxkpi/common/include/linux/idr.h projects/collation/sys/compat/linuxkpi/common/include/linux/if_arp.h projects/collation/sys/compat/linuxkpi/common/include/linux/if_vlan.h projects/collation/sys/compat/linuxkpi/common/include/linux/interrupt.h projects/collation/sys/compat/linuxkpi/common/include/linux/io.h projects/collation/sys/compat/linuxkpi/common/include/linux/jhash.h projects/collation/sys/compat/linuxkpi/common/include/linux/kobject.h projects/collation/sys/compat/linuxkpi/common/include/linux/kref.h projects/collation/sys/compat/linuxkpi/common/include/linux/module.h projects/collation/sys/compat/linuxkpi/common/include/linux/net.h projects/collation/sys/compat/linuxkpi/common/include/linux/notifier.h projects/collation/sys/compat/linuxkpi/common/include/linux/poll.h projects/collation/sys/compat/linuxkpi/common/include/linux/radix-tree.h projects/collation/sys/compat/linuxkpi/common/include/linux/rwlock.h projects/collation/sys/compat/linuxkpi/common/include/linux/sysfs.h projects/collation/sys/compat/linuxkpi/common/include/linux/usb.h projects/collation/sys/compat/linuxkpi/common/include/net/if_inet6.h projects/collation/sys/compat/linuxkpi/common/include/net/ipv6.h projects/collation/sys/compat/linuxkpi/common/include/net/netevent.h projects/collation/sys/conf/files.arm64 projects/collation/sys/conf/kern.opts.mk projects/collation/sys/conf/kern.post.mk projects/collation/sys/contrib/vchiq/interface/vchi/vchi.h projects/collation/sys/contrib/vchiq/interface/vchi/vchi_common.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_cfg.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_connected.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_connected.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_if.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_ioctl.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_pagelist.h projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_shim.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_util.c projects/collation/sys/contrib/vchiq/interface/vchiq_arm/vchiq_util.h projects/collation/sys/dev/ath/if_ath.c projects/collation/sys/dev/ath/if_athvar.h projects/collation/sys/dev/cxgbe/t4_main.c projects/collation/sys/dev/filemon/filemon.c projects/collation/sys/dev/flash/mx25l.c projects/collation/sys/dev/iwi/if_iwi.c projects/collation/sys/dev/iwi/if_iwivar.h projects/collation/sys/dev/iwn/if_iwn.c projects/collation/sys/dev/ofw/ofw_iicbus.c projects/collation/sys/dev/otus/if_otus.c projects/collation/sys/dev/otus/if_otusreg.h projects/collation/sys/dev/pci/pci.c projects/collation/sys/dev/pci/pcivar.h projects/collation/sys/dev/usb/net/if_cdce.c projects/collation/sys/dev/usb/net/if_urndis.c projects/collation/sys/dev/usb/usb_busdma.c projects/collation/sys/dev/usb/wlan/if_rum.c projects/collation/sys/dev/usb/wlan/if_rumvar.h projects/collation/sys/dev/usb/wlan/if_run.c projects/collation/sys/dev/usb/wlan/if_urtwn.c projects/collation/sys/dev/vnic/thunder_mdio_fdt.c projects/collation/sys/dev/xen/netfront/netfront.c projects/collation/sys/geom/eli/g_eli.c projects/collation/sys/kern/imgact_elf.c projects/collation/sys/kern/kern_descrip.c projects/collation/sys/kern/kern_sysctl.c projects/collation/sys/kern/kern_tc.c projects/collation/sys/kern/link_elf.c projects/collation/sys/kern/subr_rman.c projects/collation/sys/kern/vfs_bio.c projects/collation/sys/mips/atheros/files.ar71xx projects/collation/sys/mips/mips/trap.c projects/collation/sys/modules/Makefile projects/collation/sys/net/flowtable.c projects/collation/sys/net/ieee8023ad_lacp.c projects/collation/sys/net/if_arcsubr.c projects/collation/sys/net/if_ethersubr.c projects/collation/sys/net/if_fddisubr.c projects/collation/sys/net/if_fwsubr.c projects/collation/sys/net/if_iso88025subr.c projects/collation/sys/netinet/in_var.h projects/collation/sys/netinet/ip_carp.c projects/collation/sys/netinet/ip_fastfwd.c projects/collation/sys/netinet/ip_fw.h projects/collation/sys/netinet/ip_input.c projects/collation/sys/netinet/sctp_indata.c projects/collation/sys/netinet/sctp_uio.h projects/collation/sys/netinet/sctputil.c projects/collation/sys/netinet/tcp_input.c projects/collation/sys/netinet6/frag6.c projects/collation/sys/netinet6/in6.h projects/collation/sys/netinet6/in6_rss.c projects/collation/sys/netinet6/ip6_input.c projects/collation/sys/netinet6/ip6_var.h projects/collation/sys/netpfil/ipfw/ip_fw_private.h projects/collation/sys/netpfil/ipfw/ip_fw_sockopt.c projects/collation/sys/netpfil/ipfw/ip_fw_table.c projects/collation/sys/netpfil/ipfw/ip_fw_table.h projects/collation/sys/powerpc/mpc85xx/pci_mpc85xx.c projects/collation/sys/powerpc/powerpc/busdma_machdep.c projects/collation/sys/powerpc/powerpc/db_interface.c projects/collation/sys/sparc64/sparc64/bus_machdep.c projects/collation/sys/sys/cdefs.h projects/collation/sys/sys/param.h projects/collation/sys/sys/sysctl.h projects/collation/sys/x86/x86/busdma_bounce.c projects/collation/sys/x86/xen/xen_intr.c projects/collation/sys/xen/xen-os.h projects/collation/tools/build/mk/OptionalObsoleteFiles.inc projects/collation/tools/build/options/makeman projects/collation/tools/regression/security/open_to_operation/open_to_operation.c projects/collation/tools/tools/zfsboottest/Makefile projects/collation/tools/tools/zfsboottest/zfsboottest.c projects/collation/usr.bin/bsdiff/bsdiff/bsdiff.c projects/collation/usr.bin/m4/Makefile projects/collation/usr.bin/m4/Makefile.depend projects/collation/usr.bin/mandoc/Makefile projects/collation/usr.bin/mandoc/Makefile.depend projects/collation/usr.bin/netstat/if.c projects/collation/usr.bin/netstat/route.c projects/collation/usr.bin/rctl/rctl.8 projects/collation/usr.bin/rctl/rctl.c projects/collation/usr.bin/soelim/soelim.1 projects/collation/usr.bin/svn/lib/Makefile projects/collation/usr.sbin/bsdinstall/distfetch/distfetch.c projects/collation/usr.sbin/makefs/cd9660.c projects/collation/usr.sbin/makefs/ffs/ffs_bswap.c projects/collation/usr.sbin/makefs/makefs.8 projects/collation/usr.sbin/makefs/tests/makefs_cd9660_tests.sh projects/collation/usr.sbin/makefs/tests/makefs_ffs_tests.sh projects/collation/usr.sbin/makefs/tests/makefs_tests_common.sh projects/collation/usr.sbin/pciconf/cap.c projects/collation/usr.sbin/sysrc/sysrc projects/collation/usr.sbin/sysrc/sysrc.8 Directory Properties: projects/collation/ (props changed) projects/collation/contrib/libexecinfo/ (props changed) projects/collation/include/ (props changed) projects/collation/lib/libc/ (props changed) projects/collation/lib/libutil/ (props changed) projects/collation/sbin/ (props changed) projects/collation/sbin/ipfw/ (props changed) projects/collation/share/ (props changed) projects/collation/share/man/man4/ (props changed) projects/collation/sys/ (props changed) projects/collation/sys/boot/ (props changed) projects/collation/sys/cddl/contrib/opensolaris/ (props changed) projects/collation/sys/conf/ (props changed) Modified: projects/collation/MAINTAINERS ============================================================================== --- projects/collation/MAINTAINERS Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/MAINTAINERS Sat Nov 7 11:02:33 2015 (r290484) @@ -26,7 +26,38 @@ sub-system. subsystem login notes ----------------------------- +opencrypto jmg Pre-commit review requested. Documentation Required. kqueue jmg Pre-commit review requested. Documentation Required. +share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. +ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +iwn(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +iwm(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +otus(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +dev/usb/wlan adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org +openssl benl,jkim Pre-commit review requested. +release/release.sh gjb,re Pre-commit review and regression tests + requested. +sh(1) jilles Pre-commit review requested. This also applies + to kill(1), printf(1) and test(1) which are + compiled in as builtins. +isci(4) jimharris Pre-commit review requested. +nvme(4) jimharris Pre-commit review requested. +nvd(4) jimharris Pre-commit review requested. +nvmecontrol(8) jimharris Pre-commit review requested. +libfetch des Advance notification requested. +fetch des Advance notification requested. +libpam des Pre-commit review requested. +openssh des Pre-commit review requested. +pseudofs des Pre-commit review requested. +procfs des Pre-commit review requested. +linprocfs des Pre-commit review requested. +contrib/compiler-rt dim Pre-commit review preferred. +contrib/libc++ dim Pre-commit review preferred. +contrib/libcxxrt dim Pre-commit review preferred. +contrib/llvm dim Pre-commit review preferred. +contrib/llvm/tools/lldb emaste Pre-commit review preferred. +---- OLD ---- libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. UFS EAs rwatson Pre-commit review requested. @@ -34,7 +65,6 @@ MAC Framework rwatson Pre-commit review MAC Modules rwatson Pre-commit review requested. contrib/openbsm rwatson Pre-commit review requested. sys/security/audit rwatson Pre-commit review requested. -ath(4) adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. @@ -57,20 +87,11 @@ etc/mail gshapiro Pre-commit review requ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -libfetch des Advance notification requested. -fetch des Advance notification requested. -libpam des Pre-commit review requested. -openssh des Pre-commit review requested. -pseudofs des Pre-commit review requested. -procfs des Pre-commit review requested. -linprocfs des Pre-commit review requested. lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. -net80211 adrian Pre-commit review requested, send to freebsd-wireless@freebsd.org nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. -share/mk imp, bapt, bdrewery, emaste, sjg Make is hard. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org drm rnoland Just keep me informed of changes, try not to break it. unifdef(1) fanf Pre-commit review requested. @@ -102,7 +123,6 @@ linux emul emulation Please discuss chan bs{diff,patch} cperciva Pre-commit review requested. portsnap cperciva Pre-commit review requested. freebsd-update cperciva Pre-commit review requested. -openssl benl,jkim Pre-commit review requested. sys/dev/usb hselasky If in doubt, ask. sys/dev/sound/usb hselasky If in doubt, ask. sys/compat/linuxkpi hselasky If in doubt, ask. @@ -120,18 +140,8 @@ usr.sbin/zic edwin Heads-up appreciat lib/libc/stdtime edwin Heads-up appreciated, since parts of this code is maintained by a third party source. sbin/routed bms Pre-commit review; notify vendor at rhyolite.com -isci(4) jimharris Pre-commit review requested. cmx daniel@roe.ch Pre-commit review preferred. filemon obrien Pre-commit review preferred. sysdoc trhodes Pre-commit review preferred. -sh(1) jilles Pre-commit review requested. This also applies - to kill(1), printf(1) and test(1) which are - compiled in as builtins. -nvme(4) jimharris Pre-commit review requested. -nvd(4) jimharris Pre-commit review requested. -nvmecontrol(8) jimharris Pre-commit review requested. -release/release.sh gjb Pre-commit review and regression tests - requested. nanobsd imp Pre-commit review requested for coordination. vmm(4) neel,grehan Pre-commit review requested. -opencrypto jmg Pre-commit review requested. Documentation Required. Modified: projects/collation/Makefile.inc1 ============================================================================== --- projects/collation/Makefile.inc1 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/Makefile.inc1 Sat Nov 7 11:02:33 2015 (r290484) @@ -27,7 +27,7 @@ # when NO_ROOT is set. (default: ${DESTDIR}/METALOG) # TARGET="machine" to crossbuild world for a different machine type # TARGET_ARCH= may be required when a TARGET supports multiple endians -# BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh) +# BUILDENV_SHELL= shell to launch for the buildenv target (def:${SHELL}) # WORLD_FLAGS= additional flags to pass to make(1) during buildworld # KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel # SUBDIR_OVERRIDE="list of dirs" to build rather than everything. @@ -48,9 +48,15 @@ .error "Both TARGET and TARGET_ARCH must be defined." .endif -.include "share/mk/src.opts.mk" -.include -.include +# Cross toolchain changes must be in effect before bsd.compiler.mk +# so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. +.if defined(CROSS_TOOLCHAIN) +LOCALBASE?= /usr/local +.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" +CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" +.endif +.include # don't depend on src.opts.mk doing it +.include "share/mk/src.opts.mk" # We must do lib/ and libexec/ before bin/ in case of a mid-install error to # keep the users system reasonably usable. For static->dynamic root upgrades, @@ -139,7 +145,7 @@ CLEANDIR= cleandir LOCAL_TOOL_DIRS?= -BUILDENV_SHELL?=/bin/sh +BUILDENV_SHELL?=${SHELL} SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD @@ -254,7 +260,7 @@ INSTALLTMP!= /usr/bin/mktemp -d -u -t in BOOTSTRAPPING?= 0 # Common environment for world related stages -CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ +CROSSENV+= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ CPUTYPE=${TARGET_CPUTYPE} @@ -329,10 +335,6 @@ HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MT HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT .endif -.if defined(CROSS_TOOLCHAIN) -LOCALBASE?= /usr/local -.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" -.endif .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} @@ -369,7 +371,7 @@ X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${ X${BINUTIL}?= ${${BINUTIL}} .endif .endfor -WMAKEENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ +CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCFLAGS} ${XCXXFLAGS}" \ DEPFLAGS="${DEPFLAGS}" \ CPP="${XCPP} ${XCFLAGS}" \ AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ @@ -771,7 +773,7 @@ buildworld_epilogue: # modification of the current environment's PATH. In addition, we need # to quote multiword values. # -buildenvvars: +buildenvvars: .PHONY @echo ${WMAKEENV:Q} ${.MAKE.EXPORTED:@v@$v=\"${$v}\"@} .if ${.TARGETS:Mbuildenv} @@ -779,9 +781,11 @@ buildenvvars: .error The buildenv target is incompatible with -j .endif .endif -buildenv: +BUILDENV_DIR?= ${.CURDIR} +buildenv: .PHONY @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} ${BUILDENV_SHELL} || true + @cd ${BUILDENV_DIR} && env ${WMAKEENV} BUILDENV=1 ${BUILDENV_SHELL} \ + || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} @@ -1367,10 +1371,10 @@ _sed= usr.bin/sed .endif .if ${BOOTSTRAPPING} < 1000002 -_libohash= lib/libohash +_libopenbsd= lib/libopenbsd _m4= usr.bin/m4 -${_bt}-usr.bin/m4: ${_bt}-lib/libohash +${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd .endif .if ${BOOTSTRAPPING} < 1000026 @@ -1443,10 +1447,10 @@ _kerberos5_bootstrap_tools= \ .endif .if ${MK_MANDOCDB} != "no" -_libohash?= lib/libohash +_libopenbsd?= lib/libopenbsd _makewhatis= lib/libsqlite3 \ usr.bin/mandoc -${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3 +${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3 .else _makewhatis=usr.bin/makewhatis .endif @@ -1469,7 +1473,7 @@ bootstrap-tools: .PHONY ${_awk} \ ${_cat} \ usr.bin/lorder \ - ${_libohash} \ + ${_libopenbsd} \ ${_makewhatis} \ usr.bin/rpcgen \ ${_sed} \ Modified: projects/collation/ObsoleteFiles.inc ============================================================================== --- projects/collation/ObsoleteFiles.inc Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/ObsoleteFiles.inc Sat Nov 7 11:02:33 2015 (r290484) @@ -38,7 +38,7 @@ # xargs -n1 | sort | uniq -d; # done -# XXXXX: String collation improvements +# 20151107: String collation improvements OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES @@ -97,6 +97,39 @@ OLD_FILES+=usr/bin/colldef OLD_FILES+=usr/share/man/man1/colldef.1.gz OLD_FILES+=usr/bin/mklocale OLD_FILES+=usr/share/man/man1/mklocale.1.gz +# 20151101: added missing _test suffix on multiple tests in lib/libc +OLD_FILES+=usr/tests/lib/libc/c063/faccessat +OLD_FILES+=usr/tests/lib/libc/c063/fchmodat +OLD_FILES+=usr/tests/lib/libc/c063/fchownat +OLD_FILES+=usr/tests/lib/libc/c063/fexecve +OLD_FILES+=usr/tests/lib/libc/c063/fstatat +OLD_FILES+=usr/tests/lib/libc/c063/linkat +OLD_FILES+=usr/tests/lib/libc/c063/mkdirat +OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat +OLD_FILES+=usr/tests/lib/libc/c063/mknodat +OLD_FILES+=usr/tests/lib/libc/c063/openat +OLD_FILES+=usr/tests/lib/libc/c063/readlinkat +OLD_FILES+=usr/tests/lib/libc/c063/renameat +OLD_FILES+=usr/tests/lib/libc/c063/symlinkat +OLD_FILES+=usr/tests/lib/libc/c063/unlinkat +OLD_FILES+=usr/tests/lib/libc/c063/utimensat +OLD_FILES+=usr/tests/lib/libc/string/memchr +OLD_FILES+=usr/tests/lib/libc/string/memcpy +OLD_FILES+=usr/tests/lib/libc/string/memmem +OLD_FILES+=usr/tests/lib/libc/string/memset +OLD_FILES+=usr/tests/lib/libc/string/strcat +OLD_FILES+=usr/tests/lib/libc/string/strchr +OLD_FILES+=usr/tests/lib/libc/string/strcmp +OLD_FILES+=usr/tests/lib/libc/string/strcpy +OLD_FILES+=usr/tests/lib/libc/string/strcspn +OLD_FILES+=usr/tests/lib/libc/string/strerror +OLD_FILES+=usr/tests/lib/libc/string/strlen +OLD_FILES+=usr/tests/lib/libc/string/strpbrk +OLD_FILES+=usr/tests/lib/libc/string/strrchr +OLD_FILES+=usr/tests/lib/libc/string/strspn +OLD_FILES+=usr/tests/lib/libc/string/swab +# 20151101: 430.status-rwho was renamed to 430.status-uptime +OLD_FILES+=etc/periodic/daily/430.status-rwho # 20151030: OpenSSL 1.0.2d import OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz Modified: projects/collation/bin/rm/rm.1 ============================================================================== --- projects/collation/bin/rm/rm.1 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/rm/rm.1 Sat Nov 7 11:02:33 2015 (r290484) @@ -32,7 +32,7 @@ .\" @(#)rm.1 8.5 (Berkeley) 12/5/94 .\" $FreeBSD$ .\" -.Dd April 25, 2013 +.Dd November 7, 2015 .Dt RM 1 .Os .Sh NAME @@ -234,7 +234,7 @@ not the standard error output. The .Nm command conforms to -.St -p1003.2 . +.St -p1003.1-2013 . .Pp The simplified .Nm unlink Modified: projects/collation/bin/rm/rm.c ============================================================================== --- projects/collation/bin/rm/rm.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/rm/rm.c Sat Nov 7 11:02:33 2015 (r290484) @@ -155,8 +155,7 @@ main(int argc, char *argv[]) } checkdot(argv); - if (getenv("POSIXLY_CORRECT") == NULL) - checkslash(argv); + checkslash(argv); uid = geteuid(); (void)signal(SIGINFO, siginfo); Modified: projects/collation/bin/sh/eval.c ============================================================================== --- projects/collation/bin/sh/eval.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/sh/eval.c Sat Nov 7 11:02:33 2015 (r290484) @@ -750,7 +750,7 @@ isdeclarationcmd(struct narg *arg) } static void -xtracecommand(struct arglist *varlist, struct arglist *arglist) +xtracecommand(struct arglist *varlist, int argc, char **argv) { char sep = 0; const char *text, *p, *ps4; @@ -771,8 +771,8 @@ xtracecommand(struct arglist *varlist, s out2qstr(text); sep = ' '; } - for (i = 0; i < arglist->count; i++) { - text = arglist->args[i]; + for (i = 0; i < argc; i++) { + text = argv[i]; if (sep != 0) out2c(' '); out2qstr(text); @@ -849,6 +849,8 @@ evalcommand(union node *cmd, int flags, do_clearcmdentry = 0; oexitstatus = exitstatus; exitstatus = 0; + /* Add one slot at the beginning for tryexec(). */ + appendarglist(&arglist, nullstr); for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) { if (varflag && isassignment(argp->narg.text)) { expandarg(argp, varflag == 1 ? &varlist : &arglist, @@ -858,13 +860,11 @@ evalcommand(union node *cmd, int flags, varflag = isdeclarationcmd(&argp->narg) ? 2 : 0; expandarg(argp, &arglist, EXP_FULL | EXP_TILDE); } + appendarglist(&arglist, nullstr); expredir(cmd->ncmd.redirect); - argc = arglist.count; - /* Add one slot at the beginning for tryexec(). */ - argv = stalloc(sizeof (char *) * (argc + 2)); - argv++; + argc = arglist.count - 2; + argv = &arglist.args[1]; - memcpy(argv, arglist.args, sizeof(*argv) * argc); argv[argc] = NULL; lastarg = NULL; if (iflag && funcnest == 0 && argc > 0) @@ -872,7 +872,7 @@ evalcommand(union node *cmd, int flags, /* Print the command if xflag is set. */ if (xflag) - xtracecommand(&varlist, &arglist); + xtracecommand(&varlist, argc, argv); /* Now locate the command. */ if (argc == 0) { Modified: projects/collation/bin/sh/expand.c ============================================================================== --- projects/collation/bin/sh/expand.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/sh/expand.c Sat Nov 7 11:02:33 2015 (r290484) @@ -114,7 +114,6 @@ static void expmeta(char *, char *, stru static int expsortcmp(const void *, const void *); static int patmatch(const char *, const char *, int); static char *cvtnum(int, char *); -static void appendarglist(struct arglist *, char *); static int collate_range_cmp(wchar_t, wchar_t); void @@ -126,7 +125,7 @@ emptyarglist(struct arglist *list) list->capacity = sizeof(list->smallarg) / sizeof(list->smallarg[0]); } -static void +void appendarglist(struct arglist *list, char *str) { char **newargs; Modified: projects/collation/bin/sh/expand.h ============================================================================== --- projects/collation/bin/sh/expand.h Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/bin/sh/expand.h Sat Nov 7 11:02:33 2015 (r290484) @@ -52,6 +52,7 @@ struct arglist { void emptyarglist(struct arglist *); +void appendarglist(struct arglist *, char *); union node; void expandarg(union node *, struct arglist *, int); void rmescapes(char *); Modified: projects/collation/contrib/libexecinfo/backtrace.3 ============================================================================== --- projects/collation/contrib/libexecinfo/backtrace.3 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/contrib/libexecinfo/backtrace.3 Sat Nov 7 11:02:33 2015 (r290484) @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 23, 2013 +.Dd November 3, 2015 .Dt BACKTRACE 3 .Os .Sh NAME @@ -47,7 +47,7 @@ .Ft "char **" .Fn backtrace_symbols_fmt "void * const *addrlist" "size_t len" "const char *fmt" .Ft int -.Fn backtrace_symbols_fmt_fd "void * const *addrlist" "size_t len" "const char *fmt" "int fd" +.Fn backtrace_symbols_fd_fmt "void * const *addrlist" "size_t len" "const char *fmt" "int fd" .Sh DESCRIPTION The .Fn backtrace @@ -106,7 +106,7 @@ with a format argument of The .Fn backtrace_symbols_fd and -.Fn backtrace_symbols_fmt_fd +.Fn backtrace_symbols_fd_fmt are similar to the non _fd named functions, only instead of returning an array or strings, they print a new-line separated array of strings in fd, and return Modified: projects/collation/contrib/libxo/libxo/xo_format.5 ============================================================================== --- projects/collation/contrib/libxo/libxo/xo_format.5 Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/contrib/libxo/libxo/xo_format.5 Sat Nov 7 11:02:33 2015 (r290484) @@ -7,7 +7,7 @@ .\" # LICENSE. .\" # Phil Shafer, July 2014 .\" -.Dd December 4, 2014 +.Dd November 6, 2015 .Dt LIBXO 3 .Os .Sh NAME @@ -367,7 +367,7 @@ particular output styles: .It l "leaf-list " "Field is a leaf-list, a list of leaf values" .It n "no-quotes " "Do not quote the field when using JSON style" .It q "quotes " "Quote the field when using JSON style" -.It q "trim " "Trim leading and trailing whitespace" +.It t "trim " "Trim leading and trailing whitespace" .It w "white space " "A blank ("" "") is appended after the label" .El .Pp Modified: projects/collation/etc/defaults/periodic.conf ============================================================================== --- projects/collation/etc/defaults/periodic.conf Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/etc/defaults/periodic.conf Sat Nov 7 11:02:33 2015 (r290484) @@ -115,8 +115,8 @@ daily_status_network_enable="YES" # Ch daily_status_network_usedns="YES" # DNS lookups are ok daily_status_network_netstat_flags="-d" # netstat(1) flags -# 430.status-rwho -daily_status_rwho_enable="YES" # Check system status +# 430.status-uptime +daily_status_uptime_enable="YES" # Check system uptime # 440.status-mailq daily_status_mailq_enable="YES" # Check mail status Copied: projects/collation/etc/periodic/daily/430.status-uptime (from r290483, head/etc/periodic/daily/430.status-uptime) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/collation/etc/periodic/daily/430.status-uptime Sat Nov 7 11:02:33 2015 (r290484, copy of r290483, head/etc/periodic/daily/430.status-uptime) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# If there is a global system configuration file, suck it in. +# +if [ -r /etc/defaults/periodic.conf ] +then + . /etc/defaults/periodic.conf + source_periodic_confs +fi + +case "$daily_status_uptime_enable" in + [Yy][Ee][Ss]) + rwho=$(echo /var/rwho/*) + if [ -f "${rwho%% *}" ] + then + echo "" + echo "Local network system status:" + prog=ruptime + else + echo "" + echo "Local system status:" + prog=uptime + fi + rc=$($prog | tee /dev/stderr | wc -l) + if [ $? -eq 0 ] + then + [ $rc -gt 1 ] && rc=1 + else + rc=3 + fi;; + + *) rc=0;; +esac + +exit $rc Modified: projects/collation/etc/periodic/daily/Makefile ============================================================================== --- projects/collation/etc/periodic/daily/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/etc/periodic/daily/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -15,6 +15,7 @@ FILES= 100.clean-disks \ 408.status-gstripe \ 409.status-gconcat \ 420.status-network \ + 430.status-uptime \ 450.status-security \ 510.status-world-kernel \ 999.local @@ -38,8 +39,7 @@ FILES+= 480.status-ntpd .endif .if ${MK_RCMDS} != "no" -FILES+= 140.clean-rwho \ - 430.status-rwho +FILES+= 140.clean-rwho .endif .if ${MK_SENDMAIL} != "no" Modified: projects/collation/etc/periodic/security/520.pfdenied ============================================================================== --- projects/collation/etc/periodic/security/520.pfdenied Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/etc/periodic/security/520.pfdenied Sat Nov 7 11:02:33 2015 (r290484) @@ -44,7 +44,7 @@ rc=0 if check_yesno_period security_status_pfdenied_enable then TMP=`mktemp -t security` - if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); print buf$0;} }' > ${TMP}; then + if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); if ($5 > 0) print buf$0;} }' > ${TMP}; then check_diff new_only pf ${TMP} "${host} pf denied packets:" fi rc=$? Modified: projects/collation/gnu/usr.bin/grep/savedir.c ============================================================================== --- projects/collation/gnu/usr.bin/grep/savedir.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/gnu/usr.bin/grep/savedir.c Sat Nov 7 11:02:33 2015 (r290484) @@ -71,6 +71,7 @@ char *stpcpy (); #include #include "savedir.h" +#include "system.h" char *path; size_t pathlen; Modified: projects/collation/include/unistd.h ============================================================================== --- projects/collation/include/unistd.h Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/include/unistd.h Sat Nov 7 11:02:33 2015 (r290484) @@ -327,9 +327,9 @@ int close(int); void closefrom(int); int dup(int); int dup2(int, int); -int execl(const char *, const char *, ...) __sentinel; +int execl(const char *, const char *, ...) __null_sentinel; int execle(const char *, const char *, ...); -int execlp(const char *, const char *, ...) __sentinel; +int execlp(const char *, const char *, ...) __null_sentinel; int execv(const char *, char * const *); int execve(const char *, char * const *, char * const *); int execvp(const char *, char * const *); Modified: projects/collation/lib/Makefile ============================================================================== --- projects/collation/lib/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -75,7 +75,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libnetgraph} \ ${_libngatm} \ libnv \ - libohash \ + libopenbsd \ libopie \ libpam \ libpcap \ Modified: projects/collation/lib/libc/net/getnameinfo.c ============================================================================== --- projects/collation/lib/libc/net/getnameinfo.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/net/getnameinfo.c Sat Nov 7 11:02:33 2015 (r290484) @@ -122,7 +122,8 @@ getnameinfo(const struct sockaddr *sa, s afd = find_afd(sa->sa_family); if (afd == NULL) return (EAI_FAMILY); - if (sa->sa_family == PF_LOCAL) { + switch (sa->sa_family) { + case PF_LOCAL: /* * PF_LOCAL uses variable sa->sa_len depending on the * content length of sun_path. Require 1 byte in @@ -132,8 +133,17 @@ getnameinfo(const struct sockaddr *sa, s salen <= afd->a_socklen - sizeofmember(struct sockaddr_un, sun_path)) return (EAI_FAIL); - } else if (salen != afd->a_socklen) - return (EAI_FAIL); + break; + case PF_LINK: + if (salen <= afd->a_socklen - + sizeofmember(struct sockaddr_dl, sdl_data)) + return (EAI_FAIL); + break; + default: + if (salen != afd->a_socklen) + return (EAI_FAIL); + break; + } return ((*afd->a_func)(afd, sa, salen, host, hostlen, serv, servlen, flags)); Modified: projects/collation/lib/libc/rpc/clnt_bcast.c ============================================================================== --- projects/collation/lib/libc/rpc/clnt_bcast.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/clnt_bcast.c Sat Nov 7 11:02:33 2015 (r290484) @@ -636,13 +636,10 @@ rpc_broadcast_exp(rpcprog_t prog, rpcver } /* The giant for loop */ done_broad: - if (inbuf) - (void) free(inbuf); - if (outbuf) - (void) free(outbuf); + free(inbuf); + free(outbuf); #ifdef PORTMAP - if (outbuf_pmap) - (void) free(outbuf_pmap); + free(outbuf_pmap); #endif /* PORTMAP */ for (i = 0; i < fdlistno; i++) { (void)_close(fdlist[i].fd); Modified: projects/collation/lib/libc/rpc/clnt_vc.c ============================================================================== --- projects/collation/lib/libc/rpc/clnt_vc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/clnt_vc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -651,8 +651,7 @@ clnt_vc_destroy(CLIENT *cl) (void)_close(ct->ct_fd); } XDR_DESTROY(&(ct->ct_xdrs)); - if (ct->ct_addr.buf) - free(ct->ct_addr.buf); + free(ct->ct_addr.buf); mem_free(ct, sizeof(struct ct_data)); if (cl->cl_netid && cl->cl_netid[0]) mem_free(cl->cl_netid, strlen(cl->cl_netid) +1); Modified: projects/collation/lib/libc/rpc/getnetconfig.c ============================================================================== --- projects/collation/lib/libc/rpc/getnetconfig.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/getnetconfig.c Sat Nov 7 11:02:33 2015 (r290484) @@ -164,8 +164,7 @@ __nc_error(void) if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) { nc_addr = (int *)malloc(sizeof (int)); if (thr_setspecific(nc_key, (void *) nc_addr) != 0) { - if (nc_addr) - free(nc_addr); + free(nc_addr); return (&nc_error); } *nc_addr = 0; @@ -417,7 +416,7 @@ endnetconfig(void *handlep) while (q != NULL) { p = q->next; - if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups); + free(q->ncp->nc_lookups); free(q->ncp); free(q->linep); free(q); @@ -537,8 +536,7 @@ freenetconfigent(struct netconfig *netco { if (netconfigp != NULL) { free(netconfigp->nc_netid); /* holds all netconfigp's strings */ - if (netconfigp->nc_lookups != NULL) - free(netconfigp->nc_lookups); + free(netconfigp->nc_lookups); free(netconfigp); } return; @@ -628,8 +626,7 @@ parse_ncp(char *stringp, struct netconfi } else { char *cp; /* tmp string */ - if (ncp->nc_lookups != NULL) /* from last visit */ - free(ncp->nc_lookups); + free(ncp->nc_lookups); /* from last visit */ ncp->nc_lookups = NULL; ncp->nc_nlookups = 0; while ((cp = tokenp) != NULL) { Modified: projects/collation/lib/libc/rpc/mt_misc.c ============================================================================== --- projects/collation/lib/libc/rpc/mt_misc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/mt_misc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -106,8 +106,7 @@ __rpc_createerr(void) rce_addr = (struct rpc_createerr *) malloc(sizeof (struct rpc_createerr)); if (thr_setspecific(rce_key, (void *) rce_addr) != 0) { - if (rce_addr) - free(rce_addr); + free(rce_addr); return (&rpc_createerr); } memset(rce_addr, 0, sizeof (struct rpc_createerr)); Modified: projects/collation/lib/libc/rpc/rpc_soc.c ============================================================================== --- projects/collation/lib/libc/rpc/rpc_soc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/rpc_soc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -432,8 +432,7 @@ clntunix_create(struct sockaddr_un *radd if ((raddr->sun_len == 0) || ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) { - if (svcaddr != NULL) - free(svcaddr); + free(svcaddr); rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; return(cl); Modified: projects/collation/lib/libc/rpc/rpcb_clnt.c ============================================================================== --- projects/collation/lib/libc/rpc/rpcb_clnt.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/rpcb_clnt.c Sat Nov 7 11:02:33 2015 (r290484) @@ -179,8 +179,7 @@ delete_cache(struct netbuf *addr) free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) prevptr->ac_next = cptr->ac_next; else @@ -216,14 +215,10 @@ add_cache(const char *host, const char * ad_cache->ac_taddr->buf = (char *) malloc(taddr->len); if (ad_cache->ac_taddr->buf == NULL) { out: - if (ad_cache->ac_host) - free(ad_cache->ac_host); - if (ad_cache->ac_netid) - free(ad_cache->ac_netid); - if (ad_cache->ac_uaddr) - free(ad_cache->ac_uaddr); - if (ad_cache->ac_taddr) - free(ad_cache->ac_taddr); + free(ad_cache->ac_host); + free(ad_cache->ac_netid); + free(ad_cache->ac_uaddr); + free(ad_cache->ac_taddr); free(ad_cache); return; } @@ -256,8 +251,7 @@ out: free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) { prevptr->ac_next = NULL; @@ -798,10 +792,8 @@ __rpcb_findaddr_timed(rpcprog_t program, malloc(remote.len)) == NULL)) { rpc_createerr.cf_stat = RPC_SYSTEMERROR; clnt_geterr(client, &rpc_createerr.cf_error); - if (address) { - free(address); - address = NULL; - } + free(address); + address = NULL; goto error; } memcpy(address->buf, remote.buf, remote.len); Modified: projects/collation/lib/libc/rpc/svc.c ============================================================================== --- projects/collation/lib/libc/rpc/svc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -198,8 +198,7 @@ svc_reg(SVCXPRT *xprt, const rpcprog_t p rwlock_wrlock(&svc_lock); if ((s = svc_find(prog, vers, &prev, netid)) != NULL) { - if (netid) - free(netid); + free(netid); if (s->sc_dispatch == dispatch) goto rpcb_it; /* he is registering another xptr */ rwlock_unlock(&svc_lock); @@ -207,8 +206,7 @@ svc_reg(SVCXPRT *xprt, const rpcprog_t p } s = mem_alloc(sizeof (struct svc_callout)); if (s == NULL) { - if (netid) - free(netid); + free(netid); rwlock_unlock(&svc_lock); return (FALSE); } Modified: projects/collation/lib/libc/rpc/svc_dg.c ============================================================================== --- projects/collation/lib/libc/rpc/svc_dg.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc_dg.c Sat Nov 7 11:02:33 2015 (r290484) @@ -406,8 +406,7 @@ svc_dg_destroy(SVCXPRT *xprt) (void) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); if (xprt->xp_ltaddr.buf) (void) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen); - if (xprt->xp_tp) - (void) free(xprt->xp_tp); + free(xprt->xp_tp); svc_xprt_free(xprt); } Modified: projects/collation/lib/libc/rpc/svc_simple.c ============================================================================== --- projects/collation/lib/libc/rpc/svc_simple.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc_simple.c Sat Nov 7 11:02:33 2015 (r290484) @@ -166,10 +166,8 @@ rpc_reg(rpcprog_t prognum, rpcvers_t ver if (((xdrbuf = malloc((unsigned)recvsz)) == NULL) || ((netid = strdup(nconf->nc_netid)) == NULL)) { warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str); - if (xdrbuf != NULL) - free(xdrbuf); - if (netid != NULL) - free(netid); + free(xdrbuf); + free(netid); SVC_DESTROY(svcxprt); break; } Modified: projects/collation/lib/libc/rpc/svc_vc.c ============================================================================== --- projects/collation/lib/libc/rpc/svc_vc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/rpc/svc_vc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -394,10 +394,8 @@ __svc_vc_dodestroy(SVCXPRT *xprt) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); if (xprt->xp_ltaddr.buf) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen); - if (xprt->xp_tp) - free(xprt->xp_tp); - if (xprt->xp_netid) - free(xprt->xp_netid); + free(xprt->xp_tp); + free(xprt->xp_netid); svc_xprt_free(xprt); } Modified: projects/collation/lib/libc/tests/c063/Makefile ============================================================================== --- projects/collation/lib/libc/tests/c063/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/c063/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -2,21 +2,21 @@ #TODO: t_o_search -NETBSD_ATF_TESTS_C= faccessat -NETBSD_ATF_TESTS_C+= fchmodat -NETBSD_ATF_TESTS_C+= fchownat -NETBSD_ATF_TESTS_C+= fexecve -NETBSD_ATF_TESTS_C+= fstatat -NETBSD_ATF_TESTS_C+= linkat -NETBSD_ATF_TESTS_C+= mkdirat -NETBSD_ATF_TESTS_C+= mkfifoat -NETBSD_ATF_TESTS_C+= mknodat -NETBSD_ATF_TESTS_C+= openat -NETBSD_ATF_TESTS_C+= readlinkat -NETBSD_ATF_TESTS_C+= renameat -NETBSD_ATF_TESTS_C+= symlinkat -NETBSD_ATF_TESTS_C+= unlinkat -NETBSD_ATF_TESTS_C+= utimensat +NETBSD_ATF_TESTS_C= faccessat_test +NETBSD_ATF_TESTS_C+= fchmodat_test +NETBSD_ATF_TESTS_C+= fchownat_test +NETBSD_ATF_TESTS_C+= fexecve_test +NETBSD_ATF_TESTS_C+= fstatat_test +NETBSD_ATF_TESTS_C+= linkat_test +NETBSD_ATF_TESTS_C+= mkdirat_test +NETBSD_ATF_TESTS_C+= mkfifoat_test +NETBSD_ATF_TESTS_C+= mknodat_test +NETBSD_ATF_TESTS_C+= openat_test +NETBSD_ATF_TESTS_C+= readlinkat_test +NETBSD_ATF_TESTS_C+= renameat_test +NETBSD_ATF_TESTS_C+= symlinkat_test +NETBSD_ATF_TESTS_C+= unlinkat_test +NETBSD_ATF_TESTS_C+= utimensat_test CFLAGS+= -D_INCOMPLETE_XOPEN_C063 Modified: projects/collation/lib/libc/tests/setjmp/Makefile ============================================================================== --- projects/collation/lib/libc/tests/setjmp/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/setjmp/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -1,10 +1,10 @@ # $FreeBSD$ -NETBSD_ATF_TESTS_C= t_setjmp -NETBSD_ATF_TESTS_C+= t_threadjmp +NETBSD_ATF_TESTS_C= setjmp_test +NETBSD_ATF_TESTS_C+= threadjmp_test -DPADD.t_threadjmp+= ${LIBPTHREAD} -LDADD.t_threadjmp+= -lpthread +DPADD.threadjmp_test+= ${LIBPTHREAD} +LDADD.threadjmp_test+= -lpthread WARNS?= 4 Modified: projects/collation/lib/libc/tests/string/Makefile ============================================================================== --- projects/collation/lib/libc/tests/string/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/string/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -4,28 +4,28 @@ # TODO: popcount, stresep -NETBSD_ATF_TESTS_C+= memchr -NETBSD_ATF_TESTS_C+= memcpy -NETBSD_ATF_TESTS_C+= memmem -NETBSD_ATF_TESTS_C+= memset -NETBSD_ATF_TESTS_C+= strcat -NETBSD_ATF_TESTS_C+= strchr -NETBSD_ATF_TESTS_C+= strcmp -NETBSD_ATF_TESTS_C+= strcpy -NETBSD_ATF_TESTS_C+= strcspn -NETBSD_ATF_TESTS_C+= strerror -NETBSD_ATF_TESTS_C+= strlen -NETBSD_ATF_TESTS_C+= strpbrk -NETBSD_ATF_TESTS_C+= strrchr -NETBSD_ATF_TESTS_C+= strspn -NETBSD_ATF_TESTS_C+= swab +NETBSD_ATF_TESTS_C+= memchr_test +NETBSD_ATF_TESTS_C+= memcpy_test +NETBSD_ATF_TESTS_C+= memmem_test +NETBSD_ATF_TESTS_C+= memset_test +NETBSD_ATF_TESTS_C+= strcat_test +NETBSD_ATF_TESTS_C+= strchr_test +NETBSD_ATF_TESTS_C+= strcmp_test +NETBSD_ATF_TESTS_C+= strcpy_test +NETBSD_ATF_TESTS_C+= strcspn_test +NETBSD_ATF_TESTS_C+= strerror_test +NETBSD_ATF_TESTS_C+= strlen_test +NETBSD_ATF_TESTS_C+= strpbrk_test +NETBSD_ATF_TESTS_C+= strrchr_test +NETBSD_ATF_TESTS_C+= strspn_test +NETBSD_ATF_TESTS_C+= swab_test .include "../Makefile.netbsd-tests" -LDADD.memchr+= -lmd -DPADD.memchr+= ${LIBMD} +LDADD.memchr_test+= -lmd +DPADD.memchr_test+= ${LIBMD} -LDADD.memcpy+= -lmd -DPADD.memcpy+= ${LIBMD} +LDADD.memcpy_test+= -lmd +DPADD.memcpy_test+= ${LIBMD} .include Modified: projects/collation/lib/libc/tests/tls_dso/Makefile ============================================================================== --- projects/collation/lib/libc/tests/tls_dso/Makefile Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libc/tests/tls_dso/Makefile Sat Nov 7 11:02:33 2015 (r290484) @@ -1,7 +1,5 @@ # $FreeBSD$ -SRCDIR= ${SRCTOP}/contrib/netbsd/ - .include LIB= h_tls_dynamic Modified: projects/collation/lib/libdpv/dialogrc.c ============================================================================== --- projects/collation/lib/libdpv/dialogrc.c Sat Nov 7 04:49:39 2015 (r290483) +++ projects/collation/lib/libdpv/dialogrc.c Sat Nov 7 11:02:33 2015 (r290484) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2013-2014 Devin Teske + * Copyright (c) 2013-2015 Devin Teske * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -49,58 +49,58 @@ char gauge_color[STR_BUFSIZE] = "47b"; / char separator[STR_BUFSIZE] = ""; /* Function prototypes */ -static int setattr(struct fp_config *, uint32_t, char *, char *); -static int setbool(struct fp_config *, uint32_t, char *, char *); -static int setnum(struct fp_config *, uint32_t, char *, char *); -static int setstr(struct fp_config *, uint32_t, char *, char *); +static int setattr(struct figpar_config *, uint32_t, char *, char *); +static int setbool(struct figpar_config *, uint32_t, char *, char *); +static int setnum(struct figpar_config *, uint32_t, char *, char *); +static int setstr(struct figpar_config *, uint32_t, char *, char *); /* * Anatomy of DIALOGRC (~/.dialogrc by default) * NOTE: Must appear after private function prototypes (above) * NB: Brace-initialization of union requires cast to *first* member of union */ -static struct fp_config dialogrc_config[] = { - /* TYPE Directive DEFAULT HANDLER */ - {FP_TYPE_INT, "aspect", {(void *)0}, &setnum}, - {FP_TYPE_STR, "separate_widget", {separator}, &setstr}, - {FP_TYPE_INT, "tab_len", {(void *)0}, &setnum}, - {FP_TYPE_BOOL, "visit_items", {(void *)0}, &setbool}, - {FP_TYPE_BOOL, "use_shadow", {(void *)1}, &setbool}, - {FP_TYPE_BOOL, "use_colors", {(void *)1}, &setbool}, - {FP_TYPE_STR, "screen_color", {NULL}, &setattr}, - {FP_TYPE_STR, "shadow_color", {NULL}, &setattr}, - {FP_TYPE_STR, "dialog_color", {NULL}, &setattr}, - {FP_TYPE_STR, "title_color", {NULL}, &setattr}, - {FP_TYPE_STR, "border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_active_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_inactive_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_key_active_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_key_inactive_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_label_active_color", {NULL}, &setattr}, - {FP_TYPE_STR, "button_label_inactive_color",{NULL}, &setattr}, - {FP_TYPE_STR, "inputbox_color", {NULL}, &setattr}, - {FP_TYPE_STR, "inputbox_border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "searchbox_color", {NULL}, &setattr}, - {FP_TYPE_STR, "searchbox_title_color", {NULL}, &setattr}, - {FP_TYPE_STR, "searchbox_border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "position_indicator_color", {NULL}, &setattr}, - {FP_TYPE_STR, "menubox_color", {NULL}, &setattr}, - {FP_TYPE_STR, "menubox_border_color", {NULL}, &setattr}, - {FP_TYPE_STR, "item_color", {NULL}, &setattr}, - {FP_TYPE_STR, "item_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_key_color", {NULL}, &setattr}, - {FP_TYPE_STR, "tag_key_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "check_color", {NULL}, &setattr}, - {FP_TYPE_STR, "check_selected_color", {NULL}, &setattr}, - {FP_TYPE_STR, "uarrow_color", {NULL}, &setattr}, - {FP_TYPE_STR, "darrow_color", {NULL}, &setattr}, - {FP_TYPE_STR, "itemhelp_color", {NULL}, &setattr}, - {FP_TYPE_STR, "form_active_text_color", {NULL}, &setattr}, - {FP_TYPE_STR, "form_text_color", {NULL}, &setattr}, - {FP_TYPE_STR, "form_item_readonly_color", {NULL}, &setattr}, - {FP_TYPE_STR, "gauge_color", {gauge_color}, &setattr}, +static struct figpar_config dialogrc_config[] = { + /* TYPE DIRECTIVE DEFAULT HANDLER */ + {FIGPAR_TYPE_INT, "aspect", {(void *)0}, &setnum}, + {FIGPAR_TYPE_STR, "separate_widget", {separator}, &setstr}, + {FIGPAR_TYPE_INT, "tab_len", {(void *)0}, &setnum}, + {FIGPAR_TYPE_BOOL, "visit_items", {(void *)0}, &setbool}, + {FIGPAR_TYPE_BOOL, "use_shadow", {(void *)1}, &setbool}, + {FIGPAR_TYPE_BOOL, "use_colors", {(void *)1}, &setbool}, *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Sat Nov 7 11:08:20 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CCC7A27E68 for ; Sat, 7 Nov 2015 11:08:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2F2E514E2; Sat, 7 Nov 2015 11:08:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7B8J0x005481; Sat, 7 Nov 2015 11:08:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7B8Jm0005480; Sat, 7 Nov 2015 11:08:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511071108.tA7B8Jm0005480@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 11:08:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290485 - projects/collation/usr.bin/localedef X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 11:08:20 -0000 Author: bapt Date: Sat Nov 7 11:08:19 2015 New Revision: 290485 URL: https://svnweb.freebsd.org/changeset/base/290485 Log: Fix typo Modified: projects/collation/usr.bin/localedef/wide.c Modified: projects/collation/usr.bin/localedef/wide.c ============================================================================== --- projects/collation/usr.bin/localedef/wide.c Sat Nov 7 11:02:33 2015 (r290484) +++ projects/collation/usr.bin/localedef/wide.c Sat Nov 7 11:08:19 2015 (r290485) @@ -644,7 +644,8 @@ set_wide_encoding(const char *encoding) _tomb = tomb_none; _nbits = 8; - snprint(_encoding_buffer, sizeof(_encoding_buffer), "NONE:%s", encoding); + snprintf(_encoding_buffer, sizeof(_encoding_buffer), "NONE:%s", + encoding); for (i = 0; mb_encodings[i].name; i++) { if (strcasecmp(encoding, mb_encodings[i].name) == 0) { _towide = mb_encodings[i].towide; From owner-svn-src-projects@freebsd.org Sat Nov 7 11:26:15 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96A04A27523 for ; Sat, 7 Nov 2015 11:26:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 60F841361; Sat, 7 Nov 2015 11:26:15 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7BQEKL011365; Sat, 7 Nov 2015 11:26:14 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7BQETi011364; Sat, 7 Nov 2015 11:26:14 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511071126.tA7BQETi011364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 11:26:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290487 - projects/collation/share/locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 11:26:15 -0000 Author: bapt Date: Sat Nov 7 11:26:14 2015 New Revision: 290487 URL: https://svnweb.freebsd.org/changeset/base/290487 Log: Readd LOCALEDIR definition removed by accident Modified: projects/collation/share/locale-links/Makefile Modified: projects/collation/share/locale-links/Makefile ============================================================================== --- projects/collation/share/locale-links/Makefile Sat Nov 7 11:12:00 2015 (r290486) +++ projects/collation/share/locale-links/Makefile Sat Nov 7 11:26:14 2015 (r290487) @@ -1,3 +1,6 @@ +# $FreeBSD$ + +LOCALEDIR= ${SHAREDIR}/locale # We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some # of the lang catalogs use zh_CN still (e.g. vi), plus people may expect it From owner-svn-src-projects@freebsd.org Sat Nov 7 11:28:27 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3D9DA275B9 for ; Sat, 7 Nov 2015 11:28:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 740B21568; Sat, 7 Nov 2015 11:28:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7BSPqZ011490; Sat, 7 Nov 2015 11:28:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7BSPR2011489; Sat, 7 Nov 2015 11:28:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511071128.tA7BSPR2011489@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 11:28:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290488 - projects/collation/tools/build/mk X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 11:28:27 -0000 Author: bapt Date: Sat Nov 7 11:28:25 2015 New Revision: 290488 URL: https://svnweb.freebsd.org/changeset/base/290488 Log: Catchup with latest changes for ObsoleteFiles in case base is built using WITHOUT_LOCALE knob Modified: projects/collation/tools/build/mk/OptionalObsoleteFiles.inc Modified: projects/collation/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/collation/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 7 11:26:14 2015 (r290487) +++ projects/collation/tools/build/mk/OptionalObsoleteFiles.inc Sat Nov 7 11:28:25 2015 (r290488) @@ -4237,8 +4237,6 @@ OLD_DIRS+=usr/include/c++/v1 #.endif .if ${MK_LOCALES} == no -OLD_FILES+=usr/share/locale/af_ZA -OLD_FILES+=usr/share/locale/af_ZA.ISO-8859-15@euro OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES @@ -4257,17 +4255,12 @@ OLD_FILES+=usr/share/locale/af_ZA.UTF-8/ OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/af_ZA.UTF8 -OLD_FILES+=usr/share/locale/af_ZA@euro -OLD_FILES+=usr/share/locale/am_ET OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/am_ET.UTF8 -OLD_FILES+=usr/share/locale/be_BY OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES @@ -4292,8 +4285,6 @@ OLD_FILES+=usr/share/locale/be_BY.UTF-8/ OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/be_BY.UTF8 -OLD_FILES+=usr/share/locale/bg_BG OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_COLLATE OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_CTYPE OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MESSAGES @@ -4306,9 +4297,6 @@ OLD_FILES+=usr/share/locale/bg_BG.UTF-8/ OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/bg_BG.UTF8 -OLD_FILES+=usr/share/locale/ca_AD -OLD_FILES+=usr/share/locale/ca_AD.ISO-8859-15@euro OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES @@ -4327,10 +4315,6 @@ OLD_FILES+=usr/share/locale/ca_AD.UTF-8/ OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ca_AD.UTF8 -OLD_FILES+=usr/share/locale/ca_AD@euro -OLD_FILES+=usr/share/locale/ca_ES -OLD_FILES+=usr/share/locale/ca_ES.ISO-8859-15@euro OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES @@ -4349,10 +4333,6 @@ OLD_FILES+=usr/share/locale/ca_ES.UTF-8/ OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ca_ES.UTF8 -OLD_FILES+=usr/share/locale/ca_ES@euro -OLD_FILES+=usr/share/locale/ca_FR -OLD_FILES+=usr/share/locale/ca_FR.ISO-8859-15@euro OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES @@ -4371,10 +4351,6 @@ OLD_FILES+=usr/share/locale/ca_FR.UTF-8/ OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ca_FR.UTF8 -OLD_FILES+=usr/share/locale/ca_FR@euro -OLD_FILES+=usr/share/locale/ca_IT -OLD_FILES+=usr/share/locale/ca_IT.ISO-8859-15@euro OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES @@ -4393,9 +4369,6 @@ OLD_FILES+=usr/share/locale/ca_IT.UTF-8/ OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ca_IT.UTF8 -OLD_FILES+=usr/share/locale/ca_IT@euro -OLD_FILES+=usr/share/locale/cs_CZ OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_CTYPE OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES @@ -4408,9 +4381,6 @@ OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/ OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/cs_CZ.UTF8 -OLD_FILES+=usr/share/locale/da_DK -OLD_FILES+=usr/share/locale/da_DK.ISO-8859-15@euro OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES @@ -4429,10 +4399,6 @@ OLD_FILES+=usr/share/locale/da_DK.UTF-8/ OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/da_DK.UTF8 -OLD_FILES+=usr/share/locale/da_DK@euro -OLD_FILES+=usr/share/locale/de_AT -OLD_FILES+=usr/share/locale/de_AT.ISO-8859-15@euro OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES @@ -4451,10 +4417,6 @@ OLD_FILES+=usr/share/locale/de_AT.UTF-8/ OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/de_AT.UTF8 -OLD_FILES+=usr/share/locale/de_AT@euro -OLD_FILES+=usr/share/locale/de_CH -OLD_FILES+=usr/share/locale/de_CH.ISO-8859-15@euro OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES @@ -4473,10 +4435,6 @@ OLD_FILES+=usr/share/locale/de_CH.UTF-8/ OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/de_CH.UTF8 -OLD_FILES+=usr/share/locale/de_CH@euro -OLD_FILES+=usr/share/locale/de_DE -OLD_FILES+=usr/share/locale/de_DE.ISO-8859-15@euro OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES @@ -4495,9 +4453,6 @@ OLD_FILES+=usr/share/locale/de_DE.UTF-8/ OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/de_DE.UTF8 -OLD_FILES+=usr/share/locale/de_DE@euro -OLD_FILES+=usr/share/locale/el_GR OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_COLLATE OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_CTYPE OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES @@ -4510,9 +4465,6 @@ OLD_FILES+=usr/share/locale/el_GR.UTF-8/ OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/el_GR.UTF8 -OLD_FILES+=usr/share/locale/en_AU -OLD_FILES+=usr/share/locale/en_AU.ISO-8859-15@euro OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES @@ -4537,10 +4489,6 @@ OLD_FILES+=usr/share/locale/en_AU.UTF-8/ OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_AU.UTF8 -OLD_FILES+=usr/share/locale/en_AU@euro -OLD_FILES+=usr/share/locale/en_CA -OLD_FILES+=usr/share/locale/en_CA.ISO-8859-15@euro OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES @@ -4565,10 +4513,6 @@ OLD_FILES+=usr/share/locale/en_CA.UTF-8/ OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_CA.UTF8 -OLD_FILES+=usr/share/locale/en_CA@euro -OLD_FILES+=usr/share/locale/en_GB -OLD_FILES+=usr/share/locale/en_GB.ISO-8859-15@euro OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES @@ -4593,9 +4537,6 @@ OLD_FILES+=usr/share/locale/en_GB.UTF-8/ OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_GB.UTF8 -OLD_FILES+=usr/share/locale/en_GB@euro -OLD_FILES+=usr/share/locale/en_HK OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_MESSAGES @@ -4608,17 +4549,12 @@ OLD_FILES+=usr/share/locale/en_HK.UTF-8/ OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_HK.UTF8 -OLD_FILES+=usr/share/locale/en_IE OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MESSAGES OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_IE.UTF8 -OLD_FILES+=usr/share/locale/en_NZ -OLD_FILES+=usr/share/locale/en_NZ.ISO-8859-15@euro OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES @@ -4643,9 +4579,6 @@ OLD_FILES+=usr/share/locale/en_NZ.UTF-8/ OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_NZ.UTF8 -OLD_FILES+=usr/share/locale/en_NZ@euro -OLD_FILES+=usr/share/locale/en_PH OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_PH.ISO8859-1/LC_MESSAGES @@ -4658,8 +4591,6 @@ OLD_FILES+=usr/share/locale/en_PH.UTF-8/ OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_PH.UTF8 -OLD_FILES+=usr/share/locale/en_SG OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_MESSAGES @@ -4672,11 +4603,8 @@ OLD_FILES+=usr/share/locale/en_SG.UTF-8/ OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_SG.UTF8 -OLD_FILES+=usr/share/locale/en_US OLD_FILES+=usr/share/locale/en_US.ISO-8859-1 OLD_FILES+=usr/share/locale/en_US.ISO-8859-15 -OLD_FILES+=usr/share/locale/en_US.ISO-8859-15@euro OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES @@ -4701,10 +4629,6 @@ OLD_FILES+=usr/share/locale/en_US.UTF-8/ OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_US.UTF8 -OLD_FILES+=usr/share/locale/en_US@euro -OLD_FILES+=usr/share/locale/en_ZA -OLD_FILES+=usr/share/locale/en_ZA.ISO-8859-15@euro OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MESSAGES @@ -4729,8 +4653,6 @@ OLD_FILES+=usr/share/locale/en_ZA.UTF-8/ OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/en_ZA@euro -OLD_FILES+=usr/share/locale/es_AR OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_MESSAGES @@ -4743,8 +4665,6 @@ OLD_FILES+=usr/share/locale/es_AR.UTF-8/ OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/es_AR.UTF8 -OLD_FILES+=usr/share/locale/es_CR OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/es_CR.ISO8859-1/LC_MESSAGES @@ -4757,9 +4677,6 @@ OLD_FILES+=usr/share/locale/es_CR.UTF-8/ OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/es_CR.UTF8 -OLD_FILES+=usr/share/locale/es_ES -OLD_FILES+=usr/share/locale/es_ES.ISO-8859-15@euro OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES @@ -4778,9 +4695,6 @@ OLD_FILES+=usr/share/locale/es_ES.UTF-8/ OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/es_ES.UTF8 -OLD_FILES+=usr/share/locale/es_ES@euro -OLD_FILES+=usr/share/locale/es_MX OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_MESSAGES @@ -4793,9 +4707,6 @@ OLD_FILES+=usr/share/locale/es_MX.UTF-8/ OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/es_MX.UTF8 -OLD_FILES+=usr/share/locale/et_EE -OLD_FILES+=usr/share/locale/et_EE.ISO-8859-15@euro OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_COLLATE OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_CTYPE OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES @@ -4808,10 +4719,6 @@ OLD_FILES+=usr/share/locale/et_EE.UTF-8/ OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/et_EE.UTF8 -OLD_FILES+=usr/share/locale/et_EE@euro -OLD_FILES+=usr/share/locale/eu_ES -OLD_FILES+=usr/share/locale/eu_ES.ISO-8859-15@euro OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES @@ -4830,10 +4737,6 @@ OLD_FILES+=usr/share/locale/eu_ES.UTF-8/ OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/eu_ES.UTF8 -OLD_FILES+=usr/share/locale/eu_ES@euro -OLD_FILES+=usr/share/locale/fi_FI -OLD_FILES+=usr/share/locale/fi_FI.ISO-8859-15@euro OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES @@ -4852,10 +4755,6 @@ OLD_FILES+=usr/share/locale/fi_FI.UTF-8/ OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/fi_FI.UTF8 -OLD_FILES+=usr/share/locale/fi_FI@euro -OLD_FILES+=usr/share/locale/fr_BE -OLD_FILES+=usr/share/locale/fr_BE.ISO-8859-15@euro OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES @@ -4875,9 +4774,7 @@ OLD_FILES+=usr/share/locale/fr_BE.UTF-8/ OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_TIME OLD_FILES+=usr/share/locale/fr_BE.UTF8 -OLD_FILES+=usr/share/locale/fr_BE@euro OLD_FILES+=usr/share/locale/fr_CA -OLD_FILES+=usr/share/locale/fr_CA.ISO-8859-15@euro OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES @@ -4918,10 +4815,6 @@ OLD_FILES+=usr/share/locale/fr_CH.UTF-8/ OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/fr_CH.UTF8 -OLD_FILES+=usr/share/locale/fr_CH@euro -OLD_FILES+=usr/share/locale/fr_FR -OLD_FILES+=usr/share/locale/fr_FR.ISO-8859-15@euro OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES @@ -4940,17 +4833,12 @@ OLD_FILES+=usr/share/locale/fr_FR.UTF-8/ OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/fr_FR.UTF8 -OLD_FILES+=usr/share/locale/fr_FR@euro -OLD_FILES+=usr/share/locale/he_IL OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MESSAGES OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/he_IL.UTF8 -OLD_FILES+=usr/share/locale/hi_IN OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_COLLATE OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_CTYPE OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MESSAGES @@ -4963,8 +4851,6 @@ OLD_FILES+=usr/share/locale/hi_IN.UTF-8/ OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/hi_IN.UTF8 -OLD_FILES+=usr/share/locale/hr_HR OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MESSAGES @@ -4977,8 +4863,6 @@ OLD_FILES+=usr/share/locale/hr_HR.UTF-8/ OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/hr_HR.UTF8 -OLD_FILES+=usr/share/locale/hu_HU OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES @@ -4991,8 +4875,6 @@ OLD_FILES+=usr/share/locale/hu_HU.UTF-8/ OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/hu_HU.UTF8 -OLD_FILES+=usr/share/locale/hy_AM OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_COLLATE OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES @@ -5005,9 +4887,6 @@ OLD_FILES+=usr/share/locale/hy_AM.UTF-8/ OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/hy_AM.UTF8 -OLD_FILES+=usr/share/locale/is_IS -OLD_FILES+=usr/share/locale/is_IS.ISO-8859-15@euro OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES @@ -5026,10 +4905,6 @@ OLD_FILES+=usr/share/locale/is_IS.UTF-8/ OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/is_IS.UTF8 -OLD_FILES+=usr/share/locale/is_IS@euro -OLD_FILES+=usr/share/locale/it_CH -OLD_FILES+=usr/share/locale/it_CH.ISO-8859-15@euro OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES @@ -5048,10 +4923,6 @@ OLD_FILES+=usr/share/locale/it_CH.UTF-8/ OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/it_CH.UTF8 -OLD_FILES+=usr/share/locale/it_CH@euro -OLD_FILES+=usr/share/locale/it_IT -OLD_FILES+=usr/share/locale/it_IT.ISO-8859-15@euro OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES @@ -5070,9 +4941,6 @@ OLD_FILES+=usr/share/locale/it_IT.UTF-8/ OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/it_IT.UTF8 -OLD_FILES+=usr/share/locale/it_IT@euro -OLD_FILES+=usr/share/locale/ja_JP OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_COLLATE OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_CTYPE OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MESSAGES @@ -5085,25 +4953,18 @@ OLD_FILES+=usr/share/locale/ja_JP.UTF-8/ OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ja_JP.UTF8 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_COLLATE OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_TIME -OLD_FILES+=usr/share/locale/ja_JP.eucjp -OLD_FILES+=usr/share/locale/kk_Cyrl_KZ OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF8 -OLD_FILES+=usr/share/locale/kk_KZ -OLD_FILES+=usr/share/locale/kk_KZ.UTF8 -OLD_FILES+=usr/share/locale/ko_KR OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_COLLATE OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_CTYPE OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES @@ -5116,14 +4977,12 @@ OLD_FILES+=usr/share/locale/ko_KR.UTF-8/ OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ko_KR.UTF8 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_COLLATE OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_CTYPE OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MESSAGES OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MONETARY OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_NUMERIC OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_TIME -OLD_FILES+=usr/share/locale/lt_LT OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_COLLATE OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES @@ -5142,8 +5001,6 @@ OLD_FILES+=usr/share/locale/lt_LT.UTF-8/ OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/lt_LT.UTF8 -OLD_FILES+=usr/share/locale/lv_LV OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_COLLATE OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_CTYPE OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MESSAGES @@ -5156,17 +5013,12 @@ OLD_FILES+=usr/share/locale/lv_LV.UTF-8/ OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/lv_LV.UTF8 -OLD_FILES+=usr/share/locale/mn_Cyrl_MN OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF8 -OLD_FILES+=usr/share/locale/nb_NO -OLD_FILES+=usr/share/locale/nb_NO.ISO-8859-15@euro OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES @@ -5185,10 +5037,6 @@ OLD_FILES+=usr/share/locale/nb_NO.UTF-8/ OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/nb_NO.UTF8 -OLD_FILES+=usr/share/locale/nb_NO@euro -OLD_FILES+=usr/share/locale/nl_BE -OLD_FILES+=usr/share/locale/nl_BE.ISO-8859-15@euro OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES @@ -5207,10 +5055,6 @@ OLD_FILES+=usr/share/locale/nl_BE.UTF-8/ OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/nl_BE.UTF8 -OLD_FILES+=usr/share/locale/nl_BE@euro -OLD_FILES+=usr/share/locale/nl_NL -OLD_FILES+=usr/share/locale/nl_NL.ISO-8859-15@euro OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES @@ -5229,10 +5073,6 @@ OLD_FILES+=usr/share/locale/nl_NL.UTF-8/ OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/nl_NL.UTF8 -OLD_FILES+=usr/share/locale/nl_NL@euro -OLD_FILES+=usr/share/locale/nn_NO -OLD_FILES+=usr/share/locale/nn_NO.ISO-8859-15@euro OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES @@ -5251,9 +5091,6 @@ OLD_FILES+=usr/share/locale/nn_NO.UTF-8/ OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/nn_NO.UTF8 -OLD_FILES+=usr/share/locale/nn_NO@euro -OLD_FILES+=usr/share/locale/pl_PL OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_CTYPE OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MESSAGES @@ -5266,9 +5103,6 @@ OLD_FILES+=usr/share/locale/pl_PL.UTF-8/ OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/pl_PL.UTF8 -OLD_FILES+=usr/share/locale/pt_BR -OLD_FILES+=usr/share/locale/pt_BR.ISO-8859-15@euro OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES @@ -5287,10 +5121,6 @@ OLD_FILES+=usr/share/locale/pt_BR.UTF-8/ OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/pt_BR.UTF8 -OLD_FILES+=usr/share/locale/pt_BR@euro -OLD_FILES+=usr/share/locale/pt_PT -OLD_FILES+=usr/share/locale/pt_PT.ISO-8859-15@euro OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES @@ -5309,9 +5139,6 @@ OLD_FILES+=usr/share/locale/pt_PT.UTF-8/ OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/pt_PT.UTF8 -OLD_FILES+=usr/share/locale/pt_PT@euro -OLD_FILES+=usr/share/locale/ro_RO OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_CTYPE OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MESSAGES @@ -5324,8 +5151,6 @@ OLD_FILES+=usr/share/locale/ro_RO.UTF-8/ OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ro_RO.UTF8 -OLD_FILES+=usr/share/locale/ru_RU OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_COLLATE OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_CTYPE OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MESSAGES @@ -5356,24 +5181,18 @@ OLD_FILES+=usr/share/locale/ru_RU.UTF-8/ OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/ru_RU.UTF8 -OLD_FILES+=usr/share/locale/se_FI OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MESSAGES OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/se_FI.UTF8 -OLD_FILES+=usr/share/locale/se_NO OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_COLLATE OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_CTYPE OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MESSAGES OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/se_NO.UTF8 -OLD_FILES+=usr/share/locale/sk_SK OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_CTYPE OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MESSAGES @@ -5386,8 +5205,6 @@ OLD_FILES+=usr/share/locale/sk_SK.UTF-8/ OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/sk_SK.UTF8 -OLD_FILES+=usr/share/locale/sl_SI OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_COLLATE OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_CTYPE OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MESSAGES @@ -5400,8 +5217,6 @@ OLD_FILES+=usr/share/locale/sl_SI.UTF-8/ OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/sl_SI.UTF8 -OLD_FILES+=usr/share/locale/sr_Cyrl_RS OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES @@ -5414,8 +5229,6 @@ OLD_FILES+=usr/share/locale/sr_Cyrl_RS.U OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF8 -OLD_FILES+=usr/share/locale/sr_Latn_RS 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 @@ -5428,9 +5241,6 @@ OLD_FILES+=usr/share/locale/sr_Latn_RS.U 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_FILES+=usr/share/locale/sr_Latn_RS.UTF8 -OLD_FILES+=usr/share/locale/sv_FI -OLD_FILES+=usr/share/locale/sv_FI.ISO-8859-15@euro OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MESSAGES @@ -5449,10 +5259,6 @@ OLD_FILES+=usr/share/locale/sv_FI.UTF-8/ OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/sv_FI.UTF8 -OLD_FILES+=usr/share/locale/sv_FI@euro -OLD_FILES+=usr/share/locale/sv_SE -OLD_FILES+=usr/share/locale/sv_SE.ISO-8859-15@euro OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES @@ -5471,9 +5277,6 @@ OLD_FILES+=usr/share/locale/sv_SE.UTF-8/ OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/sv_SE.UTF8 -OLD_FILES+=usr/share/locale/sv_SE@euro -OLD_FILES+=usr/share/locale/tr_TR OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_COLLATE OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_CTYPE OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MESSAGES @@ -5486,8 +5289,6 @@ OLD_FILES+=usr/share/locale/tr_TR.UTF-8/ OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/tr_TR.UTF8 -OLD_FILES+=usr/share/locale/uk_UA OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_COLLATE OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_CTYPE OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MESSAGES @@ -5512,13 +5313,13 @@ OLD_FILES+=usr/share/locale/uk_UA.UTF-8/ OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MONETARY OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_NUMERIC OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_TIME -OLD_FILES+=usr/share/locale/uk_UA.UTF8 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312 OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8 OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN -OLD_FILES+=usr/share/locale/zh_Hans_CN +OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS +OLD_FILES+=usr/share/locale/zh_HK.UTF-8 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 @@ -5543,14 +5344,12 @@ OLD_FILES+=usr/share/locale/zh_Hans_CN.U 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_FILES+=usr/share/locale/zh_Hans_CN.UTF8 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_FILES+=usr/share/locale/zh_Hant_HK OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_COLLATE OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_CTYPE OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MESSAGES @@ -5563,8 +5362,6 @@ OLD_FILES+=usr/share/locale/zh_Hant_HK.U 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_FILES+=usr/share/locale/zh_Hant_HK.UTF8 -OLD_FILES+=usr/share/locale/zh_Hant_TW 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 @@ -5577,7 +5374,8 @@ OLD_FILES+=usr/share/locale/zh_Hant_TW.U 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_FILES+=usr/share/locale/zh_Hant_TW.UTF8 +OLD_FILES+=usr/share/locale/zh_TW.Big5 +OLD_FILES+=usr/share/locale/zh_TW.UTF-8 .endif .if ${MK_LOCATE} == no From owner-svn-src-projects@freebsd.org Sat Nov 7 12:11:19 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 139BCA2856E for ; Sat, 7 Nov 2015 12:11:19 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0CB21F80; Sat, 7 Nov 2015 12:11:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7CBHHj025513; Sat, 7 Nov 2015 12:11:17 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7CBH9p025512; Sat, 7 Nov 2015 12:11:17 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511071211.tA7CBH9p025512@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 12:11:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290490 - projects/collation/usr.bin/localedef X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 12:11:19 -0000 Author: bapt Date: Sat Nov 7 12:11:17 2015 New Revision: 290490 URL: https://svnweb.freebsd.org/changeset/base/290490 Log: Add missing header Modified: projects/collation/usr.bin/localedef/wide.c Modified: projects/collation/usr.bin/localedef/wide.c ============================================================================== --- projects/collation/usr.bin/localedef/wide.c Sat Nov 7 11:40:35 2015 (r290489) +++ projects/collation/usr.bin/localedef/wide.c Sat Nov 7 12:11:17 2015 (r290490) @@ -37,6 +37,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include From owner-svn-src-projects@freebsd.org Sat Nov 7 17:55:52 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1FFFCA28979 for ; Sat, 7 Nov 2015 17:55:52 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C4FCD1B6C; Sat, 7 Nov 2015 17:55:51 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7HtoOV027062; Sat, 7 Nov 2015 17:55:50 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7Htoee027061; Sat, 7 Nov 2015 17:55:50 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511071755.tA7Htoee027061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 17:55:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290502 - projects/mpsutil X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 17:55:52 -0000 Author: bapt Date: Sat Nov 7 17:55:50 2015 New Revision: 290502 URL: https://svnweb.freebsd.org/changeset/base/290502 Log: Remove branch mpsutil, it has been merged into head Deleted: projects/mpsutil/ From owner-svn-src-projects@freebsd.org Sat Nov 7 17:56:16 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA9E8A2899A for ; Sat, 7 Nov 2015 17:56:16 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 98CBD1C6F; Sat, 7 Nov 2015 17:56:16 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7HuF7G027123; Sat, 7 Nov 2015 17:56:15 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7HuFSg027122; Sat, 7 Nov 2015 17:56:15 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511071756.tA7HuFSg027122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 7 Nov 2015 17:56:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290503 - projects/collation X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 17:56:17 -0000 Author: bapt Date: Sat Nov 7 17:56:15 2015 New Revision: 290503 URL: https://svnweb.freebsd.org/changeset/base/290503 Log: Remove collation branch as it has been merged into head Deleted: projects/collation/