Your message dated Wed, 11 Dec 2019 11:19:17 +0000
with message-id <[email protected]>
and subject line Bug#946460: fixed in tcmu 1.5.2-3
has caused the Debian Bug report #946460,
regarding tcmu: Fix for 32 bit builds
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
946460: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=946460
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: tcmu
Version: 1.5.2-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu focal ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Resolve issues with compilation on 32 bit architectures:
- d/p/32bit-size_t-cast.patch: Ensure same type comparison
avoiding compilation error.
- d/p/Disable-Werror.patch: Drop, no longer needed.
This avoids the need to disable -Werror universally for all builds.
Thanks for considering the patch.
-- System Information:
Debian Release: bullseye/sid
APT prefers focal
APT policy: (500, 'focal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.3.0-19-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru tcmu-1.5.2/debian/patches/32bit-size_t-cast.patch
tcmu-1.5.2/debian/patches/32bit-size_t-cast.patch
--- tcmu-1.5.2/debian/patches/32bit-size_t-cast.patch 1970-01-01
01:00:00.000000000 +0100
+++ tcmu-1.5.2/debian/patches/32bit-size_t-cast.patch 2019-12-09
10:42:11.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Case return of tcmu_lba_to_byte to size_t
+ Ensures comparison of size_t types avoiding compilation
+ error under 32 bit architectures.
+Author: James Page <[email protected]>
+Forwarded: https://github.com/open-iscsi/tcmu-runner/pull/603
+
+diff --git a/tcmur_cmd_handler.c b/tcmur_cmd_handler.c
+index 132c668..a68e367 100644
+--- a/tcmur_cmd_handler.c
++++ b/tcmur_cmd_handler.c
+@@ -725,7 +725,7 @@ static int handle_writesame(struct tcmu_device *dev,
struct tcmulib_cmd *cmd)
+
+ max_xfer_length = tcmu_dev_get_max_xfer_len(dev) * block_size;
+ length = round_up(length, max_xfer_length);
+- length = min(length, tcmu_lba_to_byte(dev, lba_cnt));
++ length = min(length, (size_t)tcmu_lba_to_byte(dev, lba_cnt));
+
+ if (tcmur_cmd_state_init(tcmur_cmd, sizeof(*write_same), length)) {
+ tcmu_dev_err(dev, "Failed to calloc write_same data!\n");
diff -Nru tcmu-1.5.2/debian/patches/Disable-Werror.patch
tcmu-1.5.2/debian/patches/Disable-Werror.patch
--- tcmu-1.5.2/debian/patches/Disable-Werror.patch 2019-10-21
13:39:15.000000000 +0100
+++ tcmu-1.5.2/debian/patches/Disable-Werror.patch 1970-01-01
01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-From: =?utf-8?q?Rapha=C3=ABl_Hertzog?= <[email protected]>
-Date: Mon, 21 Oct 2019 14:31:53 +0200
-Subject: Disable Werror
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index da21689..7618eb5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required (VERSION 2.8 FATAL_ERROR)
- project (tcmu-runner C)
- set(VERSION 1.5.2)
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall
-Wdeclaration-after-statement -std=c99")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wdeclaration-after-statement
-std=c99")
-
- include(GNUInstallDirs)
- include(CheckIncludeFile)
diff -Nru tcmu-1.5.2/debian/patches/series tcmu-1.5.2/debian/patches/series
--- tcmu-1.5.2/debian/patches/series 2019-10-21 13:39:15.000000000 +0100
+++ tcmu-1.5.2/debian/patches/series 2019-12-09 10:40:48.000000000 +0000
@@ -1 +1 @@
-Disable-Werror.patch
+32bit-size_t-cast.patch
--- End Message ---
--- Begin Message ---
Source: tcmu
Source-Version: 1.5.2-3
We believe that the bug you reported is fixed in the latest version of
tcmu, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Raphaël Hertzog <[email protected]> (supplier of updated tcmu package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Wed, 11 Dec 2019 11:17:54 +0100
Source: tcmu
Architecture: source
Version: 1.5.2-3
Distribution: unstable
Urgency: medium
Maintainer: Freexian Packaging Team <[email protected]>
Changed-By: Raphaël Hertzog <[email protected]>
Closes: 946460
Changes:
tcmu (1.5.2-3) unstable; urgency=medium
.
* Team upload.
* Add patch to fix 32 bit builds with -Werror.
Thanks to James Page <[email protected]> (Closes: #946460)
* Add Pre-Depends with substvars so that the appropriate init-system-helpers
dependency gets added.
Checksums-Sha1:
bec32ded4e0cf7f604bf9bdd7088d9ac9c9355f6 1718 tcmu_1.5.2-3.dsc
efebabd0c34c8693db783461c1e09ae7bd5f0129 5996 tcmu_1.5.2-3.debian.tar.xz
716ba3f56b134607dd85203aadbc723153dcdfd8 7019 tcmu_1.5.2-3_source.buildinfo
Checksums-Sha256:
3b06815566e250c3cf6bf1eafa67fb5c289c9d947044b21df32bb867532065f1 1718
tcmu_1.5.2-3.dsc
08050a0c56918a1ad1a1cbc9ab17453ce14828a1494abc807c0a1da4fd924e48 5996
tcmu_1.5.2-3.debian.tar.xz
637f6ac7d24873f525248901d4dd9a3dfd5b4575a02214ea6c85d37b6a176cc2 7019
tcmu_1.5.2-3_source.buildinfo
Files:
d952a376bd1d27eeed78377d9f4d1bb8 1718 admin optional tcmu_1.5.2-3.dsc
35274495ae470011123f884e83b47c2b 5996 admin optional tcmu_1.5.2-3.debian.tar.xz
3d71b4df968b9544bcb2419f4ff427d6 7019 admin optional
tcmu_1.5.2-3_source.buildinfo
-----BEGIN PGP SIGNATURE-----
Comment: Signed by Raphael Hertzog
iQEzBAEBCgAdFiEE1823g1EQnhJ1LsbSA4gdq+vCmrkFAl3wy38ACgkQA4gdq+vC
mrkBpwf/anFWsU5ziaWmlwInOG5TVGERsXPopUglP7wFj1PmFYPmd/7bgR6EvYKH
kv4Hm0Dqul0S8X5vMfG6j4dZHe0xKhx7SJiZy518eMd/SMD9Myuekr7RTXkoZWbm
NoM9Zp+wFup1nDh2BUGL4zAoRM8uDeycy7LrDY9Eux0PYqwjgVbRsv3V5XOuCVQc
qBT5ES+k3r+mPsH35BPIdVXvfpgWrHekxdFNOz7v19rdOVtjNpp/6xnIKr9nBCTP
11tSMJpx4uE46fjRKfPkVEp3rlNW+TfO8w2hT+eBlT1hL7TUEDhCVZQWMqVFwJTF
lfXDg36wsVzbhWDZj4Nr/9VClBIj0g==
=hGWl
-----END PGP SIGNATURE-----
--- End Message ---
