this is a bugfix rev on release 1.47 [r919,920]

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@921 6180dd3e-e324-4e3e-922d-17de1ae2f315

7 files changed, 32 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index bdb97820..abfc3722 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@ 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 pre-release sg3_utils-1.48 [20211115] [svn: r921]
+  - rev 921 is a bugfix rev on release 1.47 [r919,920]
+  - configure.ac: map msys to mingw
+  - sg_dd: change uint type to uint32_t
+  - sg_pt_dummy.c: remove problematic include
+
 Changelog for released sg3_utils-1.47 [20211110] [svn: r919]
   - sg_rep_zones: add support for REPORT ZONE DOMAINS and
     REPORT REALMS in this utility
diff --git a/configure b/configure
index e4b6ffe4..84460e62 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.47.
+# Generated by GNU Autoconf 2.69 for sg3_utils 1.48.
 #
 # 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.47'
-PACKAGE_STRING='sg3_utils 1.47'
+PACKAGE_VERSION='1.48'
+PACKAGE_STRING='sg3_utils 1.48'
 PACKAGE_BUGREPORT='dgilbert@interlog.com'
 PACKAGE_URL=''
 
@@ -1369,7 +1369,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.47 to adapt to many kinds of systems.
+\`configure' configures sg3_utils 1.48 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1440,7 +1440,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sg3_utils 1.47:";;
+     short | recursive ) echo "Configuration of sg3_utils 1.48:";;
    esac
   cat <<\_ACEOF
 
@@ -1564,7 +1564,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sg3_utils configure 1.47
+sg3_utils configure 1.48
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1933,7 +1933,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.47, which was
+It was created by sg3_utils $as_me 1.48, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2792,7 +2792,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sg3_utils'
- VERSION='1.47'
+ VERSION='1.48'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12735,7 +12735,7 @@ _ACEOF
 
 		check_for_getrandom
                 CFLAGS="$CFLAGS -Wno-char-subscripts";;
-        *-*-mingw*)
+        *-*-mingw* | *-*-msys*)
 
 cat >>confdefs.h <<_ACEOF
 #define SG_LIB_WIN32 1
@@ -13563,7 +13563,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.47, which was
+This file was extended by sg3_utils $as_me 1.48, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13629,7 +13629,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.47
+sg3_utils config.status 1.48
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 801e2442..0a65d940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(sg3_utils, 1.47, dgilbert@interlog.com)
+AC_INIT(sg3_utils, 1.48, dgilbert@interlog.com)
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AM_MAINTAINER_MODE
@@ -100,7 +100,7 @@ case "${host}" in
 		AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe])
 		check_for_getrandom
                 CFLAGS="$CFLAGS -Wno-char-subscripts";;
-        *-*-mingw*)
+        *-*-mingw* | *-*-msys*)
 		AC_DEFINE_UNQUOTED(SG_LIB_WIN32, 1, [sg3_utils on Win32])
 		AC_DEFINE_UNQUOTED(SG_LIB_MINGW, 1, [also MinGW environment])
 		# AC_CHECK_HEADERS([nvme.h], [AC_DEFINE_UNQUOTED(HAVE_NVME, 1, [Found NVMe])], [], [])
diff --git a/debian/changelog b/debian/changelog
index 9c35e953..13e8c88f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sg3-utils (1.48-0.1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Douglas Gilbert <dgilbert@interlog.com>  Mon, 15 Nov 2021 11:00:00 -0500
+
 sg3-utils (1.47-0.1) unstable; urgency=low
 
   * New upstream version
diff --git a/lib/sg_pt_dummy.c b/lib/sg_pt_dummy.c
index d746c1ad..9bed386b 100644
--- a/lib/sg_pt_dummy.c
+++ b/lib/sg_pt_dummy.c
@@ -11,7 +11,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -23,7 +22,7 @@
 #include "sg_lib.h"
 #include "sg_pr2serr.h"
 
-/* Version 1.02 20210618 */
+/* Version 1.03 20211115 */
 
 /* List of function names with external linkage that need to be defined
  *
diff --git a/sg3_utils.spec b/sg3_utils.spec
index fcbd9e18..e4d1abb5 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -84,6 +84,10 @@ fi
 %{_libdir}/*.la
 
 %changelog
+* Mon Nov 15 2021 - dgilbert at interlog dot com
+- track t10 changes
+  * sg3_utils-1.48
+
 * Tue Nov 09 2021 - dgilbert at interlog dot com
 - track t10 changes
   * sg3_utils-1.47
diff --git a/src/sg_dd.c b/src/sg_dd.c
index 9d05c93b..75430dda 100644
--- a/src/sg_dd.c
+++ b/src/sg_dd.c
@@ -70,7 +70,7 @@
 #include "sg_unaligned.h"
 #include "sg_pr2serr.h"
 
-static const char * version_str = "6.30 20211027";
+static const char * version_str = "6.31 20211115";
 
 
 #define ME "sg_dd: "
@@ -2399,7 +2399,7 @@ main(int argc, char * argv[])
             res = blocks * blk_sz;
             if (iflag.zero && iflag.ff && (blk_sz >= 4)) {
                 uint32_t pos = (uint32_t)skip;
-                uint off;
+                uint32_t off;
 
                 for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) {
                     for (j = 0; j < (blk_sz - 3); j += 4)