--- reiserfsprogs-3.6.21.orig/config.guess
+++ reiserfsprogs-3.6.21/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2003-07-02'
+timestamp='2009-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -66,11 +69,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -104,7 +107,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -136,16 +139,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -168,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -176,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -206,50 +200,32 @@
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@@ -287,42 +263,49 @@
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE="alphaev79" ;;
 	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -330,32 +313,48 @@
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -364,10 +363,10 @@
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -379,10 +378,10 @@
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -393,37 +392,40 @@
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -447,32 +449,33 @@
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -488,29 +491,29 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -518,7 +521,7 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -533,15 +536,19 @@
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
-    *:AIX:*:[45])
+	exit ;;
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -554,28 +561,28 @@
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -637,9 +644,19 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -647,11 +664,11 @@
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -679,197 +696,227 @@
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-	exit 0 ;;
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
+	exit ;;
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd | genuineintel)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux
-	exit 0 ;;
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
-	;;
-    mips64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux
-	exit 0 ;;
+	echo powerpc-unknown-linux-gnu
+	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux
-	exit 0 ;;
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -880,36 +927,45 @@
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
-	exit 0 ;;
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
-	  *)    echo hppa-${VENDOR}-linux ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux
-	exit 0 ;;
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux
-	exit 0 ;;
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -923,19 +979,8 @@
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linuxoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
-		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -952,23 +997,33 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -976,24 +1031,27 @@
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1001,15 +1059,16 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1027,73 +1086,86 @@
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1101,68 +1173,84 @@
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1170,22 +1258,25 @@
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1196,28 +1287,50 @@
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1249,7 +1362,7 @@
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1338,11 +1451,12 @@
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1351,22 +1465,22 @@
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1377,7 +1491,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- reiserfsprogs-3.6.21.orig/config.sub
+++ reiserfsprogs-3.6.21/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2003-07-04'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -83,11 +85,11 @@
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +101,7 @@
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -118,7 +120,10 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,10 +149,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -169,6 +177,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +197,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,44 +244,57 @@
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -275,6 +304,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -294,54 +326,67 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -359,6 +404,9 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -376,6 +424,9 @@
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -399,6 +450,10 @@
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -407,10 +462,26 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -435,12 +506,27 @@
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -463,6 +549,14 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -613,6 +707,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -628,6 +730,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -641,10 +747,6 @@
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -657,6 +759,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -725,10 +830,6 @@
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -736,9 +837,12 @@
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -756,6 +860,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -765,6 +877,12 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -821,6 +939,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -847,6 +969,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -858,6 +984,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -947,6 +1076,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -960,6 +1093,10 @@
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1003,6 +1140,10 @@
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1014,6 +1155,10 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1033,6 +1178,9 @@
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1049,13 +1197,10 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1122,25 +1267,30 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1158,12 +1308,18 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
@@ -1173,6 +1329,9 @@
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1194,6 +1353,9 @@
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1216,6 +1378,9 @@
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1252,6 +1417,12 @@
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1274,6 +1445,12 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1283,9 +1460,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1311,6 +1488,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1329,9 +1509,15 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1434,7 +1620,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
@@ -1464,9 +1650,15 @@
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1491,7 +1683,7 @@
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- reiserfsprogs-3.6.21.orig/debian/mkreiserfs-udeb.install
+++ reiserfsprogs-3.6.21/debian/mkreiserfs-udeb.install
@@ -0,0 +1 @@
+sbin/mkreiserfs       sbin
--- reiserfsprogs-3.6.21.orig/debian/journal_params_autofix.patch.nolongerapplied
+++ reiserfsprogs-3.6.21/debian/journal_params_autofix.patch.nolongerapplied
@@ -0,0 +1,46 @@
+===== reiserfscore/journal.c 1.19 vs edited =====
+--- 1.19/reiserfsprogs/reiserfscore/journal.c	Thu Apr 24 17:25:56 2003
++++ edited/reiserfscore/journal.c	Tue Apr 29 19:58:48 2003
+@@ -481,21 +481,6 @@
+     }
+     
+     if (check) {
+-	
+-	j_head = (struct reiserfs_journal_header *)(bh->b_data);
+-
+-	if (get_jp_journal_1st_block (&j_head->jh_journal) != get_jp_journal_1st_block (sb_jp (sb)) || 
+-	    get_jp_journal_dev (&j_head->jh_journal) != get_jp_journal_dev (sb_jp (sb)) || 
+-	    get_jp_journal_size (&j_head->jh_journal) != get_jp_journal_size (sb_jp (sb))) 
+-	{
+-	    reiserfs_warning (stderr, 
+-		"\nreiserfs_open_journal: journal parameters from the super block does not match \n"
+-		"to journal parameters from the journal. It is expected if you created your fs \n"
+-		"with old reiserfsprogs. In this case rebuild-sb will fix it all for you.\n", j_filename);
+-	    brelse (bh);
+-	    return 0;        
+-	}
+-	
+ 	/* Check the superblock's journal parameters. */
+ 	if (!is_reiserfs_jr_magic_string (sb)) {    
+ 	    if (get_jp_journal_dev (sb_jp(sb)) != 0 || 
+@@ -506,6 +491,20 @@
+ 		brelse (bh);
+ 		return 0;
+ 	    }
++	} else {
++	    j_head = (struct reiserfs_journal_header *)(bh->b_data);
++	    
++	    if (get_jp_journal_1st_block (&j_head->jh_journal) != get_jp_journal_1st_block (sb_jp (sb)) || 
++		get_jp_journal_dev (&j_head->jh_journal) != get_jp_journal_dev (sb_jp (sb)) || 
++		get_jp_journal_size (&j_head->jh_journal) != get_jp_journal_size (sb_jp (sb))) 
++	    {
++		reiserfs_warning (stderr, 
++		    "\nreiserfs_open_journal: journal parameters from the super block does not match \n"
++		    "to journal parameters from the journal. It is expected if you created your fs \n"
++		    "with old reiserfsprogs. In this case rebuild-sb will fix it all for you.\n", j_filename);
++		brelse (bh);
++		return 0;        
++	    }
+ 	}
+     }
+ 
--- reiserfsprogs-3.6.21.orig/debian/reiserfsprogs.docs
+++ reiserfsprogs-3.6.21/debian/reiserfsprogs.docs
@@ -0,0 +1,2 @@
+README
+debian/html
--- reiserfsprogs-3.6.21.orig/debian/yesopt.diff.nolongerapplied
+++ reiserfsprogs-3.6.21/debian/yesopt.diff.nolongerapplied
@@ -0,0 +1,103 @@
+diff -ru reiserfsprogs-3.6.4/fsck/fsck.h new_reiserfsprogs-3.6.4/fsck/fsck.h
+--- reiserfsprogs-3.6.4/fsck/fsck.h	Mon Sep 23 18:03:51 2002
++++ new_reiserfsprogs-3.6.4/fsck/fsck.h	Sat Mar 15 02:59:59 2003
+@@ -57,6 +57,7 @@
+ #define OPT_SAVE_PASSES_DUMP            0x200
+ #define BADBLOCKS_FILE               	0x400
+ #define OPT_SAVE_ROLLBACK               0x800
++#define OPT_YES				0x1000
+ 
+ 
+ /* pass0.c */
+@@ -455,6 +456,7 @@
+ 
+ #define fsck_deallocate_bitmap(fs) fsck_data(fs)->check.deallocate_bitmap
+ 
++#define fsck_yes(fs) (fsck_data(fs)->options & OPT_YES)
+ #define fsck_interactive(fs) (fsck_data(fs)->options & OPT_INTERACTIVE)
+ //#define fsck_fix_fixable(fs) (fsck_data(fs)->options & OPT_FIX_FIXABLE)
+ 
+diff -ru reiserfsprogs-3.6.4/fsck/main.c new_reiserfsprogs-3.6.4/fsck/main.c
+--- reiserfsprogs-3.6.4/fsck/main.c	Sat Mar 15 02:55:11 2003
++++ new_reiserfsprogs-3.6.4/fsck/main.c	Sat Mar 15 02:50:41 2003
+@@ -37,9 +37,10 @@
+ "  \t\t\tfix file sizes to real size\n"\
+ "  \t\t\tlist of all bad blocks on the fs\n"\
+ "  -q | --quiet\t\tno speed info\n"\
++"  -y | --yes\t\trun without confirmation\n"\
+ "  -V\t\t\tprints version and exits\n"\
+ "  -a and -p\t\tprint fs info and exits\n"\
+-"  -f, -r and -y\t\tignored\n"\
++"  -f and -r\t\tignored\n"\
+ "Expert options:\n"\
+ "  --no-journal-available\n"\
+ "  \t\t\tdo not open nor replay journal\n"\
+@@ -103,6 +104,7 @@
+ 	    {"interactive", no_argument, 0, 'i'},
+ 	    {"adjust-file-size", no_argument, 0, 'z'},
+ 	    {"quiet", no_argument, 0, 'q'},
++	    {"yes", no_argument, 0, 'y'},
+ 	    {"nolog", no_argument, 0, 'n'},
+ 	    
+ 	    /* if file exists ad reiserfs can be load of it - only
+@@ -154,6 +156,10 @@
+ 	    data->options |= OPT_QUIET;
+ 	    break;
+ 
++	case 'y': /* --yes */
++	    data->options |= OPT_YES;
++	    break;
++
+ 	case 'l': /* --logfile */
+ 	    data->log_file_name = optarg;
+ 	    /*asprintf (&data->log_file_name, "%s", optarg);*/
+@@ -228,7 +234,6 @@
+ 	
+ 	case 'f':
+ 	case 'r': /* ignored */
+-	case 'y':
+ 	    break;
+ 	    
+ 	case 'V': /* cause fsck to do nothing */
+@@ -414,7 +419,9 @@
+                 "Will put log info to '%s'\n", 
+                         (data->log == stdout) ? "stdout" : (data->log_file_name ?: "fsck.run"));
+ 
+-    if (!user_confirmed (warn_to, 
++    if (data->mode == FSCK_CHECK && (data->options & OPT_YES))
++	/* inhibit confirmation */;
++    else if (!user_confirmed (warn_to, 
+                 "\nDo you want to run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n"))
+ 	exit (0);
+ }
+diff -ru reiserfsprogs-3.6.4/fsck/reiserfsck.8 new_reiserfsprogs-3.6.4/fsck/reiserfsck.8
+--- reiserfsprogs-3.6.4/fsck/reiserfsck.8	Fri Oct 25 14:51:54 2002
++++ new_reiserfsprogs-3.6.4/fsck/reiserfsck.8	Sat Mar 15 02:24:08 2003
+@@ -89,6 +89,11 @@
+ .B --quiet, -q
+ This option prevents \fBreiserfsck\fR from reporting its rate of progress.
+ .TP
++.B --yes, -y
++This option inhibits \fBreiserfsck\fR from asking you for confirmation after
++telling you what it is going to do, assuming yes.  For safety, it only works
++together with the --check option.
++.TP
+ \fB-a\fR, \fB-p\fR
+ These options are usually passed by fsck -A during the automatic 
+ checking of /etc/fstab partitions.  For compatibility, these options
+@@ -100,11 +105,8 @@
+ .B -V
+ This option prints the reiserfsprogs version and exit.
+ .TP
+-\fB-r\fR, \fB-p\fR, \fB-y\fR
++\fB-r\fR, \fB-f\fR
+ These options are ignored.
+-.TP
+-.B -V\fR, \fB-f\fR
+-prints version and exits
+ .SH EXPERT OPTIONS
+ DO NOT USE THESE OPTIONS UNLESS YOU KNOW WHAT YOU ARE DOING. 
+ WE ARE NOT RESPONSIBLE IF YOU LOSE DATA AS A RESULT OF THESE
+
+
+
--- reiserfsprogs-3.6.21.orig/debian/reiserfsprogs.install
+++ reiserfsprogs-3.6.21/debian/reiserfsprogs.install
@@ -0,0 +1,5 @@
+sbin/mkreiserfs       sbin/
+sbin/reiserfsck       sbin/
+sbin/resize_reiserfs  sbin/
+sbin/debugreiserfs    sbin/
+sbin/reiserfstune     sbin/
--- reiserfsprogs-3.6.21.orig/debian/mkfs.reiserfs
+++ reiserfsprogs-3.6.21/debian/mkfs.reiserfs
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+# Be sure to invoke mkreiserfs noninteractively for the debian-installer
+exec /sbin/mkreiserfs -q "$@"
--- reiserfsprogs-3.6.21.orig/debian/README.Debian
+++ reiserfsprogs-3.6.21/debian/README.Debian
@@ -0,0 +1,14 @@
+reiserfsprogs for Debian
+------------------------
+
+Releases of Linux prior to 2.4.1 do not support ReiserFS on their own. Thus,
+these tools will only be useful with Linux 2.4.1 or later, or if your kernel 
+has been built with the ReiserFS patch applied. This patch can be found in the 
+appropriate kernel-patch-<version>-reiserfs packages.
+
+NOTE: mkreiserfs builds version 3.6 filesystems by default. In order to create
+a 3.5 filesystem (i.e., a Linux 2.2-mountable filesystem), you must provide
+the -v1 option when invoking mkreiserfs. To reiterate, version 3.6 filesystems
+are not mountable under Linux 2.2.
+
+ -- Ed Boraas <ed@debian.org>, Fri, 09 Feb 2001 18:41:46 -0700
--- reiserfsprogs-3.6.21.orig/debian/reiserfsprogs-udeb.install
+++ reiserfsprogs-3.6.21/debian/reiserfsprogs-udeb.install
@@ -0,0 +1,3 @@
+sbin/reiserfsck       sbin/
+sbin/resize_reiserfs  sbin/
+sbin/debugreiserfs    sbin/
--- reiserfsprogs-3.6.21.orig/debian/compat
+++ reiserfsprogs-3.6.21/debian/compat
@@ -0,0 +1 @@
+7
--- reiserfsprogs-3.6.21.orig/debian/reiserfsprogs.dirs
+++ reiserfsprogs-3.6.21/debian/reiserfsprogs.dirs
@@ -0,0 +1 @@
+sbin
--- reiserfsprogs-3.6.21.orig/debian/watch
+++ reiserfsprogs-3.6.21/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-([0-9.]+).tar.gz debian uupdate
--- reiserfsprogs-3.6.21.orig/debian/copyright
+++ reiserfsprogs-3.6.21/debian/copyright
@@ -0,0 +1,21 @@
+This package has been taken over by Felix Zielcke <fzielcke@z-51.de> on
+Sun, 08 Feb 2009 14:49:50 +0100
+This package was debianized by Ed Boraas <ed@debian.org> on
+Sat, 30 Sep 2000 18:41:46 -0600.
+
+It was downloaded from ftp://ftp.kernel.org/pub/linux/utils/fs/reiserfs/
+
+Upstream Authors: Hans Reiser <reiser@namesys.com>, et al.
+
+  For a more extensive listing of authors and contributors, see
+  /usr/share/doc/reiserfsprogs/README.
+
+Copyright (C)  1996-2004 by Hans Reiser
+
+License:
+
+  GNU General Public License, version 2, found in
+  /usr/share/common-licenses/GPL-2 on Debian systems.
+
+  Furthermore, licensing clarifications have been provided by the
+  upstream authors within /usr/share/doc/reiserfsprogs/README.
--- reiserfsprogs-3.6.21.orig/debian/reiserfsprogs.manpages
+++ reiserfsprogs-3.6.21/debian/reiserfsprogs.manpages
@@ -0,0 +1,5 @@
+mkreiserfs/mkreiserfs.8
+fsck/reiserfsck.8
+resize_reiserfs/resize_reiserfs.8
+tune/reiserfstune.8
+debugreiserfs/debugreiserfs.8
--- reiserfsprogs-3.6.21.orig/debian/reiserfsprogs-udeb.dirs
+++ reiserfsprogs-3.6.21/debian/reiserfsprogs-udeb.dirs
@@ -0,0 +1 @@
+sbin
--- reiserfsprogs-3.6.21.orig/debian/rules
+++ reiserfsprogs-3.6.21/debian/rules
@@ -0,0 +1,86 @@
+#! /usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+DEB=reiserfsprogs
+SMALLUDEB=mkreiserfs-udeb
+FULLUDEB=reiserfsprogs-udeb
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+config.status: configure
+	dh_testdir
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr --mandir=\$${prefix}/share/man --sbindir=/sbin
+
+build: build-stamp
+build-stamp: config.status
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean::
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+	-test -r /usr/share/misc/config.sub && \
+	  cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	  cp -f /usr/share/misc/config.guess config.guess
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_install --sourcedir=debian/tmp
+
+	ln debian/$(DEB)/sbin/mkreiserfs debian/$(DEB)/sbin/mkfs.reiserfs
+	ln debian/$(SMALLUDEB)/sbin/mkreiserfs debian/$(SMALLUDEB)/sbin/mkfs.reiserfs
+	install -m 755 debian/fsck.reiserfs debian/$(DEB)/sbin
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installman
+	dh_link -p$(DEB) usr/share/man/man8/mkreiserfs.8.gz usr/share/man/man8/mkfs.reiserfs.8.gz
+	dh_link -p$(DEB) usr/share/man/man8/reiserfsck.8.gz usr/share/man/man8/fsck.reiserfs.8.gz
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- reiserfsprogs-3.6.21.orig/debian/quietmkfs.diff.nolongerapplied
+++ reiserfsprogs-3.6.21/debian/quietmkfs.diff.nolongerapplied
@@ -0,0 +1,65 @@
+--- reiserfsprogs-3.6.6.orig/mkreiserfs/mkreiserfs.c	2003-04-22 07:56:50.000000000 -0600
++++ reiserfsprogs-3.6.6/mkreiserfs/mkreiserfs.c	2003-04-25 23:01:03.000000000 -0600
+@@ -81,7 +81,8 @@
+ 			"                                   disk, not block device or mounted partition;\n"
+ 			"                                   specified twice, do not ask for confirmation\n"
+ 			"  -d | --debug                     print debugging information during mkreiser\n"
+-			"  -V                               print version and exit\n",
++			"  -V                               print version and exit\n"
++			"  -q | --quiet                     do not output sponsorship message at completion\n",
+ 			program_name);
+ 	exit (1);
+ }
+@@ -91,6 +92,7 @@
+ int Create_default_journal = 1;
+ int Block_size = 4096;
+ int DEBUG_MODE = 0;
++int quiet = 0;
+ 
+ /* size of journal + 1 block for journal header */
+ unsigned long Journal_size = 0;
+@@ -546,11 +548,12 @@
+ 			{"uuid", required_argument, 0, 'u'},
+ 			{"label", required_argument, 0, 'l'},
+ 			{"format", required_argument, &flag, 1},
++			{"quiet", no_argument, 0, 'q'},
+ 			{0, 0, 0, 0}
+ 		};
+ 		int option_index;
+       
+-		c = getopt_long (argc, argv, "b:j:s:t:o:h:u:l:Vfd",
++		c = getopt_long (argc, argv, "b:j:s:t:o:h:u:l:Vfdq",
+ 						 options, &option_index);
+ 		if (c == -1)
+ 			break;
+@@ -599,7 +602,7 @@
+ 			break;
+ 
+ 		case 'V':
+-			exit (1);
++			exit (0);
+ 
+ 		case 'f':
+ 			force ++;
+@@ -620,7 +623,11 @@
+ 		case 'l':
+ 			LABEL = optarg;
+ 			break;
+-		
++	
++		case 'q':
++			quiet = 1;
++			break;
++			
+ 		default:
+ 			print_usage_and_exit();
+ 		}
+@@ -712,7 +719,7 @@
+     sync ();
+     printf ("ok\n");
+  
+-	if (DEBUG_MODE)
++	if (DEBUG_MODE || quiet)
+ 		return 0;
+ 	printf ("\nThe Defense Advanced Research Projects Agency (DARPA) is the primary sponsor of"
+ 			"\nReiser4. DARPA does not endorse this project; it merely sponsors it."
--- reiserfsprogs-3.6.21.orig/debian/control
+++ reiserfsprogs-3.6.21/debian/control
@@ -0,0 +1,31 @@
+Source: reiserfsprogs
+Section: admin
+Priority: optional
+Maintainer: Felix Zielcke <fzielcke@z-51.de>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7), uuid-dev, autotools-dev, cdbs
+Standards-Version: 3.8.0
+
+Package: reiserfsprogs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: User-level tools for ReiserFS filesystems
+ This package contains utilities to create, check, resize, and debug
+ ReiserFS filesystems.
+
+Package: reiserfsprogs-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: User-level tools for ReiserFS filesystems
+ This installer module contains utilities to check, resize, and debug
+ ReiserFS filesystems.
+
+Package: mkreiserfs-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: User-level tools for ReiserFS filesystems
+ This installer module contains the utility to create ReiserFS filesystems.
--- reiserfsprogs-3.6.21.orig/debian/changelog
+++ reiserfsprogs-3.6.21/debian/changelog
@@ -0,0 +1,451 @@
+reiserfsprogs (1:3.6.21-1build1) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac@ubuntu.com>  Sun, 07 Mar 2010 01:06:45 +0100
+
+reiserfsprogs (1:3.6.21-1) unstable; urgency=low
+
+  * New maintainer (Closes: #483025)
+  * Add a watch file.
+  * Bump standards version to 3.8.0.
+  * Remove DH_COMPAT from debian/rules and add a debian/compat file and bump
+    debhelper compat level and build-dep to 7.
+  * Remove homepage from description.
+  * Change download url in debian/copyright to the kernel.org one.
+  * Add appropriate Copyright holder to debian/copyright.
+  * Change license path to GPL-2 in debian/copyright.
+  * Add a build dependency on autotools-dev and update config.guess and
+    config.sub in the clean target.
+  * Add a build dependency on CDBS and use the simple-patchsys.mk
+  * Add `-a' to fsck.reiserfs flags if `-y' was given. Patch by Federico Heinz.
+    (Closes: #498087)
+  * Don't ignore make distclean errors.
+  * Replace `pwd` with $(CURDIR) in debian/rules.
+  * Remove unneeded lintian overrides.
+  * Replace deprecated `dh_clean -k' with `dh_prep'.
+  * Remove Priority field from binary packages in debian/control.
+  * debian/patches/00_escape_dashes_in_manpagecape.diff: New patch to escape
+    dashes in the manpages.
+
+ -- Felix Zielcke <fzielcke@z-51.de>  Fri, 06 Mar 2009 18:32:13 +0100
+
+reiserfsprogs (1:3.6.19-6) unstable; urgency=low
+
+  * Remove linux-kernel-headers from Build-Depends.
+  * Merge from Ubuntu:
+    - definitively drop inclusion of asm/unaligned.h (closes: #429006).
+
+ -- Domenico Andreoli <cavok@debian.org>  Tue, 17 Jul 2007 02:26:04 +0200
+
+reiserfsprogs (1:3.6.19-5) unstable; urgency=low
+
+  * Added linux-kernel-headers to Build-Depends (closes: #429006).
+
+ -- Domenico Andreoli <cavok@debian.org>  Wed, 04 Jul 2007 00:56:48 +0200
+
+reiserfsprogs (1:3.6.19-4ubuntu2) feisty; urgency=low
+
+  * Changed man page for mkreiserfs to note that block sizes other than
+    4096 bytes are NOT supported by current kernels
+
+ -- Phillip Susi <psusi@cfl.rr.com>  Wed, 13 Dec 2006 14:23:15 -0500
+
+reiserfsprogs (1:3.6.19-4ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu change:
+    - include/reiserfs_fs.h: Do not #include <asm/unaligned.h>, FTBFS fix.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 30 Oct 2006 10:45:35 +0100
+
+reiserfsprogs (1:3.6.19-4) unstable; urgency=low
+
+  * fsck.reiserfs is now a script invoking reiserfsck -q (closes: #385155). 
+
+ -- Domenico Andreoli <cavok@debian.org>  Thu, 28 Sep 2006 13:08:24 +0200
+
+reiserfsprogs (1:3.6.19-3ubuntu1) edgy; urgency=low
+
+  * include/reiserfs_fs.h: Do not #include <asm/unaligned.h>. It does not
+    exist any more and should not be necessary on our architectures. Instead
+    define {get,put}_aligned macros as naive macros. Fixes FTBFS. 
+    Closes: LP#65842
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 13 Oct 2006 14:41:06 +0200
+
+reiserfsprogs (1:3.6.19-3) unstable; urgency=low
+
+  * Fixed typos in man pages (closes: #371849, #371850, #371851, #371852).
+
+ -- Domenico Andreoli <cavok@debian.org>  Fri, 30 Jun 2006 12:29:49 +0200
+
+reiserfsprogs (1:3.6.19-2) unstable; urgency=low
+
+  * Fixed typo in reiserfstune's manpage (closes: #309512).
+  * Removed obsolete NOTE in reiserfsprogs' package description
+    (closes: #249204).
+  * Applied patch to make reiserfsck display volume labels (closes: #345948).
+  * Updated HTML man pages from upstream site. attrs mount option is
+    now documented in mount-options.html (closes: #270006).
+
+ -- Domenico Andreoli <cavok@debian.org>  Wed,  1 Mar 2006 18:08:55 +0100
+
+reiserfsprogs (1:3.6.19-1) unstable; urgency=low
+
+  * New upstream release:
+    - fixed error message for invalid device (closes: #266648).
+
+ -- Domenico Andreoli <cavok@debian.org>  Fri, 15 Oct 2004 13:43:08 +0200
+
+reiserfsprogs (1:3.6.18-4) unstable; urgency=low
+
+  * Uses debhelper to build udebs. Cleaned and updated the build process.
+
+ -- Domenico Andreoli <cavok@debian.org>  Fri,  3 Sep 2004 18:48:12 +0200
+
+reiserfsprogs (1:3.6.18-3) unstable; urgency=low
+
+  * Changed header used to guess the architecture for hack applied in -2.
+
+ -- Domenico Andreoli <cavok@debian.org>  Sun,  8 Aug 2004 21:57:52 +0200
+
+reiserfsprogs (1:3.6.18-2) unstable; urgency=low
+
+  * Applied hack to build also on powerpc with broken linux-kernel-headers.
+
+ -- Domenico Andreoli <cavok@debian.org>  Sun,  8 Aug 2004 14:44:30 +0200
+
+reiserfsprogs (1:3.6.18-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Domenico Andreoli <cavok@debian.org>  Tue,  3 Aug 2004 19:29:12 +0200
+
+reiserfsprogs (1:3.6.17-2) unstable; urgency=low
+
+  * Added build dependency on uuid-dev (closes: #254480).
+
+ -- Domenico Andreoli <cavok@debian.org>  Tue, 15 Jun 2004 10:27:59 +0200
+
+reiserfsprogs (1:3.6.17-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated and fixed debian/copyright (closes: #246687).
+
+ -- Domenico Andreoli <cavok@debian.org>  Fri, 14 May 2004 12:57:41 +0200
+
+reiserfsprogs (1:3.6.14-3) unstable; urgency=low
+
+  * Removed postinst and prerm, used to manage hard links to mkreiserfs
+    and reiserfsck.
+
+ -- Domenico Andreoli <cavok@debian.org>  Tue, 20 Apr 2004 11:31:44 +0200
+
+reiserfsprogs (1:3.6.14-2) unstable; urgency=low
+
+  * Hard links to /sbin/mkreiserfs and /sbin/reiserfsck are now also
+    in the reiserfsprogs package (closes: #244761).
+
+ -- Domenico Andreoli <cavok@debian.org>  Tue, 20 Apr 2004 00:46:01 +0200
+
+reiserfsprogs (1:3.6.14-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Domenico Andreoli <cavok@debian.org>  Fri, 19 Mar 2004 11:26:55 +0100
+
+reiserfsprogs (1:3.6.13-1) unstable; urgency=low
+
+  * New upstream release:
+    - should fix checking of read-only filesystems (closes: #233219)
+
+ -- Domenico Andreoli <cavok@debian.org>  Wed, 18 Feb 2004 00:49:23 +0100
+
+reiserfsprogs (1:3.6.12-1) unstable; urgency=low
+
+  * New upstream release:
+    - fixed some non-4k-block-size issues (closes: #212517)
+  * Added new uploader (me)
+  * reiserfsck is now built statically to work around known bug
+    (closes: #230482)
+
+ -- Domenico Andreoli <cavok@debian.org>  Sat, 14 Feb 2004 16:40:39 +0100
+
+reiserfsprogs (1:3.6.11-1.1) unstable; urgency=low
+
+  * NMU with Ed's permission.
+  * Applied patch from "Straightening out ioctl() size confusion"
+    discussion (closes: #219627).
+  * Fixed interactive invocation of mkreiserfs by d-i (closes: #213314).
+
+ -- Domenico Andreoli <cavok@debian.org>  Mon, 22 Dec 2003 15:13:54 +0100
+
+reiserfsprogs (1:3.6.11-1) unstable; urgency=low
+
+  * New upstream release (Closes: #204288)
+  * Build .udeb packages for debian-installer (Closes: #203002)
+  * Superblock check behavior seems to be fixed upstream
+  * -y option incorporated upstream
+
+ -- Ed Boraas <ed@debian.org>  Tue, 12 Aug 2003 21:40:35 -0600
+
+reiserfsprogs (1:3.6.6-3) unstable; urgency=low
+
+  * Fix typo in superblock fix
+
+ -- Ed Boraas <ed@debian.org>  Wed, 30 Apr 2003 11:01:23 -0600
+
+reiserfsprogs (1:3.6.6-2) unstable; urgency=low
+
+  * Do not check superblock journal parameters unless
+    they're expected to be correct (Closes: #191050)
+
+ -- Ed Boraas <ed@debian.org>  Wed, 30 Apr 2003 06:51:26 -0600
+
+reiserfsprogs (1:3.6.6-1) unstable; urgency=low
+
+  * New upstream release (Closes: #187611)
+  * Upstream now includes a "proper" replacement for
+    David Kimdon's patches
+  * Update HTML "man" pages
+
+ -- Ed Boraas <ed@debian.org>  Fri, 25 Apr 2003 22:55:17 -0600
+
+reiserfsprogs (1:3.6.4-5) unstable; urgency=low
+
+  * Include upstream README
+  * Output sponsorship message once again, if
+    mkreiserfs is invoked without --quiet
+  * Refer to licensing clarifications from 'copyright'
+  * -V exits returning 0 (Closes: #183868)
+   
+ -- Ed Boraas <ed@debian.org>  Wed, 23 Apr 2003 16:16:16 -0600
+
+reiserfsprogs (1:3.6.4-4) unstable; urgency=low
+
+  * Rebuild as non-native package (oops)
+    (Closes: #185723)
+
+ -- Ed Boraas <ed@debian.org>  Sat, 22 Mar 2003 16:29:14 -0700
+
+reiserfsprogs (1:3.6.4-3) unstable; urgency=low
+
+  * Add -y option [Thanks, Tommy Pettersson!]
+    (Closes: #130075)
+
+ -- Ed Boraas <ed@debian.org>  Sun, 16 Mar 2003 11:21:03 -0700
+
+reiserfsprogs (1:3.6.4-2) unstable; urgency=low
+
+  * Apply patches from David Kimdon to allow build on
+    hppa and sparc -- thanks, David!
+    (Closes: #170619)
+  * Remove over-verbose startup warning in reiserfsck
+    (Closes: #171121)
+  * Adjust reiserfsck banner to fit on one line, instead of
+    three (Closes: #119033)
+  * mkreiserfs advertising removed
+    (Closes: #152547)
+  * Build as non-native package (oops)
+  * Update to policy 3.5.8
+  * Refer to /usr/share/common-licenses in debian/copyright
+
+ -- Ed Boraas <ed@debian.org>  Mon, 6 Jan 2003 19:31:47 -0700
+
+reiserfsprogs (1:3.6.4-1) unstable; urgency=low
+
+  * New upstream release
+    * Corruption on cancelled reiserfsck reported fixed
+      (Closes: #155241)
+
+ -- Ed Boraas <ed@debian.org>  Tue, 19 Nov 2002 07:10:14 -0700
+
+reiserfsprogs (1:3.6.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #159861)
+
+ -- Ed Boraas <ed@debian.org>  Sun, 8 Sep 2002 15:20:51 -0600
+
+reiserfsprogs (1:3.6.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #153709)
+  * Included many more html docs from the ReiserFS website
+  * New (saner) version numbering scheme requires an epoch
+
+ -- Ed Boraas <ed@debian.org>  Mon, 29 Jul 2002 07:18:54 -0600
+
+reiserfsprogs (3.x.1b-1) unstable; urgency=low
+
+  * New upstream release (Closes: #139315)
+  * Last version built fine on ia64, assuming this one will as well
+    (Closes: #124121)
+  * Make reiserfsck -y do nothing (upstream explicitly ignores -y) 
+    (Closes: #140014)
+
+ -- Ed Boraas <ed@debian.org>  Sat, 23 Mar 2002 15:00:37 -0700
+
+reiserfsprogs (3.x.1a-2) unstable; urgency=high
+
+  * Reinstate mkreiserfs options "-v" and "-q" (Closes: #137755)
+     * Urgency=high because this bug breaks boot floppies
+
+ -- Ed Boraas <ed@debian.org>  Sun, 10 Mar 2002 15:10:56 -0700
+
+reiserfsprogs (3.x.1a-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #128512)
+      * Appears not to suffer from spurious 'device to small' errors
+        (Closes: #110902)
+      * Verified able to create filesystems on loopbacks >= 2GB
+        (Closes: #120966)
+      * reiserfsck is much more robust in error-handling (Closes: #122230)
+      * mkreiserfs correctly makes filesystems in files, when forced
+        to do so (Closes: #128801)
+      * New reiserfsck is clear about when to use options other than
+        --check (Closes: #128803)
+      * user_confirmed() calls fixed in mkreiserfs.c to account for 
+        newlines (Closes: #130149)
+
+ -- Ed Boraas <ed@debian.org>  Sat, 9 Feb 2002 13:48:17 -0700
+
+reiserfsprogs (3.x.0j-7) unstable; urgency=low
+
+  * Set "Architecture: any" (Closes: #114824)
+
+ -- Ed Boraas <ed@debian.org>  Tue, 9 Oct 2001 06:40:42 -0600
+
+reiserfsprogs (3.x.0j-6) unstable; urgency=low
+
+  * reiserfsck now recorgnizes (and ignores) a "-f" option
+    as in 3.x.0k-pre (Closes: #96397)
+
+ -- Ed Boraas <ed@debian.org>  Mon, 30 Jul 2001 21:23:11 -0600
+
+reiserfsprogs (3.x.0j-5) unstable; urgency=low
+
+  * Fix typo in resize_reiserfs(8) manpage (Closes: #106972)
+
+ -- Ed Boraas <ed@debian.org>  Mon, 30 Jul 2001 20:47:54 -0600
+
+reiserfsprogs (3.x.0j-4) unstable; urgency=low
+
+  * Restrict arch to i386/alpha, as no other ports
+    have kernel support for ReiserFS (Closes: #103792)
+
+ -- Ed Boraas <ed@debian.org>  Wed, 11 Jul 2001 20:13:19 -0600
+
+reiserfsprogs (3.x.0j-3) unstable; urgency=low
+
+  * Included fs.html and mount-options.html documents from 
+    the ReiserFS website (Closes: #97706)
+
+ -- Ed Boraas <ed@debian.org>  Tue, 19 Jun 2001 16:51:34 -0600
+
+reiserfsprogs (3.x.0j-2) unstable; urgency=low
+
+  * Include information on creating 2.2-mountable (ReiserFS
+    3.5) filesystems in the README.Debian (Closes: #95990)
+  * Happy May Day!
+
+ -- Ed Boraas <ed@debian.org>  Tue, 1 May 2001 23:10:40 -0600 
+
+reiserfsprogs (3.x.0j-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ed Boraas <ed@debian.org>  Wed, 4 Apr 2001 18:44:14 -0600
+
+reiserfsprogs (3.x.0h-3) unstable; urgency=low
+
+  * Added support for double-force on mkreiserfs, for boot
+    floppies (Closes: #90163)
+
+ -- Ed Boraas <ed@debian.org>  Tue, 27 Mar 2001 18:29:15 -0700 
+
+reiserfsprogs (3.x.0h-2) unstable; urgency=low
+
+  * Updated to policy v3.5.2
+  * Included Build-Depends (Closes: #90439) 
+
+ -- Ed Boraas <ed@debian.org>  Tue, 20 Mar 2001 06:34:10 -0700 
+
+reiserfsprogs (3.x.0h-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ed Boraas <ed@debian.org>  Tue, 13 Mar 2001 15:33:48 -0700
+
+reiserfsprogs (3.x.0d-3) unstable; urgency=low
+
+  * '-y' now does nothing, instead of forcing a check on each boot  
+
+ -- Ed Boraas <ed@debian.org>  Tue, 13 Mar 2001 15:06:41 -0700
+
+reiserfsprogs (3.x.0d-2) unstable; urgency=low
+
+  * Basic support for -y option in reiserfsck, based on patch submitted
+    by Eduard Bloch <blade@debian.org> (Closes: #87215)
+
+ -- Ed Boraas <ed@debian.org>  Tue, 6 Mar 2001 06:15:23 -0700
+
+reiserfsprogs (3.x.0d-1) unstable; urgency=low
+
+  * New upstream release
+  * Last of Alpha problems (should be) fixed (Closes: #83941)
+  * Upstream now includes manpages (Closes: #74650)
+
+ -- Ed Boraas <ed@debian.org>  Sun, 25 Feb 2001 11:52:47 -0700
+
+reiserfsprogs (3.x.0a-2) unstable; urgency=low
+
+  * lib/misc.c now #includes io.h; I assume this (Closes: #76008)
+  * lib/misc.c again #includes sys/mount.h (Not yet folded upstream)
+  * Updated README.Debian and package info to reflect the fact that Linux
+    2.4.1 and up have built-in reiserfs support.
+
+ -- Ed Boraas <ed@debian.org>  Fri, 09 Feb 2001 18:35:14 -0700
+
+reiserfsprogs (3.x.0a-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated to policy version 3.2.1
+
+ -- Ed Boraas <ed@debian.org>  Sun, 21 Jan 2001 20:18:34 -0700
+
+reiserfsprogs (3.0.20001019-3) unstable; urgency=low
+
+  * Paper-bag bugfix: shebang missing from postinst
+  * Added prerm script to clean up after postinst
+  * postinst will no longer bail if the hardlinks already exist
+
+ -- Ed Boraas <ed@debian.org>  Mon, 30 Oct 2000 19:56:23 -0700
+
+reiserfsprogs (3.0.20001019-2) unstable; urgency=low
+
+  * Added LDFLAGS = -lm  in fsck/ for x-platform compliance (Closes: #74943)
+  * Now installs to /sbin instead of /usr/sbin
+  * lib/misc.c '#include's <sys/mount.h> (Closes: #74833)
+  * Created mkfs.reiserfs and fsck.reiserfs hardlinks (Closes: #59833)
+
+ -- Ed Boraas <ed@debian.org>  Sat, 28 Oct 2000 15:24:54 -0600
+
+reiserfsprogs (3.0.20001019-1) unstable; urgency=low
+
+  * New upstream snapshot
+
+ -- Ed Boraas <ed@debian.org>  Thu, 19 Oct 2000 17:16:26 -0600
+
+reiserfsprogs (3.0.20001007-1) unstable; urgency=low
+
+  * New upstream release 
+  * Version number updated to reflect snapshot date, as upstream
+    is not versioning new releases
+
+ -- Ed Boraas <ed@debian.org>  Sat, 8 Oct 2000 00:17:37 -0600
+
+reiserfsprogs (3.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Ed Boraas <ed@debian.org>  Sat, 30 Sep 2000 18:41:46 -0600
--- reiserfsprogs-3.6.21.orig/debian/mkreiserfs-udeb.dirs
+++ reiserfsprogs-3.6.21/debian/mkreiserfs-udeb.dirs
@@ -0,0 +1 @@
+sbin
--- reiserfsprogs-3.6.21.orig/debian/fsck.reiserfs
+++ reiserfsprogs-3.6.21/debian/fsck.reiserfs
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+# Treat the -y flag the same way other fsck.* instances do
+ADD_OPTS=""
+for opt
+do
+	case "$opt" in
+		--)
+			break
+			;;
+		-y)
+			ADD_OPTS="-a"
+			;;
+	esac
+done
+
+# Be sure to invoke reiserfsck quitely for booting over slow consoles
+exec /sbin/reiserfsck -q $ADD_OPTS "$@"
--- reiserfsprogs-3.6.21.orig/debian/patches/00_escape_dashes_in_manpages.diff
+++ reiserfsprogs-3.6.21/debian/patches/00_escape_dashes_in_manpages.diff
@@ -0,0 +1,198 @@
+diff -ur reiserfsprogs-3.6.21.orig/debugreiserfs/debugreiserfs.8 reiserfsprogs-3.6.21/debugreiserfs/debugreiserfs.8
+--- reiserfsprogs-3.6.21.orig/debugreiserfs/debugreiserfs.8	2009-01-10 13:18:34.000000000 +0100
++++ reiserfsprogs-3.6.21/debugreiserfs/debugreiserfs.8	2009-03-06 18:13:37.000000000 +0100
+@@ -31,7 +31,7 @@
+ .SH OPTIONS
+ .TP
+ \fB-j\fR \fIdevice\fR
+-prints the contents of the journal. The option -p allows it to pack the journal 
++prints the contents of the journal. The option \-p allows it to pack the journal 
+ with other metadata into the archive.
+ .TP
+ \fB-J\fR
+@@ -61,22 +61,22 @@
+ .\" formatted nodes found. Can be used to find specific key in the filesystem.
+ .\" .TP
+ .B -p
+-extracts the filesystem's metadata with \fBdebugreiserfs\fR -p /dev/xxx | gzip -c > 
++extracts the filesystem's metadata with \fBdebugreiserfs\fR \-p /dev/xxx | gzip \-c > 
+ xxx.gz. None of your data are packed unless a filesystem corruption presents when 
+ the whole block having this corruption is packed. You send us the output, and we use 
+-it to create a filesystem with the same strucure as yours using \fBdebugreiserfs -u\fR.
++it to create a filesystem with the same strucure as yours using \fBdebugreiserfs \-u\fR.
+ When the data file is not too large, this usually allows us to quickly reproduce 
+ and debug the problem.
+ .TP
+ .B -u
+-builds the ReiserFS filesystem image with gunzip -c xxx.gz | \fBdebugreiserfs\fR 
+--u /dev/image of the previously packed metadata with \fBdebugreiserfs -p\fR. The
++builds the ReiserFS filesystem image with gunzip \-c xxx.gz | \fBdebugreiserfs\fR 
++\-u /dev/image of the previously packed metadata with \fBdebugreiserfs \-p\fR. The
+ result image is not the same as the original filesystem, because mostly only metadata
+-were packed with \fBdebugreiserfs -p\fR, but the filesystem structure is completely 
++were packed with \fBdebugreiserfs \-p\fR, but the filesystem structure is completely 
+ recreated.
+ .TP
+ .B -S 
+-When -S is not specified -p 
++When \-S is not specified \-p 
+ .\" and -s 
+ deals with blocks marked used in the filesystem bitmap only. With this option 
+ set \fBdebugreiserfs\fR will work with the entire device.
+@@ -84,7 +84,7 @@
+ .B -q
+ When 
+ .\" -s or 
+--p is in use, suppress showing the speed of progress.
++\-p is in use, suppress showing the speed of progress.
+ .SH AUTHOR
+ This version of \fBdebugreiserfs\fR has been written by Vitaly Fertman 
+ <vitaly@namesys.com>.
+diff -ur reiserfsprogs-3.6.21.orig/fsck/reiserfsck.8 reiserfsprogs-3.6.21/fsck/reiserfsck.8
+--- reiserfsprogs-3.6.21.orig/fsck/reiserfsck.8	2009-01-10 13:18:34.000000000 +0100
++++ reiserfsprogs-3.6.21/fsck/reiserfsck.8	2009-03-06 18:23:33.000000000 +0100
+@@ -59,10 +59,10 @@
+ .B --rebuild-tree
+ This option rebuilds the entire filesystem tree using leaf nodes 
+ found on the device.  Normally you only need this option if the 
+-\fBreiserfsck --check\fR reports "Running with \fB--rebuild-tree\fR
++\fBreiserfsck \-\-check\fR reports "Running with \fB\-\-rebuild-tree\fR
+ is required". You are strongly encouraged to make a backup copy 
+ of the whole partition before attempting the \fB--rebuild-tree\fR 
+-option. Once \fBreiserfsck --rebuild-tree\fR is started it must
++option. Once \fBreiserfsck \-\-rebuild-tree\fR is started it must
+ finish its work (and you should not interrupt it), otherwise the
+ filesystem will be left in the unmountable state to avoid subsequent
+ data corruptions.
+@@ -95,7 +95,7 @@
+ This option sets the badblock list to be the list of blocks specified in 
+ the given `file`. The filesystem badblock list is cleared before the new 
+ list is added. It can be used with \fB--fix-fixable\fR to fix the list of 
+-badblocks (see \fBdebugreiserfs -B\fR). If the device has bad blocks, every
++badblocks (see \fBdebugreiserfs \-B\fR). If the device has bad blocks, every
+ time it must be given with the \fB--rebuild-tree\fR option.
+ .TP
+ \fB--logfile \fIfile\fR, \fB-l \fI file\fR
+@@ -114,7 +114,7 @@
+ it does not work with the \fB--rebuild-tree\fR option.
+ .TP
+ \fB-a\fR, \fB-p\fR
+-These options are usually passed by fsck -A during the automatic checking 
++These options are usually passed by fsck \-A during the automatic checking 
+ of those partitions listed in /etc/fstab. These options cause \fBreiserfsck\fR 
+ to print some information about the specified filesystem, to check if error 
+ flags in the superblock are set and to do some light-weight checks. If these 
+@@ -149,23 +149,23 @@
+ 1. You think something may be wrong with a reiserfs partition on /dev/hda1 
+ or you would just like to perform a periodic disk check.
+ 
+-2. Run \fBreiserfsck --check --logfile check.log /dev/hda1\fR. If \fBreiserfsck 
+---check\fR exits with status 0 it means no errors were discovered. 
++2. Run \fBreiserfsck \-\-check \-\-logfile check.log /dev/hda1\fR. If \fBreiserfsck 
++\-\-check\fR exits with status 0 it means no errors were discovered. 
+ 
+-3. If \fBreiserfsck --check\fR exits with status 1 (and reports about fixable 
+-corruptions) it means that you should run \fBreiserfsck --fix-fixable --logfile 
++3. If \fBreiserfsck \-\-check\fR exits with status 1 (and reports about fixable 
++corruptions) it means that you should run \fBreiserfsck \-\-fix-fixable \-\-logfile 
+ fixable.log /dev/hda1\fR.
+ 
+-4. If \fBreiserfsck --check\fR exits with status 2 (and reports about fatal 
+-corruptions) it means that you need to run \fBreiserfsck --rebuild-tree\fR.  
+-If \fBreiserfsck --check\fR fails in some way you should also run \fBreiserfsck 
+---rebuild-tree\fR, but we also encourage you to submit this as a bug report.
++4. If \fBreiserfsck \-\-check\fR exits with status 2 (and reports about fatal 
++corruptions) it means that you need to run \fBreiserfsck \-\-rebuild\-tree\fR.  
++If \fBreiserfsck \-\-check\fR fails in some way you should also run \fBreiserfsck 
++\-\-rebuild-tree\fR, but we also encourage you to submit this as a bug report.
+ 
+-5. Before running \fBreiserfsck --rebuild-tree\fR, please make a backup of 
+-the whole partition before proceeding. Then run \fBreiserfsck --rebuild-tree 
+---logfile rebuild.log /dev/hda1\fR.
++5. Before running \fBreiserfsck \-\-rebuild-tree\fR, please make a backup of 
++the whole partition before proceeding. Then run \fBreiserfsck \-\-rebuild-tree 
++\-\-logfile rebuild.log /dev/hda1\fR.
+ 
+-6. If the \fBreiserfsck --rebuild-tree\fR step fails or does not recover what 
++6. If the \fBreiserfsck \-\-rebuild-tree\fR step fails or does not recover what 
+ you expected, please submit this as a bug report. Try to provide as much 
+ information as possible including your platform and Linux kernel version. We 
+ will try to help solve the problem.
+@@ -180,11 +180,11 @@
+ .br
+ \   \fI4\fR \-\ File system fatal errors left uncorrected,
+ .br
+-\	  \fBreiserfsck --rebuild-tree\fR needs to be launched.
++\	  \fBreiserfsck \-\-rebuild-tree\fR needs to be launched.
+ .br
+ \   \fI6\fR \-\ File system fixable errors left uncorrected,
+ .br
+-\	  \fBreiserfsck --fix-fixable\fR needs to be launched.
++\	  \fBreiserfsck \-\-fix-fixable\fR needs to be launched.
+ .br
+ \   \fI8\fR \-\ Operational error.
+ .br
+Nur in reiserfsprogs-3.6.21/include: credits.h.
+diff -ur reiserfsprogs-3.6.21.orig/mkreiserfs/mkreiserfs.8 reiserfsprogs-3.6.21/mkreiserfs/mkreiserfs.8
+--- reiserfsprogs-3.6.21.orig/mkreiserfs/mkreiserfs.8	2009-01-10 15:07:37.000000000 +0100
++++ reiserfsprogs-3.6.21/mkreiserfs/mkreiserfs.8	2009-03-06 18:14:29.000000000 +0100
+@@ -88,7 +88,7 @@
+ \fB-B\fR | \fB--badblocks \fIfile
+ \fIFile\fR is the file name of the file that contains the list of blocks to be 
+ marked as bad on the filesystem. This list can be created by
+-\fB/sbin/badblocks -b block-size device\fR.
++\fB/sbin/badblocks \-b block-size device\fR.
+ .TP
+ \fB-f\fR
+ Forces \fBmkreiserfs\fR to continue even when the device is the whole disk, 
+diff -ur reiserfsprogs-3.6.21.orig/resize_reiserfs/resize_reiserfs.8 reiserfsprogs-3.6.21/resize_reiserfs/resize_reiserfs.8
+--- reiserfsprogs-3.6.21.orig/resize_reiserfs/resize_reiserfs.8	2009-01-10 13:18:34.000000000 +0100
++++ reiserfsprogs-3.6.21/resize_reiserfs/resize_reiserfs.8	2009-03-06 18:19:00.000000000 +0100
+@@ -102,7 +102,7 @@
+ .br
+ \	umount /mnt
+ .br
+-\	resize_reiserfs -s -1G /dev/hda8
++\	resize_reiserfs \-s \-1G /dev/hda8
+ .br
+ \	mount /dev/hda8 /mnt
+ .br
+diff -ur reiserfsprogs-3.6.21.orig/tune/reiserfstune.8 reiserfsprogs-3.6.21/tune/reiserfstune.8
+--- reiserfsprogs-3.6.21.orig/tune/reiserfstune.8	2009-01-10 13:18:34.000000000 +0100
++++ reiserfsprogs-3.6.21/tune/reiserfstune.8	2009-03-06 18:21:02.000000000 +0100
+@@ -197,14 +197,14 @@
+ .nf
+ .IP
+ boot kernel patched with special "relocatable journal support" patch
+-reiserfstune /dev/hda1 --journal-new-device /dev/journal -f
++reiserfstune /dev/hda1 \-\-journal\-new\-device /dev/journal \-f
+ mount /dev/hda1 and use.
+ You would like to change max transaction size to 512 blocks
+-reiserfstune -t 512 /dev/hda1
++reiserfstune \-t 512 /dev/hda1
+ You would like to use your file system on another kernel that doesn't 
+ contain relocatable journal support.
+ umount /dev/hda1
+-reiserfstune /dev/hda1 -j /dev/journal --journal-new-device /dev/hda1 --make-journal-standard
++reiserfstune /dev/hda1 \-j /dev/journal \-\-journal\-new\-device /dev/hda1 \-\-make\-journal\-standard
+ mount /dev/hda1 and use.
+ .LP
+ 2. You would like to have ReiserFS on /dev/hda1 and to be able to
+@@ -215,13 +215,13 @@
+ boot kernel patched with special "relocatable journal support" patch
+ mkreiserfs /dev/hda1
+ you got solid state disk (perhaps /dev/sda, they typically look like scsi disks)
+-reiserfstune --journal-new-device /dev/sda1 -f /dev/hda1
++reiserfstune \-\-journal\-new\-device /dev/sda1 \-f /dev/hda1
+ Your scsi device dies, it is three in the morning, you have an extra IDE device
+ lying around
+-reiserfsck --no-journal-available /dev/hda1
++reiserfsck \-\-no\-journal\-available /dev/hda1
+ or
+-reiserfsck --rebuild-tree --no-journal-available /dev/hda1
+-reiserfstune --no-journal-available --journal-new-device /dev/hda1 /dev/hda1
++reiserfsck \-\-rebuild-tree \-\-no\-journal\-available /dev/hda1
++reiserfstune \-\-no\-journal\-available \-\-journal\-new\-device /dev/hda1 /dev/hda1
+ using /dev/hda1 under patched kernel
+ .SH AUTHOR
+ This version of \fBreiserfstune\fR has been written by Vladimir
--- reiserfsprogs-3.6.21.orig/debian/html/reiserfstune.html
+++ reiserfsprogs-3.6.21/debian/html/reiserfstune.html
@@ -0,0 +1,369 @@
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta name="Content-Style" content="text/css">
+<title>REISERFSTUNE</title>
+</head>
+<body>
+
+<h1 align=center>REISERFSTUNE</h1>
+<a href="#NAME">NAME</a><br>
+<a href="#SYNOPSIS">SYNOPSIS</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#POSSIBLE SCENARIOS OF USING REISERFSTUNE:">POSSIBLE SCENARIOS OF USING REISERFSTUNE:</a><br>
+<a href="#AUTHOR">AUTHOR</a><br>
+<a href="#BUGS">BUGS</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+<!-- Creator     : groff version 1.17.2 -->
+<!-- CreationDate: Thu May 13 21:46:09 2004 -->
+<a name="NAME"></a>
+<h2>NAME</h2>
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+reiserfstune - The tuning tool for the ReiserFS filesystem.</td></table>
+<a name="SYNOPSIS"></a>
+<h2>SYNOPSIS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>reiserfstune</b> [ <b>-f</b> ] [ <b>-j</b> |
+<b>--journal-device</b> <i>FILE</i> ] [
+<b>--no-journal-available</b> ] [
+<b>--journal-new-device</b> <i>FILE</i> ] [
+<b>--make-journal-standard</b> ] [ <b>-s</b> |
+<b>--journal-new-size</b> <i>N</i> ] [ <b>-o</b> |
+<b>--journal-new-offset</b> <i>N</i> ] [ <b>-t</b> |
+<b>--trans-max-size</b> <i>N</i> ] [ <b>-b</b> |
+<b>--add-badblocks</b> <i>file</i> ] [ <b>-B</b> |
+<b>--badblocks</b> <i>file</i> ] [ <b>-u</b> | <b>--uuid</b>
+<i>UUID</i> ] [ <b>-l</b> | <b>--label</b> <i>LABEL</i> ]
+<i>device</i></td></table>
+<a name="DESCRIPTION"></a>
+<h2>DESCRIPTION</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>reiserfstune</b> is used for tuning the ReiserFS. It can
+change two journal parameters (the journal size and the
+maximum transaction size), and it can move the journal's
+location to a new specified block device. (The old
+ReiserFS's journal may be kept unused, or discarded at the
+user's option.) Besides that <b>reiserfstune</b> can store
+the bad block list to the ReiserFS and set UUID and LABEL.
+Note: At the time of writing the relocated journal was
+implemented for a special release of ReiserFS, and was not
+expected to be put into the mainstream kernel until
+approximately Linux 2.5. This means that if you have the
+stock kernel you must apply a special patch. Without this
+patch the kernel will refuse to mount the newly modified
+file system. We will charge $25 to explain this to you if
+you ask us why it doesn't work.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+Perhaps the most interesting application of this code is to
+put the journal on a solid state disk.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<i>device</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+is the special file corresponding to the newly specified
+block device (e.g /dev/hdXX for IDE disk partition or
+/dev/sdXX for the SCSI disk partition).</td></table>
+<a name="OPTIONS"></a>
+<h2>OPTIONS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-j</b> | <b>--journal-device</b> <i>FILE</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>FILE</i> is the file name of the block device the file
+system has the current journal (the one prior to running
+reiserfstune) on. This option is required when the journal
+is already on a separate device from the main data device
+(although it can be avoided with
+<b>--no-journal-available</b>). If you don't specify journal
+device by this option, reiserfstune suppose that journal is
+on main device.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--no-journal-available</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+allows <b>reiserfstune</b> to continue when the current
+journal's block device is no longer available. This might
+happen if a disk goes bad and you remove it (and run
+fsck).</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--journal-new-device</b> <i>FILE</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>FILE</i> is the file name of the block device which will
+contain the new journal for the file system. If you don't
+specify this, reiserfstune supposes that journal device
+remains the same.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-s</b> | <b>--journal-new-size</b> <i>N</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>N</i> is the size parameter for the new journal. When
+journal is to be on a separate device - its size defaults to
+number of blocks that device has. When journal is to be on
+the same device as the filesytem - its size defaults to
+amount of blocks allocated for journal by <i>mkreiserfs</i>
+when it created the filesystem. Minimum is 513 for both
+cases.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-o</b> | <b>--journal-new-offset</b>
+<i>N</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>N</i> is an offset in blocks where journal will starts
+from when journal is to be on a separate device. Default is
+0. Has no effect when journal is to be on the same device as
+the filesystem. Most users have no need to use this feature.
+It can be used when you want the journals from multiple
+filesystems to reside on the same device, and you don't want
+to or cannot partition that device.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-t</b> | <b>--trans-max-size</b>
+<i>N</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>N</i> is the maximum transaction size parameter for the
+new journal. The default, and max possible, value is 1024
+blocks. It should be less than half the size of the journal.
+If specifed incorrectly, it will be adjusted.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-b</b> | <b>--add-badblocks</b> <i>file</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>File</i> is the file name of the file that contains the
+list of blocks to be marked as bad on the fs. The list is
+added to the fs list of bad blocks.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-B</b> | <b>--badblocks</b> <i>file</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>File</i> is the file name of the file that contains the
+list of blocks to be marked as bad on the fs. The bad block
+list on the fs is cleared before the list specified in the
+<i>File</i> is added to the fs.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-f</b> | <b>--force</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Normally <b>reiserfstune</b> will refuse to change a journal
+of a file system that was created before this journal
+relocation code. This is because if you change the journal,
+you cannot go back (without special option
+<b>--make-journal-standard</b>) to an old kernel that lacks
+this feature and be able to use your filesytem. This option
+forces it to do that. Specified more than once it allows to
+avoid asking for confirmation.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--make-journal-standard</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+As it was mentioned above, if your file system has
+non-standard journal, it can not be mounted on the kernel
+without journal relocation code. The thing can be changed,
+the only condition is that there is reserved area on main
+device of the standard journal size 8193 blocks (it will be
+so for instance if you convert standard journal to
+non-standard). Just specify this option when you relocate
+journal back, or without relocation if you already have it
+on main device.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-u</b> | <b>--uuid</b> <i>UUID</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Set the universally unique identifier ( <b>UUID</b> ) of the
+filesystem to <i>UUID</i> (see also <b>uuidgen(8)</b>). The
+format of the UUID is a series of hex digits separated by
+hypthens, like this:
+&quot;c1b9d5a2-f162-11cf-9ece-0020afc76f16&quot;.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-l</b> | <b>--label</b> <i>LABEL</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Set the volume label of the filesystem. <i>LABEL</i> can be
+at most 16 characters long; if it is longer than 16
+characters, reiserfstune will truncate it.</td></table>
+<a name="POSSIBLE SCENARIOS OF USING REISERFSTUNE:"></a>
+<h2>POSSIBLE SCENARIOS OF USING REISERFSTUNE:</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+1. You have ReiserFS on /dev/hda1, and you wish to have it
+working with its journal on the device
+/dev/journal</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<pre>
+       boot kernel patched with special &quot;relocatable journal support&quot; patch
+       reiserfstune /dev/hda1 --journal-new-device /dev/journal -f
+       mount /dev/hda1 and use.
+       You would like to change max transaction size to 512 blocks
+       reiserfstune -t 512 /dev/hda1
+       You would like to use your file system on another kernel that doesn't
+       contain relocatable journal support.
+       umount /dev/hda1
+       reiserfstune /dev/hda1 -j /dev/journal --journal-new-device /dev/hda1 --make-journal-standard
+       mount /dev/hda1 and use.
+
+2. You would like to have ReiserFS on /dev/hda1 and to be able to
+switch between different journals including journal located on the
+device containing the filesystem.
+
+       boot kernel patched with special &quot;relocatable journal support&quot; patch
+       mkreiserfs /dev/hda1
+       you got solid state disk (perhaps /dev/sda, they typically look like scsi disks)
+       reiserfstune --journal-new-device /dev/sda1 -f /dev/hda1
+       Your scsi device dies, it is three in the morning, you have an extra IDE device
+       lying around
+       reiserfsck --no-journal-available /dev/hda1
+       or
+       reiserfsck --rebuild-tree --no-journal-available /dev/hda1
+       reiserfstune --no-journal-available --journal-new-device /dev/hda1 /dev/hda1
+       using /dev/hda1 under patched kernel
+</pre></td></table>
+<a name="AUTHOR"></a>
+<h2>AUTHOR</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+This version of <b>reiserfstune</b> has been written by
+Vladimir Demidov &lt;vova@namesys.com&gt; and Edward
+Shishkin &lt;edward@namesys.com&gt;.</td></table>
+<a name="BUGS"></a>
+<h2>BUGS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+Please report bugs to the ReiserFS developers
+&lt;reiserfs-dev@namesys.com&gt;, providing as much
+information as possible--your hardware, kernel, patches,
+settings, all printed messages; check the syslog file for
+any related information.</td></table>
+<a name="SEE ALSO"></a>
+<h2>SEE ALSO</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>reiserfsck</b>(8), <b>debugreiserfs</b>(8),
+<b>mkreiserfs</b>(8)</td></table>
+<hr>
+</body>
+</html>
--- reiserfsprogs-3.6.21.orig/debian/html/resize_reiserfs.html
+++ reiserfsprogs-3.6.21/debian/html/resize_reiserfs.html
@@ -0,0 +1,224 @@
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta name="Content-Style" content="text/css">
+<title>RESIZE_REISERFS</title>
+</head>
+<body>
+
+<h1 align=center>RESIZE_REISERFS</h1>
+<a href="#NAME">NAME</a><br>
+<a href="#SYNOPSIS">SYNOPSIS</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#RETURN VALUES">RETURN VALUES</a><br>
+<a href="#EXAMPLES">EXAMPLES</a><br>
+<a href="#AUTHOR">AUTHOR</a><br>
+<a href="#BUGS">BUGS</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+<!-- Creator     : groff version 1.17.2 -->
+<!-- CreationDate: Thu May 13 21:46:09 2004 -->
+<a name="NAME"></a>
+<h2>NAME</h2>
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+resize_reiserfs - resizer tool for the ReiserFS filesystem</td></table>
+<a name="SYNOPSIS"></a>
+<h2>SYNOPSIS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>resize_reiserfs</b> [ <b>-s</b>
+[<b>+</b>|<b>-</b>]<i>size</i><b>[K</b>|<b>M</b>|<b>G</b>] ]
+[ <b>-j</b> <i>dev</i> ] [ <b>-fqv</b> ]
+<i>device</i></td></table>
+<a name="DESCRIPTION"></a>
+<h2>DESCRIPTION</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+The <b>resize_reiserfs</b> tool resizes an unmounted
+reiserfs file system. It enlarges or shrinks a reiserfs
+file system located on a <i>device</i> so that it will have
+<i>size</i> bytes or size=old_size +(-) <i>size</i> bytes if
+the + or - prefix is used. If the <b>-s</b> option is not
+specified, the filesystem will be resized to fill the given
+device. The <i>size</i> parameter may have one of the
+optional modifiers <b>K</b>, <b>M</b>, <b>G</b>, which means
+the <i>size</i> parameter is given in kilo-, mega-,
+gigabytes respectively.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+The <b>resize_reiserfs</b> program does not manipulate the
+size of the device. If you wish to enlarge a filesystem, you
+must make sure you expand the underlying device first. This
+can be done using <b>cfdisk</b>(8) for partitions, by
+deleting the partition and recreating it with a larger size
+(assuming there is free space <i>after</i> the partition in
+question). Make sure you re-create it with the same starting
+disk cylinder as before! Otherwise, the resize operation
+will certainly not work, and you may lose your entire
+filesystem.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+The <b>resize_reiserfs</b> program allows to grow a reiserfs
+on-line if there is a free space on block
+<i>device.</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+If you wish to shrink a reiserfs partition, first use
+<b>resize_reiserfs</b> to shrink the file system. You may
+then use <b>cfdisk</b>(8) to shrink the device. When
+shrinking the size of the device, make sure you do not make
+it smaller than the reduced size of the reiserfs
+filesystem.</td></table>
+<a name="OPTIONS"></a>
+<h2>OPTIONS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-s [+|-]</b><i>size</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Set the new size in bytes.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-j</b> <i>dev</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Set the journal device name.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-f</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Force, do not perform checks.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-q</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Do not print anything but error messages.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-v</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Turn on extra progress status messages
+(default).</td></table>
+<a name="RETURN VALUES"></a>
+<h2>RETURN VALUES</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+0 Resizing successful.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+-1 Resizing not successful.</td></table>
+<a name="EXAMPLES"></a>
+<h2>EXAMPLES</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+The following example shows how to test
+<b>resize_reiserfs</b>. Suppose 2Gb reiserfs filesystem is
+created on the device /dev/hda8 and is mounted on /mnt. For
+shrinking the device we need to unmount it first, then run
+<b>resize_reiserfs</b> with a <i>size</i> parameter (in this
+case -1Gb):</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+df<br>
+umount /mnt<br>
+resize_reiserfs -s -1G /dev/hda8<br>
+mount /dev/hda8 /mnt<br>
+df /mnt</td></table>
+<a name="AUTHOR"></a>
+<h2>AUTHOR</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+This version of <b>resize_reiserfs</b> has been written by
+Alexander Zarochentcev &lt;zam@namesys.com&gt;.</td></table>
+<a name="BUGS"></a>
+<h2>BUGS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+Please report bugs to the ReiserFS developers
+&lt;reiserfs-dev@namesys.com&gt;, providing as much
+information as possible--your hardware, kernel, patches,
+settings, all printed messages; check the syslog file for
+any related information.</td></table>
+<a name="SEE ALSO"></a>
+<h2>SEE ALSO</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>cfdisk</b>(8), <b>reiserfsck</b>(8),
+<b>debugreiserfs</b>(8)</td></table>
+<hr>
+</body>
+</html>
--- reiserfsprogs-3.6.21.orig/debian/html/mount-options.html
+++ reiserfsprogs-3.6.21/debian/html/mount-options.html
@@ -0,0 +1,570 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta name="Author" content="Danilov Nikita">
+<meta name="GENERATOR" content="Hand crafted in XEMACS">
+<meta name="Description" content="ReiserFS mount options">
+<meta name="KeyWords" content="reiserfs, ReiserFS, namesys, file-system, file system, filesystem, mount, mount options, conversion, nolog, notail, reiserfs-raw, GC, garbage collector">
+
+<link href="style_whitepaper.css" rel="stylesheet"> 
+<title>ReiserFS mount options</title>
+ </head>
+
+<body>
+<h1>ReiserFS Mount Options</h1>
+<h2>linux kernels 2.4.x</h2>
+
+<dl>
+  <!-- 2.6 -->
+  <dt><span class="code">conv</span></dt>
+  <dd>
+  <p>
+  Instructs <span class="ver">3.6</span> ReiserFS code to mount 
+  <span class="ver">3.5</span> filesystem, using 
+  <span class="ver">3.6</span> format for newly created objects.
+  After this you cannot use it through <span class="ver">3.5</span>
+  ReiserFS tools anymore. This option causes conversion of old
+  format super block to the new format. If not specified - old
+  partition will be dealt with in a manner of 3.5.
+  </p>
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o conv /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+<!--
+  <dt><span class="code">dontpanic</span></dt>
+  <dd>
+  <p>
+  Ignore IO errors during journal committing. Without this option ReiserFS
+  will panic on IO errors.<br>
+
+  <em>Only available when reiserfs-raw is used.</em> Not in the stock kernels.
+  </p>
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o dontpanic /dev/sdb1 /cache/squid-cache-1
+	</pre>
+  </dd>
+-->
+  <!-- 2.6 -->
+  <dt><span class="code">nolog</span></dt>
+  <dd>
+  <p>
+  Disable journalling. This will get you slight performance improvement in
+  some situations at the cost of losing fast recovery from crashes.
+  Actually even with this option turned on, ReiserFS still performs all
+  journalling paraphernalia, save for actual writes into journalling area.
+  Implementation of real <span class="code">nolog</span> is work in progress. </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o nolog /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">notail</span></dt>
+  <dd>
+  <p>
+  By default, ReiserFS stores small files and `file tails' directly
+  into the tree. This confuses some utilities like 
+  <span class="fileName">LILO</span>. This option is used to disable
+  packing of files into the tree.</p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o notail /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+<!--
+  <dt><span class="code">pgc=LOW,HIGH</span></dt>
+  <dd>
+  <p>
+  Activate Passive Garbage Collector.<br>
+  <em>Only available when reiserfs-raw is used.</em> Not in the stock kernels.</p>
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o pgc=50,75 /dev/sdb1 /cache/squid-cache-1
+	</pre>
+  </dd>
+  </dd>
+
+  <dt><span class="code">raw</span></dt>
+  <dd>
+  <p>
+  Mount filesystem in `<em>raw</em>' access mode. <br>
+  <em>Only available when reiserfs-raw is used.</em> Not in the stock kernels.</p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o raw /dev/sdb1 /cache/squid-cache-1
+	</pre>
+  </dd>
+
+-->
+
+ <!-- 2.6 not checked --> 
+ <dt><span class="code">replayonly</span></dt>
+  <dd>
+  <p>
+  Replay transactions in journal, but don't actually mount filesystem. 
+  Used by fsck, mostly.</p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o replayonly /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">jdev=journal_device</span></dt>
+  <dd>
+  <p>
+  </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o jdev=/dev/sdb2 /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">attrs</span></dt>
+  <dd>
+  <p>
+  </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o attrs /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">noattrs</span></dt>
+  <dd>
+  <p>
+  </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o noattrs /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6. not cheked -->
+  <dt><span class="code">resize=NUMBER</span></dt>
+  <dd>
+  <p>
+  Remount option allowing to expand ReiserFS partition on-line.
+  Make ReiserFS think that device has NUMBER blocks. 
+  Useful with LVM devices.
+  There is a special resizer utility
+  which can be obtained from 
+  <a
+  href="ftp://ftp.namesys.com/pub/reiserfsprogs">ftp://ftp.namesys.com/pub/reiserfsprogs</a></p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o resize=680000 /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 does not work  -->
+  <dt><span class="code">hash=rupasov / tea / r5 / detect</span></dt>
+  <dd>
+  <p>
+  Choose hash function ReiserFS will use to find files within
+  directories.
+  Long time ago ReiserFS had only one hash,
+  so hash code was not marked in filesystem superblock. Then additional hashes
+  became available so we had to put hash code into super block. Also, old hash was
+  made notdefault. At that time there were already a number of filesystems with not
+  set hash code in super block. So, mount option was created to make it possible to
+  write proper hash value into super block.
+  Relative merits of hash functions were subjected to discussions of great
+  length on the 
+  <a href="http://marc.theaimsgroup.com/?l=reiserfs&r=1&w=2">ReiserFS mailing list</a>. 
+  (Try this <a href="http://marc.theaimsgroup.com/?l=reiserfs&w=2&r=1&s=hash+tea+rupasov&q=b">query</a>.)
+  Roughly speaking:  99% of the time, this option
+  is not required.  If the normal autodection code can't determine which
+  hash to use (because both hases had the same value for a file)
+  use this option to force a specific hash.  It won't allow you to override
+  the existing hash on the FS, so if you have a tea hash disk, and mount
+  with -o hash=rupasov, the mount will fail.
+
+  </p>
+  <p>
+  <dl>
+  <dt><span class="code">rupasov</span></dt>
+  <dd>
+  <p>
+   This hash is invented by 
+  <a href="mailto:yura@yura.polnet.botik.ru">Yury Yu. Rupasov &lt;yura@yura.polnet.botik.ru&gt;</a>. It is fast and preserves locality, mapping lexicographically 
+  close file names to the close hash values. Never use it, as it has high probability of hash collisions.
+  </p>
+  </dd>
+
+  
+  <dt><span class="code">tea</span></dt>
+  <dd>
+  <p>
+  This hash is a Davis-Meyer function
+  implemented by <a href="mailto:jeremy@zip.com.au">Jeremy Fitzhardinge &lt;jeremy@zip.com.au&gt;</a>. 
+  It is hash permuting bits in the name thoroughly. It gets high randomness
+  and, therefore, low probability of hash collision, but this costs 
+  performance. Use this if you got <span class="code">EHASHCOLLISION</span> with 
+  <span class="code">r5</span> hash.
+  </p>
+  </dd>
+  
+  <dt><span class="code">r5</span></dt>
+  <dd>
+  <p>
+   This hash is a modified version of 
+  <span class="code">rupasov</span> hash. It is used by default and it is 
+  better to stick here until you have to support huge directories and unusual
+  file-name patterns.
+  </p>
+  </dd>
+  
+  <dt><span class="code">detect</span></dt>
+  <dd>
+  <p>
+  This is the instructs mount to detect hash function
+  in use by instance of filesystem being mounted and write this information
+  into superblock. This is only useful on the first mount of old filesystem.
+  </p>
+  </dd>
+  </dl>
+  
+  <p>Example:</p>
+        <pre>
+	mount -t reiserfs -o hash=r5 /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+  
+  <!-- 2.6 -->
+  <dt><span class="code">block-allocator=hashed_relocation /
+  no_unhashed_relocation / noborder / border </span></dt>
+  <dd>
+  <p>
+  Tunes block allocator.
+  This option is used for testing experimental features, makes benchmarking new
+   features with and without more convenient, should never be used by
+   users in any code shipped to users (ideally). 
+  </p>
+
+  <p>
+
+  <dl>
+  <!-- 2.6 -->
+  <dt><span class="code">hashed_relocation</span></dt>
+  <dd>
+  <p>
+  Tunes block allocator.
+  This may give you performance improvements in some situations. 
+  </p>
+  </dd>
+
+
+  <!-- 2.6 -->
+  <dt><span class="code">no_unhashed_relocation</span></dt>
+  <dd>
+  <p>
+  Tunes block allocator.
+  This may give you performance improvements in some situations. 
+  </p>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">noborder</span></dt>
+  <dd>
+  <p>
+  Disable `<em>border allocator algorithm</em>' invented by 
+  <a href="mailto:yura@yura.polnet.botik.ru">Yury Yu. Rupasov &lt;yura@yura.polnet.botik.ru&gt;</a>. 
+  This may give you performance improvements in some situations. 
+  <!--		  (This option was also known as <span class="code">test1</span>.) -->
+  </p>
+  </dd>
+
+
+  <!-- 2.6 -->
+  <dt><span class="code">block-allocator=border</span></dt>
+  <dd>
+  <p>
+  Enable `<em>border allocator algorithm</em>' invented by 
+  <a href="mailto:yura@yura.polnet.botik.ru">Yury Yu. Rupasov
+  &lt;yura@yura.polnet.botik.ru&gt;</a>.
+  This may give you performance improvements in some situations. 
+  </dd>
+  </dl>
+  </p>
+
+  <p>Example:</p>
+        <pre>
+	mount -t reiserfs -o block-allocator=border /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+
+
+<!--
+  <dt><span class="code">test4</span></dt>
+  <dd>
+  <p>
+    This doesn't seem to be of any use now.</p>
+  </dd>
+
+ -->
+</dl>
+
+<hr>
+
+
+<h2>linux kernels 2.6.x</h2>
+
+<dl>
+  <!-- 2.6 -->
+  <dt><span class="code">conv</span></dt>
+  <dd>
+  <p>
+  Instructs <span class="ver">3.6</span> ReiserFS code to mount 
+  <span class="ver">3.5</span> filesystem, using 
+  <span class="ver">3.6</span> format for newly created objects.
+  After this you cannot use it through <span class="ver">3.5</span>
+  ReiserFS tools anymore. This option causes conversion of old
+  format super block to the new format. If not specified - old
+  partition will be dealt with in a manner of 3.5.
+  </p>
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o conv /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+
+  <!-- 2.6 -->
+  <dt><span class="code">nolog</span></dt>
+  <dd>
+  <p>
+  Disable journalling. This will get you slight performance improvement in
+  some situations at the cost of losing fast recovery from crashes.
+  Actually even with this option turned on, ReiserFS still performs all
+  journalling paraphernalia, save for actual writes into journalling area.
+  Implementation of real <span class="code">nolog</span> is work in progress. </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o nolog /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">notail</span></dt>
+  <dd>
+  <p>
+  By default, ReiserFS stores small files and `file tails' directly
+  into the tree. This confuses some utilities like 
+  <span class="fileName">LILO</span>. This option is used to disable
+  packing of files into the tree.</p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o notail /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+ <!-- 2.6 not checked whether this works or not --> 
+ <dt><span class="code">replayonly</span></dt>
+  <dd>
+  <p>
+  Replay transactions in journal, but don't actually mount filesystem. 
+  Used by fsck, mostly.</p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o replayonly /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">jdev=journal_device</span></dt>
+  <dd>
+  <p>
+  </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o jdev=/dev/sdb2 /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">attrs</span></dt>
+  <dd>
+  <p>
+  </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o attrs /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">noattrs</span></dt>
+  <dd>
+  <p>
+  </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o noattrs /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6. did not cheked -->
+  <dt><span class="code">resize=NUMBER</span></dt>
+  <dd>
+  <p>
+  Remount option allowing to expand ReiserFS partition on-line.
+  Make ReiserFS think that device has NUMBER blocks. 
+  Useful with LVM devices.
+  There is a special resizer utility
+  which can be obtained from 
+  <a
+  href="ftp://ftp.namesys.com/pub/reiserfsprogs">ftp://ftp.namesys.com/pub/reiserfsprogs</a></p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o resize=680000 /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">data=ordered / journal / writeback </span></dt>
+  <dd>
+  <p>
+  Specifies the journalling mode for file data.  Metadata is always journaled.
+
+  <dl>
+  <dt><span class="code">journal</span></dt>
+  <dd>
+  <p>
+  All data is committed into the journal prior to being written into the main
+  file system.
+  </p>
+  </dd>
+
+
+  <dt><span class="code">ordered</span></dt>
+  <dd>
+  <p>
+  This  is  the default mode.  All data is forced directly out to the main
+  file system prior to its metadata being committed to the journal.
+  </p>
+  </dd>
+
+  <dt><span class="code">writeback</span></dt>
+  <dd>
+  <p>
+  Data ordering is not preserved - data may be written into the main
+  file system after its metadata has  been  committed  to  the journal.
+  This is rumoured to be the highest-throughput option.  It guarantees
+  internal file system integrity, however it can allow old data to appear in
+  files after a crash and journal recovery.
+  </p>
+  </dd>
+
+  </dl>
+  </p>
+
+  <p>Example:</p>
+	<pre>
+	mount -t reiserfs -o data=writeback /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">block-allocator=hashed_relocation /
+  no_unhashed_relocation / noborder / border </span></dt>
+  <dd>
+  <p>
+  Tunes block allocator.
+  This option is used for testing experimental features, makes benchmarking new
+   features with and without more convenient, should never be used by
+   users in any code shipped to users (ideally). 
+  </p>
+
+  <p>
+
+  <dl>
+  <!-- 2.6 -->
+  <dt><span class="code">hashed_relocation</span></dt>
+  <dd>
+  <p>
+  Tunes block allocator.
+  This may give you performance improvements in some situations. 
+  </p>
+  </dd>
+
+
+  <!-- 2.6 -->
+  <dt><span class="code">no_unhashed_relocation</span></dt>
+  <dd>
+  <p>
+  Tunes block allocator.
+  This may give you performance improvements in some situations. 
+  </p>
+  </dd>
+
+  <!-- 2.6 -->
+  <dt><span class="code">noborder</span></dt>
+  <dd>
+  <p>
+  Disable `<em>border allocator algorithm</em>' invented by 
+  <a href="mailto:yura@yura.polnet.botik.ru">Yury Yu. Rupasov &lt;yura@yura.polnet.botik.ru&gt;</a>. 
+  This may give you performance improvements in some situations. 
+  <!--		  (This option was also known as <span class="code">test1</span>.) -->
+  </p>
+  </dd>
+
+
+  <!-- 2.6 -->
+  <dt><span class="code">block-allocator=border</span></dt>
+  <dd>
+  <p>
+  Enable `<em>border allocator algorithm</em>' invented by 
+  <a href="mailto:yura@yura.polnet.botik.ru">Yury Yu. Rupasov
+  &lt;yura@yura.polnet.botik.ru&gt;</a>.
+  This may give you performance improvements in some situations. 
+  </dd>
+  </dl>
+  </p>
+
+  <p>Example:</p>
+        <pre>
+	mount -t reiserfs -o block-allocator=border /dev/sdb1 /mnt/scsi-disk-b
+	</pre>
+  </dd>
+
+</dl>
+
+
+
+<hr>
+<p class="fine-print">
+Maintainer: <a href="mailto:grev@namesys.com">grev@namesys.com</a>
+<!-- Created: Wed Jan 24 16:13:00 MSK 2001 -->
+<!-- hhmts start -->
+
+<!-- hhmts end -->
+</p>
+</body>
+</html>
+
--- reiserfsprogs-3.6.21.orig/debian/html/reiserfsck.html
+++ reiserfsprogs-3.6.21/debian/html/reiserfsck.html
@@ -0,0 +1,482 @@
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta name="Content-Style" content="text/css">
+<title>REISERFSCK</title>
+</head>
+<body>
+
+<h1 align=center>REISERFSCK</h1>
+<a href="#NAME">NAME</a><br>
+<a href="#SYNOPSIS">SYNOPSIS</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#EXPERT OPTIONS">EXPERT OPTIONS</a><br>
+<a href="#AN EXAMPLE OF USING reiserfsck">AN EXAMPLE OF USING reiserfsck</a><br>
+<a href="#EXIT CODES">EXIT CODES</a><br>
+<a href="#AUTHOR">AUTHOR</a><br>
+<a href="#BUGS">BUGS</a><br>
+<a href="#TODO">TODO</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+<!-- Creator     : groff version 1.17.2 -->
+<!-- CreationDate: Thu May 13 21:46:08 2004 -->
+<a name="NAME"></a>
+<h2>NAME</h2>
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+reiserfsck - The checking tool for the ReiserFS filesystem.</td></table>
+<a name="SYNOPSIS"></a>
+<h2>SYNOPSIS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>reiserfsck</b> [ <b>-afprVy</b> ] [ <b>--rebuild-sb</b> |
+<b>--check</b> | <b>--fix-fixable</b> |
+<b>--rebuild-tree</b> | <b>--clean-attributes</b> ] [
+<b>-j</b> | <b>--journal</b> <i>device</i> ] [ <b>-z</b> |
+<b>--adjust-size</b> ] [ <b>-n</b> | <b>--nolog</b> ] [
+<b>-B</b> | <b>--badblocks</b> <i>file</i> ] [ <b>-l</b> |
+<b>--logfile</b> <i>file</i> ] [ <b>-q</b> | <b>--quiet</b>
+] [ <b>-y</b> | <b>--yes</b> ] [ <b>-S</b> |
+<b>--scan-whole-partition</b> ] [
+<b>--no-journal-available</b> ] <i>device</i></td></table>
+<a name="DESCRIPTION"></a>
+<h2>DESCRIPTION</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>Reiserfsck</b> searches for a Reiserfs filesystem on a
+device, replays any necessary transactions, and either
+checks or repairs the file system.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<i>device</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+is the special file corresponding to a device or to a
+partition (e.g /dev/hdXX for an IDE disk partition or
+/dev/sdXX for a SCSI disk partition).</td></table>
+<a name="OPTIONS"></a>
+<h2>OPTIONS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--rebuild-sb</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option recovers the superblock on a Reiserfs partition.
+Normally you only need this option if mount reports
+&quot;read_super_block: can't find a reiserfs file
+system&quot; and you are sure that a Reiserfs file system is
+there. But remember that if you have used some partition
+editor program and now you cannot find a filesystem,
+probably something has gone wrong while repartitioning and
+the start of the partition has been changed. If so, instead
+of rebuilding the super block on a wrong place you should
+find the correct start of the partition first.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--check</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This default action checks filesystem consistency and
+reports, but does not repair any corruption that it finds.
+This option may be used on a read-only file system
+mount.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--fix-fixable</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option recovers certain kinds of corruption that do not
+require rebuilding the entire file system tree
+(<b>--rebuild-tree</b>). Normally you only need this option
+if the <b>--check</b> option reports &quot;corruption that
+can be fixed with <b>--fix-fixable</b>&quot;. This includes:
+zeroing invalid data-block pointers, correcting st_size and
+st_blocks for directories, and deleting invalid directory
+entries.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--rebuild-tree</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option rebuilds the entire filesystem tree using leaf
+nodes found on the device. Normally you only need this
+option if the <b>reiserfsck --check</b> reports
+&quot;Running with <b>--rebuild-tree</b> is required&quot;.
+You are strongly encouraged to make a backup copy of the
+whole partition before attempting the <b>--rebuild-tree</b>
+option. Once <b>reiserfsck --rebuild-tree</b> is started it
+must finish its work (and you should not interrupt it),
+otherwise the filesystem will be left in the unmountable
+state to avoid subsequent data corruptions.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--clean-attributes</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option cleans reserved fields of Stat-Data items. There
+were days when there were no extended attributes in
+reiserfs. When they were implemented old partitions needed
+to be cleaned first -- reiserfs code in the kernel did not
+care about not used fields in its strutures. Thus if you
+have used one of the old (pre-attrbutes) kernels with a
+ReiserFS filesystem and you want to use extented attribues
+there, you should clean the filesystem first.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--journal</b> <i>device</i> , <b>-j</b>
+<i>device</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option supplies the device name of the current file
+system journal. This option is required when the journal
+resides on a separate device from the main data device
+(although it can be avoided with the expert option
+<b>--no-journal-available</b>).</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--adjust-size, -z</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option causes <b>reiserfsck</b> to correct file sizes
+that are larger than the offset of the last discovered byte.
+This implies that holes at the end of a file will be
+removed. File sizes that are smaller than the offset of the
+last discovered byte are corrected by
+<b>--fix-fixable</b>.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--badblocks</b> <i>file</i>, <b>-B</b>
+<i>file</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option sets the badblock list to be the list of blocks
+specified in the given `file`. The filesystem badblock list
+is cleared before the new list is added. It can be used with
+<b>--fix-fixable</b> to fix the list of badblocks (see
+<b>debugreiserfs -B</b>). If the device has bad blocks,
+every time it must be given with the <b>--rebuild-tree</b>
+option.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--logfile</b> <i>file</i>, <b>-l</b>
+<i>file</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option causes <b>reiserfsck</b> to report any
+corruption it finds to the specified log file rather than to
+stderr.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--nolog, -n</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option prevents <b>reiserfsck</b> from reporting any
+kinds of corruption.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--quiet, -q</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option prevents <b>reiserfsck</b> from reporting its
+rate of progress.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--yes, -y</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option inhibits <b>reiserfsck</b> from asking you for
+confirmation after telling you what it is going to do. It
+will assuem you confirm. For safety, it does not work with
+the <b>--rebuild-tree</b> option.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-a</b>, <b>-p</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+These options are usually passed by fsck -A during the
+automatic checking of those partitions listed in /etc/fstab.
+These options cause <b>reiserfsck</b> to print some
+information about the specified filesystem, to check if
+error flags in the superblock are set and to do some
+light-weight checks. If these checks reveal a corruption or
+the flag indicating a (possibly fixable) corruption is found
+set in the superblock, then <b>reiserfsck</b> switches to
+the fix-fixable mode. If the flag indicating a fatal
+corruption is found set in the superblock, then
+<b>reiserfsck</b> finishes with an error.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-V</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option prints the reiserfsprogs version and then
+exit.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-r</b>, <b>-f</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+These options are not yet operational and therefore are
+ignored.</td></table>
+<a name="EXPERT OPTIONS"></a>
+<h2>EXPERT OPTIONS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+DO NOT USE THESE OPTIONS UNLESS YOU KNOW WHAT YOU ARE DOING.
+WE ARE NOT RESPONSIBLE IF YOU LOSE DATA AS A RESULT OF THESE
+OPTIONS.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--no-journal-available</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option allows <b>reiserfsck</b> to proceed when the
+journal device is not available. This option has no effect
+when the journal is located on the main data device. NOTE:
+after this operation you must use <b>reiserfstune</b> to
+specify a new journal device.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--scan-whole-partition, -S</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+This option causes <b>--rebuild-tree</b> to scan the whole
+partition but not only the used space on the
+partition.</td></table>
+<a name="AN EXAMPLE OF USING reiserfsck"></a>
+<h2>AN EXAMPLE OF USING reiserfsck</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+1. You think something may be wrong with a reiserfs
+partition on /dev/hda1 or you would just like to perform a
+periodic disk check.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+2. Run <b>reiserfsck --check --logfile check.log
+/dev/hda1</b>. If <b>reiserfsck --check</b> exits with
+status 0 it means no errors were discovered.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+3. If <b>reiserfsck --check</b> exits with status 1 (and
+reports about fixable corruptions) it means that you should
+run <b>reiserfsck --fix-fixable --logfile fixable.log
+/dev/hda1</b>.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+4. If <b>reiserfsck --check</b> exits with status 2 (and
+reports about fatal corruptions) it means that you need to
+run <b>reiserfsck --rebuild-tree</b>. If <b>reiserfsck
+--check</b> fails in some way you should also run
+<b>reiserfsck --rebuild-tree</b>, but we also encourage you
+to submit this as a bug report.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+5. Before running <b>reiserfsck --rebuild-tree</b>, please
+make a backup of the whole partition before proceeding. Then
+run <b>reiserfsck --rebuild-tree --logfile rebuild.log
+/dev/hda1</b>.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+6. If the <b>reiserfsck --rebuild-tree</b> step fails or
+does not recover what you expected, please submit this as a
+bug report. Try to provide as much information as possible
+including your platform and Linux kernel version. We will
+try to help solve the problem.</td></table>
+<a name="EXIT CODES"></a>
+<h2>EXIT CODES</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>reiserfsck</b> uses the following exit codes:<i><br>
+0</i> - No errors.<i><br>
+1</i> - File system errors corrected.<i><br>
+2</i> - Reboot is needed.<i><br>
+4</i> - File system fatal errors left uncorrected,<b><br>
+reiserfsck --rebuild-tree</b> needs to be launched.<i><br>
+6</i> - File system fixable errors left uncorrected,<b><br>
+reiserfsck --fix-fixable</b> needs to be launched.<i><br>
+8</i> - Operational error.<i><br>
+16</i> - Usage or syntax error.</td></table>
+<a name="AUTHOR"></a>
+<h2>AUTHOR</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+This version of <b>reiserfsck</b> has been written by Vitaly
+Fertman &lt;vitaly@namesys.com&gt;.</td></table>
+<a name="BUGS"></a>
+<h2>BUGS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+Please report bugs to the ReiserFS developers
+&lt;reiserfs-dev@namesys.com&gt;, providing as much
+information as possible--your hardware, kernel, patches,
+settings, all printed messages, the logfile; check the
+syslog file for any related information.</td></table>
+<a name="TODO"></a>
+<h2>TODO</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+Faster recovering, signal handling.</td></table>
+<a name="SEE ALSO"></a>
+<h2>SEE ALSO</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>mkreiserfs</b>(8), <b>reiserfstune</b>(8)
+<b>resize_reiserfs</b>(8),
+<b>debugreiserfs</b>(8),</td></table>
+<hr>
+</body>
+</html>
--- reiserfsprogs-3.6.21.orig/debian/html/debugreiserfs.html
+++ reiserfsprogs-3.6.21/debian/html/debugreiserfs.html
@@ -0,0 +1,269 @@
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta name="Content-Style" content="text/css">
+<title>DEBUGREISERFS</title>
+</head>
+<body>
+
+<h1 align=center>DEBUGREISERFS</h1>
+<a href="#NAME">NAME</a><br>
+<a href="#SYNOPSIS">SYNOPSIS</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#AUTHOR">AUTHOR</a><br>
+<a href="#BUGS">BUGS</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+<!-- Creator     : groff version 1.17.2 -->
+<!-- CreationDate: Thu May 13 21:46:09 2004 -->
+<a name="NAME"></a>
+<h2>NAME</h2>
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+debugreiserfs - The debugging tool for the ReiserFS filesystem.</td></table>
+<a name="SYNOPSIS"></a>
+<h2>SYNOPSIS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>debugreiserfs</b> [ <b>-dDJmoqpuSV</b> ] [ <b>-j</b>
+<i>device</i> ] [ <b>-B</b> <i>file</i> ] [ <b>-1</b>
+<i>N</i> ]</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<i>device</i></td></table>
+<a name="DESCRIPTION"></a>
+<h2>DESCRIPTION</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>debugreiserfs</b> sometimes helps to solve problems with
+reiserfs filesystems. When run without options it prints the
+super block of the ReiserFS filesystem found on the
+<i>device</i>.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<i>device</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+is the special file corresponding to the device (e.g
+/dev/hdXX for an IDE disk partition or /dev/sdXX for a SCSI
+disk partition).</td></table>
+<a name="OPTIONS"></a>
+<h2>OPTIONS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-j</b> <i>device</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+prints the contents of the journal. The option -p allows it
+to pack the journal with other metadata into the
+archive.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-J</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+prints the journal header.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-d</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+prints the formatted nodes of the internal tree of the
+filesystem.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-D</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+prints the formatted nodes of all used blocks of the
+filesystem.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-m</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+prints the contents of the bitmap (slightly
+useful).</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-o</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+prints the objectid map (slightly useful).</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-B</b> <i>file</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+takes the list of bad blocks stored in the internal ReiserFS
+tree and translates it into an ascii list written to the
+specified file.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-1</b> <i>blocknumber</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+prints the specified block of the filesystem.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-p</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+extracts the filesystem's metadata with <b>debugreiserfs</b>
+-p /dev/xxx | gzip -c &gt; xxx.gz. None of your data are
+packed unless a filesystem corruption presents when the
+whole block having this corruption is packed. You send us
+the output, and we use it to create a filesystem with the
+same strucure as yours using <b>debugreiserfs -u</b>. When
+the data file is not too large, this usually allows us to
+quickly reproduce and debug the problem.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-u</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+builds the ReiserFS filesystem image with gunzip -c xxx.gz |
+<b>debugreiserfs</b> -u /dev/image of the previously packed
+metadata with <b>debugreiserfs -p</b>. The result image is
+not the same as the original filesystem, because mostly only
+metadata were packed with <b>debugreiserfs -p</b>, but the
+filesystem structure is completely recreated.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-S</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+When -S is not specified -p deals with blocks marked used in
+the filesystem bitmap only. With this option set
+<b>debugreiserfs</b> will work with the entire
+device.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-q</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+When -p is in use, suppress showing the speed of
+progress.</td></table>
+<a name="AUTHOR"></a>
+<h2>AUTHOR</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+This version of <b>debugreiserfs</b> has been written by
+Vitaly Fertman &lt;vitaly@namesys.com&gt;.</td></table>
+<a name="BUGS"></a>
+<h2>BUGS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+Please report bugs to the ReiserFS developers
+&lt;reiserfs-dev@namesys.com&gt;, providing as much
+information as possible--your hardware, kernel, patches,
+settings, all printed messages; check the syslog file for
+any related information.</td></table>
+<a name="SEE ALSO"></a>
+<h2>SEE ALSO</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>reiserfsck</b>(8), <b>mkreiserfs</b>(8)</td></table>
+<hr>
+</body>
+</html>
--- reiserfsprogs-3.6.21.orig/debian/html/mkreiserfs.html
+++ reiserfsprogs-3.6.21/debian/html/mkreiserfs.html
@@ -0,0 +1,324 @@
+<html>
+<head>
+<meta name="generator" content="groff -Thtml, see www.gnu.org">
+<meta name="Content-Style" content="text/css">
+<title>MKREISERFS</title>
+</head>
+<body>
+
+<h1 align=center>MKREISERFS</h1>
+<a href="#NAME">NAME</a><br>
+<a href="#SYNOPSIS">SYNOPSIS</a><br>
+<a href="#DESCRIPTION">DESCRIPTION</a><br>
+<a href="#OPTIONS">OPTIONS</a><br>
+<a href="#AUTHOR">AUTHOR</a><br>
+<a href="#BUGS">BUGS</a><br>
+<a href="#SEE ALSO">SEE ALSO</a><br>
+
+<hr>
+<!-- Creator     : groff version 1.17.2 -->
+<!-- CreationDate: Thu May 13 21:46:09 2004 -->
+<a name="NAME"></a>
+<h2>NAME</h2>
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+mkreiserfs - The create tool for the Linux ReiserFS filesystem.</td></table>
+<a name="SYNOPSIS"></a>
+<h2>SYNOPSIS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>mkreiserfs</b> [ <b>-dfV</b> ] [ <b>-b</b> |
+<b>--block-size</b> <i>N</i> ] [ <b>-h</b> | <b>--hash</b>
+<i>HASH</i> ] [ <b>-u</b> | <b>--uuid</b> <i>UUID</i> ] [
+<b>-l</b> | <b>--label</b> <i>LABEL</i> ] [ <b>--format</b>
+<i>FORMAT</i> ] [ <b>-q</b> | <b>--quiet</b> ] [ <b>-j</b> |
+<b>--journal-device</b> <i>FILE</i> ] [ <b>-s</b> |
+<b>--journal-size</b> <i>N</i> ] [ <b>-o</b> |
+<b>--journal-offset</b> <i>N</i> ] [ <b>-t</b> |
+<b>--transaction-max-size</b> <i>N</i> ] [ <b>-B</b> |
+<b>--badblocks</b> <i>file</i> ] <i>device</i> [
+<i>filesystem-size</i> ]</td></table>
+<a name="DESCRIPTION"></a>
+<h2>DESCRIPTION</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>mkreiserfs</b> creates a Linux ReiserFS filesystem on a
+device (usually a disk partition).</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<i>device</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+is the special file corresponding to a device or to a
+partition (e.g /dev/hdXX for an IDE disk partition or
+/dev/sdXX for a SCSI disk partition).</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<i>filesystem-size</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+is the size in blocks of the filesystem. If omitted,
+<b>mkreiserfs</b> will automatically set it.</td></table>
+<a name="OPTIONS"></a>
+<h2>OPTIONS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-b</b> | <b>--block-size</b> <i>N</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>N</i> is block size in bytes. It may only be set to a
+power of 2 within the 512-8192 interval.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-h</b> | <b>--hash</b> <i>HASH</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>HASH</i> specifies which hash function will sort the
+names in the directories. Choose from r5, rupasov, or tea.
+r5 is the default one.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>--format</b> <i>FORMAT</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>FORMAT</i> specifies the format for the new filsystem.
+Choose format 3.5 or 3.6. If none is specified
+<b>mkreiserfs</b> will create format 3.6 if running kernel
+is 2.4 or higher, and format 3.5 if kernel 2.2 is running,
+and will refuse creation under all other
+kernels.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-u</b> | <b>--uuid</b> <i>UUID</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Sets the Universally Unique IDentifier of the filesystem to
+<i>UUID</i> (see also <b>uuidgen(8)</b>). The format of the
+<i>UUID</i> is a series of hex digits separated by hypthens,
+e.g.: &quot;c1b9d5a2-f162-11cf-9ece-0020afc76f16&quot;. If
+the option is skipped, <b>mkreiserfs</b> will by default
+generate a new <i>UUID</i>.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-l</b> | <b>--label</b> <i>LABEL</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Sets the volume label of the filesystem. <i>LABEL</i> can at
+most be 16 characters long; if it is longer than 16
+characters, <b>mkreiserfs</b> will truncate it.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-q</b> | <b>--quiet</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Sets <b>mkreiserfs</b> to work quietly without producing
+messages, progress or questions. It is useful, but only for
+use by end users, if you run <b>mkreiserfs</b> in a
+script.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-j</b> | <b>--journal-device</b> <i>FILE</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>FILE</i> is the name of the block device on which is to
+be places the filesystem journal.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-o</b> | <b>--journal-offset</b> <i>N</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>N</i> is the offset where the journal starts when it is
+to be on a separate device. Default is 0. <i>N</i> has no
+effect when the journal is to be on the host
+device.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-s</b> | <b>--journal-size</b> <i>N</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>N</i> is the size of the journal in blocks. When the
+journal is to be on a separate device, its size defaults to
+the number of blocks that the device has. When journal is to
+be on the host device, its size defaults to 8193 and the
+maximal possible size is 32749 (for blocksize 4k). The
+minimum size is 513 blocks (whether the journal is on the
+host or on a separate device).</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-t</b> | <b>--transaction-max-size</b>
+<i>N</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>N</i> is the maximum transaction size parameter for the
+journal. The default, and max possible, value is 1024
+blocks. It should be less than half the size of the journal.
+If specified incorrectly, it will automatically be
+adjusted.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-B</b> | <b>--badblocks</b> <i>file</i></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+<i>File</i> is the file name of the file that contains the
+list of blocks to be marked as bad on the filesystem. This
+list can be created by <b>/sbin/badblocks -b block-size
+device</b>.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-f</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Forces <b>mkreiserfs</b> to continue even when the device is
+the whole disk, looks mounted, or is not a block device. If
+<b>-f</b> is specified more than once, it allows the user to
+avoid asking for confirmation.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-d</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Sets <b>mkreiserfs</b> to print debugging information during
+<b>mkreiserfs</b>.</td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>-V</b></td></table>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="21%"></td><td width="79%">
+Prints the version and then exits.</td></table>
+<a name="AUTHOR"></a>
+<h2>AUTHOR</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+This version of <b>mkreiserfs</b> has been written by Edward
+Shishkin &lt;edward@namesys.com&gt;.</td></table>
+<a name="BUGS"></a>
+<h2>BUGS</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+Please report bugs to the ReiserFS developers
+&lt;reiserfs-dev@namesys.com&gt;, providing as much
+information as possible--your hardware, kernel, patches,
+settings, all printed messages; check the syslog file for
+any related information.</td></table>
+<a name="SEE ALSO"></a>
+<h2>SEE ALSO</h2>
+
+<table width="100%" border=0 rules="none" frame="void"
+       cols="2" cellspacing="0" cellpadding="0">
+<tr valign="top" align="left">
+<td width="10%"></td><td width="90%">
+<b>reiserfsck</b>(8), <b>debugreiserfs</b>(8),
+<b>reiserfstune</b>(8)</td></table>
+<hr>
+</body>
+</html>
--- reiserfsprogs-3.6.21.orig/debian/html/fs.html
+++ reiserfsprogs-3.6.21/debian/html/fs.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> 
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<meta name="GENERATOR" content="Hand crafted in XEMACS">
+<meta name="Content-Style" content="text/css">
+<title>ReiserFS -- a filesystem based on balanced tree algorithms</title>
+<link rel="stylesheet" type="text/css" href="style_whitepaper.css">
+</head>
+
+<body>
+
+<!-- INDEX BEGIN -->
+<!--
+
+<UL>
+
+	<LI><A HREF="#NAME">NAME</A>
+	<LI><A HREF="#DESCRIPTION">DESCRIPTION</A>
+	<LI><A HREF="#INSTALLATION_STEPS">INSTALLATION STEPS</A>
+	<LI><A HREF="#CONFIGURATION">CONFIGURATION</A>
+	<LI><A HREF="#AUTHOR">AUTHOR</A>
+	<LI><A HREF="#BUGS">BUGS</A>
+	<LI><A HREF="#AVAILABILITY">AVAILABILITY</A>
+	<LI><A HREF="#SEE_ALSO">SEE ALSO</A>
+</UL>
+-->
+<!-- INDEX END -->
+
+<P>
+<H1><A NAME="NAME">NAME</A></H1>
+<P>
+ReiserFS -- a file system based on balanced tree algorithms.
+
+<P>
+<HR>
+<H1><A NAME="DESCRIPTION">DESCRIPTION</A></H1>
+<P>
+ReiserFS is a filesystem based on plug-in based object-oriented balanced
+tree algorithms. See <A
+HREF="http://www.namesys.com">http://www.namesys.com</A>
+for a full treatment of ReiserFS.
+
+<P>
+<HR>
+<H1><A NAME="INSTALLATION_STEPS">INSTALLATION STEPS</A></H1>
+<UL>
+<LI>
+<P>
+Get the latest ReiserFS patches from one of the mirrors listed at <A
+HREF="http://www.namesys.com">http://www.namesys.com</A>
+
+
+<LI>
+<P>
+Suppose you have linux-2.2.15-reiserfs-3.5.21-patch.gz (latest as of
+06/06/2000).
+
+<LI>
+<P>
+Have kernel sources of 2.2.15.
+
+<LI>
+<P>
+Apply ReiserFS patch to it.
+
+<LI>
+<P>
+When configuring, say y or n on ReiserFS support question. Read
+<A HREF="#CONFIGURATION">CONFIGURATION</A> section below.
+
+<LI>
+<P>
+Compile and install kernel image and modules as usual.
+
+<LI>
+<P>
+ReiserFS utils are located in the patched kernel source tree in
+linux/fs/reiserfs/utils. Follow the instruction of
+linux/fs/reiserfs/utils/README.
+
+<LI>
+<P>
+Boot with the kernel just built, mkreiserfs spare partition, mount it.
+
+<LI>
+<P>
+Have fun.
+
+</UL>
+<P>
+<HR>
+<H1><A NAME="CONFIGURATION">CONFIGURATION</A></H1>
+<P>
+This section will try to describe what you can vary when using ReiserFS.
+ReiserFS has several mount options to play with.
+
+<DL>
+<DT><STRONG><A NAME="item_notail">notail</A></STRONG><DD>
+<P>
+causes filesystem to work faster, especially for small appends to small
+files. But it wastes more disk space in that case.
+
+<DT><STRONG><A NAME="item_nolog">nolog</A></STRONG><DD>
+<P>
+turns off journalling feature of ReiserFS. This gives performance gain for
+some applications, but you lose fault tolerance. That is, you must properly
+umount your disk, or else you will have to repair the filesystem using <EM>reiserfsck(8)</EM> on the subsequent boot.
+
+<DT><STRONG><A NAME="item_resize">resize</A></STRONG><DD>
+<P>
+used for on-line ReiserFS resizing. To grow a ReiserFS online, use
+
+<P>
+<PRE>    mount -o remount,resize=NEW_BLOCKCOUNT /mnt
+</PRE>
+<DT><STRONG><A NAME="item_replayonly">replayonly</A></STRONG><DD>
+<P>
+used internally by <EM>reiserfsck(8)</EM> to replay the journal before doing filesystem check. (No actual mount
+happens if you try to mount ReiserFS with this option, only the log
+replay.)
+
+</DL>
+<P>
+<HR>
+<H1><A NAME="AUTHOR">AUTHOR</A></H1>
+<P>
+See <A
+HREF="http://www.namesys.com">http://www.namesys.com</A>
+for a current list, there are many, Vladimir Saveljev, Igor, and Hans
+Reiser are among them. Ecila.org contributed the funding that started this
+going.
+
+<P>
+<HR>
+<H1><A NAME="BUGS">BUGS</A></H1>
+<P>
+See the patches on the DOWNLOAD page and the Mail Li.
+
+<P>
+Please, report bugs to ReiserFS Developers Mailing List &lt;<A
+HREF="mailto:reiserfs-dev@namesys.com">reiserfs-dev@namesys.com</A>&gt; <!--and Vladimir
+Saveljev &lt;<A
+HREF="mailto:vs@namesys.botik.ru">vs@namesys.botik.ru</A>&gt;, and via
+bugzilla.at <A
+HREF="http://reiser.senga.org/bugzilla.">http://reiser.senga.org/bugzilla.</A>
+
+<P>
+Reporting bugs by email gets you a faster response, reporting them by
+bugzilla allows you and us to track their repair, we encourage you to do
+both.
+-->
+
+
+<P>
+<HR>
+<H1><A NAME="AVAILABILITY">AVAILABILITY</A></H1>
+<P>
+ReiserFS sources are available for anonymous ftp from one of our mirrors
+listed at <A
+HREF="http://namesys.com">http://namesys.com</A>
+
+<P>
+<HR>
+<H1><A NAME="SEE_ALSO">SEE ALSO</A></H1>
+<P>
+<EM>mkreiserfs(8)</EM>, <EM>reiserfsck(8)</EM>
+
+
+
+</BODY>
+
+</HTML>
--- reiserfsprogs-3.6.21.orig/include/credits.h
+++ reiserfsprogs-3.6.21/include/credits.h
@@ -0,0 +1,93 @@
+/*
+   Copyright 1996-2004 by Hans Reiser, licensing governed by 
+   reiserfsprogs/README.
+*/
+
+char *credits[] = {
+	"Hans Reiser was the project initiator,  source of all funding for the first 5.5\n"	\
+	"years. He is the architect and official maintainer.\n",
+
+	"Vladimir Saveliev started as the most junior programmer on the team, and became\n"	\
+	"the lead programmer.  He is now an experienced highly productive programmer. He\n"	\
+	"wrote the extent  handling code for Reiser4,  plus parts of  the balancing code \n"	\
+	"and file write and file read.\n",
+
+	"Alexander Zarochentcev  (zam)  wrote the high low priority locking code, online\n"	\
+	"resizer for V3 and V4, online repacker for V4, block allocation code, and major\n"	\
+	"parts of  the flush code,  and maintains the transaction manager code.  We give\n"	\
+	"him the stuff  that we know will be hard to debug,  or needs to be very cleanly\n"	\
+	"structured.\n",
+
+	"Nikita Danilov  wrote  most of the core  balancing code, plugin infrastructure,\n"	\
+	"and directory code. He steadily worked long hours, and is the reason so much of\n"	\
+	"the Reiser4 plugin infrastructure is well abstracted in its details.  The carry \n"	\
+	"function, and the use of non-recursive balancing, are his idea.\n",
+
+	"Vladimir Demidov wrote the parser for sys_reiser4(), the V3 alpha port, part of\n"	\
+	"the V3  journal  relocation code,  and helped  Hans keep  the business  side of\n"	\
+	"things running.\n",
+
+	"Chris Mason wrote the journaling code for V3,  which was enormously more useful\n"	\
+	"to users than just waiting until  we could create a wandering log filesystem as\n"	\
+	"Hans would have unwisely done without him.\n"	\
+	"Jeff Mahoney optimized the bitmap  scanning code for V3,  and performed the big\n"	\
+	"endian cleanups. \n",
+
+	"Elena Gryaznova performed testing and benchmarking.\n",
+
+	"Oleg Drokin was the debugger for  V3 during most of the time that  V4 was under\n"	\
+	"development,  and was quite  skilled and fast at it.  He wrote  the large write\n"	\
+	"optimization of V3.\n",
+
+	"Edward Shishkin wrote the encryption and compression  file plugins,  and the V3\n"	\
+	"journal relocation code.\n",
+
+	"Alexander  Lyamin  keeps our hardware  running,  and was very  generous  to our\n"	\
+	"project in many little ways.\n",
+
+	"Vitaly Fertman wrote  fsck for V3 and  maintains the reiserfsprogs package now.\n"	\
+	"He wrote librepair,  userspace plugins repair code, fsck for V4,  and worked on\n"	\
+	"developing libreiser4 and userspace plugins with Umka.\n",
+
+	"Yury Umanets  (aka Umka)  developed  libreiser4,  userspace  plugins,  and  all\n"	\
+	"userspace tools (reiser4progs) except of fsck.\n",
+
+	"Joshua Macdonald wrote the first draft of the transaction manager. Yuri Rupasov\n"	\
+	"did testing  and benchmarking,  plus he invented the r5 hash  (also used by the\n"	\
+	"dcache  code).  Yura  Rupasov,  Anatoly Pinchuk,  Igor Krasheninnikov,  Grigory\n"	\
+	"Zaigralin,  Mikhail  Gilula,   Igor  Zagorovsky,  Roman  Pozlevich,  Konstantin\n"	\
+	"Shvachko, and Joshua MacDonald are former contributors to the project.\n",
+
+	"Jeremy  Fitzhardinge  wrote  the  teahash.c  code  for  V3.  Colin  Plumb  also\n"	\
+	"contributed to that.\n",
+
+	"The  Defense  Advanced  Research  Projects Agency (DARPA, www.darpa.mil) is the\n"	\
+	"primary sponsor of Reiser4.  DARPA  does  not  endorse  this project; it merely \n"	\
+	"sponsors it.\n",
+
+	"Continuing core development of ReiserFS is  mostly paid for by Hans Reiser from\n"	\
+	"money made selling licenses  in addition to the GPL to companies who don't want\n"	\
+	"it known that they use ReiserFS  as a foundation for their proprietary product.\n"	\
+	"And my lawyer asked 'People pay you money for this?'. Yup. Life is good. If you\n"	\
+	"buy ReiserFS, you can focus on your value add rather than reinventing an entire\n"	\
+	"FS.\n",
+
+	"BigStorage  (www.bigstorage.com)  contributes to our general fund  every month,\n"	\
+	"and has done so for quite a long time.\n",
+
+	"SuSE (www.suse.com)  pays for continuing work on journaling for version 3, paid\n"	\
+	"for much of the previous version 3 work, and is paying for Chris and Jeff to do\n"	\
+	"V3 maintenance. Reiserfs integration in their distro is consistently solid, and\n"	\
+	"they were key to our becoming widely used.\n",
+
+	"Lycos Europe  (www.lycos-europe.com)  had  a  support  contract  with  us  that\n"	\
+	"consistently came in just when we would otherwise have missed payroll, and that\n"	\
+	"they kept doubling every year. Much thanks to them.\n",
+
+	"Many persons came to www.namesys.com/support.html,  and got a question answered\n"	\
+	"for $25, or just gave us a small donation there.\n",
+
+	"Thanks to all  of those sponsors,  including  the secret ones.  Without you, we\n"	\
+	"would each still have that day job.\n"
+};
+#define CREDITS_COUNT 20