aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog82
-rw-r--r--aclocal.m46
-rwxr-xr-xconfigure26
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog6
-rw-r--r--doc/sg3_utils.83
-rwxr-xr-xltmain.sh4
-rw-r--r--sg3_utils.spec6
-rw-r--r--src/sg_dd.c4
-rw-r--r--testing/sgh_dd.cpp7
10 files changed, 84 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog
index 3dbfda29..c7ec5db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,20 +2,22 @@ Each utility has its own version number, date of last change and
some description at the top of its ".c" file. All utilities in the main
directory have their own "man" pages. There is also a sg3_utils man page.
+Changelog for sg3_utils-1.46 [20200309] [svn: r845]
+ - bump config to 1.46
+
Changelog for sg3_utils-1.45 [20200229] [svn: r843]
- sg_get_elem_status: new utility [sbc4r16]
- - sg_ses: bug: --page= being overridden when --control
- and --data= also given; fix
+ - sg_ses: bug: --page= being overridden when --control and --data= also
+ given; fix
- document explicit Element type codes and example
- rename 'SAS SlimLine' to SlimSAS [ses4r02]
- - add --inhex=FN, equivalent to --data=@FN, for
- compatibility with other utilities
+ - add --inhex=FN, equivalent to --data=@FN, for compatibility with
+ other utilities
- 'fan speed factor' field added in 20-013r1
- sg_opcodes: expand MLU (now 2 bits, spc5r20)
- - include RWCDLP field as extension of CDLP
- field (spc5r01)
- - sg_write_buffer: allow comma and period separated
- lists when input from stdin
+ - include RWCDLP field as extension of CDLP field (spc5r01)
+ - sg_write_buffer: allow comma and period separated lists when input
+ from stdin
- sg_inq: update version descriptors to spc5r21
- add some NVMe 1.4 snippets to ctl identify
- sg_format: add --dcrt used twice (FOV=1 DCRT=0)
@@ -23,39 +25,36 @@ Changelog for sg3_utils-1.45 [20200229] [svn: r843]
- sg_raw: fix --send bug when using stdin
- sg_vpd: 3pc VPD page add copy group descriptor
- add --examine option
- - new zoned block device char. field (zbc2r04)
+ - new zoned block device char. page (zbc2r04)
- sg_read_buffer: decode read microcode status page
- add --inhex=FN option
- - sg_request: add --error option, replaces opcode
- with 0xff (or skips call to pass-through)
+ - sg_request: add --error option, replaces opcode with 0xff (or skips call
+ to pass-through)
- sg_get_lba_status: add --inhex=FN option
- sg_xcopy: add --fco (fast copy only) (spc5r20)
- implement --app=1 (append) on regular OFILE type
- sg_scan (win32): expand limits for big arrays
- - sg_modes: placeholders for Command duration limit
- T2A and T2B mpages (sbc4r17)
+ - sg_modes: placeholders for Command duration limit T2A and T2B mpages
+ (sbc4r17)
- improve zbc support (e.g. caching mpage)
- - sg_logs: add Command duration limits statistics
- lpage (spc6r01)
- - zoned block device statistics log page: shorten
- counter fields from 8 to 4 bytes (zbc2r02)
+ - sg_logs: add Command duration limits statistics lpage (spc6r01)
+ - zoned block device statistics log page: shorten counter fields from
+ 8 to 4 bytes (zbc2r02)
- new field in this log page (zbc2r04)
- - change '-ll' option to suppress subpages=0xff
- apart from page 0x0,0xff. Used three times:
- list all pages and subpages names reported
- - sg_reassign: for defect list format 6 (vendor
- specific) don't try to decode
+ - change '-ll' option to suppress subpages=0xff apart from page
+ 0x0,0xff. Used three times: list all pages and subpages names
+ reported
+ - sg_reassign: for defect list format 6 (vendor specific) don't try to decode
- sg_rep_zones: expand some fields per zbc2r04
- add --num= and --wp options
- sg_verify: correct so issues VERIFY(16)
- - add --0 and --ff options and implement
- bytchk=3 properly
+ - add --0 and --ff options and implement bytchk=3 properly
- sg_write_same: add --ff for 0xff fill
- sg_luns: report new "target commands" w-lun (19-117)
- sg_dd: add --verify support
- sgp_dd: support memory-mapped IO via mmap flag
- - inhex directory: new, contains ASCII hex files
- that can be used with the '--inhex=' option
+ - inhex directory: new, contains ASCII hex files that can be used with
+ the '--inhex=' option
- sg_lib: add sg_t10_uuid_desig2str()
- add sg_get_command_str and sg_print_command_len()
- speed up sg_print_command()
@@ -65,17 +64,15 @@ Changelog for sg3_utils-1.45 [20200229] [svn: r843]
- add ${PACKAGE_VERSION} to '.so' name
- add sg_f2hex_arr()
- update some tables for NVMe 1.4
- - sg_get_num()+sg_get_llnum(): add 'e' decoding,
+ - sg_get_num()+sg_get_llnum(): add 'e' decoding, exabytes; allow
+ addition (e.g. --count=3+1k)
- asc/ascq match asc-num.txt @t10 20191014
- exabytes; allow addition (e.g. --count=3+1k)
- new zbc2r04 service actions
- sg_pt_freebsd: fixes for FreeBSD 12.0 release
- - scripts: update 54-before-scsi-sg3_id.rules,
- scsi-enable-target-scan.sh and
- 59-fc-wwpn-id.rules
- - linux: add nanosecond durations when
- SG3_UTILS_LINUX_NANO environment variable given
- and Linux sg driver >= 4.0.30
+ - scripts: update 54-before-scsi-sg3_id.rules, scsi-enable-target-scan.sh
+ and 59-fc-wwpn-id.rules
+ - linux: add nanosecond durations when SG3_UTILS_LINUX_NANO environment
+ variable givenand Linux sg driver >= 4.0.30
- rescan-scsi-bus: widen LUN 0 only scanning
- multiple patches to sync with Suse
- testing/sg_tst_async: fix free_list issue
@@ -83,22 +80,21 @@ Changelog for sg3_utils-1.45 [20200229] [svn: r843]
- testing/sg_tst_bidi: for sg 4.0 driver
- testing/sgh_dd: test request sharing, mreqs...
- add --verify support
- - testing/sgs_dd: back from archive, for testing
+ - testing/sgs_dd: back from archive, for testing SIGPOLL (SIGIO) and
+ realtime (RT) signals
- testing/sg_chk_asc: allow LF and CR/LF in asc-num.txt
- testing: 'make' now builds both C and C++ programs
- SIGPOLL (SIGIO) and realtime (RT) signals
- - sg_pt: add sg_get_opcode_translation() to replace
- global pointer to array: sg_opcode_info_arr[]
+ - sg_pt: add sg_get_opcode_translation() to replace global pointer to
+ array: sg_opcode_info_arr[]
- extend small SNTL to support read capacity
- utils/hxascdmp: add -o=<offset> option
- add -1, -2 and -q options
- sg_io_linux (sg_lib): add sg_linux_sense_print()
- - sg_pt_linux: uses sg v4 interface if sg driver
- >= 4.0.0 . Force sg v3 always by building with
- './configure --disable-linux-sgv4'
+ - sg_pt_linux: uses sg v4 interface if sg driver >= 4.0.0 . Force sg v3
+ always by building with './configure --disable-linux-sgv4'
- add sg_linux_get_sg_version() function
- - add: 'SPDX-License-Identifier: BSD-2-Clause'
- or a small number of 'GPL-2.0-or-later'
+ - add: 'SPDX-License-Identifier: BSD-2-Clause' or a small number of
+ 'GPL-2.0-or-later'
- gcc-9: suppress (pointless) warnings
- automake: upgrade to version 1.16.1
- autoconf: upgrade to version 2.69
diff --git a/aclocal.m4 b/aclocal.m4
index a0e5edaa..2fd8809f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4718,6 +4718,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
diff --git a/configure b/configure
index 45ee88a6..8fd118bc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sg3_utils 1.45.
+# Generated by GNU Autoconf 2.69 for sg3_utils 1.46.
#
# Report bugs to <dgilbert@interlog.com>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='sg3_utils'
PACKAGE_TARNAME='sg3_utils'
-PACKAGE_VERSION='1.45'
-PACKAGE_STRING='sg3_utils 1.45'
+PACKAGE_VERSION='1.46'
+PACKAGE_STRING='sg3_utils 1.46'
PACKAGE_BUGREPORT='dgilbert@interlog.com'
PACKAGE_URL=''
@@ -1353,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures sg3_utils 1.45 to adapt to many kinds of systems.
+\`configure' configures sg3_utils 1.46 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1424,7 +1424,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of sg3_utils 1.45:";;
+ short | recursive ) echo "Configuration of sg3_utils 1.46:";;
esac
cat <<\_ACEOF
@@ -1547,7 +1547,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-sg3_utils configure 1.45
+sg3_utils configure 1.46
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1916,7 +1916,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by sg3_utils $as_me 1.45, which was
+It was created by sg3_utils $as_me 1.46, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2780,7 +2780,7 @@ fi
# Define the identity of the package.
PACKAGE='sg3_utils'
- VERSION='1.45'
+ VERSION='1.46'
cat >>confdefs.h <<_ACEOF
@@ -8634,6 +8634,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
@@ -13395,7 +13401,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by sg3_utils $as_me 1.45, which was
+This file was extended by sg3_utils $as_me 1.46, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13461,7 +13467,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-sg3_utils config.status 1.45
+sg3_utils config.status 1.46
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 8d641eb6..e15dd16a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(sg3_utils, 1.45, dgilbert@interlog.com)
+AC_INIT(sg3_utils, 1.46, dgilbert@interlog.com)
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 2d0e7922..cd1869a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sg3-utils (1.46-0.1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Douglas Gilbert <dgilbert@interlog.com> Tue, 03 Mar 2020 10:00:00 -0500
+
sg3-utils (1.45-0.1) unstable; urgency=low
* New upstream version
diff --git a/doc/sg3_utils.8 b/doc/sg3_utils.8
index b336707b..4bcd8872 100644
--- a/doc/sg3_utils.8
+++ b/doc/sg3_utils.8
@@ -1,4 +1,4 @@
-.TH SG3_UTILS "8" "February 2020" "sg3_utils\-1.45" SG3_UTILS
+.TH SG3_UTILS "8" "March 2020" "sg3_utils\-1.46" SG3_UTILS
.SH NAME
sg3_utils \- a package of utilities for sending SCSI commands
.SH SYNOPSIS
@@ -442,6 +442,7 @@ Work in this area is currently experimental.
.B 49
low level driver reports a response's residual count (i.e. number of bytes
actually received by HBA is 'requested_bytes \- residual_count') that is
+nonsensical.
.TP
.B 50
OS system calls that fail often return a small integer number to help. In
diff --git a/ltmain.sh b/ltmain.sh
index c12c197b..d11f1e02 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-9"
+VERSION="2.4.6 Debian-2.4.6-11"
package_revision=2.4.6
@@ -2141,7 +2141,7 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname $scriptversion Debian-2.4.6-9
+ version: $progname $scriptversion Debian-2.4.6-11
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
diff --git a/sg3_utils.spec b/sg3_utils.spec
index 6ddc4716..664f9105 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -1,6 +1,6 @@
Summary: Utilities for devices that use SCSI command sets
Name: sg3_utils
-Version: 1.45
+Version: 1.46
# Release: 1%{?dist}
Release: 1
License: GPL
@@ -84,6 +84,10 @@ fi
%{_libdir}/*.la
%changelog
+* Thu Mar 05 2020 - dgilbert at interlog dot com
+- track t10 changes
+ * sg3_utils-1.46
+
* Sat Feb 29 2020 - dgilbert at interlog dot com
- track t10 changes
* sg3_utils-1.45
diff --git a/src/sg_dd.c b/src/sg_dd.c
index 55de0930..93edc249 100644
--- a/src/sg_dd.c
+++ b/src/sg_dd.c
@@ -66,7 +66,7 @@
#include "sg_unaligned.h"
#include "sg_pr2serr.h"
-static const char * version_str = "6.10 20200216";
+static const char * version_str = "6.11 20200303";
#define ME "sg_dd: "
@@ -365,7 +365,7 @@ usage()
"[coe=0|1|2|3]\n"
" [coe_limit=CL] [dio=0|1] [odir=0|1] "
"[of2=OFILE2] [retries=RETR]\n"
- " [sync=0|1] [time=0|1] [verbose=VERB]\n"
+ " [sync=0|1] [time=0|1] [verbose=VERB] [--verify]\n"
" where:\n"
" blk_sgio 0->block device use normal I/O(def), 1->use "
"SG_IO\n"
diff --git a/testing/sgh_dd.cpp b/testing/sgh_dd.cpp
index f48be00f..9367043b 100644
--- a/testing/sgh_dd.cpp
+++ b/testing/sgh_dd.cpp
@@ -108,7 +108,7 @@
using namespace std;
-static const char * version_str = "1.75 20200227";
+static const char * version_str = "1.76 20200307";
#ifdef __GNUC__
#ifndef __clang__
@@ -3500,7 +3500,10 @@ bypass:
mmp = (uint8_t *)mmap(NULL, num, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, 0);
if (MAP_FAILED == mmp) {
- perror("error using mmap()");
+ int err = errno;
+
+ pr2serr_lk("sgh_dd: %s: sz=%d, fd=%d, mmap() failed: %s\n",
+ __func__, num, fd, strerror(err));
return 0;
}
*mmpp = mmp;