diff -Nru zfs-fuse-0.7.0/debian/changelog zfs-fuse-0.7.0/debian/changelog --- zfs-fuse-0.7.0/debian/changelog 2021-03-05 22:18:11.000000000 +0000 +++ zfs-fuse-0.7.0/debian/changelog 2021-12-08 12:29:55.000000000 +0000 @@ -1,9 +1,29 @@ -zfs-fuse (0.7.0-21ubuntu1) hirsute; urgency=medium +zfs-fuse (0.7.0-22ubuntu1) jammy; urgency=medium - * Grab patch from Michael Hudson-Doyle to fix build failure with current - glibc. Closes: #971688. + * Add debian/patches/more-glibc-fixes.patch and fix the package from FTBFS. - -- Steve Langasek Fri, 05 Mar 2021 14:18:11 -0800 + -- Ɓukasz 'sil2100' Zemczak Wed, 08 Dec 2021 13:29:55 +0100 + +zfs-fuse (0.7.0-22build1) jammy; urgency=medium + + * No-change rebuild against openssl3 + + -- Simon Chopin Fri, 03 Dec 2021 11:57:18 +0100 + +zfs-fuse (0.7.0-22) unstable; urgency=medium + + * QA upload. + + [ Debian Janitor ] + * Remove constraints unnecessary since stretch: + + zfs-fuse: Drop versioned constraint on fuse in Depends. + + [ Aurelien Jarno ] + * Add glibc-2.32-compat.patch to switch from glibc's legacy RPC + implementation, which is now disabled in the Debian package, to libtirpc's + one (Closes: #971688). + + -- Aurelien Jarno Sat, 21 Aug 2021 19:44:09 +0200 zfs-fuse (0.7.0-21) 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-03-05 22:18:11.000000000 +0000 +++ zfs-fuse-0.7.0/debian/control 2021-12-08 12:29:55.000000000 +0000 @@ -17,7 +17,7 @@ Package: zfs-fuse Architecture: amd64 armel armhf i386 powerpc powerpcspe ppc64 ppc64el sh4 sparc sparc64 -Depends: fuse (>=2.8.7-2), lsb-base, ${misc:Depends}, ${shlibs:Depends} +Depends: fuse, lsb-base, ${misc:Depends}, ${shlibs:Depends} Suggests: kpartx, nfs-kernel-server Description: ZFS on FUSE ZFS is an advanced filesystem from Sun Microsystems, originally developed 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 1970-01-01 00:00:00.000000000 +0000 +++ zfs-fuse-0.7.0/debian/patches/more-glibc-fixes.patch 2021-12-08 12:29:48.000000000 +0000 @@ -0,0 +1,39 @@ +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-03-05 22:18:11.000000000 +0000 +++ zfs-fuse-0.7.0/debian/patches/series 2021-12-08 12:25:55.000000000 +0000 @@ -20,3 +20,4 @@ fix-scons-use-python3-print.patch gcc10_fixes.patch glibc-2.32-compat.patch +more-glibc-fixes.patch