Bug#957380: istgt: diff for NMU version 0.4~20111008-3.1
On 12 Aug 2020, at 19:15, Sudip Mukherjee <sudipm.mukherjee@gmail.com> wrote:
>
> Control: tags 957380 + patch
> Control: tags 957380 + pending
>
> Dear maintainer,
>
> I've prepared an NMU for istgt (versioned as 0.4~20111008-3.1) and
> uploaded it to DELAYED/2. Please feel free to tell me if I
> should cancel it.
Thanks, I've been meaning to do this but it's just not a high enough
priority for me. Could you please however use `typedef` instead, as I
believe the intent of the code (based on how these ones are written,
and what's around it) is to have `ISTGT_LU_TASK_TYPE` be the type name,
not `enum ISTGT_LU_TASK_TYPE`? Would you also be willing to file it as
a merge request against https://salsa.debian.org/bsd-team/istgt?
Jess
> --
> Regards
> Sudip
>
> diff -Nru istgt-0.4~20111008/debian/changelog istgt-0.4~20111008/debian/changelog
> --- istgt-0.4~20111008/debian/changelog 2012-06-26 23:25:01.000000000 +0100
> +++ istgt-0.4~20111008/debian/changelog 2020-08-12 19:05:25.000000000 +0100
> @@ -1,3 +1,10 @@
> +istgt (0.4~20111008-3.1) unstable; urgency=medium
> +
> + * Non-maintainer upload.
> + * Fix ftbfs with GCC-10. (Closes: #957380)
> +
> + -- Sudip Mukherjee <sudipm.mukherjee@gmail.com> Wed, 12 Aug 2020 19:05:25 +0100
> +
> istgt (0.4~20111008-3) unstable; urgency=low
>
> * Fix "cannot determine device size from symlink" Apply patch to use stat()
> diff -Nru istgt-0.4~20111008/debian/patches/fix_ftbfs.patch istgt-0.4~20111008/debian/patches/fix_ftbfs.patch
> --- istgt-0.4~20111008/debian/patches/fix_ftbfs.patch 1970-01-01 01:00:00.000000000 +0100
> +++ istgt-0.4~20111008/debian/patches/fix_ftbfs.patch 2020-08-12 19:05:25.000000000 +0100
> @@ -0,0 +1,31 @@
> +Description: Fix ftbfs with GCC-10
> + The enum variable is not used, use that as the enum name to declare it.
> +
> +Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> +Bug-Debian: https://bugs.debian.org/957380
> +Forwarded: no
> +---
> +
> +--- istgt-0.4~20111008.orig/src/istgt_lu.h
> ++++ istgt-0.4~20111008/src/istgt_lu.h
> +@@ -270,16 +270,16 @@ typedef struct istgt_lu_cmd_t {
> + } ISTGT_LU_CMD;
> + typedef ISTGT_LU_CMD *ISTGT_LU_CMD_Ptr;
> +
> +-enum {
> ++enum ISTGT_LU_TASK_RESULT {
> + ISTGT_LU_TASK_RESULT_IMMEDIATE = 0,
> + ISTGT_LU_TASK_RESULT_QUEUE_OK = 1,
> + ISTGT_LU_TASK_RESULT_QUEUE_FULL = 2,
> +-} ISTGT_LU_TASK_RESULT;
> ++};
> +
> +-enum {
> ++enum ISTGT_LU_TASK_TYPE {
> + ISTGT_LU_TASK_RESPONSE = 0,
> + ISTGT_LU_TASK_REQPDU = 1,
> +-} ISTGT_LU_TASK_TYPE;
> ++};
> +
> + typedef struct istgt_lu_task_t {
> + int type;
> diff -Nru istgt-0.4~20111008/debian/patches/series istgt-0.4~20111008/debian/patches/series
> --- istgt-0.4~20111008/debian/patches/series 2012-06-26 22:04:42.000000000 +0100
> +++ istgt-0.4~20111008/debian/patches/series 2020-08-12 19:00:39.000000000 +0100
> @@ -3,3 +3,4 @@
> fix-as-needed-build.patch
> fix-autosize.patch
> add-reload.patch
> +fix_ftbfs.patch
>
Reply to: