diff -pruN 1:1.0.85-1.3/debian/changelog 1:1.0.85-1.3ubuntu1/debian/changelog --- 1:1.0.85-1.3/debian/changelog 2024-09-08 19:03:20.000000000 +0000 +++ 1:1.0.85-1.3ubuntu1/debian/changelog 2024-11-19 14:27:43.000000000 +0000 @@ -1,3 +1,16 @@ +tgt (1:1.0.85-1.3ubuntu1) plucky; urgency=medium + + * Merge with Debian unstable (LP: #2085299). Remaining changes: + - Add fio-examples as a localtgt test dependency + - d/t/control, d/t/storage: handle tgt-glusterfs not being available + everywhere, notably, not on 32bit architectures + - d/tests/storage: Skip RBD tests on unsupported architectures. + * Dropped changes: + - Fix ftbfs on arm64 and riscv64 with upstream patch (LP #2053134) + [ Fixed with glibc 2.40 transition ] + + -- Athos Ribeiro Tue, 19 Nov 2024 11:27:43 -0300 + tgt (1:1.0.85-1.3) unstable; urgency=medium * Non-maintainer upload. @@ -5,6 +18,21 @@ tgt (1:1.0.85-1.3) unstable; urgency=med -- Salvatore Bonaccorso Sun, 08 Sep 2024 21:03:20 +0200 +tgt (1:1.0.85-1.2ubuntu1) oracular; urgency=medium + + * Merge with Debian unstable (LP: #2064472). Remaining changes: + - Add fio-examples as a localtgt test dependency + - d/t/control, d/t/storage: handle tgt-glusterfs not being available + everywhere, notably, not on 32bit architectures + - Fix ftbfs on arm64 and riscv64 with upstream patch (LP #2053134) + - d/tests/storage: Skip RBD tests on unsupported architectures. + * Dropped changes: + - d/control,rules: Only enable support for RBD on 64 bit architectures + (LP #2061815). + [ Fixed in 1:1.0.85-1.2 ] + + -- Athos Ribeiro Fri, 14 Jun 2024 08:48:08 -0300 + tgt (1:1.0.85-1.2) unstable; urgency=medium * Non-maintainer upload. @@ -13,6 +41,48 @@ tgt (1:1.0.85-1.2) unstable; urgency=med -- Chris Hofstaedtler Tue, 09 Apr 2024 09:28:44 +0200 +tgt (1:1.0.85-1.1ubuntu6) noble; urgency=medium + + * d/tests/storage: Skip RBD tests on unsupported architectures. + + -- James Page Wed, 17 Apr 2024 17:18:18 +0100 + +tgt (1:1.0.85-1.1ubuntu5) noble; urgency=medium + + * d/control,rules: Only enable support for RBD on 64 bit architectures + (LP: #2061815). + + -- James Page Wed, 17 Apr 2024 05:24:53 +0100 + +tgt (1:1.0.85-1.1ubuntu4) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- William Grant Mon, 01 Apr 2024 19:24:10 +1100 + +tgt (1:1.0.85-1.1ubuntu3) noble; urgency=medium + + * No-change rebuild against librdmacm1t64 + + -- Steve Langasek Tue, 12 Mar 2024 07:13:22 +0000 + +tgt (1:1.0.85-1.1ubuntu2) noble; urgency=medium + + [ Andreas Hasenack ] + * Fix ftbfs on arm64 and riscv64 with upstream patch (Closes: #2053134) + + -- Gianfranco Costamagna Thu, 15 Feb 2024 13:42:12 +0100 + +tgt (1:1.0.85-1.1ubuntu1) noble; urgency=medium + + * Merge with Debian unstable (LP: #2052657). Remaining changes: + - Add fio-examples as a localtgt test dependency + * Added: + - d/t/control, d/t/storage: handle tgt-glusterfs not being available + everywhere, notably, not on 32bit architectures + + -- Andreas Hasenack Thu, 08 Feb 2024 09:25:53 -0300 + tgt (1:1.0.85-1.1) unstable; urgency=medium * Non-maintainer upload. @@ -26,6 +96,12 @@ tgt (1:1.0.85-1.1) unstable; urgency=med -- Chris Hofstaedtler Fri, 17 Nov 2023 22:35:38 +0100 +tgt (1:1.0.85-1ubuntu1) lunar; urgency=medium + + * Add fio-examples as a localtgt test dependency + + -- Danilo Egea Gondolfo Thu, 23 Mar 2023 16:46:49 -0300 + tgt (1:1.0.85-1) unstable; urgency=medium * New upstream version 1.0.85 diff -pruN 1:1.0.85-1.3/debian/control 1:1.0.85-1.3ubuntu1/debian/control --- 1:1.0.85-1.3/debian/control 2024-09-08 19:03:20.000000000 +0000 +++ 1:1.0.85-1.3ubuntu1/debian/control 2024-11-19 14:27:43.000000000 +0000 @@ -1,7 +1,8 @@ Source: tgt Section: net Priority: optional -Maintainer: Apollon Oikonomopoulos +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Apollon Oikonomopoulos Build-Depends: debhelper-compat (= 13), libibverbs-dev, librdmacm-dev (>= 1.0.16), xsltproc, docbook-xsl, librbd-dev [amd64 arm64 ppc64el ppc64 riscv64 mips64el s390x ia64 sparc64], diff -pruN 1:1.0.85-1.3/debian/tests/control 1:1.0.85-1.3ubuntu1/debian/tests/control --- 1:1.0.85-1.3/debian/tests/control 2024-09-08 19:03:20.000000000 +0000 +++ 1:1.0.85-1.3ubuntu1/debian/tests/control 2024-11-19 14:20:54.000000000 +0000 @@ -2,9 +2,9 @@ Tests: daemon admin Depends: tgt Tests: storage -Depends: tgt, tgt-rbd, tgt-glusterfs +Depends: @ Restrictions: needs-root isolation-container allow-stderr Tests: localtgt -Depends: tgt, open-iscsi, fio +Depends: tgt, open-iscsi, fio, fio-examples Restrictions: needs-root isolation-machine allow-stderr diff -pruN 1:1.0.85-1.3/debian/tests/storage 1:1.0.85-1.3ubuntu1/debian/tests/storage --- 1:1.0.85-1.3/debian/tests/storage 2024-09-08 19:03:20.000000000 +0000 +++ 1:1.0.85-1.3ubuntu1/debian/tests/storage 2024-11-19 14:25:06.000000000 +0000 @@ -13,7 +13,22 @@ supported_bs=$(tgtadm --mode sys --op sh }') ret=0 -for bs in glfs rbd aio; do +bs_list="aio" +# glusterfs, and thus tgt-glusterfs, is not available in all architectures, so +# let's exclude it if it's not installed +if dpkg -l tgt-glusterfs 2>/dev/null | grep -q ^ii; then + bs_list="glfs $bs_list" +else + echo "WARNING: glusterfs not available on arch $(dpkg --print-architecture)" +fi +# rbd, and thus tgt-rbd, is not available in all architectures, so +# let's exclude it if it's not installed +if dpkg -l tgt-rbd 2>/dev/null | grep -q ^ii; then + bs_list="rbd $bs_list" +else + echo "WARNING: rbd not available on arch $(dpkg --print-architecture)" +fi +for bs in ${bs_list}; do if echo "$supported_bs" | grep -q "\b$bs\b"; then echo "OK - $bs supported" else