user debian-rele...@lists.debian.org usertags 924844 + bsp-2019-03-fr-paris tags 924844 + ftbfs patch pending thank you
Dear Maintainers, On Sun, 17 Mar 2019 19:01:41 +0100 Lucas Nussbaum <lu...@debian.org> wrote: > Source: thin-provisioning-tools > Version: 0.7.6-2 > Severity: serious > Justification: FTBFS in buster on amd64 I am about to NMU a fix for that bug. The debdiff is attached. Note that I did not submit a merge request to salsa since: 1) the Vcs-Git field points to a different location 2) I am not familiar with your git workflow (where the quilt patches are applied on the master branch) Cheers, -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄⠀⠀⠀⠀ http://www.debian.org
diff -Nru thin-provisioning-tools-0.7.6/debian/changelog thin-provisioning-tools-0.7.6/debian/changelog --- thin-provisioning-tools-0.7.6/debian/changelog 2019-01-13 12:42:46.000000000 +0100 +++ thin-provisioning-tools-0.7.6/debian/changelog 2019-03-31 11:35:25.000000000 +0200 @@ -1,3 +1,13 @@ +thin-provisioning-tools (0.7.6-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * 0002-fix-FTBFS-against-libaio-0.3.112.patch: new patch, renames + static raise() function in ft-lib/bcache.c to avoid symbol conflict + with raise() from signal.h + (Closes: #924844) + + -- Sébastien Villemot <sebast...@debian.org> Sun, 31 Mar 2019 11:35:25 +0200 + thin-provisioning-tools (0.7.6-2) unstable; urgency=medium * Fix prototype for open in test preload wrapper. (closes: #893557) diff -Nru thin-provisioning-tools-0.7.6/debian/patches/0002-fix-FTBFS-against-libaio-0.3.112.patch thin-provisioning-tools-0.7.6/debian/patches/0002-fix-FTBFS-against-libaio-0.3.112.patch --- thin-provisioning-tools-0.7.6/debian/patches/0002-fix-FTBFS-against-libaio-0.3.112.patch 1970-01-01 01:00:00.000000000 +0100 +++ thin-provisioning-tools-0.7.6/debian/patches/0002-fix-FTBFS-against-libaio-0.3.112.patch 2019-03-31 11:35:25.000000000 +0200 @@ -0,0 +1,86 @@ +Description: Fix FTBFS against libaio 0.3.112 + Since version 0.3.112, libaio.h includes signal.h, which conflicts with the + (static) raise() function in ft-lib/bcache.c. This patch renames the latter + to fix the conflict. +Author: Sébastien Villemot <sebast...@debian.org> +Bug-Debian: https://bugs.debian.org/924844 +Forwarded: no +Last-Update: 2019-03-31 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/ft-lib/bcache.c ++++ b/ft-lib/bcache.c +@@ -32,7 +32,7 @@ static void warn(const char *fmt, ...) + } + + // FIXME: raise a condition somehow? +-static void raise(const char *fmt, ...) ++static void raise_condition(const char *fmt, ...) + { + va_list ap; + +@@ -52,7 +52,7 @@ static inline struct list_head *list_pop + struct list_head *l; + + if (head->next == head) +- raise("list is empty\n"); ++ raise_condition("list is empty\n"); + + l = head->next; + list_del(l); +@@ -99,7 +99,7 @@ static struct cb_set *cb_set_create(unsi + static void cb_set_destroy(struct cb_set *cbs) + { + if (!list_empty(&cbs->allocated)) +- raise("async io still in flight"); ++ raise_condition("async io still in flight"); + + free(cbs->vec); + free(cbs); +@@ -714,13 +714,13 @@ struct bcache *bcache_simple(const char + uint64_t s; + + if (fd < 0) { +- raise("couldn't open cache file"); ++ raise_condition("couldn't open cache file"); + return NULL; + } + + r = fstat(fd, &info); + if (r < 0) { +- raise("couldn't stat cache file"); ++ raise_condition("couldn't stat cache file"); + return NULL; + } + +@@ -752,9 +752,9 @@ void bcache_destroy(struct bcache *cache + static void check_index(struct bcache *cache, block_address index) + { + if (index >= cache->nr_data_blocks) +- raise("block out of bounds (%llu >= %llu)", +- (unsigned long long) index, +- (unsigned long long) cache->nr_data_blocks); ++ raise_condition("block out of bounds (%llu >= %llu)", ++ (unsigned long long) index, ++ (unsigned long long) cache->nr_data_blocks); + } + + uint64_t get_nr_blocks(struct bcache *cache) +@@ -803,7 +803,7 @@ static struct block *lookup_or_read_bloc + // FIXME: this is insufficient. We need to also catch a read + // lock of a write locked block. Ref count needs to distinguish. + if (b->ref_count && (flags & (GF_DIRTY | GF_ZERO))) +- raise("concurrent write lock attempt"); ++ raise_condition("concurrent write lock attempt"); + + if (test_flags(b, BF_IO_PENDING)) { + miss(cache, flags); +@@ -859,7 +859,7 @@ struct block *get_block(struct bcache *c + return b; + } + +- raise("couldn't get block"); ++ raise_condition("couldn't get block"); + return NULL; + } + diff -Nru thin-provisioning-tools-0.7.6/debian/patches/series thin-provisioning-tools-0.7.6/debian/patches/series --- thin-provisioning-tools-0.7.6/debian/patches/series 2019-01-13 12:23:49.000000000 +0100 +++ thin-provisioning-tools-0.7.6/debian/patches/series 2019-03-31 11:35:25.000000000 +0200 @@ -1 +1,2 @@ 0001-Fix-build-system.patch +0002-fix-FTBFS-against-libaio-0.3.112.patch
signature.asc
Description: This is a digitally signed message part
