mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

Update to 1.45

Browse Source 
While here:
- Update license information.
- Sort variables.

Reported by:	portscout
This commit is contained in:
Mateusz Piotrowski 2020-03-03 10:45:56 +00:00
parent 1e40ec110e
commit a8d8031b5e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=527666
5 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sysutils/sg3_utils/Makefile
View File

@ -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@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>

6
sysutils/sg3_utils/distinfo
View File

@ -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

18
sysutils/sg3_utils/files/patch-include_freebsd__nvme__ioctl.h
View File

@ -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 <dev/nvme/nvme.h>
-#endif
#define nvme_completion_is_error(cpl) \
((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
+#else
+#include <dev/nvme/nvme.h>
+#endif
#define NVME_CTRLR_PREFIX "/dev/nvme"
#define NVME_NS_PREFIX "ns"

9
sysutils/sg3_utils/files/patch-lib_sg__pt__freebsd.c
View File

@ -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,

7
sysutils/sg3_utils/pkg-plist
View File

@ -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
@dir include/scsi