public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/scsi-target-utils] f43: 1.0.97
@ 2026-08-18 16:31
0 siblings, 0 replies; only message in thread
From: @ 2026-08-18 16:31 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/scsi-target-utils
Branch : f43
Commit : f66f131d6158441c19345d119f01a4ce94340666
Author : Terje Røsten <terjeros@gmail.com>
Date : 2025-11-03T13:47:40+01:00
Stats : +12/-108 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/scsi-target-utils/c/f66f131d6158441c19345d119f01a4ce94340666?branch=f43
Log:
1.0.97
Remove patch now upstream
---
diff --git a/.gitignore b/.gitignore
index 4f89f3e..a96d35b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/tgt-v1.0.93.tar.gz
/tgt-v1.0.95.tar.gz
/tgt-v1.0.96.tar.gz
+/tgt-v1.0.97.tar.gz
diff --git a/scsi-target-utils.spec b/scsi-target-utils.spec
index e5af365..2adda2e 100644
--- a/scsi-target-utils.spec
+++ b/scsi-target-utils.spec
@@ -17,8 +17,8 @@
Summary: The SCSI target daemon and utility programs
Name: scsi-target-utils
-Version: 1.0.96
-Release: 2%{?dist}
+Version: 1.0.97
+Release: 1%{?dist}
# Automatically converted from old format: GPLv2 - review is highly recommended.
License: GPL-2.0-only
URL: http://stgt.sourceforge.net/
@@ -28,10 +28,8 @@ Source2: sysconfig.tgtd
Source3: targets.conf
Source4: sample.conf
Source5: tgtd.conf
-Patch1: 0002-remove-check-for-xsltproc.patch
-Patch2: 0003-default-config.patch
-# Adapt to glusterfs-api 7.6.3, not tested
-Patch3: tgt-1.0.79-Adapt-to-glusterfs-api-7.6.3.patch
+Patch: 0002-remove-check-for-xsltproc.patch
+Patch: 0003-default-config.patch
BuildRequires: docbook-style-xsl
BuildRequires: gcc
BuildRequires: libaio-devel
@@ -81,7 +79,8 @@ Adds support for the Gluster glfs backstore to scsi-target-utils.
%build
%{__sed} -i -e 's|-g -O2 -fno-strict-aliasing|%{optflags} -fcommon|' -e 's| -Werror | |' usr/Makefile
-%{__make} %{?_smp_mflags} %{?with_rdma:ISCSI_RDMA=1} %{?with_rbd:CEPH_RBD=1} %{?with_glfs:GLFS_BD=1} SD_NOTIFY=1 libdir=%{_libdir}/tgt
+%{__make} %{?_smp_mflags} doc V=1
+%{__make} %{?_smp_mflags} %{?with_rdma:ISCSI_RDMA=1} %{?with_rbd:CEPH_RBD=1} %{?with_glfs:GLFS_BD=1} SD_NOTIFY=1 libdir=%{_libdir}/tgt V=1
%install
install -D -p -m 0755 scripts/tgt-setup-lun %{buildroot}%{_sbindir}/tgt-setup-lun
@@ -139,6 +138,10 @@ pushd usr
%endif
%changelog
+* Mon Nov 03 2025 Terje Rosten <terjeros@gmail.com> - 1.0.97-1
+- 1.0.97
+- Remove patch now upstream
+
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.96-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
diff --git a/sources b/sources
index 3927c2c..e0794c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tgt-v1.0.96.tar.gz) = 0f141b5a3041a8d63c70771ccdb7b76a15420af95490159d8a415b16cc991773b29c945bc94720795ead20b6bee7d0972b36a52bca6fd43a09fa639844230cce
+SHA512 (tgt-v1.0.97.tar.gz) = da7a68cb45a7384fc558f1498d6569c42ea56458adef2ce296712e2c693142fab3c5103b065a4b8669f3fd8f373f1955bf5154d2b42f08d63f30bec077b021db
diff --git a/tgt-1.0.79-Adapt-to-glusterfs-api-7.6.3.patch b/tgt-1.0.79-Adapt-to-glusterfs-api-7.6.3.patch
deleted file mode 100644
index aa94823..0000000
--- a/tgt-1.0.79-Adapt-to-glusterfs-api-7.6.3.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From ee3456567a639fbff8ce33c5fe166efaed5cee26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Thu, 4 Jul 2019 18:30:28 +0200
-Subject: [PATCH] Adapt to glusterfs-api 7.6.3
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Glusterfs API has changed. Some functions as can be seen in glusterfs-6.3 got
-new arguments.
-
-Samba dealt with it by using NULL arguments
-<https://bugzilla.samba.org/show_bug.cgi?id=13330>. This patch mimics it.
-
-Not tested.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- 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.20.1
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-18 16:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-18 16:31 [rpms/scsi-target-utils] f43: 1.0.97
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox