diff options
Diffstat (limited to 'tools/tools')
83 files changed, 1310 insertions, 6693 deletions
diff --git a/tools/tools/README b/tools/tools/README index 88658f043d4d..084c9fe65be9 100644 --- a/tools/tools/README +++ b/tools/tools/README @@ -59,7 +59,6 @@ portsinfo Generate list of new ports for last two weeks. scsi-defects Get at the primary or grown defect list of a SCSI disk. sysdoc Build a manual page with available sysctls for a specific kernel configuration. -tinybsd Script to build FreeBSD embedded systems. track Track the progress of a world / kernel build vimage An interim utility for managing the virtualized network stack infrastructure. diff --git a/tools/tools/atsectl/Makefile b/tools/tools/atsectl/Makefile deleted file mode 100644 index afe79a91af22..000000000000 --- a/tools/tools/atsectl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -PROG= atsectl - -LIBADD= md - -BINDIR?= /usr/sbin - -MAN= - -.include <bsd.prog.mk> diff --git a/tools/tools/atsectl/atsectl.c b/tools/tools/atsectl/atsectl.c deleted file mode 100644 index 6e593c93382b..000000000000 --- a/tools/tools/atsectl/atsectl.c +++ /dev/null @@ -1,327 +0,0 @@ -/*- - * Copyright (c) 2012 SRI International - * Copyright (c) 2013 Bjoern A. Zeeb - * All rights reserved. - * - * This software was developed by SRI International and the University of - * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) - * ("CTSRD"), as part of the DARPA CRASH research programme. - * - * This software was developed by SRI International and the University of - * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-11-C-0249) - * ("MRC2"), as part of the DARPA MRC research programme. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $ FreeBSD: head/usr.sbin/isfctl/isfctl.c 239685 2012-08-25 18:08:20Z brooks $ - * $FreeBSD$ - */ - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/endian.h> -#include <sys/errno.h> -#include <sys/socket.h> - -#include <assert.h> -#include <err.h> -#include <fcntl.h> -#include <inttypes.h> -#include <kenv.h> -#include <md5.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> - -#include <net/if_dl.h> -#include <net/ethernet.h> - - -#define CONFIG_BLOCK (128 * 1024) -#define DEV_CFI0_PATH "/dev/cfi0" - -static u_char block[CONFIG_BLOCK]; - -#define UNKNOWN 0 -#define CFI 1 -static int fdev = UNKNOWN; -static const char *fdevs[] = { - "UNKNOWN", - "CFI" -}; -static int gflag; - -/* XXX-BZ should include if_atsereg.h. */ -#define ALTERA_ETHERNET_OPTION_BITS_OFF 0x00008000 -#define ALTERA_ETHERNET_OPTION_BITS_LEN 0x00007fff - - -static void -usage(int rc) -{ - - fprintf(stderr, "usage: atsectl [-ghlu] [-s <etheraddr>]\n"); - exit(rc); -} - -static void -read_block(void) -{ - int fd; - - fd = open(DEV_CFI0_PATH, O_RDONLY, 0); - if (fd == -1) - errx(1, "Failed to open " DEV_CFI0_PATH); - else - fdev = CFI; - - if (read(fd, block, sizeof(block)) != CONFIG_BLOCK) - errx(1, "Short read from %s", fdevs[fdev]); - - close(fd); -} - -static void -write_block(void) -{ - int fd; - - assert(fdev == CFI); - - fd = open(DEV_CFI0_PATH, O_WRONLY, 0); - if (fd == -1) - errx(1, "Failed to open " DEV_CFI0_PATH); - - if (write(fd, block, sizeof(block)) != CONFIG_BLOCK) - errx(1, "Short write on %s", fdevs[fdev]); - - close(fd); -} - -static void -print_eaddr(void) -{ - uint32_t safe; - - /* - * XXX-BZ we are on our own: keep in sync with atse(4). - * Everything past the first address is a guess currently. - * So we will always only write one address into there. - */ -#if 0 -root@cheri1:/root # dd if=/dev/isf0 bs=32k skip=1 count=1 | hd -00000000 fe 5a 00 00 00 07 ed ff ed 15 ff ff c0 a8 01 ea |.Z..............| -00000010 ff ff ff ff ff ff ff 00 c0 a8 01 ff ff ff ff ff |................| -00000020 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................| -* -1+0 records in -1+0 records out -32768 bytes transferred in 0.053036 secs (617845 bytes/sec) -00008000 -#endif - - safe = block[ALTERA_ETHERNET_OPTION_BITS_OFF + 0] << 24; - safe |= block[ALTERA_ETHERNET_OPTION_BITS_OFF + 1] << 16; - safe |= block[ALTERA_ETHERNET_OPTION_BITS_OFF + 2] << 8; - safe |= block[ALTERA_ETHERNET_OPTION_BITS_OFF + 3]; - - printf("%02x:%02x:%02x:%02x:%02x:%02x%s\n", - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4], - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 5], - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 6], - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 7], - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 8], - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9], - (safe != le32toh(0x00005afe)) ? - " (invalid control pattern)" : ""); -} - -static void -list(void) -{ - - read_block(); - print_eaddr(); - exit(0); -} - -static void -_set(uint8_t *eaddr) -{ - uint8_t buf[32]; - MD5_CTX ctx; - int rc; - - printf("Original:\n"); - read_block(); - print_eaddr(); - - if (eaddr == NULL) { - /* cfi0.factory_ppr="0x0123456789abcdef" */ - rc = kenv(KENV_GET, "cfi0.factory_ppr", buf, sizeof(buf)); - if (rc == -1) - err(1, "Could not find Intel flash PPR serial\n"); - - MD5Init(&ctx); - MD5Update(&ctx, buf+2, 16); - MD5Final(buf, &ctx); - - /* Set the device specifc address (prefix). */ - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 7] = - buf[14] << 4 | buf[13] >> 4; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 8] = - buf[13] << 4 | buf[12] >> 4; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9] = buf[12] << 4; - /* Just make sure the last half-byte is really zero. */ - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9] &= ~0x0f; - - /* Set (or clear) locally administred flag. */ - if (gflag == 0) - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] |= 2; - else - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] &= ~2; - /* Make sure it is not a MC address by accident we start with. */ - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] &= ~1; - } else { - int e; - - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] = eaddr[0]; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 5] = eaddr[1]; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 6] = eaddr[2]; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 7] = eaddr[3]; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 8] = eaddr[4]; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9] = eaddr[5]; - - e = 0; - if ((eaddr[5] & 0xf) != 0x0) { - e++; - warnx("WARN: Selected Ethernet Address is " - "not multi-MAC compatible.\n"); - } - if (gflag == 0 && ((eaddr[0] & 0x2) == 0x0)) { - e++; - warnx("WARN: Locally administered bit not set.\n"); - } - if ((eaddr[0] & 0x1) != 0x0) { - e++; - warnx("WARN: You are setting a Multicast address.\n"); - } - if (e != 0) - warnx("Suggesting to re-run with: " - "%02x:%02x:%02x:%02x:%02x:%02x", - (eaddr[0] & 0xfe) | 0x2, - eaddr[1], eaddr[2], eaddr[3], eaddr[4], - eaddr[5] & 0xf0); - } - - /* Write the "safe" out, just to be sure. */ - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 0] = 0xfe; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 1] = 0x5a; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 2] = 0x00; - block[ALTERA_ETHERNET_OPTION_BITS_OFF + 3] = 0x00; - - write_block(); - - printf("Updated to:\n"); - read_block(); - print_eaddr(); - exit(0); -} - -static void -update(void) -{ - - _set(NULL); - exit(0); -} - -static void -set(char *eaddrstr) -{ - uint8_t eaddr[ETHER_ADDR_LEN]; - char *p; - long l; - int i; - - memset(eaddr, 0x00, ETHER_ADDR_LEN); - i = 0; - while ((p = strsep(&eaddrstr, ":")) != NULL && i < ETHER_ADDR_LEN) { - errno = 0; - l = strtol(p, (char **)NULL, 16); - if (l == 0 && errno != 0) - errx(1, "Failed to parse Ethernet address given: %s\n", p); - if (l < 0x00 || l > 0xff) - errx(1, "Failed to parse Ethernet address given: %lx\n", l); - eaddr[i++] = strtol(p, (char **)NULL, 16); - } - - if (i != ETHER_ADDR_LEN) - errx(1, "Failed to parse Ethernet address given\n"); - - _set(eaddr); - exit(0); -} - -int -main(int argc, char **argv) -{ - char ch, *s; - - s = NULL; - while ((ch = getopt(argc, argv, "ghlus:")) != -1) { - switch (ch) { - case 'g': - gflag = 1; - break; - case 'h': - usage(0); - /* NOTREACHED */ - break; - case 'l': - list(); - /* NOTREACHED */ - break; - case 'u': - update(); - /* NOTREACHED */ - break; - - case 's': - set(optarg); - /* NOTREACHED */ - break; - - case '?': - default: - usage(1); - /* NOTREACHED */ - break; - } - } - - usage(1); - /* NOTREACHED */ - - return (0); -} diff --git a/tools/tools/crypto/cryptocheck.c b/tools/tools/crypto/cryptocheck.c index 05b761a0c87a..bf2bf9e41340 100644 --- a/tools/tools/crypto/cryptocheck.c +++ b/tools/tools/crypto/cryptocheck.c @@ -86,6 +86,7 @@ * tests * * Hashes: + * ripemd160 160-bit RIPEMD * sha1 SHA-1 * sha224 224-bit SHA-2 * sha256 256-bit SHA-2 @@ -95,35 +96,46 @@ * blake2s Blake2-S * * MACs: + * ripemd160hmac 160-bit RIPEMD HMAC * sha1hmac SHA-1 HMAC * sha224hmac 224-bit SHA-2 HMAC * sha256hmac 256-bit SHA-2 HMAC * sha384hmac 384-bit SHA-2 HMAC * sha512hmac 512-bit SHA-2 HMAC - * gmac 128-bit GMAC + * gmac 128/192/256-bit GMAC + * gmac128 128-bit GMAC * gmac192 192-bit GMAC * gmac256 256-bit GMAC * poly1305 * * Ciphers: - * aes-cbc 128-bit AES-CBC + * aes-cbc 128/192/256-bit AES-CBC + * aes-cbc128 128-bit AES-CBC * aes-cbc192 192-bit AES-CBC * aes-cbc256 256-bit AES-CBC - * aes-ctr 128-bit AES-CTR + * aes-ctr 128/192/256-bit AES-CTR + * aes-ctr128 128-bit AES-CTR * aes-ctr192 192-bit AES-CTR * aes-ctr256 256-bit AES-CTR - * aes-xts 128-bit AES-XTS + * aes-xts 128/256-bit AES-XTS + * aes-xts128 128-bit AES-XTS * aes-xts256 256-bit AES-XTS + * camellia-cbc 128/192/256-bit Camellia-CBC + * camellia-cbc128 128-bit Camellia-CBC + * camellia-cbc192 192-bit Camellia-CBC + * camellia-cbc256 256-bit Camellia-CBC * chacha20 * * Encrypt then Authenticate: * <cipher>+<mac> * * Authenticated Encryption with Associated Data: - * aes-gcm 128-bit AES-GCM + * aes-gcm 128/192/256-bit AES-GCM + * aes-gcm128 128-bit AES-GCM * aes-gcm192 192-bit AES-GCM * aes-gcm256 256-bit AES-GCM - * aes-ccm 128-bit AES-CCM + * aes-ccm 128/192/256-bit AES-CCM + * aes-ccm128 128-bit AES-CCM * aes-ccm192 192-bit AES-CCM * aes-ccm256 256-bit AES-CCM * chacha20-poly1305 Chacha20 with Poly1305 per RFC 8439 @@ -163,6 +175,8 @@ static const struct alg { const EVP_MD *(*evp_md)(void); int pkey; } algs[] = { + { .name = "ripemd160", .mac = CRYPTO_RIPEMD160, .type = T_HASH, + .evp_md = EVP_ripemd160 }, { .name = "sha1", .mac = CRYPTO_SHA1, .type = T_HASH, .evp_md = EVP_sha1 }, { .name = "sha224", .mac = CRYPTO_SHA2_224, .type = T_HASH, @@ -173,6 +187,8 @@ static const struct alg { .evp_md = EVP_sha384 }, { .name = "sha512", .mac = CRYPTO_SHA2_512, .type = T_HASH, .evp_md = EVP_sha512 }, + { .name = "ripemd160hmac", .mac = CRYPTO_RIPEMD160_HMAC, .type = T_HMAC, + .evp_md = EVP_ripemd160 }, { .name = "sha1hmac", .mac = CRYPTO_SHA1_HMAC, .type = T_HMAC, .evp_md = EVP_sha1 }, { .name = "sha224hmac", .mac = CRYPTO_SHA2_224_HMAC, .type = T_HMAC, @@ -187,7 +203,7 @@ static const struct alg { .evp_md = EVP_blake2b512 }, { .name = "blake2s", .mac = CRYPTO_BLAKE2S, .type = T_HASH, .evp_md = EVP_blake2s256 }, - { .name = "gmac", .mac = CRYPTO_AES_NIST_GMAC, .type = T_GMAC, + { .name = "gmac128", .mac = CRYPTO_AES_NIST_GMAC, .type = T_GMAC, .tag_len = AES_GMAC_HASH_LEN, .evp_cipher = EVP_aes_128_gcm }, { .name = "gmac192", .mac = CRYPTO_AES_NIST_GMAC, .type = T_GMAC, .tag_len = AES_GMAC_HASH_LEN, .evp_cipher = EVP_aes_192_gcm }, @@ -195,34 +211,40 @@ static const struct alg { .tag_len = AES_GMAC_HASH_LEN, .evp_cipher = EVP_aes_256_gcm }, { .name = "poly1305", .mac = CRYPTO_POLY1305, .type = T_DIGEST, .key_len = POLY1305_KEY_LEN, .pkey = EVP_PKEY_POLY1305 }, - { .name = "aes-cbc", .cipher = CRYPTO_AES_CBC, .type = T_CIPHER, + { .name = "aes-cbc128", .cipher = CRYPTO_AES_CBC, .type = T_CIPHER, .evp_cipher = EVP_aes_128_cbc }, { .name = "aes-cbc192", .cipher = CRYPTO_AES_CBC, .type = T_CIPHER, .evp_cipher = EVP_aes_192_cbc }, { .name = "aes-cbc256", .cipher = CRYPTO_AES_CBC, .type = T_CIPHER, .evp_cipher = EVP_aes_256_cbc }, - { .name = "aes-ctr", .cipher = CRYPTO_AES_ICM, .type = T_CIPHER, + { .name = "aes-ctr128", .cipher = CRYPTO_AES_ICM, .type = T_CIPHER, .evp_cipher = EVP_aes_128_ctr }, { .name = "aes-ctr192", .cipher = CRYPTO_AES_ICM, .type = T_CIPHER, .evp_cipher = EVP_aes_192_ctr }, { .name = "aes-ctr256", .cipher = CRYPTO_AES_ICM, .type = T_CIPHER, .evp_cipher = EVP_aes_256_ctr }, - { .name = "aes-xts", .cipher = CRYPTO_AES_XTS, .type = T_CIPHER, + { .name = "aes-xts128", .cipher = CRYPTO_AES_XTS, .type = T_CIPHER, .evp_cipher = EVP_aes_128_xts }, { .name = "aes-xts256", .cipher = CRYPTO_AES_XTS, .type = T_CIPHER, .evp_cipher = EVP_aes_256_xts }, + { .name = "camellia-cbc128", .cipher = CRYPTO_CAMELLIA_CBC, + .type = T_CIPHER, .evp_cipher = EVP_camellia_128_cbc }, + { .name = "camellia-cbc192", .cipher = CRYPTO_CAMELLIA_CBC, + .type = T_CIPHER, .evp_cipher = EVP_camellia_192_cbc }, + { .name = "camellia-cbc256", .cipher = CRYPTO_CAMELLIA_CBC, + .type = T_CIPHER, .evp_cipher = EVP_camellia_256_cbc }, { .name = "chacha20", .cipher = CRYPTO_CHACHA20, .type = T_CIPHER, .evp_cipher = EVP_chacha20 }, - { .name = "aes-gcm", .cipher = CRYPTO_AES_NIST_GCM_16, .type = T_AEAD, - .tag_len = AES_GMAC_HASH_LEN, .iv_sizes = { AES_GCM_IV_LEN }, - .evp_cipher = EVP_aes_128_gcm }, + { .name = "aes-gcm128", .cipher = CRYPTO_AES_NIST_GCM_16, + .type = T_AEAD, .tag_len = AES_GMAC_HASH_LEN, + .iv_sizes = { AES_GCM_IV_LEN }, .evp_cipher = EVP_aes_128_gcm }, { .name = "aes-gcm192", .cipher = CRYPTO_AES_NIST_GCM_16, .type = T_AEAD, .tag_len = AES_GMAC_HASH_LEN, .iv_sizes = { AES_GCM_IV_LEN }, .evp_cipher = EVP_aes_192_gcm }, { .name = "aes-gcm256", .cipher = CRYPTO_AES_NIST_GCM_16, .type = T_AEAD, .tag_len = AES_GMAC_HASH_LEN, .iv_sizes = { AES_GCM_IV_LEN }, .evp_cipher = EVP_aes_256_gcm }, - { .name = "aes-ccm", .cipher = CRYPTO_AES_CCM_16, .type = T_AEAD, + { .name = "aes-ccm128", .cipher = CRYPTO_AES_CCM_16, .type = T_AEAD, .tag_len = AES_CBC_MAC_HASH_LEN, .iv_sizes = { 12, 7, 8, 9, 10, 11, 13 }, .evp_cipher = EVP_aes_128_ccm }, { .name = "aes-ccm192", .cipher = CRYPTO_AES_CCM_16, .type = T_AEAD, @@ -1716,6 +1738,19 @@ run_aead_tests(void) run_test_sizes(&algs[i]); } +static void +run_prefix_tests(const char *prefix) +{ + size_t prefix_len; + u_int i; + + prefix_len = strlen(prefix); + for (i = 0; i < nitems(algs); i++) + if (strlen(algs[i].name) >= prefix_len && + memcmp(algs[i].name, prefix, prefix_len) == 0) + run_test_sizes(&algs[i]); +} + int main(int ac, char **av) { @@ -1845,6 +1880,14 @@ main(int ac, char **av) run_eta_tests(); else if (strcasecmp(algname, "aead") == 0) run_aead_tests(); + else if (strcasecmp(algname, "gmac") == 0 || + strcasecmp(algname, "aes-cbc") == 0 || + strcasecmp(algname, "aes-ctr") == 0 || + strcasecmp(algname, "aes-xts") == 0 || + strcasecmp(algname, "camellia-cbc") == 0 || + strcasecmp(algname, "aes-gcm") == 0 || + strcasecmp(algname, "aes-ccm") == 0) + run_prefix_tests(algname); else if (strcasecmp(algname, "all") == 0) { run_hash_tests(); run_mac_tests(); diff --git a/tools/tools/ether_reflect/ether_reflect.1 b/tools/tools/ether_reflect/ether_reflect.1 index 95fe60f762aa..e38e74d49f0a 100644 --- a/tools/tools/ether_reflect/ether_reflect.1 +++ b/tools/tools/ether_reflect/ether_reflect.1 @@ -42,7 +42,7 @@ The .Nm command implements a simple ethernet packet reflector using the -.Xr PCAP 3 +.Xr pcap 3 library and .Xr bpf 4 , the Berkeley Packet Filter. @@ -96,8 +96,8 @@ Rewrite the destination address in each packet to 00:00:00:aa:bb:cc before reflecting the packet. .Sh SEE ALSO .Xr tcpdump 1 , -.Xr bpf 2 , -.Xr pcap 4 , +.Xr bpf 4 , +.Xr pcap 3 , .Xr ifconfig 8 .Sh HISTORY The diff --git a/tools/tools/git/HOWTO b/tools/tools/git/HOWTO index 160696c4d236..9e0501c91896 100644 --- a/tools/tools/git/HOWTO +++ b/tools/tools/git/HOWTO @@ -28,7 +28,7 @@ commits. The intended workflow is: Differential, so try to give each commit a meaningful commit message that gives your reviewers the necessary context to understand your change. -2. Create your reviews bu running this command in your git repo: +2. Create your reviews by running this command in your git repo: $ arcgit -r C1~..C2 -R reviewer -T testplan C1 should be the first commit that you want reviewed, and C2 should be the @@ -36,7 +36,7 @@ commits. The intended workflow is: specifying the -R option multiple times. You can CC (AKA subscribe) people to a review with the -C option. Note that if you subscribe a mailing list to a review, the mailing list will be emailed for every comment or change - made to each review. Please be judicious when subscibing mailing lists to + made to each review. Please be judicious when subscribing mailing lists to reviews. It may be better to instead send a single email to the appropriate list announcing all of the reviews and giving a short summary of the change as a whole, along with a link to the individual reviews. @@ -75,7 +75,7 @@ commits. The intended workflow is: 4. Once the reviews have been approved, you need to prepare your patch series to be committed. This involves squashing the fixes made in code review back into the original commit that they applied to. This gives you a clean - series of commits that are ready to be commited back to svn. + series of commits that are ready to be pushed to git. First, merge each of your review branches back into your main development branch. For example: diff --git a/tools/tools/git/arcgit b/tools/tools/git/arcgit index 60d9abe58595..283856ae128f 100755 --- a/tools/tools/git/arcgit +++ b/tools/tools/git/arcgit @@ -35,8 +35,8 @@ # # When your reviews are complete, merge all of the review_DXXXX branches # together, and then do a git rebase -ik to meld the code review fixes into the -# commit that they fixed. Now you have a clean series of patches to commit to -# svn. +# commit that they fixed. Now you have a clean series of patches to push to +# git. usage() { diff --git a/tools/tools/git/git-arc.1 b/tools/tools/git/git-arc.1 index 984b1e8f32e5..afa9cd6e3d1f 100644 --- a/tools/tools/git/git-arc.1 +++ b/tools/tools/git/git-arc.1 @@ -24,12 +24,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 17, 2021 +.Dd November 7, 2022 .Dt GIT-ARC 1 .Os .Sh NAME .Nm git arc -.Nd a wrapper to improve integration betwen git and arcanist +.Nd a wrapper to improve integration between git and arcanist .Sh SYNOPSIS .Nm .Cm create @@ -48,7 +48,8 @@ .Op Ar commit Ns | Ns Ar commit-range .Nm .Cm update -.Op Ar commit Ns | Ns Ar commit-range Oc +.Op Fl m Ar message +.Op Ar commit Ns | Ns Ar commit-range .Sh DESCRIPTION The .Nm @@ -61,7 +62,7 @@ assumes a one-to-one relationship between git commits and Differential Revisions, and the Differential Revision title must match the summary line of the corresponding commit. In particular, the commit summaries must be unique across all open -Differential Revisions authored the submitter. +Differential Revisions authored by the submitter. .Pp The first parameter must be a verb. The available verbs are: @@ -78,7 +79,7 @@ Add one or more reviewers, separated by commas, to revision(s) being created. Argument(s) must be existing Phabricator user or group. .It Fl r Ar subscriber Add one or more subscribers, separated by commas, to revision(s) being created. -Argument(s) must be existing Phabricator user or group. +Each argument must be an existing Phabricator user or group. .It Fl p Ar parent Specify the parent of the first commit in the list. This is useful when adding more commits on top of the already existing @@ -87,7 +88,7 @@ stack in Phabricator. .It Cm list Print the associated Differential Revisions for the specified commits. .It Cm patch -Try to apply a patch from a Differential revision to the currently +Try to apply a patch from a Differential Revision to the currently checked out tree. .It Cm stage Prepare a series of commits to be pushed to the upstream @@ -104,7 +105,16 @@ Revisions. Synchronize the Differential Revisions associated with the specified commits. Currently only the diff is updated; the review description and other -metadata is not synchronized. +metadata are not synchronized. +If a message is specified with +.Fl m , +that message is added as a note to the Differential Revision. +If no message is supplied, +the user's editor will be opened to provide an update message for +each revision. +If an empty message is supplied via +.Fl m , +then no notes will be added when updating Differential Revisions. .El .Sh CONFIGURATION These are manipulated by @@ -141,14 +151,14 @@ Defaults to false. .Sh EXAMPLES The typical end-to-end usage looks something like this. .Pp -Commit changes with a message and create a Differential review: +Commit changes with a message and create a Differential Review: .Bd -literal -offset indent $ git commit -m "kern: Rewrite in Rust" $ git arc create HEAD .Ed .Pp Make changes to the diff based on review feedback, then amend the -changes to the existing commit and update the Differential review: +changes to the existing commit and update the Differential Review: .Bd -literal -offset indent $ git commit --amend $ git arc update HEAD diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh index 35a815ece137..5e8cc44ce3cc 100644 --- a/tools/tools/git/git-arc.sh +++ b/tools/tools/git/git-arc.sh @@ -53,7 +53,7 @@ Commands: list <commit>|<commit range> patch <diff1> [<diff2> ...] stage [-b branch] [<commit>|<commit range>] - update [<commit>|<commit range>] + update [-m message] [<commit>|<commit range>] Description: Create or manage FreeBSD Phabricator reviews based on git commits. There @@ -187,6 +187,22 @@ log2diff() fi } +# Look for an open revision with a title equal to the input string. Return +# a possibly empty list of Differential revision IDs. +title2diff() +{ + local title + + title=$(echo $1 | sed 's/"/\\"/g') + # arc list output always includes ANSI escape sequences, strip them. + arc list | sed 's/\x1b\[[0-9;]*m//g' | \ + awk -F': ' '{ + if (substr($0, index($0, FS) + length(FS)) == "'"$title"'") { + print substr($1, match($1, "D[1-9][0-9]*")) + } + }' +} + commit2diff() { local commit diff title @@ -204,7 +220,7 @@ commit2diff() # Second, search the open reviews returned by 'arc list' looking # for a subject match. title=$(git show -s --format=%s "$commit") - diff=$(arc list | grep -F "$title" | grep -E -o 'D[1-9][0-9]*:' | tr -d ':') + diff=$(title2diff "$title") if [ -z "$diff" ]; then err "could not find review for '${title}'" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then @@ -229,8 +245,6 @@ create_one_review() return 1 fi - git checkout -q "$commit" - msg=$(mktemp) git show -s --format='%B' "$commit" > "$msg" printf "\nTest Plan:\n" >> "$msg" @@ -240,7 +254,8 @@ create_one_review() printf "%s\n" "${subscribers}" >> "$msg" yes | env EDITOR=true \ - arc diff --message-file "$msg" --never-apply-patches --create --allow-untracked $BROWSE HEAD~ + arc diff --message-file "$msg" --never-apply-patches --create \ + --allow-untracked $BROWSE --head "$commit" "${commit}~" [ $? -eq 0 ] || err "could not create Phabricator diff" if [ -n "$parent" ]; then @@ -291,7 +306,7 @@ prompt() local resp if [ "$ASSUME_YES" ]; then - return 1 + return 0 fi printf "\nDoes this look OK? [y/N] " @@ -317,24 +332,6 @@ show_and_prompt() prompt } -save_head() -{ - local orig - - if ! orig=$(git symbolic-ref --short -q HEAD); then - orig=$(git show -s --pretty=%H HEAD) - fi - SAVED_HEAD=$orig -} - -restore_head() -{ - if [ -n "$SAVED_HEAD" ]; then - git checkout -q "$SAVED_HEAD" - SAVED_HEAD= - fi -} - build_commit_list() { local chash _commits commits @@ -366,9 +363,9 @@ gitarc__create() l) list=1 ;; - p) - prev="$OPTARG" - ;; + p) + prev="$OPTARG" + ;; r) reviewers="$OPTARG" ;; @@ -394,7 +391,6 @@ gitarc__create() doprompt= fi - save_head for commit in ${commits}; do if create_one_review "$commit" "$reviewers" "$subscribers" "$prev" \ "$doprompt"; then @@ -403,14 +399,14 @@ gitarc__create() prev="" fi done - restore_head } gitarc__list() { - local chash commit commits diff title + local chash commit commits diff openrevs title commits=$(build_commit_list "$@") + openrevs=$(arc list) for commit in $commits; do chash=$(git show -s --format='%C(auto)%h' "$commit") @@ -423,10 +419,11 @@ gitarc__list() fi # This does not use commit2diff as it needs to handle errors - # differently and keep the entire status. The extra 'cat' - # after 'fgrep' avoids erroring due to -e. + # differently and keep the entire status. title=$(git show -s --format=%s "$commit") - diff=$(arc list | grep -F "$title" | cat) + diff=$(echo "$openrevs" | \ + awk -F'D[1-9][0-9]*:\.\\[m ' \ + '{if ($2 == "'"$(echo $title | sed 's/"/\\"/g')"'") print $0}') if [ -z "$diff" ]; then echo "No Review : $title" elif [ "$(echo "$diff" | wc -l)" -ne 1 ]; then @@ -456,7 +453,7 @@ gitarc__patch() gitarc__stage() { - local author branch commit commits diff reviewers tmp + local author branch commit commits diff reviewers title tmp branch=main while getopts b: o; do @@ -482,8 +479,8 @@ gitarc__stage() tmp=$(mktemp) for commit in $commits; do git show -s --format=%B "$commit" > "$tmp" - diff=$(arc list | grep -F "$(git show -s --format=%s "$commit")" | - grep -E -o 'D[1-9][0-9]*:' | tr -d ':') + title=$(git show -s --format=%s "$commit") + diff=$(title2diff "$title") if [ -n "$diff" ]; then # XXX this leaves an extra newline in some cases. reviewers=$(diff2reviewers "$diff" | sed '/^$/d' | paste -sd ',' - | sed 's/,/, /g') @@ -504,10 +501,22 @@ gitarc__stage() gitarc__update() { - local commit commits diff + local commit commits diff have_msg msg + + while getopts m: o; do + case "$o" in + m) + msg="$OPTARG" + have_msg=1 + ;; + *) + err_usage + ;; + esac + done + shift $((OPTIND-1)) commits=$(build_commit_list "$@") - save_head for commit in ${commits}; do diff=$(commit2diff "$commit") @@ -515,14 +524,17 @@ gitarc__update() break fi - git checkout -q "$commit" - # The linter is stupid and applies patches to the working copy. # This would be tolerable if it didn't try to correct "misspelled" variable # names. - arc diff --allow-untracked --never-apply-patches --update "$diff" HEAD~ + if [ -n "$have_msg" ]; then + arc diff --message "$msg" --allow-untracked --never-apply-patches \ + --update "$diff" --head "$commit" "${commit}~" + else + arc diff --allow-untracked --never-apply-patches --update "$diff" \ + --head "$commit" "${commit}~" + fi done - restore_head } set -e @@ -582,6 +594,16 @@ USAGE= # shellcheck disable=SC1090 . "$git_sh_setup" +# git commands use GIT_EDITOR instead of EDITOR, so try to provide consistent +# behaviour. Ditto for PAGER. This makes git-arc play nicer with editor +# plugins like vim-fugitive. +if [ -n "$GIT_EDITOR" ]; then + EDITOR=$GIT_EDITOR +fi +if [ -n "$GIT_PAGER" ]; then + PAGER=$GIT_PAGER +fi + # Bail if the working tree is unclean, except for "list" and "patch" # operations. case $verb in @@ -596,6 +618,4 @@ if [ "$(git config --bool --get arc.browse 2>/dev/null || echo false)" != "false BROWSE=--browse fi -trap restore_head EXIT INT - gitarc__"${verb}" "$@" diff --git a/tools/tools/git/mfc-candidates.sh b/tools/tools/git/mfc-candidates.sh new file mode 100644 index 000000000000..45f3b645e4ba --- /dev/null +++ b/tools/tools/git/mfc-candidates.sh @@ -0,0 +1,176 @@ +#!/bin/sh + +#- +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright 2022 The FreeBSD Foundation +# +# This software was developed by Ed Maste +# under sponsorship from the FreeBSD Foundation. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted providing that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +from_branch=freebsd/main +author="${USER}" + +# Get the FreeBSD repository +repo=$(basename "$(git remote get-url freebsd 2>/dev/null)" 2>/dev/null) + +if [ "${repo}" = "ports.git" ]; then + year=$(date '+%Y') + month=$(date '+%m') + qtr=$(((month-1) / 3 + 1)) + to_branch="freebsd/${year}Q${qtr}" +elif [ "${repo}" = "src.git" ]; then + to_branch=freebsd/stable/13 + # If pwd is a stable or release branch tree, default to it. + cur_branch=$(git symbolic-ref --short HEAD 2>/dev/null) + case $cur_branch in + stable/*) + to_branch=$cur_branch + ;; + releng/*) + to_branch=$cur_branch + major=${cur_branch#releng/} + major=${major%.*} + from_branch=freebsd/stable/$major + esac +else + echo "pwd is not under a ports or src repository." + exit 0 +fi + +params() +{ + echo "from: $from_branch" + echo "to: $to_branch" + if [ -n "$author" ]; then + echo "author/committer: $author" + else + echo "author/committer: <all>" + fi +} + +usage() +{ + echo "usage: $(basename $0) [-ah] [-f from_branch] [-t to_branch] [-u user] [-X exclude_file] [path ...]" + echo + params + exit 0 +} + +while getopts "af:ht:u:vX:" opt; do + case $opt in + a) + # All authors/committers + author= + ;; + f) + from_branch=$OPTARG + ;; + h) + usage + ;; + t) + to_branch=$OPTARG + ;; + u) + author=$OPTARG + ;; + v) + verbose=1 + ;; + X) + if [ ! -r "$OPTARG" ]; then + echo "Exclude file $OPTARG not readable" >&2 + exit 1 + fi + exclude_file=$OPTARG + ;; + esac +done +shift $(($OPTIND - 1)) + +if [ $verbose ]; then + params + echo +fi + +authorarg= +if [ -n "$author" ]; then + # Match user ID in the email portion of author or committer + authorarg="--author <${author}@ --committer <${author}@" +fi + +# Commits in from_branch after branch point +commits_from() +{ + git rev-list --first-parent $authorarg $to_branch..$from_branch "$@" |\ + sort +} + +# "cherry picked from" hashes from commits in to_branch after branch point +commits_to() +{ + git log $from_branch..$to_branch --grep 'cherry picked from' "$@" |\ + sed -E -n 's/^[[:space:]]*\(cherry picked from commit ([0-9a-f]+)\)[[:space:]]*$/\1/p' |\ + sort +} + +# Turn a list of short hashes (and optional descriptions) into a list of full +# hashes. +canonicalize_hashes() +{ + while read hash rest; do + if ! git show --pretty=%H --no-patch $hash; then + echo "error parsing hash list" >&2 + exit 1 + fi + done | sort +} + +workdir=$(mktemp -d /tmp/find-mfc.XXXXXXXXXX) +from_list=$workdir/commits-from +to_list=$workdir/commits-to +candidate_list=$workdir/candidates + +if [ -n "$exclude_file" ]; then + exclude_list=$workdir/commits-exclude + canonicalize_hashes < $exclude_file > $exclude_list +fi + +commits_from "$@" > $from_list +commits_to "$@" > $to_list + +comm -23 $from_list $to_list > $candidate_list + +if [ -n "$exclude_file" ]; then + mv $candidate_list $candidate_list.bak + comm -23 $candidate_list.bak $exclude_list > $candidate_list +fi + +# Sort by (but do not print) commit time +while read hash; do + git show --pretty='%ct %h %s' --no-patch $hash +done < $candidate_list | sort -n | cut -d ' ' -f 2- + +rm -rf "$workdir" diff --git a/tools/tools/locale/Makefile b/tools/tools/locale/Makefile index b66e39ec07aa..354812b4fc2b 100644 --- a/tools/tools/locale/Makefile +++ b/tools/tools/locale/Makefile @@ -123,11 +123,11 @@ ENCODINGS= UTF-8 \ UTF-32 # CLDR files -CLDRVERSION= 39.0 +CLDRVERSION= 41.0 CLDRFILES_CORE= https://unicode.org/Public/cldr/${CLDRVERSION:R}/core.zip CLDRFILES_KEY= https://unicode.org/Public/cldr/${CLDRVERSION:R}/cldr-keyboards-${CLDRVERSION}.zip CLDRFILES_TOOLS=https://unicode.org/Public/cldr/${CLDRVERSION:R}/cldr-tools-${CLDRVERSION}.jar -CLDRFILES_UCD= http://www.unicode.org/Public/zipped/13.0.0/UCD.zip +CLDRFILES_UCD= http://www.unicode.org/Public/zipped/14.0.0/UCD.zip # fetch and extract targets ${UNIDIR}: diff --git a/tools/tools/locale/etc/final-maps/map.UTF-8 b/tools/tools/locale/etc/final-maps/map.UTF-8 index f49b7f56acd2..e16fd6544b6e 100644 --- a/tools/tools/locale/etc/final-maps/map.UTF-8 +++ b/tools/tools/locale/etc/final-maps/map.UTF-8 @@ -5,29 +5,10 @@ # charset: UTF-8 ###################### ################################################################################################# -# Copyright 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in # -# http://www.unicode.org/copyright.html. # -# # -# Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode # -# data files and any associated documentation (the "Data Files") or Unicode software and any # -# associated documentation (the "Software") to deal in the Data Files or Software without # -# restriction, including without limitation the rights to use, copy, modify, merge, publish, # -# distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom # -# the Data Files or Software are furnished to do so, provided that (a) the above copyright # -# notice(s) and this permission notice appear with all copies of the Data Files or Software, # -# (b) both the above copyright notice(s) and this permission notice appear in associated # -# documentation, and (c) there is clear notice in each modified Data File or in the Software as # -# well as in the documentation associated with the Data File(s) or Software that the data or # -# software has been modified. # -# # -# THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A # -# PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT # -# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR # -# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, # -# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # -# CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. # -################################################################################################# +# Copyright © 1991-2022 Unicode, Inc. +# For terms of use, see http://www.unicode.org/copyright.html +# SPDX-License-Identifier: Unicode-DFS-2016 +# CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) <code_set_name> "UTF-8" <mb_cur_min> 1 @@ -1685,6 +1666,7 @@ CHARMAP <ARABIC_SMALL_KASRA> \xD8\x9A <ARABIC_SEMICOLON> \xD8\x9B <ARABIC_LETTER_MARK> \xD8\x9C +<ARABIC_END_OF_TEXT_MARK> \xD8\x9D <ARABIC_TRIPLE_DOT_PUNCTUATION_MARK> \xD8\x9E <ARABIC_QUESTION_MARK> \xD8\x9F <ARABIC_LETTER_KASHMIRI_YEH> \xD8\xA0 @@ -2249,6 +2231,47 @@ CHARMAP <SYRIAC_LETTER_MALAYALAM_LLA> \xE0\xA1\xA8 <SYRIAC_LETTER_MALAYALAM_LLLA> \xE0\xA1\xA9 <SYRIAC_LETTER_MALAYALAM_SSA> \xE0\xA1\xAA +<ARABIC_LETTER_ALEF_WITH_ATTACHED_FATHA> \xE0\xA1\xB0 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_TOP_RIGHT_FATHA> \xE0\xA1\xB1 +<ARABIC_LETTER_ALEF_WITH_RIGHT_MIDDLE_STROKE> \xE0\xA1\xB2 +<ARABIC_LETTER_ALEF_WITH_LEFT_MIDDLE_STROKE> \xE0\xA1\xB3 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_KASRA> \xE0\xA1\xB4 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_BOTTOM_RIGHT_KASRA> \xE0\xA1\xB5 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_ROUND_DOT_ABOVE> \xE0\xA1\xB6 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_RIGHT_ROUND_DOT> \xE0\xA1\xB7 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_LEFT_ROUND_DOT> \xE0\xA1\xB8 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_ROUND_DOT_BELOW> \xE0\xA1\xB9 +<ARABIC_LETTER_ALEF_WITH_DOT_ABOVE> \xE0\xA1\xBA +<ARABIC_LETTER_ALEF_WITH_ATTACHED_TOP_RIGHT_FATHA_AND_DOT_ABOVE> \xE0\xA1\xBB +<ARABIC_LETTER_ALEF_WITH_RIGHT_MIDDLE_STROKE_AND_DOT_ABOVE> \xE0\xA1\xBC +<ARABIC_LETTER_ALEF_WITH_ATTACHED_BOTTOM_RIGHT_KASRA_AND_DOT_ABOVE> \xE0\xA1\xBD +<ARABIC_LETTER_ALEF_WITH_ATTACHED_TOP_RIGHT_FATHA_AND_LEFT_RING> \xE0\xA1\xBE +<ARABIC_LETTER_ALEF_WITH_RIGHT_MIDDLE_STROKE_AND_LEFT_RING> \xE0\xA1\xBF +<ARABIC_LETTER_ALEF_WITH_ATTACHED_BOTTOM_RIGHT_KASRA_AND_LEFT_RING> \xE0\xA2\x80 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_RIGHT_HAMZA> \xE0\xA2\x81 +<ARABIC_LETTER_ALEF_WITH_ATTACHED_LEFT_HAMZA> \xE0\xA2\x82 +<ARABIC_TATWEEL_WITH_OVERSTRUCK_HAMZA> \xE0\xA2\x83 +<ARABIC_TATWEEL_WITH_OVERSTRUCK_WAW> \xE0\xA2\x84 +<ARABIC_TATWEEL_WITH_TWO_DOTS_BELOW> \xE0\xA2\x85 +<ARABIC_LETTER_THIN_YEH> \xE0\xA2\x86 +<ARABIC_BASELINE_ROUND_DOT> \xE0\xA2\x87 +<ARABIC_RAISED_ROUND_DOT> \xE0\xA2\x88 +<ARABIC_LETTER_NOON_WITH_INVERTED_SMALL_V> \xE0\xA2\x89 +<ARABIC_LETTER_HAH_WITH_INVERTED_SMALL_V_BELOW> \xE0\xA2\x8A +<ARABIC_LETTER_TAH_WITH_DOT_BELOW> \xE0\xA2\x8B +<ARABIC_LETTER_TAH_WITH_THREE_DOTS_BELOW> \xE0\xA2\x8C +<ARABIC_LETTER_KEHEH_WITH_TWO_DOTS_VERTICALLY_BELOW> \xE0\xA2\x8D +<ARABIC_VERTICAL_TAIL> \xE0\xA2\x8E +<ARABIC_POUND_MARK_ABOVE> \xE0\xA2\x90 +<ARABIC_PIASTRE_MARK_ABOVE> \xE0\xA2\x91 +<ARABIC_SMALL_HIGH_WORD_AL-JUZ> \xE0\xA2\x98 +<ARABIC_SMALL_LOW_WORD_ISHMAAM> \xE0\xA2\x99 +<ARABIC_SMALL_LOW_WORD_IMAALA> \xE0\xA2\x9A +<ARABIC_SMALL_LOW_WORD_TASHEEL> \xE0\xA2\x9B +<ARABIC_MADDA_WAAJIB> \xE0\xA2\x9C +<ARABIC_SUPERSCRIPT_ALEF_MOKHASSAS> \xE0\xA2\x9D +<ARABIC_DOUBLED_MADDA> \xE0\xA2\x9E +<ARABIC_HALF_MADDA_OVER_MADDA> \xE0\xA2\x9F <ARABIC_LETTER_BEH_WITH_SMALL_V_BELOW> \xE0\xA2\xA0 <ARABIC_LETTER_BEH_WITH_HAMZA_ABOVE> \xE0\xA2\xA1 <ARABIC_LETTER_JEEM_WITH_TWO_DOTS_ABOVE> \xE0\xA2\xA2 @@ -2270,6 +2293,7 @@ CHARMAP <ARABIC_LETTER_ZAIN_WITH_INVERTED_V_ABOVE> \xE0\xA2\xB2 <ARABIC_LETTER_AIN_WITH_THREE_DOTS_BELOW> \xE0\xA2\xB3 <ARABIC_LETTER_KAF_WITH_DOT_BELOW> \xE0\xA2\xB4 +<ARABIC_LETTER_QAF_WITH_DOT_BELOW_AND_NO_DOTS_ABOVE> \xE0\xA2\xB5 <ARABIC_LETTER_BEH_WITH_SMALL_MEEM_ABOVE> \xE0\xA2\xB6 <ARABIC_LETTER_PEH_WITH_SMALL_MEEM_ABOVE> \xE0\xA2\xB7 <ARABIC_LETTER_TEH_WITH_SMALL_TEH_ABOVE> \xE0\xA2\xB8 @@ -2288,6 +2312,17 @@ CHARMAP <ARABIC_LETTER_JEEM_WITH_THREE_DOTS_ABOVE> \xE0\xA3\x85 <ARABIC_LETTER_JEEM_WITH_THREE_DOTS_BELOW> \xE0\xA3\x86 <ARABIC_LETTER_LAM_WITH_SMALL_ARABIC_LETTER_TAH_ABOVE> \xE0\xA3\x87 +<ARABIC_LETTER_GRAF> \xE0\xA3\x88 +<ARABIC_SMALL_FARSI_YEH> \xE0\xA3\x89 +<ARABIC_SMALL_HIGH_FARSI_YEH> \xE0\xA3\x8A +<ARABIC_SMALL_HIGH_YEH_BARREE_WITH_TWO_DOTS_BELOW> \xE0\xA3\x8B +<ARABIC_SMALL_HIGH_WORD_SAH> \xE0\xA3\x8C +<ARABIC_SMALL_HIGH_ZAH> \xE0\xA3\x8D +<ARABIC_LARGE_ROUND_DOT_ABOVE> \xE0\xA3\x8E +<ARABIC_LARGE_ROUND_DOT_BELOW> \xE0\xA3\x8F +<ARABIC_SUKUN_BELOW> \xE0\xA3\x90 +<ARABIC_LARGE_CIRCLE_BELOW> \xE0\xA3\x91 +<ARABIC_LARGE_ROUND_DOT_INSIDE_CIRCLE_BELOW> \xE0\xA3\x92 <ARABIC_SMALL_LOW_WAW> \xE0\xA3\x93 <ARABIC_SMALL_HIGH_WORD_AR-RUB> \xE0\xA3\x94 <ARABIC_SMALL_HIGH_SAD> \xE0\xA3\x95 @@ -2946,6 +2981,7 @@ CHARMAP <TELUGU_LETTER_SSA> \xE0\xB0\xB7 <TELUGU_LETTER_SA> \xE0\xB0\xB8 <TELUGU_LETTER_HA> \xE0\xB0\xB9 +<TELUGU_SIGN_NUKTA> \xE0\xB0\xBC <TELUGU_SIGN_AVAGRAHA> \xE0\xB0\xBD <TELUGU_VOWEL_SIGN_AA> \xE0\xB0\xBE <TELUGU_VOWEL_SIGN_I> \xE0\xB0\xBF @@ -2966,6 +3002,7 @@ CHARMAP <TELUGU_LETTER_TSA> \xE0\xB1\x98 <TELUGU_LETTER_DZA> \xE0\xB1\x99 <TELUGU_LETTER_RRRA> \xE0\xB1\x9A +<TELUGU_LETTER_NAKAARA_POLLU> \xE0\xB1\x9D <TELUGU_LETTER_VOCALIC_RR> \xE0\xB1\xA0 <TELUGU_LETTER_VOCALIC_LL> \xE0\xB1\xA1 <TELUGU_VOWEL_SIGN_VOCALIC_L> \xE0\xB1\xA2 @@ -3061,6 +3098,7 @@ CHARMAP <KANNADA_SIGN_VIRAMA> \xE0\xB3\x8D <KANNADA_LENGTH_MARK> \xE0\xB3\x95 <KANNADA_AI_LENGTH_MARK> \xE0\xB3\x96 +<KANNADA_LETTER_NAKAARA_POLLU> \xE0\xB3\x9D <KANNADA_LETTER_FA> \xE0\xB3\x9E <KANNADA_LETTER_VOCALIC_RR> \xE0\xB3\xA0 <KANNADA_LETTER_VOCALIC_LL> \xE0\xB3\xA1 @@ -5418,6 +5456,7 @@ CHARMAP <TAGALOG_LETTER_BA> \xE1\x9C\x8A <TAGALOG_LETTER_MA> \xE1\x9C\x8B <TAGALOG_LETTER_YA> \xE1\x9C\x8C +<TAGALOG_LETTER_RA> \xE1\x9C\x8D <TAGALOG_LETTER_LA> \xE1\x9C\x8E <TAGALOG_LETTER_WA> \xE1\x9C\x8F <TAGALOG_LETTER_SA> \xE1\x9C\x90 @@ -5425,6 +5464,8 @@ CHARMAP <TAGALOG_VOWEL_SIGN_I> \xE1\x9C\x92 <TAGALOG_VOWEL_SIGN_U> \xE1\x9C\x93 <TAGALOG_SIGN_VIRAMA> \xE1\x9C\x94 +<TAGALOG_SIGN_PAMUDPOD> \xE1\x9C\x95 +<TAGALOG_LETTER_ARCHAIC_RA> \xE1\x9C\x9F <HANUNOO_LETTER_A> \xE1\x9C\xA0 <HANUNOO_LETTER_I> \xE1\x9C\xA1 <HANUNOO_LETTER_U> \xE1\x9C\xA2 @@ -5615,6 +5656,7 @@ CHARMAP <MONGOLIAN_FREE_VARIATION_SELECTOR_TWO> \xE1\xA0\x8C <MONGOLIAN_FREE_VARIATION_SELECTOR_THREE> \xE1\xA0\x8D <MONGOLIAN_VOWEL_SEPARATOR> \xE1\xA0\x8E +<MONGOLIAN_FREE_VARIATION_SELECTOR_FOUR> \xE1\xA0\x8F <MONGOLIAN_DIGIT_ZERO> \xE1\xA0\x90 <MONGOLIAN_DIGIT_ONE> \xE1\xA0\x91 <MONGOLIAN_DIGIT_TWO> \xE1\xA0\x92 @@ -6219,6 +6261,20 @@ CHARMAP <COMBINING_PARENTHESES_OVERLAY> \xE1\xAA\xBE <COMBINING_LATIN_SMALL_LETTER_W_BELOW> \xE1\xAA\xBF <COMBINING_LATIN_SMALL_LETTER_TURNED_W_BELOW> \xE1\xAB\x80 +<COMBINING_LEFT_PARENTHESIS_ABOVE_LEFT> \xE1\xAB\x81 +<COMBINING_RIGHT_PARENTHESIS_ABOVE_RIGHT> \xE1\xAB\x82 +<COMBINING_LEFT_PARENTHESIS_BELOW_LEFT> \xE1\xAB\x83 +<COMBINING_RIGHT_PARENTHESIS_BELOW_RIGHT> \xE1\xAB\x84 +<COMBINING_SQUARE_BRACKETS_ABOVE> \xE1\xAB\x85 +<COMBINING_NUMBER_SIGN_ABOVE> \xE1\xAB\x86 +<COMBINING_INVERTED_DOUBLE_ARCH_ABOVE> \xE1\xAB\x87 +<COMBINING_PLUS_SIGN_ABOVE> \xE1\xAB\x88 +<COMBINING_DOUBLE_PLUS_SIGN_ABOVE> \xE1\xAB\x89 +<COMBINING_DOUBLE_PLUS_SIGN_BELOW> \xE1\xAB\x8A +<COMBINING_TRIPLE_ACUTE_ACCENT> \xE1\xAB\x8B +<COMBINING_LATIN_SMALL_LETTER_INSULAR_G> \xE1\xAB\x8C +<COMBINING_LATIN_SMALL_LETTER_INSULAR_R> \xE1\xAB\x8D +<COMBINING_LATIN_SMALL_LETTER_INSULAR_T> \xE1\xAB\x8E <BALINESE_SIGN_ULU_RICEM> \xE1\xAC\x80 <BALINESE_SIGN_ULU_CANDRA> \xE1\xAC\x81 <BALINESE_SIGN_CECEK> \xE1\xAC\x82 @@ -6295,6 +6351,7 @@ CHARMAP <BALINESE_LETTER_VE_SASAK> \xE1\xAD\x89 <BALINESE_LETTER_ZAL_SASAK> \xE1\xAD\x8A <BALINESE_LETTER_ASYURA_SASAK> \xE1\xAD\x8B +<BALINESE_LETTER_ARCHAIC_JNYA> \xE1\xAD\x8C <BALINESE_DIGIT_ZERO> \xE1\xAD\x90 <BALINESE_DIGIT_ONE> \xE1\xAD\x91 <BALINESE_DIGIT_TWO> \xE1\xAD\x92 @@ -6340,6 +6397,8 @@ CHARMAP <BALINESE_MUSICAL_SYMBOL_LEFT-HAND_CLOSED_PLAK> \xE1\xAD\xBA <BALINESE_MUSICAL_SYMBOL_LEFT-HAND_CLOSED_PLUK> \xE1\xAD\xBB <BALINESE_MUSICAL_SYMBOL_LEFT-HAND_OPEN_PING> \xE1\xAD\xBC +<BALINESE_PANTI_LANTANG> \xE1\xAD\xBD +<BALINESE_PAMADA_LANTANG> \xE1\xAD\xBE <SUNDANESE_SIGN_PANYECEK> \xE1\xAE\x80 <SUNDANESE_SIGN_PANGLAYAR> \xE1\xAE\x81 <SUNDANESE_SIGN_PANGWISAD> \xE1\xAE\x82 @@ -6938,6 +6997,7 @@ CHARMAP <COMBINING_KAVYKA_ABOVE_LEFT> \xE1\xB7\xB7 <COMBINING_DOT_ABOVE_LEFT> \xE1\xB7\xB8 <COMBINING_WIDE_INVERTED_BRIDGE_BELOW> \xE1\xB7\xB9 +<COMBINING_DOT_BELOW_LEFT> \xE1\xB7\xBA <COMBINING_DELETION_MARK> \xE1\xB7\xBB <COMBINING_DOUBLE_INVERTED_BREVE_BELOW> \xE1\xB7\xBC <COMBINING_ALMOST_EQUAL_TO_BELOW> \xE1\xB7\xBD @@ -7617,6 +7677,7 @@ CHARMAP <RUBLE_SIGN> \xE2\x82\xBD <LARI_SIGN> \xE2\x82\xBE <BITCOIN_SIGN> \xE2\x82\xBF +<SOM_SIGN> \xE2\x83\x80 <COMBINING_LEFT_HARPOON_ABOVE> \xE2\x83\x90 <COMBINING_RIGHT_HARPOON_ABOVE> \xE2\x83\x91 <COMBINING_LONG_VERTICAL_LINE_OVERLAY> \xE2\x83\x92 @@ -10460,6 +10521,7 @@ CHARMAP <GLAGOLITIC_CAPITAL_LETTER_SHTAPIC> \xE2\xB0\xAC <GLAGOLITIC_CAPITAL_LETTER_TROKUTASTI_A> \xE2\xB0\xAD <GLAGOLITIC_CAPITAL_LETTER_LATINATE_MYSLITE> \xE2\xB0\xAE +<GLAGOLITIC_CAPITAL_LETTER_CAUDATE_CHRIVI> \xE2\xB0\xAF <GLAGOLITIC_SMALL_LETTER_AZU> \xE2\xB0\xB0 <GLAGOLITIC_SMALL_LETTER_BUKY> \xE2\xB0\xB1 <GLAGOLITIC_SMALL_LETTER_VEDE> \xE2\xB0\xB2 @@ -10507,6 +10569,7 @@ CHARMAP <GLAGOLITIC_SMALL_LETTER_SHTAPIC> \xE2\xB1\x9C <GLAGOLITIC_SMALL_LETTER_TROKUTASTI_A> \xE2\xB1\x9D <GLAGOLITIC_SMALL_LETTER_LATINATE_MYSLITE> \xE2\xB1\x9E +<GLAGOLITIC_SMALL_LETTER_CAUDATE_CHRIVI> \xE2\xB1\x9F <LATIN_CAPITAL_LETTER_L_WITH_DOUBLE_BAR> \xE2\xB1\xA0 <LATIN_SMALL_LETTER_L_WITH_DOUBLE_BAR> \xE2\xB1\xA1 <LATIN_CAPITAL_LETTER_L_WITH_MIDDLE_TILDE> \xE2\xB1\xA2 @@ -10955,6 +11018,17 @@ CHARMAP <CROSS_PATTY_WITH_RIGHT_CROSSBAR> \xE2\xB9\x90 <CROSS_PATTY_WITH_LEFT_CROSSBAR> \xE2\xB9\x91 <TIRONIAN_SIGN_CAPITAL_ET> \xE2\xB9\x92 +<MEDIEVAL_EXCLAMATION_MARK> \xE2\xB9\x93 +<MEDIEVAL_QUESTION_MARK> \xE2\xB9\x94 +<LEFT_SQUARE_BRACKET_WITH_STROKE> \xE2\xB9\x95 +<RIGHT_SQUARE_BRACKET_WITH_STROKE> \xE2\xB9\x96 +<LEFT_SQUARE_BRACKET_WITH_DOUBLE_STROKE> \xE2\xB9\x97 +<RIGHT_SQUARE_BRACKET_WITH_DOUBLE_STROKE> \xE2\xB9\x98 +<TOP_HALF_LEFT_PARENTHESIS> \xE2\xB9\x99 +<TOP_HALF_RIGHT_PARENTHESIS> \xE2\xB9\x9A +<BOTTOM_HALF_LEFT_PARENTHESIS> \xE2\xB9\x9B +<BOTTOM_HALF_RIGHT_PARENTHESIS> \xE2\xB9\x9C +<OBLIQUE_HYPHEN> \xE2\xB9\x9D <CJK_RADICAL_REPEAT> \xE2\xBA\x80 <CJK_RADICAL_CLIFF> \xE2\xBA\x81 <CJK_RADICAL_SECOND_ONE> \xE2\xBA\x82 @@ -39942,6 +40016,9 @@ CHARMAP <CJK_UNIFIED_IDEOGRAPH-9FFA> \xE9\xBF\xBA <CJK_UNIFIED_IDEOGRAPH-9FFB> \xE9\xBF\xBB <CJK_UNIFIED_IDEOGRAPH-9FFC> \xE9\xBF\xBC +<CJK_UNIFIED_IDEOGRAPH-9FFD> \xE9\xBF\xBD +<CJK_UNIFIED_IDEOGRAPH-9FFE> \xE9\xBF\xBE +<CJK_UNIFIED_IDEOGRAPH-9FFF> \xE9\xBF\xBF <YI_SYLLABLE_IT> \xEA\x80\x80 <YI_SYLLABLE_IX> \xEA\x80\x81 <YI_SYLLABLE_I> \xEA\x80\x82 @@ -41886,6 +41963,8 @@ CHARMAP <LATIN_SMALL_LETTER_GLOTTAL_I> \xEA\x9E\xBD <LATIN_CAPITAL_LETTER_GLOTTAL_U> \xEA\x9E\xBE <LATIN_SMALL_LETTER_GLOTTAL_U> \xEA\x9E\xBF +<LATIN_CAPITAL_LETTER_OLD_POLISH_O> \xEA\x9F\x80 +<LATIN_SMALL_LETTER_OLD_POLISH_O> \xEA\x9F\x81 <LATIN_CAPITAL_LETTER_ANGLICANA_W> \xEA\x9F\x82 <LATIN_SMALL_LETTER_ANGLICANA_W> \xEA\x9F\x83 <LATIN_CAPITAL_LETTER_C_WITH_PALATAL_HOOK> \xEA\x9F\x84 @@ -41895,6 +41974,17 @@ CHARMAP <LATIN_SMALL_LETTER_D_WITH_SHORT_STROKE_OVERLAY> \xEA\x9F\x88 <LATIN_CAPITAL_LETTER_S_WITH_SHORT_STROKE_OVERLAY> \xEA\x9F\x89 <LATIN_SMALL_LETTER_S_WITH_SHORT_STROKE_OVERLAY> \xEA\x9F\x8A +<LATIN_CAPITAL_LETTER_CLOSED_INSULAR_G> \xEA\x9F\x90 +<LATIN_SMALL_LETTER_CLOSED_INSULAR_G> \xEA\x9F\x91 +<LATIN_SMALL_LETTER_DOUBLE_THORN> \xEA\x9F\x93 +<LATIN_SMALL_LETTER_DOUBLE_WYNN> \xEA\x9F\x95 +<LATIN_CAPITAL_LETTER_MIDDLE_SCOTS_S> \xEA\x9F\x96 +<LATIN_SMALL_LETTER_MIDDLE_SCOTS_S> \xEA\x9F\x97 +<LATIN_CAPITAL_LETTER_SIGMOID_S> \xEA\x9F\x98 +<LATIN_SMALL_LETTER_SIGMOID_S> \xEA\x9F\x99 +<MODIFIER_LETTER_CAPITAL_C> \xEA\x9F\xB2 +<MODIFIER_LETTER_CAPITAL_F> \xEA\x9F\xB3 +<MODIFIER_LETTER_CAPITAL_Q> \xEA\x9F\xB4 <LATIN_CAPITAL_LETTER_REVERSED_HALF_H> \xEA\x9F\xB5 <LATIN_SMALL_LETTER_REVERSED_HALF_H> \xEA\x9F\xB6 <LATIN_EPIGRAPHIC_LETTER_SIDEWAYS_I> \xEA\x9F\xB7 @@ -61093,6 +61183,7 @@ CHARMAP <ARABIC_SYMBOL_RING> \xEF\xAE\xBF <ARABIC_SYMBOL_SMALL_TAH_ABOVE> \xEF\xAF\x80 <ARABIC_SYMBOL_SMALL_TAH_BELOW> \xEF\xAF\x81 +<ARABIC_SYMBOL_WASLA_ABOVE> \xEF\xAF\x82 <ARABIC_LETTER_NG_ISOLATED_FORM> \xEF\xAF\x93 <ARABIC_LETTER_NG_FINAL_FORM> \xEF\xAF\x94 <ARABIC_LETTER_NG_INITIAL_FORM> \xEF\xAF\x95 @@ -61458,6 +61549,22 @@ CHARMAP <ARABIC_LIGATURE_ALEF_WITH_FATHATAN_ISOLATED_FORM> \xEF\xB4\xBD <ORNATE_LEFT_PARENTHESIS> \xEF\xB4\xBE <ORNATE_RIGHT_PARENTHESIS> \xEF\xB4\xBF +<ARABIC_LIGATURE_RAHIMAHU_ALLAAH> \xEF\xB5\x80 +<ARABIC_LIGATURE_RADI_ALLAAHU_ANH> \xEF\xB5\x81 +<ARABIC_LIGATURE_RADI_ALLAAHU_ANHAA> \xEF\xB5\x82 +<ARABIC_LIGATURE_RADI_ALLAAHU_ANHUM> \xEF\xB5\x83 +<ARABIC_LIGATURE_RADI_ALLAAHU_ANHUMAA> \xEF\xB5\x84 +<ARABIC_LIGATURE_RADI_ALLAAHU_ANHUNNA> \xEF\xB5\x85 +<ARABIC_LIGATURE_SALLALLAAHU_ALAYHI_WA-AALIH> \xEF\xB5\x86 +<ARABIC_LIGATURE_ALAYHI_AS-SALAAM> \xEF\xB5\x87 +<ARABIC_LIGATURE_ALAYHIM_AS-SALAAM> \xEF\xB5\x88 +<ARABIC_LIGATURE_ALAYHIMAA_AS-SALAAM> \xEF\xB5\x89 +<ARABIC_LIGATURE_ALAYHI_AS-SALAATU_WAS-SALAAM> \xEF\xB5\x8A +<ARABIC_LIGATURE_QUDDISA_SIRRAH> \xEF\xB5\x8B +<ARABIC_LIGATURE_SALLALLAHU_ALAYHI_WAAALIHEE_WA-SALLAM> \xEF\xB5\x8C +<ARABIC_LIGATURE_ALAYHAA_AS-SALAAM> \xEF\xB5\x8D +<ARABIC_LIGATURE_TABAARAKA_WA-TAAALAA> \xEF\xB5\x8E +<ARABIC_LIGATURE_RAHIMAHUM_ALLAAH> \xEF\xB5\x8F <ARABIC_LIGATURE_TEH_WITH_JEEM_WITH_MEEM_INITIAL_FORM> \xEF\xB5\x90 <ARABIC_LIGATURE_TEH_WITH_HAH_WITH_JEEM_FINAL_FORM> \xEF\xB5\x91 <ARABIC_LIGATURE_TEH_WITH_HAH_WITH_JEEM_INITIAL_FORM> \xEF\xB5\x92 @@ -61576,6 +61683,7 @@ CHARMAP <ARABIC_LIGATURE_SAD_WITH_MEEM_WITH_MEEM_INITIAL_FORM> \xEF\xB7\x85 <ARABIC_LIGATURE_SEEN_WITH_KHAH_WITH_YEH_FINAL_FORM> \xEF\xB7\x86 <ARABIC_LIGATURE_NOON_WITH_JEEM_WITH_YEH_FINAL_FORM> \xEF\xB7\x87 +<ARABIC_LIGATURE_SALAAMUHU_ALAYNAA> \xEF\xB7\x8F <ARABIC_LIGATURE_SALLA_USED_AS_KORANIC_STOP_SIGN_ISOLATED_FORM> \xEF\xB7\xB0 <ARABIC_LIGATURE_QALA_USED_AS_KORANIC_STOP_SIGN_ISOLATED_FORM> \xEF\xB7\xB1 <ARABIC_LIGATURE_ALLAH_ISOLATED_FORM> \xEF\xB7\xB2 @@ -61590,6 +61698,8 @@ CHARMAP <ARABIC_LIGATURE_JALLAJALALOUHOU> \xEF\xB7\xBB <RIAL_SIGN> \xEF\xB7\xBC <ARABIC_LIGATURE_BISMILLAH_AR-RAHMAN_AR-RAHEEM> \xEF\xB7\xBD +<ARABIC_LIGATURE_SUBHAANAHU_WA_TAAALAA> \xEF\xB7\xBE +<ARABIC_LIGATURE_AZZA_WA_JALL> \xEF\xB7\xBF <VARIATION_SELECTOR-1> \xEF\xB8\x80 <VARIATION_SELECTOR-2> \xEF\xB8\x81 <VARIATION_SELECTOR-3> \xEF\xB8\x82 @@ -63097,6 +63207,76 @@ CHARMAP <CAUCASIAN_ALBANIAN_LETTER_PIWR> \xF0\x90\x95\xA2 <CAUCASIAN_ALBANIAN_LETTER_KIW> \xF0\x90\x95\xA3 <CAUCASIAN_ALBANIAN_CITATION_MARK> \xF0\x90\x95\xAF +<VITHKUQI_CAPITAL_LETTER_A> \xF0\x90\x95\xB0 +<VITHKUQI_CAPITAL_LETTER_BBE> \xF0\x90\x95\xB1 +<VITHKUQI_CAPITAL_LETTER_BE> \xF0\x90\x95\xB2 +<VITHKUQI_CAPITAL_LETTER_CE> \xF0\x90\x95\xB3 +<VITHKUQI_CAPITAL_LETTER_CHE> \xF0\x90\x95\xB4 +<VITHKUQI_CAPITAL_LETTER_DE> \xF0\x90\x95\xB5 +<VITHKUQI_CAPITAL_LETTER_DHE> \xF0\x90\x95\xB6 +<VITHKUQI_CAPITAL_LETTER_EI> \xF0\x90\x95\xB7 +<VITHKUQI_CAPITAL_LETTER_E> \xF0\x90\x95\xB8 +<VITHKUQI_CAPITAL_LETTER_FE> \xF0\x90\x95\xB9 +<VITHKUQI_CAPITAL_LETTER_GA> \xF0\x90\x95\xBA +<VITHKUQI_CAPITAL_LETTER_HA> \xF0\x90\x95\xBC +<VITHKUQI_CAPITAL_LETTER_HHA> \xF0\x90\x95\xBD +<VITHKUQI_CAPITAL_LETTER_I> \xF0\x90\x95\xBE +<VITHKUQI_CAPITAL_LETTER_IJE> \xF0\x90\x95\xBF +<VITHKUQI_CAPITAL_LETTER_JE> \xF0\x90\x96\x80 +<VITHKUQI_CAPITAL_LETTER_KA> \xF0\x90\x96\x81 +<VITHKUQI_CAPITAL_LETTER_LA> \xF0\x90\x96\x82 +<VITHKUQI_CAPITAL_LETTER_LLA> \xF0\x90\x96\x83 +<VITHKUQI_CAPITAL_LETTER_ME> \xF0\x90\x96\x84 +<VITHKUQI_CAPITAL_LETTER_NE> \xF0\x90\x96\x85 +<VITHKUQI_CAPITAL_LETTER_NJE> \xF0\x90\x96\x86 +<VITHKUQI_CAPITAL_LETTER_O> \xF0\x90\x96\x87 +<VITHKUQI_CAPITAL_LETTER_PE> \xF0\x90\x96\x88 +<VITHKUQI_CAPITAL_LETTER_QA> \xF0\x90\x96\x89 +<VITHKUQI_CAPITAL_LETTER_RE> \xF0\x90\x96\x8A +<VITHKUQI_CAPITAL_LETTER_SE> \xF0\x90\x96\x8C +<VITHKUQI_CAPITAL_LETTER_SHE> \xF0\x90\x96\x8D +<VITHKUQI_CAPITAL_LETTER_TE> \xF0\x90\x96\x8E +<VITHKUQI_CAPITAL_LETTER_THE> \xF0\x90\x96\x8F +<VITHKUQI_CAPITAL_LETTER_U> \xF0\x90\x96\x90 +<VITHKUQI_CAPITAL_LETTER_VE> \xF0\x90\x96\x91 +<VITHKUQI_CAPITAL_LETTER_XE> \xF0\x90\x96\x92 +<VITHKUQI_CAPITAL_LETTER_Y> \xF0\x90\x96\x94 +<VITHKUQI_CAPITAL_LETTER_ZE> \xF0\x90\x96\x95 +<VITHKUQI_SMALL_LETTER_A> \xF0\x90\x96\x97 +<VITHKUQI_SMALL_LETTER_BBE> \xF0\x90\x96\x98 +<VITHKUQI_SMALL_LETTER_BE> \xF0\x90\x96\x99 +<VITHKUQI_SMALL_LETTER_CE> \xF0\x90\x96\x9A +<VITHKUQI_SMALL_LETTER_CHE> \xF0\x90\x96\x9B +<VITHKUQI_SMALL_LETTER_DE> \xF0\x90\x96\x9C +<VITHKUQI_SMALL_LETTER_DHE> \xF0\x90\x96\x9D +<VITHKUQI_SMALL_LETTER_EI> \xF0\x90\x96\x9E +<VITHKUQI_SMALL_LETTER_E> \xF0\x90\x96\x9F +<VITHKUQI_SMALL_LETTER_FE> \xF0\x90\x96\xA0 +<VITHKUQI_SMALL_LETTER_GA> \xF0\x90\x96\xA1 +<VITHKUQI_SMALL_LETTER_HA> \xF0\x90\x96\xA3 +<VITHKUQI_SMALL_LETTER_HHA> \xF0\x90\x96\xA4 +<VITHKUQI_SMALL_LETTER_I> \xF0\x90\x96\xA5 +<VITHKUQI_SMALL_LETTER_IJE> \xF0\x90\x96\xA6 +<VITHKUQI_SMALL_LETTER_JE> \xF0\x90\x96\xA7 +<VITHKUQI_SMALL_LETTER_KA> \xF0\x90\x96\xA8 +<VITHKUQI_SMALL_LETTER_LA> \xF0\x90\x96\xA9 +<VITHKUQI_SMALL_LETTER_LLA> \xF0\x90\x96\xAA +<VITHKUQI_SMALL_LETTER_ME> \xF0\x90\x96\xAB +<VITHKUQI_SMALL_LETTER_NE> \xF0\x90\x96\xAC +<VITHKUQI_SMALL_LETTER_NJE> \xF0\x90\x96\xAD +<VITHKUQI_SMALL_LETTER_O> \xF0\x90\x96\xAE +<VITHKUQI_SMALL_LETTER_PE> \xF0\x90\x96\xAF +<VITHKUQI_SMALL_LETTER_QA> \xF0\x90\x96\xB0 +<VITHKUQI_SMALL_LETTER_RE> \xF0\x90\x96\xB1 +<VITHKUQI_SMALL_LETTER_SE> \xF0\x90\x96\xB3 +<VITHKUQI_SMALL_LETTER_SHE> \xF0\x90\x96\xB4 +<VITHKUQI_SMALL_LETTER_TE> \xF0\x90\x96\xB5 +<VITHKUQI_SMALL_LETTER_THE> \xF0\x90\x96\xB6 +<VITHKUQI_SMALL_LETTER_U> \xF0\x90\x96\xB7 +<VITHKUQI_SMALL_LETTER_VE> \xF0\x90\x96\xB8 +<VITHKUQI_SMALL_LETTER_XE> \xF0\x90\x96\xB9 +<VITHKUQI_SMALL_LETTER_Y> \xF0\x90\x96\xBB +<VITHKUQI_SMALL_LETTER_ZE> \xF0\x90\x96\xBC <LINEAR_A_SIGN_AB001> \xF0\x90\x98\x80 <LINEAR_A_SIGN_AB002> \xF0\x90\x98\x81 <LINEAR_A_SIGN_AB003> \xF0\x90\x98\x82 @@ -63438,6 +63618,63 @@ CHARMAP <LINEAR_A_SIGN_A805> \xF0\x90\x9D\xA5 <LINEAR_A_SIGN_A806> \xF0\x90\x9D\xA6 <LINEAR_A_SIGN_A807> \xF0\x90\x9D\xA7 +<MODIFIER_LETTER_SMALL_CAPITAL_AA> \xF0\x90\x9E\x80 +<MODIFIER_LETTER_SUPERSCRIPT_TRIANGULAR_COLON> \xF0\x90\x9E\x81 +<MODIFIER_LETTER_SUPERSCRIPT_HALF_TRIANGULAR_COLON> \xF0\x90\x9E\x82 +<MODIFIER_LETTER_SMALL_AE> \xF0\x90\x9E\x83 +<MODIFIER_LETTER_SMALL_CAPITAL_B> \xF0\x90\x9E\x84 +<MODIFIER_LETTER_SMALL_B_WITH_HOOK> \xF0\x90\x9E\x85 +<MODIFIER_LETTER_SMALL_DZ_DIGRAPH> \xF0\x90\x9E\x87 +<MODIFIER_LETTER_SMALL_DZ_DIGRAPH_WITH_RETROFLEX_HOOK> \xF0\x90\x9E\x88 +<MODIFIER_LETTER_SMALL_DZ_DIGRAPH_WITH_CURL> \xF0\x90\x9E\x89 +<MODIFIER_LETTER_SMALL_DEZH_DIGRAPH> \xF0\x90\x9E\x8A +<MODIFIER_LETTER_SMALL_D_WITH_TAIL> \xF0\x90\x9E\x8B +<MODIFIER_LETTER_SMALL_D_WITH_HOOK> \xF0\x90\x9E\x8C +<MODIFIER_LETTER_SMALL_D_WITH_HOOK_AND_TAIL> \xF0\x90\x9E\x8D +<MODIFIER_LETTER_SMALL_REVERSED_E> \xF0\x90\x9E\x8E +<MODIFIER_LETTER_SMALL_CLOSED_REVERSED_OPEN_E> \xF0\x90\x9E\x8F +<MODIFIER_LETTER_SMALL_FENG_DIGRAPH> \xF0\x90\x9E\x90 +<MODIFIER_LETTER_SMALL_RAMS_HORN> \xF0\x90\x9E\x91 +<MODIFIER_LETTER_SMALL_CAPITAL_G> \xF0\x90\x9E\x92 +<MODIFIER_LETTER_SMALL_G_WITH_HOOK> \xF0\x90\x9E\x93 +<MODIFIER_LETTER_SMALL_CAPITAL_G_WITH_HOOK> \xF0\x90\x9E\x94 +<MODIFIER_LETTER_SMALL_H_WITH_STROKE> \xF0\x90\x9E\x95 +<MODIFIER_LETTER_SMALL_CAPITAL_H> \xF0\x90\x9E\x96 +<MODIFIER_LETTER_SMALL_HENG_WITH_HOOK> \xF0\x90\x9E\x97 +<MODIFIER_LETTER_SMALL_DOTLESS_J_WITH_STROKE_AND_HOOK> \xF0\x90\x9E\x98 +<MODIFIER_LETTER_SMALL_LS_DIGRAPH> \xF0\x90\x9E\x99 +<MODIFIER_LETTER_SMALL_LZ_DIGRAPH> \xF0\x90\x9E\x9A +<MODIFIER_LETTER_SMALL_L_WITH_BELT> \xF0\x90\x9E\x9B +<MODIFIER_LETTER_SMALL_CAPITAL_L_WITH_BELT> \xF0\x90\x9E\x9C +<MODIFIER_LETTER_SMALL_L_WITH_RETROFLEX_HOOK_AND_BELT> \xF0\x90\x9E\x9D +<MODIFIER_LETTER_SMALL_LEZH> \xF0\x90\x9E\x9E +<MODIFIER_LETTER_SMALL_LEZH_WITH_RETROFLEX_HOOK> \xF0\x90\x9E\x9F +<MODIFIER_LETTER_SMALL_TURNED_Y> \xF0\x90\x9E\xA0 +<MODIFIER_LETTER_SMALL_TURNED_Y_WITH_BELT> \xF0\x90\x9E\xA1 +<MODIFIER_LETTER_SMALL_O_WITH_STROKE> \xF0\x90\x9E\xA2 +<MODIFIER_LETTER_SMALL_CAPITAL_OE> \xF0\x90\x9E\xA3 +<MODIFIER_LETTER_SMALL_CLOSED_OMEGA> \xF0\x90\x9E\xA4 +<MODIFIER_LETTER_SMALL_Q> \xF0\x90\x9E\xA5 +<MODIFIER_LETTER_SMALL_TURNED_R_WITH_LONG_LEG> \xF0\x90\x9E\xA6 +<MODIFIER_LETTER_SMALL_TURNED_R_WITH_LONG_LEG_AND_RETROFLEX_HOOK> \xF0\x90\x9E\xA7 +<MODIFIER_LETTER_SMALL_R_WITH_TAIL> \xF0\x90\x9E\xA8 +<MODIFIER_LETTER_SMALL_R_WITH_FISHHOOK> \xF0\x90\x9E\xA9 +<MODIFIER_LETTER_SMALL_CAPITAL_R> \xF0\x90\x9E\xAA +<MODIFIER_LETTER_SMALL_TC_DIGRAPH_WITH_CURL> \xF0\x90\x9E\xAB +<MODIFIER_LETTER_SMALL_TS_DIGRAPH> \xF0\x90\x9E\xAC +<MODIFIER_LETTER_SMALL_TS_DIGRAPH_WITH_RETROFLEX_HOOK> \xF0\x90\x9E\xAD +<MODIFIER_LETTER_SMALL_TESH_DIGRAPH> \xF0\x90\x9E\xAE +<MODIFIER_LETTER_SMALL_T_WITH_RETROFLEX_HOOK> \xF0\x90\x9E\xAF +<MODIFIER_LETTER_SMALL_V_WITH_RIGHT_HOOK> \xF0\x90\x9E\xB0 +<MODIFIER_LETTER_SMALL_CAPITAL_Y> \xF0\x90\x9E\xB2 +<MODIFIER_LETTER_GLOTTAL_STOP_WITH_STROKE> \xF0\x90\x9E\xB3 +<MODIFIER_LETTER_REVERSED_GLOTTAL_STOP_WITH_STROKE> \xF0\x90\x9E\xB4 +<MODIFIER_LETTER_BILABIAL_CLICK> \xF0\x90\x9E\xB5 +<MODIFIER_LETTER_DENTAL_CLICK> \xF0\x90\x9E\xB6 +<MODIFIER_LETTER_LATERAL_CLICK> \xF0\x90\x9E\xB7 +<MODIFIER_LETTER_ALVEOLAR_CLICK> \xF0\x90\x9E\xB8 +<MODIFIER_LETTER_RETROFLEX_CLICK_WITH_RETROFLEX_HOOK> \xF0\x90\x9E\xB9 +<MODIFIER_LETTER_SMALL_S_WITH_CURL> \xF0\x90\x9E\xBA <CYPRIOT_SYLLABLE_A> \xF0\x90\xA0\x80 <CYPRIOT_SYLLABLE_E> \xF0\x90\xA0\x81 <CYPRIOT_SYLLABLE_I> \xF0\x90\xA0\x82 @@ -64521,6 +64758,32 @@ CHARMAP <SOGDIAN_PUNCTUATION_CIRCLE_WITH_DOT> \xF0\x90\xBD\x97 <SOGDIAN_PUNCTUATION_TWO_CIRCLES_WITH_DOTS> \xF0\x90\xBD\x98 <SOGDIAN_PUNCTUATION_HALF_CIRCLE_WITH_DOT> \xF0\x90\xBD\x99 +<OLD_UYGHUR_LETTER_ALEPH> \xF0\x90\xBD\xB0 +<OLD_UYGHUR_LETTER_BETH> \xF0\x90\xBD\xB1 +<OLD_UYGHUR_LETTER_GIMEL-HETH> \xF0\x90\xBD\xB2 +<OLD_UYGHUR_LETTER_WAW> \xF0\x90\xBD\xB3 +<OLD_UYGHUR_LETTER_ZAYIN> \xF0\x90\xBD\xB4 +<OLD_UYGHUR_LETTER_FINAL_HETH> \xF0\x90\xBD\xB5 +<OLD_UYGHUR_LETTER_YODH> \xF0\x90\xBD\xB6 +<OLD_UYGHUR_LETTER_KAPH> \xF0\x90\xBD\xB7 +<OLD_UYGHUR_LETTER_LAMEDH> \xF0\x90\xBD\xB8 +<OLD_UYGHUR_LETTER_MEM> \xF0\x90\xBD\xB9 +<OLD_UYGHUR_LETTER_NUN> \xF0\x90\xBD\xBA +<OLD_UYGHUR_LETTER_SAMEKH> \xF0\x90\xBD\xBB +<OLD_UYGHUR_LETTER_PE> \xF0\x90\xBD\xBC +<OLD_UYGHUR_LETTER_SADHE> \xF0\x90\xBD\xBD +<OLD_UYGHUR_LETTER_RESH> \xF0\x90\xBD\xBE +<OLD_UYGHUR_LETTER_SHIN> \xF0\x90\xBD\xBF +<OLD_UYGHUR_LETTER_TAW> \xF0\x90\xBE\x80 +<OLD_UYGHUR_LETTER_LESH> \xF0\x90\xBE\x81 +<OLD_UYGHUR_COMBINING_DOT_ABOVE> \xF0\x90\xBE\x82 +<OLD_UYGHUR_COMBINING_DOT_BELOW> \xF0\x90\xBE\x83 +<OLD_UYGHUR_COMBINING_TWO_DOTS_ABOVE> \xF0\x90\xBE\x84 +<OLD_UYGHUR_COMBINING_TWO_DOTS_BELOW> \xF0\x90\xBE\x85 +<OLD_UYGHUR_PUNCTUATION_BAR> \xF0\x90\xBE\x86 +<OLD_UYGHUR_PUNCTUATION_TWO_BARS> \xF0\x90\xBE\x87 +<OLD_UYGHUR_PUNCTUATION_TWO_DOTS> \xF0\x90\xBE\x88 +<OLD_UYGHUR_PUNCTUATION_FOUR_DOTS> \xF0\x90\xBE\x89 <CHORASMIAN_LETTER_ALEPH> \xF0\x90\xBE\xB0 <CHORASMIAN_LETTER_SMALL_ALEPH> \xF0\x90\xBE\xB1 <CHORASMIAN_LETTER_BETH> \xF0\x90\xBE\xB2 @@ -64680,6 +64943,12 @@ CHARMAP <BRAHMI_DIGIT_SEVEN> \xF0\x91\x81\xAD <BRAHMI_DIGIT_EIGHT> \xF0\x91\x81\xAE <BRAHMI_DIGIT_NINE> \xF0\x91\x81\xAF +<BRAHMI_SIGN_OLD_TAMIL_VIRAMA> \xF0\x91\x81\xB0 +<BRAHMI_LETTER_OLD_TAMIL_SHORT_E> \xF0\x91\x81\xB1 +<BRAHMI_LETTER_OLD_TAMIL_SHORT_O> \xF0\x91\x81\xB2 +<BRAHMI_VOWEL_SIGN_OLD_TAMIL_SHORT_E> \xF0\x91\x81\xB3 +<BRAHMI_VOWEL_SIGN_OLD_TAMIL_SHORT_O> \xF0\x91\x81\xB4 +<BRAHMI_LETTER_OLD_TAMIL_LLA> \xF0\x91\x81\xB5 <BRAHMI_NUMBER_JOINER> \xF0\x91\x81\xBF <KAITHI_SIGN_CANDRABINDU> \xF0\x91\x82\x80 <KAITHI_SIGN_ANUSVARA> \xF0\x91\x82\x81 @@ -64747,6 +65016,7 @@ CHARMAP <KAITHI_DOUBLE_SECTION_MARK> \xF0\x91\x82\xBF <KAITHI_DANDA> \xF0\x91\x83\x80 <KAITHI_DOUBLE_DANDA> \xF0\x91\x83\x81 +<KAITHI_VOWEL_SIGN_VOCALIC_R> \xF0\x91\x83\x82 <KAITHI_NUMBER_SIGN_ABOVE> \xF0\x91\x83\x8D <SORA_SOMPENG_LETTER_SAH> \xF0\x91\x83\x90 <SORA_SOMPENG_LETTER_TAH> \xF0\x91\x83\x91 @@ -65684,6 +65954,7 @@ CHARMAP <TAKRI_SIGN_VIRAMA> \xF0\x91\x9A\xB6 <TAKRI_SIGN_NUKTA> \xF0\x91\x9A\xB7 <TAKRI_LETTER_ARCHAIC_KHA> \xF0\x91\x9A\xB8 +<TAKRI_ABBREVIATION_SIGN> \xF0\x91\x9A\xB9 <TAKRI_DIGIT_ZERO> \xF0\x91\x9B\x80 <TAKRI_DIGIT_ONE> \xF0\x91\x9B\x81 <TAKRI_DIGIT_TWO> \xF0\x91\x9B\x82 @@ -65752,6 +66023,13 @@ CHARMAP <AHOM_SIGN_SECTION> \xF0\x91\x9C\xBD <AHOM_SIGN_RULAI> \xF0\x91\x9C\xBE <AHOM_SYMBOL_VI> \xF0\x91\x9C\xBF +<AHOM_LETTER_CA> \xF0\x91\x9D\x80 +<AHOM_LETTER_TTA> \xF0\x91\x9D\x81 +<AHOM_LETTER_TTHA> \xF0\x91\x9D\x82 +<AHOM_LETTER_DDA> \xF0\x91\x9D\x83 +<AHOM_LETTER_DDHA> \xF0\x91\x9D\x84 +<AHOM_LETTER_NNA> \xF0\x91\x9D\x85 +<AHOM_LETTER_LLA> \xF0\x91\x9D\x86 <DOGRA_LETTER_A> \xF0\x91\xA0\x80 <DOGRA_LETTER_AA> \xF0\x91\xA0\x81 <DOGRA_LETTER_I> \xF0\x91\xA0\x82 @@ -66188,6 +66466,22 @@ CHARMAP <SOYOMBO_HEAD_MARK_WITH_MOON_AND_SUN> \xF0\x91\xAA\xA0 <SOYOMBO_TERMINAL_MARK-1> \xF0\x91\xAA\xA1 <SOYOMBO_TERMINAL_MARK-2> \xF0\x91\xAA\xA2 +<CANADIAN_SYLLABICS_NATTILIK_HI> \xF0\x91\xAA\xB0 +<CANADIAN_SYLLABICS_NATTILIK_HII> \xF0\x91\xAA\xB1 +<CANADIAN_SYLLABICS_NATTILIK_HO> \xF0\x91\xAA\xB2 +<CANADIAN_SYLLABICS_NATTILIK_HOO> \xF0\x91\xAA\xB3 +<CANADIAN_SYLLABICS_NATTILIK_HA> \xF0\x91\xAA\xB4 +<CANADIAN_SYLLABICS_NATTILIK_HAA> \xF0\x91\xAA\xB5 +<CANADIAN_SYLLABICS_NATTILIK_SHRI> \xF0\x91\xAA\xB6 +<CANADIAN_SYLLABICS_NATTILIK_SHRII> \xF0\x91\xAA\xB7 +<CANADIAN_SYLLABICS_NATTILIK_SHRO> \xF0\x91\xAA\xB8 +<CANADIAN_SYLLABICS_NATTILIK_SHROO> \xF0\x91\xAA\xB9 +<CANADIAN_SYLLABICS_NATTILIK_SHRA> \xF0\x91\xAA\xBA +<CANADIAN_SYLLABICS_NATTILIK_SHRAA> \xF0\x91\xAA\xBB +<CANADIAN_SYLLABICS_SPE> \xF0\x91\xAA\xBC +<CANADIAN_SYLLABICS_SPI> \xF0\x91\xAA\xBD +<CANADIAN_SYLLABICS_SPO> \xF0\x91\xAA\xBE +<CANADIAN_SYLLABICS_SPA> \xF0\x91\xAA\xBF <PAU_CIN_HAU_LETTER_PA> \xF0\x91\xAB\x80 <PAU_CIN_HAU_LETTER_KA> \xF0\x91\xAB\x81 <PAU_CIN_HAU_LETTER_LA> \xF0\x91\xAB\x82 @@ -67859,6 +68153,105 @@ CHARMAP <CUNEIFORM_SIGN_ZA7> \xF0\x92\x95\x81 <CUNEIFORM_SIGN_ZU_OVER_ZU_PLUS_SAR> \xF0\x92\x95\x82 <CUNEIFORM_SIGN_ZU5_TIMES_THREE_DISH_TENU> \xF0\x92\x95\x83 +<CYPRO-MINOAN_SIGN_CM001> \xF0\x92\xBE\x90 +<CYPRO-MINOAN_SIGN_CM002> \xF0\x92\xBE\x91 +<CYPRO-MINOAN_SIGN_CM004> \xF0\x92\xBE\x92 +<CYPRO-MINOAN_SIGN_CM005> \xF0\x92\xBE\x93 +<CYPRO-MINOAN_SIGN_CM006> \xF0\x92\xBE\x94 +<CYPRO-MINOAN_SIGN_CM007> \xF0\x92\xBE\x95 +<CYPRO-MINOAN_SIGN_CM008> \xF0\x92\xBE\x96 +<CYPRO-MINOAN_SIGN_CM009> \xF0\x92\xBE\x97 +<CYPRO-MINOAN_SIGN_CM010> \xF0\x92\xBE\x98 +<CYPRO-MINOAN_SIGN_CM011> \xF0\x92\xBE\x99 +<CYPRO-MINOAN_SIGN_CM012> \xF0\x92\xBE\x9A +<CYPRO-MINOAN_SIGN_CM012B> \xF0\x92\xBE\x9B +<CYPRO-MINOAN_SIGN_CM013> \xF0\x92\xBE\x9C +<CYPRO-MINOAN_SIGN_CM015> \xF0\x92\xBE\x9D +<CYPRO-MINOAN_SIGN_CM017> \xF0\x92\xBE\x9E +<CYPRO-MINOAN_SIGN_CM019> \xF0\x92\xBE\x9F +<CYPRO-MINOAN_SIGN_CM021> \xF0\x92\xBE\xA0 +<CYPRO-MINOAN_SIGN_CM023> \xF0\x92\xBE\xA1 +<CYPRO-MINOAN_SIGN_CM024> \xF0\x92\xBE\xA2 +<CYPRO-MINOAN_SIGN_CM025> \xF0\x92\xBE\xA3 +<CYPRO-MINOAN_SIGN_CM026> \xF0\x92\xBE\xA4 +<CYPRO-MINOAN_SIGN_CM027> \xF0\x92\xBE\xA5 +<CYPRO-MINOAN_SIGN_CM028> \xF0\x92\xBE\xA6 +<CYPRO-MINOAN_SIGN_CM029> \xF0\x92\xBE\xA7 +<CYPRO-MINOAN_SIGN_CM030> \xF0\x92\xBE\xA8 +<CYPRO-MINOAN_SIGN_CM033> \xF0\x92\xBE\xA9 +<CYPRO-MINOAN_SIGN_CM034> \xF0\x92\xBE\xAA +<CYPRO-MINOAN_SIGN_CM035> \xF0\x92\xBE\xAB +<CYPRO-MINOAN_SIGN_CM036> \xF0\x92\xBE\xAC +<CYPRO-MINOAN_SIGN_CM037> \xF0\x92\xBE\xAD +<CYPRO-MINOAN_SIGN_CM038> \xF0\x92\xBE\xAE +<CYPRO-MINOAN_SIGN_CM039> \xF0\x92\xBE\xAF +<CYPRO-MINOAN_SIGN_CM040> \xF0\x92\xBE\xB0 +<CYPRO-MINOAN_SIGN_CM041> \xF0\x92\xBE\xB1 +<CYPRO-MINOAN_SIGN_CM044> \xF0\x92\xBE\xB2 +<CYPRO-MINOAN_SIGN_CM046> \xF0\x92\xBE\xB3 +<CYPRO-MINOAN_SIGN_CM047> \xF0\x92\xBE\xB4 +<CYPRO-MINOAN_SIGN_CM049> \xF0\x92\xBE\xB5 +<CYPRO-MINOAN_SIGN_CM050> \xF0\x92\xBE\xB6 +<CYPRO-MINOAN_SIGN_CM051> \xF0\x92\xBE\xB7 +<CYPRO-MINOAN_SIGN_CM052> \xF0\x92\xBE\xB8 +<CYPRO-MINOAN_SIGN_CM053> \xF0\x92\xBE\xB9 +<CYPRO-MINOAN_SIGN_CM054> \xF0\x92\xBE\xBA +<CYPRO-MINOAN_SIGN_CM055> \xF0\x92\xBE\xBB +<CYPRO-MINOAN_SIGN_CM056> \xF0\x92\xBE\xBC +<CYPRO-MINOAN_SIGN_CM058> \xF0\x92\xBE\xBD +<CYPRO-MINOAN_SIGN_CM059> \xF0\x92\xBE\xBE +<CYPRO-MINOAN_SIGN_CM060> \xF0\x92\xBE\xBF +<CYPRO-MINOAN_SIGN_CM061> \xF0\x92\xBF\x80 +<CYPRO-MINOAN_SIGN_CM062> \xF0\x92\xBF\x81 +<CYPRO-MINOAN_SIGN_CM063> \xF0\x92\xBF\x82 +<CYPRO-MINOAN_SIGN_CM064> \xF0\x92\xBF\x83 +<CYPRO-MINOAN_SIGN_CM066> \xF0\x92\xBF\x84 +<CYPRO-MINOAN_SIGN_CM067> \xF0\x92\xBF\x85 +<CYPRO-MINOAN_SIGN_CM068> \xF0\x92\xBF\x86 +<CYPRO-MINOAN_SIGN_CM069> \xF0\x92\xBF\x87 +<CYPRO-MINOAN_SIGN_CM070> \xF0\x92\xBF\x88 +<CYPRO-MINOAN_SIGN_CM071> \xF0\x92\xBF\x89 +<CYPRO-MINOAN_SIGN_CM072> \xF0\x92\xBF\x8A +<CYPRO-MINOAN_SIGN_CM073> \xF0\x92\xBF\x8B +<CYPRO-MINOAN_SIGN_CM074> \xF0\x92\xBF\x8C +<CYPRO-MINOAN_SIGN_CM075> \xF0\x92\xBF\x8D +<CYPRO-MINOAN_SIGN_CM075B> \xF0\x92\xBF\x8E +<CYPRO-MINOAN_SIGN_CM076> \xF0\x92\xBF\x8F +<CYPRO-MINOAN_SIGN_CM078> \xF0\x92\xBF\x90 +<CYPRO-MINOAN_SIGN_CM079> \xF0\x92\xBF\x91 +<CYPRO-MINOAN_SIGN_CM080> \xF0\x92\xBF\x92 +<CYPRO-MINOAN_SIGN_CM081> \xF0\x92\xBF\x93 +<CYPRO-MINOAN_SIGN_CM082> \xF0\x92\xBF\x94 +<CYPRO-MINOAN_SIGN_CM083> \xF0\x92\xBF\x95 +<CYPRO-MINOAN_SIGN_CM084> \xF0\x92\xBF\x96 +<CYPRO-MINOAN_SIGN_CM085> \xF0\x92\xBF\x97 +<CYPRO-MINOAN_SIGN_CM086> \xF0\x92\xBF\x98 +<CYPRO-MINOAN_SIGN_CM087> \xF0\x92\xBF\x99 +<CYPRO-MINOAN_SIGN_CM088> \xF0\x92\xBF\x9A +<CYPRO-MINOAN_SIGN_CM089> \xF0\x92\xBF\x9B +<CYPRO-MINOAN_SIGN_CM090> \xF0\x92\xBF\x9C +<CYPRO-MINOAN_SIGN_CM091> \xF0\x92\xBF\x9D +<CYPRO-MINOAN_SIGN_CM092> \xF0\x92\xBF\x9E +<CYPRO-MINOAN_SIGN_CM094> \xF0\x92\xBF\x9F +<CYPRO-MINOAN_SIGN_CM095> \xF0\x92\xBF\xA0 +<CYPRO-MINOAN_SIGN_CM096> \xF0\x92\xBF\xA1 +<CYPRO-MINOAN_SIGN_CM097> \xF0\x92\xBF\xA2 +<CYPRO-MINOAN_SIGN_CM098> \xF0\x92\xBF\xA3 +<CYPRO-MINOAN_SIGN_CM099> \xF0\x92\xBF\xA4 +<CYPRO-MINOAN_SIGN_CM100> \xF0\x92\xBF\xA5 +<CYPRO-MINOAN_SIGN_CM101> \xF0\x92\xBF\xA6 +<CYPRO-MINOAN_SIGN_CM102> \xF0\x92\xBF\xA7 +<CYPRO-MINOAN_SIGN_CM103> \xF0\x92\xBF\xA8 +<CYPRO-MINOAN_SIGN_CM104> \xF0\x92\xBF\xA9 +<CYPRO-MINOAN_SIGN_CM105> \xF0\x92\xBF\xAA +<CYPRO-MINOAN_SIGN_CM107> \xF0\x92\xBF\xAB +<CYPRO-MINOAN_SIGN_CM108> \xF0\x92\xBF\xAC +<CYPRO-MINOAN_SIGN_CM109> \xF0\x92\xBF\xAD +<CYPRO-MINOAN_SIGN_CM110> \xF0\x92\xBF\xAE +<CYPRO-MINOAN_SIGN_CM112> \xF0\x92\xBF\xAF +<CYPRO-MINOAN_SIGN_CM114> \xF0\x92\xBF\xB0 +<CYPRO-MINOAN_SIGN_CM301> \xF0\x92\xBF\xB1 +<CYPRO-MINOAN_SIGN_CM302> \xF0\x92\xBF\xB2 <EGYPTIAN_HIEROGLYPH_A001> \xF0\x93\x80\x80 <EGYPTIAN_HIEROGLYPH_A002> \xF0\x93\x80\x81 <EGYPTIAN_HIEROGLYPH_A003> \xF0\x93\x80\x82 @@ -70134,6 +70527,95 @@ CHARMAP <MRO_DIGIT_NINE> \xF0\x96\xA9\xA9 <MRO_DANDA> \xF0\x96\xA9\xAE <MRO_DOUBLE_DANDA> \xF0\x96\xA9\xAF +<TANGSA_LETTER_OZ> \xF0\x96\xA9\xB0 +<TANGSA_LETTER_OC> \xF0\x96\xA9\xB1 +<TANGSA_LETTER_OQ> \xF0\x96\xA9\xB2 +<TANGSA_LETTER_OX> \xF0\x96\xA9\xB3 +<TANGSA_LETTER_AZ> \xF0\x96\xA9\xB4 +<TANGSA_LETTER_AC> \xF0\x96\xA9\xB5 +<TANGSA_LETTER_AQ> \xF0\x96\xA9\xB6 +<TANGSA_LETTER_AX> \xF0\x96\xA9\xB7 +<TANGSA_LETTER_VZ> \xF0\x96\xA9\xB8 +<TANGSA_LETTER_VC> \xF0\x96\xA9\xB9 +<TANGSA_LETTER_VQ> \xF0\x96\xA9\xBA +<TANGSA_LETTER_VX> \xF0\x96\xA9\xBB +<TANGSA_LETTER_EZ> \xF0\x96\xA9\xBC +<TANGSA_LETTER_EC> \xF0\x96\xA9\xBD +<TANGSA_LETTER_EQ> \xF0\x96\xA9\xBE +<TANGSA_LETTER_EX> \xF0\x96\xA9\xBF +<TANGSA_LETTER_IZ> \xF0\x96\xAA\x80 +<TANGSA_LETTER_IC> \xF0\x96\xAA\x81 +<TANGSA_LETTER_IQ> \xF0\x96\xAA\x82 +<TANGSA_LETTER_IX> \xF0\x96\xAA\x83 +<TANGSA_LETTER_UZ> \xF0\x96\xAA\x84 +<TANGSA_LETTER_UC> \xF0\x96\xAA\x85 +<TANGSA_LETTER_UQ> \xF0\x96\xAA\x86 +<TANGSA_LETTER_UX> \xF0\x96\xAA\x87 +<TANGSA_LETTER_AWZ> \xF0\x96\xAA\x88 +<TANGSA_LETTER_AWC> \xF0\x96\xAA\x89 +<TANGSA_LETTER_AWQ> \xF0\x96\xAA\x8A +<TANGSA_LETTER_AWX> \xF0\x96\xAA\x8B +<TANGSA_LETTER_UIZ> \xF0\x96\xAA\x8C +<TANGSA_LETTER_UIC> \xF0\x96\xAA\x8D +<TANGSA_LETTER_UIQ> \xF0\x96\xAA\x8E +<TANGSA_LETTER_UIX> \xF0\x96\xAA\x8F +<TANGSA_LETTER_FINAL_NG> \xF0\x96\xAA\x90 +<TANGSA_LETTER_LONG_UEX> \xF0\x96\xAA\x91 +<TANGSA_LETTER_SHORT_UEZ> \xF0\x96\xAA\x92 +<TANGSA_LETTER_SHORT_AWX> \xF0\x96\xAA\x93 +<TANGSA_LETTER_UEC> \xF0\x96\xAA\x94 +<TANGSA_LETTER_UEZ> \xF0\x96\xAA\x95 +<TANGSA_LETTER_UEQ> \xF0\x96\xAA\x96 +<TANGSA_LETTER_UEX> \xF0\x96\xAA\x97 +<TANGSA_LETTER_UIUZ> \xF0\x96\xAA\x98 +<TANGSA_LETTER_UIUC> \xF0\x96\xAA\x99 +<TANGSA_LETTER_UIUQ> \xF0\x96\xAA\x9A +<TANGSA_LETTER_UIUX> \xF0\x96\xAA\x9B +<TANGSA_LETTER_MZ> \xF0\x96\xAA\x9C +<TANGSA_LETTER_MC> \xF0\x96\xAA\x9D +<TANGSA_LETTER_MQ> \xF0\x96\xAA\x9E +<TANGSA_LETTER_MX> \xF0\x96\xAA\x9F +<TANGSA_LETTER_KA> \xF0\x96\xAA\xA0 +<TANGSA_LETTER_KHA> \xF0\x96\xAA\xA1 +<TANGSA_LETTER_GA> \xF0\x96\xAA\xA2 +<TANGSA_LETTER_NGA> \xF0\x96\xAA\xA3 +<TANGSA_LETTER_SA> \xF0\x96\xAA\xA4 +<TANGSA_LETTER_YA> \xF0\x96\xAA\xA5 +<TANGSA_LETTER_WA> \xF0\x96\xAA\xA6 +<TANGSA_LETTER_PA> \xF0\x96\xAA\xA7 +<TANGSA_LETTER_NYA> \xF0\x96\xAA\xA8 +<TANGSA_LETTER_PHA> \xF0\x96\xAA\xA9 +<TANGSA_LETTER_BA> \xF0\x96\xAA\xAA +<TANGSA_LETTER_MA> \xF0\x96\xAA\xAB +<TANGSA_LETTER_NA> \xF0\x96\xAA\xAC +<TANGSA_LETTER_HA> \xF0\x96\xAA\xAD +<TANGSA_LETTER_LA> \xF0\x96\xAA\xAE +<TANGSA_LETTER_HTA> \xF0\x96\xAA\xAF +<TANGSA_LETTER_TA> \xF0\x96\xAA\xB0 +<TANGSA_LETTER_DA> \xF0\x96\xAA\xB1 +<TANGSA_LETTER_RA> \xF0\x96\xAA\xB2 +<TANGSA_LETTER_NHA> \xF0\x96\xAA\xB3 +<TANGSA_LETTER_SHA> \xF0\x96\xAA\xB4 +<TANGSA_LETTER_CA> \xF0\x96\xAA\xB5 +<TANGSA_LETTER_TSA> \xF0\x96\xAA\xB6 +<TANGSA_LETTER_GHA> \xF0\x96\xAA\xB7 +<TANGSA_LETTER_HTTA> \xF0\x96\xAA\xB8 +<TANGSA_LETTER_THA> \xF0\x96\xAA\xB9 +<TANGSA_LETTER_XA> \xF0\x96\xAA\xBA +<TANGSA_LETTER_FA> \xF0\x96\xAA\xBB +<TANGSA_LETTER_DHA> \xF0\x96\xAA\xBC +<TANGSA_LETTER_CHA> \xF0\x96\xAA\xBD +<TANGSA_LETTER_ZA> \xF0\x96\xAA\xBE +<TANGSA_DIGIT_ZERO> \xF0\x96\xAB\x80 +<TANGSA_DIGIT_ONE> \xF0\x96\xAB\x81 +<TANGSA_DIGIT_TWO> \xF0\x96\xAB\x82 +<TANGSA_DIGIT_THREE> \xF0\x96\xAB\x83 +<TANGSA_DIGIT_FOUR> \xF0\x96\xAB\x84 +<TANGSA_DIGIT_FIVE> \xF0\x96\xAB\x85 +<TANGSA_DIGIT_SIX> \xF0\x96\xAB\x86 +<TANGSA_DIGIT_SEVEN> \xF0\x96\xAB\x87 +<TANGSA_DIGIT_EIGHT> \xF0\x96\xAB\x88 +<TANGSA_DIGIT_NINE> \xF0\x96\xAB\x89 <BASSA_VAH_LETTER_ENNI> \xF0\x96\xAB\x90 <BASSA_VAH_LETTER_KA> \xF0\x96\xAB\x91 <BASSA_VAH_LETTER_SE> \xF0\x96\xAB\x92 @@ -77927,6 +78409,19 @@ CHARMAP <TANGUT_IDEOGRAPH-18D06> \xF0\x98\xB4\x86 <TANGUT_IDEOGRAPH-18D07> \xF0\x98\xB4\x87 <TANGUT_IDEOGRAPH-18D08> \xF0\x98\xB4\x88 +<KATAKANA_LETTER_MINNAN_TONE-2> \xF0\x9A\xBF\xB0 +<KATAKANA_LETTER_MINNAN_TONE-3> \xF0\x9A\xBF\xB1 +<KATAKANA_LETTER_MINNAN_TONE-4> \xF0\x9A\xBF\xB2 +<KATAKANA_LETTER_MINNAN_TONE-5> \xF0\x9A\xBF\xB3 +<KATAKANA_LETTER_MINNAN_TONE-7> \xF0\x9A\xBF\xB5 +<KATAKANA_LETTER_MINNAN_TONE-8> \xF0\x9A\xBF\xB6 +<KATAKANA_LETTER_MINNAN_NASALIZED_TONE-1> \xF0\x9A\xBF\xB7 +<KATAKANA_LETTER_MINNAN_NASALIZED_TONE-2> \xF0\x9A\xBF\xB8 +<KATAKANA_LETTER_MINNAN_NASALIZED_TONE-3> \xF0\x9A\xBF\xB9 +<KATAKANA_LETTER_MINNAN_NASALIZED_TONE-4> \xF0\x9A\xBF\xBA +<KATAKANA_LETTER_MINNAN_NASALIZED_TONE-5> \xF0\x9A\xBF\xBB +<KATAKANA_LETTER_MINNAN_NASALIZED_TONE-7> \xF0\x9A\xBF\xBD +<KATAKANA_LETTER_MINNAN_NASALIZED_TONE-8> \xF0\x9A\xBF\xBE <KATAKANA_LETTER_ARCHAIC_E> \xF0\x9B\x80\x80 <HIRAGANA_LETTER_ARCHAIC_YE> \xF0\x9B\x80\x81 <HENTAIGANA_LETTER_A-1> \xF0\x9B\x80\x82 @@ -78214,6 +78709,10 @@ CHARMAP <HENTAIGANA_LETTER_WO-7> \xF0\x9B\x84\x9C <HENTAIGANA_LETTER_N-MU-MO-1> \xF0\x9B\x84\x9D <HENTAIGANA_LETTER_N-MU-MO-2> \xF0\x9B\x84\x9E +<HIRAGANA_LETTER_ARCHAIC_WU> \xF0\x9B\x84\x9F +<KATAKANA_LETTER_ARCHAIC_YI> \xF0\x9B\x84\xA0 +<KATAKANA_LETTER_ARCHAIC_YE> \xF0\x9B\x84\xA1 +<KATAKANA_LETTER_ARCHAIC_WU> \xF0\x9B\x84\xA2 <HIRAGANA_LETTER_SMALL_WI> \xF0\x9B\x85\x90 <HIRAGANA_LETTER_SMALL_WE> \xF0\x9B\x85\x91 <HIRAGANA_LETTER_SMALL_WO> \xF0\x9B\x85\x92 @@ -78764,6 +79263,191 @@ CHARMAP <SHORTHAND_FORMAT_CONTINUING_OVERLAP> \xF0\x9B\xB2\xA1 <SHORTHAND_FORMAT_DOWN_STEP> \xF0\x9B\xB2\xA2 <SHORTHAND_FORMAT_UP_STEP> \xF0\x9B\xB2\xA3 +<ZNAMENNY_COMBINING_MARK_GORAZDO_NIZKO_S_KRYZHEM_ON_LEFT> \xF0\x9C\xBC\x80 +<ZNAMENNY_COMBINING_MARK_NIZKO_S_KRYZHEM_ON_LEFT> \xF0\x9C\xBC\x81 +<ZNAMENNY_COMBINING_MARK_TSATA_ON_LEFT> \xF0\x9C\xBC\x82 +<ZNAMENNY_COMBINING_MARK_GORAZDO_NIZKO_ON_LEFT> \xF0\x9C\xBC\x83 +<ZNAMENNY_COMBINING_MARK_NIZKO_ON_LEFT> \xF0\x9C\xBC\x84 +<ZNAMENNY_COMBINING_MARK_SREDNE_ON_LEFT> \xF0\x9C\xBC\x85 +<ZNAMENNY_COMBINING_MARK_MALO_POVYSHE_ON_LEFT> \xF0\x9C\xBC\x86 +<ZNAMENNY_COMBINING_MARK_POVYSHE_ON_LEFT> \xF0\x9C\xBC\x87 +<ZNAMENNY_COMBINING_MARK_VYSOKO_ON_LEFT> \xF0\x9C\xBC\x88 +<ZNAMENNY_COMBINING_MARK_MALO_POVYSHE_S_KHOKHLOM_ON_LEFT> \xF0\x9C\xBC\x89 +<ZNAMENNY_COMBINING_MARK_POVYSHE_S_KHOKHLOM_ON_LEFT> \xF0\x9C\xBC\x8A +<ZNAMENNY_COMBINING_MARK_VYSOKO_S_KHOKHLOM_ON_LEFT> \xF0\x9C\xBC\x8B +<ZNAMENNY_COMBINING_MARK_GORAZDO_NIZKO_S_KRYZHEM_ON_RIGHT> \xF0\x9C\xBC\x8C +<ZNAMENNY_COMBINING_MARK_NIZKO_S_KRYZHEM_ON_RIGHT> \xF0\x9C\xBC\x8D +<ZNAMENNY_COMBINING_MARK_TSATA_ON_RIGHT> \xF0\x9C\xBC\x8E +<ZNAMENNY_COMBINING_MARK_GORAZDO_NIZKO_ON_RIGHT> \xF0\x9C\xBC\x8F +<ZNAMENNY_COMBINING_MARK_NIZKO_ON_RIGHT> \xF0\x9C\xBC\x90 +<ZNAMENNY_COMBINING_MARK_SREDNE_ON_RIGHT> \xF0\x9C\xBC\x91 +<ZNAMENNY_COMBINING_MARK_MALO_POVYSHE_ON_RIGHT> \xF0\x9C\xBC\x92 +<ZNAMENNY_COMBINING_MARK_POVYSHE_ON_RIGHT> \xF0\x9C\xBC\x93 +<ZNAMENNY_COMBINING_MARK_VYSOKO_ON_RIGHT> \xF0\x9C\xBC\x94 +<ZNAMENNY_COMBINING_MARK_MALO_POVYSHE_S_KHOKHLOM_ON_RIGHT> \xF0\x9C\xBC\x95 +<ZNAMENNY_COMBINING_MARK_POVYSHE_S_KHOKHLOM_ON_RIGHT> \xF0\x9C\xBC\x96 +<ZNAMENNY_COMBINING_MARK_VYSOKO_S_KHOKHLOM_ON_RIGHT> \xF0\x9C\xBC\x97 +<ZNAMENNY_COMBINING_MARK_TSATA_S_KRYZHEM> \xF0\x9C\xBC\x98 +<ZNAMENNY_COMBINING_MARK_MALO_POVYSHE_S_KRYZHEM> \xF0\x9C\xBC\x99 +<ZNAMENNY_COMBINING_MARK_STRANNO_MALO_POVYSHE> \xF0\x9C\xBC\x9A +<ZNAMENNY_COMBINING_MARK_POVYSHE_S_KRYZHEM> \xF0\x9C\xBC\x9B +<ZNAMENNY_COMBINING_MARK_POVYSHE_STRANNO> \xF0\x9C\xBC\x9C +<ZNAMENNY_COMBINING_MARK_VYSOKO_S_KRYZHEM> \xF0\x9C\xBC\x9D +<ZNAMENNY_COMBINING_MARK_MALO_POVYSHE_STRANNO> \xF0\x9C\xBC\x9E +<ZNAMENNY_COMBINING_MARK_GORAZDO_VYSOKO> \xF0\x9C\xBC\x9F +<ZNAMENNY_COMBINING_MARK_ZELO> \xF0\x9C\xBC\xA0 +<ZNAMENNY_COMBINING_MARK_ON> \xF0\x9C\xBC\xA1 +<ZNAMENNY_COMBINING_MARK_RAVNO> \xF0\x9C\xBC\xA2 +<ZNAMENNY_COMBINING_MARK_TIKHAYA> \xF0\x9C\xBC\xA3 +<ZNAMENNY_COMBINING_MARK_BORZAYA> \xF0\x9C\xBC\xA4 +<ZNAMENNY_COMBINING_MARK_UDARKA> \xF0\x9C\xBC\xA5 +<ZNAMENNY_COMBINING_MARK_PODVERTKA> \xF0\x9C\xBC\xA6 +<ZNAMENNY_COMBINING_MARK_LOMKA> \xF0\x9C\xBC\xA7 +<ZNAMENNY_COMBINING_MARK_KUPNAYA> \xF0\x9C\xBC\xA8 +<ZNAMENNY_COMBINING_MARK_KACHKA> \xF0\x9C\xBC\xA9 +<ZNAMENNY_COMBINING_MARK_ZEVOK> \xF0\x9C\xBC\xAA +<ZNAMENNY_COMBINING_MARK_SKOBA> \xF0\x9C\xBC\xAB +<ZNAMENNY_COMBINING_MARK_RAZSEKA> \xF0\x9C\xBC\xAC +<ZNAMENNY_COMBINING_MARK_KRYZH_ON_LEFT> \xF0\x9C\xBC\xAD +<ZNAMENNY_COMBINING_TONAL_RANGE_MARK_MRACHNO> \xF0\x9C\xBC\xB0 +<ZNAMENNY_COMBINING_TONAL_RANGE_MARK_SVETLO> \xF0\x9C\xBC\xB1 +<ZNAMENNY_COMBINING_TONAL_RANGE_MARK_TRESVETLO> \xF0\x9C\xBC\xB2 +<ZNAMENNY_COMBINING_MARK_ZADERZHKA> \xF0\x9C\xBC\xB3 +<ZNAMENNY_COMBINING_MARK_DEMESTVENNY_ZADERZHKA> \xF0\x9C\xBC\xB4 +<ZNAMENNY_COMBINING_MARK_OTSECHKA> \xF0\x9C\xBC\xB5 +<ZNAMENNY_COMBINING_MARK_PODCHASHIE> \xF0\x9C\xBC\xB6 +<ZNAMENNY_COMBINING_MARK_PODCHASHIE_WITH_VERTICAL_STROKE> \xF0\x9C\xBC\xB7 +<ZNAMENNY_COMBINING_MARK_CHASHKA> \xF0\x9C\xBC\xB8 +<ZNAMENNY_COMBINING_MARK_CHASHKA_POLNAYA> \xF0\x9C\xBC\xB9 +<ZNAMENNY_COMBINING_MARK_OBLACHKO> \xF0\x9C\xBC\xBA +<ZNAMENNY_COMBINING_MARK_SOROCHYA_NOZHKA> \xF0\x9C\xBC\xBB +<ZNAMENNY_COMBINING_MARK_TOCHKA> \xF0\x9C\xBC\xBC +<ZNAMENNY_COMBINING_MARK_DVOETOCHIE> \xF0\x9C\xBC\xBD +<ZNAMENNY_COMBINING_ATTACHING_VERTICAL_OMET> \xF0\x9C\xBC\xBE +<ZNAMENNY_COMBINING_MARK_CURVED_OMET> \xF0\x9C\xBC\xBF +<ZNAMENNY_COMBINING_MARK_KRYZH> \xF0\x9C\xBD\x80 +<ZNAMENNY_COMBINING_LOWER_TONAL_RANGE_INDICATOR> \xF0\x9C\xBD\x81 +<ZNAMENNY_PRIZNAK_MODIFIER_LEVEL-2> \xF0\x9C\xBD\x82 +<ZNAMENNY_PRIZNAK_MODIFIER_LEVEL-3> \xF0\x9C\xBD\x83 +<ZNAMENNY_PRIZNAK_MODIFIER_DIRECTION_FLIP> \xF0\x9C\xBD\x84 +<ZNAMENNY_PRIZNAK_MODIFIER_KRYZH> \xF0\x9C\xBD\x85 +<ZNAMENNY_PRIZNAK_MODIFIER_ROG> \xF0\x9C\xBD\x86 +<ZNAMENNY_NEUME_KRYUK> \xF0\x9C\xBD\x90 +<ZNAMENNY_NEUME_KRYUK_TIKHY> \xF0\x9C\xBD\x91 +<ZNAMENNY_NEUME_PARAKLIT> \xF0\x9C\xBD\x92 +<ZNAMENNY_NEUME_DVA_V_CHELNU> \xF0\x9C\xBD\x93 +<ZNAMENNY_NEUME_KLYUCH> \xF0\x9C\xBD\x94 +<ZNAMENNY_NEUME_ZANOZHEK> \xF0\x9C\xBD\x95 +<ZNAMENNY_NEUME_STOPITSA> \xF0\x9C\xBD\x96 +<ZNAMENNY_NEUME_STOPITSA_S_OCHKOM> \xF0\x9C\xBD\x97 +<ZNAMENNY_NEUME_PEREVODKA> \xF0\x9C\xBD\x98 +<ZNAMENNY_NEUME_PEREVODKA_NEPOSTOYANNAYA> \xF0\x9C\xBD\x99 +<ZNAMENNY_NEUME_STOPITSA_WITH_SOROCHYA_NOZHKA> \xF0\x9C\xBD\x9A +<ZNAMENNY_NEUME_CHELYUSTKA> \xF0\x9C\xBD\x9B +<ZNAMENNY_NEUME_PALKA> \xF0\x9C\xBD\x9C +<ZNAMENNY_NEUME_ZAPYATAYA> \xF0\x9C\xBD\x9D +<ZNAMENNY_NEUME_GOLUBCHIK_BORZY> \xF0\x9C\xBD\x9E +<ZNAMENNY_NEUME_GOLUBCHIK_TIKHY> \xF0\x9C\xBD\x9F +<ZNAMENNY_NEUME_GOLUBCHIK_MRACHNY> \xF0\x9C\xBD\xA0 +<ZNAMENNY_NEUME_GOLUBCHIK_SVETLY> \xF0\x9C\xBD\xA1 +<ZNAMENNY_NEUME_GOLUBCHIK_TRESVETLY> \xF0\x9C\xBD\xA2 +<ZNAMENNY_NEUME_VRAKHIYA_PROSTAYA> \xF0\x9C\xBD\xA3 +<ZNAMENNY_NEUME_VRAKHIYA_MRACHNAYA> \xF0\x9C\xBD\xA4 +<ZNAMENNY_NEUME_VRAKHIYA_SVETLAYA> \xF0\x9C\xBD\xA5 +<ZNAMENNY_NEUME_VRAKHIYA_TRESVETLAYA> \xF0\x9C\xBD\xA6 +<ZNAMENNY_NEUME_VRAKHIYA_KLYUCHEVAYA_PROSTAYA> \xF0\x9C\xBD\xA7 +<ZNAMENNY_NEUME_VRAKHIYA_KLYUCHEVAYA_MRACHNAYA> \xF0\x9C\xBD\xA8 +<ZNAMENNY_NEUME_VRAKHIYA_KLYUCHEVAYA_SVETLAYA> \xF0\x9C\xBD\xA9 +<ZNAMENNY_NEUME_VRAKHIYA_KLYUCHEVAYA_TRESVETLAYA> \xF0\x9C\xBD\xAA +<ZNAMENNY_NEUME_DOUBLE_ZAPYATAYA> \xF0\x9C\xBD\xAB +<ZNAMENNY_NEUME_REVERSED_CHELYUSTKA> \xF0\x9C\xBD\xAC +<ZNAMENNY_NEUME_DERBITSA> \xF0\x9C\xBD\xAD +<ZNAMENNY_NEUME_KHAMILO> \xF0\x9C\xBD\xAE +<ZNAMENNY_NEUME_CHASHKA> \xF0\x9C\xBD\xAF +<ZNAMENNY_NEUME_PODCHASHIE> \xF0\x9C\xBD\xB0 +<ZNAMENNY_NEUME_SKAMEYTSA_MRACHNAYA> \xF0\x9C\xBD\xB1 +<ZNAMENNY_NEUME_SKAMEYTSA_SVETLAYA> \xF0\x9C\xBD\xB2 +<ZNAMENNY_NEUME_SKAMEYTSA_TRESVETLAYA> \xF0\x9C\xBD\xB3 +<ZNAMENNY_NEUME_SKAMEYTSA_TIKHAYA> \xF0\x9C\xBD\xB4 +<ZNAMENNY_NEUME_DEMESTVENNY_KLYUCH> \xF0\x9C\xBD\xB5 +<ZNAMENNY_NEUME_SKAMEYTSA_KLYUCHEVAYA_SVETLAYA> \xF0\x9C\xBD\xB6 +<ZNAMENNY_NEUME_SKAMEYTSA_KLYUCHENEPOSTOYANNAYA> \xF0\x9C\xBD\xB7 +<ZNAMENNY_NEUME_SKAMEYTSA_KLYUCHEVAYA_TIKHAYA> \xF0\x9C\xBD\xB8 +<ZNAMENNY_NEUME_SKAMEYTSA_DVOECHELNAYA_PROSTAYA> \xF0\x9C\xBD\xB9 +<ZNAMENNY_NEUME_SKAMEYTSA_DVOECHELNAYA_SVETLAYA> \xF0\x9C\xBD\xBA +<ZNAMENNY_NEUME_SKAMEYTSA_DVOECHELNAYA_NEPOSTOYANNAYA> \xF0\x9C\xBD\xBB +<ZNAMENNY_NEUME_SKAMEYTSA_DVOECHELNAYA_KLYUCHEVAYA> \xF0\x9C\xBD\xBC +<ZNAMENNY_NEUME_SLOZHITIE> \xF0\x9C\xBD\xBD +<ZNAMENNY_NEUME_SLOZHITIE_S_ZAPYATOY> \xF0\x9C\xBD\xBE +<ZNAMENNY_NEUME_SLOZHITIE_ZAKRYTOE> \xF0\x9C\xBD\xBF +<ZNAMENNY_NEUME_SLOZHITIE_S_KRYZHEM> \xF0\x9C\xBE\x80 +<ZNAMENNY_NEUME_KRYZH> \xF0\x9C\xBE\x81 +<ZNAMENNY_NEUME_ROG> \xF0\x9C\xBE\x82 +<ZNAMENNY_NEUME_FITA> \xF0\x9C\xBE\x83 +<ZNAMENNY_NEUME_KOBYLA> \xF0\x9C\xBE\x84 +<ZNAMENNY_NEUME_ZMEYTSA> \xF0\x9C\xBE\x85 +<ZNAMENNY_NEUME_STATYA> \xF0\x9C\xBE\x86 +<ZNAMENNY_NEUME_STATYA_S_ZAPYATOY> \xF0\x9C\xBE\x87 +<ZNAMENNY_NEUME_STATYA_S_KRYZHEM> \xF0\x9C\xBE\x88 +<ZNAMENNY_NEUME_STATYA_S_ZAPYATOY_I_KRYZHEM> \xF0\x9C\xBE\x89 +<ZNAMENNY_NEUME_STATYA_S_KRYZHEM_I_ZAPYATOY> \xF0\x9C\xBE\x8A +<ZNAMENNY_NEUME_STATYA_ZAKRYTAYA> \xF0\x9C\xBE\x8B +<ZNAMENNY_NEUME_STATYA_ZAKRYTAYA_S_ZAPYATOY> \xF0\x9C\xBE\x8C +<ZNAMENNY_NEUME_STATYA_S_ROGOM> \xF0\x9C\xBE\x8D +<ZNAMENNY_NEUME_STATYA_S_DVUMYA_ZAPYATYMI> \xF0\x9C\xBE\x8E +<ZNAMENNY_NEUME_STATYA_S_ZAPYATOY_I_PODCHASHIEM> \xF0\x9C\xBE\x8F +<ZNAMENNY_NEUME_POLKULIZMY> \xF0\x9C\xBE\x90 +<ZNAMENNY_NEUME_STATYA_NEPOSTOYANNAYA> \xF0\x9C\xBE\x91 +<ZNAMENNY_NEUME_STRELA_PROSTAYA> \xF0\x9C\xBE\x92 +<ZNAMENNY_NEUME_STRELA_MRACHNOTIKHAYA> \xF0\x9C\xBE\x93 +<ZNAMENNY_NEUME_STRELA_KRYZHEVAYA> \xF0\x9C\xBE\x94 +<ZNAMENNY_NEUME_STRELA_POLUPOVODNAYA> \xF0\x9C\xBE\x95 +<ZNAMENNY_NEUME_STRELA_POVODNAYA> \xF0\x9C\xBE\x96 +<ZNAMENNY_NEUME_STRELA_NEPOSTOYANNAYA> \xF0\x9C\xBE\x97 +<ZNAMENNY_NEUME_STRELA_KLYUCHEPOVODNAYA> \xF0\x9C\xBE\x98 +<ZNAMENNY_NEUME_STRELA_KLYUCHENEPOSTOYANNAYA> \xF0\x9C\xBE\x99 +<ZNAMENNY_NEUME_STRELA_TIKHAYA_PUTNAYA> \xF0\x9C\xBE\x9A +<ZNAMENNY_NEUME_STRELA_DVOECHELNAYA> \xF0\x9C\xBE\x9B +<ZNAMENNY_NEUME_STRELA_DVOECHELNOKRYZHEVAYA> \xF0\x9C\xBE\x9C +<ZNAMENNY_NEUME_STRELA_DVOECHELNOPOVODNAYA> \xF0\x9C\xBE\x9D +<ZNAMENNY_NEUME_STRELA_DVOECHELNAYA_KLYUCHEVAYA> \xF0\x9C\xBE\x9E +<ZNAMENNY_NEUME_STRELA_DVOECHELNOPOVODNAYA_KLYUCHEVAYA> \xF0\x9C\xBE\x9F +<ZNAMENNY_NEUME_STRELA_GROMNAYA_WITH_SINGLE_ZAPYATAYA> \xF0\x9C\xBE\xA0 +<ZNAMENNY_NEUME_STRELA_GROMOPOVODNAYA_WITH_SINGLE_ZAPYATAYA> \xF0\x9C\xBE\xA1 +<ZNAMENNY_NEUME_STRELA_GROMNAYA> \xF0\x9C\xBE\xA2 +<ZNAMENNY_NEUME_STRELA_GROMOPOVODNAYA> \xF0\x9C\xBE\xA3 +<ZNAMENNY_NEUME_STRELA_GROMOPOVODNAYA_WITH_DOUBLE_ZAPYATAYA> \xF0\x9C\xBE\xA4 +<ZNAMENNY_NEUME_STRELA_GROMOKRYZHEVAYA> \xF0\x9C\xBE\xA5 +<ZNAMENNY_NEUME_STRELA_GROMOKRYZHEVAYA_POVODNAYA> \xF0\x9C\xBE\xA6 +<ZNAMENNY_NEUME_MECHIK> \xF0\x9C\xBE\xA7 +<ZNAMENNY_NEUME_MECHIK_POVODNY> \xF0\x9C\xBE\xA8 +<ZNAMENNY_NEUME_MECHIK_KLYUCHEVOY> \xF0\x9C\xBE\xA9 +<ZNAMENNY_NEUME_MECHIK_KLYUCHEPOVODNY> \xF0\x9C\xBE\xAA +<ZNAMENNY_NEUME_MECHIK_KLYUCHENEPOSTOYANNY> \xF0\x9C\xBE\xAB +<ZNAMENNY_NEUME_STRELA_TRYASOGLASNAYA> \xF0\x9C\xBE\xAC +<ZNAMENNY_NEUME_STRELA_TRYASOPOVODNAYA> \xF0\x9C\xBE\xAD +<ZNAMENNY_NEUME_STRELA_TRYASOSTRELNAYA> \xF0\x9C\xBE\xAE +<ZNAMENNY_NEUME_OSOKA> \xF0\x9C\xBE\xAF +<ZNAMENNY_NEUME_OSOKA_SVETLAYA> \xF0\x9C\xBE\xB0 +<ZNAMENNY_NEUME_OSOKA_TRESVETLAYA> \xF0\x9C\xBE\xB1 +<ZNAMENNY_NEUME_OSOKA_KRYUKOVAYA_SVETLAYA> \xF0\x9C\xBE\xB2 +<ZNAMENNY_NEUME_OSOKA_KLYUCHEVAYA_SVETLAYA> \xF0\x9C\xBE\xB3 +<ZNAMENNY_NEUME_OSOKA_KLYUCHEVAYA_NEPOSTOYANNAYA> \xF0\x9C\xBE\xB4 +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA> \xF0\x9C\xBE\xB5 +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_POVODNAYA> \xF0\x9C\xBE\xB6 +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_GROMNAYA_WITH_SINGLE_ZAPYATAYA> \xF0\x9C\xBE\xB7 +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_GROMOPOVODNAYA_WITH_SINGLE_ZAPYATAYA> \xF0\x9C\xBE\xB8 +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_GROMNAYA> \xF0\x9C\xBE\xB9 +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_GROMOPOVODNAYA> \xF0\x9C\xBE\xBA +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_GROMOPOVODNAYA_WITH_DOUBLE_ZAPYATAYA> \xF0\x9C\xBE\xBB +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_GROMOKRYZHEVAYA> \xF0\x9C\xBE\xBC +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_GROMOKRYZHEVAYA_POVODNAYA> \xF0\x9C\xBE\xBD +<ZNAMENNY_NEUME_STRELA_KRYUKOVAYA_TRYASKA> \xF0\x9C\xBE\xBE +<ZNAMENNY_NEUME_KUFISMA> \xF0\x9C\xBE\xBF +<ZNAMENNY_NEUME_OBLAKO> \xF0\x9C\xBF\x80 +<ZNAMENNY_NEUME_DUDA> \xF0\x9C\xBF\x81 +<ZNAMENNY_NEUME_NEMKA> \xF0\x9C\xBF\x82 +<ZNAMENNY_NEUME_PAUK> \xF0\x9C\xBF\x83 <BYZANTINE_MUSICAL_SYMBOL_PSILI> \xF0\x9D\x80\x80 <BYZANTINE_MUSICAL_SYMBOL_DASEIA> \xF0\x9D\x80\x81 <BYZANTINE_MUSICAL_SYMBOL_PERISPOMENI> \xF0\x9D\x80\x82 @@ -79241,6 +79925,8 @@ CHARMAP <MUSICAL_SYMBOL_KIEVAN_EIGHTH_NOTE_STEM_DOWN> \xF0\x9D\x87\xA6 <MUSICAL_SYMBOL_KIEVAN_EIGHTH_NOTE_STEM_UP> \xF0\x9D\x87\xA7 <MUSICAL_SYMBOL_KIEVAN_FLAT_SIGN> \xF0\x9D\x87\xA8 +<MUSICAL_SYMBOL_SORI> \xF0\x9D\x87\xA9 +<MUSICAL_SYMBOL_KORON> \xF0\x9D\x87\xAA <GREEK_VOCAL_NOTATION_SYMBOL-1> \xF0\x9D\x88\x80 <GREEK_VOCAL_NOTATION_SYMBOL-2> \xF0\x9D\x88\x81 <GREEK_VOCAL_NOTATION_SYMBOL-3> \xF0\x9D\x88\x82 @@ -81111,6 +81797,37 @@ CHARMAP <SIGNWRITING_ROTATION_MODIFIER-14> \xF0\x9D\xAA\xAD <SIGNWRITING_ROTATION_MODIFIER-15> \xF0\x9D\xAA\xAE <SIGNWRITING_ROTATION_MODIFIER-16> \xF0\x9D\xAA\xAF +<LATIN_SMALL_LETTER_FENG_DIGRAPH_WITH_TRILL> \xF0\x9D\xBC\x80 +<LATIN_SMALL_LETTER_REVERSED_SCRIPT_G> \xF0\x9D\xBC\x81 +<LATIN_LETTER_SMALL_CAPITAL_TURNED_G> \xF0\x9D\xBC\x82 +<LATIN_SMALL_LETTER_REVERSED_K> \xF0\x9D\xBC\x83 +<LATIN_LETTER_SMALL_CAPITAL_L_WITH_BELT> \xF0\x9D\xBC\x84 +<LATIN_SMALL_LETTER_LEZH_WITH_RETROFLEX_HOOK> \xF0\x9D\xBC\x85 +<LATIN_SMALL_LETTER_TURNED_Y_WITH_BELT> \xF0\x9D\xBC\x86 +<LATIN_SMALL_LETTER_REVERSED_ENG> \xF0\x9D\xBC\x87 +<LATIN_SMALL_LETTER_TURNED_R_WITH_LONG_LEG_AND_RETROFLEX_HOOK> \xF0\x9D\xBC\x88 +<LATIN_SMALL_LETTER_T_WITH_HOOK_AND_RETROFLEX_HOOK> \xF0\x9D\xBC\x89 +<LATIN_LETTER_RETROFLEX_CLICK_WITH_RETROFLEX_HOOK> \xF0\x9D\xBC\x8A +<LATIN_SMALL_LETTER_ESH_WITH_DOUBLE_BAR> \xF0\x9D\xBC\x8B +<LATIN_SMALL_LETTER_ESH_WITH_DOUBLE_BAR_AND_CURL> \xF0\x9D\xBC\x8C +<LATIN_SMALL_LETTER_TURNED_T_WITH_CURL> \xF0\x9D\xBC\x8D +<LATIN_LETTER_INVERTED_GLOTTAL_STOP_WITH_CURL> \xF0\x9D\xBC\x8E +<LATIN_LETTER_STRETCHED_C_WITH_CURL> \xF0\x9D\xBC\x8F +<LATIN_LETTER_SMALL_CAPITAL_TURNED_K> \xF0\x9D\xBC\x90 +<LATIN_SMALL_LETTER_L_WITH_FISHHOOK> \xF0\x9D\xBC\x91 +<LATIN_SMALL_LETTER_DEZH_DIGRAPH_WITH_PALATAL_HOOK> \xF0\x9D\xBC\x92 +<LATIN_SMALL_LETTER_L_WITH_BELT_AND_PALATAL_HOOK> \xF0\x9D\xBC\x93 +<LATIN_SMALL_LETTER_ENG_WITH_PALATAL_HOOK> \xF0\x9D\xBC\x94 +<LATIN_SMALL_LETTER_TURNED_R_WITH_PALATAL_HOOK> \xF0\x9D\xBC\x95 +<LATIN_SMALL_LETTER_R_WITH_FISHHOOK_AND_PALATAL_HOOK> \xF0\x9D\xBC\x96 +<LATIN_SMALL_LETTER_TESH_DIGRAPH_WITH_PALATAL_HOOK> \xF0\x9D\xBC\x97 +<LATIN_SMALL_LETTER_EZH_WITH_PALATAL_HOOK> \xF0\x9D\xBC\x98 +<LATIN_SMALL_LETTER_DEZH_DIGRAPH_WITH_RETROFLEX_HOOK> \xF0\x9D\xBC\x99 +<LATIN_SMALL_LETTER_I_WITH_STROKE_AND_RETROFLEX_HOOK> \xF0\x9D\xBC\x9A +<LATIN_SMALL_LETTER_O_WITH_RETROFLEX_HOOK> \xF0\x9D\xBC\x9B +<LATIN_SMALL_LETTER_TESH_DIGRAPH_WITH_RETROFLEX_HOOK> \xF0\x9D\xBC\x9C +<LATIN_SMALL_LETTER_C_WITH_RETROFLEX_HOOK> \xF0\x9D\xBC\x9D +<LATIN_SMALL_LETTER_S_WITH_CURL> \xF0\x9D\xBC\x9E <COMBINING_GLAGOLITIC_LETTER_AZU> \xF0\x9E\x80\x80 <COMBINING_GLAGOLITIC_LETTER_BUKY> \xF0\x9E\x80\x81 <COMBINING_GLAGOLITIC_LETTER_VEDE> \xF0\x9E\x80\x82 @@ -81220,6 +81937,37 @@ CHARMAP <NYIAKENG_PUACHUE_HMONG_DIGIT_NINE> \xF0\x9E\x85\x89 <NYIAKENG_PUACHUE_HMONG_LOGOGRAM_NYAJ> \xF0\x9E\x85\x8E <NYIAKENG_PUACHUE_HMONG_CIRCLED_CA> \xF0\x9E\x85\x8F +<TOTO_LETTER_PA> \xF0\x9E\x8A\x90 +<TOTO_LETTER_BA> \xF0\x9E\x8A\x91 +<TOTO_LETTER_TA> \xF0\x9E\x8A\x92 +<TOTO_LETTER_DA> \xF0\x9E\x8A\x93 +<TOTO_LETTER_KA> \xF0\x9E\x8A\x94 +<TOTO_LETTER_GA> \xF0\x9E\x8A\x95 +<TOTO_LETTER_MA> \xF0\x9E\x8A\x96 +<TOTO_LETTER_NA> \xF0\x9E\x8A\x97 +<TOTO_LETTER_NGA> \xF0\x9E\x8A\x98 +<TOTO_LETTER_SA> \xF0\x9E\x8A\x99 +<TOTO_LETTER_CHA> \xF0\x9E\x8A\x9A +<TOTO_LETTER_YA> \xF0\x9E\x8A\x9B +<TOTO_LETTER_WA> \xF0\x9E\x8A\x9C +<TOTO_LETTER_JA> \xF0\x9E\x8A\x9D +<TOTO_LETTER_HA> \xF0\x9E\x8A\x9E +<TOTO_LETTER_RA> \xF0\x9E\x8A\x9F +<TOTO_LETTER_LA> \xF0\x9E\x8A\xA0 +<TOTO_LETTER_I> \xF0\x9E\x8A\xA1 +<TOTO_LETTER_BREATHY_I> \xF0\x9E\x8A\xA2 +<TOTO_LETTER_IU> \xF0\x9E\x8A\xA3 +<TOTO_LETTER_BREATHY_IU> \xF0\x9E\x8A\xA4 +<TOTO_LETTER_U> \xF0\x9E\x8A\xA5 +<TOTO_LETTER_E> \xF0\x9E\x8A\xA6 +<TOTO_LETTER_BREATHY_E> \xF0\x9E\x8A\xA7 +<TOTO_LETTER_EO> \xF0\x9E\x8A\xA8 +<TOTO_LETTER_BREATHY_EO> \xF0\x9E\x8A\xA9 +<TOTO_LETTER_O> \xF0\x9E\x8A\xAA +<TOTO_LETTER_AE> \xF0\x9E\x8A\xAB +<TOTO_LETTER_BREATHY_AE> \xF0\x9E\x8A\xAC +<TOTO_LETTER_A> \xF0\x9E\x8A\xAD +<TOTO_SIGN_RISING_TONE> \xF0\x9E\x8A\xAE <WANCHO_LETTER_AA> \xF0\x9E\x8B\x80 <WANCHO_LETTER_A> \xF0\x9E\x8B\x81 <WANCHO_LETTER_BA> \xF0\x9E\x8B\x82 @@ -81279,6 +82027,34 @@ CHARMAP <WANCHO_DIGIT_EIGHT> \xF0\x9E\x8B\xB8 <WANCHO_DIGIT_NINE> \xF0\x9E\x8B\xB9 <WANCHO_NGUN_SIGN> \xF0\x9E\x8B\xBF +<ETHIOPIC_SYLLABLE_HHYA> \xF0\x9E\x9F\xA0 +<ETHIOPIC_SYLLABLE_HHYU> \xF0\x9E\x9F\xA1 +<ETHIOPIC_SYLLABLE_HHYI> \xF0\x9E\x9F\xA2 +<ETHIOPIC_SYLLABLE_HHYAA> \xF0\x9E\x9F\xA3 +<ETHIOPIC_SYLLABLE_HHYEE> \xF0\x9E\x9F\xA4 +<ETHIOPIC_SYLLABLE_HHYE> \xF0\x9E\x9F\xA5 +<ETHIOPIC_SYLLABLE_HHYO> \xF0\x9E\x9F\xA6 +<ETHIOPIC_SYLLABLE_GURAGE_HHWA> \xF0\x9E\x9F\xA8 +<ETHIOPIC_SYLLABLE_HHWI> \xF0\x9E\x9F\xA9 +<ETHIOPIC_SYLLABLE_HHWEE> \xF0\x9E\x9F\xAA +<ETHIOPIC_SYLLABLE_HHWE> \xF0\x9E\x9F\xAB +<ETHIOPIC_SYLLABLE_GURAGE_MWI> \xF0\x9E\x9F\xAD +<ETHIOPIC_SYLLABLE_GURAGE_MWEE> \xF0\x9E\x9F\xAE +<ETHIOPIC_SYLLABLE_GURAGE_QWI> \xF0\x9E\x9F\xB0 +<ETHIOPIC_SYLLABLE_GURAGE_QWEE> \xF0\x9E\x9F\xB1 +<ETHIOPIC_SYLLABLE_GURAGE_QWE> \xF0\x9E\x9F\xB2 +<ETHIOPIC_SYLLABLE_GURAGE_BWI> \xF0\x9E\x9F\xB3 +<ETHIOPIC_SYLLABLE_GURAGE_BWEE> \xF0\x9E\x9F\xB4 +<ETHIOPIC_SYLLABLE_GURAGE_KWI> \xF0\x9E\x9F\xB5 +<ETHIOPIC_SYLLABLE_GURAGE_KWEE> \xF0\x9E\x9F\xB6 +<ETHIOPIC_SYLLABLE_GURAGE_KWE> \xF0\x9E\x9F\xB7 +<ETHIOPIC_SYLLABLE_GURAGE_GWI> \xF0\x9E\x9F\xB8 +<ETHIOPIC_SYLLABLE_GURAGE_GWEE> \xF0\x9E\x9F\xB9 +<ETHIOPIC_SYLLABLE_GURAGE_GWE> \xF0\x9E\x9F\xBA +<ETHIOPIC_SYLLABLE_GURAGE_FWI> \xF0\x9E\x9F\xBB +<ETHIOPIC_SYLLABLE_GURAGE_FWEE> \xF0\x9E\x9F\xBC +<ETHIOPIC_SYLLABLE_GURAGE_PWI> \xF0\x9E\x9F\xBD +<ETHIOPIC_SYLLABLE_GURAGE_PWEE> \xF0\x9E\x9F\xBE <MENDE_KIKAKUI_SYLLABLE_M001_KI> \xF0\x9E\xA0\x80 <MENDE_KIKAKUI_SYLLABLE_M002_KA> \xF0\x9E\xA0\x81 <MENDE_KIKAKUI_SYLLABLE_M003_KU> \xF0\x9E\xA0\x82 @@ -83326,6 +84102,9 @@ CHARMAP <HINDU_TEMPLE> \xF0\x9F\x9B\x95 <HUT> \xF0\x9F\x9B\x96 <ELEVATOR> \xF0\x9F\x9B\x97 +<PLAYGROUND_SLIDE> \xF0\x9F\x9B\x9D +<WHEEL> \xF0\x9F\x9B\x9E +<RING_BUOY> \xF0\x9F\x9B\x9F <HAMMER_AND_WRENCH> \xF0\x9F\x9B\xA0 <SHIELD> \xF0\x9F\x9B\xA1 <OIL_DRUM> \xF0\x9F\x9B\xA2 @@ -83569,6 +84348,7 @@ CHARMAP <LARGE_GREEN_SQUARE> \xF0\x9F\x9F\xA9 <LARGE_PURPLE_SQUARE> \xF0\x9F\x9F\xAA <LARGE_BROWN_SQUARE> \xF0\x9F\x9F\xAB +<HEAVY_EQUALS_SIGN> \xF0\x9F\x9F\xB0 <LEFTWARDS_ARROW_WITH_SMALL_TRIANGLE_ARROWHEAD> \xF0\x9F\xA0\x80 <UPWARDS_ARROW_WITH_SMALL_TRIANGLE_ARROWHEAD> \xF0\x9F\xA0\x81 <RIGHTWARDS_ARROW_WITH_SMALL_TRIANGLE_ARROWHEAD> \xF0\x9F\xA0\x82 @@ -83840,6 +84620,7 @@ CHARMAP <FREEZING_FACE> \xF0\x9F\xA5\xB6 <NINJA> \xF0\x9F\xA5\xB7 <DISGUISED_FACE> \xF0\x9F\xA5\xB8 +<FACE_HOLDING_BACK_TEARS> \xF0\x9F\xA5\xB9 <FACE_WITH_PLEADING_EYES> \xF0\x9F\xA5\xBA <SARI> \xF0\x9F\xA5\xBB <LAB_COAT> \xF0\x9F\xA5\xBC @@ -83922,6 +84703,7 @@ CHARMAP <MATE_DRINK> \xF0\x9F\xA7\x89 <ICE_CUBE> \xF0\x9F\xA7\x8A <BUBBLE_TEA> \xF0\x9F\xA7\x8B +<TROLL> \xF0\x9F\xA7\x8C <STANDING_PERSON> \xF0\x9F\xA7\x8D <KNEELING_PERSON> \xF0\x9F\xA7\x8E <DEAF_PERSON> \xF0\x9F\xA7\x8F @@ -84079,6 +84861,8 @@ CHARMAP <DROP_OF_BLOOD> \xF0\x9F\xA9\xB8 <ADHESIVE_BANDAGE> \xF0\x9F\xA9\xB9 <STETHOSCOPE> \xF0\x9F\xA9\xBA +<X-RAY> \xF0\x9F\xA9\xBB +<CRUTCH> \xF0\x9F\xA9\xBC <YO-YO> \xF0\x9F\xAA\x80 <KITE> \xF0\x9F\xAA\x81 <PARACHUTE> \xF0\x9F\xAA\x82 @@ -84111,6 +84895,10 @@ CHARMAP <HEADSTONE> \xF0\x9F\xAA\xA6 <PLACARD> \xF0\x9F\xAA\xA7 <ROCK> \xF0\x9F\xAA\xA8 +<MIRROR_BALL> \xF0\x9F\xAA\xA9 +<IDENTIFICATION_CARD> \xF0\x9F\xAA\xAA +<LOW_BATTERY> \xF0\x9F\xAA\xAB +<HAMSA> \xF0\x9F\xAA\xAC <FLY> \xF0\x9F\xAA\xB0 <WORM> \xF0\x9F\xAA\xB1 <BEETLE> \xF0\x9F\xAA\xB2 @@ -84118,9 +84906,16 @@ CHARMAP <POTTED_PLANT> \xF0\x9F\xAA\xB4 <WOOD> \xF0\x9F\xAA\xB5 <FEATHER> \xF0\x9F\xAA\xB6 +<LOTUS> \xF0\x9F\xAA\xB7 +<CORAL> \xF0\x9F\xAA\xB8 +<EMPTY_NEST> \xF0\x9F\xAA\xB9 +<NEST_WITH_EGGS> \xF0\x9F\xAA\xBA <ANATOMICAL_HEART> \xF0\x9F\xAB\x80 <LUNGS> \xF0\x9F\xAB\x81 <PEOPLE_HUGGING> \xF0\x9F\xAB\x82 +<PREGNANT_MAN> \xF0\x9F\xAB\x83 +<PREGNANT_PERSON> \xF0\x9F\xAB\x84 +<PERSON_WITH_CROWN> \xF0\x9F\xAB\x85 <BLUEBERRIES> \xF0\x9F\xAB\x90 <BELL_PEPPER> \xF0\x9F\xAB\x91 <OLIVE> \xF0\x9F\xAB\x92 @@ -84128,6 +84923,24 @@ CHARMAP <TAMALE> \xF0\x9F\xAB\x94 <FONDUE> \xF0\x9F\xAB\x95 <TEAPOT> \xF0\x9F\xAB\x96 +<POURING_LIQUID> \xF0\x9F\xAB\x97 +<BEANS> \xF0\x9F\xAB\x98 +<JAR> \xF0\x9F\xAB\x99 +<MELTING_FACE> \xF0\x9F\xAB\xA0 +<SALUTING_FACE> \xF0\x9F\xAB\xA1 +<FACE_WITH_OPEN_EYES_AND_HAND_OVER_MOUTH> \xF0\x9F\xAB\xA2 +<FACE_WITH_PEEKING_EYE> \xF0\x9F\xAB\xA3 +<FACE_WITH_DIAGONAL_MOUTH> \xF0\x9F\xAB\xA4 +<DOTTED_LINE_FACE> \xF0\x9F\xAB\xA5 +<BITING_LIP> \xF0\x9F\xAB\xA6 +<BUBBLES> \xF0\x9F\xAB\xA7 +<HAND_WITH_INDEX_FINGER_AND_THUMB_CROSSED> \xF0\x9F\xAB\xB0 +<RIGHTWARDS_HAND> \xF0\x9F\xAB\xB1 +<LEFTWARDS_HAND> \xF0\x9F\xAB\xB2 +<PALM_DOWN_HAND> \xF0\x9F\xAB\xB3 +<PALM_UP_HAND> \xF0\x9F\xAB\xB4 +<INDEX_POINTING_AT_THE_VIEWER> \xF0\x9F\xAB\xB5 +<HEART_HANDS> \xF0\x9F\xAB\xB6 <BLOCK_SEXTANT-1> \xF0\x9F\xAC\x80 <BLOCK_SEXTANT-2> \xF0\x9F\xAC\x81 <BLOCK_SEXTANT-12> \xF0\x9F\xAC\x82 @@ -127058,6 +127871,8 @@ CHARMAP <CJK_UNIFIED_IDEOGRAPH-2A6DB> \xF0\xAA\x9B\x9B <CJK_UNIFIED_IDEOGRAPH-2A6DC> \xF0\xAA\x9B\x9C <CJK_UNIFIED_IDEOGRAPH-2A6DD> \xF0\xAA\x9B\x9D +<CJK_UNIFIED_IDEOGRAPH-2A6DE> \xF0\xAA\x9B\x9E +<CJK_UNIFIED_IDEOGRAPH-2A6DF> \xF0\xAA\x9B\x9F <CJK_UNIFIED_IDEOGRAPH-2A700> \xF0\xAA\x9C\x80 <CJK_UNIFIED_IDEOGRAPH-2A701> \xF0\xAA\x9C\x81 <CJK_UNIFIED_IDEOGRAPH-2A702> \xF0\xAA\x9C\x82 @@ -131207,6 +132022,10 @@ CHARMAP <CJK_UNIFIED_IDEOGRAPH-2B732> \xF0\xAB\x9C\xB2 <CJK_UNIFIED_IDEOGRAPH-2B733> \xF0\xAB\x9C\xB3 <CJK_UNIFIED_IDEOGRAPH-2B734> \xF0\xAB\x9C\xB4 +<CJK_UNIFIED_IDEOGRAPH-2B735> \xF0\xAB\x9C\xB5 +<CJK_UNIFIED_IDEOGRAPH-2B736> \xF0\xAB\x9C\xB6 +<CJK_UNIFIED_IDEOGRAPH-2B737> \xF0\xAB\x9C\xB7 +<CJK_UNIFIED_IDEOGRAPH-2B738> \xF0\xAB\x9C\xB8 <CJK_UNIFIED_IDEOGRAPH-2B740> \xF0\xAB\x9D\x80 <CJK_UNIFIED_IDEOGRAPH-2B741> \xF0\xAB\x9D\x81 <CJK_UNIFIED_IDEOGRAPH-2B742> \xF0\xAB\x9D\x82 diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 45d9fe44c650..59d0b3917411 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -885,7 +885,7 @@ export_var ( ) { # Don't wawnt a subshell # Call this function to set defaults _after_ parsing options. # dont want a subshell otherwise variable setting is thrown away. set_defaults_and_export ( ) { - : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}} + : ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT}:+.${NANO_LAYOUT}} : ${MAKEOBJDIRPREFIX:=${NANO_OBJ}} : ${NANO_DISKIMGDIR:=${NANO_OBJ}} : ${NANO_WORLDDIR:=${NANO_OBJ}/_.w} diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common index 07b3f3963d0b..0bfe1993fc13 100644 --- a/tools/tools/nanobsd/dhcpd/common +++ b/tools/tools/nanobsd/dhcpd/common @@ -98,10 +98,8 @@ NANO_MAKEFS="makefs -B big \ -o bsize=4096,fsize=512,density=8192,optimization=space" export NANO_MAKEFS -# NB: leave c++ enabled so devd can be built CONF_BUILD=" WITHOUT_ACPI=true -WITHOUT_ATM=true WITHOUT_AUDIT=true WITHOUT_BLUETOOTH=true WITHOUT_CALENDAR=true diff --git a/tools/tools/nanobsd/embedded/README b/tools/tools/nanobsd/embedded/README index b77d3302d861..736e1c47673c 100644 --- a/tools/tools/nanobsd/embedded/README +++ b/tools/tools/nanobsd/embedded/README @@ -23,10 +23,6 @@ Config Short description beaglebone.cfg Create a bootable beaglebone image qemu-amd64.cfg Create a bootable amd64 image for qemu (W) qemu-i386.cfg Create a bootable i386 image for qemu (W) -qemu-mips.cfg Create a bootable mips malta board image for - qemu -qemu-mips64.cfg Create a bootable mips malta board (64-bit - mode) image for qemu qemu-powerpc.cfg Create a bootable 32-bit powerpc image for qemu qemu-powerpc64.cfg Create a bootable 64-bit IBM-flavor image for diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 3b8faff5e252..0e799be96e30 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -128,11 +128,9 @@ cust_install_machine_files ( ) ( customize_cmd cust_install_files customize_cmd cust_install_machine_files -# NB: leave c++ enabled so devd can be built CONF_BUILD=" LOCAL_XTOOL_DIRS=usr.bin/mkimg WITHOUT_ACPI=true -WITHOUT_ATM=true WITHOUT_AUDIT=true WITHOUT_BLUETOOTH=true WITHOUT_CALENDAR=true @@ -217,7 +215,7 @@ create_diskimage_mbr ( ) ( if [ -d ${NANO_FAT_DIR} ]; then # Need to copy files from ${NANO_FATDIR} with mtools, or use # makefs -t msdos once that's supported - mcopy -i ${NANO_LOG}/_.${NANO_SLICE_FAT} ${NANO_FAT_DIR}/* :: + mcopy -s -i ${NANO_LOG}/_.${NANO_SLICE_FAT} ${NANO_FAT_DIR}/* :: fi fi @@ -452,11 +450,6 @@ dos_boot_part ( ) ( chdir $f cp ${d}/* . - # Also copy ubldr. u-boot will load it and it will load the kernel - # from the ufs partition - cp ${NANO_WORLDDIR}/boot/ubldr . - cp ${NANO_WORLDDIR}/boot/ubldr.bin . - # We have to touch the saveenv file touch uEnv.txt @@ -529,20 +522,6 @@ std_i386 ( ) { : ${NANO_BOOT_BSD:=${NANO_WORLDDIR}/boot/boot} } -std_mips ( ) { - NANO_ENDIAN=big -} - -std_mipsel ( ) { -} - -std_mips64 ( ) { - NANO_ENDIAN=big -} - -std_mips64el ( ) { -} - std_powerpc ( ) { NANO_ENDIAN=big } diff --git a/tools/tools/nanobsd/embedded/qemu-mips.cfg b/tools/tools/nanobsd/embedded/qemu-mips.cfg deleted file mode 100644 index 341f7f9c1430..000000000000 --- a/tools/tools/nanobsd/embedded/qemu-mips.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# $FreeBSD$ - -#- -# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org> -# Copyright (c) 2010-2011 iXsystems, Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL iXsystems, Inc. OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# - -NANO_ARCH=mips -NANO_KERNEL=MALTA -NANO_DRIVE=ada0 -NANO_NAME=qemu-mips - -. common # Pull in common definitions - -qemu_env diff --git a/tools/tools/nanobsd/embedded/qemu-mips64.cfg b/tools/tools/nanobsd/embedded/qemu-mips64.cfg deleted file mode 100644 index 6e936b156757..000000000000 --- a/tools/tools/nanobsd/embedded/qemu-mips64.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# $FreeBSD$ - -#- -# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org> -# Copyright (c) 2010-2011 iXsystems, Inc. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL iXsystems, Inc. OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# - -NANO_ARCH=mips -NANO_KERNEL=MALTA64 -NANO_DRIVE=ada0 -NANO_NAME=qemu-mips64 - -. common # Pull in common definitions - -qemu_env diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config deleted file mode 100644 index d2a1db35d42e..000000000000 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config +++ /dev/null @@ -1,49 +0,0 @@ -# $OpenBSD: ssh_config,v 1.35 2020/07/17 03:43:42 dtucker Exp $ -# $FreeBSD$ - -# This is the ssh client system-wide configuration file. See -# ssh_config(5) for more information. This file provides defaults for -# users, and the values can be changed in per-user configuration files -# or on the command line. - -# Configuration data is parsed as follows: -# 1. command line options -# 2. user-specific file -# 3. system-wide file -# Any configuration value is only changed the first time it is set. -# Thus, host-specific definitions should be at the beginning of the -# configuration file, and defaults at the end. - -# Site-wide defaults for some commonly used options. For a comprehensive -# list of available options, their meanings and defaults, please see the -# ssh_config(5) man page. - -# Host * -# ForwardAgent no -# ForwardX11 no -# PasswordAuthentication yes -# HostbasedAuthentication no -# GSSAPIAuthentication no -# GSSAPIDelegateCredentials no -# BatchMode no -# CheckHostIP no -# AddressFamily any -# ConnectTimeout 0 -# StrictHostKeyChecking ask -# IdentityFile ~/.ssh/id_rsa -# IdentityFile ~/.ssh/id_dsa -# IdentityFile ~/.ssh/id_ecdsa -# IdentityFile ~/.ssh/id_ed25519 -# Port 22 -# Ciphers aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc -# MACs hmac-md5,hmac-sha1,umac-64@openssh.com -# EscapeChar ~ -# Tunnel no -# TunnelDevice any:any -# PermitLocalCommand no -# VisualHostKey no -# ProxyCommand ssh -q -W %h:%p gateway.example.com -# RekeyLimit 1G 1h -# UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VerifyHostKeyDNS yes -# VersionAddendum FreeBSD-20210907 diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config deleted file mode 100644 index e3020bbfcacf..000000000000 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config +++ /dev/null @@ -1,121 +0,0 @@ -# $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $ -# $FreeBSD$ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -# Note that some of FreeBSD's defaults differ from OpenBSD's, and -# FreeBSD has a few additional options. - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key -#HostKey /etc/ssh/ssh_host_ed25519_key - -# Ciphers and keying -#RekeyLimit default none - -# Logging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#PubkeyAuthentication yes - -# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys - -#AuthorizedPrincipalsFile none - -#AuthorizedKeysCommand none -#AuthorizedKeysCommandUser nobody - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# Change to yes to enable built-in password authentication. -#PasswordAuthentication no -#PermitEmptyPasswords no - -# Change to no to disable PAM authentication -#KbdInteractiveAuthentication yes - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes - -# Set this to 'no' to disable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the KbdInteractiveAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via KbdInteractiveAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and KbdInteractiveAuthentication to 'no'. -#UsePAM yes - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -#X11Forwarding yes -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PermitTTY yes -#PrintMotd yes -#PrintLastLog yes -#TCPKeepAlive yes -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid -#MaxStartups 10:30:100 -#PermitTunnel no -#ChrootDirectory none -#UseBlacklist no -#VersionAddendum FreeBSD-20210907 - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/libexec/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# PermitTTY no -# ForceCommand cvs server diff --git a/tools/tools/netmap/bridge.c b/tools/tools/netmap/bridge.c index 0c8f56265ff4..6bd8809b8849 100644 --- a/tools/tools/netmap/bridge.c +++ b/tools/tools/netmap/bridge.c @@ -206,8 +206,6 @@ main(int argc, char **argv) int loopback = 0; int ch; - fprintf(stderr, "%s built %s %s\n\n", argv[0], __DATE__, __TIME__); - while ((ch = getopt(argc, argv, "hb:ci:vw:L")) != -1) { switch (ch) { default: diff --git a/tools/tools/netmap/lb.c b/tools/tools/netmap/lb.c index 778360d9ed6a..66d7aab8f6e1 100644 --- a/tools/tools/netmap/lb.c +++ b/tools/tools/netmap/lb.c @@ -388,7 +388,8 @@ static void sigint_h(int sig) signal(SIGINT, SIG_DFL); } -static void usage() +static void +usage(void) { printf("usage: lb [options]\n"); printf("where options are:\n"); @@ -617,7 +618,6 @@ int main(int argc, char **argv) int ch; uint32_t i; int rv; - unsigned int iter = 0; int poll_timeout = 10; /* default */ glob_arg.ifname[0] = '\0'; @@ -897,7 +897,6 @@ run: while (!do_abort) { u_int polli = 0; - iter++; for (i = 0; i < npipes; ++i) { struct netmap_ring *ring = ports[i].ring; diff --git a/tools/tools/netmap/nmreplay.c b/tools/tools/netmap/nmreplay.c index e0a9e2146119..390877677403 100644 --- a/tools/tools/netmap/nmreplay.c +++ b/tools/tools/netmap/nmreplay.c @@ -1249,6 +1249,8 @@ main(int argc, char **argv) err += cmd_apply(delay_cfg, d[i], qs, &qs->c_delay); err += cmd_apply(bw_cfg, b[i], qs, &qs->c_bw); err += cmd_apply(loss_cfg, l[i], qs, &qs->c_loss); + if (err != 0) + exit(1); } pthread_create(&bp[0].cons_tid, NULL, nmreplay_main, (void*)&bp[0]); diff --git a/tools/tools/netmap/pkt-gen.c b/tools/tools/netmap/pkt-gen.c index f43469cf7ad6..296208018fd4 100644 --- a/tools/tools/netmap/pkt-gen.c +++ b/tools/tools/netmap/pkt-gen.c @@ -684,6 +684,10 @@ source_hwaddr(const char *ifname, char *buf) return (-1); } + /* remove 'netmap:' prefix before comparing interfaces */ + if (!strncmp(ifname, "netmap:", 7)) + ifname = &ifname[7]; + for (ifap = ifaphead; ifap; ifap = ifap->ifa_next) { struct sockaddr_dl *sdl = (struct sockaddr_dl *)ifap->ifa_addr; @@ -1302,7 +1306,7 @@ ping_body(void *data) struct targ *targ = (struct targ *) data; struct pollfd pfd = { .fd = targ->fd, .events = POLLIN }; struct netmap_if *nifp = targ->nmd->nifp; - int i, m, rx = 0; + int i, m; void *frame; int size; struct timespec ts, now, last_print; @@ -1322,6 +1326,10 @@ ping_body(void *data) return NULL; } + if (targ->g->af == AF_INET6) { + D("Warning: ping-pong with IPv6 not supported"); + } + bzero(&buckets, sizeof(buckets)); clock_gettime(CLOCK_REALTIME_PRECISE, &last_print); now = last_print; @@ -1391,7 +1399,9 @@ ping_body(void *data) } #endif /* BUSYWAIT */ /* see what we got back */ - rx = 0; +#ifdef BUSYWAIT + int rx = 0; +#endif for (i = targ->nmd->first_rx_ring; i <= targ->nmd->last_rx_ring; i++) { ring = NETMAP_RXRING(nifp, i); @@ -1426,7 +1436,9 @@ ping_body(void *data) buckets[pos]++; /* now store it in a bucket */ ring->head = ring->cur = nm_ring_next(ring, ring->head); +#ifdef BUSYWAIT rx++; +#endif } } //D("tx %d rx %d", sent, rx); @@ -1494,7 +1506,7 @@ pong_body(void *data) struct pollfd pfd = { .fd = targ->fd, .events = POLLIN }; struct netmap_if *nifp = targ->nmd->nifp; struct netmap_ring *txring, *rxring; - int i, rx = 0; + int i; uint64_t sent = 0, n = targ->g->npackets; if (targ->g->nthreads > 1) { @@ -1504,6 +1516,11 @@ pong_body(void *data) if (n > 0) D("understood ponger %llu but don't know how to do it", (unsigned long long)n); + + if (targ->g->af == AF_INET6) { + D("Warning: ping-pong with IPv6 not supported"); + } + while (!targ->cancel && (n == 0 || sent < n)) { uint32_t txhead, txavail; //#define BUSYWAIT @@ -1531,7 +1548,6 @@ pong_body(void *data) src = NETMAP_BUF(rxring, slot->buf_idx); //D("got pkt %p of size %d", src, slot->len); rxring->head = rxring->cur = nm_ring_next(rxring, head); - rx++; if (txavail == 0) continue; dst = NETMAP_BUF(txring, @@ -1547,7 +1563,15 @@ pong_body(void *data) dpkt[3] = spkt[0]; dpkt[4] = spkt[1]; dpkt[5] = spkt[2]; + /* swap source and destination IPv4 */ + if (spkt[6] == htons(ETHERTYPE_IP)) { + dpkt[13] = spkt[15]; + dpkt[14] = spkt[16]; + dpkt[15] = spkt[13]; + dpkt[16] = spkt[14]; + } txring->slot[txhead].len = slot->len; + //dump_payload(dst, slot->len, txring, txhead); txhead = nm_ring_next(txring, txhead); txavail--; sent++; @@ -1558,7 +1582,6 @@ pong_body(void *data) #ifdef BUSYWAIT ioctl(pfd.fd, NIOCTXSYNC, NULL); #endif - //D("tx %d rx %d", sent, rx); } targ->completed = 1; @@ -1581,7 +1604,7 @@ sender_body(void *data) uint64_t n = targ->g->npackets / targ->g->nthreads; uint64_t sent = 0; uint64_t event = 0; - int options = targ->g->options | OPT_COPY; + int options = targ->g->options; struct timespec nexttime = { 0, 0}; // XXX silence compiler int rate_limit = targ->g->tx_rate; struct pkt *pkt = &targ->pkt; @@ -1655,6 +1678,19 @@ sender_body(void *data) targ->frags++; } D("frags %u frag_size %u", targ->frags, targ->frag_size); + + /* mark all slots of all rings as changed so initial copy will be done */ + for (i = targ->nmd->first_tx_ring; i <= targ->nmd->last_tx_ring; i++) { + uint32_t j; + struct netmap_slot *slot; + + txring = NETMAP_TXRING(nifp, i); + for (j = 0; j < txring->num_slots; j++) { + slot = &txring->slot[j]; + slot->flags = NS_BUF_CHANGED; + } + } + while (!targ->cancel && (n == 0 || sent < n)) { int rv; @@ -1691,10 +1727,6 @@ sender_body(void *data) /* * scan our queues and send on those with room */ - if (options & OPT_COPY && sent > 100000 && !(targ->g->options & OPT_COPY) ) { - D("drop copy"); - options &= ~OPT_COPY; - } for (i = targ->nmd->first_tx_ring; i <= targ->nmd->last_tx_ring; i++) { int m; uint64_t limit = rate_limit ? tosend : targ->g->burst; @@ -2792,7 +2824,7 @@ tap_alloc(char *dev) /* try to create the device */ if( (err = ioctl(fd, TUNSETIFF, (void *) &ifr)) < 0 ) { - D("failed to to a TUNSETIFF: %s", strerror(errno)); + D("failed to do a TUNSETIFF: %s", strerror(errno)); close(fd); return err; } diff --git a/tools/tools/netrate/tcpp/tcpp_server.c b/tools/tools/netrate/tcpp/tcpp_server.c index 0a79fbba5e30..eca2c3d469db 100644 --- a/tools/tools/netrate/tcpp/tcpp_server.c +++ b/tools/tools/netrate/tcpp/tcpp_server.c @@ -54,7 +54,7 @@ * Server side -- create a pool of processes, each listening on its own TCP * port number for new connections. The first 8 bytes of each connection * will be a network byte order length, then there will be that number of - * bytes of data. We use non-blocking sockets with kqueue to to avoid the + * bytes of data. We use non-blocking sockets with kqueue to avoid the * overhead of threading or more than one process per processor, which makes * things a bit awkward when dealing with data we care about. As such, we * read into a small character buffer which we then convert to a length once diff --git a/tools/tools/sysdoc/tunables.mdoc b/tools/tools/sysdoc/tunables.mdoc index 0926c2556c81..a481c7e3f008 100644 --- a/tools/tools/sysdoc/tunables.mdoc +++ b/tools/tools/sysdoc/tunables.mdoc @@ -1395,56 +1395,9 @@ net.inet.tcp.getcred net.inet.tcp.icmp_may_rst --- -net.inet.tcp.inflight_debug -bool - -Control debugging for the -.Va net.inet.tcp.inflight_enable -.Nm . -Please see the -.Xr tuning 7 -man page for more information. - ---- -net.inet.tcp.inflight_enable -bool - -Turns on bandwidth delay product limiting for all -TCP connections. Please see the -.Xr tuning 7 -man page for more information. - ---- -net.inet.tcp.inflight_max -bool - -.Em double check -The maximum amount of data that may be queued for -bandwidth delay product limiting. - ---- -net.inet.tcp.inflight_min -bool - -.Em double check -The minimum amount of data that may be queued for -bandwidth delay product limiting. - ---- -net.inet.tcp.inflight_stab -bool - -This parameter represents the maximal packets -added to the bandwidth delay product window -calculation. Changing this is not recommended. - ---- net.inet.tcp.isn_reseed_interval --- -net.inet.tcp.local_slowstart_flightsize - ---- net.inet.tcp.log_in_vain bool diff --git a/tools/tools/tinybsd/CHANGES b/tools/tools/tinybsd/CHANGES deleted file mode 100644 index b409fd67fbd2..000000000000 --- a/tools/tools/tinybsd/CHANGES +++ /dev/null @@ -1,43 +0,0 @@ -# $FreeBSD$ - -0.9: -- Added function personal_directories, you can create on conf dir your custom -personal directories with your custom files inside of them and it will be copied -to your image. -Thanks to Marcus Grando <mnag@FreeBSD.org> for the patch. - -0.8: -- Now FreeBSD 6.X is the default configuration on TinyBSD files. -- TinyBSD no longer use bootmanager, so fstab device was changed to ad0a. -- Added an example configuration to WRAP motherboards. Just use 'wrap' as argument on build to use it. - -0.7: -- Revision on Makefile to respect non-standard LOCALBASE/X11BASE on FreeBSD. -Thanks to Florent Thoumie <flz@FreeBSD.org>. - -0.6: -- fix script problem on symlinks creation. -- added debug information on tinybsd build process with "====>". - -0.5: -- fix script problem when the kernel is not build, it's not should process -an image without kernel :) Thanks to Marten <info@martenvijn.nl> for the patch. - -0.4: -- added pre configured images to build tinybsd: default, bridge, minimal, vpn, -firewall and wireless. -- added etc/ on each image directory to the user copy your custom etc -configuration. - -0.3: -- fix named directory missing on etc build. - -0.2: -- added "device ath_rate_onoe" on kernel config file to be compiled on -FreeBSD 6. -- added on tinybsd script a line to clean up kernel build directory -- added on tinybsd script a for function to copy correct pam depends. - -0.1: -- TinyBSD released - diff --git a/tools/tools/tinybsd/README b/tools/tools/tinybsd/README deleted file mode 100644 index ff1bf28b3afa..000000000000 --- a/tools/tools/tinybsd/README +++ /dev/null @@ -1,259 +0,0 @@ -# $FreeBSD$ - -- TinyBSD - -You must read this to know how to build embedded systems with TinyBSD. - -- TinyBSD files - -TinyBSD's creation conf files are available under /usr/src/tools/tools/tinybsd/conf -and the script are available under /usr/src/tools/tools/tinybsd/tinybsd. - -The system has been entirely based on the ease of image customization from -PicoBSD, and the compilation script based on NanoBSD's. - -# ls /usr/src/tools/tools/tinybsd/conf -bridge/ default/ firewall/ minimal/ vpn/ wireless/ wrap/ - -We have these six pre configured images to build. On each directory we have 3 -main files in there. Let's see what each of them are: - -# ls /usr/src/tools/tools/tinybsd/conf/default -TINYBSD etc/ tinybsd.basefiles - -TINYBSD: Just like PicoBSD had its kernel previously compiled, we call ours -TINYBSD. - -# more TINYBSD - -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident TINYBSD - -#To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. -... - -As you can see, it's a kernel file identical to your system's, leaving only -the task of enabling or disabling options, according to your needs. - -tinybsd.basefiles: Just like PicoBSD had its crunch.conf file to define which -files we'd want the new system to have, in this one we'll have all files to be -put into our embedded system, already having all available files for running -the system well. Put in or take out the files you need according to your -needs. Let's see it: - -# more tinybsd.basefiles -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -... -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -... - -And so on. In case you'd want to add the binary "setkey", sitting on -/usr/sbin, you'd only need to add the following line inside the /usr/sbin part -of the file, like this: - -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/setkey - -tinybsd.ports: Here you can add the applications from the FreeBSD Ports Collection -which you want TinyBSD ports system to install in your embedded system. You whould -list one application per line, mentioning its category and name, like the examples: -www/mini_httpd -net-mgmt/rate - -etc/: This is the directory where you can put your custom /etc configuration. - -# ls /usr/src/tools/tools/tinybsd/tinybsd -tinybsd - -tinybsd: This is the script that builds the entire system. You'll hardly -need to modify it at all. The idea is for it to create a temporary work -directory for it to create the entire system tree. Once done, it'll copy all -files listed in tinybsd.basefiles to this tree, then it'll compile a new -kernel using the definitions in the TINYBSD file, and finally copy the library -dependencies the binaries will have. We'll then populate /etc on that -temporary tree and put in a few important default configurations inside on -/usr/src/tools/tools/tinybsd/conf/YOURCHOICE/etc/ like rc.conf, fstab and others. - -Finally, we create an empty image, according to your media's specifications, -passed on to the script on the command line, and copy the entire temporary -work tree into the image mounted on /mnt. - -- Running TinyBSD - -Now that we know how it works, it's time for us to build our own image. Let's -do that step-by-step. - -1) Choose what pre-configured image you want. - -2) Edit the TINYBSD kernel file and add/remove all options you'll need. - -3) Edit the tinybsd.basefiles file and add/remove all binaries you'll need on -your system. - -4) Copy all your /etc configuration which you want to conf/YOURIMAGE/etc/. - -5) Gather the right information on your destination media. To do that, plug in -the device on the system and fetch the information using diskinfo(8): - -# diskinfo -v /dev/ad2 -ad2 - 512 # sectorsize - 20060135424 # mediasize in bytes (19G) - 39179952 # mediasize in sectors - 38869 # Cylinders according to firmware. - 16 # Heads according to firmware. - 63 # Sectors according to firmware. - -To create my image, I'll need to know the media size in sectors, Heads -according to firmware and Sectors according to firmware. Optionally, you may -define the name of the generated image's file, but if you don't, it'll be -named tinybsd.bin. Now that we have gathered these informations through -diskinfo, all we need to do is run tinybsd. Remember that it has 3 -parameters plus 1 optional, and if you don't pass on the required ones, the -script will warn you about it: - -# /usr/src/tools/tools/tinybsd/tinybsd -Woops! - Usage: tinybsd <mediasize in sectors> <heads according to firmware> - <sectors according to firmware> <conf> [<tinybsd image name>] - - Example: tinybsd 62592 4 32 - - or - - /usr/src/tools/tools/tinybsd/tinybsd 62592 4 32 wireless - - Run diskinfo(8) -v against your CF device to get correct information - about your disk. - -Passing on the parameters correctly: - -# /usr/src/tools/tools/tinybsd/tinybsd 39179952 16 63 wireless -Creating directory hierarchy... -./bin missing (created) -./boot missing (created) -./boot/defaults missing (created) -./boot/kernel missing (created) -./boot/modules missing (created) -./dev missing (created) -./etc missing (created) -... - -In the end, we have the generated tinybsd.bin image. Now we have to copy it to -its final destination: - -# dd if=/usr/src/tools/tools/tinybsd/tinybsd.bin of=/dev/ad2 - -Boot up your new embedded system and log on it. If you're ever going to modify -it, you must first remount the root slice as read-write, as it operates by -default on read-only mode, saving disk writes and preventing data-loss in case -of power failures. To mount it for read-write, use mount: - -# mount -u -o rw / - -Once you're done, return it to read-only mode: - -# mount -u -o ro / - -The first thing you need to do after logging for the first time, is to set a -root password. By default, it's created with no root password. - -If you run df(1), you'll see the following partitions: - -# df -Filesystem 1K-blocks Used Avail Capacity Mounted on -/dev/ad0a 29359 19446 7565 72% / -devfs 1 1 0 100% /dev -procfs 4 4 0 100% /proc -/dev/md0 3694 114 3286 3% /var -/dev/md1 19566 6 17996 0% /tmp - -As you can see, /var and /tmp are mounted on /dev/md0 and /dev/md1 -respectively, using memory disk devices. That's because both /var and /tmp are -write-intensive, and as our system works mostly on read-only mode, we'd suffer -with writing problems there, so the memory disk approach works fine. On the -other hand, whenever you reboot the system, those directories' contents -(including logs on /var/log) will be lost. If you need to keep the contents of -those directories, I suggest you to always upload them to another box. - -The configuration line that fires up the system script to create /var as a -memory disk partition is "varmfs="YES"", inside -/etc/rc.conf. Besides mounting /var as a memory disk device, it also populates -its tree with the necessary subdirectories. Initially, /var is created on -memory using only 32MB of space, and that's usually enough. Although, if you -find it necessary to tweak that configuration, you may edit this line of -/etc/rc.conf: - -varsize="32m" - -Change 32m to whatever value you see fit (in MBytes). Take care of not using -your entire memory for /var. - -- Ports and TinyBSD - -You can also install ports on the new system via ports. For that, you'll need -to set the PREFIX environment variable to the image's destination path. Let's -assume you want to install apache on the newly-created image. For that, I'd do -this: - -# mdconfig -a -t vnode -f /usr/src/tools/tools/tinybsd/tinybsd.bin -u 0 - -That uses mdconfig to enable the memory disk 0. - -# mount /dev/md0a /mnt - -Now we've mounted the image on the temporary directory /mnt. Let's then -install apache via ports: - -# cd /usr/ports/www/apache13 -# make install PREFIX=/mnt/usr/local -===> Vulnerability check disabled ->> apache_1.3.31.tar.gz doesn't seem to exist in /usr/ports/distfiles/. ->> Attempting to fetch from http://www.apache.org/dist/httpd/. -... - This port has installed the following startup scripts which may cause - these network services to be started at boot time. -/mnt/usr/local/etc/rc.d/apache.sh -.... - -Once the install is finished, let's verify that apache has indeed been -properly installed under our /mnt directory: - -# cd /mnt/usr/local/sbin -# ls -lga httpd --rwxr-xr-x 1 root wheel 252439 Jul 14 15:31 httpd - -Our software has been successfully installed. You must notice that at the end -of the install, it shows the full path for the PREFIX variable we passed it. -The problem with that is that at boot-time, your system is going to look for -it under /mnt instead of /usr. So we need to edit apache's initialization -script under /usr/local/etc/rc.d (apache.sh) and remove all instances of -"/mnt" in it. - -WARNING: A very important thing to care about are dependencies. Before -installing anything, check to see if it has any dependencies, and that you'll -have enough disk space on the destination system for both the application -you're installing and its dependencies. - -- Script download - -TinyBSD is still a project under heavy development, both the script itself and -its documentation. - -In case you'd like to try or use the BETA version of the script, feel free to -download it from the project's official site at http://code.google.com/p/tinybsd/. diff --git a/tools/tools/tinybsd/conf/bridge/TINYBSD b/tools/tools/tinybsd/conf/bridge/TINYBSD deleted file mode 100644 index fe6bed93ba6f..000000000000 --- a/tools/tools/tinybsd/conf/bridge/TINYBSD +++ /dev/null @@ -1,155 +0,0 @@ -# $FreeBSD$ - -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident TINYBSD - -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -options SCHED_4BSD # 4BSD scheduler -options INET # InterNETworking -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -device apic # I/O APIC - -device eisa -device pci - -# Floppy drives -#device fdc - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -options ATA_STATIC_ID # Static device numbering - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -#device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# PCCARD (PCMCIA) support -# PCMCIA and cardbus bridge support -device cbb # cardbus (yenta) bridge -device pccard # PC Card (16-bit) bus -device cardbus # CardBus (32-bit) bus - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit ethernet -device nge # NatSemi DP83820 gigabit ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# ISA devices that use the old ISA shims -#device le - -# Wireless NIC cards -device wlan # 802.11 support -device an # Aironet 4500/4800 802.11 wireless NICs. -device awi # BayStack 660 and others -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. - -# Pseudo devices. -device loop # Network loopback -device ether # Ethernet support -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. -device bpf # Berkeley packet filter - -options IPFIREWALL -options IPFIREWALL_DEFAULT_TO_ACCEPT - -device ath -device ath_hal -device ath_rate_sample - -device if_bridge #Bridge interface - -# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 -# clock to actually be used. -options CLK_USE_I8254_CALIBRATION - -# CPU_ELAN enables support for AMDs ElanSC520 CPU. -options CPU_ELAN -options CPU_SOEKRIS -options CPU_ELAN_XTAL=32768000 -options CPU_ELAN_PPS - diff --git a/tools/tools/tinybsd/conf/bridge/etc/fstab b/tools/tools/tinybsd/conf/bridge/etc/fstab deleted file mode 100644 index 16ada11d7790..000000000000 --- a/tools/tools/tinybsd/conf/bridge/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# $FreeBSD$ -/dev/ad0a / ufs ro 1 1 diff --git a/tools/tools/tinybsd/conf/bridge/etc/rc.conf b/tools/tools/tinybsd/conf/bridge/etc/rc.conf deleted file mode 100644 index a3e638e5efd5..000000000000 --- a/tools/tools/tinybsd/conf/bridge/etc/rc.conf +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ -hostname="tinybsd.freebsd.org" -sendmail_enable="NONE" -sshd_enable="YES" -usbd_enable="NO" -inetd_enable="NO" -portmap_enable="NO" -update_motd="NO" -varmfs="YES" -populate_var="YES" -varsize="8192" -tmpmfs="YES" - -# Bridge configuration -# Replace both ath0 and xl1 by your bridge interfaces -cloned_interfaces="bridge0" -ifconfig_bridge0="addm ath0 addm xl1 up" diff --git a/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf b/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf deleted file mode 100644 index cb7084679fae..000000000000 --- a/tools/tools/tinybsd/conf/bridge/etc/sysctl.conf +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -# BRIDGE Options -net.link.bridge.ipfw=1 -net.link.bridge.pfil_onlyip=1 diff --git a/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles b/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles deleted file mode 100644 index 63a860e5b8f7..000000000000 --- a/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles +++ /dev/null @@ -1,236 +0,0 @@ -# $FreeBSD$ -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -boot/loader -boot/loader.4th -boot/loader.help -boot/loader.rc -boot/mbr -boot/support.4th - -# contents of ${WORKDIR}/libexec -libexec/ld-elf.so.1:usr/libexec/ld-elf.so.1 - -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -bin/cp -bin/csh:bin/tcsh -bin/date -bin/dd -bin/df -bin/domainname -bin/echo -bin/ed:bin/red -bin/expr -bin/hostname -bin/kenv -bin/kill -bin/ln:bin/link -bin/ls -bin/mkdir -bin/mv -bin/pax -bin/ps -bin/pwd -bin/realpath -bin/rm:bin/unlink -bin/rmdir -bin/sh -bin/sleep -bin/stty -bin/sync - -# contents of ${WORKDIR}/sbin -sbin/adjkerntz -sbin/comcontrol -sbin/disklabel -sbin/dmesg -sbin/fastboot:sbin/reboot -sbin/fasthalt:sbin/halt -sbin/fsck -sbin/fsck_ufs:sbin/fsck_ffs -sbin/fsck_ufs:sbin/fsck_4.2bsd -sbin/ifconfig -sbin/init -sbin/ipfw -sbin/kldconfig -sbin/kldload -sbin/kldstat -sbin/kldunload -sbin/ldconfig -sbin/md5 -sbin/mdconfig -sbin/mknod -sbin/mdmfs -sbin/mount -sbin/mount_nfs -sbin/mount_nullfs -sbin/mount_unionfs -sbin/newfs -sbin/nextboot -sbin/nologin -sbin/nos-tun -sbin/ping -sbin/rcorder -sbin/route -sbin/shutdown -sbin/slattach -sbin/swapon -sbin/sysctl -sbin/umount - -# contents of ${WORKDIR}/usr/sbin -usr/bin/at:usr/bin/atq -usr/bin/at:usr/bin/atrm -usr/bin/at:usr/bin/batch -usr/bin/awk -usr/bin/basename -usr/bin/bunzip2:usr/bin/bzcat -usr/bin/bunzip2:usr/bin/bzip2 -usr/bin/chat -usr/bin/chfn:usr/bin/chpass -usr/bin/chfn:usr/bin/chsh -usr/bin/chgrp -usr/bin/cksum -usr/bin/clear -usr/bin/cmp -usr/bin/compress:usr/bin/uncompress -usr/bin/cpio -usr/bin/crontab -usr/bin/cu -usr/bin/dig -usr/bin/dirname -usr/bin/du -usr/bin/ee -usr/bin/egrep:usr/bin/fgrep -usr/bin/egrep:usr/bin/grep -usr/bin/env -usr/bin/false -usr/bin/fetch -usr/bin/find -usr/bin/finger -usr/bin/fstat -usr/bin/fsync -usr/bin/ftp -usr/bin/gunzip:usr/bin/gzcat -usr/bin/gunzip:usr/bin/gzip -usr/bin/gzexe -usr/bin/head -usr/bin/hexdump -usr/bin/id:usr/bin/whoami -usr/bin/ident -usr/bin/killall -usr/bin/last -usr/bin/less:usr/bin/more -usr/bin/limits -usr/bin/lock -usr/bin/lockf -usr/bin/logger -usr/bin/login -usr/bin/logname -usr/bin/mesg -usr/bin/minigzip -usr/bin/mkfifo -usr/bin/mktemp -usr/bin/msgs -usr/bin/netstat -usr/bin/nfsstat -usr/bin/nice -usr/bin/nslookup -usr/bin/nsupdate -usr/bin/nohup -usr/bin/objformat -usr/bin/openssl -usr/bin/passwd -usr/bin/printf -usr/bin/renice -usr/bin/reset:usr/sbin/tset -usr/bin/scp -usr/bin/script -usr/bin/sed -usr/bin/sftp -usr/bin/shar -usr/bin/slogin:usr/bin/ssh -usr/bin/sort -usr/bin/split -usr/bin/ssh-keygen -usr/bin/su -usr/bin/tail -usr/bin/tar -usr/bin/tee -usr/bin/telnet -usr/bin/tftp -usr/bin/time -usr/bin/top -usr/bin/touch -usr/bin/tput -usr/bin/tr -usr/bin/true -usr/bin/tty -usr/bin/uname -usr/bin/uptime:usr/bin/w -usr/bin/users -usr/bin/uudecode -usr/bin/uuencode -usr/bin/vi -usr/bin/vmstat -usr/bin/wall -usr/bin/who -usr/bin/whois -usr/bin/write -usr/bin/yes - -# contents of ${WORKDIR}/usr/sbin -usr/sbin/arp -usr/sbin/boot0cfg -usr/sbin/chown -usr/sbin/chroot -usr/sbin/cron -usr/sbin/idprio:usr/sbin/rtprio -usr/sbin/inetd -usr/sbin/iostat -usr/sbin/kbdcontrol -usr/sbin/lastlogin -usr/sbin/memcontrol -usr/sbin/mountd -usr/sbin/mtree -usr/sbin/newsyslog -usr/sbin/ngctl -usr/sbin/nghook -usr/sbin/ntpdate -usr/sbin/pciconf -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/slstat -usr/sbin/sshd -usr/sbin/syslogd -usr/sbin/tcpdchk -usr/sbin/tcpdmatch -usr/sbin/tcpdump -usr/sbin/traceroute -usr/sbin/vidcontrol -usr/sbin/vipw -usr/sbin/vnconfig -usr/sbin/watch -usr/sbin/pccardc -usr/sbin/pccardd - -# contents of ${WORKDIR}/usr/libexec -usr/libexec/atrun -usr/libexec/ftpd -usr/libexec/getty -usr/libexec/sftp-server -usr/libexec/telnetd -usr/libexec/tftpd - -# contents of ${WORKDIR}/usr/share -usr/share/misc/termcap - diff --git a/tools/tools/tinybsd/conf/bridge/tinybsd.ports b/tools/tools/tinybsd/conf/bridge/tinybsd.ports deleted file mode 100644 index 49bb52175241..000000000000 --- a/tools/tools/tinybsd/conf/bridge/tinybsd.ports +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# Here you can add the applications from the FreeBSD Ports Collection which you -# want TinyBSD ports system to install in your embedded system. You whould list -# one application per line, mentioning its category and name, like the examples: -# -# www/mini_httpd -# net-mgmt/rate -# -# Make sure you have enough space to add it. diff --git a/tools/tools/tinybsd/conf/default/TINYBSD b/tools/tools/tinybsd/conf/default/TINYBSD deleted file mode 100644 index 64b8f13a3629..000000000000 --- a/tools/tools/tinybsd/conf/default/TINYBSD +++ /dev/null @@ -1,170 +0,0 @@ -# $FreeBSD$ - -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident TINYBSD - -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -options SCHED_4BSD # 4BSD scheduler -options INET # InterNETworking -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_ACL # Support for access control lists -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options NFSCLIENT # Network Filesystem Client -options NFSSERVER # Network Filesystem Server -options NFS_ROOT # NFS usable as /, requires NFSCLIENT -options MSDOSFS # MSDOS Filesystem -options CD9660 # ISO 9660 Filesystem -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -device apic # I/O APIC - -device eisa -device pci - -# Floppy drives -#device fdc - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -#device ataraid # ATA RAID drives -#device atapicd # ATAPI CDROM drives -#device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -#device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# PCCARD (PCMCIA) support -# PCMCIA and cardbus bridge support -device cbb # cardbus (yenta) bridge -device pccard # PC Card (16-bit) bus -device cardbus # CardBus (32-bit) bus - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit ethernet -device nge # NatSemi DP83820 gigabit ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# ISA devices that use the old ISA shims -#device le - -# Wireless NIC cards -device wlan # 802.11 support -device an # Aironet 4500/4800 802.11 wireless NICs. -device awi # BayStack 660 and others -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. - -# Pseudo devices. -device loop # Network loopback -device ether # Ethernet support -device ppp # Kernel PPP -device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" -device gif # IPv6 and IPv4 tunneling - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. -device bpf # Berkeley packet filter - -options IPFIREWALL -options IPFIREWALL_DEFAULT_TO_ACCEPT -options IPDIVERT -options DUMMYNET - -device ath -device ath_hal -device ath_rate_sample - -device if_bridge #Bridge interface - -# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 -# clock to actually be used. -options CLK_USE_I8254_CALIBRATION - -# CPU_ELAN enables support for AMDs ElanSC520 CPU. -options CPU_ELAN -options CPU_SOEKRIS -options CPU_ELAN_XTAL=32768000 -options CPU_ELAN_PPS - diff --git a/tools/tools/tinybsd/conf/default/etc/fstab b/tools/tools/tinybsd/conf/default/etc/fstab deleted file mode 100644 index 16ada11d7790..000000000000 --- a/tools/tools/tinybsd/conf/default/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# $FreeBSD$ -/dev/ad0a / ufs ro 1 1 diff --git a/tools/tools/tinybsd/conf/default/etc/rc.conf b/tools/tools/tinybsd/conf/default/etc/rc.conf deleted file mode 100644 index a21476241081..000000000000 --- a/tools/tools/tinybsd/conf/default/etc/rc.conf +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ -hostname="tinybsd.freebsd.org" -sendmail_enable="NONE" -sshd_enable="YES" -usbd_enable="NO" -inetd_enable="NO" -portmap_enable="NO" -update_motd="NO" -varmfs="YES" -populate_var="YES" -varsize="8192" -tmpmfs="YES" diff --git a/tools/tools/tinybsd/conf/default/tinybsd.basefiles b/tools/tools/tinybsd/conf/default/tinybsd.basefiles deleted file mode 100644 index 4db705f95557..000000000000 --- a/tools/tools/tinybsd/conf/default/tinybsd.basefiles +++ /dev/null @@ -1,247 +0,0 @@ -# $FreeBSD$ -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -boot/loader -boot/loader.4th -boot/loader.help -boot/loader.rc -boot/mbr -boot/support.4th - -# contents of ${WORKDIR}/libexec -libexec/ld-elf.so.1:usr/libexec/ld-elf.so.1 - -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -bin/cp -bin/csh:bin/tcsh -bin/date -bin/dd -bin/df -bin/domainname -bin/echo -bin/ed:bin/red -bin/expr -bin/hostname -bin/kenv -bin/kill -bin/ln:bin/link -bin/ls -bin/mkdir -bin/mv -bin/pax -bin/ps -bin/pwd -bin/realpath -bin/rm:bin/unlink -bin/rmdir -bin/sh -bin/sleep -bin/stty -bin/sync - -# contents of ${WORKDIR}/sbin -sbin/adjkerntz -sbin/comcontrol -sbin/dhclient -sbin/dhclient-script -sbin/disklabel -sbin/dmesg -sbin/fastboot:sbin/reboot -sbin/fasthalt:sbin/halt -sbin/fsck -sbin/fsck_ufs:sbin/fsck_ffs -sbin/fsck_ufs:sbin/fsck_4.2bsd -sbin/ifconfig -sbin/init -sbin/ipfw -sbin/kldconfig -sbin/kldload -sbin/kldstat -sbin/kldunload -sbin/ldconfig -sbin/md5 -sbin/mdconfig -sbin/mknod -sbin/mdmfs -sbin/mount -sbin/mount_nfs -sbin/mount_nullfs -sbin/mount_unionfs -sbin/natd -sbin/nfsiod -sbin/newfs -sbin/nextboot -sbin/nologin -sbin/nos-tun -sbin/ping -sbin/rcorder -sbin/route -sbin/shutdown -sbin/slattach -sbin/swapon -sbin/sysctl -sbin/umount - -# contents of ${WORKDIR}/usr/sbin -usr/bin/at:usr/bin/atq -usr/bin/at:usr/bin/atrm -usr/bin/at:usr/bin/batch -usr/bin/awk -usr/bin/basename -usr/bin/bunzip2:usr/bin/bzcat -usr/bin/bunzip2:usr/bin/bzip2 -usr/bin/chat -usr/bin/chfn:usr/bin/chpass -usr/bin/chfn:usr/bin/chsh -usr/bin/chgrp -usr/bin/cksum -usr/bin/clear -usr/bin/cmp -usr/bin/compress:usr/bin/uncompress -usr/bin/cpio -usr/bin/crontab -usr/bin/cu -usr/bin/dig -usr/bin/dirname -usr/bin/du -usr/bin/ee -usr/bin/egrep:usr/bin/fgrep -usr/bin/egrep:usr/bin/grep -usr/bin/env -usr/bin/false -usr/bin/fetch -usr/bin/find -usr/bin/finger -usr/bin/fstat -usr/bin/fsync -usr/bin/ftp -usr/bin/gunzip:usr/bin/gzcat -usr/bin/gunzip:usr/bin/gzip -usr/bin/gzexe -usr/bin/head -usr/bin/hexdump -usr/bin/id:usr/bin/whoami -usr/bin/ident -usr/bin/killall -usr/bin/last -usr/bin/less:usr/bin/more -usr/bin/limits -usr/bin/lock -usr/bin/lockf -usr/bin/logger -usr/bin/login -usr/bin/logname -usr/bin/mesg -usr/bin/minigzip -usr/bin/mkfifo -usr/bin/mktemp -usr/bin/msgs -usr/bin/netstat -usr/bin/nfsstat -usr/bin/nice -usr/bin/nslookup -usr/bin/nsupdate -usr/bin/nohup -usr/bin/objformat -usr/bin/openssl -usr/bin/passwd -usr/bin/printf -usr/bin/renice -usr/bin/reset:usr/sbin/tset -usr/bin/scp -usr/bin/script -usr/bin/sed -usr/bin/sftp -usr/bin/shar -usr/bin/slogin:usr/bin/ssh -usr/bin/sort -usr/bin/split -usr/bin/ssh-keygen -usr/bin/su -usr/bin/tail -usr/bin/tar -usr/bin/tee -usr/bin/telnet -usr/bin/tftp -usr/bin/time -usr/bin/top -usr/bin/touch -usr/bin/tput -usr/bin/tr -usr/bin/true -usr/bin/tty -usr/bin/uname -usr/bin/uptime:usr/bin/w -usr/bin/users -usr/bin/uudecode -usr/bin/uuencode -usr/bin/vi -usr/bin/vmstat -usr/bin/wall -usr/bin/who -usr/bin/whois -usr/bin/write -usr/bin/yes - -# contents of ${WORKDIR}/usr/sbin -usr/sbin/arp -usr/sbin/boot0cfg -usr/sbin/chown -usr/sbin/chroot -usr/sbin/cron -usr/sbin/idprio:usr/sbin/rtprio -usr/sbin/inetd -usr/sbin/iostat -usr/sbin/kbdcontrol -usr/sbin/lastlogin -usr/sbin/memcontrol -usr/sbin/mountd -usr/sbin/mtree -usr/sbin/named -usr/sbin/named.reload -usr/sbin/newsyslog -usr/sbin/nfsd -usr/sbin/ngctl -usr/sbin/nghook -usr/sbin/ntpdate -usr/sbin/pciconf -usr/sbin/ppp -usr/sbin/pppctl -usr/sbin/pppstats -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/rpcbind -usr/sbin/slstat -usr/sbin/sshd -usr/sbin/syslogd -usr/sbin/tcpdchk -usr/sbin/tcpdmatch -usr/sbin/tcpdump -usr/sbin/traceroute -usr/sbin/vidcontrol -usr/sbin/vipw -usr/sbin/vnconfig -usr/sbin/watch -usr/sbin/pccardc -usr/sbin/pccardd - -# contents of ${WORKDIR}/usr/libexec -usr/libexec/atrun -usr/libexec/ftpd -usr/libexec/getty -usr/libexec/sftp-server -usr/libexec/telnetd -usr/libexec/tftpd - -# contents of ${WORKDIR}/usr/share -usr/share/misc/termcap - diff --git a/tools/tools/tinybsd/conf/default/tinybsd.ports b/tools/tools/tinybsd/conf/default/tinybsd.ports deleted file mode 100644 index 49bb52175241..000000000000 --- a/tools/tools/tinybsd/conf/default/tinybsd.ports +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# Here you can add the applications from the FreeBSD Ports Collection which you -# want TinyBSD ports system to install in your embedded system. You whould list -# one application per line, mentioning its category and name, like the examples: -# -# www/mini_httpd -# net-mgmt/rate -# -# Make sure you have enough space to add it. diff --git a/tools/tools/tinybsd/conf/firewall/TINYBSD b/tools/tools/tinybsd/conf/firewall/TINYBSD deleted file mode 100644 index a91f1ee22085..000000000000 --- a/tools/tools/tinybsd/conf/firewall/TINYBSD +++ /dev/null @@ -1,168 +0,0 @@ -# $FreeBSD$ -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident TINYBSD - -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -options SCHED_4BSD # 4BSD scheduler -options INET # InterNETworking -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -device apic # I/O APIC - -device eisa -device pci - -# Floppy drives -#device fdc - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -options ATA_STATIC_ID # Static device numbering - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -#device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# PCCARD (PCMCIA) support -# PCMCIA and cardbus bridge support -#device cbb # cardbus (yenta) bridge -#device pccard # PC Card (16-bit) bus -#device cardbus # CardBus (32-bit) bus - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit ethernet -device nge # NatSemi DP83820 gigabit ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# ISA devices that use the old ISA shims -#device le - -# Wireless NIC cards -device wlan # 802.11 support -#device an # Aironet 4500/4800 802.11 wireless NICs. -#device awi # BayStack 660 and others -#device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. - -# Pseudo devices. -device loop # Network loopback -device ether # Ethernet support -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. -device bpf # Berkeley packet filter - -options IPFIREWALL -options IPFIREWALL_DEFAULT_TO_ACCEPT -options IPDIVERT -options DUMMYNET - -device pf #PF OpenBSD packet-filter firewall -device pflog #logging support interface for PF -device pfsync #synchronization interface for PF -device carp #Common Address Redundancy Protocol - -options ALTQ -options ALTQ_CBQ # Class Based Queueing -options ALTQ_RED # Random Early Detection -options ALTQ_RIO # RED In/Out -options ALTQ_HFSC # Hierarchical Packet Scheduler -options ALTQ_CDNR # Traffic conditioner -options ALTQ_PRIQ # Priority Queueing -options ALTQ_NOPCC # Required for SMP build - -device ath -device ath_hal -device ath_rate_sample - -# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 -# clock to actually be used. -options CLK_USE_I8254_CALIBRATION - -# CPU_ELAN enables support for AMDs ElanSC520 CPU. -options CPU_ELAN -options CPU_SOEKRIS -options CPU_ELAN_XTAL=32768000 -options CPU_ELAN_PPS - diff --git a/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules b/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules deleted file mode 100644 index e8c0da7a1d7e..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/authpf/authpf.rules +++ /dev/null @@ -1 +0,0 @@ -# $FreeBSD$ diff --git a/tools/tools/tinybsd/conf/firewall/etc/fstab b/tools/tools/tinybsd/conf/firewall/etc/fstab deleted file mode 100644 index 16ada11d7790..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# $FreeBSD$ -/dev/ad0a / ufs ro 1 1 diff --git a/tools/tools/tinybsd/conf/firewall/etc/natd.conf b/tools/tools/tinybsd/conf/firewall/etc/natd.conf deleted file mode 100644 index e8c0da7a1d7e..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/natd.conf +++ /dev/null @@ -1 +0,0 @@ -# $FreeBSD$ diff --git a/tools/tools/tinybsd/conf/firewall/etc/pf.conf b/tools/tools/tinybsd/conf/firewall/etc/pf.conf deleted file mode 100644 index 9acf363030a2..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/pf.conf +++ /dev/null @@ -1,78 +0,0 @@ -# $FreeBSD$ -# -# See pf.conf(5) and /usr/share/examples/pf for syntax and examples. -# Required order: options, normalization, queueing, translation, filtering. -# Macros and tables may be defined and used anywhere. -# Note that translation rules are first match while filter rules are last match. - -# Macros: define common values, so they can be referenced and changed easily. -#ext_if="ext0" # replace with actual external interface name i.e., dc0 -#int_if="int0" # replace with actual internal interface name i.e., dc1 -#internal_net="10.1.1.1/8" -#external_addr="192.168.1.1" - -# Tables: similar to macros, but more flexible for many addresses. -#table <foo> { 10.0.0.0/8, !10.1.0.0/16, 192.168.0.0/24, 192.168.1.18 } - -# Options: tune the behavior of pf, default values are given. -#set timeout { interval 10, frag 30 } -#set timeout { tcp.first 120, tcp.opening 30, tcp.established 86400 } -#set timeout { tcp.closing 900, tcp.finwait 45, tcp.closed 90 } -#set timeout { udp.first 60, udp.single 30, udp.multiple 60 } -#set timeout { icmp.first 20, icmp.error 10 } -#set timeout { other.first 60, other.single 30, other.multiple 60 } -#set timeout { adaptive.start 0, adaptive.end 0 } -#set limit { states 10000, frags 5000 } -#set loginterface none -#set optimization normal -#set block-policy drop -#set require-order yes -#set fingerprints "/etc/pf.os" - -# Normalization: reassemble fragments and resolve or reduce traffic ambiguities. -#scrub in all - -# Queueing: rule-based bandwidth control. -#altq on $ext_if bandwidth 2Mb cbq queue { dflt, developers, marketing } -#queue dflt bandwidth 5% cbq(default) -#queue developers bandwidth 80% -#queue marketing bandwidth 15% - -# Translation: specify how addresses are to be mapped or redirected. -# nat: packets going out through $ext_if with source address $internal_net will -# get translated as coming from the address of $ext_if, a state is created for -# such packets, and incoming packets will be redirected to the internal address. -#nat on $ext_if from $internal_net to any -> ($ext_if) - -# rdr: packets coming in on $ext_if with destination $external_addr:1234 will -# be redirected to 10.1.1.1:5678. A state is created for such packets, and -# outgoing packets will be translated as coming from the external address. -#rdr on $ext_if proto tcp from any to $external_addr/32 port 1234 -> 10.1.1.1 port 5678 - -# rdr outgoing FTP requests to the ftp-proxy -#rdr on $int_if proto tcp from any to any port ftp -> 127.0.0.1 port 8021 - -# spamd-setup puts addresses to be redirected into table <spamd>. -#table <spamd> persist -#no rdr on { lo0, lo1 } from any to any -#rdr inet proto tcp from <spamd> to any port smtp -> 127.0.0.1 port 8025 - -# Filtering: the implicit first two rules are -#pass in all -#pass out all - -# block all incoming packets but allow ssh, pass all outgoing tcp and udp -# connections and keep state, logging blocked packets. -#block in log all -#pass in on $ext_if proto tcp from any to $ext_if port 22 keep state -#pass out on $ext_if proto { tcp, udp } all keep state - -# pass incoming packets destined to the addresses given in table <foo>. -#pass in on $ext_if proto { tcp, udp } from any to <foo> port 80 keep state - -# pass incoming ports for ftp-proxy -#pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state - -# assign packets to a queue. -#pass out on $ext_if from 192.168.0.0/24 to any keep state queue developers -#pass out on $ext_if from 192.168.1.0/24 to any keep state queue marketing diff --git a/tools/tools/tinybsd/conf/firewall/etc/pf.os b/tools/tools/tinybsd/conf/firewall/etc/pf.os deleted file mode 100644 index 2a64809bcfa9..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/pf.os +++ /dev/null @@ -1,549 +0,0 @@ -# $FreeBSD$ -# passive OS fingerprinting -# ------------------------- -# -# SYN signatures. Those signatures work for SYN packets only (duh!). -# -# (C) Copyright 2000-2003 by Michal Zalewski <lcamtuf@coredump.cx> -# (C) Copyright 2003 by Mike Frantzen <frantzen@w4g.org> -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# -# -# This fingerprint database is adapted from Michal Zalewski's p0f passive -# operating system package. -# -# -# Each line in this file specifies a single fingerprint. Please read the -# information below carefully before attempting to append any signatures -# reported as UNKNOWN to this file to avoid mistakes. -# -# We use the following set metrics for fingerprinting: -# -# - Window size (WSS) - a highly OS dependent setting used for TCP/IP -# performance control (max. amount of data to be sent without ACK). -# Some systems use a fixed value for initial packets. On other -# systems, it is a multiple of MSS or MTU (MSS+40). In some rare -# cases, the value is just arbitrary. -# -# NEW SIGNATURE: if p0f reported a special value of 'Snn', the number -# appears to be a multiple of MSS (MSS*nn); a special value of 'Tnn' -# means it is a multiple of MTU ((MSS+40)*nn). Unless you notice the -# value of nn is not fixed (unlikely), just copy the Snn or Tnn token -# literally. If you know this device has a simple stack and a fixed -# MTU, you can however multiply S value by MSS, or T value by MSS+40, -# and put it instead of Snn or Tnn. -# -# If WSS otherwise looks like a fixed value (for example a multiple -# of two), or if you can confirm the value is fixed, please quote -# it literally. If there's no apparent pattern in WSS chosen, you -# should consider wildcarding this value. -# -# - Overall packet size - a function of all IP and TCP options and bugs. -# -# NEW SIGNATURE: Copy this value literally. -# -# - Initial TTL - We check the actual TTL of a received packet. It can't -# be higher than the initial TTL, and also shouldn't be dramatically -# lower (maximum distance is defined as 40 hops). -# -# NEW SIGNATURE: *Never* copy TTL from a p0f-reported signature literally. -# You need to determine the initial TTL. The best way to do it is to -# check the documentation for a remote system, or check its settings. -# A fairly good method is to simply round the observed TTL up to -# 32, 64, 128, or 255, but it should be noted that some obscure devices -# might not use round TTLs (in particular, some shoddy appliances use -# "original" initial TTL settings). If not sure, you can see how many -# hops you're away from the remote party with traceroute or mtr. -# -# - Don't fragment flag (DF) - some modern OSes set this to implement PMTU -# discovery. Others do not bother. -# -# NEW SIGNATURE: Copy this value literally. -# -# - Maximum segment size (MSS) - this setting is usually link-dependent. P0f -# uses it to determine link type of the remote host. -# -# NEW SIGNATURE: Always wildcard this value, except for rare cases when -# you have an appliance with a fixed value, know the system supports only -# a very limited number of network interface types, or know the system -# is using a value it pulled out of nowhere. Specific unique MSS -# can be used to tell Google crawlbots from the rest of the population. -# -# - Window scaling (WSCALE) - this feature is used to scale WSS. -# It extends the size of a TCP/IP window to 32 bits. Some modern -# systems implement this feature. -# -# NEW SIGNATURE: Observe several signatures. Initial WSCALE is often set -# to zero or other low value. There's usually no need to wildcard this -# parameter. -# -# - Timestamp - some systems that implement timestamps set them to -# zero in the initial SYN. This case is detected and handled appropriately. -# -# - Selective ACK permitted - a flag set by systems that implement -# selective ACK functionality. -# -# - The sequence of TCP all options (MSS, window scaling, selective ACK -# permitted, timestamp, NOP). Other than the options previously -# discussed, p0f also checks for timestamp option (a silly -# extension to broadcast your uptime ;-), NOP options (used for -# header padding) and sackOK option (selective ACK feature). -# -# NEW SIGNATURE: Copy the sequence literally. -# -# To wildcard any value (except for initial TTL or TCP options), replace -# it with '*'. You can also use a modulo operator to match any values -# that divide by nnn - '%nnn'. -# -# Fingerprint entry format: -# -# wwww:ttt:D:ss:OOO...:OS:Version:Subtype:Details -# -# wwww - window size (can be *, %nnn, Snn or Tnn). The special values -# "S" and "T" which are a multiple of MSS or a multiple of MTU -# respectively. -# ttt - initial TTL -# D - don't fragment bit (0 - not set, 1 - set) -# ss - overall SYN packet size -# OOO - option value and order specification (see below) -# OS - OS genre (Linux, Solaris, Windows) -# Version - OS Version (2.0.27 on x86, etc) -# Subtype - OS subtype or patchlevel (SP3, lo0) -# details - Generic OS details -# -# If OS genre starts with '*', p0f will not show distance, link type -# and timestamp data. It is useful for userland TCP/IP stacks of -# network scanners and so on, where many settings are randomized or -# bogus. -# -# If OS genre starts with @, it denotes an approximate hit for a group -# of operating systems (signature reporting still enabled in this case). -# Use this feature at the end of this file to catch cases for which -# you don't have a precise match, but can tell it's Windows or FreeBSD -# or whatnot by looking at, say, flag layout alone. -# -# Option block description is a list of comma or space separated -# options in the order they appear in the packet: -# -# N - NOP option -# Wnnn - window scaling option, value nnn (or * or %nnn) -# Mnnn - maximum segment size option, value nnn (or * or %nnn) -# S - selective ACK OK -# T - timestamp -# T0 - timestamp with a zero value -# -# To denote no TCP options, use a single '.'. -# -# Please report any additions to this file, or any inaccuracies or -# problems spotted, to the maintainers: lcamtuf@coredump.cx, -# frantzen@openbsd.org and bugs@openbsd.org with a tcpdump packet -# capture of the relevant SYN packet(s) -# -# WARNING WARNING WARNING -# ----------------------- -# -# Do not add a system X as OS Y just because NMAP says so. It is often -# the case that X is a NAT firewall. While nmap is talking to the -# device itself, p0f is fingerprinting the guy behind the firewall -# instead. -# -# When in doubt, use common sense, don't add something that looks like -# a completely different system as Linux or FreeBSD or LinkSys router. -# Check DNS name, establish a connection to the remote host and look -# at SYN+ACK - does it look similar? -# -# Some users tweak their TCP/IP settings - enable or disable RFC1323 -# functionality, enable or disable timestamps or selective ACK, -# disable PMTU discovery, change MTU and so on. Always compare a new rule -# to other fingerprints for this system, and verify the system isn't -# "customized" before adding it. It is OK to add signature variants -# caused by a commonly used software (personal firewalls, security -# packages, etc), but it makes no sense to try to add every single -# possible /proc/sys/net/ipv4 tweak on Linux or so. -# -# KEEP IN MIND: Some packet firewalls configured to normalize outgoing -# traffic (OpenBSD pf with "scrub" enabled, for example) will, well, -# normalize packets. Signatures will not correspond to the originating -# system (and probably not quite to the firewall either). -# -# NOTE: Try to keep this file in some reasonable order, from most to -# least likely systems. This will speed up operation. Also keep most -# generic and broad rules near the end. -# - -########################## -# Standard OS signatures # -########################## - -# ----------------- AIX --------------------- - -# AIX is first because its signatures are close to NetBSD, MacOS X and -# Linux 2.0, but it uses a fairly rare MSSes, at least sometimes... -# This is a shoddy hack, though. - -16384:64:0:44:M512: AIX:4.3:2-3:AIX 4.3.2 and earlier - -16384:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2 -16384:64:0:60:M512,N,W%2,N,N,T: AIX:5.1-5.2::AIX 4.3.3-5.2 -32768:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2 -32768:64:0:60:M512,N,W%2,N,N,T: AIX:5.1-5.2::AIX 4.3.3-5.2 -65535:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2 -65535:64:0:60:M512,N,W%2,N,N,T: AIX:5.1-5.2::AIX 4.3.3-5.2 -65535:64:0:64:M*,N,W1,N,N,T,N,N,S: AIX:5.3:ML1:AIX 5.3 ML1 - -# ----------------- Linux ------------------- - -512:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x -16384:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x - -# Endian snafu! Nelson says "ha-ha": -2:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x (MkLinux) on Mac -64:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x (MkLinux) on Mac - - -S4:64:1:60:M1360,S,T,N,W0: Linux:google::Linux (Google crawlbot) - -S2:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4 (big boy) -S3:64:1:60:M*,S,T,N,W0: Linux:2.4:18-21:Linux 2.4.18 and newer -S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6 -S4:64:1:60:M*,S,T,N,W0: Linux:2.6::Linux 2.4/2.6 - -S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 -S4:64:1:60:M*,S,T,N,W1: Linux:2.5-2.6::Linux 2.5/2.6 - -S20:64:1:60:M*,S,T,N,W0: Linux:2.2:20-25:Linux 2.2.20 and newer -S22:64:1:60:M*,S,T,N,W0: Linux:2.2::Linux 2.2 -S11:64:1:60:M*,S,T,N,W0: Linux:2.2::Linux 2.2 - -# Popular cluster config scripts disable timestamps and -# selective ACK: -S4:64:1:48:M1460,N,W0: Linux:2.4:cluster:Linux 2.4 in cluster - -# This needs to be investigated. On some systems, WSS -# is selected as a multiple of MTU instead of MSS. I got -# many submissions for this for many late versions of 2.4: -T4:64:1:60:M1412,S,T,N,W0: Linux:2.4::Linux 2.4 (late, uncommon) - -# This happens only over loopback, but let's make folks happy: -32767:64:1:60:M16396,S,T,N,W0: Linux:2.4:lo0:Linux 2.4 (local) -S8:64:1:60:M3884,S,T,N,W0: Linux:2.2:lo0:Linux 2.2 (local) - -# Opera visitors: -16384:64:1:60:M*,S,T,N,W0: Linux:2.2:Opera:Linux 2.2 (Opera?) -32767:64:1:60:M*,S,T,N,W0: Linux:2.4:Opera:Linux 2.4 (Opera?) - -# Some fairly common mods: -S4:64:1:52:M*,N,N,S,N,W0: Linux:2.4:ts:Linux 2.4 w/o timestamps -S22:64:1:52:M*,N,N,S,N,W0: Linux:2.2:ts:Linux 2.2 w/o timestamps - - -# ----------------- FreeBSD ----------------- - -16384:64:1:44:M*: FreeBSD:2.0-2.2::FreeBSD 2.0-4.1 -16384:64:1:44:M*: FreeBSD:3.0-3.5::FreeBSD 2.0-4.1 -16384:64:1:44:M*: FreeBSD:4.0-4.1::FreeBSD 2.0-4.1 -16384:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4 - -1024:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4 - -57344:64:1:44:M*: FreeBSD:4.6-4.8:noRFC1323:FreeBSD 4.6-4.8 (no RFC1323) -57344:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.6-4.8::FreeBSD 4.6-4.8 - -32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X) -32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.9::FreeBSD 4.7-5.1 -65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.7-5.1 - -# 16384:64:1:60:M*,N,N,N,N,N,N,T:FreeBSD:4.4:noTS:FreeBSD 4.4 (w/o timestamps) - -# ----------------- NetBSD ------------------ - -65535:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6:opera:NetBSD 1.6 (Opera) -16384:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6::NetBSD 1.6 -16384:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6:df:NetBSD 1.6 (DF) -16384:64:0:60:M*,N,W0,N,N,T: NetBSD:1.3::NetBSD 1.3 -65535:64:1:60:M*,N,W1,N,N,T0: NetBSD:1.6::NetBSD 1.6W-current (DF) - -# ----------------- OpenBSD ----------------- - -16384:64:0:60:M*,N,W0,N,N,T: OpenBSD:2.6::NetBSD 1.3 (or OpenBSD 2.6) -16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4::OpenBSD 3.0-3.4 -16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:no-df:OpenBSD 3.0-3.4 (scrub no-df) -57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4::OpenBSD 3.3-3.4 -57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4:no-df:OpenBSD 3.3-3.4 (scrub no-df) - -65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:opera:OpenBSD 3.0-3.4 (Opera) - -# ----------------- Solaris ----------------- - -S17:64:1:64:N,W3,N,N,T0,N,N,S,M*: Solaris:8:RFC1323:Solaris 8 RFC1323 -S17:64:1:48:N,N,S,M*: Solaris:8::Solaris 8 -S17:255:1:44:M*: Solaris:2.5-2.7::Solaris 2.5 to 7 - -S6:255:1:44:M*: Solaris:2.6-2.7::Solaris 2.6 to 7 -S23:255:1:44:M*: Solaris:2.5:1:Solaris 2.5.1 -S34:64:1:48:M*,N,N,S: Solaris:2.9::Solaris 9 -S44:255:1:44:M*: Solaris:2.7::Solaris 7 - -# ----------------- IRIX -------------------- - -49152:64:0:44:M*: IRIX:6.4::IRIX 6.4 -61440:64:0:44:M*: IRIX:6.2-6.5::IRIX 6.2-6.5 -49152:64:0:52:M*,N,W2,N,N,S: IRIX:6.5:RFC1323:IRIX 6.5 (RFC1323) -49152:64:0:52:M*,N,W3,N,N,S: IRIX:6.5:RFC1323:IRIX 6.5 (RFC1323) - -61440:64:0:48:M*,N,N,S: IRIX:6.5:12-21:IRIX 6.5.12 - 6.5.21 -49152:64:0:48:M*,N,N,S: IRIX:6.5:15-21:IRIX 6.5.15 - 6.5.21 - -# ----------------- Tru64 ------------------- - -32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0 -32768:64:0:48:M*,N,W0: Tru64:5.0::Tru64 5.0 -8192:64:0:44:M1460: Tru64:5.1:noRFC1323:Tru64 6.1 (no RFC1323) (or QNX 6) - -# This looks awfully Linuxish :/ -# S22:64:0:60:M*,S,T,N,W0: Tru64:5.0:a:Tru64 5.0a - -61440:64:0:48:M*,N,W0: Tru64:5.1a:JP4:Tru64 v5.1a JP4 (or OpenVMS 7.x on Compaq 5.x stack) - - -# ----------------- OpenVMS ----------------- - -6144:64:1:60:M*,N,W0,N,N,T: OpenVMS:7.2::OpenVMS 7.2 (Multinet 4.4 stack) - -# ----------------- MacOS ------------------- - -16616:255:1:48:M*,W0: MacOS:7.3-7.6:OTTCP:MacOS 7.3-8.6 (OTTCP) -16616:255:1:48:M*,W0: MacOS:8.0-8.6:OTTCP:MacOS 7.3-8.6 (OTTCP) -32768:255:1:48:M*,W0,N: MacOS:9.1-9.2::MacOS 9.1/9.2 -32768:64:0:60:M*,N,W0,N,N,T: MacOS:X:10.2:MacOS X 10.2 - -# ----------------- Windows ----------------- - -# Windows 95 - need more: - -8192:32:1:44:M*: Windows:95::Windows 95 (low TTL) - -# Windows 98 - plenty of silly signatures: -S44:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL) -8192:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL) - -%8192:64:1:48:M*,N,N,S: Windows:98::Windows 98 (or newer XP/2000 with tweaked TTL) -S4:64:1:48:M*,N,N,S: Windows:98::Windows 98 -S6:64:1:48:M*,N,N,S: Windows:98::Windows 98 -S12:64:1:48:M*,N,N,S: Windows:98::Windows 98 -32767:64:1:48:M*,N,N,S: Windows:98::Windows 98 -37300:64:1:48:M*,N,N,S: Windows:98::Windows 98 -46080:64:1:52:M*,N,W3,N,N,S: Windows:98:RFC1323:Windows 98 (RFC1323) -65535:64:1:44:M*: Windows:98:noSACK:Windows 98 (no sack) - -S16:128:1:48:M*,N,N,S: Windows:98::Windows 98 -S16:128:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:98::Windows 98 -S26:128:1:48:M*,N,N,S: Windows:98::Windows 98 -T30:128:1:48:M*,N,N,S: Windows:98::Windows 98 -32767:128:1:52:M*,N,W0,N,N,S: Windows:98::Windows 98 -60352:128:1:48:M*,N,N,S: Windows:98::Windows 98 -60352:128:1:64:M*,N,W2,N,N,T0,N,N,S: Windows:98::Windows 98 - -# Windows NT 4.0 - need more: - -64512:128:1:44:M1414: Windows:NT:4.0:Windows NT 4.0 SP6a -8192:128:1:44:M*: Windows:NT:4.0:Windows NT 4.0 (older) -6144:128:1:52:M*,W0,N,S,N,N: Windows:NT:4.0:Windows NT 4.0 (RFC1323) - -# Windows XP and 2000. Most of the signatures that were -# either dubious or non-specific (no service pack data) -# were deleted and replaced with generics at the end. - -65535:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1 -%8192:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1 -S45:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4 -S6:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows XP SP1, 2000 SP4 -S44:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows XP Pro SP1, 2000 SP3 - -S6:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1, 2000 SP4 -S44:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP Pro SP1, 2000 SP3 -64512:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1 -32767:128:1:48:M1452,N,N,S: Windows:XP:SP1:Windows XP SP1 -65535:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1 -%8192:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1 - -# Odds, ends, mods: - -S52:128:1:48:M1260,N,N,S: Windows:XP:Cisco:Windows XP/2000 via Cisco -S52:128:1:48:M1260,N,N,S: Windows:2000:Cisco:Windows XP/2000 via Cisco - -# HUNT DOWN: -# *:128:1:48:M*,N,N,S:U:@Windows:XP (leak) (PLEASE REPORT) - -# ----------------- HP/UX ------------------- - -32768:64:1:44:M*: HP-UX:B.10.20::HP-UX B.10.20 -32768:64:0:48:M*,W0,N: HP-UX:11.0::HP-UX 11.0 -32768:64:1:48:M*,W0,N: HP-UX:11.10::HP-UX 11.0 or 11.11 -32768:64:1:48:M*,W0,N: HP-UX:11.11::HP-UX 11.0 or 11.11 - -# Whoa. Hardcore WSS. -0:64:0:48:M*,W0,N: HP-UX:B.11.00:A:HP-UX B.11.00 A (RFC1323) - - -# ----------------- RiscOS ------------------ - -# We don't yet support the ?12 TCP option -#16384:64:1:68:M1460,N,W0,N,N,T,N,N,?12: RISCOS:3.70-4.36::RISC OS 3.70-4.36 - -# ----------------- BSD/OS ------------------ - -# Once again, power of two WSS is also shared by MacOS X with DF set -8192:64:1:60:M1460,N,W0,N,N,T: BSD/OS:3.1::BSD/OS 3.1-4.3 (or MacOS X 10.2 w/DF) -8192:64:1:60:M1460,N,W0,N,N,T: BSD/OS:4.0-4.3::BSD/OS 3.1-4.3 (or MacOS X 10.2) - - -# ---------------- NewtonOS ----------------- - -4096:64:0:44:M1420: NewtonOS:2.1::NewtonOS 2.1 - -# ---------------- NeXTSTEP ----------------- - -S8:64:0:44:M512: NeXTSTEP:3.3::NeXTSTEP 3.3 - -# ------------------ BeOS ------------------- - -1024:255:0:48:M*,N,W0: BeOS:5.0-5.1::BeOS 5.0-5.1 -12288:255:0:44:M1402: BeOS:5.0::BeOS 5.0.x - -# ------------------ OS/400 ----------------- - -8192:64:1:60:M1440,N,W0,N,N,T: OS/400:VR4::OS/400 VR4/R5 -8192:64:1:60:M1440,N,W0,N,N,T: OS/400:VR5::OS/400 VR4/R5 -4096:64:1:60:M1440,N,W0,N,N,T: OS/400:V4R5:CF67032:OS/400 V4R5 + CF67032 - - -# ------------------ ULTRIX ----------------- - -16384:64:0:40:.: ULTRIX:4.5::ULTRIX 4.5 - -# ------------------- QNX ------------------- - -S16:64:0:44:M512: QNX:::QNX demodisk - -# ------------------ Novell ----------------- - -16384:128:1:44:M1460: Novell:NetWare:5.0:Novel Netware 5.0 -6144:128:1:44:M1460: Novell:IntranetWare:4.11:Novell IntranetWare 4.11 - -# ----------------- SCO ------------------ -S17:64:1:44:M1460: SCO:Unixware:7.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06 -S17:64:1:44:M1460: SCO:OpenServer:5.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06 -S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1 - -# ------------------- DOS ------------------- - -2048:255:0:44:M536: DOS:WATTCP:1.05:DOS Arachne via WATTCP/1.05 - -########################################### -# Appliance / embedded / other signatures # -########################################### - -# ---------- Firewalls / routers ------------ - -S12:64:1:44:M1460: @Checkpoint:::Checkpoint (unknown 1) -S12:64:1:48:N,N,S,M1460: @Checkpoint:::Checkpoint (unknown 2) -4096:32:0:44:M1460: ExtremeWare:4.x::ExtremeWare 4.x -60352:64:0:52:M1460,N,W2,N,N,S: Clavister:7::Clavister firewall 7.x - -# ------- Switches and other stuff ---------- - -4128:255:0:44:M*: Cisco:::Cisco Catalyst 3500, 7500 etc -S8:255:0:44:M*: Cisco:12008::Cisco 12008 -60352:128:1:64:M1460,N,W2,N,N,T,N,N,S: Alteon:ACEswitch::Alteon ACEswitch -64512:128:1:44:M1370: Nortel:Contivity Client::Nortel Conectivity Client - - -# ---------- Caches and whatnots ------------ - -S4:64:1:52:M1460,N,N,S,N,W0: AOL:web cache::AOL web cache - -32850:64:1:64:N,W1,N,N,T,N,N,S,M*: NetApp:5.x::NetApp Data OnTap 5.x -16384:64:1:64:M1460,N,N,S,N,W0,N: NetApp:5.3:1:NetApp 5.3.1 -65535:64:0:64:M1460,N,N,S,N,W3,N,N,T: NetApp:5.3:1:NetApp 5.3.1 -65535:64:0:60:M1460,N,W0,N,N,T: NetApp:CacheFlow::NetApp CacheFlow -8192:64:1:64:M1460,N,N,S,N,W0,N,N,T: NetApp:5.2:1:NetApp NetCache 5.2.1 - -S4:64:0:48:M1460,N,N,S: Cisco:Content Engine::Cisco Content Engine - -27085:128:0:40:.: Dell:PowerApp cache::Dell PowerApp (Linux-based) - -65535:255:1:48:N,W1,M1460: Inktomi:crawler::Inktomi crawler -S1:255:1:60:M1460,S,T,N,W0: LookSmart:ZyBorg::LookSmart ZyBorg - - -16384:255:0:40:.: Proxyblocker:::Proxyblocker (what's this?) - -# ----------- Embedded systems -------------- - -S9:255:0:44:M536: PalmOS:Tungsten:C:PalmOS Tungsten C -S5:255:0:44:M536: PalmOS:3::PalmOS 3/4 -S5:255:0:44:M536: PalmOS:4::PalmOS 3/4 -S4:255:0:44:M536: PalmOS:3:5:PalmOS 3.5 -2948:255:0:44:M536: PalmOS:3:5:PalmOS 3.5.3 (Handera) - -S23:64:1:64:N,W1,N,N,T,N,N,S,M1460: SymbianOS:7::SymbianOS 7 -8192:255:0:44:M1460: SymbianOS:6048::SymbianOS 6048 (on Nokia 7650?) -8192:255:0:44:M536: SymbianOS:::SymbianOS (on Nokia 9210?) - - -# Perhaps S4? -5840:64:1:60:M1452,S,T,N,W1: Zaurus:3.10::Zaurus 3.10 - -32768:128:1:64:M1460,N,W0,N,N,T0,N,N,S: PocketPC:2002::PocketPC 2002 - -S1:255:0:44:M346: Contiki:1.1:rc0:Contiki 1.1-rc0 - -4096:128:0:44:M1460: Sega:Dreamcast:3.0:Sega Dreamcast Dreamkey 3.0 - -S12:64:0:44:M1452: AXIS:5600:v5.64:AXIS Printer Server 5600 v5.64 - - - -#################### -# Fancy signatures # -#################### - -1024:64:0:40:.: *NMAP:syn scan:1:NMAP syn scan (1) -2048:64:0:40:.: *NMAP:syn scan:2:NMAP syn scan (2) -3072:64:0:40:.: *NMAP:syn scan:3:NMAP syn scan (3) -4096:64:0:40:.: *NMAP:syn scan:4:NMAP syn scan (4) - -1024:64:0:60:W10,N,M265,T: *NMAP:OS:1:NMAP OS detection probe (1) -2048:64:0:60:W10,N,M265,T: *NMAP:OS:2:NMAP OS detection probe (2) -3072:64:0:60:W10,N,M265,T: *NMAP:OS:3:NMAP OS detection probe (3) -4096:64:0:60:W10,N,M265,T: *NMAP:OS:4:NMAP OS detection probe (4) - -##################################### -# Generic signatures - just in case # -##################################### - -#*:64:1:60:M*,N,W*,N,N,T: @FreeBSD:4.0-4.9::FreeBSD 4.x/5.x -#*:64:1:60:M*,N,W*,N,N,T: @FreeBSD:5.0-5.1::FreeBSD 4.x/5.x - -*:128:1:52:M*,N,W0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323 no tstamp) -*:128:1:52:M*,N,W0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323 no tstamp) -*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323) -*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323) -*:128:1:64:M*,N,W*,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP (RFC1323, w+) -*:128:1:48:M*,N,N,S: @Windows:XP::Windows XP/2000 -*:128:1:48:M*,N,N,S: @Windows:2000::Windows XP/2000 diff --git a/tools/tools/tinybsd/conf/firewall/etc/rc.conf b/tools/tools/tinybsd/conf/firewall/etc/rc.conf deleted file mode 100644 index d00fe837797f..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/rc.conf +++ /dev/null @@ -1,41 +0,0 @@ -# $FreeBSD$ -hostname="tinybsd.freebsd.org" -sendmail_enable="NONE" -sshd_enable="YES" -usbd_enable="NO" -inetd_enable="NO" -portmap_enable="NO" -update_motd="NO" -varmfs="YES" -populate_var="YES" -varsize="8192" -tmpmfs="YES" - -# IPFW -firewall_enable="YES" -firewall_script="/etc/rc.firewall" -firewall_type="closed" - -# NAT -natd_enable="NO" -natd_interface="" -natd_flags="" - -# PF -pf_enable="NO" -pf_rules="/etc/pf.conf" -pf_program="/sbin/pfctl" -pf_flags="" -pflog_enable="NO" -pflog_logfile="/var/log/pflog" -pflog_program="/sbin/pflogd" -pflog_flags="" - -# CARP Example -#cloned_interfaces="carp0" -#ifconfig_carp0="vhid 1 pass xalala 192.168.1.1/24" - - - - - diff --git a/tools/tools/tinybsd/conf/firewall/etc/rc.firewall b/tools/tools/tinybsd/conf/firewall/etc/rc.firewall deleted file mode 100644 index bda2ff62a155..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/rc.firewall +++ /dev/null @@ -1,302 +0,0 @@ -#!/bin/sh - -# Copyright (c) 1996 Poul-Henning Kamp -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD$ -# - -# -# Setup system for firewall service. -# - -# Suck in the configuration variables. -if [ -z "${source_rc_confs_defined}" ]; then - if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs - elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf - fi -fi - -############ -# Define the firewall type in /etc/rc.conf. Valid values are: -# open - will allow anyone in -# client - will try to protect just this machine -# simple - will try to protect a whole network -# closed - totally disables IP services except via lo0 interface -# UNKNOWN - disables the loading of firewall rules. -# filename - will load the rules in the given filename (full path required) -# -# For ``client'' and ``simple'' the entries below should be customized -# appropriately. - -############ -# -# If you don't know enough about packet filtering, we suggest that you -# take time to read this book: -# -# Building Internet Firewalls, 2nd Edition -# Brent Chapman and Elizabeth Zwicky -# -# O'Reilly & Associates, Inc -# ISBN 1-56592-871-7 -# http://www.ora.com/ -# http://www.oreilly.com/catalog/fire2/ -# -# For a more advanced treatment of Internet Security read: -# -# Firewalls & Internet Security -# Repelling the wily hacker -# William R. Cheswick, Steven M. Bellowin -# -# Addison-Wesley -# ISBN 0-201-63357-4 -# http://www.awl.com/ -# http://www.awlonline.com/product/0%2C2627%2C0201633574%2C00.html -# - -setup_loopback () { - ############ - # Only in rare cases do you want to change these rules - # - ${fwcmd} add 100 pass all from any to any via lo0 - ${fwcmd} add 200 deny all from any to 127.0.0.0/8 - ${fwcmd} add 300 deny ip from 127.0.0.0/8 to any -} - -if [ -n "${1}" ]; then - firewall_type="${1}" -fi - -############ -# Set quiet mode if requested -# -case ${firewall_quiet} in -[Yy][Ee][Ss]) - fwcmd="/sbin/ipfw -q" - ;; -*) - fwcmd="/sbin/ipfw" - ;; -esac - -############ -# Flush out the list before we begin. -# -${fwcmd} -f flush - -############ -# Network Address Translation. All packets are passed to natd(8) -# before they encounter your remaining rules. The firewall rules -# will then be run again on each packet after translation by natd -# starting at the rule number following the divert rule. -# -# For ``simple'' firewall type the divert rule should be put to a -# different place to not interfere with address-checking rules. -# -case ${firewall_type} in -[Oo][Pp][Ee][Nn]|[Cc][Ll][Ii][Ee][Nn][Tt]) - case ${natd_enable} in - [Yy][Ee][Ss]) - if [ -n "${natd_interface}" ]; then - ${fwcmd} add 50 divert natd all from any to any via ${natd_interface} - fi - ;; - esac -esac - -############ -# If you just configured ipfw in the kernel as a tool to solve network -# problems or you just want to disallow some particular kinds of traffic -# then you will want to change the default policy to open. You can also -# do this as your only action by setting the firewall_type to ``open''. -# -# ${fwcmd} add 65000 pass all from any to any - - -# Prototype setups. -# -case ${firewall_type} in -[Oo][Pp][Ee][Nn]) - setup_loopback - ${fwcmd} add 65000 pass all from any to any - ;; - -[Cc][Ll][Ii][Ee][Nn][Tt]) - ############ - # This is a prototype setup that will protect your system somewhat - # against people from outside your own network. - ############ - - # set these to your network and netmask and ip - net="192.0.2.0" - mask="255.255.255.0" - ip="192.0.2.1" - - setup_loopback - - # Allow any traffic to or from my own net. - ${fwcmd} add pass all from ${ip} to ${net}:${mask} - ${fwcmd} add pass all from ${net}:${mask} to ${ip} - - # Allow TCP through if setup succeeded - ${fwcmd} add pass tcp from any to any established - - # Allow IP fragments to pass through - ${fwcmd} add pass all from any to any frag - - # Allow setup of incoming email - ${fwcmd} add pass tcp from any to ${ip} 25 setup - - # Allow setup of outgoing TCP connections only - ${fwcmd} add pass tcp from ${ip} to any setup - - # Disallow setup of all other TCP connections - ${fwcmd} add deny tcp from any to any setup - - # Allow DNS queries out in the world - ${fwcmd} add pass udp from ${ip} to any 53 keep-state - - # Allow NTP queries out in the world - ${fwcmd} add pass udp from ${ip} to any 123 keep-state - - # Everything else is denied by default, unless the - # IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel - # config file. - ;; - -[Ss][Ii][Mm][Pp][Ll][Ee]) - ############ - # This is a prototype setup for a simple firewall. Configure this - # machine as a DNS and NTP server, and point all the machines - # on the inside at this machine for those services. - ############ - - # set these to your outside interface network and netmask and ip - oif="em0" - onet="192.0.2.0" - omask="255.255.255.240" - oip="192.0.2.1" - - # set these to your inside interface network and netmask and ip - iif="em1" - inet="192.0.2.16" - imask="255.255.255.240" - iip="192.0.2.17" - - setup_loopback - - # Stop spoofing - ${fwcmd} add deny all from ${inet}:${imask} to any in via ${oif} - ${fwcmd} add deny all from ${onet}:${omask} to any in via ${iif} - - # Stop RFC1918 nets on the outside interface - ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} - ${fwcmd} add deny all from any to 172.16.0.0/12 via ${oif} - ${fwcmd} add deny all from any to 192.168.0.0/16 via ${oif} - - # Stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, - # DHCP auto-configuration, NET-TEST, MULTICAST (class D), and class E) - # on the outside interface - ${fwcmd} add deny all from any to 0.0.0.0/8 via ${oif} - ${fwcmd} add deny all from any to 169.254.0.0/16 via ${oif} - ${fwcmd} add deny all from any to 192.0.2.0/24 via ${oif} - ${fwcmd} add deny all from any to 224.0.0.0/4 via ${oif} - ${fwcmd} add deny all from any to 240.0.0.0/4 via ${oif} - - # Network Address Translation. This rule is placed here deliberately - # so that it does not interfere with the surrounding address-checking - # rules. If for example one of your internal LAN machines had its IP - # address set to 192.0.2.1 then an incoming packet for it after being - # translated by natd(8) would match the `deny' rule above. Similarly - # an outgoing packet originated from it before being translated would - # match the `deny' rule below. - case ${natd_enable} in - [Yy][Ee][Ss]) - if [ -n "${natd_interface}" ]; then - ${fwcmd} add divert natd all from any to any via ${natd_interface} - fi - ;; - esac - - # Stop RFC1918 nets on the outside interface - ${fwcmd} add deny all from 10.0.0.0/8 to any via ${oif} - ${fwcmd} add deny all from 172.16.0.0/12 to any via ${oif} - ${fwcmd} add deny all from 192.168.0.0/16 to any via ${oif} - - # Stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, - # DHCP auto-configuration, NET-TEST, MULTICAST (class D), and class E) - # on the outside interface - ${fwcmd} add deny all from 0.0.0.0/8 to any via ${oif} - ${fwcmd} add deny all from 169.254.0.0/16 to any via ${oif} - ${fwcmd} add deny all from 192.0.2.0/24 to any via ${oif} - ${fwcmd} add deny all from 224.0.0.0/4 to any via ${oif} - ${fwcmd} add deny all from 240.0.0.0/4 to any via ${oif} - - # Allow TCP through if setup succeeded - ${fwcmd} add pass tcp from any to any established - - # Allow IP fragments to pass through - ${fwcmd} add pass all from any to any frag - - # Allow setup of incoming email - ${fwcmd} add pass tcp from any to ${oip} 25 setup - - # Allow access to our DNS - ${fwcmd} add pass tcp from any to ${oip} 53 setup - ${fwcmd} add pass udp from any to ${oip} 53 - ${fwcmd} add pass udp from ${oip} 53 to any - - # Allow access to our WWW - ${fwcmd} add pass tcp from any to ${oip} 80 setup - - # Reject&Log all setup of incoming connections from the outside - ${fwcmd} add deny log tcp from any to any in via ${oif} setup - - # Allow setup of any other TCP connection - ${fwcmd} add pass tcp from any to any setup - - # Allow DNS queries out in the world - ${fwcmd} add pass udp from ${oip} to any 53 keep-state - - # Allow NTP queries out in the world - ${fwcmd} add pass udp from ${oip} to any 123 keep-state - - # Everything else is denied by default, unless the - # IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel - # config file. - ;; - -[Cc][Ll][Oo][Ss][Ee][Dd]) - setup_loopback - ;; -[Uu][Nn][Kk][Nn][Oo][Ww][Nn]) - ;; -*) - if [ -r "${firewall_type}" ]; then - ${fwcmd} ${firewall_flags} ${firewall_type} - fi - ;; -esac diff --git a/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf b/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf deleted file mode 100644 index f9e09ff620d0..000000000000 --- a/tools/tools/tinybsd/conf/firewall/etc/sysctl.conf +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ -# CARP Options -#net.inet.carp.preempt=1 -#net.inet.carp.arpbalance=1 - diff --git a/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles b/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles deleted file mode 100644 index ad76d0b758a3..000000000000 --- a/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles +++ /dev/null @@ -1,240 +0,0 @@ -# $FreeBSD$ -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -boot/loader -boot/loader.4th -boot/loader.help -boot/loader.rc -boot/mbr -boot/support.4th - -# contents of ${WORKDIR}/libexec -libexec/ld-elf.so.1:usr/libexec/ld-elf.so.1 - -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -bin/cp -bin/csh:bin/tcsh -bin/date -bin/dd -bin/df -bin/domainname -bin/echo -bin/ed:bin/red -bin/expr -bin/hostname -bin/kenv -bin/kill -bin/ln:bin/link -bin/ls -bin/mkdir -bin/mv -bin/pax -bin/ps -bin/pwd -bin/realpath -bin/rm:bin/unlink -bin/rmdir -bin/sh -bin/sleep -bin/stty -bin/sync - -# contents of ${WORKDIR}/sbin -sbin/adjkerntz -sbin/comcontrol -sbin/disklabel -sbin/dmesg -sbin/fastboot:sbin/reboot -sbin/fasthalt:sbin/halt -sbin/fsck -sbin/fsck_ufs:sbin/fsck_ffs -sbin/fsck_ufs:sbin/fsck_4.2bsd -sbin/ifconfig -sbin/init -sbin/ipfw -sbin/kldconfig -sbin/kldload -sbin/kldstat -sbin/kldunload -sbin/ldconfig -sbin/md5 -sbin/mdconfig -sbin/mknod -sbin/mdmfs -sbin/mount -sbin/mount_nfs -sbin/mount_nullfs -sbin/mount_unionfs -sbin/natd -sbin/newfs -sbin/nextboot -sbin/nologin -sbin/nos-tun -sbin/pfctl -sbin/pflogd -sbin/ping -sbin/rcorder -sbin/route -sbin/shutdown -sbin/slattach -sbin/swapon -sbin/sysctl -sbin/umount - -# contents of ${WORKDIR}/usr/sbin -usr/bin/at:usr/bin/atq -usr/bin/at:usr/bin/atrm -usr/bin/at:usr/bin/batch -usr/bin/awk -usr/bin/basename -usr/bin/bunzip2:usr/bin/bzcat -usr/bin/bunzip2:usr/bin/bzip2 -usr/bin/chat -usr/bin/chfn:usr/bin/chpass -usr/bin/chfn:usr/bin/chsh -usr/bin/chgrp -usr/bin/cksum -usr/bin/clear -usr/bin/cmp -usr/bin/compress:usr/bin/uncompress -usr/bin/cpio -usr/bin/crontab -usr/bin/cu -usr/bin/dig -usr/bin/dirname -usr/bin/du -usr/bin/ee -usr/bin/egrep:usr/bin/fgrep -usr/bin/egrep:usr/bin/grep -usr/bin/env -usr/bin/false -usr/bin/fetch -usr/bin/find -usr/bin/finger -usr/bin/fstat -usr/bin/fsync -usr/bin/ftp -usr/bin/gunzip:usr/bin/gzcat -usr/bin/gunzip:usr/bin/gzip -usr/bin/gzexe -usr/bin/head -usr/bin/hexdump -usr/bin/id:usr/bin/whoami -usr/bin/ident -usr/bin/killall -usr/bin/last -usr/bin/less:usr/bin/more -usr/bin/limits -usr/bin/lock -usr/bin/lockf -usr/bin/logger -usr/bin/login -usr/bin/logname -usr/bin/mesg -usr/bin/minigzip -usr/bin/mkfifo -usr/bin/mktemp -usr/bin/msgs -usr/bin/netstat -usr/bin/nfsstat -usr/bin/nice -usr/bin/nslookup -usr/bin/nsupdate -usr/bin/nohup -usr/bin/objformat -usr/bin/openssl -usr/bin/passwd -usr/bin/printf -usr/bin/renice -usr/bin/reset:usr/sbin/tset -usr/bin/scp -usr/bin/script -usr/bin/sed -usr/bin/sftp -usr/bin/shar -usr/bin/slogin:usr/bin/ssh -usr/bin/sort -usr/bin/split -usr/bin/ssh-keygen -usr/bin/su -usr/bin/tail -usr/bin/tar -usr/bin/tee -usr/bin/telnet -usr/bin/tftp -usr/bin/time -usr/bin/top -usr/bin/touch -usr/bin/tput -usr/bin/tr -usr/bin/true -usr/bin/tty -usr/bin/uname -usr/bin/uptime:usr/bin/w -usr/bin/users -usr/bin/uudecode -usr/bin/uuencode -usr/bin/vi -usr/bin/vmstat -usr/bin/wall -usr/bin/who -usr/bin/whois -usr/bin/write -usr/bin/yes - -# contents of ${WORKDIR}/usr/sbin -usr/sbin/arp -usr/sbin/authpf -usr/sbin/boot0cfg -usr/sbin/chown -usr/sbin/chroot -usr/sbin/cron -usr/sbin/idprio:usr/sbin/rtprio -usr/sbin/inetd -usr/sbin/iostat -usr/sbin/kbdcontrol -usr/sbin/lastlogin -usr/sbin/memcontrol -usr/sbin/mountd -usr/sbin/mtree -usr/sbin/named -usr/sbin/named.reload -usr/sbin/newsyslog -usr/sbin/ngctl -usr/sbin/nghook -usr/sbin/ntpdate -usr/sbin/pciconf -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/slstat -usr/sbin/sshd -usr/sbin/syslogd -usr/sbin/tcpdchk -usr/sbin/tcpdmatch -usr/sbin/tcpdump -usr/sbin/traceroute -usr/sbin/vidcontrol -usr/sbin/vipw -usr/sbin/vnconfig -usr/sbin/watch - -# contents of ${WORKDIR}/usr/libexec -usr/libexec/atrun -usr/libexec/ftpd -usr/libexec/getty -usr/libexec/sftp-server -usr/libexec/telnetd -usr/libexec/tftpd - -# contents of ${WORKDIR}/usr/share -usr/share/misc/termcap - diff --git a/tools/tools/tinybsd/conf/firewall/tinybsd.ports b/tools/tools/tinybsd/conf/firewall/tinybsd.ports deleted file mode 100644 index 49bb52175241..000000000000 --- a/tools/tools/tinybsd/conf/firewall/tinybsd.ports +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# Here you can add the applications from the FreeBSD Ports Collection which you -# want TinyBSD ports system to install in your embedded system. You whould list -# one application per line, mentioning its category and name, like the examples: -# -# www/mini_httpd -# net-mgmt/rate -# -# Make sure you have enough space to add it. diff --git a/tools/tools/tinybsd/conf/minimal/TINYBSD b/tools/tools/tinybsd/conf/minimal/TINYBSD deleted file mode 100644 index 7052e6a22f58..000000000000 --- a/tools/tools/tinybsd/conf/minimal/TINYBSD +++ /dev/null @@ -1,77 +0,0 @@ -# $FreeBSD$ -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident TINYBSD - -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -options SCHED_4BSD # 4BSD scheduler -options INET # InterNETworking -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -device apic # I/O APIC - -device pci - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -options ATA_STATIC_ID # Static device numbering - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -#device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# Pseudo devices. -device loop # Network loopback -device ether # Ethernet support -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" - -# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 -# clock to actually be used. -options CLK_USE_I8254_CALIBRATION - -# CPU_ELAN enables support for AMDs ElanSC520 CPU. -options CPU_ELAN -options CPU_SOEKRIS -options CPU_ELAN_XTAL=32768000 -options CPU_ELAN_PPS - -device bpf diff --git a/tools/tools/tinybsd/conf/minimal/etc/fstab b/tools/tools/tinybsd/conf/minimal/etc/fstab deleted file mode 100644 index 16ada11d7790..000000000000 --- a/tools/tools/tinybsd/conf/minimal/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# $FreeBSD$ -/dev/ad0a / ufs ro 1 1 diff --git a/tools/tools/tinybsd/conf/minimal/etc/rc.conf b/tools/tools/tinybsd/conf/minimal/etc/rc.conf deleted file mode 100644 index a21476241081..000000000000 --- a/tools/tools/tinybsd/conf/minimal/etc/rc.conf +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ -hostname="tinybsd.freebsd.org" -sendmail_enable="NONE" -sshd_enable="YES" -usbd_enable="NO" -inetd_enable="NO" -portmap_enable="NO" -update_motd="NO" -varmfs="YES" -populate_var="YES" -varsize="8192" -tmpmfs="YES" diff --git a/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles b/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles deleted file mode 100644 index 446ef1f2afea..000000000000 --- a/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles +++ /dev/null @@ -1,167 +0,0 @@ -# $FreeBSD$ -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -boot/loader -boot/loader.4th -boot/loader.help -boot/loader.rc -boot/mbr -boot/support.4th - -# contents of ${WORKDIR}/libexec -libexec/ld-elf.so.1:usr/libexec/ld-elf.so.1 - -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -bin/cp -bin/csh:bin/tcsh -bin/date -bin/df -bin/domainname -bin/echo -bin/ed:bin/red -bin/expr -bin/hostname -bin/kenv -bin/kill -bin/ln:bin/link -bin/ls -bin/mkdir -bin/mv -bin/pax -bin/ps -bin/pwd -bin/realpath -bin/rm:bin/unlink -bin/rmdir -bin/sh -bin/sleep -bin/stty -bin/sync - -# contents of ${WORKDIR}/sbin -sbin/adjkerntz -sbin/disklabel -sbin/dmesg -sbin/fastboot:sbin/reboot -sbin/fasthalt:sbin/halt -sbin/fsck -sbin/fsck_ufs:sbin/fsck_ffs -sbin/fsck_ufs:sbin/fsck_4.2bsd -sbin/ifconfig -sbin/init -sbin/kldconfig -sbin/kldload -sbin/kldstat -sbin/kldunload -sbin/ldconfig -sbin/mdconfig -sbin/mknod -sbin/mdmfs -sbin/mount -sbin/mount_nullfs -sbin/mount_unionfs -sbin/newfs -sbin/nextboot -sbin/nologin -sbin/rcorder -sbin/shutdown -sbin/swapon -sbin/sysctl -sbin/umount - -# contents of ${WORKDIR}/usr/sbin -usr/bin/at:usr/bin/atq -usr/bin/at:usr/bin/atrm -usr/bin/at:usr/bin/batch -usr/bin/awk -usr/bin/basename -usr/bin/bunzip2:usr/bin/bzcat -usr/bin/bunzip2:usr/bin/bzip2 -usr/bin/chfn:usr/bin/chpass -usr/bin/chfn:usr/bin/chsh -usr/bin/chgrp -usr/bin/cksum -usr/bin/clear -usr/bin/compress:usr/bin/uncompress -usr/bin/crontab -usr/bin/ee -usr/bin/egrep:usr/bin/fgrep -usr/bin/egrep:usr/bin/grep -usr/bin/env -usr/bin/false -usr/bin/fstat -usr/bin/fsync -usr/bin/gunzip:usr/bin/gzcat -usr/bin/gunzip:usr/bin/gzip -usr/bin/head -usr/bin/hexdump -usr/bin/id:usr/bin/whoami -usr/bin/killall -usr/bin/last -usr/bin/less:usr/bin/more -usr/bin/logger -usr/bin/login -usr/bin/logname -usr/bin/mesg -usr/bin/minigzip -usr/bin/mkfifo -usr/bin/mktemp -usr/bin/msgs -usr/bin/nice -usr/bin/nohup -usr/bin/objformat -usr/bin/passwd -usr/bin/printf -usr/bin/reset:usr/sbin/tset -usr/bin/scp -usr/bin/sed -usr/bin/slogin:usr/bin/ssh -usr/bin/su -usr/bin/tail -usr/bin/tar -usr/bin/tee -usr/bin/time -usr/bin/top -usr/bin/touch -usr/bin/true -usr/bin/tty -usr/bin/uname -usr/bin/uptime:usr/bin/w -usr/bin/users -usr/bin/uudecode -usr/bin/uuencode -usr/bin/vmstat -usr/bin/who -usr/bin/whois - -# contents of ${WORKDIR}/usr/sbin -usr/sbin/boot0cfg -usr/sbin/chown -usr/sbin/cron -usr/sbin/idprio:usr/sbin/rtprio -usr/sbin/lastlogin -usr/sbin/memcontrol -usr/sbin/mtree -usr/sbin/newsyslog -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/syslogd -usr/sbin/vidcontrol -usr/sbin/vipw - -# contents of ${WORKDIR}/usr/libexec -usr/libexec/atrun -usr/libexec/getty - -# contents of ${WORKDIR}/usr/share -usr/share/misc/termcap - diff --git a/tools/tools/tinybsd/conf/minimal/tinybsd.ports b/tools/tools/tinybsd/conf/minimal/tinybsd.ports deleted file mode 100644 index 49bb52175241..000000000000 --- a/tools/tools/tinybsd/conf/minimal/tinybsd.ports +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# Here you can add the applications from the FreeBSD Ports Collection which you -# want TinyBSD ports system to install in your embedded system. You whould list -# one application per line, mentioning its category and name, like the examples: -# -# www/mini_httpd -# net-mgmt/rate -# -# Make sure you have enough space to add it. diff --git a/tools/tools/tinybsd/conf/vpn/TINYBSD b/tools/tools/tinybsd/conf/vpn/TINYBSD deleted file mode 100644 index 25848510f598..000000000000 --- a/tools/tools/tinybsd/conf/vpn/TINYBSD +++ /dev/null @@ -1,153 +0,0 @@ -# $FreeBSD$ -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident TINYBSD - -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -options SCHED_4BSD # 4BSD scheduler -options INET # InterNETworking -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -device apic # I/O APIC - -device eisa -device pci - -# Floppy drives -#device fdc - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -#device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# PCCARD (PCMCIA) support -# PCMCIA and cardbus bridge support -#device cbb # cardbus (yenta) bridge -#device pccard # PC Card (16-bit) bus -#device cardbus # CardBus (32-bit) bus - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit ethernet -device nge # NatSemi DP83820 gigabit ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# ISA devices that use the old ISA shims -#device le - -# Wireless NIC cards -#device wlan # 802.11 support -#device an # Aironet 4500/4800 802.11 wireless NICs. -#device awi # BayStack 660 and others -#device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. - -# Pseudo devices. -device loop # Network loopback -device ether # Ethernet support -device ppp # Kernel PPP -device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" -device gif # IPv6 and IPv4 tunneling - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. -device bpf # Berkeley packet filter - -# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 -# clock to actually be used. -options CLK_USE_I8254_CALIBRATION - -# CPU_ELAN enables support for AMDs ElanSC520 CPU. -options CPU_ELAN -options CPU_SOEKRIS -options CPU_ELAN_XTAL=32768000 -options CPU_ELAN_PPS - -# IPSEC -options IPSEC -options IPSEC_ESP - diff --git a/tools/tools/tinybsd/conf/vpn/etc/fstab b/tools/tools/tinybsd/conf/vpn/etc/fstab deleted file mode 100644 index 16ada11d7790..000000000000 --- a/tools/tools/tinybsd/conf/vpn/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# $FreeBSD$ -/dev/ad0a / ufs ro 1 1 diff --git a/tools/tools/tinybsd/conf/vpn/etc/rc.conf b/tools/tools/tinybsd/conf/vpn/etc/rc.conf deleted file mode 100644 index cb0af9ffa6c8..000000000000 --- a/tools/tools/tinybsd/conf/vpn/etc/rc.conf +++ /dev/null @@ -1,22 +0,0 @@ -# $FreeBSD$ -hostname="tinybsd.freebsd.org" -sendmail_enable="NONE" -sshd_enable="YES" -usbd_enable="NO" -inetd_enable="NO" -portmap_enable="NO" -update_motd="NO" -varmfs="YES" -populate_var="YES" -varsize="8192" -tmpmfs="YES" - -# VPN -ipsec_enable="YES" -ipsec_file="/etc/ipsec.conf" - -# Set here your VPN configuration -gif_interfaces="gif0" -ifconfig_gif0="inet 192.168.1.1 192.168.2.1 netmask 0xffffffff" -static_routes="vpn" -route_vpn="192.168.2.0 192.168.2.1 netmask 0xffffff00" diff --git a/tools/tools/tinybsd/conf/vpn/etc/setkey.conf b/tools/tools/tinybsd/conf/vpn/etc/setkey.conf deleted file mode 100644 index e8c0da7a1d7e..000000000000 --- a/tools/tools/tinybsd/conf/vpn/etc/setkey.conf +++ /dev/null @@ -1 +0,0 @@ -# $FreeBSD$ diff --git a/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles b/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles deleted file mode 100644 index eba1a11493fa..000000000000 --- a/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles +++ /dev/null @@ -1,222 +0,0 @@ -# $FreeBSD$ -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -boot/loader -boot/loader.4th -boot/loader.help -boot/loader.rc -boot/mbr -boot/support.4th - -# contents of ${WORKDIR}/libexec -libexec/ld-elf.so.1:usr/libexec/ld-elf.so.1 - -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -bin/cp -bin/csh:bin/tcsh -bin/date -bin/df -bin/domainname -bin/echo -bin/ed:bin/red -bin/expr -bin/hostname -bin/kenv -bin/kill -bin/ln:bin/link -bin/ls -bin/mkdir -bin/mv -bin/pax -bin/ps -bin/pwd -bin/realpath -bin/rm:bin/unlink -bin/rmdir -bin/sh -bin/sleep -bin/stty -bin/sync - -# contents of ${WORKDIR}/sbin -sbin/adjkerntz -sbin/comcontrol -sbin/disklabel -sbin/dmesg -sbin/fastboot:sbin/reboot -sbin/fasthalt:sbin/halt -sbin/fsck -sbin/fsck_ufs:sbin/fsck_ffs -sbin/fsck_ufs:sbin/fsck_4.2bsd -sbin/ifconfig -sbin/init -sbin/ipfw -sbin/kldconfig -sbin/kldload -sbin/kldstat -sbin/kldunload -sbin/ldconfig -sbin/md5 -sbin/mdconfig -sbin/mknod -sbin/mdmfs -sbin/mount -sbin/mount_nullfs -sbin/mount_unionfs -sbin/newfs -sbin/nextboot -sbin/nologin -sbin/nos-tun -sbin/ping -sbin/rcorder -sbin/route -sbin/setkey -sbin/shutdown -sbin/slattach -sbin/swapon -sbin/sysctl -sbin/umount - -# contents of ${WORKDIR}/usr/sbin -usr/bin/at:usr/bin/atq -usr/bin/at:usr/bin/atrm -usr/bin/at:usr/bin/batch -usr/bin/awk -usr/bin/basename -usr/bin/bunzip2:usr/bin/bzcat -usr/bin/bunzip2:usr/bin/bzip2 -usr/bin/chat -usr/bin/chfn:usr/bin/chpass -usr/bin/chfn:usr/bin/chsh -usr/bin/chgrp -usr/bin/cksum -usr/bin/clear -usr/bin/cmp -usr/bin/compress:usr/bin/uncompress -usr/bin/cpio -usr/bin/crontab -usr/bin/cu -usr/bin/dig -usr/bin/dirname -usr/bin/du -usr/bin/ee -usr/bin/egrep:usr/bin/fgrep -usr/bin/egrep:usr/bin/grep -usr/bin/env -usr/bin/false -usr/bin/fetch -usr/bin/find -usr/bin/fstat -usr/bin/fsync -usr/bin/ftp -usr/bin/gunzip:usr/bin/gzcat -usr/bin/gunzip:usr/bin/gzip -usr/bin/gzexe -usr/bin/head -usr/bin/hexdump -usr/bin/id:usr/bin/whoami -usr/bin/ident -usr/bin/killall -usr/bin/last -usr/bin/less:usr/bin/more -usr/bin/limits -usr/bin/lock -usr/bin/lockf -usr/bin/logger -usr/bin/login -usr/bin/logname -usr/bin/mesg -usr/bin/minigzip -usr/bin/mkfifo -usr/bin/mktemp -usr/bin/msgs -usr/bin/netstat -usr/bin/nfsstat -usr/bin/nice -usr/bin/nslookup -usr/bin/nsupdate -usr/bin/nohup -usr/bin/objformat -usr/bin/openssl -usr/bin/passwd -usr/bin/printf -usr/bin/renice -usr/bin/reset:usr/sbin/tset -usr/bin/scp -usr/bin/script -usr/bin/sed -usr/bin/sftp -usr/bin/shar -usr/bin/slogin:usr/bin/ssh -usr/bin/sort -usr/bin/split -usr/bin/ssh-keygen -usr/bin/su -usr/bin/tail -usr/bin/tar -usr/bin/tee -usr/bin/telnet -usr/bin/time -usr/bin/top -usr/bin/touch -usr/bin/tput -usr/bin/tr -usr/bin/true -usr/bin/tty -usr/bin/uname -usr/bin/uptime:usr/bin/w -usr/bin/users -usr/bin/uudecode -usr/bin/uuencode -usr/bin/vi -usr/bin/vmstat -usr/bin/wall -usr/bin/who -usr/bin/whois -usr/bin/write -usr/bin/yes - -# contents of ${WORKDIR}/usr/sbin -usr/sbin/boot0cfg -usr/sbin/chown -usr/sbin/cron -usr/sbin/idprio:usr/sbin/rtprio -usr/sbin/iostat -usr/sbin/kbdcontrol -usr/sbin/lastlogin -usr/sbin/memcontrol -usr/sbin/mtree -usr/sbin/newsyslog -usr/sbin/ntpdate -usr/sbin/pciconf -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/slstat -usr/sbin/sshd -usr/sbin/syslogd -usr/sbin/tcpdchk -usr/sbin/tcpdmatch -usr/sbin/tcpdump -usr/sbin/traceroute -usr/sbin/vidcontrol -usr/sbin/vipw -usr/sbin/vnconfig -usr/sbin/watch - -# contents of ${WORKDIR}/usr/libexec -usr/libexec/atrun -usr/libexec/getty -usr/libexec/sftp-server - -# contents of ${WORKDIR}/usr/share -usr/share/misc/termcap - diff --git a/tools/tools/tinybsd/conf/vpn/tinybsd.ports b/tools/tools/tinybsd/conf/vpn/tinybsd.ports deleted file mode 100644 index 49bb52175241..000000000000 --- a/tools/tools/tinybsd/conf/vpn/tinybsd.ports +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# Here you can add the applications from the FreeBSD Ports Collection which you -# want TinyBSD ports system to install in your embedded system. You whould list -# one application per line, mentioning its category and name, like the examples: -# -# www/mini_httpd -# net-mgmt/rate -# -# Make sure you have enough space to add it. diff --git a/tools/tools/tinybsd/conf/wireless/TINYBSD b/tools/tools/tinybsd/conf/wireless/TINYBSD deleted file mode 100644 index 9477f08e1dba..000000000000 --- a/tools/tools/tinybsd/conf/wireless/TINYBSD +++ /dev/null @@ -1,167 +0,0 @@ -# $FreeBSD$ -machine i386 -cpu I486_CPU -cpu I586_CPU -cpu I686_CPU -ident TINYBSD - -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. - -options SCHED_4BSD # 4BSD scheduler -options INET # InterNETworking -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -device apic # I/O APIC - -device eisa -device pci - -# Floppy drives -#device fdc - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID # Static device numbering - -# atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc # AT keyboard controller -device atkbd # AT keyboard -device psm # PS/2 mouse - -device vga # VGA video card driver - -#device splash # Splash screen and screen saver support - -# syscons is the default console driver, resembling an SCO console -device sc - -# Enable this for the pcvt (VT220 compatible) console driver -#device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor - -device agp # support several AGP chipsets - -# PCCARD (PCMCIA) support -# PCMCIA and cardbus bridge support -device cbb # cardbus (yenta) bridge -device pccard # PC Card (16-bit) bus -device cardbus # CardBus (32-bit) bus - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# PCI Ethernet NICs. -#device de # DEC/Intel DC21x4x (``Tulip'') -#device em # Intel PRO/1000 adapter Gigabit Ethernet Card -#device txp # 3Com 3cR990 (``Typhoon'') -#device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -#device miibus # MII bus support -#device bfe # Broadcom BCM440x 10/100 Ethernet -#device bge # Broadcom BCM570xx Gigabit Ethernet -#device dc # DEC/Intel 21143 and various workalikes -#device fxp # Intel EtherExpress PRO/100B (82557, 82558) -#device lge # Level 1 LXT1001 gigabit ethernet -#device nge # NatSemi DP83820 gigabit ethernet -#device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -#device re # RealTek 8139C+/8169/8169S/8110S -#device rl # RealTek 8129/8139 -#device sf # Adaptec AIC-6915 (``Starfire'') -#device sis # Silicon Integrated Systems SiS 900/SiS 7016 -#device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -#device ste # Sundance ST201 (D-Link DFE-550TX) -#device ti # Alteon Networks Tigon I/II gigabit Ethernet -#device tl # Texas Instruments ThunderLAN -#device tx # SMC EtherPower II (83c170 ``EPIC'') -#device vge # VIA VT612x gigabit ethernet -#device vr # VIA Rhine, Rhine II -#device wb # Winbond W89C840F -#device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -#device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -#device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -#device ex # Intel EtherExpress Pro/10 and Pro/10+ -#device ep # Etherlink III based cards -#device fe # Fujitsu MB8696x based cards -#device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -#device lnc # NE2100, NE32-VL Lance Ethernet cards -#device sn # SMC's 9000 series of Ethernet chips -#device xe # Xircom pccard Ethernet - -# ISA devices that use the old ISA shims -#device le - -# Wireless NIC cards -device wlan # 802.11 support -device wlan_wep #802.11 WEP support -device wlan_ccmp #802.11 CCMP support -device wlan_tkip #802.11 TKIP support -device wlan_xauth #802.11 external authenticator support -device wlan_acl #802.11 MAC ACL support -device an # Aironet 4500/4800 802.11 wireless NICs. -device awi # BayStack 660 and others -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -#device wl # Older non 802.11 Wavelan wireless NIC. - -# Pseudo devices. -device loop # Network loopback -device ether # Ethernet support -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. -device bpf # Berkeley packet filter - -options IPFIREWALL -options IPFIREWALL_DEFAULT_TO_ACCEPT -options IPDIVERT -options DUMMYNET - -device pf #PF OpenBSD packet-filter firewall -device pflog #logging support interface for PF -device pfsync #synchronization interface for PF - -device ath -device ath_hal -device ath_rate_sample - -device if_bridge - -# CLK_USE_I8254_CALIBRATION causes the calibrated frequency of the i8254 -# clock to actually be used. -options CLK_USE_I8254_CALIBRATION - -# CPU_ELAN enables support for AMDs ElanSC520 CPU. -options CPU_ELAN -options CPU_SOEKRIS -options CPU_ELAN_XTAL=32768000 -options CPU_ELAN_PPS - diff --git a/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules b/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules deleted file mode 100644 index e8c0da7a1d7e..000000000000 --- a/tools/tools/tinybsd/conf/wireless/etc/authpf/authpf.rules +++ /dev/null @@ -1 +0,0 @@ -# $FreeBSD$ diff --git a/tools/tools/tinybsd/conf/wireless/etc/fstab b/tools/tools/tinybsd/conf/wireless/etc/fstab deleted file mode 100644 index 16ada11d7790..000000000000 --- a/tools/tools/tinybsd/conf/wireless/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# $FreeBSD$ -/dev/ad0a / ufs ro 1 1 diff --git a/tools/tools/tinybsd/conf/wireless/etc/natd.conf b/tools/tools/tinybsd/conf/wireless/etc/natd.conf deleted file mode 100644 index e8c0da7a1d7e..000000000000 --- a/tools/tools/tinybsd/conf/wireless/etc/natd.conf +++ /dev/null @@ -1 +0,0 @@ -# $FreeBSD$ diff --git a/tools/tools/tinybsd/conf/wireless/etc/pf.conf b/tools/tools/tinybsd/conf/wireless/etc/pf.conf deleted file mode 100644 index 9acf363030a2..000000000000 --- a/tools/tools/tinybsd/conf/wireless/etc/pf.conf +++ /dev/null @@ -1,78 +0,0 @@ -# $FreeBSD$ -# -# See pf.conf(5) and /usr/share/examples/pf for syntax and examples. -# Required order: options, normalization, queueing, translation, filtering. -# Macros and tables may be defined and used anywhere. -# Note that translation rules are first match while filter rules are last match. - -# Macros: define common values, so they can be referenced and changed easily. -#ext_if="ext0" # replace with actual external interface name i.e., dc0 -#int_if="int0" # replace with actual internal interface name i.e., dc1 -#internal_net="10.1.1.1/8" -#external_addr="192.168.1.1" - -# Tables: similar to macros, but more flexible for many addresses. -#table <foo> { 10.0.0.0/8, !10.1.0.0/16, 192.168.0.0/24, 192.168.1.18 } - -# Options: tune the behavior of pf, default values are given. -#set timeout { interval 10, frag 30 } -#set timeout { tcp.first 120, tcp.opening 30, tcp.established 86400 } -#set timeout { tcp.closing 900, tcp.finwait 45, tcp.closed 90 } -#set timeout { udp.first 60, udp.single 30, udp.multiple 60 } -#set timeout { icmp.first 20, icmp.error 10 } -#set timeout { other.first 60, other.single 30, other.multiple 60 } -#set timeout { adaptive.start 0, adaptive.end 0 } -#set limit { states 10000, frags 5000 } -#set loginterface none -#set optimization normal -#set block-policy drop -#set require-order yes -#set fingerprints "/etc/pf.os" - -# Normalization: reassemble fragments and resolve or reduce traffic ambiguities. -#scrub in all - -# Queueing: rule-based bandwidth control. -#altq on $ext_if bandwidth 2Mb cbq queue { dflt, developers, marketing } -#queue dflt bandwidth 5% cbq(default) -#queue developers bandwidth 80% -#queue marketing bandwidth 15% - -# Translation: specify how addresses are to be mapped or redirected. -# nat: packets going out through $ext_if with source address $internal_net will -# get translated as coming from the address of $ext_if, a state is created for -# such packets, and incoming packets will be redirected to the internal address. -#nat on $ext_if from $internal_net to any -> ($ext_if) - -# rdr: packets coming in on $ext_if with destination $external_addr:1234 will -# be redirected to 10.1.1.1:5678. A state is created for such packets, and -# outgoing packets will be translated as coming from the external address. -#rdr on $ext_if proto tcp from any to $external_addr/32 port 1234 -> 10.1.1.1 port 5678 - -# rdr outgoing FTP requests to the ftp-proxy -#rdr on $int_if proto tcp from any to any port ftp -> 127.0.0.1 port 8021 - -# spamd-setup puts addresses to be redirected into table <spamd>. -#table <spamd> persist -#no rdr on { lo0, lo1 } from any to any -#rdr inet proto tcp from <spamd> to any port smtp -> 127.0.0.1 port 8025 - -# Filtering: the implicit first two rules are -#pass in all -#pass out all - -# block all incoming packets but allow ssh, pass all outgoing tcp and udp -# connections and keep state, logging blocked packets. -#block in log all -#pass in on $ext_if proto tcp from any to $ext_if port 22 keep state -#pass out on $ext_if proto { tcp, udp } all keep state - -# pass incoming packets destined to the addresses given in table <foo>. -#pass in on $ext_if proto { tcp, udp } from any to <foo> port 80 keep state - -# pass incoming ports for ftp-proxy -#pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state - -# assign packets to a queue. -#pass out on $ext_if from 192.168.0.0/24 to any keep state queue developers -#pass out on $ext_if from 192.168.1.0/24 to any keep state queue marketing diff --git a/tools/tools/tinybsd/conf/wireless/etc/pf.os b/tools/tools/tinybsd/conf/wireless/etc/pf.os deleted file mode 100644 index 2a64809bcfa9..000000000000 --- a/tools/tools/tinybsd/conf/wireless/etc/pf.os +++ /dev/null @@ -1,549 +0,0 @@ -# $FreeBSD$ -# passive OS fingerprinting -# ------------------------- -# -# SYN signatures. Those signatures work for SYN packets only (duh!). -# -# (C) Copyright 2000-2003 by Michal Zalewski <lcamtuf@coredump.cx> -# (C) Copyright 2003 by Mike Frantzen <frantzen@w4g.org> -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# -# -# This fingerprint database is adapted from Michal Zalewski's p0f passive -# operating system package. -# -# -# Each line in this file specifies a single fingerprint. Please read the -# information below carefully before attempting to append any signatures -# reported as UNKNOWN to this file to avoid mistakes. -# -# We use the following set metrics for fingerprinting: -# -# - Window size (WSS) - a highly OS dependent setting used for TCP/IP -# performance control (max. amount of data to be sent without ACK). -# Some systems use a fixed value for initial packets. On other -# systems, it is a multiple of MSS or MTU (MSS+40). In some rare -# cases, the value is just arbitrary. -# -# NEW SIGNATURE: if p0f reported a special value of 'Snn', the number -# appears to be a multiple of MSS (MSS*nn); a special value of 'Tnn' -# means it is a multiple of MTU ((MSS+40)*nn). Unless you notice the -# value of nn is not fixed (unlikely), just copy the Snn or Tnn token -# literally. If you know this device has a simple stack and a fixed -# MTU, you can however multiply S value by MSS, or T value by MSS+40, -# and put it instead of Snn or Tnn. -# -# If WSS otherwise looks like a fixed value (for example a multiple -# of two), or if you can confirm the value is fixed, please quote -# it literally. If there's no apparent pattern in WSS chosen, you -# should consider wildcarding this value. -# -# - Overall packet size - a function of all IP and TCP options and bugs. -# -# NEW SIGNATURE: Copy this value literally. -# -# - Initial TTL - We check the actual TTL of a received packet. It can't -# be higher than the initial TTL, and also shouldn't be dramatically -# lower (maximum distance is defined as 40 hops). -# -# NEW SIGNATURE: *Never* copy TTL from a p0f-reported signature literally. -# You need to determine the initial TTL. The best way to do it is to -# check the documentation for a remote system, or check its settings. -# A fairly good method is to simply round the observed TTL up to -# 32, 64, 128, or 255, but it should be noted that some obscure devices -# might not use round TTLs (in particular, some shoddy appliances use -# "original" initial TTL settings). If not sure, you can see how many -# hops you're away from the remote party with traceroute or mtr. -# -# - Don't fragment flag (DF) - some modern OSes set this to implement PMTU -# discovery. Others do not bother. -# -# NEW SIGNATURE: Copy this value literally. -# -# - Maximum segment size (MSS) - this setting is usually link-dependent. P0f -# uses it to determine link type of the remote host. -# -# NEW SIGNATURE: Always wildcard this value, except for rare cases when -# you have an appliance with a fixed value, know the system supports only -# a very limited number of network interface types, or know the system -# is using a value it pulled out of nowhere. Specific unique MSS -# can be used to tell Google crawlbots from the rest of the population. -# -# - Window scaling (WSCALE) - this feature is used to scale WSS. -# It extends the size of a TCP/IP window to 32 bits. Some modern -# systems implement this feature. -# -# NEW SIGNATURE: Observe several signatures. Initial WSCALE is often set -# to zero or other low value. There's usually no need to wildcard this -# parameter. -# -# - Timestamp - some systems that implement timestamps set them to -# zero in the initial SYN. This case is detected and handled appropriately. -# -# - Selective ACK permitted - a flag set by systems that implement -# selective ACK functionality. -# -# - The sequence of TCP all options (MSS, window scaling, selective ACK -# permitted, timestamp, NOP). Other than the options previously -# discussed, p0f also checks for timestamp option (a silly -# extension to broadcast your uptime ;-), NOP options (used for -# header padding) and sackOK option (selective ACK feature). -# -# NEW SIGNATURE: Copy the sequence literally. -# -# To wildcard any value (except for initial TTL or TCP options), replace -# it with '*'. You can also use a modulo operator to match any values -# that divide by nnn - '%nnn'. -# -# Fingerprint entry format: -# -# wwww:ttt:D:ss:OOO...:OS:Version:Subtype:Details -# -# wwww - window size (can be *, %nnn, Snn or Tnn). The special values -# "S" and "T" which are a multiple of MSS or a multiple of MTU -# respectively. -# ttt - initial TTL -# D - don't fragment bit (0 - not set, 1 - set) -# ss - overall SYN packet size -# OOO - option value and order specification (see below) -# OS - OS genre (Linux, Solaris, Windows) -# Version - OS Version (2.0.27 on x86, etc) -# Subtype - OS subtype or patchlevel (SP3, lo0) -# details - Generic OS details -# -# If OS genre starts with '*', p0f will not show distance, link type -# and timestamp data. It is useful for userland TCP/IP stacks of -# network scanners and so on, where many settings are randomized or -# bogus. -# -# If OS genre starts with @, it denotes an approximate hit for a group -# of operating systems (signature reporting still enabled in this case). -# Use this feature at the end of this file to catch cases for which -# you don't have a precise match, but can tell it's Windows or FreeBSD -# or whatnot by looking at, say, flag layout alone. -# -# Option block description is a list of comma or space separated -# options in the order they appear in the packet: -# -# N - NOP option -# Wnnn - window scaling option, value nnn (or * or %nnn) -# Mnnn - maximum segment size option, value nnn (or * or %nnn) -# S - selective ACK OK -# T - timestamp -# T0 - timestamp with a zero value -# -# To denote no TCP options, use a single '.'. -# -# Please report any additions to this file, or any inaccuracies or -# problems spotted, to the maintainers: lcamtuf@coredump.cx, -# frantzen@openbsd.org and bugs@openbsd.org with a tcpdump packet -# capture of the relevant SYN packet(s) -# -# WARNING WARNING WARNING -# ----------------------- -# -# Do not add a system X as OS Y just because NMAP says so. It is often -# the case that X is a NAT firewall. While nmap is talking to the -# device itself, p0f is fingerprinting the guy behind the firewall -# instead. -# -# When in doubt, use common sense, don't add something that looks like -# a completely different system as Linux or FreeBSD or LinkSys router. -# Check DNS name, establish a connection to the remote host and look -# at SYN+ACK - does it look similar? -# -# Some users tweak their TCP/IP settings - enable or disable RFC1323 -# functionality, enable or disable timestamps or selective ACK, -# disable PMTU discovery, change MTU and so on. Always compare a new rule -# to other fingerprints for this system, and verify the system isn't -# "customized" before adding it. It is OK to add signature variants -# caused by a commonly used software (personal firewalls, security -# packages, etc), but it makes no sense to try to add every single -# possible /proc/sys/net/ipv4 tweak on Linux or so. -# -# KEEP IN MIND: Some packet firewalls configured to normalize outgoing -# traffic (OpenBSD pf with "scrub" enabled, for example) will, well, -# normalize packets. Signatures will not correspond to the originating -# system (and probably not quite to the firewall either). -# -# NOTE: Try to keep this file in some reasonable order, from most to -# least likely systems. This will speed up operation. Also keep most -# generic and broad rules near the end. -# - -########################## -# Standard OS signatures # -########################## - -# ----------------- AIX --------------------- - -# AIX is first because its signatures are close to NetBSD, MacOS X and -# Linux 2.0, but it uses a fairly rare MSSes, at least sometimes... -# This is a shoddy hack, though. - -16384:64:0:44:M512: AIX:4.3:2-3:AIX 4.3.2 and earlier - -16384:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2 -16384:64:0:60:M512,N,W%2,N,N,T: AIX:5.1-5.2::AIX 4.3.3-5.2 -32768:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2 -32768:64:0:60:M512,N,W%2,N,N,T: AIX:5.1-5.2::AIX 4.3.3-5.2 -65535:64:0:60:M512,N,W%2,N,N,T: AIX:4.3:3:AIX 4.3.3-5.2 -65535:64:0:60:M512,N,W%2,N,N,T: AIX:5.1-5.2::AIX 4.3.3-5.2 -65535:64:0:64:M*,N,W1,N,N,T,N,N,S: AIX:5.3:ML1:AIX 5.3 ML1 - -# ----------------- Linux ------------------- - -512:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x -16384:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x - -# Endian snafu! Nelson says "ha-ha": -2:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x (MkLinux) on Mac -64:64:0:44:M*: Linux:2.0:3x:Linux 2.0.3x (MkLinux) on Mac - - -S4:64:1:60:M1360,S,T,N,W0: Linux:google::Linux (Google crawlbot) - -S2:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4 (big boy) -S3:64:1:60:M*,S,T,N,W0: Linux:2.4:18-21:Linux 2.4.18 and newer -S4:64:1:60:M*,S,T,N,W0: Linux:2.4::Linux 2.4/2.6 -S4:64:1:60:M*,S,T,N,W0: Linux:2.6::Linux 2.4/2.6 - -S3:64:1:60:M*,S,T,N,W1: Linux:2.5::Linux 2.5 -S4:64:1:60:M*,S,T,N,W1: Linux:2.5-2.6::Linux 2.5/2.6 - -S20:64:1:60:M*,S,T,N,W0: Linux:2.2:20-25:Linux 2.2.20 and newer -S22:64:1:60:M*,S,T,N,W0: Linux:2.2::Linux 2.2 -S11:64:1:60:M*,S,T,N,W0: Linux:2.2::Linux 2.2 - -# Popular cluster config scripts disable timestamps and -# selective ACK: -S4:64:1:48:M1460,N,W0: Linux:2.4:cluster:Linux 2.4 in cluster - -# This needs to be investigated. On some systems, WSS -# is selected as a multiple of MTU instead of MSS. I got -# many submissions for this for many late versions of 2.4: -T4:64:1:60:M1412,S,T,N,W0: Linux:2.4::Linux 2.4 (late, uncommon) - -# This happens only over loopback, but let's make folks happy: -32767:64:1:60:M16396,S,T,N,W0: Linux:2.4:lo0:Linux 2.4 (local) -S8:64:1:60:M3884,S,T,N,W0: Linux:2.2:lo0:Linux 2.2 (local) - -# Opera visitors: -16384:64:1:60:M*,S,T,N,W0: Linux:2.2:Opera:Linux 2.2 (Opera?) -32767:64:1:60:M*,S,T,N,W0: Linux:2.4:Opera:Linux 2.4 (Opera?) - -# Some fairly common mods: -S4:64:1:52:M*,N,N,S,N,W0: Linux:2.4:ts:Linux 2.4 w/o timestamps -S22:64:1:52:M*,N,N,S,N,W0: Linux:2.2:ts:Linux 2.2 w/o timestamps - - -# ----------------- FreeBSD ----------------- - -16384:64:1:44:M*: FreeBSD:2.0-2.2::FreeBSD 2.0-4.1 -16384:64:1:44:M*: FreeBSD:3.0-3.5::FreeBSD 2.0-4.1 -16384:64:1:44:M*: FreeBSD:4.0-4.1::FreeBSD 2.0-4.1 -16384:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4 - -1024:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.4::FreeBSD 4.4 - -57344:64:1:44:M*: FreeBSD:4.6-4.8:noRFC1323:FreeBSD 4.6-4.8 (no RFC1323) -57344:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.6-4.8::FreeBSD 4.6-4.8 - -32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X) -32768:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:4.8-4.9::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W0,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.8-5.1 (or MacOS X) -65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:4.7-4.9::FreeBSD 4.7-5.1 -65535:64:1:60:M*,N,W1,N,N,T: FreeBSD:5.0-5.1::FreeBSD 4.7-5.1 - -# 16384:64:1:60:M*,N,N,N,N,N,N,T:FreeBSD:4.4:noTS:FreeBSD 4.4 (w/o timestamps) - -# ----------------- NetBSD ------------------ - -65535:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6:opera:NetBSD 1.6 (Opera) -16384:64:0:60:M*,N,W0,N,N,T0: NetBSD:1.6::NetBSD 1.6 -16384:64:1:60:M*,N,W0,N,N,T0: NetBSD:1.6:df:NetBSD 1.6 (DF) -16384:64:0:60:M*,N,W0,N,N,T: NetBSD:1.3::NetBSD 1.3 -65535:64:1:60:M*,N,W1,N,N,T0: NetBSD:1.6::NetBSD 1.6W-current (DF) - -# ----------------- OpenBSD ----------------- - -16384:64:0:60:M*,N,W0,N,N,T: OpenBSD:2.6::NetBSD 1.3 (or OpenBSD 2.6) -16384:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4::OpenBSD 3.0-3.4 -16384:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:no-df:OpenBSD 3.0-3.4 (scrub no-df) -57344:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4::OpenBSD 3.3-3.4 -57344:64:0:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.3-3.4:no-df:OpenBSD 3.3-3.4 (scrub no-df) - -65535:64:1:64:M*,N,N,S,N,W0,N,N,T: OpenBSD:3.0-3.4:opera:OpenBSD 3.0-3.4 (Opera) - -# ----------------- Solaris ----------------- - -S17:64:1:64:N,W3,N,N,T0,N,N,S,M*: Solaris:8:RFC1323:Solaris 8 RFC1323 -S17:64:1:48:N,N,S,M*: Solaris:8::Solaris 8 -S17:255:1:44:M*: Solaris:2.5-2.7::Solaris 2.5 to 7 - -S6:255:1:44:M*: Solaris:2.6-2.7::Solaris 2.6 to 7 -S23:255:1:44:M*: Solaris:2.5:1:Solaris 2.5.1 -S34:64:1:48:M*,N,N,S: Solaris:2.9::Solaris 9 -S44:255:1:44:M*: Solaris:2.7::Solaris 7 - -# ----------------- IRIX -------------------- - -49152:64:0:44:M*: IRIX:6.4::IRIX 6.4 -61440:64:0:44:M*: IRIX:6.2-6.5::IRIX 6.2-6.5 -49152:64:0:52:M*,N,W2,N,N,S: IRIX:6.5:RFC1323:IRIX 6.5 (RFC1323) -49152:64:0:52:M*,N,W3,N,N,S: IRIX:6.5:RFC1323:IRIX 6.5 (RFC1323) - -61440:64:0:48:M*,N,N,S: IRIX:6.5:12-21:IRIX 6.5.12 - 6.5.21 -49152:64:0:48:M*,N,N,S: IRIX:6.5:15-21:IRIX 6.5.15 - 6.5.21 - -# ----------------- Tru64 ------------------- - -32768:64:1:48:M*,N,W0: Tru64:4.0::Tru64 4.0 -32768:64:0:48:M*,N,W0: Tru64:5.0::Tru64 5.0 -8192:64:0:44:M1460: Tru64:5.1:noRFC1323:Tru64 6.1 (no RFC1323) (or QNX 6) - -# This looks awfully Linuxish :/ -# S22:64:0:60:M*,S,T,N,W0: Tru64:5.0:a:Tru64 5.0a - -61440:64:0:48:M*,N,W0: Tru64:5.1a:JP4:Tru64 v5.1a JP4 (or OpenVMS 7.x on Compaq 5.x stack) - - -# ----------------- OpenVMS ----------------- - -6144:64:1:60:M*,N,W0,N,N,T: OpenVMS:7.2::OpenVMS 7.2 (Multinet 4.4 stack) - -# ----------------- MacOS ------------------- - -16616:255:1:48:M*,W0: MacOS:7.3-7.6:OTTCP:MacOS 7.3-8.6 (OTTCP) -16616:255:1:48:M*,W0: MacOS:8.0-8.6:OTTCP:MacOS 7.3-8.6 (OTTCP) -32768:255:1:48:M*,W0,N: MacOS:9.1-9.2::MacOS 9.1/9.2 -32768:64:0:60:M*,N,W0,N,N,T: MacOS:X:10.2:MacOS X 10.2 - -# ----------------- Windows ----------------- - -# Windows 95 - need more: - -8192:32:1:44:M*: Windows:95::Windows 95 (low TTL) - -# Windows 98 - plenty of silly signatures: -S44:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL) -8192:32:1:48:M*,N,N,S: Windows:98::Windows 98 (low TTL) - -%8192:64:1:48:M*,N,N,S: Windows:98::Windows 98 (or newer XP/2000 with tweaked TTL) -S4:64:1:48:M*,N,N,S: Windows:98::Windows 98 -S6:64:1:48:M*,N,N,S: Windows:98::Windows 98 -S12:64:1:48:M*,N,N,S: Windows:98::Windows 98 -32767:64:1:48:M*,N,N,S: Windows:98::Windows 98 -37300:64:1:48:M*,N,N,S: Windows:98::Windows 98 -46080:64:1:52:M*,N,W3,N,N,S: Windows:98:RFC1323:Windows 98 (RFC1323) -65535:64:1:44:M*: Windows:98:noSACK:Windows 98 (no sack) - -S16:128:1:48:M*,N,N,S: Windows:98::Windows 98 -S16:128:1:64:M*,N,W0,N,N,T0,N,N,S: Windows:98::Windows 98 -S26:128:1:48:M*,N,N,S: Windows:98::Windows 98 -T30:128:1:48:M*,N,N,S: Windows:98::Windows 98 -32767:128:1:52:M*,N,W0,N,N,S: Windows:98::Windows 98 -60352:128:1:48:M*,N,N,S: Windows:98::Windows 98 -60352:128:1:64:M*,N,W2,N,N,T0,N,N,S: Windows:98::Windows 98 - -# Windows NT 4.0 - need more: - -64512:128:1:44:M1414: Windows:NT:4.0:Windows NT 4.0 SP6a -8192:128:1:44:M*: Windows:NT:4.0:Windows NT 4.0 (older) -6144:128:1:52:M*,W0,N,S,N,N: Windows:NT:4.0:Windows NT 4.0 (RFC1323) - -# Windows XP and 2000. Most of the signatures that were -# either dubious or non-specific (no service pack data) -# were deleted and replaced with generics at the end. - -65535:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1 -%8192:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4, XP SP1 -S45:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows 2000 SP4 -S6:128:1:48:M*,N,N,S: Windows:2000:SP4:Windows XP SP1, 2000 SP4 -S44:128:1:48:M*,N,N,S: Windows:2000:SP3:Windows XP Pro SP1, 2000 SP3 - -S6:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1, 2000 SP4 -S44:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP Pro SP1, 2000 SP3 -64512:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows XP SP1 -32767:128:1:48:M1452,N,N,S: Windows:XP:SP1:Windows XP SP1 -65535:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1 -%8192:128:1:48:M*,N,N,S: Windows:XP:SP1:Windows 2000 SP4, XP SP1 - -# Odds, ends, mods: - -S52:128:1:48:M1260,N,N,S: Windows:XP:Cisco:Windows XP/2000 via Cisco -S52:128:1:48:M1260,N,N,S: Windows:2000:Cisco:Windows XP/2000 via Cisco - -# HUNT DOWN: -# *:128:1:48:M*,N,N,S:U:@Windows:XP (leak) (PLEASE REPORT) - -# ----------------- HP/UX ------------------- - -32768:64:1:44:M*: HP-UX:B.10.20::HP-UX B.10.20 -32768:64:0:48:M*,W0,N: HP-UX:11.0::HP-UX 11.0 -32768:64:1:48:M*,W0,N: HP-UX:11.10::HP-UX 11.0 or 11.11 -32768:64:1:48:M*,W0,N: HP-UX:11.11::HP-UX 11.0 or 11.11 - -# Whoa. Hardcore WSS. -0:64:0:48:M*,W0,N: HP-UX:B.11.00:A:HP-UX B.11.00 A (RFC1323) - - -# ----------------- RiscOS ------------------ - -# We don't yet support the ?12 TCP option -#16384:64:1:68:M1460,N,W0,N,N,T,N,N,?12: RISCOS:3.70-4.36::RISC OS 3.70-4.36 - -# ----------------- BSD/OS ------------------ - -# Once again, power of two WSS is also shared by MacOS X with DF set -8192:64:1:60:M1460,N,W0,N,N,T: BSD/OS:3.1::BSD/OS 3.1-4.3 (or MacOS X 10.2 w/DF) -8192:64:1:60:M1460,N,W0,N,N,T: BSD/OS:4.0-4.3::BSD/OS 3.1-4.3 (or MacOS X 10.2) - - -# ---------------- NewtonOS ----------------- - -4096:64:0:44:M1420: NewtonOS:2.1::NewtonOS 2.1 - -# ---------------- NeXTSTEP ----------------- - -S8:64:0:44:M512: NeXTSTEP:3.3::NeXTSTEP 3.3 - -# ------------------ BeOS ------------------- - -1024:255:0:48:M*,N,W0: BeOS:5.0-5.1::BeOS 5.0-5.1 -12288:255:0:44:M1402: BeOS:5.0::BeOS 5.0.x - -# ------------------ OS/400 ----------------- - -8192:64:1:60:M1440,N,W0,N,N,T: OS/400:VR4::OS/400 VR4/R5 -8192:64:1:60:M1440,N,W0,N,N,T: OS/400:VR5::OS/400 VR4/R5 -4096:64:1:60:M1440,N,W0,N,N,T: OS/400:V4R5:CF67032:OS/400 V4R5 + CF67032 - - -# ------------------ ULTRIX ----------------- - -16384:64:0:40:.: ULTRIX:4.5::ULTRIX 4.5 - -# ------------------- QNX ------------------- - -S16:64:0:44:M512: QNX:::QNX demodisk - -# ------------------ Novell ----------------- - -16384:128:1:44:M1460: Novell:NetWare:5.0:Novel Netware 5.0 -6144:128:1:44:M1460: Novell:IntranetWare:4.11:Novell IntranetWare 4.11 - -# ----------------- SCO ------------------ -S17:64:1:44:M1460: SCO:Unixware:7.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06 -S17:64:1:44:M1460: SCO:OpenServer:5.0:SCO Unixware 7.0.0 or OpenServer 5.0.4-5.06 -S3:64:1:60:M1460,N,W0,N,N,T: SCO:UnixWare:7.1:SCO UnixWare 7.1 - -# ------------------- DOS ------------------- - -2048:255:0:44:M536: DOS:WATTCP:1.05:DOS Arachne via WATTCP/1.05 - -########################################### -# Appliance / embedded / other signatures # -########################################### - -# ---------- Firewalls / routers ------------ - -S12:64:1:44:M1460: @Checkpoint:::Checkpoint (unknown 1) -S12:64:1:48:N,N,S,M1460: @Checkpoint:::Checkpoint (unknown 2) -4096:32:0:44:M1460: ExtremeWare:4.x::ExtremeWare 4.x -60352:64:0:52:M1460,N,W2,N,N,S: Clavister:7::Clavister firewall 7.x - -# ------- Switches and other stuff ---------- - -4128:255:0:44:M*: Cisco:::Cisco Catalyst 3500, 7500 etc -S8:255:0:44:M*: Cisco:12008::Cisco 12008 -60352:128:1:64:M1460,N,W2,N,N,T,N,N,S: Alteon:ACEswitch::Alteon ACEswitch -64512:128:1:44:M1370: Nortel:Contivity Client::Nortel Conectivity Client - - -# ---------- Caches and whatnots ------------ - -S4:64:1:52:M1460,N,N,S,N,W0: AOL:web cache::AOL web cache - -32850:64:1:64:N,W1,N,N,T,N,N,S,M*: NetApp:5.x::NetApp Data OnTap 5.x -16384:64:1:64:M1460,N,N,S,N,W0,N: NetApp:5.3:1:NetApp 5.3.1 -65535:64:0:64:M1460,N,N,S,N,W3,N,N,T: NetApp:5.3:1:NetApp 5.3.1 -65535:64:0:60:M1460,N,W0,N,N,T: NetApp:CacheFlow::NetApp CacheFlow -8192:64:1:64:M1460,N,N,S,N,W0,N,N,T: NetApp:5.2:1:NetApp NetCache 5.2.1 - -S4:64:0:48:M1460,N,N,S: Cisco:Content Engine::Cisco Content Engine - -27085:128:0:40:.: Dell:PowerApp cache::Dell PowerApp (Linux-based) - -65535:255:1:48:N,W1,M1460: Inktomi:crawler::Inktomi crawler -S1:255:1:60:M1460,S,T,N,W0: LookSmart:ZyBorg::LookSmart ZyBorg - - -16384:255:0:40:.: Proxyblocker:::Proxyblocker (what's this?) - -# ----------- Embedded systems -------------- - -S9:255:0:44:M536: PalmOS:Tungsten:C:PalmOS Tungsten C -S5:255:0:44:M536: PalmOS:3::PalmOS 3/4 -S5:255:0:44:M536: PalmOS:4::PalmOS 3/4 -S4:255:0:44:M536: PalmOS:3:5:PalmOS 3.5 -2948:255:0:44:M536: PalmOS:3:5:PalmOS 3.5.3 (Handera) - -S23:64:1:64:N,W1,N,N,T,N,N,S,M1460: SymbianOS:7::SymbianOS 7 -8192:255:0:44:M1460: SymbianOS:6048::SymbianOS 6048 (on Nokia 7650?) -8192:255:0:44:M536: SymbianOS:::SymbianOS (on Nokia 9210?) - - -# Perhaps S4? -5840:64:1:60:M1452,S,T,N,W1: Zaurus:3.10::Zaurus 3.10 - -32768:128:1:64:M1460,N,W0,N,N,T0,N,N,S: PocketPC:2002::PocketPC 2002 - -S1:255:0:44:M346: Contiki:1.1:rc0:Contiki 1.1-rc0 - -4096:128:0:44:M1460: Sega:Dreamcast:3.0:Sega Dreamcast Dreamkey 3.0 - -S12:64:0:44:M1452: AXIS:5600:v5.64:AXIS Printer Server 5600 v5.64 - - - -#################### -# Fancy signatures # -#################### - -1024:64:0:40:.: *NMAP:syn scan:1:NMAP syn scan (1) -2048:64:0:40:.: *NMAP:syn scan:2:NMAP syn scan (2) -3072:64:0:40:.: *NMAP:syn scan:3:NMAP syn scan (3) -4096:64:0:40:.: *NMAP:syn scan:4:NMAP syn scan (4) - -1024:64:0:60:W10,N,M265,T: *NMAP:OS:1:NMAP OS detection probe (1) -2048:64:0:60:W10,N,M265,T: *NMAP:OS:2:NMAP OS detection probe (2) -3072:64:0:60:W10,N,M265,T: *NMAP:OS:3:NMAP OS detection probe (3) -4096:64:0:60:W10,N,M265,T: *NMAP:OS:4:NMAP OS detection probe (4) - -##################################### -# Generic signatures - just in case # -##################################### - -#*:64:1:60:M*,N,W*,N,N,T: @FreeBSD:4.0-4.9::FreeBSD 4.x/5.x -#*:64:1:60:M*,N,W*,N,N,T: @FreeBSD:5.0-5.1::FreeBSD 4.x/5.x - -*:128:1:52:M*,N,W0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323 no tstamp) -*:128:1:52:M*,N,W0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323 no tstamp) -*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP/2000 (RFC1323) -*:128:1:64:M*,N,W0,N,N,T0,N,N,S: @Windows:2000:RFC1323:Windows XP/2000 (RFC1323) -*:128:1:64:M*,N,W*,N,N,T0,N,N,S: @Windows:XP:RFC1323:Windows XP (RFC1323, w+) -*:128:1:48:M*,N,N,S: @Windows:XP::Windows XP/2000 -*:128:1:48:M*,N,N,S: @Windows:2000::Windows XP/2000 diff --git a/tools/tools/tinybsd/conf/wireless/etc/rc.conf b/tools/tools/tinybsd/conf/wireless/etc/rc.conf deleted file mode 100644 index 18c3586b38ac..000000000000 --- a/tools/tools/tinybsd/conf/wireless/etc/rc.conf +++ /dev/null @@ -1,32 +0,0 @@ -# $FreeBSD$ -hostname="tinybsd.freebsd.org" -sendmail_enable="NONE" -sshd_enable="YES" -usbd_enable="NO" -inetd_enable="NO" -portmap_enable="NO" -update_motd="NO" -varmfs="YES" -populate_var="YES" -varsize="8192" -tmpmfs="YES" - -# IPFW -firewall_enable="YES" -firewall_script="/etc/rc.firewall" -firewall_type="closed" - -# NAT -natd_enable="NO" -natd_interface="" -natd_flags="" - -# PF -pf_enable="NO" -pf_rules="/etc/pf.conf" -pf_program="/sbin/pfctl" -pf_flags="" -pflog_enable="NO" -pflog_logfile="/var/log/pflog" -pflog_program="/sbin/pflogd" -pflog_flags="" diff --git a/tools/tools/tinybsd/conf/wireless/etc/rc.firewall b/tools/tools/tinybsd/conf/wireless/etc/rc.firewall deleted file mode 100644 index 05a1a6aaec95..000000000000 --- a/tools/tools/tinybsd/conf/wireless/etc/rc.firewall +++ /dev/null @@ -1,302 +0,0 @@ -#!/bin/sh - -# Copyright (c) 1996 Poul-Henning Kamp -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD$ -# - -# -# Setup system for firewall service. -# - -# Suck in the configuration variables. -if [ -z "${source_rc_confs_defined}" ]; then - if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs - elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf - fi -fi - -############ -# Define the firewall type in /etc/rc.conf. Valid values are: -# open - will allow anyone in -# client - will try to protect just this machine -# simple - will try to protect a whole network -# closed - totally disables IP services except via lo0 interface -# UNKNOWN - disables the loading of firewall rules. -# filename - will load the rules in the given filename (full path required) -# -# For ``client'' and ``simple'' the entries below should be customized -# appropriately. - -############ -# -# If you don't know enough about packet filtering, we suggest that you -# take time to read this book: -# -# Building Internet Firewalls, 2nd Edition -# Brent Chapman and Elizabeth Zwicky -# -# O'Reilly & Associates, Inc -# ISBN 1-56592-871-7 -# http://www.ora.com/ -# http://www.oreilly.com/catalog/fire2/ -# -# For a more advanced treatment of Internet Security read: -# -# Firewalls & Internet Security -# Repelling the wily hacker -# William R. Cheswick, Steven M. Bellowin -# -# Addison-Wesley -# ISBN 0-201-63357-4 -# http://www.awl.com/ -# http://www.awlonline.com/product/0%2C2627%2C0201633574%2C00.html -# - -setup_loopback () { - ############ - # Only in rare cases do you want to change these rules - # - ${fwcmd} add 100 pass all from any to any via lo0 - ${fwcmd} add 200 deny all from any to 127.0.0.0/8 - ${fwcmd} add 300 deny ip from 127.0.0.0/8 to any -} - -if [ -n "${1}" ]; then - firewall_type="${1}" -fi - -############ -# Set quiet mode if requested -# -case ${firewall_quiet} in -[Yy][Ee][Ss]) - fwcmd="/sbin/ipfw -q" - ;; -*) - fwcmd="/sbin/ipfw" - ;; -esac - -############ -# Flush out the list before we begin. -# -${fwcmd} -f flush - -############ -# Network Address Translation. All packets are passed to natd(8) -# before they encounter your remaining rules. The firewall rules -# will then be run again on each packet after translation by natd -# starting at the rule number following the divert rule. -# -# For ``simple'' firewall type the divert rule should be put to a -# different place to not interfere with address-checking rules. -# -case ${firewall_type} in -[Oo][Pp][Ee][Nn]|[Cc][Ll][Ii][Ee][Nn][Tt]) - case ${natd_enable} in - [Yy][Ee][Ss]) - if [ -n "${natd_interface}" ]; then - ${fwcmd} add 50 divert natd all from any to any via ${natd_interface} - fi - ;; - esac -esac - -############ -# If you just configured ipfw in the kernel as a tool to solve network -# problems or you just want to disallow some particular kinds of traffic -# then you will want to change the default policy to open. You can also -# do this as your only action by setting the firewall_type to ``open''. -# -# ${fwcmd} add 65000 pass all from any to any - - -# Prototype setups. -# -case ${firewall_type} in -[Oo][Pp][Ee][Nn]) - setup_loopback - ${fwcmd} add 65000 pass all from any to any - ;; - -[Cc][Ll][Ii][Ee][Nn][Tt]) - ############ - # This is a prototype setup that will protect your system somewhat - # against people from outside your own network. - ############ - - # set these to your network and netmask and ip - net="192.0.2.0" - mask="255.255.255.0" - ip="192.0.2.1" - - setup_loopback - - # Allow any traffic to or from my own net. - ${fwcmd} add pass all from ${ip} to ${net}:${mask} - ${fwcmd} add pass all from ${net}:${mask} to ${ip} - - # Allow TCP through if setup succeeded - ${fwcmd} add pass tcp from any to any established - - # Allow IP fragments to pass through - ${fwcmd} add pass all from any to any frag - - # Allow setup of incoming email - ${fwcmd} add pass tcp from any to ${ip} 25 setup - - # Allow setup of outgoing TCP connections only - ${fwcmd} add pass tcp from ${ip} to any setup - - # Disallow setup of all other TCP connections - ${fwcmd} add deny tcp from any to any setup - - # Allow DNS queries out in the world - ${fwcmd} add pass udp from ${ip} to any 53 keep-state - - # Allow NTP queries out in the world - ${fwcmd} add pass udp from ${ip} to any 123 keep-state - - # Everything else is denied by default, unless the - # IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel - # config file. - ;; - -[Ss][Ii][Mm][Pp][Ll][Ee]) - ############ - # This is a prototype setup for a simple firewall. Configure this - # machine as a DNS and NTP server, and point all the machines - # on the inside at this machine for those services. - ############ - - # set these to your outside interface network and netmask and ip - oif="ed0" - onet="192.0.2.0" - omask="255.255.255.240" - oip="192.0.2.1" - - # set these to your inside interface network and netmask and ip - iif="ed1" - inet="192.0.2.16" - imask="255.255.255.240" - iip="192.0.2.17" - - setup_loopback - - # Stop spoofing - ${fwcmd} add deny all from ${inet}:${imask} to any in via ${oif} - ${fwcmd} add deny all from ${onet}:${omask} to any in via ${iif} - - # Stop RFC1918 nets on the outside interface - ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} - ${fwcmd} add deny all from any to 172.16.0.0/12 via ${oif} - ${fwcmd} add deny all from any to 192.168.0.0/16 via ${oif} - - # Stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, - # DHCP auto-configuration, NET-TEST, MULTICAST (class D), and class E) - # on the outside interface - ${fwcmd} add deny all from any to 0.0.0.0/8 via ${oif} - ${fwcmd} add deny all from any to 169.254.0.0/16 via ${oif} - ${fwcmd} add deny all from any to 192.0.2.0/24 via ${oif} - ${fwcmd} add deny all from any to 224.0.0.0/4 via ${oif} - ${fwcmd} add deny all from any to 240.0.0.0/4 via ${oif} - - # Network Address Translation. This rule is placed here deliberately - # so that it does not interfere with the surrounding address-checking - # rules. If for example one of your internal LAN machines had its IP - # address set to 192.0.2.1 then an incoming packet for it after being - # translated by natd(8) would match the `deny' rule above. Similarly - # an outgoing packet originated from it before being translated would - # match the `deny' rule below. - case ${natd_enable} in - [Yy][Ee][Ss]) - if [ -n "${natd_interface}" ]; then - ${fwcmd} add divert natd all from any to any via ${natd_interface} - fi - ;; - esac - - # Stop RFC1918 nets on the outside interface - ${fwcmd} add deny all from 10.0.0.0/8 to any via ${oif} - ${fwcmd} add deny all from 172.16.0.0/12 to any via ${oif} - ${fwcmd} add deny all from 192.168.0.0/16 to any via ${oif} - - # Stop draft-manning-dsua-03.txt (1 May 2000) nets (includes RESERVED-1, - # DHCP auto-configuration, NET-TEST, MULTICAST (class D), and class E) - # on the outside interface - ${fwcmd} add deny all from 0.0.0.0/8 to any via ${oif} - ${fwcmd} add deny all from 169.254.0.0/16 to any via ${oif} - ${fwcmd} add deny all from 192.0.2.0/24 to any via ${oif} - ${fwcmd} add deny all from 224.0.0.0/4 to any via ${oif} - ${fwcmd} add deny all from 240.0.0.0/4 to any via ${oif} - - # Allow TCP through if setup succeeded - ${fwcmd} add pass tcp from any to any established - - # Allow IP fragments to pass through - ${fwcmd} add pass all from any to any frag - - # Allow setup of incoming email - ${fwcmd} add pass tcp from any to ${oip} 25 setup - - # Allow access to our DNS - ${fwcmd} add pass tcp from any to ${oip} 53 setup - ${fwcmd} add pass udp from any to ${oip} 53 - ${fwcmd} add pass udp from ${oip} 53 to any - - # Allow access to our WWW - ${fwcmd} add pass tcp from any to ${oip} 80 setup - - # Reject&Log all setup of incoming connections from the outside - ${fwcmd} add deny log tcp from any to any in via ${oif} setup - - # Allow setup of any other TCP connection - ${fwcmd} add pass tcp from any to any setup - - # Allow DNS queries out in the world - ${fwcmd} add pass udp from ${oip} to any 53 keep-state - - # Allow NTP queries out in the world - ${fwcmd} add pass udp from ${oip} to any 123 keep-state - - # Everything else is denied by default, unless the - # IPFIREWALL_DEFAULT_TO_ACCEPT option is set in your kernel - # config file. - ;; - -[Cc][Ll][Oo][Ss][Ee][Dd]) - setup_loopback - ;; -[Uu][Nn][Kk][Nn][Oo][Ww][Nn]) - ;; -*) - if [ -r "${firewall_type}" ]; then - ${fwcmd} ${firewall_flags} ${firewall_type} - fi - ;; -esac diff --git a/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles b/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles deleted file mode 100644 index e37dade3acd3..000000000000 --- a/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles +++ /dev/null @@ -1,232 +0,0 @@ -# $FreeBSD$ -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -boot/loader -boot/loader.4th -boot/loader.help -boot/loader.rc -boot/mbr -boot/support.4th - -# contents of ${WORKDIR}/libexec -libexec/ld-elf.so.1:usr/libexec/ld-elf.so.1 - -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -bin/cp -bin/csh:bin/tcsh -bin/date -bin/dd -bin/df -bin/domainname -bin/echo -bin/ed:bin/red -bin/expr -bin/hostname -bin/kenv -bin/kill -bin/ln:bin/link -bin/ls -bin/mkdir -bin/mv -bin/pax -bin/ps -bin/pwd -bin/realpath -bin/rm:bin/unlink -bin/rmdir -bin/sh -bin/sleep -bin/stty -bin/sync - -# contents of ${WORKDIR}/sbin -sbin/adjkerntz -sbin/comcontrol -sbin/disklabel -sbin/dmesg -sbin/fastboot:sbin/reboot -sbin/fasthalt:sbin/halt -sbin/fsck -sbin/fsck_ufs:sbin/fsck_ffs -sbin/fsck_ufs:sbin/fsck_4.2bsd -sbin/ifconfig -sbin/init -sbin/ipfw -sbin/kldconfig -sbin/kldload -sbin/kldstat -sbin/kldunload -sbin/ldconfig -sbin/md5 -sbin/mdconfig -sbin/mknod -sbin/mdmfs -sbin/mount -sbin/mount_nullfs -sbin/mount_unionfs -sbin/natd -sbin/newfs -sbin/nextboot -sbin/nologin -sbin/nos-tun -sbin/pfctl -sbin/pflogd -sbin/ping -sbin/rcorder -sbin/route -sbin/shutdown -sbin/slattach -sbin/swapon -sbin/sysctl -sbin/umount - -# contents of ${WORKDIR}/usr/sbin -usr/bin/at:usr/bin/atq -usr/bin/at:usr/bin/atrm -usr/bin/at:usr/bin/batch -usr/bin/awk -usr/bin/basename -usr/bin/bunzip2:usr/bin/bzcat -usr/bin/bunzip2:usr/bin/bzip2 -usr/bin/chat -usr/bin/chfn:usr/bin/chpass -usr/bin/chfn:usr/bin/chsh -usr/bin/chgrp -usr/bin/cksum -usr/bin/clear -usr/bin/cmp -usr/bin/compress:usr/bin/uncompress -usr/bin/cpio -usr/bin/crontab -usr/bin/cu -usr/bin/dig -usr/bin/dirname -usr/bin/du -usr/bin/ee -usr/bin/egrep:usr/bin/fgrep -usr/bin/egrep:usr/bin/grep -usr/bin/env -usr/bin/false -usr/bin/fetch -usr/bin/find -usr/bin/finger -usr/bin/fstat -usr/bin/fsync -usr/bin/ftp -usr/bin/gunzip:usr/bin/gzcat -usr/bin/gunzip:usr/bin/gzip -usr/bin/gzexe -usr/bin/head -usr/bin/hexdump -usr/bin/id:usr/bin/whoami -usr/bin/ident -usr/bin/killall -usr/bin/last -usr/bin/less:usr/bin/more -usr/bin/limits -usr/bin/lock -usr/bin/lockf -usr/bin/logger -usr/bin/login -usr/bin/logname -usr/bin/mesg -usr/bin/minigzip -usr/bin/mkfifo -usr/bin/mktemp -usr/bin/msgs -usr/bin/netstat -usr/bin/nfsstat -usr/bin/nice -usr/bin/nslookup -usr/bin/nsupdate -usr/bin/nohup -usr/bin/objformat -usr/bin/openssl -usr/bin/passwd -usr/bin/printf -usr/bin/renice -usr/bin/reset:usr/sbin/tset -usr/bin/scp -usr/bin/script -usr/bin/sed -usr/bin/sftp -usr/bin/shar -usr/bin/slogin:usr/bin/ssh -usr/bin/sort -usr/bin/split -usr/bin/ssh-keygen -usr/bin/su -usr/bin/tail -usr/bin/tar -usr/bin/tee -usr/bin/telnet -usr/bin/time -usr/bin/top -usr/bin/touch -usr/bin/tput -usr/bin/tr -usr/bin/true -usr/bin/tty -usr/bin/uname -usr/bin/uptime:usr/bin/w -usr/bin/users -usr/bin/uudecode -usr/bin/uuencode -usr/bin/vi -usr/bin/vmstat -usr/bin/wall -usr/bin/who -usr/bin/whois -usr/bin/write -usr/bin/yes - -# contents of ${WORKDIR}/usr/sbin -usr/sbin/arp -usr/sbin/authpf -usr/sbin/boot0cfg -usr/sbin/chown -usr/sbin/cron -usr/sbin/idprio:usr/sbin/rtprio -usr/sbin/inetd -usr/sbin/iostat -usr/sbin/kbdcontrol -usr/sbin/lastlogin -usr/sbin/memcontrol -usr/sbin/mtree -usr/sbin/newsyslog -usr/sbin/ntpdate -usr/sbin/pciconf -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/slstat -usr/sbin/sshd -usr/sbin/syslogd -usr/sbin/tcpdchk -usr/sbin/tcpdmatch -usr/sbin/tcpdump -usr/sbin/traceroute -usr/sbin/vidcontrol -usr/sbin/vipw -usr/sbin/vnconfig -usr/sbin/watch -usr/sbin/pccardc -usr/sbin/pccardd - -# contents of ${WORKDIR}/usr/libexec -usr/libexec/atrun -usr/libexec/ftpd -usr/libexec/getty -usr/libexec/sftp-server - -# contents of ${WORKDIR}/usr/share -usr/share/misc/termcap - diff --git a/tools/tools/tinybsd/conf/wireless/tinybsd.ports b/tools/tools/tinybsd/conf/wireless/tinybsd.ports deleted file mode 100644 index 49bb52175241..000000000000 --- a/tools/tools/tinybsd/conf/wireless/tinybsd.ports +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# Here you can add the applications from the FreeBSD Ports Collection which you -# want TinyBSD ports system to install in your embedded system. You whould list -# one application per line, mentioning its category and name, like the examples: -# -# www/mini_httpd -# net-mgmt/rate -# -# Make sure you have enough space to add it. diff --git a/tools/tools/tinybsd/conf/wrap/TINYBSD b/tools/tools/tinybsd/conf/wrap/TINYBSD deleted file mode 100644 index 2ef7c6742cbd..000000000000 --- a/tools/tools/tinybsd/conf/wrap/TINYBSD +++ /dev/null @@ -1,138 +0,0 @@ -# $FreeBSD$ -machine i386 -cpu I586_CPU -ident TINYBSD -maxusers 8 -options CPU_GEODE - -# To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" # Default places to look for devices. -options SCHED_4BSD # 4BSD scheduler -options INET # InterNETworking -options FFS # Berkeley Fast Filesystem -options SOFTUPDATES # Enable FFS soft updates support -options UFS_ACL # Support for access control lists -options UFS_DIRHASH # Improve performance on big directories -options MD_ROOT # MD is a potential root device -options NFSCLIENT # Network Filesystem Client -options NFSSERVER # Network Filesystem Server -options NFS_ROOT # NFS usable as /, requires NFSCLIENT -options PROCFS # Process filesystem (requires PSEUDOFS) -options PSEUDOFS # Pseudo-filesystem framework -options GEOM_PART_GPT # GUID Partition Tables. -options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 # Compatible with FreeBSD4 -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev -options AHC_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~128k to driver. -options AHD_REG_PRETTY_PRINT # Print register bitfields in debug - # output. Adds ~215k to driver. -options ADAPTIVE_GIANT # Giant mutex is adaptive. - -#device apic # I/O APIC - -device pci - -# ATA and ATAPI devices -device ata -device atadisk # ATA disk drives -options ATA_STATIC_ID # Static device numbering - -# Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports - -# PCI Ethernet NICs. -device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card -device txp # 3Com 3cR990 (``Typhoon'') -device vx # 3Com 3c590, 3c595 (``Vortex'') - -# PCI Ethernet NICs that use the common MII bus controller code. -# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! -device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 Ethernet -device bge # Broadcom BCM570xx Gigabit Ethernet -device dc # DEC/Intel 21143 and various workalikes -device fxp # Intel EtherExpress PRO/100B (82557, 82558) -device lge # Level 1 LXT1001 gigabit ethernet -device nge # NatSemi DP83820 gigabit ethernet -device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') -device re # RealTek 8139C+/8169/8169S/8110S -device rl # RealTek 8129/8139 -device sf # Adaptec AIC-6915 (``Starfire'') -device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet -device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit Ethernet -device tl # Texas Instruments ThunderLAN -device tx # SMC EtherPower II (83c170 ``EPIC'') -device vge # VIA VT612x gigabit ethernet -device vr # VIA Rhine, Rhine II -device wb # Winbond W89C840F -device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') - -# ISA Ethernet NICs. pccard NICs included. -device cs # Crystal Semiconductor CS89x0 NIC -# 'device ed' requires 'device miibus' -device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards -device ex # Intel EtherExpress Pro/10 and Pro/10+ -device ep # Etherlink III based cards -device fe # Fujitsu MB8696x based cards -device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. -device sn # SMC's 9000 series of Ethernet chips -device xe # Xircom pccard Ethernet - -# Wireless NIC cards -device wlan # 802.11 support -device wlan_wep #802.11 WEP support -device wlan_ccmp #802.11 CCMP support -device wlan_tkip #802.11 TKIP support -device wlan_xauth #802.11 external authenticator support -device wlan_acl #802.11 MAC ACL support -device an # Aironet 4500/4800 802.11 wireless NICs. -device awi # BayStack 660 and others -device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. -device ath -device ath_hal -device ath_rate_sample - -# Pseudo devices. -device loop # Network loopback -device ether # Ethernet support -device ppp # Kernel PPP -device tun # Packet tunnel. -device pty # Pseudo-ttys (telnet etc) -device md # Memory "disks" -device gif # IPv6 and IPv4 tunneling - -# The `bpf' device enables the Berkeley Packet Filter. -# Be aware of the administrative consequences of enabling this! -# Note that 'bpf' is required for DHCP. -device bpf # Berkeley packet filter - -options INCLUDE_CONFIG_FILE - -options IPFIREWALL -options IPFIREWALL_DEFAULT_TO_ACCEPT -options IPDIVERT -options DUMMYNET - -options ALTQ -options ALTQ_CBQ -options ALTQ_RED -options ALTQ_RIO -options ALTQ_HFSC -options ALTQ_CDNR -options ALTQ_PRIQ - -device pf -device pflog -device pfsync -device carp -device if_bridge - -options DEVICE_POLLING diff --git a/tools/tools/tinybsd/conf/wrap/etc/fstab b/tools/tools/tinybsd/conf/wrap/etc/fstab deleted file mode 100644 index 16ada11d7790..000000000000 --- a/tools/tools/tinybsd/conf/wrap/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# $FreeBSD$ -/dev/ad0a / ufs ro 1 1 diff --git a/tools/tools/tinybsd/conf/wrap/etc/rc.conf b/tools/tools/tinybsd/conf/wrap/etc/rc.conf deleted file mode 100644 index a21476241081..000000000000 --- a/tools/tools/tinybsd/conf/wrap/etc/rc.conf +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ -hostname="tinybsd.freebsd.org" -sendmail_enable="NONE" -sshd_enable="YES" -usbd_enable="NO" -inetd_enable="NO" -portmap_enable="NO" -update_motd="NO" -varmfs="YES" -populate_var="YES" -varsize="8192" -tmpmfs="YES" diff --git a/tools/tools/tinybsd/conf/wrap/etc/ttys b/tools/tools/tinybsd/conf/wrap/etc/ttys deleted file mode 100644 index 919bceaa3403..000000000000 --- a/tools/tools/tinybsd/conf/wrap/etc/ttys +++ /dev/null @@ -1,308 +0,0 @@ -# -# $FreeBSD$ -# -# This file specifies various information about terminals on the system. -# It is used by several different programs. Common entries for the -# various columns include: -# -# name The name of the terminal device. -# -# getty The program to start running on the terminal. Typically a -# getty program, as the name implies. Other common entries -# include none, when no getty is needed, and xdm, to start the -# X Window System. -# -# type The initial terminal type for this port. For hardwired -# terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically xterm, but -# vt220 will work better if you need interoperability with other -# systems like Solaris or GNU/Linux. -# Other common values include network for network connections on -# pseudo-terminals, dialup for incoming modem ports, and unknown -# when the terminal type cannot be predetermined. -# -# status Must be on or off. If on, init will run the getty program on -# the specified port. If the word "secure" appears, this tty -# allows root login. -# -# name getty type status comments -# -# If console is marked "insecure", then init will ask for the root password -# when going to single-user mode. -console none unknown off secure -# -ttyv0 "/usr/libexec/getty Pc" xterm off secure -# Virtual terminals -ttyv1 "/usr/libexec/getty Pc" xterm off secure -ttyv2 "/usr/libexec/getty Pc" xterm off secure -ttyv3 "/usr/libexec/getty Pc" xterm off secure -ttyv4 "/usr/libexec/getty Pc" xterm off secure -ttyv5 "/usr/libexec/getty Pc" xterm off secure -ttyv6 "/usr/libexec/getty Pc" xterm off secure -ttyv7 "/usr/libexec/getty Pc" xterm off secure -ttyv8 "/usr/local/bin/xdm -nodaemoff" xterm off secure -# Serial terminals -# The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyu0 "/usr/libexec/getty std.9600" dialup on secure -ttyu1 "/usr/libexec/getty std.9600" dialup off secure -ttyu2 "/usr/libexec/getty std.9600" dialup off secure -ttyu3 "/usr/libexec/getty std.9600" dialup off secure -# Dumb console -dcons "/usr/libexec/getty std.9600" vt100 off secure -# Pseudo terminals -ttyp0 none network -ttyp1 none network -ttyp2 none network -ttyp3 none network -ttyp4 none network -ttyp5 none network -ttyp6 none network -ttyp7 none network -ttyp8 none network -ttyp9 none network -ttypa none network -ttypb none network -ttypc none network -ttypd none network -ttype none network -ttypf none network -ttypg none network -ttyph none network -ttypi none network -ttypj none network -ttypk none network -ttypl none network -ttypm none network -ttypn none network -ttypo none network -ttypp none network -ttypq none network -ttypr none network -ttyps none network -ttypt none network -ttypu none network -ttypv none network -ttyq0 none network -ttyq1 none network -ttyq2 none network -ttyq3 none network -ttyq4 none network -ttyq5 none network -ttyq6 none network -ttyq7 none network -ttyq8 none network -ttyq9 none network -ttyqa none network -ttyqb none network -ttyqc none network -ttyqd none network -ttyqe none network -ttyqf none network -ttyqg none network -ttyqh none network -ttyqi none network -ttyqj none network -ttyqk none network -ttyql none network -ttyqm none network -ttyqn none network -ttyqo none network -ttyqp none network -ttyqq none network -ttyqr none network -ttyqs none network -ttyqt none network -ttyqu none network -ttyqv none network -ttyr0 none network -ttyr1 none network -ttyr2 none network -ttyr3 none network -ttyr4 none network -ttyr5 none network -ttyr6 none network -ttyr7 none network -ttyr8 none network -ttyr9 none network -ttyra none network -ttyrb none network -ttyrc none network -ttyrd none network -ttyre none network -ttyrf none network -ttyrg none network -ttyrh none network -ttyri none network -ttyrj none network -ttyrk none network -ttyrl none network -ttyrm none network -ttyrn none network -ttyro none network -ttyrp none network -ttyrq none network -ttyrr none network -ttyrs none network -ttyrt none network -ttyru none network -ttyrv none network -ttys0 none network -ttys1 none network -ttys2 none network -ttys3 none network -ttys4 none network -ttys5 none network -ttys6 none network -ttys7 none network -ttys8 none network -ttys9 none network -ttysa none network -ttysb none network -ttysc none network -ttysd none network -ttyse none network -ttysf none network -ttysg none network -ttysh none network -ttysi none network -ttysj none network -ttysk none network -ttysl none network -ttysm none network -ttysn none network -ttyso none network -ttysp none network -ttysq none network -ttysr none network -ttyss none network -ttyst none network -ttysu none network -ttysv none network -ttyP0 none network -ttyP1 none network -ttyP2 none network -ttyP3 none network -ttyP4 none network -ttyP5 none network -ttyP6 none network -ttyP7 none network -ttyP8 none network -ttyP9 none network -ttyPa none network -ttyPb none network -ttyPc none network -ttyPd none network -ttyPe none network -ttyPf none network -ttyPg none network -ttyPh none network -ttyPi none network -ttyPj none network -ttyPk none network -ttyPl none network -ttyPm none network -ttyPn none network -ttyPo none network -ttyPp none network -ttyPq none network -ttyPr none network -ttyPs none network -ttyPt none network -ttyPu none network -ttyPv none network -ttyQ0 none network -ttyQ1 none network -ttyQ2 none network -ttyQ3 none network -ttyQ4 none network -ttyQ5 none network -ttyQ6 none network -ttyQ7 none network -ttyQ8 none network -ttyQ9 none network -ttyQa none network -ttyQb none network -ttyQc none network -ttyQd none network -ttyQe none network -ttyQf none network -ttyQg none network -ttyQh none network -ttyQi none network -ttyQj none network -ttyQk none network -ttyQl none network -ttyQm none network -ttyQn none network -ttyQo none network -ttyQp none network -ttyQq none network -ttyQr none network -ttyQs none network -ttyQt none network -ttyQu none network -ttyQv none network -ttyR0 none network -ttyR1 none network -ttyR2 none network -ttyR3 none network -ttyR4 none network -ttyR5 none network -ttyR6 none network -ttyR7 none network -ttyR8 none network -ttyR9 none network -ttyRa none network -ttyRb none network -ttyRc none network -ttyRd none network -ttyRe none network -ttyRf none network -ttyRg none network -ttyRh none network -ttyRi none network -ttyRj none network -ttyRk none network -ttyRl none network -ttyRm none network -ttyRn none network -ttyRo none network -ttyRp none network -ttyRq none network -ttyRr none network -ttyRs none network -ttyRt none network -ttyRu none network -ttyRv none network -ttyS0 none network -ttyS1 none network -ttyS2 none network -ttyS3 none network -ttyS4 none network -ttyS5 none network -ttyS6 none network -ttyS7 none network -ttyS8 none network -ttyS9 none network -ttySa none network -ttySb none network -ttySc none network -ttySd none network -ttySe none network -ttySf none network -ttySg none network -ttySh none network -ttySi none network -ttySj none network -ttySk none network -ttySl none network -ttySm none network -ttySn none network -ttySo none network -ttySp none network -ttySq none network -ttySr none network -ttySs none network -ttySt none network -ttySu none network -ttySv none network diff --git a/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles b/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles deleted file mode 100644 index e37dade3acd3..000000000000 --- a/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles +++ /dev/null @@ -1,232 +0,0 @@ -# $FreeBSD$ -# contents of ${WORKDIR}/boot -boot/boot0 -boot/boot1 -boot/boot2 -boot/defaults/loader.conf -boot/device.hints -boot/loader -boot/loader.4th -boot/loader.help -boot/loader.rc -boot/mbr -boot/support.4th - -# contents of ${WORKDIR}/libexec -libexec/ld-elf.so.1:usr/libexec/ld-elf.so.1 - -# contents of ${WORKDIR}/bin -bin/[:bin/test -bin/cat -bin/chflags -bin/chio -bin/chmod -bin/cp -bin/csh:bin/tcsh -bin/date -bin/dd -bin/df -bin/domainname -bin/echo -bin/ed:bin/red -bin/expr -bin/hostname -bin/kenv -bin/kill -bin/ln:bin/link -bin/ls -bin/mkdir -bin/mv -bin/pax -bin/ps -bin/pwd -bin/realpath -bin/rm:bin/unlink -bin/rmdir -bin/sh -bin/sleep -bin/stty -bin/sync - -# contents of ${WORKDIR}/sbin -sbin/adjkerntz -sbin/comcontrol -sbin/disklabel -sbin/dmesg -sbin/fastboot:sbin/reboot -sbin/fasthalt:sbin/halt -sbin/fsck -sbin/fsck_ufs:sbin/fsck_ffs -sbin/fsck_ufs:sbin/fsck_4.2bsd -sbin/ifconfig -sbin/init -sbin/ipfw -sbin/kldconfig -sbin/kldload -sbin/kldstat -sbin/kldunload -sbin/ldconfig -sbin/md5 -sbin/mdconfig -sbin/mknod -sbin/mdmfs -sbin/mount -sbin/mount_nullfs -sbin/mount_unionfs -sbin/natd -sbin/newfs -sbin/nextboot -sbin/nologin -sbin/nos-tun -sbin/pfctl -sbin/pflogd -sbin/ping -sbin/rcorder -sbin/route -sbin/shutdown -sbin/slattach -sbin/swapon -sbin/sysctl -sbin/umount - -# contents of ${WORKDIR}/usr/sbin -usr/bin/at:usr/bin/atq -usr/bin/at:usr/bin/atrm -usr/bin/at:usr/bin/batch -usr/bin/awk -usr/bin/basename -usr/bin/bunzip2:usr/bin/bzcat -usr/bin/bunzip2:usr/bin/bzip2 -usr/bin/chat -usr/bin/chfn:usr/bin/chpass -usr/bin/chfn:usr/bin/chsh -usr/bin/chgrp -usr/bin/cksum -usr/bin/clear -usr/bin/cmp -usr/bin/compress:usr/bin/uncompress -usr/bin/cpio -usr/bin/crontab -usr/bin/cu -usr/bin/dig -usr/bin/dirname -usr/bin/du -usr/bin/ee -usr/bin/egrep:usr/bin/fgrep -usr/bin/egrep:usr/bin/grep -usr/bin/env -usr/bin/false -usr/bin/fetch -usr/bin/find -usr/bin/finger -usr/bin/fstat -usr/bin/fsync -usr/bin/ftp -usr/bin/gunzip:usr/bin/gzcat -usr/bin/gunzip:usr/bin/gzip -usr/bin/gzexe -usr/bin/head -usr/bin/hexdump -usr/bin/id:usr/bin/whoami -usr/bin/ident -usr/bin/killall -usr/bin/last -usr/bin/less:usr/bin/more -usr/bin/limits -usr/bin/lock -usr/bin/lockf -usr/bin/logger -usr/bin/login -usr/bin/logname -usr/bin/mesg -usr/bin/minigzip -usr/bin/mkfifo -usr/bin/mktemp -usr/bin/msgs -usr/bin/netstat -usr/bin/nfsstat -usr/bin/nice -usr/bin/nslookup -usr/bin/nsupdate -usr/bin/nohup -usr/bin/objformat -usr/bin/openssl -usr/bin/passwd -usr/bin/printf -usr/bin/renice -usr/bin/reset:usr/sbin/tset -usr/bin/scp -usr/bin/script -usr/bin/sed -usr/bin/sftp -usr/bin/shar -usr/bin/slogin:usr/bin/ssh -usr/bin/sort -usr/bin/split -usr/bin/ssh-keygen -usr/bin/su -usr/bin/tail -usr/bin/tar -usr/bin/tee -usr/bin/telnet -usr/bin/time -usr/bin/top -usr/bin/touch -usr/bin/tput -usr/bin/tr -usr/bin/true -usr/bin/tty -usr/bin/uname -usr/bin/uptime:usr/bin/w -usr/bin/users -usr/bin/uudecode -usr/bin/uuencode -usr/bin/vi -usr/bin/vmstat -usr/bin/wall -usr/bin/who -usr/bin/whois -usr/bin/write -usr/bin/yes - -# contents of ${WORKDIR}/usr/sbin -usr/sbin/arp -usr/sbin/authpf -usr/sbin/boot0cfg -usr/sbin/chown -usr/sbin/cron -usr/sbin/idprio:usr/sbin/rtprio -usr/sbin/inetd -usr/sbin/iostat -usr/sbin/kbdcontrol -usr/sbin/lastlogin -usr/sbin/memcontrol -usr/sbin/mtree -usr/sbin/newsyslog -usr/sbin/ntpdate -usr/sbin/pciconf -usr/sbin/pw -usr/sbin/pwd_mkdb -usr/sbin/slstat -usr/sbin/sshd -usr/sbin/syslogd -usr/sbin/tcpdchk -usr/sbin/tcpdmatch -usr/sbin/tcpdump -usr/sbin/traceroute -usr/sbin/vidcontrol -usr/sbin/vipw -usr/sbin/vnconfig -usr/sbin/watch -usr/sbin/pccardc -usr/sbin/pccardd - -# contents of ${WORKDIR}/usr/libexec -usr/libexec/atrun -usr/libexec/ftpd -usr/libexec/getty -usr/libexec/sftp-server - -# contents of ${WORKDIR}/usr/share -usr/share/misc/termcap - diff --git a/tools/tools/tinybsd/conf/wrap/tinybsd.ports b/tools/tools/tinybsd/conf/wrap/tinybsd.ports deleted file mode 100644 index 49bb52175241..000000000000 --- a/tools/tools/tinybsd/conf/wrap/tinybsd.ports +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# Here you can add the applications from the FreeBSD Ports Collection which you -# want TinyBSD ports system to install in your embedded system. You whould list -# one application per line, mentioning its category and name, like the examples: -# -# www/mini_httpd -# net-mgmt/rate -# -# Make sure you have enough space to add it. diff --git a/tools/tools/tinybsd/tinybsd b/tools/tools/tinybsd/tinybsd deleted file mode 100755 index 1675b09f2a52..000000000000 --- a/tools/tools/tinybsd/tinybsd +++ /dev/null @@ -1,526 +0,0 @@ -#!/bin/sh - -# Copyright (c) 2006 Jean Milanez Melo <jmelo@freebsdbrasil.com.br> -# <jmelo@FreeBSD.org> -# Patrick Tracanelli <eksffa@freebsdbrasil.com.br> -# -# $FreeBSD$ -#set -xv -CURRENTDIR=/usr/src/tools/tools/tinybsd -if [ ! -d $CURRENTDIR ] -then - CURRENTDIR=`pwd` -else - cd $CURRENTDIR -fi - -WORKDIR=/usr/obj/tinybsdbuild -KERNCONF=TINYBSD -BASEFILE="tinybsd.basefiles" -PORTSFILE="tinybsd.ports" -PORTSDIR=/usr/ports -DEFINSTARGS="-o 0 -g 0 -m 555" -TINYARCH=$(uname -p) - -TS="=====>" - -splitarg1 () { - local IFS - IFS='=' - set $1 - echo $1 -} - -splitarg2 () { - local IFS - IFS='=' - set $1 - echo $2 -} - -getargs () { - ARGS="$*" - for arg in $* - do - ARG=`splitarg1 $arg` - VAL=`splitarg2 $arg` - case $ARG in - sectors) - SECTUNIT=$VAL - ;; - heads) - TRACKCYL=$VAL - ;; - spt) - SECTRACK=$VAL - ;; - conf) - CONF=$VAL - ;; - mfsroot) - MFSROOT=$VAL - ;; - image) - IMG=$VAL - ;; - batch) - NO_PROMPTS="YES" - ;; - new) - NO_READ="YES" - ;; - *) - usage - ;; - esac - done -} - -usage () { - echo "Woops - Usage: $0 sectors=<size of media> [80000] - heads=<heads according to firmware> [4] - spt=<sectors per track according to firmware> [32] - conf=<configuration name> (see conf/name) [default] - mfsroot[=<yes|no>] [no] - image=<tinybsd image name> [tinybsd.bin] - batch[=<anything>] (do not ask interactively) - new[=<anything>] (do not read previous values) - - Examples: - $0 sectors=65536 heads=8 spt=16 conf=wireless mfsroot=yes image=myimage.img batch - - Default values are set in the program. - Environment values override defaults. - Previous values override environment values but can be disabled. - Command arguments override previous values. - Interactive values override command arguments but can be disabled. - - Run diskinfo(8) -v against your CF device to get correct information - about your disk. USB keys do not need any specific geometry" - exit 1 -} - -######## -# Load variables from stdin (could be a file) -# Look for lines that match foo=bar -# do not run the file.. that is asking for trouble -######## -loadvars () { - while : - do - OIFS=$IFS - IFS="=" - if read PART1 PART2 - then - IFS="$OIFS" - case "$PART1" in - \#*) - ;; - "") - ;; - *) - set "${PART1}" - if [ $# = "1" ] - then - eval "${PART1}='${PART2}'" - fi - ;; - esac - else - IFS="$OIFS" - return 0 - fi - done -} - -######## -# get values from the user -######## -confirm_action(){ - local ANSWER - local MESSAGE - ANSWER=$1 - MESSAGE=$2 - if [ "$NO_PROMPTS" != "YES" ] - then - echo -n "$MESSAGE [$ANSWER] " > /dev/tty - read result - [ "$result" != "" ] && ANSWER=$result - fi - - ANSWER=`eval "echo $ANSWER"` - echo $ANSWER -} - -######## -# These are only used the VERY first time you run the program (on this machine) -######## -setdefaults () { - NO_PROMPTS=${NO_PROMPTS:-NO} - NO_READ=${NO_READ:-NO} - SECTUNIT=${SECTUNIT:-80000}; export SECTUNIT - TRACKCYL=${TRACKCYL:-4}; export TRACKCYL - SECTRACK=${SECTRACK:-32}; export SECTRACK - CONF=${CONF:-default}; export CONF - MFSROOT=${MFSROOT:-NO}; export MFSROOT - IMG=${IMG:-tinybsd.bin}; export IMG - -} - -####### -# get ourselves set up. -# Partly by reading config files and partly from asking questions. -####### -loadconfig () { - if [ "${NO_READ}" = "YES" ] - then - return - fi - - HOSTNAME=`hostname` - HOSTPART=${HOSTNAME%%.*} - FILENAME=".tinybsd.${HOSTPART}.${USER}" - FULLFILENAME=$HOME/$FILENAME - - if [ -f ${FULLFILENAME} ] - then - loadvars <${FULLFILENAME} - fi - - SECTUNIT=`confirm_action "$SECTUNIT" "512 byte sectors per unit?"` - TRACKCYL=`confirm_action "$TRACKCYL" "Tracks per cylinder?"` - SECTRACK=`confirm_action "$SECTRACK" "Sectors per track?"` - while : - do - echo "The following configurations exist:" - ls -l conf|awk '/^d/{print " ",$9}'|grep -v CVS - CONF=`confirm_action "$CONF" "Configuration name?"` - if [ ! -d "${CURRENTDIR}/conf/$CONF" ] - then - echo "${TS} Error: Could not find config (${CONF})" - if [ "$NO_PROMPTS" = "YES" ] - then - exit 1 - fi - else - break - fi - done - MFSROOT=`confirm_action "$MFSROOT" "Use an MFSROOT? (yes/no)"` - IMG=`confirm_action "$IMG" "Image file to generate?"` - -# example of formatted value (NNN in this case) -# #condition and format the number -# if [ -z "${BUILDNUM}" ] -# then -# echo "Starting with build 001" -# BUILDNUM="001" -# else -# BUILDNUM=`printf "%03d\n" $(($BUILDNUM))` -# fi - - -} - -saveconfig () { - HOSTNAME=`hostname` - HOSTPART=${HOSTNAME%%.*} - FILENAME=".tinybsd.${HOSTPART}.${USER}" - FULLFILENAME=$HOME/$FILENAME - ( - echo "# written by tinybsd" `date` - echo "SECTUNIT=${SECTUNIT}" - echo "TRACKCYL=${TRACKCYL}" - echo "SECTRACK=${SECTRACK}" - echo "CONF=${CONF}" - echo "MFSROOT=${MFSROOT:-NO}" - echo "IMG=${IMG}" - ) >${FULLFILENAME} -} - -check_alt_imgname() { - if [ ${IMG} = 'tinybsd.bin' ] - then - echo "${TS} Alternative image name not set; defaulting to 'tinybsd.bin'" - fi -} - -rotate_buidlog() { - mv -f ${HOME}/tinybsd.log ${HOME}/tinybsd.log.old -} - -remove_workdir() { - # Before removing check if there is not a mount under $WORKDIR anymore - MOUNT_CHECK=`mount|egrep "on ${WORKDIR}"` - - if [ ! -z "${MOUNT_CHECK}" ]; then - echo "There are mounts under the workdir (${WORKDIR}). Please umount them before running this script" - exit 1 - else - chflags -R noschg ${WORKDIR} - echo "${TS} Removing "${WORKDIR} - rm -rf ${WORKDIR} - echo "${TS} Removing Build Kernel Directory" - rm -rf /usr/obj/usr/src/sys/${KERNCONF} - echo "${TS} done." - fi -} - - -prework() { - remove_workdir - mkdir -p ${WORKDIR} -} - - -create_tree() { - echo "${TS} Creating directory hierarchy... " - mtree -deU -f /etc/mtree/BSD.root.dist -p ${WORKDIR} - mtree -deU -f /etc/mtree/BIND.chroot.dist -p ${WORKDIR} - mtree -deU -f /etc/mtree/BSD.usr.dist -p ${WORKDIR}/usr - mtree -deU -f /etc/mtree/BSD.local.dist -p ${WORKDIR}/usr/local - mtree -deU -f /etc/mtree/BSD.var.dist -p ${WORKDIR}/var -} - -copy_binaries() { - cd ${CURRENTDIR}/conf/${CONF} - - for file in `cat ${CURRENTDIR}/conf/${CONF}/${BASEFILE} | grep -v "#" | \ - cut -f1 -d":" | sort | uniq` ; do - echo "${TS} Copying "/${file}" to "${WORKDIR}/${file} - cp -fp /${file} ${WORKDIR}/${file} ; - done -} - -install_ports() { - for portname in `cat ${CURRENTDIR}/conf/${CONF}/${PORTSFILE} | grep -v '#'` ; do - if [ ! -d "${WORKDIR}/usr/ports" ]; then - mkdir -p "${WORKDIR}/usr/ports" - fi - - PNAME=`/usr/bin/basename "${portname}"` - PORT_OPTION_FILE="/var/db/ports/${PNAME}/options" - - if [ -f "${PORT_OPTION_FILE}" ]; then - mkdir -p "${WORKDIR}/var/db/ports/${PNAME}" - cp "${PORT_OPTION_FILE}" "${WORKDIR}/var/db/ports/${PNAME}/" - fi - - mount_nullfs /lib "${WORKDIR}/lib" - mount_nullfs /usr/bin "${WORKDIR}/usr/bin" - mount_nullfs /usr/sbin "${WORKDIR}/usr/sbin" - mount_nullfs /usr/ports "${WORKDIR}/usr/ports" - mount_nullfs /usr/share "${WORKDIR}/usr/share" - mount_nullfs /usr/libexec "${WORKDIR}/usr/libexec" - mount_nullfs /usr/lib "${WORKDIR}/usr/lib" - mount_nullfs /usr/include "${WORKDIR}/usr/include" - - cd ${PORTSDIR}/${portname} - make fetch-recursive - make DESTDIR_ENV_LIST=PATH DESTDIR="${WORKDIR}" install - make clean - - umount "${WORKDIR}/lib" - umount "${WORKDIR}/usr/ports" - umount "${WORKDIR}/usr/bin" - umount "${WORKDIR}/usr/sbin" - umount "${WORKDIR}/usr/share" - umount "${WORKDIR}/usr/libexec" - umount "${WORKDIR}/usr/lib" - umount "${WORKDIR}/usr/include" - done -} - -make_kernel() { - echo "${TS} Building customized tiny beastie kernel... " - cp -p ${CURRENTDIR}/conf/${CONF}/${KERNCONF} /usr/src/sys/${TINYARCH}/conf - cd /usr/src - make buildkernel KERNCONF=${KERNCONF} || exit 1 - gzip -9 /usr/obj/usr/src/sys/${KERNCONF}/kernel - install ${DEFINSTARGS} /usr/obj/usr/src/sys/${KERNCONF}/kernel.gz ${WORKDIR}/boot/kernel/ - install ${DEFINSTARGS} \ - /usr/obj/usr/src/sys/${KERNCONF}/modules/usr/src/sys/modules/acpi/acpi/acpi.ko \ - ${WORKDIR}/boot/kernel - install -o 0 -g 0 -m 444 /sys/${TINYARCH}/conf/GENERIC.hints ${WORKDIR}/boot/device.hints -} - -copy_libraries() { - TDEPFILE="`mktemp -t deps`" - TDEPFILES="`mktemp -t depsymlnk`" - - find "${WORKDIR}" -type f |while read file; do - ldd -f "%p\n" ${file} >> ${TDEPFILE} ; # don't worry on progs been "not dynamic" - done - - for libdeplib in `cat ${TDEPFILE} | sort | uniq`; do - ldd -f "%p\n" /${libdeplib} >> ${TDEPFILE} ; - done - - for pamdep in `ls -1 /usr/lib/pam*`; do - echo $pamdep >> ${TDEPFILE} ; - ldd -f "%p\n" /${pamdep} >> ${TDEPFILE} ; - done - - for lib in `cat ${TDEPFILE} | sort | uniq`; do - echo "${TS} Copying "${lib}" to "${WORKDIR}${lib} - cp -fp ${lib} ${WORKDIR}${lib} ; - done - - for depsymlink in `cat ${TDEPFILE}`; do - echo "${TS} Checking if ${depsymlink} is a symbolic link" - /bin/ls -l $depsymlink | grep "\->" | awk '{print $11":"$9}' >> ${TDEPFILES} - done - - for i in `cat ${TDEPFILES}`; do - SOURCE_FILE=`echo $i | awk -F ":" '{print $1}'` - TARGET_FILE=`echo $i | awk -F ":" '{print $2}'` - - echo "${TS} Unlinking ${WORKDIR}${TARGET_FILE}" - chroot ${WORKDIR} /bin/chflags 0 ${TARGET_FILE} - chroot ${WORKDIR} /bin/rm -f ${TARGET_FILE} - - echo "${TS} Symlinking ${SOURCE_FILE} to ${TARGET_FILE}" - chroot ${WORKDIR} /bin/ln -s ${SOURCE_FILE} ${TARGET_FILE} - done - - echo -n "${TS} Unlinking " - rm -fv ${TDEPFILE} ${TDEPFILES} -} - -create_etc() { - cd /usr/src/etc/sendmail/ - make freebsd.cf freebsd.submit.cf - - cd /usr/src/etc/ - mkdir -p ${WORKDIR}/var/named/etc/namedb - make distribution DESTDIR=${WORKDIR} || exit 1 -} - -create_ssh_keys() { - echo "Creating ssh keys..." - ssh-keygen -t rsa1 -b 1024 -f ${WORKDIR}/etc/ssh/ssh_host_key -N '' - ssh-keygen -t dsa -f ${WORKDIR}/etc/ssh/ssh_host_dsa_key -N '' - ssh-keygen -t rsa -f ${WORKDIR}/etc/ssh/ssh_host_rsa_key -N '' -} - -personal_conf() { - echo "${TS} Copying your custom configuration on conf/ ..." - for custom in `find ${CURRENTDIR}/conf/${CONF}/ -type d -depth 1 \! -name CVS`; do - cp -Rp ${custom}/* ${WORKDIR}/${custom#${CURRENTDIR}/conf/${CONF}/}/ - done - - if [ -f ${CURRENTDIR}/conf/${CONF}/boot.config ]; then - cp ${CURRENTDIR}/conf/${CONF}/boot.config ${WORKDIR}/boot.config - fi -} - -symlinks() { -#set -xv - for i in `cat ${CURRENTDIR}/conf/${CONF}/${BASEFILE}| grep -v "#" | grep ":"`; do - SOURCE_FILE=`echo $i | awk -F ":" {'print $1'}` - TARGET_FILE=`echo $i | awk -F ":" {'print $2'}` - chroot ${WORKDIR} /bin/ln -vs /${SOURCE_FILE} ${TARGET_FILE} - done -#set +xv -} - - -create_image() { - VNODEFILE=`mktemp -t tinybsd` - IMGMNT=`mktemp -d -t tinybsd` - - dd if=/dev/zero of=${VNODEFILE} count=${SECTUNIT} - - MD=`mdconfig -a -t vnode -f ${VNODEFILE} -x ${SECTRACK} -y ${TRACKCYL}` - - diskinfo -v /dev/${MD} - - fdisk -I /dev/${MD} - fdisk /dev/${MD} - - cp -p /boot/boot0 ${WORKDIR}/boot/boot0 - bsdlabel -w -B /dev/${MD} - newfs -O2 -U /dev/${MD}a - - mount /dev/${MD}a ${IMGMNT} - - if [ ${MFSROOT} = 'yes' ] - then - echo "${TS} Creating MFS root..." - # Update is not done yet - #mkdir -p ${WORKDIR}/usr/local/bin/ - #cp -p ${CURRENTDIR}/update/update ${WORKDIR}/usr/local/bin/ - rm ${WORKDIR}/etc/fstab - cd ${WORKDIR} && find . -print | sed '/kernel/ d' | cpio -dump ${IMGMNT} || true - umount ${IMGMNT} - dd if=/dev/${MD} of=${CURRENTDIR}/mfsroot.img - gzip -9 < ${CURRENTDIR}/mfsroot.img > ${CURRENTDIR}/mfsroot.gz - rm ${CURRENTDIR}/mfsroot.img - mount /dev/${MD}a ${IMGMNT} - rm -rf ${IMGMNT}/* - cp -rp ${WORKDIR}/boot ${IMGMNT} - rm ${IMGMNT}/boot/device.hints - ( \ - echo 'set vfs.root.mountfrom="ufs:/dev/md0a"' ; \ - echo 'set bootfile="/boot/kernel/kernel"' ; \ - sed -e '/^#/ d' -e 's/^/set /' < ${WORKDIR}/boot/device.hints ; \ - echo 'load /boot/kernel/kernel' ; \ - echo 'echo Loading mfsroot' ; \ - echo 'load -t mfs_root /mfsroot' ;\ - echo 'boot' ; \ - ) > ${IMGMNT}/boot/loader.rc - mv ${CURRENTDIR}/mfsroot.gz ${IMGMNT} - else - ( cd ${WORKDIR} && find . -print | cpio -dump ${IMGMNT} ) || true - fi - - df ${IMGMNT} - sleep 1 - umount ${IMGMNT} - - dd if=/dev/${MD} of=${CURRENTDIR}/${IMG} bs=64k - - rm -vf ${VNODEFILE} - rm -rvf ${IMGMNT} - mdconfig -d -u ${MD} - echo "" - echo "${TS} Done!" - echo "${TS} Your configuration options were saved in ${FULLFILENAME}" - echo "${TS} You can see your build log in ${HOME}/tinybsd.log" - echo "${TS} Your final image is in ${CURRENTDIR}/${IMG}" - echo "${TS} Now use dd(1) to write it." -} - -########################## -# run things - -########################################## -## The actual program -########################################## -getargs $* -setdefaults -# Load as many of the configuration options as we can -loadconfig -saveconfig - -# Rotate build log -rotate_buidlog - -# Now start logging. -( - # Do the build - prework - check_alt_imgname - create_tree - copy_binaries - create_etc - install_ports - make_kernel - copy_libraries - symlinks - create_ssh_keys - personal_conf - create_image -#set +xv -) 2>&1 |tee -a ${HOME}/tinybsd.log - diff --git a/tools/tools/usbtest/usb_control_ep_test.c b/tools/tools/usbtest/usb_control_ep_test.c index 87c5fc16a83c..4ee3bf3e05b6 100644 --- a/tools/tools/usbtest/usb_control_ep_test.c +++ b/tools/tools/usbtest/usb_control_ep_test.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2007-2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2007-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -75,7 +75,7 @@ emissing: } void -usb_control_ep_error_test(uint16_t vid, uint16_t pid) +usb_control_ep_error_test(struct uaddr uaddr) { struct LIBUSB20_CONTROL_SETUP_DECODED req; struct libusb20_device *pdev; @@ -86,7 +86,7 @@ usb_control_ep_error_test(uint16_t vid, uint16_t pid) int dev; int cfg; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -161,7 +161,7 @@ usb_control_ep_error_test(uint16_t vid, uint16_t pid) } void -usb_get_string_desc_test(uint16_t vid, uint16_t pid) +usb_get_string_desc_test(struct uaddr uaddr) { struct libusb20_device *pdev; uint32_t x; @@ -170,7 +170,7 @@ usb_get_string_desc_test(uint16_t vid, uint16_t pid) uint8_t *buf; int error; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -190,7 +190,7 @@ usb_get_string_desc_test(uint16_t vid, uint16_t pid) valid = 0; printf("Starting string descriptor test for " - "VID=0x%04x PID=0x%04x\n", vid, pid); + "VID=0x%04x PID=0x%04x\n", uaddr.vid, uaddr.pid); for (x = 0; x != 256; x++) { @@ -236,7 +236,7 @@ usb_get_string_desc_test(uint16_t vid, uint16_t pid) } void -usb_port_reset_test(uint16_t vid, uint16_t pid, uint32_t duration) +usb_port_reset_test(struct uaddr uaddr, uint32_t duration) { struct timeval sub_tv; struct timeval ref_tv; @@ -252,7 +252,7 @@ usb_port_reset_test(uint16_t vid, uint16_t pid, uint32_t duration) /* sysctl() - no set config */ - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -306,7 +306,7 @@ usb_port_reset_test(uint16_t vid, uint16_t pid, uint32_t duration) } void -usb_set_config_test(uint16_t vid, uint16_t pid, uint32_t duration) +usb_set_config_test(struct uaddr uaddr, uint32_t duration) { struct libusb20_device *pdev; struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; @@ -315,7 +315,7 @@ usb_set_config_test(uint16_t vid, uint16_t pid, uint32_t duration) int failed; int exp; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -329,7 +329,7 @@ usb_set_config_test(uint16_t vid, uint16_t pid, uint32_t duration) failed = 0; printf("Starting set config test for " - "VID=0x%04x PID=0x%04x\n", vid, pid); + "VID=0x%04x PID=0x%04x\n", uaddr.vid, uaddr.pid); for (x = 255; x > -1; x--) { @@ -365,11 +365,11 @@ usb_set_config_test(uint16_t vid, uint16_t pid, uint32_t duration) } void -usb_get_descriptor_test(uint16_t vid, uint16_t pid, uint32_t duration) +usb_get_descriptor_test(struct uaddr uaddr, uint32_t duration) { struct libusb20_device *pdev; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -378,7 +378,7 @@ usb_get_descriptor_test(uint16_t vid, uint16_t pid, uint32_t duration) } void -usb_suspend_resume_test(uint16_t vid, uint16_t pid, uint32_t duration) +usb_suspend_resume_test(struct uaddr uaddr, uint32_t duration) { struct timeval sub_tv; struct timeval ref_tv; @@ -403,7 +403,7 @@ usb_suspend_resume_test(uint16_t vid, uint16_t pid, uint32_t duration) printf("WARNING: Could not set power " "timeout to 1 (error=%d) \n", errno); } - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -417,7 +417,7 @@ usb_suspend_resume_test(uint16_t vid, uint16_t pid, uint32_t duration) power_old = libusb20_dev_get_power_mode(pdev); printf("Starting suspend and resume " - "test for VID=0x%04x PID=0x%04x\n", vid, pid); + "test for VID=0x%04x PID=0x%04x\n", uaddr.vid, uaddr.pid); iter = 0; errcnt = 0; @@ -468,7 +468,7 @@ usb_suspend_resume_test(uint16_t vid, uint16_t pid, uint32_t duration) } void -usb_set_and_clear_stall_test(uint16_t vid, uint16_t pid) +usb_set_and_clear_stall_test(struct uaddr uaddr) { struct libusb20_device *pdev; struct libusb20_transfer *pxfer; @@ -478,7 +478,7 @@ usb_set_and_clear_stall_test(uint16_t vid, uint16_t pid) int errcnt; int ep; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -490,7 +490,7 @@ usb_set_and_clear_stall_test(uint16_t vid, uint16_t pid) return; } printf("Starting set and clear stall test " - "for VID=0x%04x PID=0x%04x\n", vid, pid); + "for VID=0x%04x PID=0x%04x\n", uaddr.vid, uaddr.pid); iter = 0; errcnt = 0; @@ -604,7 +604,7 @@ usb_set_and_clear_stall_test(uint16_t vid, uint16_t pid) } void -usb_set_alt_interface_test(uint16_t vid, uint16_t pid) +usb_set_alt_interface_test(struct uaddr uaddr) { struct libusb20_device *pdev; struct libusb20_config *config; @@ -615,13 +615,13 @@ usb_set_alt_interface_test(uint16_t vid, uint16_t pid) int n; int m; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; } printf("Starting set alternate setting test " - "for VID=0x%04x PID=0x%04x\n", vid, pid); + "for VID=0x%04x PID=0x%04x\n", uaddr.vid, uaddr.pid); config = libusb20_dev_alloc_config(pdev, libusb20_dev_get_config_index(pdev)); diff --git a/tools/tools/usbtest/usb_modem_test.c b/tools/tools/usbtest/usb_modem_test.c index 74406fc6b218..0ac7ac594601 100644 --- a/tools/tools/usbtest/usb_modem_test.c +++ b/tools/tools/usbtest/usb_modem_test.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2007-2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2007-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -428,7 +428,7 @@ fail: } static void -exec_host_modem_test(struct modem *p, uint16_t vid, uint16_t pid) +exec_host_modem_test(struct modem *p, struct uaddr uaddr) { struct libusb20_device *pdev; @@ -440,7 +440,7 @@ exec_host_modem_test(struct modem *p, uint16_t vid, uint16_t pid) int error; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -513,7 +513,7 @@ exec_host_modem_test(struct modem *p, uint16_t vid, uint16_t pid) } void -show_host_modem_test(uint8_t level, uint16_t vid, uint16_t pid, uint32_t duration) +show_host_modem_test(uint8_t level, struct uaddr uaddr, uint32_t duration) { uint8_t retval; @@ -542,7 +542,7 @@ show_host_modem_test(uint8_t level, uint16_t vid, uint16_t pid, uint32_t duratio (modem.use_vendor_specific ? "YES" : "NO"), (modem.loop_data ? "YES" : "NO"), (int)(modem.duration), - (int)vid, (int)pid); + (int)uaddr.vid, (int)uaddr.pid); switch (retval) { case 0: @@ -573,10 +573,10 @@ show_host_modem_test(uint8_t level, uint16_t vid, uint16_t pid, uint32_t duratio set_defaults(&modem); break; case 30: - exec_host_modem_test(&modem, vid, pid); + exec_host_modem_test(&modem, uaddr); break; case 40: - show_host_device_selection(level + 1, &vid, &pid); + show_host_device_selection(level + 1, &uaddr); break; default: return; diff --git a/tools/tools/usbtest/usb_msc_test.c b/tools/tools/usbtest/usb_msc_test.c index db2ab257baab..8a67d040f63c 100644 --- a/tools/tools/usbtest/usb_msc_test.c +++ b/tools/tools/usbtest/usb_msc_test.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2007-2012 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2007-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -857,14 +857,13 @@ fail: } void -show_host_device_selection(uint8_t level, uint16_t *pvid, uint16_t *ppid) +show_host_device_selection(uint8_t level, struct uaddr *puaddr) { struct libusb20_backend *pbe; struct libusb20_device *pdev; struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; - uint16_t vid[USB_DEVICES_MAX]; - uint16_t pid[USB_DEVICES_MAX]; + struct uaddr uaddr[USB_DEVICES_MAX]; int index; int sel; @@ -887,8 +886,10 @@ top: ddesc = libusb20_dev_get_device_desc(pdev); ptr = libusb20_dev_get_desc(pdev); printf("%s%d) %s\n", indent[level], index, ptr); - vid[index] = ddesc->idVendor; - pid[index] = ddesc->idProduct; + uaddr[index].vid = ddesc->idVendor; + uaddr[index].pid = ddesc->idProduct; + uaddr[index].bus = libusb20_dev_get_bus_number(pdev); + uaddr[index].addr = libusb20_dev_get_address(pdev); index++; } else { break; @@ -907,16 +908,14 @@ top: goto top; if ((sel < 0) || (sel >= index)) { - *pvid = 0; - *ppid = 0; - return; + memset(puaddr, 0, sizeof(*puaddr)); + } else { + *puaddr = uaddr[sel]; } - *pvid = vid[sel]; - *ppid = pid[sel]; } struct libusb20_device * -find_usb_device(uint16_t vid, uint16_t pid) +find_usb_device(struct uaddr uaddr) { struct libusb20_backend *pbe = libusb20_be_alloc_default(); struct libusb20_device *pdev = NULL; @@ -929,8 +928,11 @@ find_usb_device(uint16_t vid, uint16_t pid) ddesc = libusb20_dev_get_device_desc(pdev); - if ((vid == ddesc->idVendor) && - (pid == ddesc->idProduct)) { + if ((uaddr.vid == ddesc->idVendor) && + (uaddr.pid == ddesc->idProduct) && + (uaddr.addr == 0 || + (uaddr.addr == libusb20_dev_get_address(pdev) && + uaddr.bus == libusb20_dev_get_bus_number(pdev)))) { libusb20_be_dequeue_device(pbe, pdev); break; } @@ -1004,7 +1006,7 @@ find_usb_endpoints(struct libusb20_device *pdev, uint8_t class, } static void -exec_host_msc_test(struct usb_msc_params *p, uint16_t vid, uint16_t pid) +exec_host_msc_test(struct usb_msc_params *p, struct uaddr uaddr) { struct libusb20_device *pdev; @@ -1019,7 +1021,7 @@ exec_host_msc_test(struct usb_msc_params *p, uint16_t vid, uint16_t pid) xfer_current_id = 0; xfer_wrapper_sig = CBWSIGNATURE; - pdev = find_usb_device(vid, pid); + pdev = find_usb_device(uaddr); if (pdev == NULL) { printf("USB device not found\n"); return; @@ -1199,8 +1201,7 @@ get_io_area(const struct usb_msc_params *p) } void -show_host_msc_test(uint8_t level, uint16_t vid, - uint16_t pid, uint32_t duration) +show_host_msc_test(uint8_t level, struct uaddr uaddr, uint32_t duration) { struct usb_msc_params params; uint8_t retval; @@ -1251,7 +1252,7 @@ show_host_msc_test(uint8_t level, uint16_t vid, (params.try_sense_on_error ? "YES" : "NO"), (params.try_all_lun ? "YES" : "NO"), (params.try_shorter_wrapper_block ? "YES" : "NO"), - vid, pid); + uaddr.vid, uaddr.pid); switch (retval) { case 0: break; @@ -1317,10 +1318,10 @@ show_host_msc_test(uint8_t level, uint16_t vid, set_defaults(¶ms); break; case 30: - exec_host_msc_test(¶ms, vid, pid); + exec_host_msc_test(¶ms, uaddr); break; case 40: - show_host_device_selection(level + 1, &vid, &pid); + show_host_device_selection(level + 1, &uaddr); break; default: return; diff --git a/tools/tools/usbtest/usbtest.c b/tools/tools/usbtest/usbtest.c index 725b9ead9718..40d67589c5a9 100644 --- a/tools/tools/usbtest/usbtest.c +++ b/tools/tools/usbtest/usbtest.c @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2010-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -688,8 +688,8 @@ show_host_select(uint8_t level) int error; uint32_t duration = 60; - uint16_t dev_vid = 0; - uint16_t dev_pid = 0; + struct uaddr uaddr = {}; + uint8_t retval; while (1) { @@ -702,7 +702,7 @@ show_host_select(uint8_t level) "to %d (error=%d)\n", force_fs, errno); } retval = usb_ts_show_menu(level, "Select Host Mode Test (via LibUSB)", - " 1) Select USB device (VID=0x%04x, PID=0x%04x)\n" + " 1) Select USB device (VID=0x%04x, PID=0x%04x, ugen%u.%u)\n" " 2) Manually enter USB vendor and product ID\n" " 3) Force FULL speed operation: <%s>\n" " 4) Mass Storage (UMASS)\n" @@ -717,7 +717,7 @@ show_host_select(uint8_t level) "17) Start Invalid Control Request Test\n" "30) Duration: <%d> seconds\n" "x) Return to previous menu\n", - dev_vid, dev_pid, + uaddr.vid, uaddr.pid, uaddr.bus, uaddr.addr, force_fs ? "YES" : "NO", (int)duration); @@ -725,44 +725,47 @@ show_host_select(uint8_t level) case 0: break; case 1: - show_host_device_selection(level + 1, &dev_vid, &dev_pid); + show_host_device_selection(level + 1, &uaddr); break; case 2: - dev_vid = get_integer() & 0xFFFF; - dev_pid = get_integer() & 0xFFFF; + /* only match VID and PID */ + uaddr.vid = get_integer() & 0xFFFF; + uaddr.pid = get_integer() & 0xFFFF; + uaddr.bus = 0; + uaddr.addr = 0; break; case 3: force_fs ^= 1; break; case 4: - show_host_msc_test(level + 1, dev_vid, dev_pid, duration); + show_host_msc_test(level + 1, uaddr, duration); break; case 5: - show_host_modem_test(level + 1, dev_vid, dev_pid, duration); + show_host_modem_test(level + 1, uaddr, duration); break; case 10: - usb_get_string_desc_test(dev_vid, dev_pid); + usb_get_string_desc_test(uaddr); break; case 11: - usb_port_reset_test(dev_vid, dev_pid, duration); + usb_port_reset_test(uaddr, duration); break; case 12: - usb_set_config_test(dev_vid, dev_pid, duration); + usb_set_config_test(uaddr, duration); break; case 13: - usb_get_descriptor_test(dev_vid, dev_pid, duration); + usb_get_descriptor_test(uaddr, duration); break; case 14: - usb_suspend_resume_test(dev_vid, dev_pid, duration); + usb_suspend_resume_test(uaddr, duration); break; case 15: - usb_set_and_clear_stall_test(dev_vid, dev_pid); + usb_set_and_clear_stall_test(uaddr); break; case 16: - usb_set_alt_interface_test(dev_vid, dev_pid); + usb_set_alt_interface_test(uaddr); break; case 17: - usb_control_ep_error_test(dev_vid, dev_pid); + usb_control_ep_error_test(uaddr); break; case 30: duration = get_integer(); diff --git a/tools/tools/usbtest/usbtest.h b/tools/tools/usbtest/usbtest.h index 3d6643cd58f7..f274bebc848b 100644 --- a/tools/tools/usbtest/usbtest.h +++ b/tools/tools/usbtest/usbtest.h @@ -1,6 +1,6 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2010 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2010-2022 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,21 +37,28 @@ struct bps { time_t time; }; -extern void usb_get_string_desc_test(uint16_t, uint16_t); -extern void usb_port_reset_test(uint16_t, uint16_t, uint32_t); -extern void usb_set_config_test(uint16_t, uint16_t, uint32_t); -extern void usb_get_descriptor_test(uint16_t, uint16_t, uint32_t); -extern void usb_control_ep_error_test(uint16_t, uint16_t); -extern void usb_set_and_clear_stall_test(uint16_t, uint16_t); -extern void usb_set_alt_interface_test(uint16_t, uint16_t); +struct uaddr { + uint16_t vid; + uint16_t pid; + uint8_t bus; + uint8_t addr; +}; + +extern void usb_get_string_desc_test(struct uaddr); +extern void usb_port_reset_test(struct uaddr, uint32_t); +extern void usb_set_config_test(struct uaddr, uint32_t); +extern void usb_get_descriptor_test(struct uaddr, uint32_t); +extern void usb_control_ep_error_test(struct uaddr); +extern void usb_set_and_clear_stall_test(struct uaddr); +extern void usb_set_alt_interface_test(struct uaddr); -extern void usb_suspend_resume_test(uint16_t, uint16_t, uint32_t); +extern void usb_suspend_resume_test(struct uaddr, uint32_t); extern void do_bps(const char *, struct bps *, uint32_t len); extern const char *indent[USB_TS_MAX_LEVELS]; -extern void show_host_msc_test(uint8_t, uint16_t, uint16_t, uint32_t); -extern void show_host_modem_test(uint8_t, uint16_t, uint16_t, uint32_t); -extern void show_host_device_selection(uint8_t, uint16_t *, uint16_t *); -extern struct libusb20_device *find_usb_device(uint16_t, uint16_t); +extern void show_host_msc_test(uint8_t, struct uaddr, uint32_t); +extern void show_host_modem_test(uint8_t, struct uaddr, uint32_t); +extern void show_host_device_selection(uint8_t, struct uaddr *); +extern struct libusb20_device *find_usb_device(struct uaddr); extern void find_usb_endpoints(struct libusb20_device *, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t *, uint8_t *, uint8_t *, uint8_t); extern void get_string(char *, int); |