diff options
author | Stefan Schweizer <genstef@gentoo.org> | 2006-05-15 11:01:53 +0000 |
---|---|---|
committer | Stefan Schweizer <genstef@gentoo.org> | 2006-05-15 11:01:53 +0000 |
commit | 8f27c11ba3b33edb49430f0f6b5c37350761fc9d (patch) | |
tree | e29f5b360e598b7d5313f5184e2177f58f166ba1 /sys-fs/fuse/files | |
parent | Add moduledb worlaround, remove old ebuilds (diff) | |
download | historical-8f27c11ba3b33edb49430f0f6b5c37350761fc9d.tar.gz historical-8f27c11ba3b33edb49430f0f6b5c37350761fc9d.tar.bz2 historical-8f27c11ba3b33edb49430f0f6b5c37350761fc9d.zip |
Add moduledb worlaround, remove old ebuilds
Package-Manager: portage-2.1_rc1
Diffstat (limited to 'sys-fs/fuse/files')
-rw-r--r-- | sys-fs/fuse/files/digest-fuse-2.4.1-r1 | 3 | ||||
-rw-r--r-- | sys-fs/fuse/files/digest-fuse-2.4.2 | 3 | ||||
-rw-r--r-- | sys-fs/fuse/files/digest-fuse-2.5.2 | 3 | ||||
-rw-r--r-- | sys-fs/fuse/files/fuse-2.6.16.patch | 42 | ||||
-rw-r--r-- | sys-fs/fuse/files/fuse-fix-memleak.patch | 21 | ||||
-rw-r--r-- | sys-fs/fuse/files/fusermount.patch | 42 |
6 files changed, 0 insertions, 114 deletions
diff --git a/sys-fs/fuse/files/digest-fuse-2.4.1-r1 b/sys-fs/fuse/files/digest-fuse-2.4.1-r1 deleted file mode 100644 index 0914538c7177..000000000000 --- a/sys-fs/fuse/files/digest-fuse-2.4.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 553bd9c5a4f3cd27f3e2b93844711e4c fuse-2.4.1.tar.gz 384631 -RMD160 ea0919fe6b907733d519b6daadb274848e6a5ef3 fuse-2.4.1.tar.gz 384631 -SHA256 8627cf269f4abe5974bf286cf746bb41463909b67282b48fc692d73aeb224f15 fuse-2.4.1.tar.gz 384631 diff --git a/sys-fs/fuse/files/digest-fuse-2.4.2 b/sys-fs/fuse/files/digest-fuse-2.4.2 deleted file mode 100644 index 866afa57f1ef..000000000000 --- a/sys-fs/fuse/files/digest-fuse-2.4.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6e3d9a580c45ddf4a06558c135c158c2 fuse-2.4.2.tar.gz 384993 -RMD160 e88ebf356aa29b22a4638c8af44e723b2c458509 fuse-2.4.2.tar.gz 384993 -SHA256 f2b530d8bc94fb48d0595bea8367bf7909021053e6c9ee308c63fe74f6b2e9d0 fuse-2.4.2.tar.gz 384993 diff --git a/sys-fs/fuse/files/digest-fuse-2.5.2 b/sys-fs/fuse/files/digest-fuse-2.5.2 deleted file mode 100644 index 55a106156e4c..000000000000 --- a/sys-fs/fuse/files/digest-fuse-2.5.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ea565debe6c7486963bef05c45c50361 fuse-2.5.2.tar.gz 407845 -RMD160 840f0f13d9d493b1c2969471cfb9414a5368780e fuse-2.5.2.tar.gz 407845 -SHA256 19aeaa8e9c63393ddde7114a74899161748accf7ff60d59144a876a65f4fb1b8 fuse-2.5.2.tar.gz 407845 diff --git a/sys-fs/fuse/files/fuse-2.6.16.patch b/sys-fs/fuse/files/fuse-2.6.16.patch deleted file mode 100644 index 0ae6c3253aa6..000000000000 --- a/sys-fs/fuse/files/fuse-2.6.16.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: kernel/file.c -=================================================================== -RCS file: /cvsroot/fuse/fuse/kernel/file.c,v -retrieving revision 1.94 -retrieving revision 1.94.2.1 -diff -u -r1.94 -r1.94.2.1 ---- kernel/file.c 6 Jan 2006 18:29:39 -0000 1.94 -+++ kernel/file.c 18 Jan 2006 12:17:33 -0000 1.94.2.1 -@@ -675,9 +675,15 @@ - struct inode *inode = file->f_dentry->d_inode; - ssize_t res; - /* Don't allow parallel writes to the same file */ -+#ifdef KERNEL_2_6_16_PLUS -+ mutex_lock(&inode->i_mutex); -+ res = fuse_direct_io(file, buf, count, ppos, 1); -+ mutex_unlock(&inode->i_mutex); -+#else - down(&inode->i_sem); - res = fuse_direct_io(file, buf, count, ppos, 1); - up(&inode->i_sem); -+#endif - return res; - } - -Index: kernel/fuse_i.h -=================================================================== -RCS file: /cvsroot/fuse/fuse/kernel/fuse_i.h,v -retrieving revision 1.99 -retrieving revision 1.99.2.1 -diff -u -r1.99 -r1.99.2.1 ---- kernel/fuse_i.h 14 Jan 2006 14:47:21 -0000 1.99 -+++ kernel/fuse_i.h 18 Jan 2006 12:17:33 -0000 1.99.2.1 -@@ -40,6 +40,9 @@ - # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13) - # define KERNEL_2_6_13_PLUS - # endif -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) -+# define KERNEL_2_6_16_PLUS -+# endif - #endif - - #include "config.h" diff --git a/sys-fs/fuse/files/fuse-fix-memleak.patch b/sys-fs/fuse/files/fuse-fix-memleak.patch deleted file mode 100644 index f982f32ae112..000000000000 --- a/sys-fs/fuse/files/fuse-fix-memleak.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur fuse fuseold ---- fuse/lib/fuse.c 2005-12-03 18:19:33.000000000 -0500 -+++ fuseold/lib/fuse.c 2005-12-03 18:19:33.000000000 -0500 -@@ -1656,6 +1656,7 @@ - void fuse_process_cmd(struct fuse *f, struct fuse_cmd *cmd) - { - fuse_session_process(f->se, cmd->buf, cmd->buflen, cmd->ch); -+ free_cmd(cmd); - } - - int fuse_exited(struct fuse *f) -@@ -1693,6 +1694,8 @@ - int res = fuse_chan_receive(ch, cmd->buf, bufsize); - if (res <= 0) { - free_cmd(cmd); -+ if (res == -1) -+ fuse_exit(f); - return NULL; - } - cmd->buflen = res; - diff --git a/sys-fs/fuse/files/fusermount.patch b/sys-fs/fuse/files/fusermount.patch deleted file mode 100644 index 7bd930e46a29..000000000000 --- a/sys-fs/fuse/files/fusermount.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: util/fusermount.c -=================================================================== -RCS file: /cvsroot/fuse/fuse/util/fusermount.c,v -retrieving revision 1.69 -diff -u -r1.69 fusermount.c ---- util/fusermount.c 11 Oct 2005 10:12:08 -0000 1.69 -+++ util/fusermount.c 18 Nov 2005 20:32:26 -0000 -@@ -120,6 +120,23 @@ - } - } - -+/* Glibc addmntent() doesn't encode '\n', misencodes '\t' as '\n' -+ (version 2.3.2), and encodes '\\' differently as mount(8). So -+ let's not allow those characters, they are not all that usual in -+ filenames. */ -+static int check_name(const char *name) -+{ -+ char *s; -+ for (s = "\n\t\\"; *s; s++) { -+ if (strchr(name, *s)) { -+ fprintf(stderr, "%s: illegal character 0x%02x in mount entry\n", -+ progname, *s); -+ return -1; -+ } -+ } -+ return 0; -+} -+ - static int add_mount(const char *fsname, const char *mnt, const char *type, - const char *opts) - { -@@ -128,6 +145,10 @@ - struct mntent ent; - FILE *fp; - -+ if (check_name(fsname) == -1 || check_name(mnt) == -1 || -+ check_name(type) == -1 || check_name(opts) == -1) -+ return -1; -+ - fp = setmntent(mtab, "a"); - if (fp == NULL) { - fprintf(stderr, "%s: failed to open %s: %s\n", progname, mtab, |