Attachment #91130 for bug #128422

View | Details | Raw Unified | Return to bug 128422
Collapse All | Expand All




#

PORTNAME=	hso
PORTVERSION=	20081023
PORTREVISION=	1
CATEGORIES=	comms kld
MASTER_SITES=	http://www.shapeshifter.se/pub/hso/
PKGNAMESUFFIX=	-kmod


.include <bsd.port.pre.mk>

.if ${OSVERSION} >= 800045
BROKEN=	Does not compile with the new MPSAFE TTY layer
.endif

.if !defined(WITHOUT_HSOCTL)
HSOCTL_VERSION=	20081023
DISTFILES+=	hsoctl-${HSOCTL_VERSION}${EXTRACT_SUFX}
WRKSRC_HSOCTL=	${WRKDIR}/hsoctl-${HSOCTL_VERSION}
PLIST_SUB+=	PL_HSOCTL=""

Lines 1-6 Link Here

(-)hso-kmod/distinfo (-6 / +6 lines)
1	MD5 (hso-20080514.tar.gz) = 72162021aa4d05304537bf83389f77a6	1	MD5 (hso-20081023.tar.gz) = c431eba366d7fb36dbd30e2e8f992457
2	SHA256 (hso-20080514.tar.gz) = 9c72974973e8f11cdcd42c251adab0780180a9dc5f098ee8968520db02564f9f	2	SHA256 (hso-20081023.tar.gz) = 8ab6cf4bc0208dbe76cdf41422b573afb811e6075c99e97f38f5377f47bc648c
3	SIZE (hso-20080514.tar.gz) = 10345	3	SIZE (hso-20081023.tar.gz) = 12326
4	MD5 (hsoctl-20080812.tar.gz) = 680675da75c75b58790fe226b87e122b	4	MD5 (hsoctl-20081023.tar.gz) = f19ebf0022758326837ce4db0684be6d
5	SHA256 (hsoctl-20080812.tar.gz) = 925cc427f1895c13ff986821babc30ff40d1318040cd63efadb4ca7acb9d6d2c	5	SHA256 (hsoctl-20081023.tar.gz) = fe20461852c72ed554c5f1cf7dd98f9dd2a5217fc4b4a2ca3e1e7ade301ba8fe
6	SIZE (hsoctl-20080812.tar.gz) = 6779	6	SIZE (hsoctl-20081023.tar.gz) = 8360

Lines 1-9 Link Here

(-)hso-kmod/files/HSOCTL-DEBUG-patch-Makefile (-4 / +5 lines)
1	--- Makefile.orig 2008-05-14 14:18:53.751411172 +0200	1	--- Makefile.orig 2008-10-23 15:45:28.158855941 +0200
2	+++ Makefile 2008-05-14 14:19:01.497294028 +0200	2	+++ Makefile 2008-10-23 15:45:53.171672654 +0200
3	@@ -1,5 +1,5 @@	3	@@ -1,6 +1,6 @@
4	SRCS= hsoctl.c	4	SRCS= hsoctl.c
5	PROG= hsoctl	5	PROG= hsoctl
6	-CFLAGS+= -g	6	-CFLAGS+= -g
7	+#CFLAGS+= -g	7	+#CFLAGS+= -g
		8	LDFLAGS+= -lutil
		9	DESTDIR?= /usr/local
8		10
9	.include <bsd.prog.mk>

Lines 1-7 Link Here

(-)hso-kmod/files/option-icon.conf.sample (-1 / +1 lines)
1	attach 100 {	1	attach 100 {
2	match "device-name" "umass[0-9]+";	2	match "device-name" "umass[0-9]+";
3	match "vendor" "0x0af0";	3	match "vendor" "0x0af0";
4	match "product" "0x6911\|0x6971\|0x7251\|0x7401";	4	match "product" "0x6911\|0x6971\|0x7251\|0x7401\|0x7011\|0x7501";
5	match "devclass" "0x00";	5	match "devclass" "0x00";
6	action "sleep 1; /sbin/camcontrol cmd `/sbin/camcontrol devlist \| /usr/bin/grep ZCOPTION \| /usr/bin/awk '{match($11, /pass[0-9]+/); print substr($11, RSTART, RLENGTH) }'` -c '01 00 00 00 00 00' -i 1 i1 > /dev/null";	6	action "sleep 1; /sbin/camcontrol cmd `/sbin/camcontrol devlist \| /usr/bin/grep ZCOPTION \| /usr/bin/awk '{match($11, /pass[0-9]+/); print substr($11, RSTART, RLENGTH) }'` -c '01 00 00 00 00 00' -i 1 i1 > /dev/null";
7	};	7	};




--- if_hso.c.orig	2008-05-18 15:16:15.402471749 +0200
+++ if_hso.c	2008-05-18 15:16:54.689656014 +0200
@@ -831,7 +831,7 @@
 
 	ht = tp->t_sc;
 	if (cnt > ht->ht_obufsz) {
-		DPRINTF(1, "too many bytes %d, reducing to %d\n",
+		DPRINTF(1, "too many bytes %d, reducing to %zd\n",
 		    cnt, ht->ht_obufsz);
 		cnt = ht->ht_obufsz;
 	}
@@ -1005,7 +1005,7 @@
 	len = m->m_pkthdr.len - ETHER_HDR_LEN;
 	m_copydata(m, ETHER_HDR_LEN, len, ib->ib_buf);
 
-	DPRINTF(5, "hso_if_start: mlen=%d, len=%d\n",
+	DPRINTF(5, "hso_if_start: mlen=%d, len=%zd\n",
 	    m->m_pkthdr.len, len);
 
 	m_freem(m);

Return to bug 128422

Lines 6-13 Link Here

(-)hso-kmod/Makefile (-7 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= hso	8	PORTNAME= hso
9	PORTVERSION= 20080514	9	PORTVERSION= 20081023
10	PORTREVISION= 1
11	CATEGORIES= comms kld	10	CATEGORIES= comms kld
12	MASTER_SITES= http://www.shapeshifter.se/pub/hso/	11	MASTER_SITES= http://www.shapeshifter.se/pub/hso/
13	PKGNAMESUFFIX= -kmod	12	PKGNAMESUFFIX= -kmod
Lines 31-42 Link Here
31		30
32	.include <bsd.port.pre.mk>	31	.include <bsd.port.pre.mk>
33		32
34	.if ${OSVERSION} >= 800045
35	BROKEN= Does not compile with the new MPSAFE TTY layer
36	.endif
37
38	.if !defined(WITHOUT_HSOCTL)	33	.if !defined(WITHOUT_HSOCTL)
39	HSOCTL_VERSION= 20080812	34	HSOCTL_VERSION= 20081023
40	DISTFILES+= hsoctl-${HSOCTL_VERSION}${EXTRACT_SUFX}	35	DISTFILES+= hsoctl-${HSOCTL_VERSION}${EXTRACT_SUFX}
41	WRKSRC_HSOCTL= ${WRKDIR}/hsoctl-${HSOCTL_VERSION}	36	WRKSRC_HSOCTL= ${WRKDIR}/hsoctl-${HSOCTL_VERSION}
42	PLIST_SUB+= PL_HSOCTL=""	37	PLIST_SUB+= PL_HSOCTL=""

Lines 1-20 Link Here

(-)hso-kmod/files/patch-if_hso.c (-20 lines)
1	--- if_hso.c.orig 2008-05-18 15:16:15.402471749 +0200
2	+++ if_hso.c 2008-05-18 15:16:54.689656014 +0200
3	@@ -831,7 +831,7 @@
4
5	ht = tp->t_sc;
6	if (cnt > ht->ht_obufsz) {
7	- DPRINTF(1, "too many bytes %d, reducing to %d\n",
8	+ DPRINTF(1, "too many bytes %d, reducing to %zd\n",
9	cnt, ht->ht_obufsz);
10	cnt = ht->ht_obufsz;
11	}
12	@@ -1005,7 +1005,7 @@
13	len = m->m_pkthdr.len - ETHER_HDR_LEN;
14	m_copydata(m, ETHER_HDR_LEN, len, ib->ib_buf);
15
16	- DPRINTF(5, "hso_if_start: mlen=%d, len=%d\n",
17	+ DPRINTF(5, "hso_if_start: mlen=%d, len=%zd\n",
18	m->m_pkthdr.len, len);
19
20	m_freem(m);