Date: Fri, 1 Nov 2013 22:00:00 GMT From: Dimitry Andric <dim@FreeBSD.org> To: freebsd-bugs@FreeBSD.org Subject: Re: misc/183543: Recommend misc/dahdi, misc/dahdi-kmod, misc/dahdi-kmod26 USE_GCC=any Message-ID: <201311012200.rA1M000s069071@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR misc/183543; it has been noted by GNATS.
From: Dimitry Andric <dim@FreeBSD.org>
To: bug-followup@FreeBSD.org,
dcecchin@gmail.com
Cc:
Subject: Re: misc/183543: Recommend misc/dahdi, misc/dahdi-kmod, misc/dahdi-kmod26 USE_GCC=any
Date: Fri, 1 Nov 2013 22:57:01 +0100
--Apple-Mail=_064F2295-1D5F-4E88-9692-C62D54756BCE
Content-Type: multipart/mixed;
boundary="Apple-Mail=_55E4C6DF-01E6-4831-A3E3-BD611151CD50"
--Apple-Mail=_55E4C6DF-01E6-4831-A3E3-BD611151CD50
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=us-ascii
An additional diff, to fix the problems in misc/dahdi-kmod. This
changes the following:
- Adds a patch to remove usage of D_PSEUDO on 10.x or later.
- Adds a patch to fix several uses of invalid format specifiers.
-Dimitry
--Apple-Mail=_55E4C6DF-01E6-4831-A3E3-BD611151CD50
Content-Disposition: attachment;
filename=misc__dahdi-kmod26-fix-pr183543-1.diff
Content-Type: application/octet-stream;
name="misc__dahdi-kmod26-fix-pr183543-1.diff"
Content-Transfer-Encoding: 7bit
Index: misc/dahdi-kmod26/files/patch-drivers__dahdi__dahdi-base.c
===================================================================
--- misc/dahdi-kmod26/files/patch-drivers__dahdi__dahdi-base.c (revision 0)
+++ misc/dahdi-kmod26/files/patch-drivers__dahdi__dahdi-base.c (working copy)
@@ -0,0 +1,13 @@
+--- drivers/dahdi/dahdi-base.c.orig 2012-09-27 21:45:03.000000000 +0200
++++ drivers/dahdi/dahdi-base.c 2013-11-01 22:44:10.000000000 +0100
+@@ -10223,7 +10223,9 @@
+ .d_ioctl = dahdi_device_ioctl,
+ .d_poll = dahdi_device_poll,
+ .d_name = "dahdi",
+-#if __FreeBSD_version >= 800039
++#if __FreeBSD_version >= 1000001
++ .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
Property changes on: misc/dahdi-kmod26/files/patch-drivers__dahdi__dahdi-base.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: misc/dahdi-kmod26/files/patch-drivers__dahdi__wctc4xxp__base.c
===================================================================
--- misc/dahdi-kmod26/files/patch-drivers__dahdi__wctc4xxp__base.c (revision 0)
+++ misc/dahdi-kmod26/files/patch-drivers__dahdi__wctc4xxp__base.c (working copy)
@@ -0,0 +1,31 @@
+--- drivers/dahdi/wctc4xxp/base.c.orig 2012-03-26 19:40:58.000000000 +0200
++++ drivers/dahdi/wctc4xxp/base.c 2013-11-01 22:51:09.000000000 +0100
+@@ -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);
Property changes on: misc/dahdi-kmod26/files/patch-drivers__dahdi__wctc4xxp__base.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--Apple-Mail=_55E4C6DF-01E6-4831-A3E3-BD611151CD50
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=us-ascii
--Apple-Mail=_55E4C6DF-01E6-4831-A3E3-BD611151CD50--
--Apple-Mail=_064F2295-1D5F-4E88-9692-C62D54756BCE
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename=signature.asc
Content-Type: application/pgp-signature;
name=signature.asc
Content-Description: Message signed with OpenPGP using GPGMail
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
iEYEARECAAYFAlJ0I7kACgkQsF6jCi4glqP1qgCgwIfqsMZCDur/D3fqpYdcJpe0
O0UAn2IRc+YhCn1+1uICzv5JcEs5uqjt
=KXiw
-----END PGP SIGNATURE-----
--Apple-Mail=_064F2295-1D5F-4E88-9692-C62D54756BCE--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311012200.rA1M000s069071>