From owner-svn-soc-all@FreeBSD.ORG Sun Sep 29 17:57:57 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 516A0D8A for ; Sun, 29 Sep 2013 17:57:57 +0000 (UTC) (envelope-from syuu@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB0D20CE for ; Sun, 29 Sep 2013 17:57:57 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8THvvr3035950 for ; Sun, 29 Sep 2013 17:57:57 GMT (envelope-from syuu@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8THvup1035942 for svn-soc-all@FreeBSD.org; Sun, 29 Sep 2013 17:57:56 GMT (envelope-from syuu@FreeBSD.org) Date: Sun, 29 Sep 2013 17:57:56 GMT Message-Id: <201309291757.r8THvup1035942@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to syuu@FreeBSD.org using -f From: syuu@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257792 - in soc2013/syuu/bhyve_usb/usr.sbin/bhyve: . usb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2013 17:57:57 -0000 Author: syuu Date: Sun Sep 29 17:57:56 2013 New Revision: 257792 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257792 Log: add combined-packet.c to Makefile Modified: soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c Modified: soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile ============================================================================== --- soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile Sun Sep 29 15:19:34 2013 (r257791) +++ soc2013/syuu/bhyve_usb/usr.sbin/bhyve/Makefile Sun Sep 29 17:57:56 2013 (r257792) @@ -19,7 +19,7 @@ CFLAGS+=-I${.CURDIR}/usb/include -I${.CURDIR} SRCS+= core.c hcd-uhci.c host-libusb.c dev-hub.c .PATH: ${.CURDIR}/usb/gpl -SRCS+= desc.c dev-serial.c bus.c iov.c hexdump.c +SRCS+= desc.c dev-serial.c bus.c iov.c hexdump.c combined-packet.c NO_MAN= Modified: soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c ============================================================================== --- soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c Sun Sep 29 15:19:34 2013 (r257791) +++ soc2013/syuu/bhyve_usb/usr.sbin/bhyve/usb/hcd-uhci.c Sun Sep 29 17:57:56 2013 (r257792) @@ -1686,17 +1686,19 @@ usb_hub_class_initfn(&dev->klass, NULL); usb_qdev_init(dev); } +#endif { USBDevice *dev = usb_serial_init(&sc->sc_st.bus); usb_serial_class_initfn(&dev->klass, NULL); usb_qdev_init(dev); } -#endif +#if 0 { USBDevice *dev = usb_host_init2(&sc->sc_st.bus); usb_host_class_initfn(&dev->klass, NULL); usb_qdev_init(dev); } +#endif return (0); } From owner-svn-soc-all@FreeBSD.ORG Thu Oct 3 11:37:23 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0B193CFA for ; Thu, 3 Oct 2013 11:37:23 +0000 (UTC) (envelope-from dpl@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DDE4F2B83 for ; Thu, 3 Oct 2013 11:37:22 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r93BbMCc087553 for ; Thu, 3 Oct 2013 11:37:22 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r93BbMNC087543 for svn-soc-all@FreeBSD.org; Thu, 3 Oct 2013 11:37:22 GMT (envelope-from dpl@FreeBSD.org) Date: Thu, 3 Oct 2013 11:37:22 GMT Message-Id: <201310031137.r93BbMNC087543@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to dpl@FreeBSD.org using -f From: dpl@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257871 - in soc2013/dpl: . head/lib/libzcap head/lib/libzcap/doc head/lib/libzcap/zlibworker head/usr.bin/bsdiff/bsdiff MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2013 11:37:23 -0000 Author: dpl Date: Thu Oct 3 11:37:22 2013 New Revision: 257871 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257871 Log: Changes commited to prepare diff for sending code to Google. Deleted: soc2013/dpl/head/lib/libzcap/doc/ soc2013/dpl/testbzip2.sh Modified: soc2013/dpl/head/lib/libzcap/commands.c soc2013/dpl/head/lib/libzcap/zlibworker/commands.c soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c Modified: soc2013/dpl/head/lib/libzcap/commands.c ============================================================================== --- soc2013/dpl/head/lib/libzcap/commands.c Thu Oct 3 10:17:07 2013 (r257870) +++ soc2013/dpl/head/lib/libzcap/commands.c Thu Oct 3 11:37:22 2013 (r257871) @@ -854,7 +854,7 @@ result = sendCommand(nvl, file); int ret = nvlist_get_number(result, "result"); - data = nvlist_get_binary(result, "data", &len); + data = nvlist_get_binary(result, "data", (size_t *) &len); memcpy(buf, data, (size_t)len); destroy(); return(ret); @@ -1034,7 +1034,7 @@ initNvl(); - nvlist_add_number(nvl, "command", ZCAPCMD_GZPUTC); + nvlist_add_number(nvl, "command", ZCAPCMD_GZERROR; nvlist_add_binary(args, "file", file, gzsize); nvlist_add_nvlist(nvl, "args", args); Modified: soc2013/dpl/head/lib/libzcap/zlibworker/commands.c ============================================================================== --- soc2013/dpl/head/lib/libzcap/zlibworker/commands.c Thu Oct 3 10:17:07 2013 (r257870) +++ soc2013/dpl/head/lib/libzcap/zlibworker/commands.c Thu Oct 3 11:37:22 2013 (r257871) @@ -324,7 +324,7 @@ len = nvlist_get_number(args, "len"); dataptr = nvlist_get_binary(args, "data", &len); file = (gzFile)nvlist_get_binary(args, "file", &gzsize); - fprintf(stderr, "zlibworker: gzwrite: len: %d\n", len); + fprintf(stderr, "zlibworker: gzwrite: len: %d\n", (int)len); fprintf(stderr, "zlibworker: gzwrite: dataptr: %p\n", dataptr); fprintf(stderr, "zlibworker: gzwrite: file: %p\n", file); data = malloc(len); Modified: soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c ============================================================================== --- soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c Thu Oct 3 10:17:07 2013 (r257870) +++ soc2013/dpl/head/usr.bin/bsdiff/bsdiff/bsdiff.c Thu Oct 3 11:37:22 2013 (r257871) @@ -214,11 +214,10 @@ FILE * pf; BZFILE * pfbz2; int bz2err; - cap_rights_t filerights, pathrights; + cap_rights_t rights; if(argc!=4) errx(1,"usage: %s oldfile newfile patchfile\n",argv[0]); - /* Capsicum */ if ((first = open(argv[1],O_RDONLY|O_BINARY,0)) < 0) err(1,"%s",argv[1]); if ((second = open(argv[2], O_RDONLY|O_BINARY, 0)) < 0) @@ -227,13 +226,14 @@ if ((pf = fopen(argv[3], "wb")) == NULL) err(1, "%s", argv[3]); - cap_rights_init(&filerights, CAP_READ, CAP_SEEK); - cap_rights_init(&pathrights, CAP_WRITE, CAP_SEEK); + cap_rights_init(&rights, CAP_READ, CAP_SEEK); if (cap_rights_limit(first, &filerights) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); if (cap_rights_limit(second, &filerights) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd"); + + cap_rights_set(&rights, CAP_WRITE, CAP_SEEK); if (cap_rights_limit(fileno(pf), &pathrights) < 0 && errno != ENOSYS) err(1, "Couldn't limit fd");