From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 14 23:50:31 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D617E16A4CE for ; Mon, 14 Jun 2004 23:50:31 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64D7043D49 for ; Mon, 14 Jun 2004 23:50:31 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5ENoRn7059194 for ; Mon, 14 Jun 2004 23:50:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5ENoR8U059193; Mon, 14 Jun 2004 23:50:27 GMT (envelope-from gnats) Resent-Date: Mon, 14 Jun 2004 23:50:27 GMT Resent-Message-Id: <200406142350.i5ENoR8U059193@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Juergen Lock Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D253F16A4CE for ; Mon, 14 Jun 2004 23:48:22 +0000 (GMT) Received: from gwyn.kn-bremen.de (gwyn.kn-bremen.de [212.63.36.242]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE7543D41 for ; Mon, 14 Jun 2004 23:48:19 +0000 (GMT) (envelope-from nox@saturn.kn-bremen.de) Received: from gwyn.kn-bremen.de (uucp@gwyn [127.0.0.1]) i5ENmG3p029860 for ; Tue, 15 Jun 2004 01:48:16 +0200 Received: from saturn.kn-bremen.de (uucp@localhost)i5ENmG3s029858 for FreeBSD-gnats-submit@freebsd.org; Tue, 15 Jun 2004 01:48:16 +0200 Received: (from nox@localhost) by saturn.kn-bremen.de (8.11.4/8.8.5) id i5ENuIm92470; Tue, 15 Jun 2004 01:56:18 +0200 (CEST) Message-Id: <200406142356.i5ENuIm92470@saturn.kn-bremen.de> Date: Tue, 15 Jun 2004 01:56:18 +0200 (CEST) From: Juergen Lock To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/67950: update emulators/qemu to 0615 snapshot (supersedes ports/67948) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Juergen Lock List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2004 23:50:32 -0000 >Number: 67950 >Category: ports >Synopsis: update emulators/qemu to 0615 snapshot (supersedes ports/67948) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jun 14 23:50:27 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Juergen Lock >Release: FreeBSD 5.2.1-SECURITY i386 >Organization: me? organized?? >Environment: System: FreeBSD neptun 5.2.1-SECURITY FreeBSD 5.2.1-SECURITY #0: Sun Mar 28 22:11:39 GMT 2004 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Added ffree (for e.g. sun java), OS/2 Warp + FreeBSD 4.10 guest fixes, self modifying code fix, etc. And always loop thru /dev/tap[0-9] yourself, using /dev/tap doesn't seem to work too well for some people. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 11 Jun 2004 08:05:50 -0000 1.7 +++ Makefile 14 Jun 2004 21:48:57 -0000 @@ -6,10 +6,10 @@ # PORTNAME= qemu -PORTVERSION= 0.5.5.s.20040610 +PORTVERSION= 0.5.5.s.20040615 CATEGORIES= emulators -MASTER_SITES= http://dad-answers.com/qemu/ -DISTNAME= ${PORTNAME}-snapshot-2004-06-10_23-40 +MASTER_SITES= http://dad-answers.com/qemu/FreeBSD/ +DISTNAME= ${PORTNAME}-snapshot-2004-06-15_00 MAINTAINER= nox@jelal.kn-bremen.de COMMENT= QEMU CPU Emulator Index: distinfo =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 11 Jun 2004 08:05:50 -0000 1.5 +++ distinfo 14 Jun 2004 21:50:24 -0000 @@ -1,2 +1,2 @@ -MD5 (qemu-snapshot-2004-06-10_23-40.tar.bz2) = 639ccb380f3c5f8128ac1e96ddfbaee4 -SIZE (qemu-snapshot-2004-06-10_23-40.tar.bz2) = 662005 +MD5 (qemu-snapshot-2004-06-15_00.tar.bz2) = a42d32f3120526e8f9b7a98e40a08b45 +SIZE (qemu-snapshot-2004-06-15_00.tar.bz2) = 662037 Index: files/patch-bt =================================================================== RCS file: /home/ncvs/ports/emulators/qemu/files/patch-bt,v retrieving revision 1.1 diff -u -r1.1 patch-bt --- files/patch-bt 3 Jun 2004 02:12:52 -0000 1.1 +++ files/patch-bt 14 Jun 2004 19:20:00 -0000 @@ -9,7 +9,7 @@ #else #include #include -@@ -1022,6 +1025,34 @@ +@@ -1059,6 +1062,34 @@ #endif /* CONFIG_SLIRP */ @@ -44,14 +44,23 @@ #if !defined(_WIN32) #ifdef _BSD static int tun_open(char *ifname, int ifname_size) -@@ -1030,11 +1061,46 @@ +@@ -1067,11 +1098,55 @@ char *dev; struct stat s; +#ifdef __FreeBSD__ + int i, kldtried = 0, enoentcount = 0, err = 0; + char dname[100]; -+ for (i = -1; i < 10; i++) { ++#ifdef USE_DEVTAP ++ /* ++ * 5.x has /dev/tap, but that seems to just blindly increase its ++ * couter on every open() for some people(??), i.e. on every qemu run. ++ */ ++ i = -1; ++#else ++ i = 0; ++#endif ++ for (; i < 10; i++) { + if (i == -1) + strcpy(dname, "/dev/tap"); + else >Release-Note: >Audit-Trail: >Unformatted: