If this patch does not apply cleanly to newer version of util-linux-ng, tryreplacing original lomount.c lomount.h loop.h losetup.8 files in mountsubdirectory with versions from util-linux-ng that the patch is for. Andthen apply this patch.mount/Makefile.in is a generated file. You can ignore patch failures on thatfile if you generate it again by running the ./autogen.sh script. That./autogen.sh script needs recent versions of autohell tools.diff -urN util-linux-ng-2.13.0.1/mount/Makefile.am util-linux-ng-2.13.0.1-AES/mount/Makefile.am--- util-linux-ng-2.13.0.1/mount/Makefile.am	2007-10-10 00:33:57.000000000 +0300+++ util-linux-ng-2.13.0.1-AES/mount/Makefile.am	2007-10-23 18:49:28.000000000 +0300@@ -12,20 +12,20 @@ 	mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \ 	getusername.h loop.h sundries.h -mount_common = fstab.c mount_mntent.c getusername.c lomount.c \+mount_common = fstab.c mount_mntent.c getusername.c \ 	$(utils_common) $(headers_common) ../lib/env.c -mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c+mount_SOURCES = mount.c lomount.c loumount.c loop.c sha512.c rmd160.c aes.c $(mount_common) ../lib/setproctitle.c mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) -umount_SOURCES = umount.c $(mount_common)+umount_SOURCES = umount.c loumount.c $(mount_common) umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) -swapon_SOURCES = swapon.c swap_constants.h $(utils_common)+swapon_SOURCES = swapon.c loop.c sha512.c swap_constants.h $(utils_common) -losetup_SOURCES = lomount.c loop.h lomount.h+losetup_SOURCES = lomount.c loumount.c loop.c sha512.c rmd160.c aes.c loop.h lomount.h losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS)  mount_LDADD = $(LDADD_common)diff -urN util-linux-ng-2.13.0.1/mount/Makefile.in util-linux-ng-2.13.0.1-AES/mount/Makefile.in--- util-linux-ng-2.13.0.1/mount/Makefile.in	2007-10-22 12:21:36.000000000 +0300+++ util-linux-ng-2.13.0.1-AES/mount/Makefile.in	2007-10-23 18:54:25.000000000 +0300@@ -1,8 +1,8 @@-# Makefile.in generated by automake 1.10 from Makefile.am.+# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.+# 2003, 2004, 2005  Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved.@@ -15,11 +15,17 @@ @SET_MAKE@  +SOURCES = $(losetup_SOURCES) $(mount_SOURCES) $(mtab_lock_test_SOURCES) pivot_root.c $(swapon_SOURCES) $(umount_SOURCES)++srcdir = @srcdir@+top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@+top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd+INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c@@ -63,15 +69,19 @@ @HAVE_PIVOT_ROOT_TRUE@am__EXEEXT_1 = pivot_root$(EXEEXT) sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)-am_losetup_OBJECTS = losetup-lomount.$(OBJEXT)+am_losetup_OBJECTS = losetup-lomount.$(OBJEXT) \+	losetup-loumount.$(OBJEXT) losetup-loop.$(OBJEXT) \+	losetup-sha512.$(OBJEXT) losetup-rmd160.$(OBJEXT) \+	losetup-aes.$(OBJEXT) losetup_OBJECTS = $(am_losetup_OBJECTS) losetup_LDADD = $(LDADD)-am__mount_SOURCES_DIST = mount.c fstab.c mount_mntent.c getusername.c \-	lomount.c sundries.c xmalloc.c realpath.c fsprobe.c \-	fsprobe_blkid.c fsprobe_volumeid.c fstab.h linux_fs.h \-	mount_mntent.h mount_constants.h my_dev_t.h mount_paths.h \-	lomount.h fsprobe.h realpath.h xmalloc.h getusername.h loop.h \-	sundries.h ../lib/env.c ../lib/setproctitle.c+am__mount_SOURCES_DIST = mount.c lomount.c loumount.c loop.c sha512.c \+	rmd160.c aes.c fstab.c mount_mntent.c getusername.c sundries.c \+	xmalloc.c realpath.c fsprobe.c fsprobe_blkid.c \+	fsprobe_volumeid.c fstab.h linux_fs.h mount_mntent.h \+	mount_constants.h my_dev_t.h mount_paths.h lomount.h fsprobe.h \+	realpath.h xmalloc.h getusername.h loop.h sundries.h \+	../lib/env.c ../lib/setproctitle.c @HAVE_BLKID_TRUE@am__objects_1 = mount-fsprobe_blkid.$(OBJEXT) @HAVE_VOLUME_ID_TRUE@am__objects_2 = mount-fsprobe_volumeid.$(OBJEXT) am__objects_3 = mount-sundries.$(OBJEXT) mount-xmalloc.$(OBJEXT) \@@ -79,16 +89,17 @@ 	$(am__objects_1) $(am__objects_2) am__objects_4 = am__objects_5 = mount-fstab.$(OBJEXT) mount-mount_mntent.$(OBJEXT) \-	mount-getusername.$(OBJEXT) mount-lomount.$(OBJEXT) \-	$(am__objects_3) $(am__objects_4) mount-env.$(OBJEXT)-am_mount_OBJECTS = mount-mount.$(OBJEXT) $(am__objects_5) \+	mount-getusername.$(OBJEXT) $(am__objects_3) $(am__objects_4) \+	mount-env.$(OBJEXT)+am_mount_OBJECTS = mount-mount.$(OBJEXT) mount-lomount.$(OBJEXT) \+	mount-loumount.$(OBJEXT) mount-loop.$(OBJEXT) \+	mount-sha512.$(OBJEXT) mount-rmd160.$(OBJEXT) \+	mount-aes.$(OBJEXT) $(am__objects_5) \ 	mount-setproctitle.$(OBJEXT) mount_OBJECTS = $(am_mount_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) mount_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)-mount_LINK = $(CCLD) $(mount_CFLAGS) $(CFLAGS) $(mount_LDFLAGS) \-	$(LDFLAGS) -o $@ am_mtab_lock_test_OBJECTS = mtab_lock_test-fstab.$(OBJEXT) \ 	mtab_lock_test-sundries.$(OBJEXT) \ 	mtab_lock_test-xmalloc.$(OBJEXT) $(am__objects_4)@@ -97,23 +108,24 @@ pivot_root_SOURCES = pivot_root.c pivot_root_OBJECTS = pivot_root.$(OBJEXT) pivot_root_LDADD = $(LDADD)-am__swapon_SOURCES_DIST = swapon.c swap_constants.h sundries.c \-	xmalloc.c realpath.c fsprobe.c fsprobe_blkid.c \+am__swapon_SOURCES_DIST = swapon.c loop.c sha512.c swap_constants.h \+	sundries.c xmalloc.c realpath.c fsprobe.c fsprobe_blkid.c \ 	fsprobe_volumeid.c @HAVE_BLKID_TRUE@am__objects_6 = fsprobe_blkid.$(OBJEXT) @HAVE_VOLUME_ID_TRUE@am__objects_7 = fsprobe_volumeid.$(OBJEXT) am__objects_8 = sundries.$(OBJEXT) xmalloc.$(OBJEXT) \ 	realpath.$(OBJEXT) fsprobe.$(OBJEXT) $(am__objects_6) \ 	$(am__objects_7)-am_swapon_OBJECTS = swapon.$(OBJEXT) $(am__objects_8)+am_swapon_OBJECTS = swapon.$(OBJEXT) loop.$(OBJEXT) sha512.$(OBJEXT) \+	$(am__objects_8) swapon_OBJECTS = $(am_swapon_OBJECTS) swapon_DEPENDENCIES = $(am__DEPENDENCIES_2)-am__umount_SOURCES_DIST = umount.c fstab.c mount_mntent.c \-	getusername.c lomount.c sundries.c xmalloc.c realpath.c \-	fsprobe.c fsprobe_blkid.c fsprobe_volumeid.c fstab.h \-	linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h \-	mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \-	getusername.h loop.h sundries.h ../lib/env.c+am__umount_SOURCES_DIST = umount.c loumount.c fstab.c mount_mntent.c \+	getusername.c sundries.c xmalloc.c realpath.c fsprobe.c \+	fsprobe_blkid.c fsprobe_volumeid.c fstab.h linux_fs.h \+	mount_mntent.h mount_constants.h my_dev_t.h mount_paths.h \+	lomount.h fsprobe.h realpath.h xmalloc.h getusername.h loop.h \+	sundries.h ../lib/env.c @HAVE_BLKID_TRUE@am__objects_9 = umount-fsprobe_blkid.$(OBJEXT) @HAVE_VOLUME_ID_TRUE@am__objects_10 =  \ @HAVE_VOLUME_ID_TRUE@	umount-fsprobe_volumeid.$(OBJEXT)@@ -121,14 +133,13 @@ 	umount-realpath.$(OBJEXT) umount-fsprobe.$(OBJEXT) \ 	$(am__objects_9) $(am__objects_10) am__objects_12 = umount-fstab.$(OBJEXT) umount-mount_mntent.$(OBJEXT) \-	umount-getusername.$(OBJEXT) umount-lomount.$(OBJEXT) \-	$(am__objects_11) $(am__objects_4) umount-env.$(OBJEXT)-am_umount_OBJECTS = umount-umount.$(OBJEXT) $(am__objects_12)+	umount-getusername.$(OBJEXT) $(am__objects_11) \+	$(am__objects_4) umount-env.$(OBJEXT)+am_umount_OBJECTS = umount-umount.$(OBJEXT) umount-loumount.$(OBJEXT) \