From owner-p4-projects@FreeBSD.ORG Tue Nov 11 11:01:52 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D167F6D4; Tue, 11 Nov 2014 11:01:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 92E956D2 for ; Tue, 11 Nov 2014 11:01:52 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6596F997 for ; Tue, 11 Nov 2014 11:01:52 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sABB1q6w000442 for ; Tue, 11 Nov 2014 11:01:52 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sABB1qDa000439 for perforce@freebsd.org; Tue, 11 Nov 2014 11:01:52 GMT (envelope-from novazeta@FreeBSD.org) Date: Tue, 11 Nov 2014 11:01:52 GMT Message-Id: <201411111101.sABB1qDa000439@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 1202708 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 11:01:53 -0000 http://p4web.freebsd.org/@@1202708?ac=10 Change 1202708 by novazeta@novazeta_vica on 2014/11/11 11:01:24 Update SOAAP bits of build system Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#17 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#21 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#17 (text+ko) ==== @@ -647,21 +647,15 @@ .endif .if ${MK_SOAAP} != "no" -.if !defined(SOAAP_INCLUDE_DIR) .if !defined(SOAAP_SOURCE_DIR) -.error Must set one of SOAAP_INCLUDE_DIR or SOAAP_SOURCE_DIR with WITH_SOAAP +.error Must set SOAAP_SOURCE_DIR with WITH_SOAAP .else -.warning SOAAP_SOURCE_DIR is deprecated, use SOAAP_INCLUDE_DIR SOAAP_INCLUDE_DIR=${SOAAP_SOURCE_DIR}/include .endif -.endif -.if !defined(SOAAP_LIB_DIR) .if !defined(SOAAP_BUILD_DIR) -.error Must set one of SOAAP_LIB_DIR or SOAAP_BUILD_DIR with WITH_SOAAP +.error Must set SOAAP_BUILD_DIR with WITH_SOAAP .else -.warning SOAAP_BUILD_DIR is deprecated, use SOAAP_LIB_DIR -SOAAP_LIB_DIR=${SOAAP_BUILD_DIR} -.endif +SOAAP=${SOAAP_BUILD_DIR}/bin/soaap .endif CFLAGS+= -g -DSOAAP -I${SOAAP_INCLUDE_DIR} .if defined(WITHOUT_LLVM_INSTRUMENTED) ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#21 (text+ko) ==== @@ -298,22 +298,10 @@ .endif .${LLVM_IR_TYPE}-a.soaap: - ${SOAAP} ${SOAAP_FLAGS} -o /dev/null ${.IMPSRC} - -.${LLVM_IR_TYPE}-a.bc_cep: - ${OPT} -load ${SOAAP_LIB_DIR}/libcep.so -insert-call-edge-profiling \ - -o ${.TARGET} ${.IMPSRC} - -.bc_cep.po_cep: - ${LLC} -filetype=obj ${LLCFLAGS} -o ${.TARGET} ${.IMPSRC} - -.po_cep.soaap_cg: - ${CC} ${.IMPSRC} -L${SOAAP_LIB_DIR} -L${LLVM_BUILD_DIR}/lib \ - -lcep_rt -lprofile_rt ${LDADD} ${LLVM_LDADD} -o ${.TARGET} + ${SOAAP} ${SOAAP_FLAGS} ${.IMPSRC} .${LLVM_IR_TYPE}-a.bc_soaap_perf: - ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap \ - -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.TARGET} ${.IMPSRC} + ${SOAAP} --soaap-emulate-performance ${SOAAP_FLAGS} -o ${.TARGET} ${.IMPSRC} .bc_soaap_perf.po_soaap_perf: ${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC} From owner-p4-projects@FreeBSD.ORG Tue Nov 11 11:11:03 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE4BE9C0; Tue, 11 Nov 2014 11:11:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 911C39BE for ; Tue, 11 Nov 2014 11:11:02 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7EA05A82 for ; Tue, 11 Nov 2014 11:11:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sABBB2ed005458 for ; Tue, 11 Nov 2014 11:11:02 GMT (envelope-from novazeta@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sABBB29b005454 for perforce@freebsd.org; Tue, 11 Nov 2014 11:11:02 GMT (envelope-from novazeta@FreeBSD.org) Date: Tue, 11 Nov 2014 11:11:02 GMT Message-Id: <201411111111.sABBB29b005454@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to novazeta@FreeBSD.org using -f From: Khilan Gudka Subject: PERFORCE change 1202710 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 11:11:03 -0000 http://p4web.freebsd.org/@@1202710?ac=10 Change 1202710 by novazeta@novazeta_vica on 2014/11/11 11:10:32 Fix typo Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#20 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#20 (text+ko) ==== @@ -129,7 +129,7 @@ .if ${MK_SOAAP} != "no" CLEANFILES+= ${PROG}.${LLVM_IR_TYPE}-a \ ${PROG}.bc_cep ${PROG}.po_cep ${PROG}.soaap_cg \ - ${PROG}.bc_soaap_perf ${PROG}.po_soaap_perf ${PROG}.soaap_pef + ${PROG}.bc_soaap_perf ${PROG}.po_soaap_perf ${PROG}.soaap_perf .endif .endif From owner-p4-projects@FreeBSD.ORG Fri Nov 14 18:20:09 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B907DE0B; Fri, 14 Nov 2014 18:20:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A591E09 for ; Fri, 14 Nov 2014 18:20:09 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C0AEC76 for ; Fri, 14 Nov 2014 18:20:09 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sAEIK9pe091873 for ; Fri, 14 Nov 2014 18:20:09 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sAEIK90l091870 for perforce@freebsd.org; Fri, 14 Nov 2014 18:20:09 GMT (envelope-from jmg@freebsd.org) Date: Fri, 14 Nov 2014 18:20:09 GMT Message-Id: <201411141820.sAEIK90l091870@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1202823 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2014 18:20:10 -0000 http://p4web.freebsd.org/@@1202823?ac=10 Change 1202823 by jmg@jmg_carbon2 on 2014/11/14 18:19:46 fix from ae for fixing IPv6 transport ICMP... Affected files ... .. //depot/projects/opencrypto/sys/netipsec/ipsec_input.c#4 edit Differences ... ==== //depot/projects/opencrypto/sys/netipsec/ipsec_input.c#4 (text+ko) ==== @@ -432,7 +432,7 @@ } #ifdef INET6 /* IPv6-in-IP encapsulation. */ - if (prot == IPPROTO_IPV6 && + else if (prot == IPPROTO_IPV6 && saidx->mode != IPSEC_MODE_TRANSPORT) { if (m->m_pkthdr.len - skip < sizeof(struct ip6_hdr)) { @@ -469,6 +469,15 @@ #endif /* notyet */ } #endif /* INET6 */ + else if (prot != IPPROTO_IPV6 && saidx->mode == IPSEC_MODE_ANY) { + /* + * When mode is wildcard, inner protocol is IPv6 and + * we have no INET6 support - drop this packet a bit later. + * In other cases we assume transport mode and outer + * header was already stripped in xform_xxx_cb. + */ + prot = IPPROTO_IPIP; + } /* * Record what we've done to the packet (under what SA it was @@ -664,11 +673,11 @@ } ip6 = mtod(m, struct ip6_hdr *); - ip6->ip6_plen = htons(m->m_pkthdr.len - sizeof(struct ip6_hdr)); + ip6->ip6_plen = htons(m->m_pkthdr.len); /* Save protocol */ - prot = 0; - m_copydata(m, protoff, 1, (unsigned char *) &prot); + m_copydata(m, protoff, 1, &nxt8); + prot = nxt8; #ifdef DEV_ENC if_inc_counter(encif, IFCOUNTER_IPACKETS, 1); @@ -686,32 +695,33 @@ return (error); #endif /* DEV_ENC */ -#ifdef INET - /* IP-in-IP encapsulation */ - if (prot == IPPROTO_IPIP) { - if (m->m_pkthdr.len - skip < sizeof(struct ip)) { + /* IPv6-in-IP encapsulation */ + if (prot == IPPROTO_IPV6 && + saidx->mode != IPSEC_MODE_TRANSPORT) { + if (m->m_pkthdr.len - skip < sizeof(struct ip6_hdr)) { IPSEC_ISTAT(sproto, hdrops); error = EINVAL; goto bad; } - /* ipn will now contain the inner IPv4 header */ - m_striphdr(m, 0, skip); + /* ip6n will now contain the inner IPv6 header. */ + m_striphdr(m, 0, skip); skip = 0; #ifdef notyet /* * Check that the inner source address is the same as * the proxy address, if available. */ - if ((saidx->proxy.sa.sa_family == AF_INET && - saidx->proxy.sin.sin_addr.s_addr != INADDR_ANY && - ipn.ip_src.s_addr != saidx->proxy.sin.sin_addr.s_addr) || - (saidx->proxy.sa.sa_family != AF_INET && + if ((saidx->proxy.sa.sa_family == AF_INET6 && + !IN6_IS_ADDR_UNSPECIFIED(&saidx->proxy.sin6.sin6_addr) && + !IN6_ARE_ADDR_EQUAL(&ip6n.ip6_src, + &saidx->proxy.sin6.sin6_addr)) || + (saidx->proxy.sa.sa_family != AF_INET6 && saidx->proxy.sa.sa_family != 0)) { DPRINTF(("%s: inner source address %s doesn't " "correspond to expected proxy source %s, " "SA %s/%08lx\n", __func__, - inet_ntoa4(ipn.ip_src), + ip6_sprintf(ip6buf, &ip6n.ip6_src), ipsec_address(&saidx->proxy), ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi))); @@ -722,33 +732,33 @@ } #endif /* notyet */ } -#endif /* INET */ - /* IPv6-in-IP encapsulation */ - if (prot == IPPROTO_IPV6) { - if (m->m_pkthdr.len - skip < sizeof(struct ip6_hdr)) { +#ifdef INET + /* IP-in-IP encapsulation */ + else if (prot == IPPROTO_IPIP && + saidx->mode != IPSEC_MODE_TRANSPORT) { + if (m->m_pkthdr.len - skip < sizeof(struct ip)) { IPSEC_ISTAT(sproto, hdrops); error = EINVAL; goto bad; } - /* ip6n will now contain the inner IPv6 header. */ - m_striphdr(m, 0, skip); + /* ipn will now contain the inner IPv4 header */ + m_striphdr(m, 0, skip); skip = 0; #ifdef notyet /* * Check that the inner source address is the same as * the proxy address, if available. */ - if ((saidx->proxy.sa.sa_family == AF_INET6 && - !IN6_IS_ADDR_UNSPECIFIED(&saidx->proxy.sin6.sin6_addr) && - !IN6_ARE_ADDR_EQUAL(&ip6n.ip6_src, - &saidx->proxy.sin6.sin6_addr)) || - (saidx->proxy.sa.sa_family != AF_INET6 && + if ((saidx->proxy.sa.sa_family == AF_INET && + saidx->proxy.sin.sin_addr.s_addr != INADDR_ANY && + ipn.ip_src.s_addr != saidx->proxy.sin.sin_addr.s_addr) || + (saidx->proxy.sa.sa_family != AF_INET && saidx->proxy.sa.sa_family != 0)) { DPRINTF(("%s: inner source address %s doesn't " "correspond to expected proxy source %s, " "SA %s/%08lx\n", __func__, - ip6_sprintf(ip6buf, &ip6n.ip6_src), + inet_ntoa4(ipn.ip_src), ipsec_address(&saidx->proxy), ipsec_address(&saidx->dst), (u_long) ntohl(sav->spi))); @@ -759,6 +769,10 @@ } #endif /* notyet */ } +#endif /* INET */ + else { + prot = IPPROTO_IPV6; /* for correct BPF processing */ + } /* * Record what we've done to the packet (under what SA it was @@ -809,10 +823,6 @@ if ((error = ipsec_filter(&m, PFIL_IN, ENC_IN|ENC_AFTER)) != 0) return (error); #endif /* DEV_ENC */ - /* Retrieve new protocol */ - /* We have stripped the IP6 header from the mbuf, we have to use the backuped proto value instead */ - nxt8 = prot; - /* * See the end of ip6_input for this logic. * IPPROTO_IPV[46] case will be processed just like other ones From owner-p4-projects@FreeBSD.ORG Fri Nov 14 18:27:18 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26A71367; Fri, 14 Nov 2014 18:27:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB3AE365 for ; Fri, 14 Nov 2014 18:27:17 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C54D9D43 for ; Fri, 14 Nov 2014 18:27:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sAEIRHfx094036 for ; Fri, 14 Nov 2014 18:27:17 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sAEIRGFQ094033 for perforce@freebsd.org; Fri, 14 Nov 2014 18:27:16 GMT (envelope-from jmg@freebsd.org) Date: Fri, 14 Nov 2014 18:27:16 GMT Message-Id: <201411141827.sAEIRGFQ094033@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1202824 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2014 18:27:18 -0000 http://p4web.freebsd.org/@@1202824?ac=10 Change 1202824 by jmg@jmg_carbon2 on 2014/11/14 18:27:06 IFC @ 1202820 Affected files ... .. //depot/projects/opencrypto/etc/mtree/BSD.tests.dist#3 integrate .. //depot/projects/opencrypto/share/man/man4/Makefile#6 integrate .. //depot/projects/opencrypto/share/man/man4/dpt.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/faith.4#2 delete .. //depot/projects/opencrypto/share/man/man4/gre.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/inet.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/inet6.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/ip6.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/ipheth.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/iscsi_initiator.4#3 integrate .. //depot/projects/opencrypto/share/man/man4/me.4#1 branch .. //depot/projects/opencrypto/share/man/man4/tap.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/virtio_console.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/vt.4#4 integrate .. //depot/projects/opencrypto/share/man/man5/rc.conf.5#4 integrate .. //depot/projects/opencrypto/share/man/man7/Makefile#3 integrate .. //depot/projects/opencrypto/share/man/man7/growfs.7#1 branch .. //depot/projects/opencrypto/share/man/man7/hier.7#3 integrate .. //depot/projects/opencrypto/share/man/man7/security.7#2 integrate .. //depot/projects/opencrypto/share/man/man9/domain.9#2 integrate .. //depot/projects/opencrypto/share/man/man9/fetch.9#3 integrate .. //depot/projects/opencrypto/share/man/man9/lock.9#2 integrate .. //depot/projects/opencrypto/share/man/man9/store.9#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/genassym.c#3 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/sys_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/opencrypto/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/opencrypto/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/opencrypto/sys/arm/arm/busdma_machdep-v6.c#4 integrate .. //depot/projects/opencrypto/sys/arm/arm/gic.c#5 integrate .. //depot/projects/opencrypto/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_bsc.c#4 integrate .. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#4 integrate .. //depot/projects/opencrypto/sys/arm/conf/ATMEL#3 integrate .. //depot/projects/opencrypto/sys/arm/conf/DOCKSTAR#3 integrate .. //depot/projects/opencrypto/sys/arm/conf/DREAMPLUG-1001#3 integrate .. //depot/projects/opencrypto/sys/arm/conf/EFIKA_MX#3 integrate .. //depot/projects/opencrypto/sys/arm/conf/ETHERNUT5#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/IMX53#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/IMX6#3 integrate .. //depot/projects/opencrypto/sys/arm/conf/SAM9260EK#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_iomux.c#2 integrate .. //depot/projects/opencrypto/sys/boot/amd64/boot1.efi/boot1.c#3 integrate .. //depot/projects/opencrypto/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/common/install.c#2 integrate .. //depot/projects/opencrypto/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/opencrypto/sys/boot/common/misc.c#2 integrate .. //depot/projects/opencrypto/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/fdt_loader_cmd.c#3 integrate .. //depot/projects/opencrypto/sys/boot/fdt/fdt_platform.h#1 branch .. //depot/projects/opencrypto/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/opencrypto/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/opencrypto/sys/boot/powerpc/uboot/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/uboot/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/uboot/common/metadata.c#2 integrate .. //depot/projects/opencrypto/sys/boot/uboot/fdt/Makefile#1 branch .. //depot/projects/opencrypto/sys/boot/uboot/fdt/uboot_fdt.c#1 branch .. //depot/projects/opencrypto/sys/boot/uboot/lib/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/opencrypto/sys/boot/uboot/lib/module.c#2 integrate .. //depot/projects/opencrypto/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl.c#7 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl.h#5 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_backend.h#3 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_backend_block.c#5 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_cmd_table.c#5 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_error.c#3 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_error.h#3 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend_iscsi.c#4 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_private.h#7 integrate .. //depot/projects/opencrypto/sys/cam/ctl/scsi_ctl.c#3 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_all.h#5 integrate .. //depot/projects/opencrypto/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/opencrypto/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#5 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#4 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#4 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_systrace_args.c#3 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/opencrypto/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/opencrypto/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/opencrypto/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/opencrypto/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/opencrypto/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/opencrypto/sys/compat/svr4/README#1 branch .. //depot/projects/opencrypto/sys/compat/svr4/TO-DO#1 branch .. //depot/projects/opencrypto/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/opencrypto/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/opencrypto/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/opencrypto/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/opencrypto/sys/conf/NOTES#6 integrate .. //depot/projects/opencrypto/sys/conf/files#11 integrate .. //depot/projects/opencrypto/sys/conf/files.amd64#7 integrate .. //depot/projects/opencrypto/sys/conf/files.i386#8 integrate .. //depot/projects/opencrypto/sys/conf/kmod.mk#4 integrate .. //depot/projects/opencrypto/sys/conf/newvers.sh#3 integrate .. //depot/projects/opencrypto/sys/conf/options#7 integrate .. //depot/projects/opencrypto/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate .. //depot/projects/opencrypto/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/opencrypto/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/opencrypto/sys/dev/agp/agp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agp_amd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agp_apple.c#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agp_ati.c#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agp_i810.c#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/opencrypto/sys/dev/agp/agpvar.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/opencrypto/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/opencrypto/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/common/t4_hw.c#3 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/firmware/t4fw_cfg.txt#3 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/firmware/t5fw_cfg.txt#3 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/iw_cxgbe/cm.c#4 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/t4_main.c#5 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/tom/t4_cpl_io.c#3 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/tom/t4_ddp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/dpt/dpt_isa.c#2 delete .. //depot/projects/opencrypto/sys/dev/drm2/drm_agpsupport.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/drm_edid.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/drm_fb_helper.c#3 integrate .. //depot/projects/opencrypto/sys/dev/drm2/drm_fb_helper.h#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/radeon/radeon.h#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/radeon/radeon_connectors.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/radeon/radeon_device.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/radeon/radeon_ttm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/ttm/ttm_agp_backend.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/ttm/ttm_bo_driver.h#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/ttm/ttm_bo_util.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/ttm/ttm_page_alloc.c#2 integrate .. //depot/projects/opencrypto/sys/dev/fdt/fdt_pinctrl.c#2 integrate .. //depot/projects/opencrypto/sys/dev/glxsb/glxsb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/gpio/gpiobus.c#3 integrate .. //depot/projects/opencrypto/sys/dev/gpio/gpiobus_if.m#2 integrate .. //depot/projects/opencrypto/sys/dev/gpio/gpiobusvar.h#3 integrate .. //depot/projects/opencrypto/sys/dev/gpio/gpioiic.c#2 integrate .. //depot/projects/opencrypto/sys/dev/gpio/gpioled.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/opencrypto/sys/dev/hyperv/netvsc/hv_net_vsc.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hyperv/netvsc/hv_net_vsc.h#2 integrate .. //depot/projects/opencrypto/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#5 integrate .. //depot/projects/opencrypto/sys/dev/ida/ida_eisa.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iir/iir.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iir/iir.h#2 integrate .. //depot/projects/opencrypto/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ips/ips.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ips/ips.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ips/ips_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iscsi/icl.c#4 integrate .. //depot/projects/opencrypto/sys/dev/iscsi/icl.h#3 integrate .. //depot/projects/opencrypto/sys/dev/iscsi/iscsi.c#5 integrate .. //depot/projects/opencrypto/sys/dev/ixl/i40e_osdep.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ixl/i40e_osdep.h#3 integrate .. //depot/projects/opencrypto/sys/dev/ixl/if_ixl.c#4 integrate .. //depot/projects/opencrypto/sys/dev/ixl/if_ixlv.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ixl/ixl.h#3 integrate .. //depot/projects/opencrypto/sys/dev/ixl/ixl_txrx.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ixl/ixlv.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ixl/ixlv_vc_mgr.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/ixlvc.c#3 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap.c#4 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_freebsd.c#3 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_generic.c#3 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_kern.h#4 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_monitor.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_pipe.c#3 integrate .. //depot/projects/opencrypto/sys/dev/null/null.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ofw/ofwbus.c#5 integrate .. //depot/projects/opencrypto/sys/dev/pci/pci.c#5 integrate .. //depot/projects/opencrypto/sys/dev/random/build.sh#1 branch .. //depot/projects/opencrypto/sys/dev/random/dummy_rng.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/fortuna.c#1 branch .. //depot/projects/opencrypto/sys/dev/random/fortuna.h#1 branch .. //depot/projects/opencrypto/sys/dev/random/harvest.c#2 delete .. //depot/projects/opencrypto/sys/dev/random/hash.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/hash.h#2 integrate .. //depot/projects/opencrypto/sys/dev/random/ivy.c#3 integrate .. //depot/projects/opencrypto/sys/dev/random/live_entropy_sources.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/live_entropy_sources.h#2 integrate .. //depot/projects/opencrypto/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/random_adaptors.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/random_adaptors.h#2 integrate .. //depot/projects/opencrypto/sys/dev/random/random_harvestq.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/random_harvestq.h#2 integrate .. //depot/projects/opencrypto/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/randomdev.h#2 integrate .. //depot/projects/opencrypto/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/randomdev_soft.h#2 integrate .. //depot/projects/opencrypto/sys/dev/random/rwfile.c#2 delete .. //depot/projects/opencrypto/sys/dev/random/rwfile.h#2 delete .. //depot/projects/opencrypto/sys/dev/random/uint128.h#1 branch .. //depot/projects/opencrypto/sys/dev/random/unit_test.c#1 branch .. //depot/projects/opencrypto/sys/dev/random/unit_test.h#1 branch .. //depot/projects/opencrypto/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/opencrypto/sys/dev/random/yarrow.h#2 integrate .. //depot/projects/opencrypto/sys/dev/rp/rp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/rp/rpreg.h#2 integrate .. //depot/projects/opencrypto/sys/dev/rp/rpvar.h#2 integrate .. //depot/projects/opencrypto/sys/dev/safe/safe.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/midi/sequencer.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pcm/dsp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/opencrypto/sys/dev/streams/streams.c#3 integrate .. //depot/projects/opencrypto/sys/dev/uart/uart_bus_fdt.c#3 integrate .. //depot/projects/opencrypto/sys/dev/uart/uart_dev_pl011.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/opencrypto/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/opencrypto/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/opencrypto/sys/dev/virtio/console/virtio_console.c#2 integrate .. //depot/projects/opencrypto/sys/dev/virtio/network/if_vtnet.c#4 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt.h#5 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_buf.c#5 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_core.c#7 integrate .. //depot/projects/opencrypto/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/opencrypto/sys/fs/ext2fs/ext2_extern.h#2 integrate .. //depot/projects/opencrypto/sys/fs/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/opencrypto/sys/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/opencrypto/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/opencrypto/sys/geom/bde/g_bde.h#2 integrate .. //depot/projects/opencrypto/sys/geom/geom_dev.c#5 integrate .. //depot/projects/opencrypto/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/opencrypto/sys/i386/conf/NOTES#4 integrate .. //depot/projects/opencrypto/sys/i386/conf/XBOX#2 integrate .. //depot/projects/opencrypto/sys/i386/conf/XEN#3 integrate .. //depot/projects/opencrypto/sys/i386/i386/genassym.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/opencrypto/sys/i386/i386/locore.s#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/opencrypto/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/opencrypto/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/sys_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/trap.c#4 integrate .. //depot/projects/opencrypto/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/opencrypto/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate .. //depot/projects/opencrypto/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/opencrypto/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/opencrypto/sys/i386/ibcs2/ibcs2_stat.c#2 integrate .. //depot/projects/opencrypto/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/opencrypto/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/opencrypto/sys/i386/include/md_var.h#5 integrate .. //depot/projects/opencrypto/sys/i386/include/npx.h#3 integrate .. //depot/projects/opencrypto/sys/i386/include/pcb.h#3 integrate .. //depot/projects/opencrypto/sys/i386/isa/npx.c#3 integrate .. //depot/projects/opencrypto/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/opencrypto/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/opencrypto/sys/i386/svr4/svr4_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/opencrypto/sys/kern/init_main.c#3 integrate .. //depot/projects/opencrypto/sys/kern/init_sysent.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_clock.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_cons.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/opencrypto/sys/kern/kern_exec.c#6 integrate .. //depot/projects/opencrypto/sys/kern/kern_fork.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_intr.c#4 integrate .. //depot/projects/opencrypto/sys/kern/kern_lock.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_prot.c#5 integrate .. //depot/projects/opencrypto/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_sx.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_thr.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/opencrypto/sys/kern/subr_bus.c#3 integrate .. //depot/projects/opencrypto/sys/kern/subr_prof.c#3 integrate .. //depot/projects/opencrypto/sys/kern/subr_terminal.c#3 integrate .. //depot/projects/opencrypto/sys/kern/subr_uio.c#4 integrate .. //depot/projects/opencrypto/sys/kern/sys_generic.c#3 integrate .. //depot/projects/opencrypto/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/opencrypto/sys/kern/sys_socket.c#4 integrate .. //depot/projects/opencrypto/sys/kern/syscalls.c#3 integrate .. //depot/projects/opencrypto/sys/kern/syscalls.master#3 integrate .. //depot/projects/opencrypto/sys/kern/systrace_args.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/opencrypto/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/opencrypto/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/opencrypto/sys/kern/uipc_usrreq.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_export.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_mountroot.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/opencrypto/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/opencrypto/sys/mips/conf/GXEMUL#2 integrate .. //depot/projects/opencrypto/sys/mips/conf/GXEMUL32#2 integrate .. //depot/projects/opencrypto/sys/mips/conf/OCTEON1#2 integrate .. //depot/projects/opencrypto/sys/mips/conf/PICOSTATION_M2HP.hints#2 integrate .. //depot/projects/opencrypto/sys/mips/rmi/rootfs_list.txt#2 integrate .. //depot/projects/opencrypto/sys/modules/Makefile#6 integrate .. //depot/projects/opencrypto/sys/modules/dpt/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/drm2/drm2/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_faith/Makefile#3 delete .. //depot/projects/opencrypto/sys/modules/if_gre/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/if_me/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/ixlv/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/linux/Makefile#6 integrate .. //depot/projects/opencrypto/sys/modules/mrsas/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/padlock_rng/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/random/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/rdrand_rng/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/svr4/README#2 delete .. //depot/projects/opencrypto/sys/modules/svr4/TO-DO#2 delete .. //depot/projects/opencrypto/sys/modules/vmm/Makefile#5 integrate .. //depot/projects/opencrypto/sys/net/bpf.c#3 integrate .. //depot/projects/opencrypto/sys/net/ethernet.h#2 integrate .. //depot/projects/opencrypto/sys/net/flowtable.c#2 integrate .. //depot/projects/opencrypto/sys/net/if.c#5 integrate .. //depot/projects/opencrypto/sys/net/if_arp.h#2 integrate .. //depot/projects/opencrypto/sys/net/if_bridge.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_clone.c#2 integrate .. //depot/projects/opencrypto/sys/net/if_clone.h#2 integrate .. //depot/projects/opencrypto/sys/net/if_disc.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_faith.c#3 delete .. //depot/projects/opencrypto/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_gif.c#4 integrate .. //depot/projects/opencrypto/sys/net/if_gre.c#4 integrate .. //depot/projects/opencrypto/sys/net/if_gre.h#3 integrate .. //depot/projects/opencrypto/sys/net/if_iso88025subr.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_loop.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_me.c#1 branch .. //depot/projects/opencrypto/sys/net/if_mib.c#4 integrate .. //depot/projects/opencrypto/sys/net/if_stf.c#6 integrate .. //depot/projects/opencrypto/sys/net/if_tun.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_types.h#2 integrate .. //depot/projects/opencrypto/sys/net/if_var.h#4 integrate .. //depot/projects/opencrypto/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/opencrypto/sys/net/netmap_user.h#3 integrate .. //depot/projects/opencrypto/sys/net/route.c#3 integrate .. //depot/projects/opencrypto/sys/net/vnet.h#2 integrate .. //depot/projects/opencrypto/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/opencrypto/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/opencrypto/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c#2 integrate .. //depot/projects/opencrypto/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/opencrypto/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/opencrypto/sys/netgraph/ng_frame_relay.c#2 integrate .. //depot/projects/opencrypto/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/accf_http.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc_cdg.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc_chd.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc_hd.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc_htcp.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc_vegas.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/if_ether.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/igmp.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/in.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/in.h#3 integrate .. //depot/projects/opencrypto/sys/netinet/in_gif.c#6 integrate .. //depot/projects/opencrypto/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/opencrypto/sys/netinet/in_proto.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/in_var.h#3 integrate .. //depot/projects/opencrypto/sys/netinet/ip_carp.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/ip_gre.h#3 delete .. //depot/projects/opencrypto/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/ip_input.c#5 integrate .. //depot/projects/opencrypto/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/opencrypto/sys/netinet/ip_output.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/opencrypto/sys/netinet/siftr.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_sack.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_timewait.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_usrreq.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/opencrypto/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/opencrypto/sys/netinet6/frag6.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6.c#5 integrate .. //depot/projects/opencrypto/sys/netinet6/in6.h#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_gif.c#6 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_gre.c#1 branch .. //depot/projects/opencrypto/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/opencrypto/sys/netinet6/mld6.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/nd6.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/nd6.h#2 integrate .. //depot/projects/opencrypto/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/scope6.c#4 integrate .. //depot/projects/opencrypto/sys/netinet6/scope6_var.h#4 integrate .. //depot/projects/opencrypto/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/opencrypto/sys/netipsec/ipsec.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/opencrypto/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/opencrypto/sys/netipsec/key.c#3 integrate .. //depot/projects/opencrypto/sys/netipsec/xform_ah.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/xform_ipcomp.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/xform_ipip.c#3 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw2.c#4 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_dynamic.c#4 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_pfil.c#2 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_private.h#5 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_table.c#4 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/if_pfsync.c#5 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.c#6 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/mcg.c#4 integrate .. //depot/projects/opencrypto/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/opencrypto/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/opencrypto/sys/powerpc/conf/GENERIC64#3 integrate .. //depot/projects/opencrypto/sys/powerpc/conf/WII#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powerpc/copyinout.c#3 integrate .. //depot/projects/opencrypto/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/opencrypto/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/opencrypto/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/opencrypto/sys/sys/buf_ring.h#2 integrate .. //depot/projects/opencrypto/sys/sys/conf.h#2 integrate .. //depot/projects/opencrypto/sys/sys/disk.h#2 integrate .. //depot/projects/opencrypto/sys/sys/domain.h#2 integrate .. //depot/projects/opencrypto/sys/sys/file.h#4 integrate .. //depot/projects/opencrypto/sys/sys/filedesc.h#4 integrate .. //depot/projects/opencrypto/sys/sys/lockmgr.h#3 integrate .. //depot/projects/opencrypto/sys/sys/param.h#7 integrate .. //depot/projects/opencrypto/sys/sys/poll.h#2 integrate .. //depot/projects/opencrypto/sys/sys/protosw.h#4 integrate .. //depot/projects/opencrypto/sys/sys/random.h#2 integrate .. //depot/projects/opencrypto/sys/sys/seq.h#2 integrate .. //depot/projects/opencrypto/sys/sys/sf_base.h#2 delete .. //depot/projects/opencrypto/sys/sys/sf_sync.h#2 delete .. //depot/projects/opencrypto/sys/sys/sockbuf.h#3 integrate .. //depot/projects/opencrypto/sys/sys/socket.h#2 integrate .. //depot/projects/opencrypto/sys/sys/socketvar.h#4 integrate .. //depot/projects/opencrypto/sys/sys/syscall.h#3 integrate .. //depot/projects/opencrypto/sys/sys/syscall.mk#3 integrate .. //depot/projects/opencrypto/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/opencrypto/sys/sys/sysctl.h#4 integrate .. //depot/projects/opencrypto/sys/sys/sysent.h#3 integrate .. //depot/projects/opencrypto/sys/sys/sysproto.h#3 integrate .. //depot/projects/opencrypto/sys/sys/systm.h#6 integrate .. //depot/projects/opencrypto/sys/sys/terminal.h#3 integrate .. //depot/projects/opencrypto/sys/sys/ucred.h#3 integrate .. //depot/projects/opencrypto/sys/sys/user.h#4 integrate .. //depot/projects/opencrypto/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/opencrypto/sys/vm/default_pager.c#2 integrate .. //depot/projects/opencrypto/sys/vm/swap_pager.c#2 integrate .. //depot/projects/opencrypto/sys/vm/uma_core.c#3 integrate .. //depot/projects/opencrypto/sys/vm/vm_page.c#5 integrate .. //depot/projects/opencrypto/sys/x86/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/opencrypto/tests/sys/Makefile#3 integrate Differences ... ==== //depot/projects/opencrypto/etc/mtree/BSD.tests.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/etc/mtree/BSD.tests.dist 273771 2014-10-28 10:39:41Z bapt $ +# $FreeBSD: head/etc/mtree/BSD.tests.dist 274149 2014-11-05 22:50:33Z markj $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -17,6 +17,8 @@ doc atf .. + pjdfstest + .. .. .. tests @@ -87,12 +89,64 @@ test-programs .. .. + libc + c063 + .. + db + .. + gen + execve + .. + posix_spawn + .. + .. + hash + data + .. + .. + inet + .. + locale + .. + net + getaddrinfo + data + .. + .. + .. + regex + data + .. + .. + ssp + .. + stdio + .. + stdlib + .. + string + .. + sys + .. + time + .. + tls + dso + .. + .. + termios + .. + ttyio + .. + .. libcrypt .. libmp .. libnv .. + libpam + .. libproc .. libutil @@ -145,6 +199,38 @@ .. opencrypto .. + pjdfstest + chflags + .. + chmod + .. + chown + .. + ftruncate + .. + granular + .. + link + .. + mkdir + .. + mkfifo + .. + mknod + .. + open + .. + rename + .. + rmdir + .. + symlink + .. + truncate + .. + unlink + .. + .. .. usr.bin apply ==== //depot/projects/opencrypto/share/man/man4/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: head/share/man/man4/Makefile 273515 2014-10-23 04:47:32Z bryanv $ +# $FreeBSD: head/share/man/man4/Makefile 274331 2014-11-09 21:33:01Z melifaro $ .include @@ -132,7 +132,6 @@ et.4 \ eventtimers.4 \ exca.4 \ - faith.4 \ fatm.4 \ fd.4 \ fdc.4 \ @@ -252,6 +251,7 @@ malo.4 \ mcd.4 \ md.4 \ + me.4 \ mem.4 \ meteor.4 \ mfi.4 \ @@ -636,7 +636,6 @@ MLINKS+=enc.4 if_enc.4 MLINKS+=epair.4 if_epair.4 MLINKS+=et.4 if_et.4 -MLINKS+=faith.4 if_faith.4 MLINKS+=fatm.4 if_fatm.4 MLINKS+=fd.4 stderr.4 \ fd.4 stdin.4 \ ==== //depot/projects/opencrypto/share/man/man4/dpt.4#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" (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/share/man/man4/dpt.4 159734 2006-06-18 14:37:48Z brueffer $ +.\" $FreeBSD: head/share/man/man4/dpt.4 274481 2014-11-13 20:09:47Z jhb $ .\" -.Dd June 18, 2006 +.Dd November 13, 2014 .Dt DPT 4 .Os .Sh NAME @@ -40,9 +40,6 @@ For one or more EISA cards: .Cd "device eisa" .Pp -For one or more ISA cards: -.Cd "device isa" -.Pp For one or more PCI cards: .Cd "device pci" .Pp ==== //depot/projects/opencrypto/share/man/man4/gre.4#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/gre.4 267938 2014-06-26 21:46:14Z bapt $ +.\" $FreeBSD: head/share/man/man4/gre.4 274246 2014-11-07 19:13:19Z ae $ .\" -.Dd June 20, 2008 +.Dd November 7, 2014 .Dt GRE 4 .Os .Sh NAME @@ -68,162 +68,30 @@ .Cm destroy subcommands. .Pp -This driver currently supports the following modes of operation: -.Bl -tag -width indent -.It "GRE encapsulation (IP protocol number 47)" -Encapsulated datagrams are -prepended an outer datagram and a GRE header. +This driver corresponds to RFC 2784. +Encapsulated datagrams are prepended an outer datagram and a GRE header. The GRE header specifies the type of the encapsulated datagram and thus allows for tunneling other protocols than IP. GRE mode is also the default tunnel mode on Cisco routers. -This is also the default mode of operation of the -.Nm -interfaces. -As part of the GRE mode, .Nm also supports Cisco WCCP protocol, both version 1 and version 2. -Since there is no reliable way to distinguish between WCCP versions, it -should be configured manually using the -.Cm link2 -flag. -If the -.Cm link2 -flag is not set (default), then WCCP version 1 is selected. -.It "MOBILE encapsulation (IP protocol number 55)" -Datagrams are -encapsulated into IP, but with a shorter encapsulation. -The original -IP header is modified and the modifications are inserted between the -so modified header and the original payload. -Like -.Xr gif 4 , -only for IP-in-IP encapsulation. -.El .Pp The .Nm -interfaces support a number of -.Xr ioctl 2 Ns s , -such as: -.Bl -tag -width ".Dv GRESADDRS" -.It Dv GRESADDRS -Set the IP address of the local tunnel end. -This is the source address -set by or displayed by -.Xr ifconfig 8 -for the -.Nm -interface. -.It Dv GRESADDRD -Set the IP address of the remote tunnel end. -This is the destination address -set by or displayed by -.Xr ifconfig 8 -for the -.Nm -interface. -.It Dv GREGADDRS -Query the IP address that is set for the local tunnel end. -This is the -address the encapsulation header carries as local address (i.e., the real -address of the tunnel start point). -.It Dv GREGADDRD -Query the IP address that is set for the remote tunnel end. -This is the -address the encapsulated packets are sent to (i.e., the real address of -the remote tunnel endpoint). -.It Dv GRESPROTO -Set the operation mode to the specified IP protocol value. -The -protocol is passed to the interface in -.Po Vt "struct ifreq" Pc Ns Li -> Ns Va ifr_flags . -The operation mode can also be given as -.Pp -.Bl -tag -width ".Cm -link0" -compact -.It Cm link0 -.Dv IPPROTO_GRE -.It Cm -link0 -.Dv IPPROTO_MOBILE -.El -.Pp -to -.Xr ifconfig 8 . -.Pp -The -.Cm link1 -flag is not used to choose encapsulation, but to modify the -internal route search for the remote tunnel endpoint, see the -.Sx BUGS -section below. -.It Dv GREGPROTO -Query operation mode. -.It Dv GRESKEY +interfaces support a number of additional parameters to the +.Xr ifconfig 8 : +.Bl -tag -width "enable_csum" +.It Ar grekey Set the GRE key used for outgoing packets. A value of 0 disables the key option. -.It Dv GREGKEY -Get the GRE key currently used for outgoing packets. -0 means no outgoing key. +.It Ar enable_csum +Enables checksum calculation for outgoing packets. +.It Ar enable_seq +Enables use of sequence number field in the GRE header for outgoing packets. .El -.Pp -Note that the IP addresses of the tunnel endpoints may be the same as the -ones defined with -.Xr ifconfig 8 -for the interface (as if IP is encapsulated), but need not be. .Sh EXAMPLES -Configuration example: -.Bd -literal -Host X-- Host A ----------------tunnel---------- Cisco D------Host E - \\ | - \\ / - +------Host B----------Host C----------+ -.Ed .Pp -On host A -.Pq Fx : -.Bd -literal -offset indent -route add default B -ifconfig greN create -ifconfig greN A D netmask 0xffffffff linkX up -ifconfig greN tunnel A D -route add E D -.Ed -.Pp -On Host D (Cisco): -.Bd -literal -offset indent -Interface TunnelX - ip unnumbered D ! e.g. address from Ethernet interface - tunnel source D ! e.g. address from Ethernet interface - tunnel destination A -ip route C -ip route A mask C -ip route X mask tunnelX -.Ed -.Pp -OR -.Pp -On Host D -.Pq Fx : -.Bd -literal -offset indent -route add default C -ifconfig greN create -ifconfig greN D A -ifconfig greN tunnel D A -.Ed -.Pp -If all goes well, you should see packets flowing ;-) -.Pp -If you want to reach Host A over the tunnel (from Host D (Cisco)), then -you have to have an alias on Host A for e.g.\& the Ethernet interface like: -.Pp -.Dl "ifconfig alias Y" -.Pp -and on the Cisco: -.Pp -.Dl "ip route Y mask tunnelX" -.Pp -A similar setup can be used to create a link between two private networks -(for example in the 192.168 subnet) over the Internet: .Bd -literal 192.168.1.* --- Router A -------tunnel-------- Router B --- 192.168.2.* \\ / @@ -238,29 +106,22 @@ On router A: .Bd -literal -offset indent ifconfig greN create -ifconfig greN 192.168.1.1 192.168.2.1 link1 -ifconfig greN tunnel A B +ifconfig greN inet 192.168.1.1 192.168.2.1 +ifconfig greN inet tunnel A B route add -net 192.168.2 -netmask 255.255.255.0 192.168.2.1 .Ed .Pp On router B: .Bd -literal -offset indent ifconfig greN create -ifconfig greN 192.168.2.1 192.168.1.1 link1 -ifconfig greN tunnel B A +ifconfig greN inet 192.168.2.1 192.168.1.1 +ifconfig greN inet tunnel B A route add -net 192.168.1 -netmask 255.255.255.0 192.168.1.1 .Ed -.Pp -Note that this is a safe situation where the -.Cm link1 -flag (as discussed in the -.Sx BUGS -section below) may (and probably should) be set. .Sh NOTES The MTU of .Nm interfaces is set to 1476 by default, to match the value used by Cisco routers. -If grekey is set this is lowered to 1472. This may not be an optimal value, depending on the link between the two tunnel endpoints. It can be adjusted via @@ -268,25 +129,8 @@ .Pp For correct operation, the .Nm -device needs a route to the destination that is less specific than the -one over the tunnel. -(Basically, there needs to be a route to the decapsulating host that -does not run over the tunnel, as this would be a loop.) -If the addresses are ambiguous, doing the -.Nm ifconfig Cm tunnel -step before the -.Xr ifconfig 8 -call to set the -.Nm -IP addresses will help to find a route outside the tunnel. -.Pp -In order to tell -.Xr ifconfig 8 -to actually mark the interface as -.Dq up , -the keyword -.Cm up -must be given last on its command line. +device needs a route to the decapsulating host that does not run over the tunnel, +as this would be a loop. .Pp The kernel must be set to forward datagrams by setting the .Va net.inet.ip.forwarding @@ -296,41 +140,20 @@ .Xr gif 4 , .Xr inet 4 , .Xr ip 4 , +.Xr me 4 , .Xr netintro 4 , -.\" Xr options 4 , .Xr protocols 5 , .Xr ifconfig 8 , .Xr sysctl 8 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 15 14:18:03 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B78D4DB; Sat, 15 Nov 2014 14:18:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D00B54D9 for ; Sat, 15 Nov 2014 14:18:02 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A3093D26 for ; Sat, 15 Nov 2014 14:18:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sAFEI25j005149 for ; Sat, 15 Nov 2014 14:18:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sAFEI2wx005146 for perforce@freebsd.org; Sat, 15 Nov 2014 14:18:02 GMT (envelope-from jhb@freebsd.org) Date: Sat, 15 Nov 2014 14:18:02 GMT Message-Id: <201411151418.sAFEI2wx005146@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1202852 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Nov 2014 14:18:03 -0000 http://p4web.freebsd.org/@@1202852?ac=10 Change 1202852 by jhb@jhb_pippin on 2014/11/15 14:17:13 MFC: Fix ipdivert version. Affected files ... .. //depot/projects/multipass/sys/netinet/ip_divert.c#13 edit Differences ... ==== //depot/projects/multipass/sys/netinet/ip_divert.c#13 (text+ko) ==== @@ -836,5 +836,5 @@ }; DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); -MODULE_DEPEND(ipdivert, ipfw, 2, 2, 2); +MODULE_DEPEND(ipdivert, ipfw, 3, 3, 3); MODULE_VERSION(ipdivert, 1); From owner-p4-projects@FreeBSD.ORG Sat Nov 15 19:28:42 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E38567B9; Sat, 15 Nov 2014 19:28:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A420F7B7 for ; Sat, 15 Nov 2014 19:28:41 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 90D0FCFD for ; Sat, 15 Nov 2014 19:28:41 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sAFJSfoW084140 for ; Sat, 15 Nov 2014 19:28:41 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sAFJSfhT084137 for perforce@freebsd.org; Sat, 15 Nov 2014 19:28:41 GMT (envelope-from jmg@freebsd.org) Date: Sat, 15 Nov 2014 19:28:41 GMT Message-Id: <201411151928.sAFJSfhT084137@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1202855 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Nov 2014 19:28:42 -0000 http://p4web.freebsd.org/@@1202855?ac=10 Change 1202855 by jmg@jmg_carbon2 on 2014/11/15 19:28:00 minor updates... Sponsored by: FreeBSD Foundation Sponsored by: Netgate Affected files ... .. //depot/projects/opencrypto/share/man/man9/crypto.9#6 edit Differences ... ==== //depot/projects/opencrypto/share/man/man9/crypto.9#6 (text+ko) ==== @@ -215,7 +215,8 @@ .It Va cri_iv Contains an explicit initialization vector (IV), if it does not prefix the data. -This field is ignored during initialization. +This field is ignored during initialization +.Pq Nm crypto_newsession . If no IV is explicitly passed (see below on details), a random IV is used by the device driver processing the request. .It Va cri_next @@ -409,6 +410,8 @@ Otherwise, the key is taken at newsession time from the .Va cri_key field. +As calculating the key schedule may take a while, it is recommended that often +used keys are given their own session. .It Dv CRD_F_COMP For compression algorithms, this bit is set when compression is required (when not set, decompression is performed).