svn commit: r527666 - in head/sysutils/sg3_utils: . files
Mateusz Piotrowski
0mp at FreeBSD.org
Tue Mar 3 10:45:59 UTC 2020
Author: 0mp
Date: Tue Mar 3 10:45:56 2020
New Revision: 527666
URL: https://svnweb.freebsd.org/changeset/ports/527666
Log:
Update to 1.45
While here:
- Update license information.
- Sort variables.
Reported by: portscout
Deleted:
head/sysutils/sg3_utils/files/patch-include_freebsd__nvme__ioctl.h
Modified:
head/sysutils/sg3_utils/Makefile
head/sysutils/sg3_utils/distinfo
head/sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c
head/sysutils/sg3_utils/pkg-plist
Modified: head/sysutils/sg3_utils/Makefile
==============================================================================
--- head/sysutils/sg3_utils/Makefile Tue Mar 3 09:31:52 2020 (r527665)
+++ head/sysutils/sg3_utils/Makefile Tue Mar 3 10:45:56 2020 (r527666)
@@ -2,23 +2,25 @@
# $FreeBSD$
PORTNAME= sg3_utils
-PORTVERSION= 1.44
+DISTVERSION= 1.45
CATEGORIES= sysutils
MASTER_SITES= http://sg.danny.cz/sg/p/
MAINTAINER= ports at 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 <bsd.port.mk>
Modified: head/sysutils/sg3_utils/distinfo
==============================================================================
--- head/sysutils/sg3_utils/distinfo Tue Mar 3 09:31:52 2020 (r527665)
+++ head/sysutils/sg3_utils/distinfo Tue Mar 3 10:45:56 2020 (r527666)
@@ -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
Modified: head/sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c
==============================================================================
--- head/sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c Tue Mar 3 09:31:52 2020 (r527665)
+++ head/sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c Tue Mar 3 10:45:56 2020 (r527666)
@@ -1,13 +1,14 @@
---- 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,
Modified: head/sysutils/sg3_utils/pkg-plist
==============================================================================
--- head/sysutils/sg3_utils/pkg-plist Tue Mar 3 09:31:52 2020 (r527665)
+++ head/sysutils/sg3_utils/pkg-plist Tue Mar 3 10:45:56 2020 (r527666)
@@ -12,6 +12,7 @@ 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
@@ -71,10 +72,10 @@ 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
@@ -88,6 +89,7 @@ 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
@@ -137,4 +139,3 @@ 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
- at dir include/scsi
More information about the svn-ports-head
mailing list