From 2886607a1fce512b9e1a60450119d44d5e69a06f Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 7 Feb 2013 20:38:22 +0100 Subject: [PATCH] Remove all patches and usage of quilt. --- debian/README.source | 2 - debian/changelog | 1 + debian/control | 2 +- .../fix-fuse-read-write-return-r336.patch | 52 ------------------- ...-unexpected-removal-on-dir-move-r337.patch | 32 ------------ debian/patches/series | 2 - debian/rules | 2 +- 7 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 debian/README.source delete mode 100644 debian/patches/fix-fuse-read-write-return-r336.patch delete mode 100644 debian/patches/fix-unexpected-removal-on-dir-move-r337.patch delete mode 100644 debian/patches/series diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index c4fc1e8..0000000 --- a/debian/README.source +++ /dev/null @@ -1,2 +0,0 @@ -This package uses quilt, please see /usr/share/doc/quilt/README.source -for further instructions. diff --git a/debian/changelog b/debian/changelog index a4998dc..fbe86ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ fuse-exfat (1.0.1-1) UNRELEASED; urgency=low * New upstream release + * Remove all patches and usage of quilt. * Update years in debian/copyright. -- Sven Hoexter Tue, 05 Feb 2013 21:25:38 +0100 diff --git a/debian/control b/debian/control index da53357..59383fb 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: fuse-exfat Section: otherosfs Priority: optional Maintainer: Sven Hoexter -Build-Depends: debhelper (>= 9), scons, libfuse-dev, quilt +Build-Depends: debhelper (>= 9), scons, libfuse-dev Standards-Version: 3.9.3 Homepage: http://code.google.com/p/exfat/ Vcs-Git: git://git.sven.stormbind.net/git/sven/fuse-exfat.git diff --git a/debian/patches/fix-fuse-read-write-return-r336.patch b/debian/patches/fix-fuse-read-write-return-r336.patch deleted file mode 100644 index eeef1ee..0000000 --- a/debian/patches/fix-fuse-read-write-return-r336.patch +++ /dev/null @@ -1,52 +0,0 @@ -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-exfat/fuse/main.c -=================================================================== ---- 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) - { -+ ssize_t ret; -+ - exfat_debug("[%s] %s (%zu bytes)", __func__, path, size); -- if (exfat_generic_pread(&ef, get_node(fi), buffer, size, offset) != size) -- return EOF; -- return size; -+ ret = exfat_generic_pread(&ef, get_node(fi), buffer, size, offset); -+ if (ret < 0) -+ return -EIO; -+ return ret; - } - - static int fuse_exfat_write(const char* path, const char* buffer, size_t size, - off_t offset, struct fuse_file_info* fi) - { -+ ssize_t ret; -+ - exfat_debug("[%s] %s (%zu bytes)", __func__, path, size); -- if (exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset) != size) -- return EOF; -- return size; -+ ret = exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset); -+ if (ret < 0) -+ return -EIO; -+ return ret; - } - - static int fuse_exfat_unlink(const char* path) -Index: fuse-exfat/libexfat/io.c -=================================================================== ---- 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) - exfat_update_atime(node); -- return size - remainder; -+ return MIN(size, node->size - offset) - remainder; - } - - ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node, diff --git a/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch b/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch deleted file mode 100644 index 8cb8de2..0000000 --- a/debian/patches/fix-unexpected-removal-on-dir-move-r337.patch +++ /dev/null @@ -1,32 +0,0 @@ -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: fuse-exfat/libexfat/node.c -=================================================================== ---- 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; - } -+ -+ /* check that target is not a subdirectory of the source */ -+ if (node->flags & EXFAT_ATTRIB_DIR) -+ { -+ struct exfat_node* p; -+ -+ for (p = dir; p; p = p->parent) -+ if (node == p) -+ { -+ if (existing != NULL) -+ exfat_put_node(ef, existing); -+ exfat_put_node(ef, dir); -+ exfat_put_node(ef, node); -+ return -EINVAL; -+ } -+ } -+ - if (existing != NULL) - { - /* remove target if it's not the same node as source */ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 228799b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -fix-fuse-read-write-return-r336.patch -fix-unexpected-removal-on-dir-move-r337.patch diff --git a/debian/rules b/debian/rules index 32b9bfc..80f7246 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export CCFLAGS = $(CFLAGS) %: - dh $@ --with quilt + dh $@ override_dh_auto_build: scons -- 2.39.5