diff --git a/sysutils/sg3_utils/Makefile b/sysutils/sg3_utils/Makefile index ac9542b2d491..e59064c4d6e8 100644 --- a/sysutils/sg3_utils/Makefile +++ b/sysutils/sg3_utils/Makefile @@ -1,28 +1,27 @@ PORTNAME= sg3_utils -DISTVERSION= 1.48 -PORTREVISION= 2 +DISTVERSION= 1.49 CATEGORIES= sysutils -MASTER_SITES= http://sg.danny.cz/sg/p/ +MASTER_SITES= https://sg.danny.cz/sg/p/ -MAINTAINER= ports@FreeBSD.org +PATCH_SITES= https://github.com/doug-gilbert/sg3_utils/commit/ +PATCHFILES= 958434a1d2b5b2f4f465c9196c3c4ecf362eeb22.patch:-p1 \ + c32e19f52e7b5c75bd2a9b222c072eef16a4e583.patch:-p1 \ + c60834d53313f3796f43fdf874db98a9e8b03b6e.patch:-p1 \ + 840637b1c402a02ea56a5447fb616200f5314a51.patch:-p1 + +MAINTAINER= asomers@FreeBSD.org COMMENT= Set of utilities that send SCSI commands to devices WWW= https://sg.danny.cz/sg/sg3_utils.html LICENSE= BSD2CLAUSE GPLv2+ LICENSE_COMB= multi LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/BSD_LICENSE LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING -USES= gmake libtool shebangfix tar:tgz -USE_LDCONFIG= yes +USES= cmake shebangfix tar:xz SHEBANG_FILES= scripts/* - -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USE_LDCONFIG= yes PLIST_SUB= SOVERSION=${DISTVERSION} -post-install: - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsgutils2*.so.* - .include diff --git a/sysutils/sg3_utils/distinfo b/sysutils/sg3_utils/distinfo index 66096a7733dc..2eca02db4c12 100644 --- a/sysutils/sg3_utils/distinfo +++ b/sysutils/sg3_utils/distinfo @@ -1,3 +1,11 @@ -TIMESTAMP = 1691046445 -SHA256 (sg3_utils-1.48.tgz) = d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c283d773 -SIZE (sg3_utils-1.48.tgz) = 2302254 +TIMESTAMP = 1785012247 +SHA256 (sg3_utils-1.49.tar.xz) = 4215e7876e786dcdbf5ae14a7c0b9549b7817cdf6f5ce0debe1d1674e0d1c900 +SIZE (sg3_utils-1.49.tar.xz) = 991444 +SHA256 (958434a1d2b5b2f4f465c9196c3c4ecf362eeb22.patch) = 8e76e62fb7678c944e01a6974b34d215b032f76a0f959b14c30e134b9eadb37f +SIZE (958434a1d2b5b2f4f465c9196c3c4ecf362eeb22.patch) = 1905 +SHA256 (c32e19f52e7b5c75bd2a9b222c072eef16a4e583.patch) = d01df1983fff6bd8f41a9d12c176c6dda87da944b7b9e92772e43ff9615b9c38 +SIZE (c32e19f52e7b5c75bd2a9b222c072eef16a4e583.patch) = 1154 +SHA256 (c60834d53313f3796f43fdf874db98a9e8b03b6e.patch) = 7519227ce02758bff519e8c207057fee28fdf3b42d8741b3876ef6e720d2d412 +SIZE (c60834d53313f3796f43fdf874db98a9e8b03b6e.patch) = 1361 +SHA256 (840637b1c402a02ea56a5447fb616200f5314a51.patch) = 5c74346ed490f7b75c441d9284b2969de865f804885ee02b3c4f9fcba7e9587f +SIZE (840637b1c402a02ea56a5447fb616200f5314a51.patch) = 1427 diff --git a/sysutils/sg3_utils/files/patch-src_sg__wr__mode.c b/sysutils/sg3_utils/files/patch-src_sg__wr__mode.c deleted file mode 100644 index e9e1c7c2c7cb..000000000000 --- a/sysutils/sg3_utils/files/patch-src_sg__wr__mode.c +++ /dev/null @@ -1,28 +0,0 @@ ---- src/sg_wr_mode.c.orig 2023-06-24 02:05:48 UTC -+++ src/sg_wr_mode.c -@@ -374,17 +374,23 @@ main(int argc, char * argv[]) - } - } - if (cfile_arg || contents_arg) { -+ const char * inp = (cfile_arg ? cfile_arg : contents_arg); -+ - if (cfile_arg && contents_arg) { - pr2serr("Cannot have both --contents= and --cfile= options\n"); - return SG_LIB_SYNTAX_ERROR; - } - memset(read_in, 0, read_in_sz); -- if ((ret = build_mode_page(optarg, !! cfile_arg, do_raw, read_in, -- &read_in_len, read_in_sz))) { -+ if ((ret = build_mode_page(inp, !! cfile_arg, do_raw, -+ read_in, &read_in_len, read_in_sz))) { - pr2serr("bad argument to '%s'\n", cfile_arg ? "--cfile=" : - "--contents="); - return ret; - } -+ if (verbose > 5) { -+ pr2serr("Decoded contents:\n"); -+ hex2stderr(read_in, read_in_len, 1); -+ } - got_contents = true; - } - diff --git a/sysutils/sg3_utils/pkg-plist b/sysutils/sg3_utils/pkg-plist index 27a8f29cb546..6ba1659d4f51 100644 --- a/sysutils/sg3_utils/pkg-plist +++ b/sysutils/sg3_utils/pkg-plist @@ -1,157 +1,155 @@ -bin/rescan-scsi-bus.sh -bin/scsi_logging_level bin/scsi_mandat bin/scsi_readcap bin/scsi_ready bin/scsi_satl bin/scsi_start bin/scsi_stop bin/scsi_temperature bin/sg_bg_ctl bin/sg_compare_and_write bin/sg_decode_sense bin/sg_format bin/sg_get_config bin/sg_get_elem_status bin/sg_get_lba_status bin/sg_ident bin/sg_inq bin/sg_logs bin/sg_luns bin/sg_modes bin/sg_opcodes bin/sg_persist bin/sg_prevent bin/sg_raw bin/sg_rdac bin/sg_read_attr bin/sg_read_block_limits bin/sg_read_buffer bin/sg_read_long bin/sg_readcap bin/sg_reassign bin/sg_referrals bin/sg_rem_rest_elem bin/sg_rep_density bin/sg_rep_pip bin/sg_rep_zones bin/sg_requests bin/sg_reset_wp bin/sg_rmsn bin/sg_rtpg bin/sg_safte bin/sg_sanitize bin/sg_sat_datetime bin/sg_sat_identify bin/sg_sat_phy_event bin/sg_sat_read_gplog bin/sg_sat_set_features bin/sg_seek bin/sg_senddiag bin/sg_ses bin/sg_ses_microcode bin/sg_start bin/sg_stpg bin/sg_stream_ctl bin/sg_sync bin/sg_timestamp bin/sg_turs bin/sg_unmap bin/sg_verify bin/sg_vpd bin/sg_wr_mode bin/sg_write_attr bin/sg_write_buffer bin/sg_write_long bin/sg_write_same bin/sg_write_verify bin/sg_write_x bin/sg_z_act_query bin/sg_zone include/scsi/sg_cmds.h include/scsi/sg_cmds_basic.h include/scsi/sg_cmds_extra.h include/scsi/sg_cmds_mmc.h include/scsi/sg_json.h include/scsi/sg_json_sg_lib.h include/scsi/sg_lib.h include/scsi/sg_lib_data.h include/scsi/sg_lib_names.h +include/scsi/sg_nvme.h include/scsi/sg_pr2serr.h include/scsi/sg_pt.h -include/scsi/sg_pt_nvme.h +include/scsi/sg_snt.h include/scsi/sg_unaligned.h lib/libsgutils2-%%SOVERSION%%.so.2 lib/libsgutils2-%%SOVERSION%%.so.2.0.0 -lib/libsgutils2.a lib/libsgutils2.so share/man/man8/scsi_mandat.8.gz share/man/man8/scsi_readcap.8.gz share/man/man8/scsi_ready.8.gz share/man/man8/scsi_satl.8.gz share/man/man8/scsi_start.8.gz share/man/man8/scsi_stop.8.gz share/man/man8/scsi_temperature.8.gz share/man/man8/sg3_utils.8.gz share/man/man8/sg3_utils_json.8.gz share/man/man8/sg_bg_ctl.8.gz share/man/man8/sg_compare_and_write.8.gz share/man/man8/sg_decode_sense.8.gz share/man/man8/sg_format.8.gz share/man/man8/sg_get_config.8.gz share/man/man8/sg_get_elem_status.8.gz share/man/man8/sg_get_lba_status.8.gz share/man/man8/sg_ident.8.gz share/man/man8/sg_inq.8.gz share/man/man8/sg_logs.8.gz share/man/man8/sg_luns.8.gz share/man/man8/sg_modes.8.gz share/man/man8/sg_opcodes.8.gz share/man/man8/sg_persist.8.gz share/man/man8/sg_prevent.8.gz share/man/man8/sg_raw.8.gz share/man/man8/sg_rdac.8.gz share/man/man8/sg_read_attr.8.gz share/man/man8/sg_read_block_limits.8.gz share/man/man8/sg_read_buffer.8.gz share/man/man8/sg_read_long.8.gz share/man/man8/sg_readcap.8.gz share/man/man8/sg_reassign.8.gz share/man/man8/sg_referrals.8.gz share/man/man8/sg_rem_rest_elem.8.gz share/man/man8/sg_rep_density.8.gz share/man/man8/sg_rep_pip.8.gz share/man/man8/sg_rep_zones.8.gz share/man/man8/sg_requests.8.gz share/man/man8/sg_reset_wp.8.gz share/man/man8/sg_rmsn.8.gz share/man/man8/sg_rtpg.8.gz share/man/man8/sg_safte.8.gz share/man/man8/sg_sanitize.8.gz share/man/man8/sg_sat_datetime.8.gz share/man/man8/sg_sat_identify.8.gz share/man/man8/sg_sat_phy_event.8.gz share/man/man8/sg_sat_read_gplog.8.gz share/man/man8/sg_sat_set_features.8.gz share/man/man8/sg_seek.8.gz share/man/man8/sg_senddiag.8.gz share/man/man8/sg_ses.8.gz share/man/man8/sg_ses_microcode.8.gz share/man/man8/sg_start.8.gz share/man/man8/sg_stpg.8.gz share/man/man8/sg_stream_ctl.8.gz share/man/man8/sg_sync.8.gz share/man/man8/sg_timestamp.8.gz share/man/man8/sg_turs.8.gz share/man/man8/sg_unmap.8.gz share/man/man8/sg_verify.8.gz share/man/man8/sg_vpd.8.gz share/man/man8/sg_wr_mode.8.gz share/man/man8/sg_write_attr.8.gz share/man/man8/sg_write_buffer.8.gz share/man/man8/sg_write_long.8.gz share/man/man8/sg_write_same.8.gz share/man/man8/sg_write_verify.8.gz share/man/man8/sg_write_x.8.gz share/man/man8/sg_z_act_query.8.gz share/man/man8/sg_zone.8.gz