From 91142205534e135a29ceb3992708bf2ca3219021 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 4 Jun 2007 11:25:53 +0000 Subject: refresh all package patches in the buildroot using quilt SVN-Revision: 7490 --- package/shfs/patches/100-kmod_build.patch | 8 ++-- .../shfs/patches/101-shfs_0.35_2.6.18_dentry.patch | 52 +++++++++++++--------- .../patches/102-shfs_0.35_clean_inode_clear.patch | 6 ++- package/shfs/patches/103-shfs_0.35_gcc4.patch | 14 +++--- .../shfs/patches/104-shfs_0.35_inode_and_fs.patch | 40 ++++++++++------- package/shfs/patches/105-space_chars.patch | 12 +++-- package/shfs/patches/106-uidgid32.patch | 12 +++-- package/shfs/patches/107-df.patch | 12 +++-- package/shfs/patches/108-no_update_mtab.patch | 12 +++-- 9 files changed, 106 insertions(+), 62 deletions(-) (limited to 'package/shfs') diff --git a/package/shfs/patches/100-kmod_build.patch b/package/shfs/patches/100-kmod_build.patch index 11701033f5..16f198c4f6 100644 --- a/package/shfs/patches/100-kmod_build.patch +++ b/package/shfs/patches/100-kmod_build.patch @@ -1,5 +1,7 @@ ---- shfs-0.35-orig/shfs/Linux-2.4/Makefile 2004-06-01 15:16:19.000000000 +0200 -+++ shfs-0.35-2/shfs/Linux-2.4/Makefile 2005-04-09 02:34:35.000000000 +0200 +Index: shfs-0.35/shfs/Linux-2.4/Makefile +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.4/Makefile 2007-06-04 13:22:58.143016200 +0200 ++++ shfs-0.35/shfs/Linux-2.4/Makefile 2007-06-04 13:22:58.209006168 +0200 @@ -1,3 +1,13 @@ +# +# the original Makefile was trashed and replaced by this one @@ -14,7 +16,7 @@ ifndef KERNEL KERNEL=$(shell uname -r) endif -@@ -10,67 +24,29 @@ +@@ -10,67 +20,29 @@ KERNEL_SOURCES=${MODULESDIR}/build endif diff --git a/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch b/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch index 25c3dc6f33..e7754b037d 100644 --- a/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch +++ b/package/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch @@ -1,6 +1,8 @@ ---- shfs-0.35.orig/shfs/Linux-2.6/inode.c -+++ shfs-0.35/shfs/Linux-2.6/inode.c -@@ -341,12 +341,21 @@ out: +Index: shfs-0.35/shfs/Linux-2.6/inode.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.091024104 +0200 ++++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.397977440 +0200 +@@ -337,12 +337,21 @@ return -EINVAL; } @@ -22,9 +24,11 @@ static struct file_system_type sh_fs_type = { .owner = THIS_MODULE, ---- shfs-0.35.orig/shfs/Linux-2.6/file.c -+++ shfs-0.35/shfs/Linux-2.6/file.c -@@ -199,7 +199,7 @@ shfs_file_open(struct inode *inode, stru +Index: shfs-0.35/shfs/Linux-2.6/file.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/file.c 2007-06-04 13:22:58.096023344 +0200 ++++ shfs-0.35/shfs/Linux-2.6/file.c 2007-06-04 13:22:58.397977440 +0200 +@@ -199,7 +199,7 @@ } static int @@ -33,7 +37,7 @@ { struct dentry *dentry = f->f_dentry; struct shfs_sb_info *info = info_from_dentry(dentry); -@@ -222,6 +222,16 @@ shfs_file_flush(struct file *f) +@@ -222,6 +222,16 @@ } static int @@ -50,7 +54,7 @@ shfs_file_release(struct inode *inode, struct file *f) { struct dentry *dentry = f->f_dentry; -@@ -311,7 +321,7 @@ shfs_slow_write(struct file *f, const ch +@@ -311,7 +321,7 @@ DEBUG("\n"); written = generic_file_write(f, buf, count, offset); if (written > 0) { @@ -61,9 +65,9 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c =================================================================== ---- shfs-0.35.orig/shfs/Linux-2.6/proc.c -+++ shfs-0.35/shfs/Linux-2.6/proc.c -@@ -570,6 +570,16 @@ error: +--- shfs-0.35.orig/shfs/Linux-2.6/proc.c 2007-06-04 13:22:58.102022432 +0200 ++++ shfs-0.35/shfs/Linux-2.6/proc.c 2007-06-04 13:22:58.398977288 +0200 +@@ -570,6 +570,16 @@ return result; } @@ -80,14 +84,16 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c int shfs_statfs(struct super_block *sb, struct kstatfs *attr) { -@@ -578,4 +588,5 @@ shfs_statfs(struct super_block *sb, stru +@@ -578,4 +588,5 @@ DEBUG("\n"); return info->fops.statfs(info, attr); } +#endif ---- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h -+++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h +Index: shfs-0.35/shfs/Linux-2.6/shfs_fs.h +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.107021672 +0200 ++++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.398977288 +0200 @@ -9,6 +9,12 @@ #include @@ -101,7 +107,7 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c #define SHFS_MAX_AGE(info) (((info)->ttl * HZ) / 1000) #define SOCKBUF_SIZE (SHFS_PATH_MAX * 10) -@@ -100,7 +106,12 @@ int reply(char *s); +@@ -101,7 +107,12 @@ void set_garbage(struct shfs_sb_info *info, int write, int count); int get_name(struct dentry *d, char *name); int shfs_notify_change(struct dentry *dentry, struct iattr *attr); @@ -114,9 +120,11 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c /* shfs/inode.c */ void shfs_set_inode_attr(struct inode *inode, struct shfs_fattr *fattr); ---- shfs-0.35.orig/shfs/Linux-2.6/symlink.c -+++ shfs-0.35/shfs/Linux-2.6/symlink.c -@@ -41,7 +41,7 @@ error: +Index: shfs-0.35/shfs/Linux-2.6/symlink.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/symlink.c 2007-06-04 13:22:58.113020760 +0200 ++++ shfs-0.35/shfs/Linux-2.6/symlink.c 2007-06-04 13:22:58.398977288 +0200 +@@ -41,7 +41,7 @@ return result; } @@ -125,7 +133,7 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c shfs_follow_link(struct dentry *dentry, struct nameidata *nd) { struct shfs_sb_info *info = info_from_dentry(dentry); -@@ -61,7 +61,7 @@ shfs_follow_link(struct dentry *dentry, +@@ -61,7 +61,7 @@ DEBUG("%s\n", real_name); result = vfs_follow_link(nd, real_name); error: @@ -134,8 +142,10 @@ Index: shfs-0.35/shfs/Linux-2.6/proc.c } struct inode_operations shfs_symlink_inode_operations = { ---- shfs-0.35.orig/shfs/Linux-2.6/dcache.c 2004-06-01 15:16:19.000000000 +0200 -+++ shfs-0.35/shfs/Linux-2.6/dcache.c 2006-02-17 17:36:02.000000000 +0100 +Index: shfs-0.35/shfs/Linux-2.6/dcache.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/dcache.c 2007-06-04 13:22:58.121019544 +0200 ++++ shfs-0.35/shfs/Linux-2.6/dcache.c 2007-06-04 13:22:58.398977288 +0200 @@ -68,7 +68,7 @@ spin_lock(&dcache_lock); next = parent->d_subdirs.next; diff --git a/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch b/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch index 6ca6ec021d..f12fc96509 100644 --- a/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch +++ b/package/shfs/patches/102-shfs_0.35_clean_inode_clear.patch @@ -1,5 +1,7 @@ ---- shfs-0.35.orig/shfs/Linux-2.6/inode.c.orig 2006-01-04 16:23:11.000000000 -0600 -+++ shfs-0.35/shfs/Linux-2.6/inode.c 2006-01-04 16:24:45.000000000 -0600 +Index: shfs-0.35/shfs/Linux-2.6/inode.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.397977440 +0200 ++++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.637940960 +0200 @@ -8,6 +8,7 @@ #include #endif diff --git a/package/shfs/patches/103-shfs_0.35_gcc4.patch b/package/shfs/patches/103-shfs_0.35_gcc4.patch index 846dcb0d3e..e4c13882c4 100644 --- a/package/shfs/patches/103-shfs_0.35_gcc4.patch +++ b/package/shfs/patches/103-shfs_0.35_gcc4.patch @@ -1,5 +1,7 @@ ---- shfs-0.35/shfs/Linux-2.6/dir.c 2004-06-01 09:16:19.000000000 -0400 -+++ shfs-0.35-new/shfs/Linux-2.6/dir.c 2005-02-11 18:12:00.000000000 -0500 +Index: shfs-0.35/shfs/Linux-2.6/dir.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/dir.c 2007-06-04 13:22:58.041031704 +0200 ++++ shfs-0.35/shfs/Linux-2.6/dir.c 2007-06-04 13:22:58.822912840 +0200 @@ -19,6 +19,8 @@ #include "shfs_debug.h" #include "proc.h" @@ -9,9 +11,11 @@ static int shfs_dir_open(struct inode *inode, struct file *filp) { ---- shfs-0.35/shfs/Linux-2.6/shfs_fs.h 2004-06-01 09:16:19.000000000 -0400 -+++ shfs-0.35-new/shfs/Linux-2.6/shfs_fs.h 2005-02-11 18:12:03.000000000 -0500 -@@ -50,7 +50,6 @@ +Index: shfs-0.35/shfs/Linux-2.6/shfs_fs.h +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.398977288 +0200 ++++ shfs-0.35/shfs/Linux-2.6/shfs_fs.h 2007-06-04 13:22:58.823912688 +0200 +@@ -56,7 +56,6 @@ #define ROUND_TO_MINS(x) do { (x).tv_sec = ((x).tv_sec / 60) * 60; (x).tv_nsec = 0; } while (0) /* shfs/dir.c */ diff --git a/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch b/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch index f7857bf73c..0953e6b0aa 100644 --- a/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch +++ b/package/shfs/patches/104-shfs_0.35_inode_and_fs.patch @@ -1,5 +1,7 @@ ---- shfs-0.35.orig/shfs/Linux-2.6/fcache.c 2007-01-03 22:29:26.000000000 -0600 -+++ shfs-0.35/shfs/Linux-2.6/fcache.c 2007-01-03 22:34:21.000000000 -0600 +Index: shfs-0.35/shfs/Linux-2.6/fcache.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/fcache.c 2007-06-04 13:22:57.997038392 +0200 ++++ shfs-0.35/shfs/Linux-2.6/fcache.c 2007-06-04 13:22:59.019882896 +0200 @@ -100,7 +100,11 @@ VERBOSE("dir in file cache?\n"); return -EINVAL; @@ -72,9 +74,11 @@ if (!p) { VERBOSE("inode without info\n"); return -EINVAL; ---- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2004-06-01 08:16:19.000000000 -0500 -+++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-01-03 22:39:44.000000000 -0600 -@@ -35,7 +36,11 @@ +Index: shfs-0.35/shfs/Linux-2.6/inode.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/inode.c 2007-06-04 13:22:58.637940960 +0200 ++++ shfs-0.35/shfs/Linux-2.6/inode.c 2007-06-04 13:22:59.020882744 +0200 +@@ -36,7 +36,11 @@ shfs_set_inode_attr(struct inode *inode, struct shfs_fattr *fattr) { struct shfs_sb_info *info = info_from_inode(inode); @@ -86,7 +90,7 @@ struct timespec last_time = inode->i_mtime; loff_t last_size = inode->i_size; -@@ -52,7 +57,9 @@ +@@ -53,7 +57,9 @@ inode->i_ctime = fattr->f_ctime; inode->i_atime = fattr->f_atime; inode->i_mtime = fattr->f_mtime; @@ -96,7 +100,7 @@ inode->i_blocks = fattr->f_blocks; inode->i_size = fattr->f_size; -@@ -75,7 +82,11 @@ +@@ -76,7 +82,11 @@ if (!inode) return NULL; inode->i_ino = fattr->f_ino; @@ -108,7 +112,7 @@ if (!i) return NULL; i->cache = NULL; -@@ -107,7 +118,11 @@ +@@ -108,7 +118,11 @@ struct shfs_inode_info *i; DEBUG("ino: %lu\n", inode->i_ino); @@ -120,7 +124,7 @@ if (!i) { VERBOSE("invalid inode\n"); goto out; -@@ -172,7 +190,11 @@ +@@ -176,7 +190,11 @@ { struct shfs_sb_info *info = info_from_dentry(dentry); struct inode *inode = dentry->d_inode; @@ -132,8 +136,10 @@ int result; DEBUG("%s\n", dentry->d_name.name); ---- shfs-0.35.orig/shfs/Linux-2.6/dir.c 2007-01-03 22:38:23.000000000 -0600 -+++ shfs-0.35/shfs/Linux-2.6/dir.c 2007-01-03 22:39:06.000000000 -0600 +Index: shfs-0.35/shfs/Linux-2.6/dir.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/dir.c 2007-06-04 13:22:58.822912840 +0200 ++++ shfs-0.35/shfs/Linux-2.6/dir.c 2007-06-04 13:22:59.020882744 +0200 @@ -302,8 +302,13 @@ shfs_invalid_dir_cache(dir); @@ -148,8 +154,10 @@ return result; } ---- shfs-0.35.orig/shfs/Linux-2.6/file.c 2007-01-03 22:40:24.000000000 -0600 -+++ shfs-0.35/shfs/Linux-2.6/file.c 2007-01-03 22:45:11.000000000 -0600 +Index: shfs-0.35/shfs/Linux-2.6/file.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/file.c 2007-06-04 13:22:58.397977440 +0200 ++++ shfs-0.35/shfs/Linux-2.6/file.c 2007-06-04 13:22:59.020882744 +0200 @@ -90,7 +90,11 @@ struct dentry *dentry = f->f_dentry; struct shfs_sb_info *info = info_from_dentry(dentry); @@ -227,8 +235,10 @@ }; struct file_operations shfs_slow_operations = { ---- shfs-0.35.orig/shfs/Linux-2.6/proc.c 2007-01-03 22:45:32.000000000 -0600 -+++ shfs-0.35/shfs/Linux-2.6/proc.c 2007-01-03 22:57:17.000000000 -0600 +Index: shfs-0.35/shfs/Linux-2.6/proc.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/proc.c 2007-06-04 13:22:58.398977288 +0200 ++++ shfs-0.35/shfs/Linux-2.6/proc.c 2007-06-04 13:22:59.021882592 +0200 @@ -149,7 +149,12 @@ { struct file *f = info->sock; diff --git a/package/shfs/patches/105-space_chars.patch b/package/shfs/patches/105-space_chars.patch index 3a9aede7bf..03ad8328c6 100644 --- a/package/shfs/patches/105-space_chars.patch +++ b/package/shfs/patches/105-space_chars.patch @@ -1,5 +1,7 @@ ---- shfs-0.35.orig/shfs/Linux-2.4/shell.c 31 May 2004 16:32:13 -0000 1.6 -+++ shfs-0.35/shfs/Linux-2.4/shell.c 3 Jun 2004 09:09:54 -0000 +Index: shfs-0.35/shfs/Linux-2.4/shell.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.4/shell.c 2007-06-04 13:22:57.970042496 +0200 ++++ shfs-0.35/shfs/Linux-2.4/shell.c 2007-06-04 13:22:59.249847936 +0200 @@ -213,6 +213,7 @@ int c = 0; int is_space = 1; @@ -31,8 +33,10 @@ } } s++; ---- shfs-0.35.orig/shfs/Linux-2.6/shell.c 31 May 2004 16:32:13 -0000 1.7 -+++ shfs-0.35/shfs/Linux-2.6/shell.c 3 Jun 2004 09:09:57 -0000 +Index: shfs-0.35/shfs/Linux-2.6/shell.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/shell.c 2007-06-04 13:22:57.977041432 +0200 ++++ shfs-0.35/shfs/Linux-2.6/shell.c 2007-06-04 13:22:59.249847936 +0200 @@ -225,6 +225,7 @@ int c = 0; int is_space = 1; diff --git a/package/shfs/patches/106-uidgid32.patch b/package/shfs/patches/106-uidgid32.patch index 1bd980369b..60510a28d3 100644 --- a/package/shfs/patches/106-uidgid32.patch +++ b/package/shfs/patches/106-uidgid32.patch @@ -1,5 +1,7 @@ ---- shfs-0.35.orig/shfs/Linux-2.4/shfs_fs_sb.h 24 Mar 2004 13:40:02 -0000 1.2 -+++ shfs-0.35/shfs/Linux-2.4/shfs_fs_sb.h 3 Jun 2004 17:12:28 -0000 +Index: shfs-0.35/shfs/Linux-2.4/shfs_fs_sb.h +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.4/shfs_fs_sb.h 2007-06-04 13:22:57.941046904 +0200 ++++ shfs-0.35/shfs/Linux-2.4/shfs_fs_sb.h 2007-06-04 13:22:59.448817688 +0200 @@ -38,10 +38,10 @@ struct shfs_fileops fops; int version; @@ -15,8 +17,10 @@ char mount_point[SHFS_PATH_MAX]; struct semaphore sock_sem; /* next 4 vars are guarded */ struct file *sock; ---- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs_sb.h 24 Mar 2004 13:40:02 -0000 1.2 -+++ shfs-0.35/shfs/Linux-2.6/shfs_fs_sb.h 3 Jun 2004 17:12:28 -0000 +Index: shfs-0.35/shfs/Linux-2.6/shfs_fs_sb.h +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/shfs_fs_sb.h 2007-06-04 13:22:57.949045688 +0200 ++++ shfs-0.35/shfs/Linux-2.6/shfs_fs_sb.h 2007-06-04 13:22:59.449817536 +0200 @@ -38,10 +38,10 @@ struct shfs_fileops fops; int version; diff --git a/package/shfs/patches/107-df.patch b/package/shfs/patches/107-df.patch index 07eaaf234f..ca2c9d079a 100644 --- a/package/shfs/patches/107-df.patch +++ b/package/shfs/patches/107-df.patch @@ -1,5 +1,7 @@ ---- shfs-0.35.orig/shfs/Linux-2.4/shell.c 3 Jun 2004 13:20:44 -0000 1.8 -+++ shfs-0.35/shfs/Linux-2.4/shell.c 18 Jun 2004 12:19:52 -0000 +Index: shfs-0.35/shfs/Linux-2.4/shell.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.4/shell.c 2007-06-04 13:22:59.249847936 +0200 ++++ shfs-0.35/shfs/Linux-2.4/shell.c 2007-06-04 13:22:59.643788048 +0200 @@ -961,11 +961,11 @@ s = info->sockbuf; @@ -15,8 +17,10 @@ result = sock_readln(info, info->sockbuf, SOCKBUF_SIZE); if (result < 0) ---- shfs-0.35.orig/shfs/Linux-2.6/shell.c 3 Jun 2004 13:20:47 -0000 1.9 -+++ shfs-0.35/shfs/Linux-2.6/shell.c 18 Jun 2004 12:19:53 -0000 +Index: shfs-0.35/shfs/Linux-2.6/shell.c +=================================================================== +--- shfs-0.35.orig/shfs/Linux-2.6/shell.c 2007-06-04 13:22:59.249847936 +0200 ++++ shfs-0.35/shfs/Linux-2.6/shell.c 2007-06-04 13:22:59.643788048 +0200 @@ -974,11 +974,11 @@ s = info->sockbuf; diff --git a/package/shfs/patches/108-no_update_mtab.patch b/package/shfs/patches/108-no_update_mtab.patch index 1f519bb575..9b4a9aeeb0 100644 --- a/package/shfs/patches/108-no_update_mtab.patch +++ b/package/shfs/patches/108-no_update_mtab.patch @@ -1,5 +1,7 @@ ---- shfs-0.35.orig/shfsmount/shfsmount.c 2004-06-01 14:16:19.000000000 +0100 -+++ shfs-0.35/shfsmount/shfsmount.c 2007-03-28 21:23:47.194043034 +0100 +Index: shfs-0.35/shfsmount/shfsmount.c +=================================================================== +--- shfs-0.35.orig/shfsmount/shfsmount.c 2007-06-04 13:22:57.883055720 +0200 ++++ shfs-0.35/shfsmount/shfsmount.c 2007-06-04 13:22:59.838758408 +0200 @@ -74,7 +74,7 @@ static int have_uid = 0; @@ -9,8 +11,10 @@ /* preserve owner of files */ static int preserve = 0; ---- shfs-0.35.orig/shfsmount/shfsumount.c 2004-06-01 14:16:19.000000000 +0100 -+++ shfs-0.35/shfsmount/shfsumount.c 2007-03-28 21:49:28.937840351 +0100 +Index: shfs-0.35/shfsmount/shfsumount.c +=================================================================== +--- shfs-0.35.orig/shfsmount/shfsumount.c 2007-06-04 13:22:57.890054656 +0200 ++++ shfs-0.35/shfsmount/shfsumount.c 2007-06-04 13:22:59.838758408 +0200 @@ -67,10 +67,6 @@ FILE *new_mtab; struct mntent *ment; -- cgit v1.2.3