From 78448d7ddab545ed0833e3355b362c611cbf282a Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Fri, 25 Jan 2013 22:27:00 +0100 Subject: [PATCH] Refresh patches to -p1 level and add README.source --- debian/README.source | 2 ++ debian/patches/fix-fuse-read-write-return-r336.patch | 12 ++++++------ .../fix-unexpected-removal-on-dir-move-r337.patch | 6 +++--- debian/patches/series | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..c4fc1e8 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,2 @@ +This package uses quilt, please see /usr/share/doc/quilt/README.source +for further instructions. diff --git a/debian/patches/fix-fuse-read-write-return-r336.patch b/debian/patches/fix-fuse-read-write-return-r336.patch index 045933e..eeef1ee 100644 --- a/debian/patches/fix-fuse-read-write-return-r336.patch +++ b/debian/patches/fix-fuse-read-write-return-r336.patch @@ -1,10 +1,10 @@ Fixed "Operation not permitted" error on reading an empty file: FUSE read/write ops should return a number of bytes actually read/written or -errno on error. Picked from upstream svn r336. -Index: fuse/main.c +Index: fuse-exfat/fuse/main.c =================================================================== ---- fuse/main.c.orig 2013-01-25 22:09:08.293124286 +0100 -+++ fuse/main.c 2013-01-25 22:10:19.745121679 +0100 +--- fuse-exfat.orig/fuse/main.c 2013-01-25 22:26:15.309086812 +0100 ++++ fuse-exfat/fuse/main.c 2013-01-25 22:26:20.093086638 +0100 @@ -155,19 +155,25 @@ static int fuse_exfat_read(const char* path, char* buffer, size_t size, off_t offset, struct fuse_file_info* fi) @@ -37,10 +37,10 @@ Index: fuse/main.c } static int fuse_exfat_unlink(const char* path) -Index: libexfat/io.c +Index: fuse-exfat/libexfat/io.c =================================================================== ---- libexfat/io.c.orig 2013-01-25 22:09:08.293124286 +0100 -+++ libexfat/io.c 2013-01-25 22:10:19.745121679 +0100 +--- fuse-exfat.orig/libexfat/io.c 2013-01-25 22:26:15.309086812 +0100 ++++ fuse-exfat/libexfat/io.c 2013-01-25 22:26:20.093086638 +0100 @@ -341,7 +341,7 @@ } if (!ef->ro && !ef->noatime) diff --git a/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch b/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch index 376fb82..8cb8de2 100644 --- a/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch +++ b/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch @@ -2,10 +2,10 @@ Fixed unexpected removal of a directory if it is moved into itself: return EINVAL in this situation. It also happens when trying to change directory name case. Picked from upstream svn r337. -Index: libexfat/node.c +Index: fuse-exfat/libexfat/node.c =================================================================== ---- libexfat/node.c.orig 2013-01-25 22:09:06.197124362 +0100 -+++ libexfat/node.c 2013-01-25 22:11:41.273118704 +0100 +--- fuse-exfat.orig/libexfat/node.c 2013-01-25 22:12:09.529117673 +0100 ++++ fuse-exfat/libexfat/node.c 2013-01-25 22:22:56.473094067 +0100 @@ -905,6 +905,23 @@ exfat_put_node(ef, node); return rc; diff --git a/debian/patches/series b/debian/patches/series index 171ad0e..228799b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -fix-fuse-read-write-return-r336.patch -p0 -fix-unexpected-removal-on-dir-move-r337.patch -p0 +fix-fuse-read-write-return-r336.patch +fix-unexpected-removal-on-dir-move-r337.patch -- 2.39.5