diff -Nru reiser4progs-1.2.1/ChangeLog reiser4progs-1.2.2/ChangeLog
--- reiser4progs-1.2.1/ChangeLog	2017-11-28 11:22:58.000000000 +0000
+++ reiser4progs-1.2.2/ChangeLog	2021-03-20 13:34:10.000000000 +0000
@@ -6,6 +6,11 @@
 This file may be modified and/or distributed without restriction. This is
 not an invitation to misrepresent the history of reiser4progs.
 
+2021-03-20
+	1.2.2. version
+	Fixed problem reported by Mike Fleetwood: sometimes volume's
+	uuid, as shown by debugfs.reiser4, is either "none", or looks
+	corruptred (full of zeros)
 2017-11-28
 	1.2.1 version;
 	Fix up configuration problem (From Felix Zielcke)
diff -Nru reiser4progs-1.2.1/config.guess reiser4progs-1.2.2/config.guess
--- reiser4progs-1.2.1/config.guess	2016-02-03 17:37:24.000000000 +0000
+++ reiser4progs-1.2.2/config.guess	2017-02-10 06:47:11.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2016-10-02'
 
 # 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
@@ -27,7 +27,7 @@
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -168,19 +168,29 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +256,9 @@
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +275,42 @@
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		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/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +383,16 @@
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	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 [ "$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) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +417,7 @@
 	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
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -618,13 +642,13 @@
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -663,11 +687,11 @@
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -680,12 +704,12 @@
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -790,14 +814,14 @@
 	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_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 ;;
     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/ /_/'`
+	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:*:*)
@@ -879,7 +903,7 @@
 	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/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -902,7 +926,7 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -933,6 +957,9 @@
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -945,6 +972,9 @@
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -970,6 +1000,9 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1002,6 +1035,9 @@
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1021,7 +1057,7 @@
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1100,7 +1136,7 @@
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# 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
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1249,6 +1285,9 @@
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1262,9 +1301,9 @@
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1286,7 +1325,7 @@
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1317,7 +1356,7 @@
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1359,7 +1398,7 @@
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1370,23 +1409,25 @@
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff -Nru reiser4progs-1.2.1/config.sub reiser4progs-1.2.2/config.sub
--- reiser4progs-1.2.1/config.sub	2016-02-03 17:37:24.000000000 +0000
+++ reiser4progs-1.2.2/config.sub	2017-02-10 06:47:11.000000000 +0000
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-01-01'
+timestamp='2016-09-05'
 
 # 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
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -117,8 +116,8 @@
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -255,11 +254,12 @@
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
+	| e2k | epiphany \
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
@@ -305,7 +305,7 @@
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -376,12 +376,13 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -428,12 +429,13 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| 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-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -518,6 +520,9 @@
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -638,6 +643,14 @@
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -1017,7 +1030,7 @@
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1027,7 +1040,7 @@
 		;;
 	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1373,18 +1386,18 @@
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -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* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1393,7 +1406,8 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1525,6 +1539,8 @@
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
diff -Nru reiser4progs-1.2.1/configure reiser4progs-1.2.2/configure
--- reiser4progs-1.2.1/configure	2017-11-28 11:27:15.000000000 +0000
+++ reiser4progs-1.2.2/configure	2021-03-20 13:35:52.000000000 +0000
@@ -2673,7 +2673,7 @@
 
 LIBREISER4_MAJOR_VERSION=1
 LIBREISER4_MINOR_VERSION=2
-LIBREISER4_MICRO_VERSION=1
+LIBREISER4_MICRO_VERSION=2
 
 LIBREISER4_INTERFACE_AGE=0
 LIBREISER4_BINARY_AGE=0
diff -Nru reiser4progs-1.2.1/configure.ac reiser4progs-1.2.2/configure.ac
--- reiser4progs-1.2.1/configure.ac	2017-11-28 11:24:14.000000000 +0000
+++ reiser4progs-1.2.2/configure.ac	2021-03-20 13:32:08.000000000 +0000
@@ -15,7 +15,7 @@
 
 LIBREISER4_MAJOR_VERSION=1
 LIBREISER4_MINOR_VERSION=2
-LIBREISER4_MICRO_VERSION=1
+LIBREISER4_MICRO_VERSION=2
 
 LIBREISER4_INTERFACE_AGE=0
 LIBREISER4_BINARY_AGE=0
diff -Nru reiser4progs-1.2.1/debian/changelog reiser4progs-1.2.2/debian/changelog
--- reiser4progs-1.2.1/debian/changelog	2021-10-07 10:23:48.000000000 +0000
+++ reiser4progs-1.2.2/debian/changelog	2021-12-02 16:02:36.000000000 +0000
@@ -1,8 +1,12 @@
-reiser4progs (1.2.1-3build1) impish; urgency=medium
+reiser4progs (1.2.2-1) unstable; urgency=medium
 
-  * No-change rebuild to build packages with zstd compression.
+  * New upstream release.
+    - drop patches applied upstream.
+  * Bump Standards-Version to 4.6.0.
+  * Add not installed files to d/not-installed
+  * Update paths in d/reiser4progs.manpages.
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:23:48 +0200
+ -- Felix Zielcke <fzielcke@z-51.de>  Thu, 02 Dec 2021 17:02:36 +0100
 
 reiser4progs (1.2.1-3) unstable; urgency=medium
 
diff -Nru reiser4progs-1.2.1/debian/control reiser4progs-1.2.2/debian/control
--- reiser4progs-1.2.1/debian/control	2020-07-24 06:25:43.000000000 +0000
+++ reiser4progs-1.2.2/debian/control	2021-12-02 15:43:51.000000000 +0000
@@ -7,7 +7,7 @@
                libaal-dev (>= 1.0.7),
                libedit-dev,
                uuid-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Homepage: https://reiser4.wiki.kernel.org
 
 Package: reiser4progs
diff -Nru reiser4progs-1.2.1/debian/not-installed reiser4progs-1.2.2/debian/not-installed
--- reiser4progs-1.2.1/debian/not-installed	1970-01-01 00:00:00.000000000 +0000
+++ reiser4progs-1.2.2/debian/not-installed	2021-12-02 16:00:57.000000000 +0000
@@ -0,0 +1,4 @@
+usr/lib/*/libreiser4-minimal.la
+usr/lib/*/libreiser4.la
+usr/lib/*/librepair.la
+usr/sbin/make_reiser4
diff -Nru reiser4progs-1.2.1/debian/patches/fix_null_uuid.patch reiser4progs-1.2.2/debian/patches/fix_null_uuid.patch
--- reiser4progs-1.2.1/debian/patches/fix_null_uuid.patch	2021-03-20 13:58:26.000000000 +0000
+++ reiser4progs-1.2.2/debian/patches/fix_null_uuid.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-Author: Mike Fleetwood <mike.fleetwood@googlemail.com>
-Date:   Mon Mar 15 21:09:17 2021 +0000
-Subject: Stop occasionally making file systems with null UUIDs
-
-mkfs.reiser4 was using strncpy() to copy a binary UUID into the
-in-memory copy of the superblock.  So if there was a zero byte in the
-UUID, then from that point to the end was set to all zeros.  If the
-first byte was zero, a 1 in 256 chance, then the whole UUID was set to
-zero generating a null UUID for the file system.  Fix this.
-
-Test case:
-    truncate -s 256M test.img
-    i=0
-    while :
-    do
-        mkfs.reiser4 --force --yes --label '' test.img
-        line=`debugfs.reiser4 test.img 2> /dev/null | egrep '^uuid:'`
-        ((i++))
-        echo "[$i] $line"
-        echo "$line" | grep -q '<none>' && break
-    done
-
-Output fragment:
-    [1] uuid:               17073919-e41d-4892-9b22-4294d1544c4a
-    [2] uuid:               af2821de-ea85-4f20-9621-4fbd128b3fb8
-    [3] uuid:               c0fb805b-e224-4695-a504-d87460d158ae
-    ...
-    [34] uuid:              b747540d-5280-4e0f-bae2-922200000000
-    [35] uuid:              d604794d-097f-4810-bbb3-01a1518f3ef1
-    [36] uuid:              9634100c-1f98-42b3-a684-c9df77ab54e2
-    [37] uuid:              <none>
-
-Signed-off-by: Mike Fleetwood <mike.fleetwood@googlemail.com>
-
-Origin: upstream, https://github.com/edward6/reiser4progs/commit/44cc024f398f60adef1519426d65f3f081ee826a
-Bug-Debian: https://bugs.debian.org/985586
-
-diff --git a/libreiser4/master.c b/libreiser4/master.c
-index 649434d96..825fd38d1 100644
---- a/libreiser4/master.c
-+++ b/libreiser4/master.c
-@@ -295,8 +295,8 @@ void reiser4_master_set_uuid(reiser4_master_t *master,
- 		   sizeof(SUPER(master)->ms_uuid));
- 	
- 	if (uuid) {
--		aal_strncpy(SUPER(master)->ms_uuid, uuid,
--			    sizeof(SUPER(master)->ms_uuid));
-+		aal_memcpy(SUPER(master)->ms_uuid, uuid,
-+			   sizeof(SUPER(master)->ms_uuid));
- 	} 
- 	master->dirty = 1;
- }
diff -Nru reiser4progs-1.2.1/debian/patches/fix_print_uuid.patch reiser4progs-1.2.2/debian/patches/fix_print_uuid.patch
--- reiser4progs-1.2.1/debian/patches/fix_print_uuid.patch	2021-03-20 13:57:41.000000000 +0000
+++ reiser4progs-1.2.2/debian/patches/fix_print_uuid.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-Author: Edward Shishkin <edward.shishkin@gmail.com>
-Date:   Sat Mar 13 15:21:09 2021 +0100
-Subject: Fix up repair_master_print()
-
-Use the right criteria to make sure that uuid is set
-
-Signed-off-by: Edward Shishkin <edward.shishkin@gmail.com>
-
-Origin: upstream, https://github.com/edward6/reiser4progs/commit/4802cdb18ae03031d0e51a58b6655f3b99021ec2
-Bug-Debian: https://bugs.debian.org/985586
-
-diff --git a/librepair/master.c b/librepair/master.c
-index c7806c566..dadf21a3c 100644
---- a/librepair/master.c
-+++ b/librepair/master.c
-@@ -4,6 +4,14 @@
-    librepair/master.c - methods are needed for work with broken master 
-    super block. */
- 
-+#ifdef HAVE_CONFIG_H
-+#  include <config.h>
-+#endif
-+
-+#if defined(HAVE_LIBUUID) && defined(HAVE_UUID_UUID_H)
-+#  include <uuid/uuid.h>
-+#endif
-+
- #include <repair/librepair.h>
- 
- /* Checks the blocksize. */
-@@ -347,9 +355,9 @@ void repair_master_print(reiser4_master_t *master,
- 			  pid, plug ? plug->label : "absent");
- 
- #if defined(HAVE_LIBUUID) && defined(HAVE_UUID_UUID_H)
--	if (*master->ent.ms_uuid != '\0') {
-+	if (!uuid_is_null((unsigned char *)master->ent.ms_uuid)) {
- 		char uuid[37];
--		
-+
- 		uuid[36] = '\0';
- 		unparse(reiser4_master_get_uuid(master), uuid);
- 		aal_stream_format(stream, "uuid:\t\t%s\n", uuid);
diff -Nru reiser4progs-1.2.1/debian/patches/series reiser4progs-1.2.2/debian/patches/series
--- reiser4progs-1.2.1/debian/patches/series	2021-03-20 13:46:10.000000000 +0000
+++ reiser4progs-1.2.2/debian/patches/series	2021-12-02 15:50:59.000000000 +0000
@@ -1,5 +1,3 @@
 fix_ldconfig.patch
 05_libreiser4~profile.c.patch
 Build-with-libedit-instead-of-readline.patch
-fix_print_uuid.patch
-fix_null_uuid.patch
diff -Nru reiser4progs-1.2.1/debian/reiser4progs.manpages reiser4progs-1.2.2/debian/reiser4progs.manpages
--- reiser4progs-1.2.1/debian/reiser4progs.manpages	2013-09-07 14:38:06.000000000 +0000
+++ reiser4progs-1.2.2/debian/reiser4progs.manpages	2021-12-02 15:56:10.000000000 +0000
@@ -1,4 +1,4 @@
-doc/debugfs.reiser4.8
-doc/fsck.reiser4.8
-doc/measurefs.reiser4.8
-doc/mkfs.reiser4.8
+usr/share/man/man8/debugfs.reiser4.8
+usr/share/man/man8/fsck.reiser4.8
+usr/share/man/man8/measurefs.reiser4.8
+usr/share/man/man8/mkfs.reiser4.8
diff -Nru reiser4progs-1.2.1/demos/Makefile.am reiser4progs-1.2.2/demos/Makefile.am
--- reiser4progs-1.2.1/demos/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/demos/Makefile.am	2020-11-22 18:20:04.000000000 +0000
@@ -10,8 +10,8 @@
 
 busy_CFLAGS	= @GENERIC_CFLAGS@
 
-busy_LDADD 	= $(top_builddir)/libreiser4/libreiser4.la \
-	          $(top_builddir)/libmisc/libmisc.la \
+busy_LDADD 	= $(top_builddir)/libmisc/libmisc.la \
+	          $(top_builddir)/libreiser4/libreiser4.la \
 		  $(PROGS_LIBS)
 
 EXTRA_DIST      = $(noinst_SCRIPTS)
diff -Nru reiser4progs-1.2.1/demos/Makefile.in reiser4progs-1.2.2/demos/Makefile.in
--- reiser4progs-1.2.1/demos/Makefile.in	2017-11-28 11:27:15.000000000 +0000
+++ reiser4progs-1.2.2/demos/Makefile.in	2021-03-20 13:35:53.000000000 +0000
@@ -107,8 +107,8 @@
 	busy-busy.$(OBJEXT)
 busy_OBJECTS = $(am_busy_OBJECTS)
 am__DEPENDENCIES_1 =
-busy_DEPENDENCIES = $(top_builddir)/libreiser4/libreiser4.la \
-	$(top_builddir)/libmisc/libmisc.la $(am__DEPENDENCIES_1)
+busy_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+	$(top_builddir)/libreiser4/libreiser4.la $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -311,8 +311,8 @@
 busy_SOURCES = misc.c ls.c stat.c create.c ln.c rm.c cp.c trunc.c busy.c busy.h
 busy_LDFLAGS = @PROGS_LDFLAGS@
 busy_CFLAGS = @GENERIC_CFLAGS@
-busy_LDADD = $(top_builddir)/libreiser4/libreiser4.la \
-	          $(top_builddir)/libmisc/libmisc.la \
+busy_LDADD = $(top_builddir)/libmisc/libmisc.la \
+	          $(top_builddir)/libreiser4/libreiser4.la \
 		  $(PROGS_LIBS)
 
 EXTRA_DIST = $(noinst_SCRIPTS)
diff -Nru reiser4progs-1.2.1/libmisc/Makefile.am reiser4progs-1.2.2/libmisc/Makefile.am
--- reiser4progs-1.2.1/libmisc/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/libmisc/Makefile.am	2021-03-20 13:29:34.000000000 +0000
@@ -1,4 +1,12 @@
-noinst_LTLIBRARIES	= libmisc.la
+miscincludedir		= -I$(top_srcdir)/include
+
+if ENABLE_MINIMAL
+MINIMAL_LIBS		= libmisc-minimal.la
+else
+MINIMAL_LIBS =
+endif
+
+noinst_LTLIBRARIES	= libmisc.la $(MINIMAL_LIBS)
 
 libmisc_la_SOURCES	= misc.c profile.c exception.c gauge.c ui.c \
 			  mpressure.c
@@ -8,4 +16,13 @@
 
 libmisc_la_CFLAGS       = @GENERIC_CFLAGS@
 
-AM_CPPFLAGS                = -I$(top_srcdir)/include
+if ENABLE_MINIMAL
+libmisc_minimal_la_SOURCES = $(libmisc_la_SOURCES)
+
+libmisc_minimal_la_LIBADD  = @AAL_LIBS@ $(UUID_LIBS) @PROGS_LIBS@ \
+			     $(top_builddir)/libaux/libaux-minimal.la
+
+libmisc_minimal_la_CFLAGS  = $(libmisc_la_CFLAGS)
+endif
+
+AM_CPPFLAGS                = $(miscincludedir)
diff -Nru reiser4progs-1.2.1/libmisc/Makefile.in reiser4progs-1.2.2/libmisc/Makefile.in
--- reiser4progs-1.2.1/libmisc/Makefile.in	2017-11-28 11:27:15.000000000 +0000
+++ reiser4progs-1.2.2/libmisc/Makefile.in	2021-03-20 13:35:53.000000000 +0000
@@ -100,16 +100,32 @@
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
+@ENABLE_MINIMAL_TRUE@libmisc_minimal_la_DEPENDENCIES =  \
+@ENABLE_MINIMAL_TRUE@	$(am__DEPENDENCIES_1) \
+@ENABLE_MINIMAL_TRUE@	$(top_builddir)/libaux/libaux-minimal.la
+am__libmisc_minimal_la_SOURCES_DIST = misc.c profile.c exception.c \
+	gauge.c ui.c mpressure.c
+am__objects_1 = libmisc_minimal_la-misc.lo \
+	libmisc_minimal_la-profile.lo libmisc_minimal_la-exception.lo \
+	libmisc_minimal_la-gauge.lo libmisc_minimal_la-ui.lo \
+	libmisc_minimal_la-mpressure.lo
+@ENABLE_MINIMAL_TRUE@am_libmisc_minimal_la_OBJECTS = $(am__objects_1)
+libmisc_minimal_la_OBJECTS = $(am_libmisc_minimal_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmisc_minimal_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libmisc_minimal_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+@ENABLE_MINIMAL_TRUE@am_libmisc_minimal_la_rpath =
 libmisc_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/libaux/libaux-static.la
 am_libmisc_la_OBJECTS = libmisc_la-misc.lo libmisc_la-profile.lo \
 	libmisc_la-exception.lo libmisc_la-gauge.lo libmisc_la-ui.lo \
 	libmisc_la-mpressure.lo
 libmisc_la_OBJECTS = $(am_libmisc_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
 libmisc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmisc_la_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -147,8 +163,9 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libmisc_la_SOURCES)
-DIST_SOURCES = $(libmisc_la_SOURCES)
+SOURCES = $(libmisc_minimal_la_SOURCES) $(libmisc_la_SOURCES)
+DIST_SOURCES = $(am__libmisc_minimal_la_SOURCES_DIST) \
+	$(libmisc_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -302,7 +319,10 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = libmisc.la
+miscincludedir = -I$(top_srcdir)/include
+@ENABLE_MINIMAL_FALSE@MINIMAL_LIBS = 
+@ENABLE_MINIMAL_TRUE@MINIMAL_LIBS = libmisc-minimal.la
+noinst_LTLIBRARIES = libmisc.la $(MINIMAL_LIBS)
 libmisc_la_SOURCES = misc.c profile.c exception.c gauge.c ui.c \
 			  mpressure.c
 
@@ -310,7 +330,12 @@
 			  $(top_builddir)/libaux/libaux-static.la
 
 libmisc_la_CFLAGS = @GENERIC_CFLAGS@
-AM_CPPFLAGS = -I$(top_srcdir)/include
+@ENABLE_MINIMAL_TRUE@libmisc_minimal_la_SOURCES = $(libmisc_la_SOURCES)
+@ENABLE_MINIMAL_TRUE@libmisc_minimal_la_LIBADD = @AAL_LIBS@ $(UUID_LIBS) @PROGS_LIBS@ \
+@ENABLE_MINIMAL_TRUE@			     $(top_builddir)/libaux/libaux-minimal.la
+
+@ENABLE_MINIMAL_TRUE@libmisc_minimal_la_CFLAGS = $(libmisc_la_CFLAGS)
+AM_CPPFLAGS = $(miscincludedir)
 all: all-am
 
 .SUFFIXES:
@@ -356,6 +381,9 @@
 	  rm -f $${locs}; \
 	}
 
+libmisc-minimal.la: $(libmisc_minimal_la_OBJECTS) $(libmisc_minimal_la_DEPENDENCIES) $(EXTRA_libmisc_minimal_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmisc_minimal_la_LINK) $(am_libmisc_minimal_la_rpath) $(libmisc_minimal_la_OBJECTS) $(libmisc_minimal_la_LIBADD) $(LIBS)
+
 libmisc.la: $(libmisc_la_OBJECTS) $(libmisc_la_DEPENDENCIES) $(EXTRA_libmisc_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libmisc_la_LINK)  $(libmisc_la_OBJECTS) $(libmisc_la_LIBADD) $(LIBS)
 
@@ -371,6 +399,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_la-mpressure.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_la-profile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_la-ui.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_minimal_la-exception.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_minimal_la-gauge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_minimal_la-misc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_minimal_la-mpressure.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_minimal_la-profile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmisc_minimal_la-ui.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -393,6 +427,48 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+libmisc_minimal_la-misc.lo: misc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -MT libmisc_minimal_la-misc.lo -MD -MP -MF $(DEPDIR)/libmisc_minimal_la-misc.Tpo -c -o libmisc_minimal_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmisc_minimal_la-misc.Tpo $(DEPDIR)/libmisc_minimal_la-misc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='misc.c' object='libmisc_minimal_la-misc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -c -o libmisc_minimal_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
+
+libmisc_minimal_la-profile.lo: profile.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -MT libmisc_minimal_la-profile.lo -MD -MP -MF $(DEPDIR)/libmisc_minimal_la-profile.Tpo -c -o libmisc_minimal_la-profile.lo `test -f 'profile.c' || echo '$(srcdir)/'`profile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmisc_minimal_la-profile.Tpo $(DEPDIR)/libmisc_minimal_la-profile.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='profile.c' object='libmisc_minimal_la-profile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -c -o libmisc_minimal_la-profile.lo `test -f 'profile.c' || echo '$(srcdir)/'`profile.c
+
+libmisc_minimal_la-exception.lo: exception.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -MT libmisc_minimal_la-exception.lo -MD -MP -MF $(DEPDIR)/libmisc_minimal_la-exception.Tpo -c -o libmisc_minimal_la-exception.lo `test -f 'exception.c' || echo '$(srcdir)/'`exception.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmisc_minimal_la-exception.Tpo $(DEPDIR)/libmisc_minimal_la-exception.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='exception.c' object='libmisc_minimal_la-exception.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -c -o libmisc_minimal_la-exception.lo `test -f 'exception.c' || echo '$(srcdir)/'`exception.c
+
+libmisc_minimal_la-gauge.lo: gauge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -MT libmisc_minimal_la-gauge.lo -MD -MP -MF $(DEPDIR)/libmisc_minimal_la-gauge.Tpo -c -o libmisc_minimal_la-gauge.lo `test -f 'gauge.c' || echo '$(srcdir)/'`gauge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmisc_minimal_la-gauge.Tpo $(DEPDIR)/libmisc_minimal_la-gauge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gauge.c' object='libmisc_minimal_la-gauge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -c -o libmisc_minimal_la-gauge.lo `test -f 'gauge.c' || echo '$(srcdir)/'`gauge.c
+
+libmisc_minimal_la-ui.lo: ui.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -MT libmisc_minimal_la-ui.lo -MD -MP -MF $(DEPDIR)/libmisc_minimal_la-ui.Tpo -c -o libmisc_minimal_la-ui.lo `test -f 'ui.c' || echo '$(srcdir)/'`ui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmisc_minimal_la-ui.Tpo $(DEPDIR)/libmisc_minimal_la-ui.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ui.c' object='libmisc_minimal_la-ui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -c -o libmisc_minimal_la-ui.lo `test -f 'ui.c' || echo '$(srcdir)/'`ui.c
+
+libmisc_minimal_la-mpressure.lo: mpressure.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -MT libmisc_minimal_la-mpressure.lo -MD -MP -MF $(DEPDIR)/libmisc_minimal_la-mpressure.Tpo -c -o libmisc_minimal_la-mpressure.lo `test -f 'mpressure.c' || echo '$(srcdir)/'`mpressure.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmisc_minimal_la-mpressure.Tpo $(DEPDIR)/libmisc_minimal_la-mpressure.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mpressure.c' object='libmisc_minimal_la-mpressure.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_minimal_la_CFLAGS) $(CFLAGS) -c -o libmisc_minimal_la-mpressure.lo `test -f 'mpressure.c' || echo '$(srcdir)/'`mpressure.c
+
 libmisc_la-misc.lo: misc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmisc_la_CFLAGS) $(CFLAGS) -MT libmisc_la-misc.lo -MD -MP -MF $(DEPDIR)/libmisc_la-misc.Tpo -c -o libmisc_la-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmisc_la-misc.Tpo $(DEPDIR)/libmisc_la-misc.Plo
diff -Nru reiser4progs-1.2.1/libreiser4/Makefile.am reiser4progs-1.2.2/libreiser4/Makefile.am
--- reiser4progs-1.2.1/libreiser4/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/libreiser4/Makefile.am	2020-11-22 18:20:04.000000000 +0000
@@ -14,7 +14,7 @@
 lib_LTLIBRARIES		     = libreiser4.la $(MINIMAL_LIBS)
 noinst_LTLIBRARIES	     = libreiser4-static.la
 
-libreiser4_la_LIBADD	     = $(top_builddir)/libaux/libaux-static.la \
+libreiser4_la_LIBADD	     = $(top_builddir)/libmisc/libmisc.la \
 			       $(top_builddir)/plugin/libreiser4-plugin.la \
 			       @AAL_LIBS@ 
 
@@ -24,7 +24,7 @@
 			       -release $(LT_RELEASE)
 libreiser4_la_CFLAGS         = @GENERIC_CFLAGS@
 
-libreiser4_static_la_LIBADD  = $(top_builddir)/libaux/libaux-static.la \
+libreiser4_static_la_LIBADD  = $(top_builddir)/libmisc/libmisc.la \
 			       $(top_builddir)/plugin/libreiser4-plugin.la \
 			       @AAL_LIBS@ 
 
@@ -33,7 +33,7 @@
 libreiser4_static_la_LDFLAGS = -static
 
 if ENABLE_MINIMAL
-libreiser4_minimal_la_LIBADD   = $(top_builddir)/libaux/libaux-minimal.la \
+libreiser4_minimal_la_LIBADD   = $(top_builddir)/libmisc/libmisc-minimal.la \
 			       $(top_builddir)/plugin/libreiser4-plugin-minimal.la \
 			       @AAL_MINIMAL_LIBS@ 
 
diff -Nru reiser4progs-1.2.1/libreiser4/Makefile.in reiser4progs-1.2.2/libreiser4/Makefile.in
--- reiser4progs-1.2.1/libreiser4/Makefile.in	2017-11-28 11:27:15.000000000 +0000
+++ reiser4progs-1.2.2/libreiser4/Makefile.in	2021-03-20 13:35:53.000000000 +0000
@@ -127,8 +127,7 @@
   }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-@ENABLE_MINIMAL_TRUE@libreiser4_minimal_la_DEPENDENCIES =  \
-@ENABLE_MINIMAL_TRUE@	$(top_builddir)/libaux/libaux-minimal.la \
+@ENABLE_MINIMAL_TRUE@libreiser4_minimal_la_DEPENDENCIES = $(top_builddir)/libmisc/libmisc-minimal.la \
 @ENABLE_MINIMAL_TRUE@	$(top_builddir)/plugin/libreiser4-plugin-minimal.la
 am__libreiser4_minimal_la_SOURCES_DIST = bitmap.c libreiser4.c \
 	filesystem.c format.c journal.c alloc.c oid.c factory.c node.c \
@@ -163,7 +162,7 @@
 	$(libreiser4_minimal_la_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_MINIMAL_TRUE@am_libreiser4_minimal_la_rpath = -rpath $(libdir)
 libreiser4_static_la_DEPENDENCIES =  \
-	$(top_builddir)/libaux/libaux-static.la \
+	$(top_builddir)/libmisc/libmisc.la \
 	$(top_builddir)/plugin/libreiser4-plugin.la
 am__objects_2 = libreiser4_static_la-bitmap.lo \
 	libreiser4_static_la-libreiser4.lo \
@@ -184,7 +183,7 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libreiser4_static_la_CFLAGS) $(CFLAGS) \
 	$(libreiser4_static_la_LDFLAGS) $(LDFLAGS) -o $@
-libreiser4_la_DEPENDENCIES = $(top_builddir)/libaux/libaux-static.la \
+libreiser4_la_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
 	$(top_builddir)/plugin/libreiser4-plugin.la
 am__objects_3 = libreiser4_la-bitmap.lo libreiser4_la-libreiser4.lo \
 	libreiser4_la-filesystem.lo libreiser4_la-format.lo \
@@ -403,7 +402,7 @@
 @ENABLE_MINIMAL_TRUE@MINIMAL_LIBS = libreiser4-minimal.la
 lib_LTLIBRARIES = libreiser4.la $(MINIMAL_LIBS)
 noinst_LTLIBRARIES = libreiser4-static.la
-libreiser4_la_LIBADD = $(top_builddir)/libaux/libaux-static.la \
+libreiser4_la_LIBADD = $(top_builddir)/libmisc/libmisc.la \
 			       $(top_builddir)/plugin/libreiser4-plugin.la \
 			       @AAL_LIBS@ 
 
@@ -412,14 +411,14 @@
 			       -release $(LT_RELEASE)
 
 libreiser4_la_CFLAGS = @GENERIC_CFLAGS@
-libreiser4_static_la_LIBADD = $(top_builddir)/libaux/libaux-static.la \
+libreiser4_static_la_LIBADD = $(top_builddir)/libmisc/libmisc.la \
 			       $(top_builddir)/plugin/libreiser4-plugin.la \
 			       @AAL_LIBS@ 
 
 libreiser4_static_la_SOURCES = $(libreiser4_sources)
 libreiser4_static_la_CFLAGS = @GENERIC_CFLAGS@
 libreiser4_static_la_LDFLAGS = -static
-@ENABLE_MINIMAL_TRUE@libreiser4_minimal_la_LIBADD = $(top_builddir)/libaux/libaux-minimal.la \
+@ENABLE_MINIMAL_TRUE@libreiser4_minimal_la_LIBADD = $(top_builddir)/libmisc/libmisc-minimal.la \
 @ENABLE_MINIMAL_TRUE@			       $(top_builddir)/plugin/libreiser4-plugin-minimal.la \
 @ENABLE_MINIMAL_TRUE@			       @AAL_MINIMAL_LIBS@ 
 
diff -Nru reiser4progs-1.2.1/libreiser4/master.c reiser4progs-1.2.2/libreiser4/master.c
--- reiser4progs-1.2.1/libreiser4/master.c	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/libreiser4/master.c	2021-03-20 13:29:34.000000000 +0000
@@ -295,8 +295,8 @@
 		   sizeof(SUPER(master)->ms_uuid));
 	
 	if (uuid) {
-		aal_strncpy(SUPER(master)->ms_uuid, uuid,
-			    sizeof(SUPER(master)->ms_uuid));
+		aal_memcpy(SUPER(master)->ms_uuid, uuid,
+			   sizeof(SUPER(master)->ms_uuid));
 	} 
 	master->dirty = 1;
 }
diff -Nru reiser4progs-1.2.1/librepair/master.c reiser4progs-1.2.2/librepair/master.c
--- reiser4progs-1.2.1/librepair/master.c	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/librepair/master.c	2021-03-20 13:29:34.000000000 +0000
@@ -4,6 +4,14 @@
    librepair/master.c - methods are needed for work with broken master 
    super block. */
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#if defined(HAVE_LIBUUID) && defined(HAVE_UUID_UUID_H)
+#  include <uuid/uuid.h>
+#endif
+
 #include <repair/librepair.h>
 
 /* Checks the blocksize. */
@@ -347,9 +355,9 @@
 			  pid, plug ? plug->label : "absent");
 
 #if defined(HAVE_LIBUUID) && defined(HAVE_UUID_UUID_H)
-	if (*master->ent.ms_uuid != '\0') {
+	if (!uuid_is_null((unsigned char *)master->ent.ms_uuid)) {
 		char uuid[37];
-		
+
 		uuid[36] = '\0';
 		unparse(reiser4_master_get_uuid(master), uuid);
 		aal_stream_format(stream, "uuid:\t\t%s\n", uuid);
diff -Nru reiser4progs-1.2.1/Makefile.am reiser4progs-1.2.2/Makefile.am
--- reiser4progs-1.2.1/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/Makefile.am	2020-11-22 18:20:04.000000000 +0000
@@ -1,4 +1,4 @@
-SUBDIRS         = libaux plugin libreiser4 librepair libmisc progs include doc demos
+SUBDIRS         = libaux libmisc plugin libreiser4 librepair progs include doc demos
 
 EXTRA_DIST	= AUTHORS COPYING TODO NEWS BUGS README CREDITS THANKS \
 		  reiser4progs.spec.in reiser4progs.spec libreiser4.m4 \
diff -Nru reiser4progs-1.2.1/Makefile.in reiser4progs-1.2.2/Makefile.in
--- reiser4progs-1.2.1/Makefile.in	2017-11-28 11:27:15.000000000 +0000
+++ reiser4progs-1.2.2/Makefile.in	2021-03-20 13:35:53.000000000 +0000
@@ -360,7 +360,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = libaux plugin libreiser4 librepair libmisc progs include doc demos
+SUBDIRS = libaux libmisc plugin libreiser4 librepair progs include doc demos
 EXTRA_DIST = AUTHORS COPYING TODO NEWS BUGS README CREDITS THANKS \
 		  reiser4progs.spec.in reiser4progs.spec libreiser4.m4 \
 		  one_touch_install INSTALL_README CUSTOM_INSTALL_README \
@@ -622,7 +622,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -648,7 +648,7 @@
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -666,7 +666,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -676,7 +676,7 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
diff -Nru reiser4progs-1.2.1/progs/debugfs/Makefile.am reiser4progs-1.2.2/progs/debugfs/Makefile.am
--- reiser4progs-1.2.1/progs/debugfs/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/progs/debugfs/Makefile.am	2020-11-22 18:20:04.000000000 +0000
@@ -2,9 +2,9 @@
 debugfs_reiser4_SOURCES	 = debugfs.c debugfs.h print.c print.h browse.c \
 			   browse.h types.h
 
-debugfs_reiser4_LDADD 	 = $(top_builddir)/libreiser4/libreiser4.la \
+debugfs_reiser4_LDADD 	 = $(top_builddir)/libmisc/libmisc.la \
 			   $(top_builddir)/librepair/librepair.la \
-			   $(top_builddir)/libmisc/libmisc.la \
+			   $(top_builddir)/libreiser4/libreiser4.la \
 			   $(PROGS_LIBS)
 
 debugfs_reiser4_LDFLAGS  = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/progs/debugfs/Makefile.in reiser4progs-1.2.2/progs/debugfs/Makefile.in
--- reiser4progs-1.2.1/progs/debugfs/Makefile.in	2017-11-28 11:27:17.000000000 +0000
+++ reiser4progs-1.2.2/progs/debugfs/Makefile.in	2021-03-20 13:35:56.000000000 +0000
@@ -106,10 +106,9 @@
 	debugfs_reiser4-browse.$(OBJEXT)
 debugfs_reiser4_OBJECTS = $(am_debugfs_reiser4_OBJECTS)
 am__DEPENDENCIES_1 =
-debugfs_reiser4_DEPENDENCIES =  \
-	$(top_builddir)/libreiser4/libreiser4.la \
+debugfs_reiser4_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
 	$(top_builddir)/librepair/librepair.la \
-	$(top_builddir)/libmisc/libmisc.la $(am__DEPENDENCIES_1)
+	$(top_builddir)/libreiser4/libreiser4.la $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -310,9 +309,9 @@
 debugfs_reiser4_SOURCES = debugfs.c debugfs.h print.c print.h browse.c \
 			   browse.h types.h
 
-debugfs_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \
+debugfs_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
 			   $(top_builddir)/librepair/librepair.la \
-			   $(top_builddir)/libmisc/libmisc.la \
+			   $(top_builddir)/libreiser4/libreiser4.la \
 			   $(PROGS_LIBS)
 
 debugfs_reiser4_LDFLAGS = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/progs/fsck/Makefile.am reiser4progs-1.2.2/progs/fsck/Makefile.am
--- reiser4progs-1.2.1/progs/fsck/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/progs/fsck/Makefile.am	2020-11-22 18:20:04.000000000 +0000
@@ -1,9 +1,9 @@
 sbin_PROGRAMS 		= fsck.reiser4
 fsck_reiser4_SOURCES 	= fsck.c backup.c fsck.h backup.h
 
-fsck_reiser4_LDADD 	= $(top_builddir)/libreiser4/libreiser4.la \
+fsck_reiser4_LDADD 	= $(top_builddir)/libmisc/libmisc.la \
 			  $(top_builddir)/librepair/librepair.la \
-			  $(top_builddir)/libmisc/libmisc.la \
+			  $(top_builddir)/libreiser4/libreiser4.la \
 			  @PROGS_LIBS@
 
 fsck_reiser4_LDFLAGS    = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/progs/fsck/Makefile.in reiser4progs-1.2.2/progs/fsck/Makefile.in
--- reiser4progs-1.2.1/progs/fsck/Makefile.in	2017-11-28 11:27:17.000000000 +0000
+++ reiser4progs-1.2.2/progs/fsck/Makefile.in	2021-03-20 13:35:56.000000000 +0000
@@ -104,9 +104,9 @@
 am_fsck_reiser4_OBJECTS = fsck_reiser4-fsck.$(OBJEXT) \
 	fsck_reiser4-backup.$(OBJEXT)
 fsck_reiser4_OBJECTS = $(am_fsck_reiser4_OBJECTS)
-fsck_reiser4_DEPENDENCIES = $(top_builddir)/libreiser4/libreiser4.la \
+fsck_reiser4_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
 	$(top_builddir)/librepair/librepair.la \
-	$(top_builddir)/libmisc/libmisc.la
+	$(top_builddir)/libreiser4/libreiser4.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -304,9 +304,9 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 fsck_reiser4_SOURCES = fsck.c backup.c fsck.h backup.h
-fsck_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \
+fsck_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
 			  $(top_builddir)/librepair/librepair.la \
-			  $(top_builddir)/libmisc/libmisc.la \
+			  $(top_builddir)/libreiser4/libreiser4.la \
 			  @PROGS_LIBS@
 
 fsck_reiser4_LDFLAGS = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/progs/measurefs/Makefile.am reiser4progs-1.2.2/progs/measurefs/Makefile.am
--- reiser4progs-1.2.1/progs/measurefs/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/progs/measurefs/Makefile.am	2020-11-22 18:20:04.000000000 +0000
@@ -1,8 +1,8 @@
 sbin_PROGRAMS 		   = measurefs.reiser4
 measurefs_reiser4_SOURCES  = measurefs.c
 
-measurefs_reiser4_LDADD    = $(top_builddir)/libreiser4/libreiser4.la \
-			     $(top_builddir)/libmisc/libmisc.la \
+measurefs_reiser4_LDADD    = $(top_builddir)/libmisc/libmisc.la \
+			     $(top_builddir)/libreiser4/libreiser4.la \
 			     $(PROGS_LIBS)
 
 measurefs_reiser4_LDFLAGS  = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/progs/measurefs/Makefile.in reiser4progs-1.2.2/progs/measurefs/Makefile.in
--- reiser4progs-1.2.1/progs/measurefs/Makefile.in	2017-11-28 11:27:17.000000000 +0000
+++ reiser4progs-1.2.2/progs/measurefs/Makefile.in	2021-03-20 13:35:56.000000000 +0000
@@ -104,9 +104,8 @@
 am_measurefs_reiser4_OBJECTS = measurefs_reiser4-measurefs.$(OBJEXT)
 measurefs_reiser4_OBJECTS = $(am_measurefs_reiser4_OBJECTS)
 am__DEPENDENCIES_1 =
-measurefs_reiser4_DEPENDENCIES =  \
-	$(top_builddir)/libreiser4/libreiser4.la \
-	$(top_builddir)/libmisc/libmisc.la $(am__DEPENDENCIES_1)
+measurefs_reiser4_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+	$(top_builddir)/libreiser4/libreiser4.la $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -305,8 +304,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 measurefs_reiser4_SOURCES = measurefs.c
-measurefs_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \
-			     $(top_builddir)/libmisc/libmisc.la \
+measurefs_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
+			     $(top_builddir)/libreiser4/libreiser4.la \
 			     $(PROGS_LIBS)
 
 measurefs_reiser4_LDFLAGS = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/progs/mkfs/Makefile.am reiser4progs-1.2.2/progs/mkfs/Makefile.am
--- reiser4progs-1.2.1/progs/mkfs/Makefile.am	2017-11-23 10:21:36.000000000 +0000
+++ reiser4progs-1.2.2/progs/mkfs/Makefile.am	2020-11-22 18:20:04.000000000 +0000
@@ -1,8 +1,8 @@
 sbin_PROGRAMS 		= mkfs.reiser4
 mkfs_reiser4_SOURCES 	= mkfs.c
 
-mkfs_reiser4_LDADD 	= $(top_builddir)/libreiser4/libreiser4.la \
-			  $(top_builddir)/libmisc/libmisc.la \
+mkfs_reiser4_LDADD 	= $(top_builddir)/libmisc/libmisc.la \
+			  $(top_builddir)/libreiser4/libreiser4.la \
 			  $(PROGS_LIBS)
 
 mkfs_reiser4_LDFLAGS    = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/progs/mkfs/Makefile.in reiser4progs-1.2.2/progs/mkfs/Makefile.in
--- reiser4progs-1.2.1/progs/mkfs/Makefile.in	2017-11-28 11:27:17.000000000 +0000
+++ reiser4progs-1.2.2/progs/mkfs/Makefile.in	2021-03-20 13:35:56.000000000 +0000
@@ -104,8 +104,8 @@
 am_mkfs_reiser4_OBJECTS = mkfs_reiser4-mkfs.$(OBJEXT)
 mkfs_reiser4_OBJECTS = $(am_mkfs_reiser4_OBJECTS)
 am__DEPENDENCIES_1 =
-mkfs_reiser4_DEPENDENCIES = $(top_builddir)/libreiser4/libreiser4.la \
-	$(top_builddir)/libmisc/libmisc.la $(am__DEPENDENCIES_1)
+mkfs_reiser4_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+	$(top_builddir)/libreiser4/libreiser4.la $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -303,8 +303,8 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 mkfs_reiser4_SOURCES = mkfs.c
-mkfs_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \
-			  $(top_builddir)/libmisc/libmisc.la \
+mkfs_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
+			  $(top_builddir)/libreiser4/libreiser4.la \
 			  $(PROGS_LIBS)
 
 mkfs_reiser4_LDFLAGS = @PROGS_LDFLAGS@
diff -Nru reiser4progs-1.2.1/reiser4progs.spec reiser4progs-1.2.2/reiser4progs.spec
--- reiser4progs-1.2.1/reiser4progs.spec	2017-11-28 11:27:24.000000000 +0000
+++ reiser4progs-1.2.2/reiser4progs.spec	2021-03-20 13:36:08.000000000 +0000
@@ -1,7 +1,7 @@
 %define enable_debug 1
 
 Name: reiser4progs
-Version: 1.2.1
+Version: 1.2.2
 Release: 1
 Summary: Utilities for reiser4 filesystems
 License: GPL