From owner-svn-src-user@freebsd.org Wed Nov 18 23:45:13 2015 Return-Path: Delivered-To: svn-src-user@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 7F109A32E2A for ; Wed, 18 Nov 2015 23:45:13 +0000 (UTC) (envelope-from ngie@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 22ECC156A; Wed, 18 Nov 2015 23:45:13 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAINjCFK010665; Wed, 18 Nov 2015 23:45:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAINjA5l010643; Wed, 18 Nov 2015 23:45:10 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511182345.tAINjA5l010643@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 18 Nov 2015 23:45:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291039 - in user/ngie/more-tests2: . bin/sh bin/sh/tests/parameters crypto/openssl/doc/crypto etc etc/mtree include lib/libcrypt/tests lib/libpmc sbin secure/lib/libcrypto secure/lib/l... X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2015 23:45:13 -0000 Author: ngie Date: Wed Nov 18 23:45:09 2015 New Revision: 291039 URL: https://svnweb.freebsd.org/changeset/base/291039 Log: MFhead @ r291038 Added: user/ngie/more-tests2/bin/sh/tests/parameters/positional8.0 - copied unchanged from r291038, head/bin/sh/tests/parameters/positional8.0 user/ngie/more-tests2/share/ctypedef/en_US.ISO8859-1.src - copied unchanged from r291038, head/share/ctypedef/en_US.ISO8859-1.src user/ngie/more-tests2/share/monetdef/en_ZA.ISO8859-15.src - copied unchanged from r291038, head/share/monetdef/en_ZA.ISO8859-15.src user/ngie/more-tests2/share/monetdef/fr_CA.ISO8859-15.src - copied unchanged from r291038, head/share/monetdef/fr_CA.ISO8859-15.src user/ngie/more-tests2/share/timedef/fr_CA.ISO8859-15.src - copied unchanged from r291038, head/share/timedef/fr_CA.ISO8859-15.src user/ngie/more-tests2/sys/mips/conf/AP143 - copied unchanged from r291038, head/sys/mips/conf/AP143 user/ngie/more-tests2/sys/mips/conf/AP143.hints - copied unchanged from r291038, head/sys/mips/conf/AP143.hints user/ngie/more-tests2/sys/mips/conf/ONIONOMEGA - copied unchanged from r291038, head/sys/mips/conf/ONIONOMEGA user/ngie/more-tests2/sys/mips/conf/ONIONOMEGA.hints - copied unchanged from r291038, head/sys/mips/conf/ONIONOMEGA.hints user/ngie/more-tests2/sys/mips/conf/QCA953X_BASE - copied unchanged from r291038, head/sys/mips/conf/QCA953X_BASE user/ngie/more-tests2/sys/mips/conf/QCA953X_BASE.hints - copied unchanged from r291038, head/sys/mips/conf/QCA953X_BASE.hints user/ngie/more-tests2/usr.sbin/mpsutil/mps_flash.c - copied unchanged from r291038, head/usr.sbin/mpsutil/mps_flash.c user/ngie/more-tests2/usr.sbin/ypldap/ - copied from r291038, head/usr.sbin/ypldap/ Deleted: user/ngie/more-tests2/secure/lib/libcrypto/man/SSLeay_version.3 user/ngie/more-tests2/share/ctypedef/en_GB.ISO8859-15.src user/ngie/more-tests2/share/monetdef/en_ZA.ISO8859-1.src user/ngie/more-tests2/share/monetdef/fr_CA.ISO8859-1.src user/ngie/more-tests2/share/timedef/fr_CA.ISO8859-1.src Modified: user/ngie/more-tests2/MAINTAINERS (contents, props changed) user/ngie/more-tests2/Makefile.inc1 user/ngie/more-tests2/ObsoleteFiles.inc user/ngie/more-tests2/UPDATING user/ngie/more-tests2/bin/sh/expand.c user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_EncryptInit.pod user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod user/ngie/more-tests2/etc/Makefile user/ngie/more-tests2/etc/mtree/BSD.usr.dist user/ngie/more-tests2/include/Makefile user/ngie/more-tests2/lib/libcrypt/tests/Makefile user/ngie/more-tests2/lib/libpmc/pmc.h user/ngie/more-tests2/sbin/Makefile user/ngie/more-tests2/secure/lib/libcrypto/Makefile.inc user/ngie/more-tests2/secure/lib/libcrypto/Makefile.man user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_EncryptInit.3 user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 user/ngie/more-tests2/share/colldef/Makefile user/ngie/more-tests2/share/ctypedef/Makefile user/ngie/more-tests2/share/locale-links/Makefile user/ngie/more-tests2/share/mk/dirdeps.mk user/ngie/more-tests2/share/mk/local.gendirdeps.mk user/ngie/more-tests2/share/mk/sys.mk user/ngie/more-tests2/share/monetdef/Makefile user/ngie/more-tests2/share/msgdef/Makefile user/ngie/more-tests2/share/numericdef/Makefile user/ngie/more-tests2/share/timedef/Makefile user/ngie/more-tests2/sys/arm/arm/busdma_machdep-v6.c user/ngie/more-tests2/sys/arm/arm/pl310.c user/ngie/more-tests2/sys/arm/include/pcb.h user/ngie/more-tests2/sys/arm/include/pl310.h user/ngie/more-tests2/sys/arm/samsung/exynos/exynos5_ehci.c user/ngie/more-tests2/sys/boot/common/loader.8 user/ngie/more-tests2/sys/conf/files.powerpc user/ngie/more-tests2/sys/conf/kern.pre.mk user/ngie/more-tests2/sys/conf/options user/ngie/more-tests2/sys/conf/options.powerpc user/ngie/more-tests2/sys/dev/hwpmc/hwpmc_mod.c user/ngie/more-tests2/sys/dev/isp/isp.c user/ngie/more-tests2/sys/dev/isp/isp_freebsd.c user/ngie/more-tests2/sys/dev/isp/isp_library.c user/ngie/more-tests2/sys/dev/isp/isp_library.h user/ngie/more-tests2/sys/dev/isp/isp_stds.h user/ngie/more-tests2/sys/dev/isp/isp_target.c user/ngie/more-tests2/sys/dev/isp/ispmbox.h user/ngie/more-tests2/sys/dev/isp/ispvar.h user/ngie/more-tests2/sys/dev/ntb/if_ntb/if_ntb.c user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.c user/ngie/more-tests2/sys/dev/ntb/ntb_hw/ntb_hw.h user/ngie/more-tests2/sys/dev/re/if_re.c user/ngie/more-tests2/sys/dev/uart/uart_dev_ns8250.c user/ngie/more-tests2/sys/dev/vmware/vmxnet3/if_vmx.c user/ngie/more-tests2/sys/dev/wpi/if_wpi.c user/ngie/more-tests2/sys/dev/xen/control/control.c user/ngie/more-tests2/sys/fs/nfsclient/nfs_clvfsops.c user/ngie/more-tests2/sys/geom/geom_dev.c user/ngie/more-tests2/sys/kern/imgact_elf.c user/ngie/more-tests2/sys/kern/kern_dump.c user/ngie/more-tests2/sys/modules/tests/framework/Makefile user/ngie/more-tests2/sys/net/pfkeyv2.h user/ngie/more-tests2/sys/netipsec/ipsec.h user/ngie/more-tests2/sys/netipsec/key.c user/ngie/more-tests2/sys/netipsec/xform_esp.c user/ngie/more-tests2/sys/netpfil/ipfw/ip_fw_dynamic.c user/ngie/more-tests2/sys/netsmb/smb_conn.c user/ngie/more-tests2/sys/netsmb/smb_iod.c user/ngie/more-tests2/sys/opencrypto/xform.c user/ngie/more-tests2/sys/powerpc/aim/mmu_oea64.c user/ngie/more-tests2/sys/powerpc/aim/moea64_native.c user/ngie/more-tests2/sys/powerpc/include/bus.h user/ngie/more-tests2/sys/powerpc/mpc85xx/mpc85xx.c user/ngie/more-tests2/sys/powerpc/mpc85xx/mpc85xx.h user/ngie/more-tests2/sys/powerpc/ofw/ofw_machdep.c user/ngie/more-tests2/sys/powerpc/ofw/ofw_pci.c user/ngie/more-tests2/sys/powerpc/ofw/ofw_pcibus.c user/ngie/more-tests2/sys/powerpc/ofw/openpic_ofw.c user/ngie/more-tests2/sys/powerpc/powermac/cpcht.c user/ngie/more-tests2/sys/powerpc/powermac/kiic.c user/ngie/more-tests2/sys/powerpc/powermac/macgpio.c user/ngie/more-tests2/sys/powerpc/pseries/mmu_phyp.c user/ngie/more-tests2/sys/powerpc/pseries/phyp_console.c user/ngie/more-tests2/sys/powerpc/pseries/phyp_llan.c user/ngie/more-tests2/sys/powerpc/pseries/phyp_vscsi.c user/ngie/more-tests2/sys/powerpc/pseries/platform_chrp.c user/ngie/more-tests2/sys/powerpc/pseries/plpar_iommu.c user/ngie/more-tests2/sys/powerpc/pseries/rtas_pci.c user/ngie/more-tests2/sys/sparc64/include/dump.h user/ngie/more-tests2/sys/sparc64/sparc64/dump_machdep.c user/ngie/more-tests2/sys/sys/pmc.h user/ngie/more-tests2/sys/x86/x86/intr_machdep.c user/ngie/more-tests2/sys/x86/xen/hvm.c user/ngie/more-tests2/sys/x86/xen/xen_intr.c user/ngie/more-tests2/tools/build/mk/OptionalObsoleteFiles.inc user/ngie/more-tests2/tools/install.sh user/ngie/more-tests2/tools/sched/schedgraph.py user/ngie/more-tests2/tools/tools/locale/etc/charmaps.xml user/ngie/more-tests2/tools/tools/shlib-compat/shlib-compat.py user/ngie/more-tests2/usr.bin/netstat/if.c user/ngie/more-tests2/usr.bin/xinstall/Makefile user/ngie/more-tests2/usr.sbin/Makefile user/ngie/more-tests2/usr.sbin/mpsutil/Makefile user/ngie/more-tests2/usr.sbin/mpsutil/mps_cmd.c user/ngie/more-tests2/usr.sbin/mpsutil/mpsutil.8 user/ngie/more-tests2/usr.sbin/mpsutil/mpsutil.h user/ngie/more-tests2/usr.sbin/pmcstat/pmcpl_gprof.c user/ngie/more-tests2/usr.sbin/pmcstat/pmcstat.8 user/ngie/more-tests2/usr.sbin/pmcstat/pmcstat.c user/ngie/more-tests2/usr.sbin/pmcstat/pmcstat.h Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/crypto/openssl/ (props changed) user/ngie/more-tests2/include/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/sys/ (props changed) user/ngie/more-tests2/sys/boot/ (props changed) user/ngie/more-tests2/sys/conf/ (props changed) Modified: user/ngie/more-tests2/MAINTAINERS ============================================================================== --- user/ngie/more-tests2/MAINTAINERS Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/MAINTAINERS Wed Nov 18 23:45:09 2015 (r291039) @@ -59,7 +59,6 @@ contrib/llvm dim Pre-commit review pref contrib/llvm/tools/lldb emaste Pre-commit review preferred. atf freebsd-testing,jmmv,ngie Pre-commit review requested. contrib/netbsd-tests freebsd-testing,ngie Pre-commit review requested. -contrib/pf kp,glebius Pre-commit review recommended. contrib/pjdfstest freebsd-testing,ngie,pjd Pre-commit review requested. share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested. tests freebsd-testing,ngie Pre-commit review requested. @@ -69,7 +68,12 @@ sys/compat/linuxkpi hselasky If in doubt sys/dev/e1000 erj Pre-commit phabricator review requested. sys/dev/ixgbe erj Pre-commit phabricator review requested. sys/dev/ixl erj Pre-commit phabricator review requested. +sys/netinet/ip_carp.c glebius Pre-commit review recommended. +sys/netpfil/pf kp,glebius Pre-commit review recommended. usr.sbin/pkg pkg@ Please coordinate behavior or flag changes with pkg team. +lpr gad Pre-commit review requested, particularly for + lpd/recvjob.c and lpd/printjob.c. +nis(8), yp(8) araujo Pre-commit review requested. ---- OLD ---- libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. @@ -100,8 +104,6 @@ etc/mail gshapiro Pre-commit review requ Keep in sync with -STABLE. etc/sendmail gshapiro Pre-commit review requested. Keep in sync with -STABLE. -lpr gad Pre-commit review requested, particularly for - lpd/recvjob.c and lpd/printjob.c. nvi peter Try not to break it. libz peter Try not to break it. groff ru Recommends pre-commit review. Modified: user/ngie/more-tests2/Makefile.inc1 ============================================================================== --- user/ngie/more-tests2/Makefile.inc1 Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/Makefile.inc1 Wed Nov 18 23:45:09 2015 (r291039) @@ -1458,9 +1458,6 @@ ${_bt}-usr.bin/mandoc: ${_bt}-lib/libope _makewhatis=usr.bin/makewhatis .endif -# Rebuild up-to-date libmd for xinstall -${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd - bootstrap-tools: .PHONY # Please document (add comment) why something is in 'bootstrap-tools'. @@ -1483,7 +1480,6 @@ bootstrap-tools: .PHONY ${_yacc} \ ${_m4} \ ${_lex} \ - lib/libmd \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ Modified: user/ngie/more-tests2/ObsoleteFiles.inc ============================================================================== --- user/ngie/more-tests2/ObsoleteFiles.inc Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/ObsoleteFiles.inc Wed Nov 18 23:45:09 2015 (r291039) @@ -49,41 +49,6 @@ OLD_FILES+=usr/share/locale/zh_TW.UTF-8/ # 20151107: String collation improvements OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE OLD_DIRS+=usr/share/locale/UTF-8 -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY -OLD_DIRS+=usr/share/locale/en_CA.ISO8859-15 -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY -OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15 -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC -OLD_DIRS+=usr/share/locale/en_US.ISO8859-15 -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE -OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15 -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY -OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15 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 Modified: user/ngie/more-tests2/UPDATING ============================================================================== --- user/ngie/more-tests2/UPDATING Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/UPDATING Wed Nov 18 23:45:09 2015 (r291039) @@ -39,6 +39,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 Databases administrators will need to reindex their databases given collation results will be different. + Due to a bug in install(1) it is recommended to remove the ancient + locales before running make installworld. + + rm -rf /usr/share/locale/* + 20151030: The OpenSSL has been upgraded to 1.0.2d. Any binaries requiring libcrypto.so.7 or libssl.so.7 must be recompiled. @@ -191,12 +196,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 like it always used to, and the difference will be irrelevant. If you remove 'device random', you get *NO* kernel-processed - entopy at all. This may be acceptable to folks building + entropy at all. This may be acceptable to folks building embedded systems, but has complications. Carry on reading, and it is assumed you know what you need. *PLEASE* read random(4) and random(9) if you are in the - habit of tweeking kernel configs, and/or if you are a member + habit of tweaking kernel configs, and/or if you are a member of the embedded community, wanting specific and not-usual behaviour from your security subsystems. Modified: user/ngie/more-tests2/bin/sh/expand.c ============================================================================== --- user/ngie/more-tests2/bin/sh/expand.c Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/bin/sh/expand.c Wed Nov 18 23:45:09 2015 (r291039) @@ -249,7 +249,8 @@ argstr(char *p, int flag) case CTLQUOTEMARK: lit_quoted = 1; /* "$@" syntax adherence hack */ - if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=') + if (p[0] == CTLVAR && (p[1] & VSQUOTE) != 0 && + p[2] == '@' && p[3] == '=') break; if ((flag & EXP_FULL) != 0) USTPUTC(c, expdest); Copied: user/ngie/more-tests2/bin/sh/tests/parameters/positional8.0 (from r291038, head/bin/sh/tests/parameters/positional8.0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/bin/sh/tests/parameters/positional8.0 Wed Nov 18 23:45:09 2015 (r291039, copy of r291038, head/bin/sh/tests/parameters/positional8.0) @@ -0,0 +1,31 @@ +# $FreeBSD$ + +failures='' +ok='' + +testcase() { + code="$1" + expected="$2" + oIFS="$IFS" + eval "$code" + IFS='|' + result="$#|$*" + IFS="$oIFS" + if [ "x$result" = "x$expected" ]; then + ok=x$ok + else + failures=x$failures + echo "For $code, expected $expected actual $result" + fi +} + +testcase 'shift $#; set -- ""$*' '1|' +testcase 'shift $#; set -- $*""' '1|' +testcase 'shift $#; set -- ""$@' '1|' +testcase 'shift $#; set -- $@""' '1|' +testcase 'shift $#; set -- """$*"' '1|' +testcase 'shift $#; set -- "$*"""' '1|' +testcase 'shift $#; set -- """$@"' '1|' +testcase 'shift $#; set -- "$@"""' '1|' + +test "x$failures" = x Modified: user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_EncryptInit.pod ============================================================================== --- user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_EncryptInit.pod Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_EncryptInit.pod Wed Nov 18 23:45:09 2015 (r291039) @@ -20,7 +20,7 @@ EVP_CIPHER_CTX_set_padding, EVP_enc_nul EVP_des_cfb, EVP_des_ofb, EVP_des_ede_cbc, EVP_des_ede, EVP_des_ede_ofb, EVP_des_ede_cfb, EVP_des_ede3_cbc, EVP_des_ede3, EVP_des_ede3_ofb, EVP_des_ede3_cfb, EVP_desx_cbc, EVP_rc4, EVP_rc4_40, EVP_idea_cbc, -EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_idea_cbc, EVP_rc2_cbc, +EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_rc2_cbc, EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc, EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc, EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_rc5_32_12_16_cbc, @@ -315,7 +315,7 @@ RC4 stream cipher. This is a variable ke RC4 stream cipher with 40 bit key length. This is obsolete and new code should use EVP_rc4() and the EVP_CIPHER_CTX_set_key_length() function. -=item EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void), EVP_idea_cbc(void) +=item EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void) IDEA encryption algorithm in CBC, ECB, CFB and OFB modes respectively. Modified: user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod ============================================================================== --- user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/crypto/openssl/doc/crypto/EVP_PKEY_CTX_ctrl.pod Wed Nov 18 23:45:09 2015 (r291039) @@ -2,7 +2,7 @@ =head1 NAME -EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str, EVP_PKEY_get_default_digest_nid, +EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str, EVP_PKEY_CTX_set_signature_md, EVP_PKEY_CTX_set_rsa_padding, EVP_PKEY_CTX_set_rsa_pss_saltlen, EVP_PKEY_CTX_set_rsa_rsa_keygen_bits, EVP_PKEY_CTX_set_rsa_keygen_pubexp, EVP_PKEY_CTX_set_dsa_paramgen_bits, @@ -19,8 +19,6 @@ EVP_PKEY_CTX_set_ec_paramgen_curve_nid - int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value); - int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid); - #include int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md); Modified: user/ngie/more-tests2/etc/Makefile ============================================================================== --- user/ngie/more-tests2/etc/Makefile Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/etc/Makefile Wed Nov 18 23:45:09 2015 (r291039) @@ -337,10 +337,10 @@ MTREE_FILTER= sed -e 's,\([gu]\)name=,\1 -e 's,\(gid=\)[^ ]*$$,\1${_gid},' .else MTREE_FILTER= cat -.endif .if !defined(NO_FSCHG) MTREE_FSCHG= -i .endif +.endif MTREES= mtree/BSD.root.dist / \ mtree/BSD.var.dist /var \ Modified: user/ngie/more-tests2/etc/mtree/BSD.usr.dist ============================================================================== --- user/ngie/more-tests2/etc/mtree/BSD.usr.dist Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/etc/mtree/BSD.usr.dist Wed Nov 18 23:45:09 2015 (r291039) @@ -515,6 +515,8 @@ locale af_ZA.ISO8859-1 .. + af_ZA.ISO8859-15 + .. af_ZA.UTF-8 .. ar_AE.UTF-8 @@ -601,12 +603,16 @@ .. en_AU.ISO8859-1 .. + en_AU.ISO8859-15 + .. en_AU.US-ASCII .. en_AU.UTF-8 .. en_CA.ISO8859-1 .. + en_CA.ISO8859-15 + .. en_CA.US-ASCII .. en_CA.UTF-8 @@ -631,6 +637,8 @@ .. en_NZ.ISO8859-1 .. + en_NZ.ISO8859-15 + .. en_NZ.US-ASCII .. en_NZ.UTF-8 @@ -643,12 +651,16 @@ .. en_US.ISO8859-1 .. + en_US.ISO8859-15 + .. en_US.US-ASCII .. en_US.UTF-8 .. en_ZA.ISO8859-1 .. + en_ZA.ISO8859-15 + .. en_ZA.US-ASCII .. en_ZA.UTF-8 @@ -695,6 +707,8 @@ .. fr_CA.ISO8859-1 .. + fr_CA.ISO8859-15 + .. fr_CA.UTF-8 .. fr_CH.ISO8859-1 Modified: user/ngie/more-tests2/include/Makefile ============================================================================== --- user/ngie/more-tests2/include/Makefile Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/include/Makefile Wed Nov 18 23:45:09 2015 (r291039) @@ -376,7 +376,7 @@ symlinks: @touch ${.OBJDIR}/${.TARGET} .endif -.if ${MACHINE} == "host" +.if ${MACHINE} == "host" && !defined(_SKIP_BUILD) # we're here because we are building a sysroot... # we need MACHINE et al set correctly HOST_MACHINE!= uname -m Modified: user/ngie/more-tests2/lib/libcrypt/tests/Makefile ============================================================================== --- user/ngie/more-tests2/lib/libcrypt/tests/Makefile Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/lib/libcrypt/tests/Makefile Wed Nov 18 23:45:09 2015 (r291039) @@ -1,12 +1,12 @@ # $FreeBSD$ -ATF_TESTS_C+= crypt_tests - -NETBSD_ATF_TESTS_C+= crypt_test - -CFLAGS+= -I${.CURDIR:H} -LIBADD= crypt - +#ATF_TESTS_C+= crypt_tests +# +#NETBSD_ATF_TESTS_C+= crypt_test +# +#CFLAGS+= -I${.CURDIR:H} +#LIBADD= crypt +# .include .include Modified: user/ngie/more-tests2/lib/libpmc/pmc.h ============================================================================== --- user/ngie/more-tests2/lib/libpmc/pmc.h Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/lib/libpmc/pmc.h Wed Nov 18 23:45:09 2015 (r291039) @@ -37,14 +37,15 @@ * Driver statistics. */ struct pmc_driverstats { - int pm_intr_ignored; /* #interrupts ignored */ - int pm_intr_processed; /* #interrupts processed */ - int pm_intr_bufferfull; /* #interrupts with ENOSPC */ - int pm_syscalls; /* #syscalls */ - int pm_syscall_errors; /* #syscalls with errors */ - int pm_buffer_requests; /* #buffer requests */ - int pm_buffer_requests_failed; /* #failed buffer requests */ - int pm_log_sweeps; /* #sample buffer processing passes */ + unsigned int pm_intr_ignored; /* #interrupts ignored */ + unsigned int pm_intr_processed; /* #interrupts processed */ + unsigned int pm_intr_bufferfull; /* #interrupts with ENOSPC */ + unsigned int pm_syscalls; /* #syscalls */ + unsigned int pm_syscall_errors; /* #syscalls with errors */ + unsigned int pm_buffer_requests; /* #buffer requests */ + unsigned int pm_buffer_requests_failed; /* #failed buffer requests */ + unsigned int pm_log_sweeps; /* #sample buffer processing + passes */ }; /* Modified: user/ngie/more-tests2/sbin/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/Makefile Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/sbin/Makefile Wed Nov 18 23:45:09 2015 (r291039) @@ -70,66 +70,26 @@ SUBDIR=adjkerntz \ tunefs \ umount -.if ${MK_ATM} != "no" -SUBDIR+= atm -.endif - -.if ${MK_CASPER} != "no" -SUBDIR+= casperd -.endif - -.if ${MK_CCD} != "no" -SUBDIR+= ccdconfig -.endif - -.if ${MK_CXX} != "no" -SUBDIR+= devd -.endif - -.if ${MK_HAST} != "no" -SUBDIR+= hastctl -SUBDIR+= hastd -.endif - -.if ${MK_INET6} != "no" -SUBDIR+= ping6 -SUBDIR+= rtsol -.endif - -.if ${MK_IPFILTER} != "no" -SUBDIR+= ipf -.endif - -.if ${MK_IPFW} != "no" -SUBDIR+= ipfw -SUBDIR+= natd -.endif - -.if ${MK_ISCSI} != "no" -SUBDIR+= iscontrol -.endif - -.if ${MK_NAND} != "no" -SUBDIR+= nandfs -SUBDIR+= newfs_nandfs -.endif - -.if ${MK_PF} != "no" -SUBDIR+= pfctl -SUBDIR+= pflogd -.endif - -.if ${MK_QUOTAS} != "no" -SUBDIR+= quotacheck -.endif - -.if ${MK_ROUTED} != "no" -SUBDIR+= routed -.endif - -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif +SUBDIR.${MK_ATM}+= atm +SUBDIR.${MK_CASPER}+= casperd +SUBDIR.${MK_CCD}+= ccdconfig +SUBDIR.${MK_CXX}+= devd +SUBDIR.${MK_HAST}+= hastctl +SUBDIR.${MK_HAST}+= hastd +SUBDIR.${MK_INET6}+= ping6 +SUBDIR.${MK_INET6}+= rtsol +SUBDIR.${MK_IPFILTER}+= ipf +SUBDIR.${MK_IPFW}+= ipfw +SUBDIR.${MK_IPFW}+= natd +SUBDIR.${MK_ISCSI}+= iscontrol +SUBDIR.${MK_NAND}+= nandfs +SUBDIR.${MK_NAND}+= newfs_nandfs +SUBDIR.${MK_PF}+= pfctl +SUBDIR.${MK_PF}+= pflogd +SUBDIR.${MK_QUOTAS}+= quotacheck +SUBDIR.${MK_ROUTED}+= routed + +SUBDIR.${MK_TESTS}+= tests .include Modified: user/ngie/more-tests2/secure/lib/libcrypto/Makefile.inc ============================================================================== --- user/ngie/more-tests2/secure/lib/libcrypto/Makefile.inc Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/secure/lib/libcrypto/Makefile.inc Wed Nov 18 23:45:09 2015 (r291039) @@ -45,7 +45,7 @@ MANDIR= ${SHAREDIR}/openssl/man/man .if defined(LIB) _docs= ${LIB} -_skip= des_modes +_skip= SSLeay_version des_modes _sec= 3 .else _docs= apps @@ -72,13 +72,13 @@ man-makefile-update: ${.CURDIR}/Makefile.man for i in ${LCRYPTO_DOC}/${_docs}/*.pod; do \ fn=`basename $$i .pod`; \ - if [ "$$fn" != "${_skip}" ]; then \ + if ! echo '${_skip}' | grep -qw "$$fn"; then \ ${ECHO} "MAN+= $$fn.${_sec}" >> ${.CURDIR}/Makefile.man; \ fi; \ done for i in ${LCRYPTO_DOC}/${_docs}/*.pod; do \ fn=`basename $$i .pod`; \ - if [ "$$fn" != "${_skip}" ]; then \ + if ! echo '${_skip}' | grep -qw "$$fn"; then \ perl ${LCRYPTO_SRC}/util/extract-names.pl < $$i | \ awk "/^$$fn\$$/ { next; } \ { print \"MLINKS+= $$fn.${_sec} \" \$$1 \".${_sec}\" }" >> \ Modified: user/ngie/more-tests2/secure/lib/libcrypto/Makefile.man ============================================================================== --- user/ngie/more-tests2/secure/lib/libcrypto/Makefile.man Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/secure/lib/libcrypto/Makefile.man Wed Nov 18 23:45:09 2015 (r291039) @@ -160,7 +160,6 @@ MAN+= SMIME_read_CMS.3 MAN+= SMIME_read_PKCS7.3 MAN+= SMIME_write_CMS.3 MAN+= SMIME_write_PKCS7.3 -MAN+= SSLeay_version.3 MAN+= X509_NAME_ENTRY_get_object.3 MAN+= X509_NAME_add_entry_by_txt.3 MAN+= X509_NAME_get_index_by_NID.3 @@ -695,7 +694,6 @@ MLINKS+= EVP_EncryptInit.3 EVP_idea_cbc. MLINKS+= EVP_EncryptInit.3 EVP_idea_ecb.3 MLINKS+= EVP_EncryptInit.3 EVP_idea_cfb.3 MLINKS+= EVP_EncryptInit.3 EVP_idea_ofb.3 -MLINKS+= EVP_EncryptInit.3 EVP_idea_cbc.3 MLINKS+= EVP_EncryptInit.3 EVP_rc2_cbc.3 MLINKS+= EVP_EncryptInit.3 EVP_rc2_ecb.3 MLINKS+= EVP_EncryptInit.3 EVP_rc2_cfb.3 @@ -723,7 +721,6 @@ MLINKS+= EVP_EncryptInit.3 EVP_aes_256_c MLINKS+= EVP_OpenInit.3 EVP_OpenUpdate.3 MLINKS+= EVP_OpenInit.3 EVP_OpenFinal.3 MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_ctrl_str.3 -MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_get_default_digest_nid.3 MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_signature_md.3 MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_padding.3 MLINKS+= EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_set_rsa_pss_saltlen.3 Modified: user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_EncryptInit.3 ============================================================================== --- user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_EncryptInit.3 Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_EncryptInit.3 Wed Nov 18 23:45:09 2015 (r291039) @@ -157,7 +157,7 @@ EVP_CIPHER_CTX_set_padding, EVP_enc_nul EVP_des_cfb, EVP_des_ofb, EVP_des_ede_cbc, EVP_des_ede, EVP_des_ede_ofb, EVP_des_ede_cfb, EVP_des_ede3_cbc, EVP_des_ede3, EVP_des_ede3_ofb, EVP_des_ede3_cfb, EVP_desx_cbc, EVP_rc4, EVP_rc4_40, EVP_idea_cbc, -EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_idea_cbc, EVP_rc2_cbc, +EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_rc2_cbc, EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc, EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc, EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_rc5_32_12_16_cbc, @@ -440,8 +440,8 @@ Three key triple \s-1DES\s0 in \s-1CBC, .IX Item "EVP_rc4_40(void)" \&\s-1RC4\s0 stream cipher with 40 bit key length. This is obsolete and new code should use \fIEVP_rc4()\fR and the \fIEVP_CIPHER_CTX_set_key_length()\fR function. -.IP "\fIEVP_idea_cbc()\fR EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void), EVP_idea_cbc(void)" 4 -.IX Item "EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void), EVP_idea_cbc(void)" +.IP "\fIEVP_idea_cbc()\fR EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void)" 4 +.IX Item "EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void)" \&\s-1IDEA\s0 encryption algorithm in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively. .IP "EVP_rc2_cbc(void), EVP_rc2_ecb(void), EVP_rc2_cfb(void), EVP_rc2_ofb(void)" 4 .IX Item "EVP_rc2_cbc(void), EVP_rc2_ecb(void), EVP_rc2_cfb(void), EVP_rc2_ofb(void)" Modified: user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 ============================================================================== --- user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 Wed Nov 18 23:45:09 2015 (r291039) @@ -139,7 +139,7 @@ .if n .ad l .nh .SH "NAME" -EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str, EVP_PKEY_get_default_digest_nid, +EVP_PKEY_CTX_ctrl, EVP_PKEY_CTX_ctrl_str, EVP_PKEY_CTX_set_signature_md, EVP_PKEY_CTX_set_rsa_padding, EVP_PKEY_CTX_set_rsa_pss_saltlen, EVP_PKEY_CTX_set_rsa_rsa_keygen_bits, EVP_PKEY_CTX_set_rsa_keygen_pubexp, EVP_PKEY_CTX_set_dsa_paramgen_bits, @@ -156,8 +156,6 @@ EVP_PKEY_CTX_set_ec_paramgen_curve_nid \ \& int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, \& const char *value); \& -\& int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid); -\& \& #include \& \& int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md); Modified: user/ngie/more-tests2/share/colldef/Makefile ============================================================================== --- user/ngie/more-tests2/share/colldef/Makefile Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/share/colldef/Makefile Wed Nov 18 23:45:09 2015 (r291039) @@ -47,6 +47,7 @@ LOCALES+= uk_UA.UTF-8 LOCALES+= zh_Hans_CN.UTF-8 LOCALES+= zh_Hant_TW.UTF-8 +SAME+= af_ZA.UTF-8:af_ZA.ISO8859-15 SAME+= af_ZA.UTF-8:af_ZA.ISO8859-1 SAME+= ar_SA.UTF-8:ar_QA.UTF-8 SAME+= ar_SA.UTF-8:ar_MA.UTF-8 @@ -108,6 +109,7 @@ SAME+= en_US.UTF-8:fr_CH.UTF-8 SAME+= en_US.UTF-8:fr_CH.ISO8859-15 SAME+= en_US.UTF-8:fr_CH.ISO8859-1 SAME+= en_US.UTF-8:fr_CA.UTF-8 +SAME+= en_US.UTF-8:fr_CA.ISO8859-15 SAME+= en_US.UTF-8:fr_CA.ISO8859-1 SAME+= en_US.UTF-8:fr_BE.UTF-8 SAME+= en_US.UTF-8:fr_BE.ISO8859-15 @@ -117,14 +119,17 @@ SAME+= en_US.UTF-8:eu_ES.ISO8859-15 SAME+= en_US.UTF-8:eu_ES.ISO8859-1 SAME+= en_US.UTF-8:en_ZA.UTF-8 SAME+= en_US.UTF-8:en_ZA.US-ASCII +SAME+= en_US.UTF-8:en_ZA.ISO8859-15 SAME+= en_US.UTF-8:en_ZA.ISO8859-1 SAME+= en_US.UTF-8:en_US.US-ASCII +SAME+= en_US.UTF-8:en_US.ISO8859-15 SAME+= en_US.UTF-8:en_US.ISO8859-1 SAME+= en_US.UTF-8:en_SG.UTF-8 SAME+= en_US.UTF-8:en_SG.ISO8859-1 SAME+= en_US.UTF-8:en_PH.UTF-8 SAME+= en_US.UTF-8:en_NZ.UTF-8 SAME+= en_US.UTF-8:en_NZ.US-ASCII +SAME+= en_US.UTF-8:en_NZ.ISO8859-15 SAME+= en_US.UTF-8:en_NZ.ISO8859-1 SAME+= en_US.UTF-8:en_IE.UTF-8 SAME+= en_US.UTF-8:en_IE.ISO8859-15 @@ -137,9 +142,11 @@ SAME+= en_US.UTF-8:en_GB.ISO8859-15 SAME+= en_US.UTF-8:en_GB.ISO8859-1 SAME+= en_US.UTF-8:en_CA.UTF-8 SAME+= en_US.UTF-8:en_CA.US-ASCII +SAME+= en_US.UTF-8:en_CA.ISO8859-15 SAME+= en_US.UTF-8:en_CA.ISO8859-1 SAME+= en_US.UTF-8:en_AU.UTF-8 SAME+= en_US.UTF-8:en_AU.US-ASCII +SAME+= en_US.UTF-8:en_AU.ISO8859-15 SAME+= en_US.UTF-8:en_AU.ISO8859-1 SAME+= en_US.UTF-8:de_DE.UTF-8 SAME+= en_US.UTF-8:de_DE.ISO8859-15 Modified: user/ngie/more-tests2/share/ctypedef/Makefile ============================================================================== --- user/ngie/more-tests2/share/ctypedef/Makefile Wed Nov 18 23:42:44 2015 (r291038) +++ user/ngie/more-tests2/share/ctypedef/Makefile Wed Nov 18 23:45:09 2015 (r291039) @@ -16,8 +16,8 @@ LOCALES+= be_BY.CP1131 LOCALES+= ca_IT.ISO8859-1 LOCALES+= ca_IT.ISO8859-15 LOCALES+= el_GR.ISO8859-7 -LOCALES+= en_GB.ISO8859-15 LOCALES+= en_US.ISO8859-1 +LOCALES+= en_US.ISO8859-15 LOCALES+= en_US.US-ASCII LOCALES+= en_US.UTF-8 LOCALES+= hi_IN.ISCII-DEV @@ -152,6 +152,35 @@ SAME+= en_US.ISO8859-1:de_CH.ISO8859-1 SAME+= en_US.ISO8859-1:de_AT.ISO8859-1 SAME+= en_US.ISO8859-1:da_DK.ISO8859-1 SAME+= en_US.ISO8859-1:af_ZA.ISO8859-1 +SAME+= en_US.ISO8859-15:en_GB.ISO8859-15 +SAME+= en_US.ISO8859-15:sv_SE.ISO8859-15 +SAME+= en_US.ISO8859-15:sv_FI.ISO8859-15 +SAME+= en_US.ISO8859-15:pt_PT.ISO8859-15 +SAME+= en_US.ISO8859-15:nn_NO.ISO8859-15 +SAME+= en_US.ISO8859-15:nl_NL.ISO8859-15 +SAME+= en_US.ISO8859-15:nl_BE.ISO8859-15 +SAME+= en_US.ISO8859-15:nb_NO.ISO8859-15 +SAME+= en_US.ISO8859-15:it_IT.ISO8859-15 +SAME+= en_US.ISO8859-15:it_CH.ISO8859-15 +SAME+= en_US.ISO8859-15:is_IS.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_FR.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_CH.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_CA.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_BE.ISO8859-15 +SAME+= en_US.ISO8859-15:fi_FI.ISO8859-15 +SAME+= en_US.ISO8859-15:eu_ES.ISO8859-15 +SAME+= en_US.ISO8859-15:et_EE.ISO8859-15 +SAME+= en_US.ISO8859-15:es_ES.ISO8859-15 +SAME+= en_US.ISO8859-15:en_ZA.ISO8859-15 +SAME+= en_US.ISO8859-15:en_NZ.ISO8859-15 +SAME+= en_US.ISO8859-15:en_IE.ISO8859-15 +SAME+= en_US.ISO8859-15:en_CA.ISO8859-15 +SAME+= en_US.ISO8859-15:en_AU.ISO8859-15 +SAME+= en_US.ISO8859-15:de_DE.ISO8859-15 +SAME+= en_US.ISO8859-15:de_CH.ISO8859-15 +SAME+= en_US.ISO8859-15:de_AT.ISO8859-15 +SAME+= en_US.ISO8859-15:da_DK.ISO8859-15 +SAME+= en_US.ISO8859-15:af_ZA.ISO8859-15 SAME+= ru_RU.CP1251:bg_BG.CP1251 SAME+= ru_RU.CP1251:be_BY.CP1251 SAME+= ru_RU.ISO8859-5:sr_Cyrl_RS.ISO8859-5 @@ -169,28 +198,6 @@ SAME+= sr_Latn_RS.ISO8859-2:pl_PL.ISO88 SAME+= sr_Latn_RS.ISO8859-2:hu_HU.ISO8859-2 SAME+= sr_Latn_RS.ISO8859-2:hr_HR.ISO8859-2 SAME+= sr_Latn_RS.ISO8859-2:cs_CZ.ISO8859-2 -SAME+= en_GB.ISO8859-15:sv_SE.ISO8859-15 -SAME+= en_GB.ISO8859-15:sv_FI.ISO8859-15 -SAME+= en_GB.ISO8859-15:pt_PT.ISO8859-15 -SAME+= en_GB.ISO8859-15:nn_NO.ISO8859-15 -SAME+= en_GB.ISO8859-15:nl_NL.ISO8859-15 -SAME+= en_GB.ISO8859-15:nl_BE.ISO8859-15 -SAME+= en_GB.ISO8859-15:nb_NO.ISO8859-15 -SAME+= en_GB.ISO8859-15:it_IT.ISO8859-15 -SAME+= en_GB.ISO8859-15:it_CH.ISO8859-15 -SAME+= en_GB.ISO8859-15:is_IS.ISO8859-15 -SAME+= en_GB.ISO8859-15:fr_FR.ISO8859-15 -SAME+= en_GB.ISO8859-15:fr_CH.ISO8859-15 -SAME+= en_GB.ISO8859-15:fr_BE.ISO8859-15 -SAME+= en_GB.ISO8859-15:fi_FI.ISO8859-15 -SAME+= en_GB.ISO8859-15:eu_ES.ISO8859-15 -SAME+= en_GB.ISO8859-15:et_EE.ISO8859-15 -SAME+= en_GB.ISO8859-15:es_ES.ISO8859-15 -SAME+= en_GB.ISO8859-15:en_IE.ISO8859-15 -SAME+= en_GB.ISO8859-15:de_DE.ISO8859-15 -SAME+= en_GB.ISO8859-15:de_CH.ISO8859-15 -SAME+= en_GB.ISO8859-15:de_AT.ISO8859-15 -SAME+= en_GB.ISO8859-15:da_DK.ISO8859-15 SAME+= en_US.US-ASCII:en_ZA.US-ASCII SAME+= en_US.US-ASCII:en_NZ.US-ASCII SAME+= en_US.US-ASCII:en_GB.US-ASCII @@ -222,11 +229,11 @@ SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_ SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GB2312.src SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GBK.src SYMPAIRS+= zh_Hant_HK.Big5HKSCS.src:zh_Hant_TW.Big5.src -SYMPAIRS+= en_GB.ISO8859-15.src:en_US.ISO8859-1.src -SYMPAIRS+= en_GB.ISO8859-15.src:en_US.US-ASCII.src -SYMPAIRS+= en_GB.ISO8859-15.src:lv_LV.ISO8859-13.src -SYMPAIRS+= en_GB.ISO8859-15.src:sr_Latn_RS.ISO8859-2.src -SYMPAIRS+= en_GB.ISO8859-15.src:tr_TR.ISO8859-9.src +SYMPAIRS+= en_US.ISO8859-1.src:en_US.ISO8859-15.src +SYMPAIRS+= en_US.ISO8859-1.src:en_US.US-ASCII.src +SYMPAIRS+= en_US.ISO8859-1.src:lv_LV.ISO8859-13.src +SYMPAIRS+= en_US.ISO8859-1.src:sr_Latn_RS.ISO8859-2.src +SYMPAIRS+= en_US.ISO8859-1.src:tr_TR.ISO8859-9.src SYMPAIRS+= ja_JP.eucJP.src:ja_JP.SJIS.src .for PAIR in ${SYMPAIRS} Copied: user/ngie/more-tests2/share/ctypedef/en_US.ISO8859-1.src (from r291038, head/share/ctypedef/en_US.ISO8859-1.src) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/share/ctypedef/en_US.ISO8859-1.src Wed Nov 18 23:45:09 2015 (r291039, copy of r291038, head/share/ctypedef/en_US.ISO8859-1.src) @@ -0,0 +1,5163 @@ +# Warning: Do not edit. This file is automatically extracted from the +# tools in /usr/src/tools/tools/locale. The data is obtained from the +# CLDR project, obtained from http://cldr.unicode.org/ +# ----------------------------------------------------------------------------- +comment_char * +escape_char / +LC_CTYPE +************* + +upper ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ +

;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***