Hi Seunghun,

I've made a non-maintainer upload to DELAYED/3 fixing the two open RC issues and also moving the binary to /usr, which is a prerequisite for packages to be eligible for being shipped in trixie.

Attached is the debdiff. Please apply those changes before you are making another maintainer upload.

Regards,
Michael
diff -Nru fuse-posixovl-1.3/debian/changelog fuse-posixovl-1.3/debian/changelog
--- fuse-posixovl-1.3/debian/changelog  2021-04-22 04:51:54.000000000 +0200
+++ fuse-posixovl-1.3/debian/changelog  2024-10-20 16:58:05.000000000 +0200
@@ -1,3 +1,14 @@
+fuse-posixovl (1.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build failures with glibc >= 2.38 (Closes: #1071308)
+  * Drop Build-Depends on libattr1-dev, no longer necessary (Closes: #1071308)
+  * Update Vcs-{Git,Browser} to point at the correct location
+  * Replace obsolete pkg-config Build-Depends with pkgconf
+  * Move aliased files from / to /usr (DEP17)
+
+ -- Michael Biebl <bi...@debian.org>  Sun, 20 Oct 2024 16:58:05 +0200
+
 fuse-posixovl (1.3-1) unstable; urgency=medium
 
   * New upstream version 1.3
diff -Nru fuse-posixovl-1.3/debian/control fuse-posixovl-1.3/debian/control
--- fuse-posixovl-1.3/debian/control    2021-04-22 04:51:54.000000000 +0200
+++ fuse-posixovl-1.3/debian/control    2024-10-20 16:58:05.000000000 +0200
@@ -2,10 +2,10 @@
 Section: misc
 Priority: optional
 Maintainer: Seunghun Han <kkama...@gmail.com>
-Build-Depends: debhelper-compat (= 13), pkg-config, automake, autoconf, 
libfuse-dev, libattr1-dev
+Build-Depends: debhelper-compat (= 13), pkgconf, automake, autoconf, 
libfuse-dev
 Standards-Version: 4.5.1
-Vcs-Browser: https://salsa.debian.org/kkamagui-guest/fuse-posixovl
-Vcs-Git: https://salsa.debian.org/kkamagui-guest/fuse-posixovl.git
+Vcs-Browser: https://salsa.debian.org/kkamagui/fuse-posixovl
+Vcs-Git: https://salsa.debian.org/kkamagui/fuse-posixovl.git
 Homepage: https://sourceforge.net/projects/posixovl
 Rules-Requires-Root: no
 
diff -Nru 
fuse-posixovl-1.3/debian/patches/0002-build-resolve-build-failure-with-glibc-2.38.patch
 
fuse-posixovl-1.3/debian/patches/0002-build-resolve-build-failure-with-glibc-2.38.patch
--- 
fuse-posixovl-1.3/debian/patches/0002-build-resolve-build-failure-with-glibc-2.38.patch
     1970-01-01 01:00:00.000000000 +0100
+++ 
fuse-posixovl-1.3/debian/patches/0002-build-resolve-build-failure-with-glibc-2.38.patch
     2024-10-20 16:58:05.000000000 +0200
@@ -0,0 +1,79 @@
+From: Jan Engelhardt <jeng...@inai.de>
+Date: Mon, 21 Aug 2023 02:08:57 +0200
+Subject: build: resolve build failure with glibc >= 2.38
+
+glibc has added a prototype for strlcpy. Move posixovl's strlcpy
+(which came from libHX) to a separate name.
+
+(cherry picked from commit f5d992133b75980173089c48dcf4bdb143a15ebb)
+---
+ posixovl.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/posixovl.c b/posixovl.c
+index 710ddb4..a119ce4 100644
+--- a/posixovl.c
++++ b/posixovl.c
+@@ -193,7 +193,7 @@ static __attribute__((pure)) const char *at(const char *in)
+       return in + 1;
+ }
+ 
+-static char *strlcpy(char *dest, const char *src, size_t n)
++static char *px_strlcpy(char *dest, const char *src, size_t n)
+ {
+       strncpy(dest, src, n-1);
+       dest[n-1] = '\0';
+@@ -207,7 +207,7 @@ static void __hl_dtoi(char *dest, size_t destsize, const 
char *src)
+ {
+       char *last, *p;
+ 
+-      strlcpy(dest, src, destsize);
++      px_strlcpy(dest, src, destsize);
+       last = dest;
+       while ((p = strstr(last, "/" HL_DNODE_PREFIX)) != NULL)
+               last = p + 1;
+@@ -639,7 +639,7 @@ static int hcb_lookup_readdir(const char *dir, const char 
*name,
+                * '\0', it must be "/". I am trying to optimize here.
+                */
+               path[0] = '/';
+-              strlcpy(&path[1], name, sizeof(path) - 1);
++              px_strlcpy(&path[1], name, sizeof(path) - 1);
+               ret = strlen(name) + 1;
+       } else {
+               ret = snprintf(path, sizeof(path), "%s/%s", dir, name);
+@@ -1249,7 +1249,7 @@ static int hl_promote(const char *l0_path, const struct 
hcb *orig_info,
+               goto out2;
+       new_info.ll.mode  = S_IFHARDLNK;
+       new_info.ll.nlink = 1;
+-      strlcpy(new_info.ll.new_target, l1_path, 
sizeof(new_info.ll.new_target));
++      px_strlcpy(new_info.ll.new_target, l1_path, 
sizeof(new_info.ll.new_target));
+       hcb_update(&new_info);
+ 
+       /* instantiate first link into readdir visibility */
+@@ -1367,7 +1367,7 @@ static int hl_instantiate(const char *oldpath, const 
char *newpath)
+               goto out;
+       cb_new.ll.mode  = S_IFHARDLNK;
+       cb_new.ll.nlink = 1;
+-      strlcpy(cb_new.ll.new_target, cb_old.ll.target,
++      px_strlcpy(cb_new.ll.new_target, cb_old.ll.target,
+               sizeof(cb_new.ll.new_target));
+       if ((ret = hcb_update(&cb_new)) < 0)
+               goto out;
+@@ -1642,7 +1642,7 @@ static int posixovl_readlink(const char *path, char 
*dest, size_t size)
+               return -EINVAL; /* not a symbolic link */
+ 
+       memset(dest, 0, size);
+-      strlcpy(dest, info.ll.target, size);
++      px_strlcpy(dest, info.ll.target, size);
+       return 0;
+ }
+ 
+@@ -1778,7 +1778,7 @@ static int posixovl_symlink(const char *oldpath, const 
char *newpath)
+       info.ll.nlink = 1;
+       info.ll.uid   = ctx->uid;
+       info.ll.gid   = ctx->gid;
+-      strlcpy(info.ll.new_target, oldpath, sizeof(info.ll.new_target));
++      px_strlcpy(info.ll.new_target, oldpath, sizeof(info.ll.new_target));
+       if ((ret = hcb_update(&info)) < 0)
+               return ret;
+ 
diff -Nru fuse-posixovl-1.3/debian/patches/series 
fuse-posixovl-1.3/debian/patches/series
--- fuse-posixovl-1.3/debian/patches/series     2021-04-22 04:51:54.000000000 
+0200
+++ fuse-posixovl-1.3/debian/patches/series     2024-10-20 16:58:05.000000000 
+0200
@@ -1 +1,2 @@
 0001-fix-mount-option-bug-and-compile-warnings.patch
+0002-build-resolve-build-failure-with-glibc-2.38.patch
diff -Nru fuse-posixovl-1.3/debian/rules fuse-posixovl-1.3/debian/rules
--- fuse-posixovl-1.3/debian/rules      2021-04-21 06:09:41.000000000 +0200
+++ fuse-posixovl-1.3/debian/rules      2024-10-20 16:58:05.000000000 +0200
@@ -16,7 +16,7 @@
 override_dh_auto_install: man
        install -m 755 -D \
                mount.posixovl \
-               $(CURDIR)/debian/$(PACKAGE)/sbin/mount.posixovl
+               $(CURDIR)/debian/$(PACKAGE)/usr/sbin/mount.posixovl
 
 %:
        dh $@

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to