From owner-svn-ports-all@freebsd.org Thu Mar 26 20:01:15 2020 Return-Path: Delivered-To: svn-ports-all@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 E82512602B9; Thu, 26 Mar 2020 20:01:15 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pG8C1KN2z3PSh; Thu, 26 Mar 2020 20:01:14 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 48C8AC129; Thu, 26 Mar 2020 20:01:01 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02QK102E001715; Thu, 26 Mar 2020 20:01:00 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02QK10cr001713; Thu, 26 Mar 2020 20:01:00 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <202003262001.02QK10cr001713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Thu, 26 Mar 2020 20:01:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529211 - in head/sysutils/xen-guest-tools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/sysutils/xen-guest-tools: . files X-SVN-Commit-Revision: 529211 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2020 20:01:16 -0000 Author: dinoex Date: Thu Mar 26 20:01:00 2020 New Revision: 529211 URL: https://svnweb.freebsd.org/changeset/ports/529211 Log: - fix build with llvm10 Submitted by: kevans Added: head/sysutils/xen-guest-tools/files/patch-fsys_zfs.h (contents, props changed) Modified: head/sysutils/xen-guest-tools/Makefile Modified: head/sysutils/xen-guest-tools/Makefile ============================================================================== --- head/sysutils/xen-guest-tools/Makefile Thu Mar 26 19:52:22 2020 (r529210) +++ head/sysutils/xen-guest-tools/Makefile Thu Mar 26 20:01:00 2020 (r529211) @@ -3,7 +3,7 @@ PORTNAME= xen-guest-tools PORTVERSION= 4.13.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://downloads.xenproject.org/release/xen/${PORTVERSION}/ DISTNAME= xen-${PORTVERSION} Added: head/sysutils/xen-guest-tools/files/patch-fsys_zfs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xen-guest-tools/files/patch-fsys_zfs.h Thu Mar 26 20:01:00 2020 (r529211) @@ -0,0 +1,20 @@ +--- tools/libfsimage/zfs/fsys_zfs.h.orig 2020-03-26 16:41:12 UTC ++++ tools/libfsimage/zfs/fsys_zfs.h +@@ -71,7 +71,7 @@ typedef unsigned int size_t; + * Can only be used in functions returning non-0 for failure. + */ + #define VERIFY_DN_TYPE(dnp, type) \ +- if (type && (dnp)->dn_type != type) { \ ++ if (type != DMU_OT_NONE && (dnp)->dn_type != type) { \ + return (ERR_FSYS_CORRUPT); \ + } + +@@ -80,7 +80,7 @@ typedef unsigned int size_t; + * Can only be used in functions returning 0 for failure. + */ + #define VERIFY_OS_TYPE(osp, type) \ +- if (type && (osp)->os_type != type) { \ ++ if (type != DMU_OST_NONE && (osp)->os_type != type) { \ + errnum = ERR_FSYS_CORRUPT; \ + return (0); \ + }