From c92c5e1dd4d29142f48a62ee2793992a4be78907 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 1 Nov 2008 22:10:20 +0000 Subject: - Update to 20081023 Note: - now builds against the new MPSAFE TTY layer (and still builds against the old one) - new product IDs added (0x7011 and 0x7501) - hsoctl now forks into background after a successful connection (use -d to disconnect, -n to get the old behavior) PR: 128422 Submitted by: Ganael Laplanche (maintainer) --- comms/hso-kmod/Makefile | 9 ++------- comms/hso-kmod/distinfo | 12 ++++++------ comms/hso-kmod/files/HSOCTL-DEBUG-patch-Makefile | 9 +++++---- comms/hso-kmod/files/option-icon.conf.sample | 2 +- comms/hso-kmod/files/patch-if_hso.c | 20 -------------------- 5 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 comms/hso-kmod/files/patch-if_hso.c (limited to 'comms') diff --git a/comms/hso-kmod/Makefile b/comms/hso-kmod/Makefile index 5ba80b753c60..4f479f573a32 100644 --- a/comms/hso-kmod/Makefile +++ b/comms/hso-kmod/Makefile @@ -6,8 +6,7 @@ # PORTNAME= hso -PORTVERSION= 20080514 -PORTREVISION= 1 +PORTVERSION= 20081023 CATEGORIES= comms kld MASTER_SITES= http://www.shapeshifter.se/pub/hso/ PKGNAMESUFFIX= -kmod @@ -31,12 +30,8 @@ MAN4= hso.4 .include -.if ${OSVERSION} >= 800045 -BROKEN= Does not compile with the new MPSAFE TTY layer -.endif - .if !defined(WITHOUT_HSOCTL) -HSOCTL_VERSION= 20080812 +HSOCTL_VERSION= 20081023 DISTFILES+= hsoctl-${HSOCTL_VERSION}${EXTRACT_SUFX} WRKSRC_HSOCTL= ${WRKDIR}/hsoctl-${HSOCTL_VERSION} PLIST_SUB+= PL_HSOCTL="" diff --git a/comms/hso-kmod/distinfo b/comms/hso-kmod/distinfo index f869433aada9..d19200a78bcf 100644 --- a/comms/hso-kmod/distinfo +++ b/comms/hso-kmod/distinfo @@ -1,6 +1,6 @@ -MD5 (hso-20080514.tar.gz) = 72162021aa4d05304537bf83389f77a6 -SHA256 (hso-20080514.tar.gz) = 9c72974973e8f11cdcd42c251adab0780180a9dc5f098ee8968520db02564f9f -SIZE (hso-20080514.tar.gz) = 10345 -MD5 (hsoctl-20080812.tar.gz) = 680675da75c75b58790fe226b87e122b -SHA256 (hsoctl-20080812.tar.gz) = 925cc427f1895c13ff986821babc30ff40d1318040cd63efadb4ca7acb9d6d2c -SIZE (hsoctl-20080812.tar.gz) = 6779 +MD5 (hso-20081023.tar.gz) = c431eba366d7fb36dbd30e2e8f992457 +SHA256 (hso-20081023.tar.gz) = 8ab6cf4bc0208dbe76cdf41422b573afb811e6075c99e97f38f5377f47bc648c +SIZE (hso-20081023.tar.gz) = 12326 +MD5 (hsoctl-20081023.tar.gz) = f19ebf0022758326837ce4db0684be6d +SHA256 (hsoctl-20081023.tar.gz) = fe20461852c72ed554c5f1cf7dd98f9dd2a5217fc4b4a2ca3e1e7ade301ba8fe +SIZE (hsoctl-20081023.tar.gz) = 8360 diff --git a/comms/hso-kmod/files/HSOCTL-DEBUG-patch-Makefile b/comms/hso-kmod/files/HSOCTL-DEBUG-patch-Makefile index c1a8b8fab908..c87686f43e44 100644 --- a/comms/hso-kmod/files/HSOCTL-DEBUG-patch-Makefile +++ b/comms/hso-kmod/files/HSOCTL-DEBUG-patch-Makefile @@ -1,9 +1,10 @@ ---- Makefile.orig 2008-05-14 14:18:53.751411172 +0200 -+++ Makefile 2008-05-14 14:19:01.497294028 +0200 -@@ -1,5 +1,5 @@ +--- Makefile.orig 2008-10-23 15:45:28.158855941 +0200 ++++ Makefile 2008-10-23 15:45:53.171672654 +0200 +@@ -1,6 +1,6 @@ SRCS= hsoctl.c PROG= hsoctl -CFLAGS+= -g +#CFLAGS+= -g + LDFLAGS+= -lutil + DESTDIR?= /usr/local - .include diff --git a/comms/hso-kmod/files/option-icon.conf.sample b/comms/hso-kmod/files/option-icon.conf.sample index a133356969bf..d32ba783b7ac 100644 --- a/comms/hso-kmod/files/option-icon.conf.sample +++ b/comms/hso-kmod/files/option-icon.conf.sample @@ -1,7 +1,7 @@ attach 100 { match "device-name" "umass[0-9]+"; match "vendor" "0x0af0"; -match "product" "0x6911|0x6971|0x7251|0x7401"; +match "product" "0x6911|0x6971|0x7251|0x7401|0x7011|0x7501"; match "devclass" "0x00"; 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"; }; diff --git a/comms/hso-kmod/files/patch-if_hso.c b/comms/hso-kmod/files/patch-if_hso.c deleted file mode 100644 index 253d3085c40d..000000000000 --- a/comms/hso-kmod/files/patch-if_hso.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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); -- cgit v1.2.3