diff -Nru zfs-fuse-0.7.0/debian/changelog zfs-fuse-0.7.0/debian/changelog --- zfs-fuse-0.7.0/debian/changelog 2021-12-08 12:29:55.000000000 +0000 +++ zfs-fuse-0.7.0/debian/changelog 2022-11-02 21:56:35.000000000 +0000 @@ -1,14 +1,29 @@ -zfs-fuse (0.7.0-22ubuntu1) jammy; urgency=medium +zfs-fuse (0.7.0-25) unstable; urgency=medium - * Add debian/patches/more-glibc-fixes.patch and fix the package from FTBFS. + * QA upload. - -- Łukasz 'sil2100' Zemczak Wed, 08 Dec 2021 13:29:55 +0100 + [ Debian Janitor ] + * Remove constraints unnecessary since buster (oldstable): + + Build-Depends: Drop versioned constraint on libfuse-dev. -zfs-fuse (0.7.0-22build1) jammy; urgency=medium + -- Jelmer Vernooij Wed, 02 Nov 2022 21:56:35 +0000 - * No-change rebuild against openssl3 +zfs-fuse (0.7.0-24) unstable; urgency=medium - -- Simon Chopin Fri, 03 Dec 2021 11:57:18 +0100 + * QA upload. + + * Remove debian/watch, mentions of zfs-fuse.net (Closes: #1013948) + + -- Hilko Bengen Thu, 22 Sep 2022 14:02:56 +0200 + +zfs-fuse (0.7.0-23) unstable; urgency=medium + + * QA upload. + + [ Hilko Bengen ] + * Add patch to FTBFS with glibc >= 2..34 (Closes: #1017162, #1017311) + + -- Hilko Bengen Thu, 22 Sep 2022 01:32:45 +0200 zfs-fuse (0.7.0-22) unstable; urgency=medium diff -Nru zfs-fuse-0.7.0/debian/control zfs-fuse-0.7.0/debian/control --- zfs-fuse-0.7.0/debian/control 2021-12-08 12:29:55.000000000 +0000 +++ zfs-fuse-0.7.0/debian/control 2022-11-02 21:56:35.000000000 +0000 @@ -1,17 +1,15 @@ Source: zfs-fuse Section: otherosfs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian QA Group +Maintainer: Debian QA Group Build-Depends: debhelper-compat (= 12), libaio-dev, libattr1-dev, - libfuse-dev (>= 2.8.7-2), + libfuse-dev, libssl-dev, scons, zlib1g-dev Standards-Version: 3.9.8 -Homepage: http://zfs-fuse.net Vcs-Git: https://salsa.debian.org/debian/zfs-fuse.git Vcs-Browser: https://salsa.debian.org/debian/zfs-fuse diff -Nru zfs-fuse-0.7.0/debian/patches/glibc-2.34-compat.patch zfs-fuse-0.7.0/debian/patches/glibc-2.34-compat.patch --- zfs-fuse-0.7.0/debian/patches/glibc-2.34-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ zfs-fuse-0.7.0/debian/patches/glibc-2.34-compat.patch 2022-11-02 21:56:35.000000000 +0000 @@ -0,0 +1,92 @@ +Description: Fix build failure with glibc 2.34 + glibc 2.32 removes malloc hooks which are used in libumem. This patch + changes all #ifdef __GLIBC__ guarding malloc-related code in libumem + to require glibc < 2.34. +Author: Hilko Bengen +Bug-Debian: https://bugs.debian.org/1017311 + +Index: zfs-fuse/src/lib/libumem/malloc.c +=================================================================== +--- zfs-fuse.orig/src/lib/libumem/malloc.c ++++ zfs-fuse/src/lib/libumem/malloc.c +@@ -41,7 +41,7 @@ + + #include "misc.h" + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + # include + #endif + +@@ -62,7 +62,7 @@ typedef struct malloc_data { + uint32_t malloc_stat; /* = UMEM_MALLOC_ENCODE(state, malloc_size) */ + } malloc_data_t; + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + static void *umem_malloc_hook(size_t size_arg, const void *caller) + #else + void * +@@ -128,7 +128,7 @@ malloc(size_t size_arg) + return ((void *)ret); + } + +-#ifndef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + void * + calloc(size_t nelem, size_t elsize) + { +@@ -156,7 +156,7 @@ calloc(size_t nelem, size_t elsize) + * code. + */ + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + static void *umem_memalign_hook(size_t size_arg, size_t align, const void *caller) + #else + void * +@@ -240,7 +240,7 @@ memalign(size_t align, size_t size_arg) + return ((void *)ret); + } + +-#ifndef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + void * + valloc(size_t size) + { +@@ -392,7 +392,7 @@ process_memalign: + return (1); + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + static void umem_free_hook(void *buf, const void *caller) + #else + void +@@ -408,7 +408,7 @@ free(void *buf) + (void) process_free(buf, 1, NULL); + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + static void *umem_realloc_hook(void *buf_arg, size_t newsize, const void *caller) + #else + void * +@@ -441,7 +441,7 @@ realloc(void *buf_arg, size_t newsize) + return (buf); + } + +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !__GLIBC_PREREQ(2,34) + static void __attribute__((constructor)) umem_malloc_init_hook(void) + { + if (__malloc_hook != umem_malloc_hook) { +@@ -453,7 +453,7 @@ static void __attribute__((constructor)) + } + } + +-#if __GLIBC_PREREQ(2, 14) ++#if __GLIBC_PREREQ(2, 14) && !__GLIBC_PREREQ(2,34) + void (* __volatile __malloc_initialize_hook)(void) = umem_malloc_init_hook; + #else + void (* __malloc_initialize_hook)(void) = umem_malloc_init_hook; diff -Nru zfs-fuse-0.7.0/debian/patches/more-glibc-fixes.patch zfs-fuse-0.7.0/debian/patches/more-glibc-fixes.patch --- zfs-fuse-0.7.0/debian/patches/more-glibc-fixes.patch 2021-12-08 12:29:48.000000000 +0000 +++ zfs-fuse-0.7.0/debian/patches/more-glibc-fixes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Description: Fix build failure with newer glibc - Currently the package FTBFS because of errors re: the deprecated __malloc_hook - etc. usage. The fix is basically taken from 'upstream' - I mention 'upstream' - as right now it's not really clear which repository can be considered upstream - for this project. -Origin: upstream, https://github.com/gordan-bobic/zfs-fuse/commit/9d554eb82861d449f5e86aa6c272da6dd91377a8 - ---- a/src/lib/libumem/malloc.c -+++ b/src/lib/libumem/malloc.c -@@ -441,29 +441,9 @@ - return (buf); - } - --#ifdef __GLIBC__ --static void __attribute__((constructor)) umem_malloc_init_hook(void) --{ -- if (__malloc_hook != umem_malloc_hook) { -- umem_startup(NULL, 0, 0, NULL, NULL); -- __malloc_hook = umem_malloc_hook; -- __free_hook = umem_free_hook; -- __realloc_hook = umem_realloc_hook; -- __memalign_hook = umem_memalign_hook; -- } --} -- --#if __GLIBC_PREREQ(2, 14) --void (* __volatile __malloc_initialize_hook)(void) = umem_malloc_init_hook; --#else --void (* __malloc_initialize_hook)(void) = umem_malloc_init_hook; --#endif -- --#else - void __attribute__((constructor)) - __malloc_umem_init (void) - { - umem_startup(NULL, 0, 0, NULL, NULL); - } --#endif - diff -Nru zfs-fuse-0.7.0/debian/patches/series zfs-fuse-0.7.0/debian/patches/series --- zfs-fuse-0.7.0/debian/patches/series 2021-12-08 12:25:55.000000000 +0000 +++ zfs-fuse-0.7.0/debian/patches/series 2022-11-02 21:56:35.000000000 +0000 @@ -20,4 +20,4 @@ fix-scons-use-python3-print.patch gcc10_fixes.patch glibc-2.32-compat.patch -more-glibc-fixes.patch +glibc-2.34-compat.patch diff -Nru zfs-fuse-0.7.0/debian/README.Debian zfs-fuse-0.7.0/debian/README.Debian --- zfs-fuse-0.7.0/debian/README.Debian 2021-08-21 16:55:58.000000000 +0000 +++ zfs-fuse-0.7.0/debian/README.Debian 2022-11-02 21:56:35.000000000 +0000 @@ -8,7 +8,7 @@ # zpool create zfs hdx4 This will create a ZFS filesystem mounted at /zfs on /dev/hdx4. For more -details please see the relevant manpages and/or the website[1]. +details please see the relevant manpages. zfs-fuse currently should not be used with system volumes such as /var or /usr. /home will probably work (but see below about stability). @@ -20,6 +20,4 @@ although we have gone long times without reported data loss. It is not yet recommended for production data or on production systems. -[1] - http://zfs-fuse.net/ - -- Mike Hommey Fri, 11 Jun 2010 16:20:42 +0200 diff -Nru zfs-fuse-0.7.0/debian/watch zfs-fuse-0.7.0/debian/watch --- zfs-fuse-0.7.0/debian/watch 2021-08-21 16:55:58.000000000 +0000 +++ zfs-fuse-0.7.0/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# format version number, currently 3; this line is compulsory! -version=3 - -http://zfs-fuse.net/releases/(\d.+)/ \ - .*zfs-fuse-(\d.+)\.tar\.bz2