#1 Update to version 1.0.79
Opened 2 months ago by mlombard. Modified 2 months ago
rpms/ mlombard/scsi-target-utils f30  into  f30

file modified
+2

@@ -21,3 +21,5 @@ 

  /tgt-1.0.54.tar.gz

  /tgt-1.0.55.tar.gz

  /tgt-1.0.70.tar.gz

+ /tgt-1.0.78.tar.gz

+ /tgt-1.0.79.tar.gz

file modified
-41

@@ -9,47 +9,6 @@ 

   doc/README.iser  | 57 +++++++++++++++++++-------------------------------------

   3 files changed, 29 insertions(+), 68 deletions(-)

  

- diff --git a/README b/README

- index 1ce2f55..68ac5ba 100644

- --- a/README

- +++ b/README

- @@ -9,17 +9,6 @@ Currently, tgt supports the following target drivers:

-  

-  - iSER software target driver for Infiniband and RDMA NICs

-  

- -- IBM System p VIO server

- -

- -- FCoE software target driver for Ethernet NICs (in progress)

- -

- -- Qlogic qla2xxx FC target driver (in progress)

- -

- -Tgt consists of kernel modules, user-space daemon, and user-space

- -tools. iSCSI, iSER, and FCoE target drivers use only user-space daemon

- -and tools (i.e. they are just user-space applications. They don't need

- -any kernel support).

- -

-  tgt can emulate the following device types:

-  

-  - SBC: a virtual disk drive that can use a file to store the content.

- @@ -40,18 +29,6 @@ store the content (in progress).

-  The code is under the GNU General Public License version 2.

-  

-  

- -Preparation

- --------------

- -Linux kernel 2.6.22 or newer are recommended because tgt can get

- -better performance with signalfd.

- -

- -Target drivers have their own ways to build, configure, etc. Please

- -find an appropriate documentation in the doc directory. You might find

- -other useful information on tgt's site:

- -

- -http://stgt.sourceforge.net/

- -

- -

-  Developer Notes

-  -------------

-  The central resource for tgt development is the mailing list

  diff --git a/doc/README.iscsi b/doc/README.iscsi

  index 9fc21dd..e28fffd 100644

  --- a/doc/README.iscsi

@@ -1,34 +0,0 @@ 

- From cac321d1b5b9aeb3bb06516928a0a973cf91d3be Mon Sep 17 00:00:00 2001

- From: Andy Grover <agrover@redhat.com>

- Date: Sat, 3 Jun 2017 14:33:05 -0700

- Subject: [PATCH] Fix compiler error in tgtd.c call_program

- 

- Using a newer version of gcc, we see an error:

- 

- tgtd.c:313:14: error: comparison between pointer and zero character

-  constant [-Werror=pointer-compare]

-    while (pos != '\0')

-               ^~

- tgtd.c:313:10: note: did you mean to dereference the pointer?

-    while (pos != '\0')

-           ^

- I think gcc is right, so deref pos.

- 

- Signed-off-by: Andy Grover <agrover@redhat.com>

- ---

-  usr/tgtd.c | 2 +-

-  1 file changed, 1 insertion(+), 1 deletion(-)

- 

- diff --git a/usr/tgtd.c b/usr/tgtd.c

- index 19c703d..ae2f489 100644

- --- a/usr/tgtd.c

- +++ b/usr/tgtd.c

- @@ -310,7 +310,7 @@ int call_program(const char *cmd, void (*callback)(void *data, int result),

-  	pos = arg;

-  	str_spacecpy(&pos, cmd);

-  	if (strchr(cmd, ' ')) {

- -		while (pos != '\0')

- +		while (*pos != '\0')

-  			argv[i++] = strsep(&pos, " ");

-  	} else

-  		argv[i++] = arg;

@@ -0,0 +1,90 @@ 

+ From 4f34905427d76f2c5b2b534980169d719cc9e1a5 Mon Sep 17 00:00:00 2001

+ From: Maurizio Lombardi <mlombard@redhat.com>

+ Date: Tue, 18 Jun 2019 13:21:17 +0200

+ Subject: [PATCH] Glusterfs api 6.0

+ 

+ Fix function calls to be compatible with glusterfs-api-devel 6.0

+ 

+ ---

+  usr/bs_glfs.c | 16 ++++++++--------

+  1 file changed, 8 insertions(+), 8 deletions(-)

+ 

+ diff --git a/usr/bs_glfs.c b/usr/bs_glfs.c

+ index 93984b4..9da30e1 100644

+ --- a/usr/bs_glfs.c

+ +++ b/usr/bs_glfs.c

+ @@ -110,7 +110,7 @@ static void bs_glfs_request(struct scsi_cmd *cmd)

+  			break;

+  		}

+  

+ -		ret = glfs_pread(gfd, tmpbuf, length, offset, lu->bsoflags);

+ +		ret = glfs_pread(gfd, tmpbuf, length, offset, lu->bsoflags, NULL);

+  

+  		if (ret != length) {

+  			set_medium_error(&result, &key, &asc);

+ @@ -147,7 +147,7 @@ static void bs_glfs_request(struct scsi_cmd *cmd)

+  			break;

+  		}

+  

+ -		ret = glfs_pread(gfd, tmpbuf, length, offset, SEEK_SET);

+ +		ret = glfs_pread(gfd, tmpbuf, length, offset, SEEK_SET, NULL);

+  

+  		if (ret != length) {

+  			set_medium_error(&result, &key, &asc);

+ @@ -190,7 +190,7 @@ static void bs_glfs_request(struct scsi_cmd *cmd)

+  			key = ILLEGAL_REQUEST;

+  			asc = ASC_INVALID_FIELD_IN_CDB;

+  		} else {

+ -			glfs_fdatasync(gfd);

+ +			glfs_fdatasync(gfd, NULL, NULL);

+  		}

+  		break;

+  	case WRITE_VERIFY:

+ @@ -204,7 +204,7 @@ static void bs_glfs_request(struct scsi_cmd *cmd)

+  		length = scsi_get_out_length(cmd);

+  		write_buf = scsi_get_out_buffer(cmd);

+  write:

+ -		ret = glfs_pwrite(gfd, write_buf, length, offset, lu->bsoflags);

+ +		ret = glfs_pwrite(gfd, write_buf, length, offset, lu->bsoflags, NULL, NULL);

+  

+  		if (ret == length) {

+  			struct mode_pg *pg;

+ @@ -222,7 +222,7 @@ write:

+  			}

+  			if (((cmd->scb[0] != WRITE_6) && (cmd->scb[1] & 0x8)) ||

+  			    !(pg->mode_data[0] & 0x04))

+ -				glfs_fdatasync(gfd);

+ +				glfs_fdatasync(gfd, NULL, NULL);

+  		} else

+  			set_medium_error(&result, &key, &asc);

+  

+ @@ -258,7 +258,7 @@ write:

+  			}

+  

+  			ret = glfs_pwrite(gfd, tmpbuf, blocksize,

+ -					offset, lu->bsoflags);

+ +					offset, lu->bsoflags, NULL, NULL);

+  

+  			if (ret != blocksize)

+  				set_medium_error(&result, &key, &asc);

+ @@ -273,7 +273,7 @@ write:

+  	case READ_16:

+  		length = scsi_get_in_length(cmd);

+  		ret = glfs_pread(gfd, scsi_get_in_buffer(cmd),

+ -				length, offset, SEEK_SET);

+ +				length, offset, SEEK_SET, NULL);

+  

+  		if (ret != length) {

+  			eprintf("Error on read %x %x", ret, length);

+ @@ -299,7 +299,7 @@ verify:

+  			break;

+  		}

+  

+ -		ret = glfs_pread(gfd, tmpbuf, length, offset, lu->bsoflags);

+ +		ret = glfs_pread(gfd, tmpbuf, length, offset, lu->bsoflags, NULL);

+  

+  		if (ret != length)

+  			set_medium_error(&result, &key, &asc);

+ -- 

+ 2.21.0

+ 

@@ -1,36 +0,0 @@ 

- From ae455f6cc3692ba0c196522bf7c67f8cc91d9c9d Mon Sep 17 00:00:00 2001

- From: Andy Grover <agrover@redhat.com>

- Date: Wed, 26 Jul 2017 14:07:46 -0700

- Subject: [PATCH] Fix build with GCC 7

- 

- Signed-off-by: Andy Grover <agrover@redhat.com>

- ---

-  usr/Makefile | 2 +-

-  usr/bs_sg.c  | 1 +

-  2 files changed, 2 insertions(+), 1 deletion(-)

- 

- diff --git a/usr/Makefile b/usr/Makefile

- index decf13c..9666db0 100644

- --- a/usr/Makefile

- +++ b/usr/Makefile

- @@ -45,7 +45,7 @@ CFLAGS += -g -O0 -ggdb -rdynamic

-  else

-  CFLAGS += -g -O2 -fno-strict-aliasing

-  endif

- -CFLAGS += -Wall -Wstrict-prototypes -Werror -fPIC

- +CFLAGS += -Wall -Wstrict-prototypes -Werror -fPIC -Wno-format-truncation

-  CFLAGS += -DTGT_VERSION=\"$(VERSION)$(EXTRAVERSION)\"

-  CFLAGS += -DBSDIR=\"$(DESTDIR)$(libdir)/backing-store\"

-  

- diff --git a/usr/bs_sg.c b/usr/bs_sg.c

- index 66f4a3b..b7e71bc 100644

- --- a/usr/bs_sg.c

- +++ b/usr/bs_sg.c

- @@ -36,6 +36,7 @@

-  #include <sys/stat.h>

-  #include <sys/epoll.h>

-  #include <scsi/sg.h>

- +#include <sys/sysmacros.h>

-  

-  #include "bsg.h" /* Copied from include/linux/bsg.h */

-  #include "list.h"

file modified
+10 -7

@@ -13,13 +13,13 @@ 

  

  

  Name:           scsi-target-utils

- Version:        1.0.70

- Release:        7%{?dist}

+ Version:        1.0.79

+ Release:        1%{?dist}

  Summary:        The SCSI target daemon and utility programs

  

  License:        GPLv2

  URL:            http://stgt.sourceforge.net/

- Source0:        http://fujita.github.com/tgt/downloads/%{oname}-%{version}.tar.gz

+ Source0:        https://github.com/fujita/tgt/archive/v%{version}/%{oname}-%{version}.tar.gz

  Source1:        tgtd.service

  Source2:        sysconfig.tgtd

  Source3:        targets.conf

@@ -28,8 +28,9 @@ 

  Patch0:         0001-redhatify-docs.patch

  Patch1:         0002-remove-check-for-xsltproc.patch

  Patch2:         0003-default-config.patch

- Patch3:         0004-Fix-compiler-error-in-tgtd.c-call_program.patch

- Patch4:         0005-Fix-build-with-GCC-7.patch

+ Patch3:         0004-Glusterfs-api-6.0.patch

+ 

+ ExcludeArch:    i686 armv7hl

  

  

  BuildRequires:  gcc

@@ -61,7 +62,7 @@ 

  %if 0%{?with_glfs}

  %package gluster

  Summary:        Support for the Gluster backstore to scsi-target-utils

- BuildRequires: glusterfs-api-devel

+ BuildRequires: glusterfs-api-devel >= 6.0

  Requires: %{name}%{?_isa} = %{version}-%{release}

  

  %description gluster

@@ -75,7 +76,6 @@ 

  %patch1 -p1

  %patch2 -p1

  %patch3 -p1

- %patch4 -p1

  

  

  %build

@@ -149,6 +149,9 @@ 

  %endif

  

  %changelog

+ * Thu Jun 20 2019 Maurizio Lombardi <mlombard@redhat.com> - 1.0.78-1

+ - Update to the latest upstream version

+ 

  * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.70-7

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (tgt-1.0.70.tar.gz) = 0deb355647fca66584240d6a30c13a74129727df2b5951f08b6029c65d047fad42803ef1651d0c69fbc39df38aff3438f3775783126aef9e354688f240b40e1a

+ SHA512 (tgt-1.0.79.tar.gz) = 8cae6c43521e087fed72f98ae9659995961f987170c9799f8ebb018c0571ae78f79ce490a42dd0fddc6d1c3e946105e00b7cb02e3186026e4642d1711a990fe1