Index: head/sysutils/sg3_utils/Makefile =================================================================== --- head/sysutils/sg3_utils/Makefile (revision 527665) +++ head/sysutils/sg3_utils/Makefile (revision 527666) @@ -1,24 +1,26 @@ # Created by: Denis Barov # $FreeBSD$ PORTNAME= sg3_utils -PORTVERSION= 1.44 +DISTVERSION= 1.45 CATEGORIES= sysutils MASTER_SITES= http://sg.danny.cz/sg/p/ MAINTAINER= ports@FreeBSD.org COMMENT= Set of utilities that send SCSI commands to devices -LICENSE= BSD2CLAUSE +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 SHEBANG_FILES= scripts/* -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsgutils2.so.2 - -USE_LDCONFIG= yes GNU_CONFIGURE= yes + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsgutils2*.so.* .include Index: head/sysutils/sg3_utils/distinfo =================================================================== --- head/sysutils/sg3_utils/distinfo (revision 527665) +++ head/sysutils/sg3_utils/distinfo (revision 527666) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546295044 -SHA256 (sg3_utils-1.44.tgz) = 8dae684d22e71b11353a48b16c95597af90f0cbe9bbd57f98d7f5544da5cae7b -SIZE (sg3_utils-1.44.tgz) = 1469744 +TIMESTAMP = 1583231382 +SHA256 (sg3_utils-1.45.tgz) = 0b87c971af52af7cebebcce343eac6bd3d73febb3c72af9ce41a4552f1605a61 +SIZE (sg3_utils-1.45.tgz) = 1578568 Index: head/sysutils/sg3_utils/files/patch-include_freebsd__nvme__ioctl.h =================================================================== --- head/sysutils/sg3_utils/files/patch-include_freebsd__nvme__ioctl.h (revision 527665) +++ head/sysutils/sg3_utils/files/patch-include_freebsd__nvme__ioctl.h (nonexistent) @@ -1,18 +0,0 @@ ---- include/freebsd_nvme_ioctl.h.orig 2018-02-28 03:48:11 UTC -+++ include/freebsd_nvme_ioctl.h -@@ -151,12 +151,12 @@ struct nvme_pt_command { - */ - struct mtx * driver_lock; - }; --#else --#include --#endif - - #define nvme_completion_is_error(cpl) \ - ((cpl)->status.sc != 0 || (cpl)->status.sct != 0) -+#else -+#include -+#endif - - #define NVME_CTRLR_PREFIX "/dev/nvme" - #define NVME_NS_PREFIX "ns" Property changes on: head/sysutils/sg3_utils/files/patch-include_freebsd__nvme__ioctl.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c =================================================================== --- head/sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c (revision 527665) +++ head/sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c (revision 527666) @@ -1,14 +1,15 @@ ---- lib/sg_pt_freebsd.c.orig 2018-06-29 09:46:13 UTC +--- lib/sg_pt_freebsd.c.orig 2019-02-11 01:43:25 UTC +++ lib/sg_pt_freebsd.c -@@ -1115,7 +1115,11 @@ nvme_pt_low(struct freebsd_dev_channel *fdc_p, void * +@@ -1181,8 +1181,12 @@ nvme_pt_low(struct freebsd_dev_channel *fdc_p, void * err = ioctl(fdc_p->dev_fd, NVME_PASSTHROUGH_CMD, npcp); if (err < 0) return -errno; /* Assume Unix error in normal place */ +#if __FreeBSD_version <= 1200058 - sct_sc = ((npcp->cpl.status.sct << 8) | npcp->cpl.status.sc); ++ sct_sc = ((npcp->cpl.status.sct << 8) | npcp->cpl.status.sc); +#else -+ sct_sc = (NVME_STATUS_GET_SCT(npcp->cpl.status) << 8 | NVME_STATUS_GET_SC(npcp->cpl.status)); + sct_sc = (NVME_STATUS_GET_SCT(npcp->cpl.status) << 8) | + NVME_STATUS_GET_SC(npcp->cpl.status); +#endif fdc_p->nvme_result = npcp->cpl.cdw0; sg_put_unaligned_le32(npcp->cpl.cdw0, fdc_p->cq_dw0_3 + SG_NVME_PT_CQ_RESULT); Index: head/sysutils/sg3_utils/pkg-plist =================================================================== --- head/sysutils/sg3_utils/pkg-plist (revision 527665) +++ head/sysutils/sg3_utils/pkg-plist (revision 527666) @@ -1,140 +1,141 @@ 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_rep_zones bin/sg_requests bin/sg_reset_wp bin/sg_rmsn bin/sg_rtpg bin/sg_safte bin/sg_sanitize 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_buffer bin/sg_write_long bin/sg_write_same bin/sg_write_verify bin/sg_write_x 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_lib.h include/scsi/sg_lib_data.h include/scsi/sg_pr2serr.h include/scsi/sg_pt.h include/scsi/sg_pt_nvme.h include/scsi/sg_unaligned.h +lib/libsgutils2-1.45.so.2 +lib/libsgutils2-1.45.so.2.0.0 lib/libsgutils2.a lib/libsgutils2.so -lib/libsgutils2.so.2 -lib/libsgutils2.so.2.0.0 man/man8/scsi_mandat.8.gz man/man8/scsi_readcap.8.gz man/man8/scsi_ready.8.gz man/man8/scsi_satl.8.gz man/man8/scsi_start.8.gz man/man8/scsi_stop.8.gz man/man8/scsi_temperature.8.gz man/man8/sg3_utils.8.gz man/man8/sg_bg_ctl.8.gz man/man8/sg_compare_and_write.8.gz man/man8/sg_decode_sense.8.gz man/man8/sg_format.8.gz man/man8/sg_get_config.8.gz +man/man8/sg_get_elem_status.8.gz man/man8/sg_get_lba_status.8.gz man/man8/sg_ident.8.gz man/man8/sg_inq.8.gz man/man8/sg_logs.8.gz man/man8/sg_luns.8.gz man/man8/sg_modes.8.gz man/man8/sg_opcodes.8.gz man/man8/sg_persist.8.gz man/man8/sg_prevent.8.gz man/man8/sg_raw.8.gz man/man8/sg_rdac.8.gz man/man8/sg_read_attr.8.gz man/man8/sg_read_block_limits.8.gz man/man8/sg_read_buffer.8.gz man/man8/sg_read_long.8.gz man/man8/sg_readcap.8.gz man/man8/sg_reassign.8.gz man/man8/sg_referrals.8.gz man/man8/sg_rep_zones.8.gz man/man8/sg_requests.8.gz man/man8/sg_reset_wp.8.gz man/man8/sg_rmsn.8.gz man/man8/sg_rtpg.8.gz man/man8/sg_safte.8.gz man/man8/sg_sanitize.8.gz man/man8/sg_sat_identify.8.gz man/man8/sg_sat_phy_event.8.gz man/man8/sg_sat_read_gplog.8.gz man/man8/sg_sat_set_features.8.gz man/man8/sg_seek.8.gz man/man8/sg_senddiag.8.gz man/man8/sg_ses.8.gz man/man8/sg_ses_microcode.8.gz man/man8/sg_start.8.gz man/man8/sg_stpg.8.gz man/man8/sg_stream_ctl.8.gz man/man8/sg_sync.8.gz man/man8/sg_timestamp.8.gz man/man8/sg_turs.8.gz man/man8/sg_unmap.8.gz man/man8/sg_verify.8.gz man/man8/sg_vpd.8.gz man/man8/sg_wr_mode.8.gz man/man8/sg_write_buffer.8.gz man/man8/sg_write_long.8.gz man/man8/sg_write_same.8.gz man/man8/sg_write_verify.8.gz man/man8/sg_write_x.8.gz man/man8/sg_zone.8.gz -@dir include/scsi