summaryrefslogtreecommitdiff
path: root/sysutils/mtx
diff options
context:
space:
mode:
authorbouyer <bouyer@pkgsrc.org>2015-07-14 12:25:36 +0000
committerbouyer <bouyer@pkgsrc.org>2015-07-14 12:25:36 +0000
commit3de38888c9a9461d0c33b108ebc6b481559dfcc2 (patch)
tree00f531fe01ff0cb08001ca86e316689307925db4 /sysutils/mtx
parent94c298d1686a5fcda8a41e5de4a35eb99bf70ca9 (diff)
downloadpkgsrc-3de38888c9a9461d0c33b108ebc6b481559dfcc2.tar.gz
After executing a scsi command reset the timeout to default value
(like other scsi backends do). Bump PKGREVISION
Diffstat (limited to 'sysutils/mtx')
-rw-r--r--sysutils/mtx/Makefile3
-rw-r--r--sysutils/mtx/distinfo4
-rw-r--r--sysutils/mtx/patches/patch-scsi_netbsd.c9
3 files changed, 9 insertions, 7 deletions
diff --git a/sysutils/mtx/Makefile b/sysutils/mtx/Makefile
index 6ec8c9ce76a..fd21df11e3a 100644
--- a/sysutils/mtx/Makefile
+++ b/sysutils/mtx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2015/07/09 10:27:39 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/14 12:25:36 bouyer Exp $
DISTNAME= mtx-1.3.12
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mtx/mtx-stable/1.3.12/}
diff --git a/sysutils/mtx/distinfo b/sysutils/mtx/distinfo
index 9141e3e7c28..b152f6ef755 100644
--- a/sysutils/mtx/distinfo
+++ b/sysutils/mtx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/07/10 13:33:41 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2015/07/14 12:25:36 bouyer Exp $
SHA1 (mtx-1.3.12.tar.gz) = 9823426934261c9186ed5954f67068e44d3f7cf3
RMD160 (mtx-1.3.12.tar.gz) = 7c9a762b489c1923e5508225cf8a5da8c53cc50f
@@ -6,4 +6,4 @@ Size (mtx-1.3.12.tar.gz) = 235214 bytes
SHA1 (patch-Makefile.in) = 4a526c1b362c08a7c5bd5a39b16ecf336e4b31c1
SHA1 (patch-mtx.h) = 0b1a35ea5dc4dd639cf2bdc79bcfb06d2a551427
SHA1 (patch-mtxl.c) = 6e1318d3501d49c670439da36f3654fc0e6d54f2
-SHA1 (patch-scsi_netbsd.c) = f763530fbac164a33f7704d0b0a80f135f18bb24
+SHA1 (patch-scsi_netbsd.c) = 8b14d7553965e303aa2fe693aaa5c9d94d8e7b24
diff --git a/sysutils/mtx/patches/patch-scsi_netbsd.c b/sysutils/mtx/patches/patch-scsi_netbsd.c
index 4e9fb453584..3922b11930f 100644
--- a/sysutils/mtx/patches/patch-scsi_netbsd.c
+++ b/sysutils/mtx/patches/patch-scsi_netbsd.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-scsi_netbsd.c,v 1.2 2015/07/10 13:33:41 bouyer Exp $
+$NetBSD: patch-scsi_netbsd.c,v 1.3 2015/07/14 12:25:36 bouyer Exp $
---- /dev/null 2015-07-08 16:44:57.000000000 +0200
-+++ scsi_netbsd.c 2015-07-08 16:58:09.000000000 +0200
-@@ -0,0 +1,156 @@
+--- scsi_netbsd.c.orig 2015-07-14 13:48:44.000000000 +0200
++++ scsi_netbsd.c 2015-07-14 13:58:53.000000000 +0200
+@@ -0,0 +1,157 @@
+/* Changes 2003 Steve Heck <steve.heck@am.sony.com>
+ Copyright 2007-2008 by Robert Nelson <robertn@the-nelsons.org>
+
@@ -135,6 +135,7 @@ $NetBSD: patch-scsi_netbsd.c,v 1.2 2015/07/10 13:33:41 bouyer Exp $
+ req.senselen = SENSEBUFLEN;
+ req.senselen_used = 0;
+ ioctl_result = ioctl(DeviceFD, SCIOCCOMMAND, &req);
++ SCSI_Default_Timeout(); /* set it back to default, sigh. */
+
+ if (ioctl_result < 0)
+ {