sync to upstream sdparm svn rev 366

See ChangeLog file for pre-release sdparm-1.13 [20230221]

ChangeLog

@@ -2,7 +2,8 @@ The version number is hardcoded into sdparm.c (in a C string);
 the rpm spec file: sdparm.spec ; the debian/changelog file;
 and the configure.ac file (in the AC_INIT item).
 
-ChangeLog for pre-release sdparm-1.13 [20221107] [svn: r364]
+ChangeLog for pre-release sdparm-1.13 [20230221] [svn: r366]
+  - add --json[=JO] and --js-file=JFN options
   - control extension mpage: add pwromact, hrdrmact, ssumact
     and fmtmact fields
   - format presets vpd: expand for schema type 4
@@ -15,7 +16,7 @@ ChangeLog for pre-release sdparm-1.13 [20221107] [svn: r364]
   - act on LAST bit in App tag mpage descriptors to stop
     output of further descriptors, override this
     truncation with --flexible option
-  - point svn:externals to sg3_utils revision 981
+  - point svn:externals to sg3_utils revision 1004
   - autoconf: upgrade version 2.70 to 2.71; automake upgrade
     to version 1.16.5
 

debian/changelog

@@ -2,7 +2,7 @@ sdparm (1.13-0.1) unstable; urgency=low
 
   * see ChangeLog
 
- -- Douglas Gilbert <[email protected]>  Mon, 07 Nov 2022 16:00:00 -0500
+ -- Douglas Gilbert <[email protected]>  Mon, 20 Feb 2023 20:00:00 -0500
 
 sdparm (1.12-0.1) unstable; urgency=low
 

doc/Makefile.am

@@ -1,36 +1,36 @@
 
 if OS_LINUX
 
-man_MANS = sdparm.8 sas_disk_blink.8 scsi_ch_swp.8
+man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8 scsi_ch_swp.8
 
 endif
 
 if OS_WIN32_MINGW
 
-man_MANS = sdparm.8 sas_disk_blink.8
+man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
 
 endif
 
 if OS_WIN32_CYGWIN
 
-man_MANS = sdparm.8 sas_disk_blink.8
+man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
 
 endif
 
 if OS_FREEBSD
 
-man_MANS = sdparm.8 sas_disk_blink.8
+man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
 
 endif
 
 if OS_SOLARIS
 
-man_MANS = sdparm.8 sas_disk_blink.8
+man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
 
 endif
 
 if OS_OSF
 
-man_MANS = sdparm.8 sas_disk_blink.8
+man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
 
 endif

doc/Makefile.in

@@ -254,12 +254,12 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@OS_FREEBSD_TRUE@man_MANS = sdparm.8 sas_disk_blink.8
-@OS_LINUX_TRUE@man_MANS = sdparm.8 sas_disk_blink.8 scsi_ch_swp.8
-@OS_OSF_TRUE@man_MANS = sdparm.8 sas_disk_blink.8
-@OS_SOLARIS_TRUE@man_MANS = sdparm.8 sas_disk_blink.8
-@OS_WIN32_CYGWIN_TRUE@man_MANS = sdparm.8 sas_disk_blink.8
-@OS_WIN32_MINGW_TRUE@man_MANS = sdparm.8 sas_disk_blink.8
+@OS_FREEBSD_TRUE@man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
+@OS_LINUX_TRUE@man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8 scsi_ch_swp.8
+@OS_OSF_TRUE@man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
+@OS_SOLARIS_TRUE@man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
+@OS_WIN32_CYGWIN_TRUE@man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
+@OS_WIN32_MINGW_TRUE@man_MANS = sdparm.8 sdparm_json.8 sas_disk_blink.8
 all: all-am
 
 .SUFFIXES:

doc/sas_disk_blink.8

@@ -4,10 +4,9 @@ sas_disk_blink \- blink the LED on a SAS disk
 .SH SYNOPSIS
 .B sas_disk_blink
 [\fI\-\-help\fR] [\fI\-\-set NUM\fR] [\fI\-\-verbose\fR]
-\fIDEVICE\fR 
+\fIDEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
-.PP
 This bash shell script attempts to blink the LED on the SAS disk
 referred to by \fIDEVICE\fR. By default the LED will blink for
 30 seconds. This is meant to help identify which disk corresponds

doc/scsi_ch_swp.8

@@ -4,10 +4,9 @@ scsi_ch_swp \- change SCSI Software WRITE Protect and block device settings
 .SH SYNOPSIS
 .B scsi_ch_swp
 [\fI\-\-help\fR] [\fI\-\-set 0|1\fR] [\fI\-\-verbose\fR] [\fI\-\-wr\fR]
-\fIBLK_DEVICE\fR 
+\fIBLK_DEVICE\fR
 .SH DESCRIPTION
 .\" Add any additional description here
-.PP
 This bash shell script attempts to read or change the Software Write
 Protect (SWP) bit in the SCSI Control mode page using the sdparm utility.
 If that change is successful then it uses the blockdev utility to change
@@ -50,7 +49,7 @@ action of this script is to use the sdparm \fI\-\-readonly\fR option when
 be a generic device (e.g. /dev/sg3) which has a different interpretation of
 the read\-only open flag and may fail. For such rare cases the \fI\-\-wr\fR
 option makes sdparm open \fIBLK_DEVICE\fR read\-write when \fI\-\-set 0\fR
-is invoked. 
+is invoked.
 .SH EXIT STATUS
 The exit status of this script is 0 when it is successful. Otherwise the exit
 status is that of the sdparm or the blockdev utility, whichever is called

doc/sdparm.8

@@ -1,6 +1,6 @@
-.TH SDPARM "8" "November 2022" "sdparm\-1.13" SDPARM
+.TH SDPARM "8" "February 2023" "sdparm\-1.13" SDPARM
 .SH NAME
-sdparm \- access SCSI modes pages; read VPD pages; send simple SCSI commands.
+sdparm \- access SCSI modes pages; read VPD pages; send simple SCSI commands
 .SH SYNOPSIS
 .B sdparm
 [\fI\-\-all\fR] [\fI\-\-dbd\fR] [\fI\-\-examine\fR] [\fI\-\-flexible\fR]
@@ -43,7 +43,6 @@ sdparm \- access SCSI modes pages; read VPD pages; send simple SCSI commands.
 [\fI\-\-help\fR] [\fI\-\-version\fR]
 .SH DESCRIPTION
 .\" Add any additional description here
-.PP
 This utility fetches and potentially changes SCSI device (e.g. disk) mode
 pages. Inquiry data including Vital Product Data (VPD) pages can also be
 displayed. Commands associated with starting and stopping the medium; loading
@@ -514,49 +513,27 @@ follows. For brevity subsequent examples of options are shown in their
 shorter form.
 .PP
     \-\-enumerate          list generic mode page information
-.br
     \-e \-\-all             list generic mode page contents
-.br
                          (i.e. parameters)
-.br
     \-e \-\-page=rw         list contents of read write error
-.br
                          recovery mode page
-.br
     \-e \-\-inquiry         list VPD pages this utility can decode
-.br
     \-e \-\-long            list generic mode pages, transport
-.br
                          protocols, mode pages for each
-.br
                          supported transport protocol and
-.br
                          supported commands
-.br
     \-e \-l \-\-all          additionally list the contents of
-.br
                          each mode page
-.br
     \-e \-\-transport=fcp   list mode pages for the fcp
-.br
                          transport protocol
-.br
     \-e \-t fcp \-\-all      additionally list the contents of
-.br
                          each mode page
-.br
     \-e \-\-vendor=sea      list vendor specific mode pages for
-.br
                          "sea" (Seagate)
-.br
     \-e \-M sea \-\-all      additionally list the contents of vendor
-.br
                          specific mode pages for "sea" (Seagate)
-.br
     \-e \-p pcd \-l         list contents of SAS phy control and
-.br
                          discovery mode page plus (due to "\-l")
-.br
                          some descfriptor format information
 .PP
 When known mode pages are listed (via the \fI\-\-enumerate \fR option) each
@@ -809,19 +786,12 @@ if there are specialized storage related devices (e.g. a SES device in
 an enclosure) but does add much extra information in this case.
 .PP
   # sdparm \-www
-.br
-PD0     [C]     <Ata  >  FUJITSU   MHY2160BH         0000
-.br
-PD1     [DF]    <Usb  >  WD        2500BEV External  1.05  WD\-WXE90
-.br
-CDROM0  [E]     <Atapi>  MATSHITA DVD/CDRW UJDA775  CB03
-.br
+  PD0     [C]     <Ata  >  FUJITSU   MHY2160BH         0000
+  PD1     [DF]    <Usb  >  WD        2500BEV External  1.05  WD\-WXE90
+  CDROM0  [E]     <Atapi>  MATSHITA DVD/CDRW UJDA775  CB03
 
-.br
-SCSI0:0,0,0   claimed=1 pdt=0h  FUJITSU   MHY2160BH         0000
-.br
-SCSI1:0,0,0   claimed=1 pdt=5h  MATSHITA  DVD/CDRW UJDA775  CB03
-.PP
+  SCSI0:0,0,0   claimed=1 pdt=0h  FUJITSU   MHY2160BH         0000
+  SCSI1:0,0,0   claimed=1 pdt=5h  MATSHITA  DVD/CDRW UJDA775  CB03
 .SH EXIT STATUS
 To aid scripts that call sdparm, the exit status is set to indicate
 success (0) or failure (1 or more). Note that some of the lower values
@@ -1028,7 +998,7 @@ Written by Douglas Gilbert.
 .SH "REPORTING BUGS"
 Report bugs to <dgilbert at interlog dot com>.
 .SH COPYRIGHT
-Copyright \(co 2005\-2022 Douglas Gilbert
+Copyright \(co 2005\-2023 Douglas Gilbert
 .br
 This software is distributed under a FreeBSD license. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.