From owner-svn-ports-head@freebsd.org Sun Oct 27 00:11:58 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 854FD15E707 for ; Sun, 27 Oct 2019 00:11:58 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 470yvf33QSz3GZH for ; Sun, 27 Oct 2019 00:11:58 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 3FD4D3529 for ; Sun, 27 Oct 2019 00:11:58 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f172.google.com with SMTP id g50so9130477qtb.4 for ; Sat, 26 Oct 2019 17:11:58 -0700 (PDT) X-Gm-Message-State: APjAAAVFhra7XkWIFPpWe2BUq/g8lCHLseuzuSh5P+fA1aIl8Hv4SRDK 4phNcX/wHi9WNwe8/vv8iKNjN3Wbcm+urluqktA= X-Received: by 2002:a05:6214:1109:: with SMTP id e9mt2881585qvs.129.1572135117567; Sat, 26 Oct 2019 17:11:57 -0700 (PDT) MIME-Version: 1.0 References: <201910270008.x9R0843b089555@repo.freebsd.org> In-Reply-To: <201910270008.x9R0843b089555@repo.freebsd.org> From: Kyle Evans Date: Sat, 26 Oct 2019 19:11:46 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r515732 - head/emulators/qemu-sbruno Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Oct 2019 00:11:58 -0000 On Sat, Oct 26, 2019 at 7:08 PM Kyle Evans wrote: > > Author: kevans (src committer) > Date: Sun Oct 27 00:08:04 2019 > New Revision: 515732 > URL: https://svnweb.freebsd.org/changeset/ports/515732 > > Log: > qemu-user-static: pull in fixes for the 2.x branch > > Short list: > - __sysctlbyname(2) implemented > - posix_spawn breakage due to RFSPAWN averted > - some _umtx_op misbehavior fixed* > > Some _umtx_op operations were processing a timeout, but failed to pass in > the size of the timespec/_umtx_time to the kernel, passing in '0' instead. > This would cause unbounded sleep until interrupted, rather than timeout > expected by the caller. > > PR: 240763 > Approved by: ler (ports), sbruno (maintainer, implicit) > MFH: 2019Q4 (runtime fix) > > Modified: > head/emulators/qemu-sbruno/Makefile > head/emulators/qemu-sbruno/distinfo > > Modified: head/emulators/qemu-sbruno/Makefile > ============================================================================== > --- head/emulators/qemu-sbruno/Makefile Sat Oct 26 22:00:04 2019 (r515731) > +++ head/emulators/qemu-sbruno/Makefile Sun Oct 27 00:08:04 2019 (r515732) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= qemu > -PORTVERSION= 2.11.50.g20190730 > +PORTVERSION= 2.11.50.g20191026 > CATEGORIES= emulators > PKGNAMESUFFIX?= -sbruno > DIST_SUBDIR= qemu/${PORTVERSION} > @@ -12,7 +12,7 @@ COMMENT?= QEMU CPU Emulator - github bsd-user branch > > LICENSE= GPLv2 > USE_GITHUB= yes > -GH_TUPLE= seanbruno:qemu-bsd-user:7b21781 \ > +GH_TUPLE= seanbruno:qemu-bsd-user:5b85e90 \ > qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb > HAS_CONFIGURE= yes > USES= bison compiler:c11 gmake perl5 pkgconfig python:2.7,build > @@ -157,6 +157,9 @@ PLIST_SUB+= GTK2="" > > .if ${PORT_OPTIONS:MGNUTLS} > LIB_DEPENDS+= libgnutls.so:security/gnutls > +CONFIGURE_ARGS+= --enable-gnutls > +.else > +CONFIGURE_ARGS+= --disable-gnutls > .endif > > .if empty(PORT_OPTIONS:MSASL) > > Sorry, I forgot to explain this hunk (though it is somewhat self-explanatory, I think). =-( qemu will pick up gnutls if it's installed on the environment in some form, so we must explicitly disable it when it's not wanted. Thanks, Kyle Evans