From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 13 14:50:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DA941065677 for ; Mon, 13 Jul 2009 14:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 794148FC19 for ; Mon, 13 Jul 2009 14:50:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6DEo2Q5020530 for ; Mon, 13 Jul 2009 14:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6DEo2H1020529; Mon, 13 Jul 2009 14:50:02 GMT (envelope-from gnats) Resent-Date: Mon, 13 Jul 2009 14:50:02 GMT Resent-Message-Id: <200907131450.n6DEo2H1020529@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, Gleb Kurtsou Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 548DB106566B for ; Mon, 13 Jul 2009 14:45:04 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 291C18FC1F for ; Mon, 13 Jul 2009 14:45:04 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6DEj4iW046988 for ; Mon, 13 Jul 2009 14:45:04 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n6DEj3Rt046987; Mon, 13 Jul 2009 14:45:03 GMT (envelope-from nobody) Message-Id: <200907131445.n6DEj3Rt046987@www.freebsd.org> Date: Mon, 13 Jul 2009 14:45:03 GMT From: Gleb Kurtsou To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/136720: [PATCH] fix fuse-kmod port on -CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2009 14:50:03 -0000 >Number: 136720 >Category: ports >Synopsis: [PATCH] fix fuse-kmod port on -CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jul 13 14:50:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Gleb Kurtsou >Release: 8.0-BETA1 >Organization: >Environment: >Description: sysutils/fuse-kmod port is marked BROKEN on CURRENT. Fix it >How-To-Repeat: >Fix: patch attached Patch attached with submission follows: diff -ur fusefs-kmod.orig/Makefile fusefs-kmod/Makefile --- fusefs-kmod.orig/Makefile 2009-06-16 17:55:36.000000000 +0300 +++ fusefs-kmod/Makefile 2009-07-13 17:39:20.894497204 +0300 @@ -58,10 +58,6 @@ .include -.if (${OSVERSION} >= 800000) -BROKEN= does not build on 8.x -.endif - .if !exists(${SRC_BASE}/sys/Makefile) IGNORE= requires the Kernel source to be installed. Set SRC_BASE if it is not in /usr/src .endif diff -ur fusefs-kmod.orig/files/patch-fuse_module__fuse.h fusefs-kmod/files/patch-fuse_module__fuse.h --- fusefs-kmod.orig/files/patch-fuse_module__fuse.h 2009-05-27 19:25:38.000000000 +0300 +++ fusefs-kmod/files/patch-fuse_module__fuse.h 2009-07-13 17:39:20.875493462 +0300 @@ -1,5 +1,5 @@ ---- fuse_module/fuse.h.orig 2008-02-05 00:25:57.000000000 -0500 -+++ fuse_module/fuse.h 2009-05-13 18:40:19.000000000 -0400 +--- fuse_module/fuse.h.orig 2009-07-13 17:18:21.485280879 +0300 ++++ fuse_module/fuse.h 2009-07-13 17:24:12.237354466 +0300 @@ -25,6 +25,22 @@ #endif #endif @@ -23,7 +23,7 @@ #ifndef VOP_OPEN_TAKES_FP #if __FreeBSD_version >= 700044 #define VOP_OPEN_TAKES_FP 1 -@@ -49,6 +65,14 @@ +@@ -49,6 +65,20 @@ #endif #endif @@ -35,6 +35,12 @@ +#endif +#endif + ++#if __FreeBSD_version >= 800096 ++#define USE_VFS_BIO_SET_VALID 1 ++#else ++#define USE_VFS_BIO_SET_VALID 0 ++#endif ++ #ifndef USE_PRIVILEGE_API /* * __FreeBSD_version bump was omitted for introduction of diff -ur fusefs-kmod.orig/files/patch-fuse_module__fuse_io.c fusefs-kmod/files/patch-fuse_module__fuse_io.c --- fusefs-kmod.orig/files/patch-fuse_module__fuse_io.c 2008-09-26 21:26:35.000000000 +0300 +++ fusefs-kmod/files/patch-fuse_module__fuse_io.c 2009-07-13 17:39:20.861493009 +0300 @@ -1,5 +1,5 @@ ---- fuse_module/fuse_io.c.orig 2008-02-05 00:25:57.000000000 -0500 -+++ fuse_module/fuse_io.c 2008-09-26 13:15:56.000000000 -0400 +--- fuse_module/fuse_io.c.orig 2009-07-13 17:18:21.495282010 +0300 ++++ fuse_module/fuse_io.c 2009-07-13 17:24:33.917356534 +0300 @@ -157,7 +157,11 @@ goto out; @@ -13,7 +13,20 @@ goto out; uio->uio_offset = va.va_size; } else if ((flags & FOF_OFFSET) == 0) -@@ -823,7 +827,11 @@ +@@ -745,7 +749,12 @@ + bp->b_dirtyoff = on; + bp->b_dirtyend = on + n; + } ++#if USE_VFS_BIO_SET_VALID ++ vfs_bio_set_valid(bp, on, n); ++#else + vfs_bio_set_validclean(bp, on, n); ++#endif ++ + } + + bwrite(bp); +@@ -823,7 +832,11 @@ #if FUSELIB_CONFORM_BIOREAD struct vattr va; >Release-Note: >Audit-Trail: >Unformatted: