Frank Küster <[EMAIL PROTECTED]> wrote:
> Otherwise, I can offer to do an NMU, this would be the diff:
After your ACK on IRC, and with further hints by Julien Cristau on
#debian-release, I have uploaded with the following diff:
diff -Nur fuse-2.5.3.old/debian/changelog fuse-2.5.3/debian/changelog
--- fuse-2.5.3.old/debian/changelog 2007-03-05 18:07:57.000000000 +0100
+++ fuse-2.5.3/debian/changelog 2007-03-08 17:02:49.000000000 +0100
@@ -1,3 +1,26 @@
+fuse (2.5.3-4.3) testing-proposed-updates; urgency=low
+
+ * Non-maintainer upload to fix RC bug
+ * Upload to t-p-u, since unstable has already a new upstream version
+ * Call dh_makeshlibs with '-V "libfuse (>= 2.5)"' to make sure
+ dependencies are correct (closes: #409644)
+ * Incorporate the patch for the 2.5.3-4.2 NMU, including changelog
+ entry, which never made it to testing
+
+ -- Frank KÃŒster <[EMAIL PROTECTED]> Thu, 8 Mar 2007 17:02:41 +0100
+
+fuse (2.5.3-4.2) unstable; urgency=low
+
+ * Non-maintainer upload (with maintainer's approval).
+ * Ensure the correct alignment of the ccmsg array in receive_fd()
+ from lib/mount.c by declaring it as size_t instead of char and
+ adjusting the size accordingly. This resolves the issue of
+ sshfs crashing with SIGBUS on sparc. Thanks to Sebastian Fontius
+ for debugging and testing, and to Miklos Szeredi for the patch.
+ (closes: #404904)
+
+ -- Jurij Smakov <[EMAIL PROTECTED]> Wed, 10 Jan 2007 20:35:22 -0800
+
fuse (2.5.3-4.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nur fuse-2.5.3.old/debian/rules fuse-2.5.3/debian/rules
--- fuse-2.5.3.old/debian/rules 2007-03-05 18:07:57.000000000 +0100
+++ fuse-2.5.3/debian/rules 2007-03-08 17:01:01.000000000 +0100
@@ -77,7 +77,7 @@
dh_compress -Xfusexmp.c
dh_fixperms
dh_installdebconf
- dh_makeshlibs
+ dh_makeshlibs -V "libfuse (>= 2.5)"
dh_installdeb
dh_shlibdeps
dh_gencontrol
diff -Nur fuse-2.5.3.old/lib/mount.c fuse-2.5.3/lib/mount.c
--- fuse-2.5.3.old/lib/mount.c 2006-02-19 18:19:41.000000000 +0100
+++ fuse-2.5.3/lib/mount.c 2007-03-08 17:00:46.000000000 +0100
@@ -131,7 +131,7 @@
char buf[1];
int rv;
int connfd = -1;
- char ccmsg[CMSG_SPACE(sizeof(connfd))];
+ size_t ccmsg[CMSG_SPACE(sizeof(connfd))/sizeof(size_t)];
struct cmsghdr *cmsg;
iov.iov_base = buf;
--
Dr. Frank Küster
Single Molecule Spectroscopy, Protein Folding @ Inst. f. Biochemie, Univ. Zürich
Debian Developer (teTeX/TeXLive)
