* Refactoring: move most filesystem utilities / FUSE filesystems to

  tools/filesystems.  Previously they were all over the place.

svn path=/nixpkgs/trunk/; revision=18809

3 files changed, 69 insertions, 0 deletions

diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
new file mode 100644
index 000000000000..f036e0a08bc8
--- /dev/null
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -0,0 +1,18 @@
+args: with args;
+
+stdenv.mkDerivation {
+  name = "reiserfsprogs-3.6.19-patched";
+
+  src = fetchurl {
+    url = http://chichkin_i.zelnet.ru/namesys/reiserfsprogs-3.6.19.tar.gz;
+    sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0";
+  };
+
+  patches = [./headers-fix.patch ./verbose-flag-ignore-for-compatibility.patch ];
+
+  meta = {
+    homepage = http://www.namesys.com/;
+    description = "Reiserfs utilities";
+    license = "GPL-2";
+  };
+}
diff --git a/pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch b/pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch
new file mode 100644
index 000000000000..2c6693dae75c
--- /dev/null
+++ b/pkgs/tools/filesystems/reiserfsprogs/headers-fix.patch
@@ -0,0 +1,19 @@
+diff -pruN 1:3.6.19-4/include/reiserfs_fs.h 1:3.6.19-4ubuntu2/include/reiserfs_fs.h
+--- 1:3.6.19-4/include/reiserfs_fs.h	2004-09-16 08:49:05.000000000 +0100
++++ 1:3.6.19-4ubuntu2/include/reiserfs_fs.h	2006-12-14 18:08:28.000000000 +0000
+@@ -38,15 +38,10 @@
+ # define extern_inline
+ #endif
+ 
+-#include <asm/unaligned.h>
+-
+ #ifndef get_unaligned
+-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
+-    defined(__PPC) || defined(powerpc) || defined(__powerpc__)
+ #	define get_unaligned(ptr)	(*(ptr))
+ #	define put_unaligned(val,ptr)	((void)(*(ptr) = (val)))
+ #endif
+-#endif
+ 
+ #define get_leXX(xx,p,field)	(le##xx##_to_cpu ((p)->field))
+ #define set_leXX(xx,p,field,val) do { (p)->field = cpu_to_le##xx(val); } while (0)
diff --git a/pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch b/pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch
new file mode 100644
index 000000000000..802971b73fdc
--- /dev/null
+++ b/pkgs/tools/filesystems/reiserfsprogs/verbose-flag-ignore-for-compatibility.patch
@@ -0,0 +1,32 @@
+diff --git a/fsck/main.c b/fsck/main.c
+index ab3342a..79a0473 100644
+--- a/fsck/main.c
++++ b/fsck/main.c
+@@ -37,6 +37,7 @@ fsck_progress ("Usage: %s [mode] [options] "					\
+ "  -z | --adjust-size\t\tfix file sizes to real size\n"				\
+ "  -q | --quiet\t\t\tno speed info\n"						\
+ "  -y | --yes\t\t\tno confirmations\n"						\
++"  -v         \t\t ignore -v option for compatibility to fsck.* tools\n"						\
+ "  -V\t\t\t\tprints version and exits\n"					\
+ "  -a and -p\t\t\tsome light-weight auto checks for bootup\n"			\
+ "  -f and -r\t\t\tignored\n"							\
+@@ -131,7 +132,7 @@ static char * parse_options (struct fsck_data * data, int argc, char * argv [])
+ 	};
+ 	int option_index;
+       
+-	c = getopt_long (argc, argv, "iql:nb:Szd:R:h:j:gafVrpyt:B:",
++	c = getopt_long (argc, argv, "iql:nb:Szd:R:h:j:gafVrpyvt:B:",
+ 			 options, &option_index);
+ 	if (c == -1)
+ 	    break;
+@@ -158,6 +159,10 @@ static char * parse_options (struct fsck_data * data, int argc, char * argv [])
+ 	    data->options |= OPT_YES;
+ 	    break;
+ 
++	case 'v': /* --quiet */
++            reiserfs_warning(stdout, "\nignoring -v option for compatibility\n");
++	    break;
++
+ 	case 'l': /* --logfile */
+ 	    data->log_file_name = optarg;
+ 	    /*asprintf (&data->log_file_name, "%s", optarg);*/