mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

- Unbreak on FreeBSD 11.

Browse Source 
- Switch to a newer snapshot that already contains port patches.
This commit is contained in:
Max Khon 2014-05-10 09:08:43 +00:00
parent e249ef8804
commit f280b7c404
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=353565
6 changed files with 4 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/dahdi-kmod26/Makefile
View File

@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}\
http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
MASTER_SITE_SUBDIR= fjoe
DISTNAME= dahdi-freebsd-${DAHDI_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}\
DISTFILES= ${DISTNAME}.tar.bz2\
oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
zaphfc-${ZAPHFC_VERSION}${EXTRACT_SUFX}
@ -18,7 +18,7 @@ COMMENT= Digium/Asterisk Hardware Device Interface
RUN_DEPENDS= ${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
DAHDI_VERSION= 2.6.1-r10738
DAHDI_VERSION= 2.6.1-r10747
DAHDI_TOOLS_VERSION= 2.4.0-rc1
OSLEC_VERSION= 2.6.35.4
ZAPHFC_VERSION= r5

4
misc/dahdi-kmod26/distinfo
View File

@ -1,5 +1,5 @@
SHA256 (dahdi-freebsd-2.6.1-r10738.tar.gz) = b39ffd3c2dea241e749f03c2902f8be5ae12305f5bc240382f3d2e651173dfa5
SIZE (dahdi-freebsd-2.6.1-r10738.tar.gz) = 1443352
SHA256 (dahdi-freebsd-2.6.1-r10747.tar.bz2) = b34f3f4dc3a9c3b22490bd506244cb3223732eb497606781b35234ad63490ee1
SIZE (dahdi-freebsd-2.6.1-r10747.tar.bz2) = 1439779
SHA256 (oslec-linux-2.6.35.4.tar.gz) = 01cfaa1ca64056c822d1a3ebf4f7b3c81127cd7b308ad5b0738ff4eb2026e261
SIZE (oslec-linux-2.6.35.4.tar.gz) = 12057
SHA256 (zaphfc-r5.tar.gz) = 7e809b62dcc2bd3caf2e5a882390051b881eb08d37fea1733d7fb55e80bc6756

8
misc/dahdi-kmod26/files/patch-bsd-kmod__Makefile.inc
View File

@ -1,8 +0,0 @@
--- bsd-kmod/Makefile.inc.orig 2012-02-26 21:53:27.000000000 +0100
+++ bsd-kmod/Makefile.inc 2014-01-26 19:46:54.000000000 +0100
@@ -19,4 +19,4 @@
TOUCH?= touch
beforeinstall:
- ${MKDIR} ${KMODDIR}
+ ${MKDIR} ${DESTDIR}${KMODDIR}

13
misc/dahdi-kmod26/files/patch-drivers-dahdi-dahdi-base.c
View File

@ -1,13 +0,0 @@
--- drivers/dahdi/dahdi-base.c.orig 2012-09-28 02:45:03.000000000 +0700
+++ drivers/dahdi/dahdi-base.c 2014-02-09 17:45:02.000000000 +0700
@@ -10223,7 +10223,9 @@
.d_ioctl = dahdi_device_ioctl,
.d_poll = dahdi_device_poll,
.d_name = "dahdi",
-#if __FreeBSD_version >= 800039
+#if __FreeBSD_version >= 1000000
+ .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

31
misc/dahdi-kmod26/files/patch-drivers-dahdi-wctc4xxp-base.c
View File

@ -1,31 +0,0 @@
--- 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);

33
misc/dahdi-kmod26/files/patch-mbuf
View File

@ -1,33 +0,0 @@
--- drivers/dahdi/dahdi_dynamic_eth.c.orig 2014-02-09 13:10:00.000000000 +0700
+++ drivers/dahdi/dahdi_dynamic_eth.c 2014-02-09 13:10:34.000000000 +0700
@@ -191,10 +191,10 @@
dev = z->dev;
spin_unlock_irqrestore(&zlock, flags);
#if defined(__FreeBSD__)
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m != NULL) {
if (sizeof(eh) + sizeof(zh) + msglen >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
}
/* copy ethernet header */
--- drivers/dahdi/dahdi_dynamic_ethmf.c.orig 2014-02-09 13:10:51.000000000 +0700
+++ drivers/dahdi/dahdi_dynamic_ethmf.c 2014-02-09 13:11:10.000000000 +0700
@@ -494,13 +494,13 @@
}
#if defined(__FreeBSD__)
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
rcu_read_unlock();
ethmf_errors_inc();
return;
}
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
/* copy ethernet header and reserve space for ztdeth header */
bcopy(dev->dev_addr, &eh.ether_shost, sizeof(eh.ether_shost));