From owner-svn-ports-all@FreeBSD.ORG Mon Nov 18 12:18:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B1813AA; Mon, 18 Nov 2013 12:18:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D469C2602; Mon, 18 Nov 2013 12:18:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAICI5I0076430; Mon, 18 Nov 2013 12:18:05 GMT (envelope-from fjoe@svn.freebsd.org) Received: (from fjoe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAICI5HS076428; Mon, 18 Nov 2013 12:18:05 GMT (envelope-from fjoe@svn.freebsd.org) Message-Id: <201311181218.rAICI5HS076428@svn.freebsd.org> From: Max Khon Date: Mon, 18 Nov 2013 12:18:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334177 - head/misc/dahdi-kmod26/files X-SVN-Group: ports-head 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.16 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: Mon, 18 Nov 2013 12:18:06 -0000 Author: fjoe Date: Mon Nov 18 12:18:05 2013 New Revision: 334177 URL: http://svnweb.freebsd.org/changeset/ports/334177 Log: Unbreak on FreeBSD 10 and clang. Added: head/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c (contents, props changed) head/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c (contents, props changed) Added: head/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c Mon Nov 18 12:18:05 2013 (r334177) @@ -0,0 +1,11 @@ +--- drivers/dahdi/dahdi-base.c.orig 2013-11-18 19:11:51.000000000 +0700 ++++ drivers/dahdi/dahdi-base.c 2013-11-18 19:12:07.000000000 +0700 +@@ -10224,6 +10224,8 @@ + .d_poll = dahdi_device_poll, + .d_name = "dahdi", + #if __FreeBSD_version >= 800039 ++ .d_flags = D_TRACKCLOSE | D_NEEDMINOR ++#elif __FreeBSD_version >= 800039 + .d_flags = D_PSEUDO | D_TRACKCLOSE | D_NEEDMINOR + #else + .d_flags = D_PSEUDO | D_TRACKCLOSE Added: head/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c Mon Nov 18 12:18:05 2013 (r334177) @@ -0,0 +1,31 @@ +--- drivers/dahdi/wctc4xxp/base.c.orig 2013-11-18 19:15:33.000000000 +0700 ++++ drivers/dahdi/wctc4xxp/base.c 2013-11-18 19:15:48.000000000 +0700 +@@ -2423,8 +2423,8 @@ + + if (unlikely(count > SFRAME_SIZE - sizeof(struct rtp_packet))) { + DTE_DEBUG(DTE_DEBUG_GENERAL, +- "Cannot transcode packet of %Zu bytes. This exceeds the " \ +- "maximum size of %Zu bytes.\n", count, ++ "Cannot transcode packet of %zu bytes. This exceeds the " \ ++ "maximum size of %zu bytes.\n", count, + SFRAME_SIZE - sizeof(struct rtp_packet)); + return -EINVAL; + } +@@ -2434,7 +2434,7 @@ + (G723_SID_BYTES != count)) { + DTE_DEBUG(DTE_DEBUG_GENERAL, + "Trying to transcode packet into G723 format " \ +- "that is %Zu bytes instead of the expected " \ ++ "that is %zu bytes instead of the expected " \ + "%d/%d/%d bytes.\n", count, G723_5K_BYTES, + G723_6K_BYTES, G723_SID_BYTES); + return -EINVAL; +@@ -2465,7 +2465,7 @@ + cpvt->seqno += 1; + + DTE_DEBUG(DTE_DEBUG_RTP_TX, +- "Sending packet of %Zu byte on channel (%p).\n", count, dtc); ++ "Sending packet of %zu byte on channel (%p).\n", count, dtc); + + atomic_inc(&cpvt->stats.packets_sent); + wctc4xxp_transmit_cmd(wc, cmd);