util-linux-aes: release of 3.7y allows to update

3 files changed, 87 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f746f7d44617..53aa938ca57e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = util-linux-aes
 	pkgdesc = Miscellaneous system utilities for Linux, with loop-AES support
-	pkgver = 2.38
-	pkgrel = 1.1
+	pkgver = 2.38.1
+	pkgrel = 1
 	url = https://github.com/karelzak/util-linux
 	install = util-linux-aes.install
 	arch = x86_64
@@ -13,9 +13,9 @@ pkgbase = util-linux-aes
 	makedepends = systemd
 	makedepends = gtk-doc
 	options = strip
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.tar.sign
-	source = util-linux-2.38.diff
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.sign
+	source = util-linux-2.38.1.diff
 	source = pam-login
 	source = pam-common
 	source = pam-runuser
@@ -26,9 +26,9 @@ pkgbase = util-linux-aes
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
 	validpgpkeys = 12D64C3ADCDA0AA427BDACDFF0733C808132F189
-	sha256sums = 6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
+	sha256sums = 60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f
 	sha256sums = SKIP
-	sha256sums = b1f2bf1145354664fac932b313db9599f55de5ff25c5c6f3c003c76da78ae39c
+	sha256sums = 58238cf5bcacd1a5a0717cd5d1f3fccb74e6192e20b58f8282169bc80d518a8e
 	sha256sums = 99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f
 	sha256sums = 57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af
 	sha256sums = 48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1
diff --git a/PKGBUILD b/PKGBUILD
index 5d3823b9f3b3..55f700dad8f1 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,9 +9,9 @@ _basename=util-linux
 pkgbase=util-linux-aes
 pkgname=(util-linux-aes util-linux-libs-aes)
 _pkgmajor=2.38
-_realver=${_pkgmajor}
+_realver=${_pkgmajor}.1
 pkgver=${_realver/-/}
-pkgrel=1.1
+pkgrel=1
 pkgdesc='Miscellaneous system utilities for Linux, with loop-AES support'
 url='https://github.com/karelzak/util-linux'
 #url="http://sourceforge.net/projects/loop-aes/"
@@ -29,9 +29,9 @@ source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${_base
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64'
+sha256sums=('60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f'
             'SKIP'
-            'b1f2bf1145354664fac932b313db9599f55de5ff25c5c6f3c003c76da78ae39c'
+            '58238cf5bcacd1a5a0717cd5d1f3fccb74e6192e20b58f8282169bc80d518a8e'
             '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
             '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
             '48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
diff --git a/util-linux-2.38.diff b/util-linux-2.38.1.diff
index eee48d4cb22c..4a52c4a654ea 100644
--- a/util-linux-2.38.diff
+++ b/util-linux-2.38.1.diff
@@ -19,9 +19,9 @@ to programs, like this:
     make
 
 
-diff -urN util-linux-2.38/include/Makemodule.am util-linux-2.38-AES/include/Makemodule.am
---- util-linux-2.38/include/Makemodule.am	2022-03-25 09:27:30.402407156 +0200
-+++ util-linux-2.38-AES/include/Makemodule.am	2022-05-31 00:31:47.991067951 +0300
+diff -urN util-linux-2.38.1/include/Makemodule.am util-linux-2.38.1-AES/include/Makemodule.am
+--- util-linux-2.38.1/include/Makemodule.am	2022-08-04 11:21:36.041638477 +0300
++++ util-linux-2.38.1-AES/include/Makemodule.am	2022-10-06 14:49:48.706433681 +0300
 @@ -52,6 +52,7 @@
  	include/procfs.h \
  	include/pt-bsd.h \
@@ -30,9 +30,9 @@ diff -urN util-linux-2.38/include/Makemodule.am util-linux-2.38-AES/include/Make
  	include/pt-mbr-partnames.h \
  	include/pt-gpt-partnames.h \
  	include/pt-sgi.h \
-diff -urN util-linux-2.38/include/xgetpass.h util-linux-2.38-AES/include/xgetpass.h
---- util-linux-2.38/include/xgetpass.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/include/xgetpass.h	2022-05-31 00:31:47.991067951 +0300
+diff -urN util-linux-2.38.1/include/xgetpass.h util-linux-2.38.1-AES/include/xgetpass.h
+--- util-linux-2.38.1/include/xgetpass.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/include/xgetpass.h	2022-10-06 14:49:48.707433689 +0300
 @@ -0,0 +1,6 @@
 +#ifndef UTIL_LINUX_XGETPASS_H
 +#define UTIL_LINUX_XGETPASS_H
@@ -40,9 +40,9 @@ diff -urN util-linux-2.38/include/xgetpass.h util-linux-2.38-AES/include/xgetpas
 +extern char *xgetpass(int pfd, const char *prompt);
 +
 +#endif /* UTIL_LINUX_XGETPASS_H */
-diff -urN util-linux-2.38/lib/Makemodule.am util-linux-2.38-AES/lib/Makemodule.am
---- util-linux-2.38/lib/Makemodule.am	2022-03-25 09:27:30.403407149 +0200
-+++ util-linux-2.38-AES/lib/Makemodule.am	2022-05-31 00:31:47.992067959 +0300
+diff -urN util-linux-2.38.1/lib/Makemodule.am util-linux-2.38.1-AES/lib/Makemodule.am
+--- util-linux-2.38.1/lib/Makemodule.am	2022-08-04 11:21:36.042638474 +0300
++++ util-linux-2.38.1-AES/lib/Makemodule.am	2022-10-06 14:49:48.707433689 +0300
 @@ -33,6 +33,7 @@
  	lib/pwdutils.c \
  	lib/randutils.c \
@@ -51,9 +51,9 @@ diff -urN util-linux-2.38/lib/Makemodule.am util-linux-2.38-AES/lib/Makemodule.a
  	lib/signames.c \
  	lib/strutils.c \
  	lib/strv.c \
-diff -urN util-linux-2.38/lib/xgetpass.c util-linux-2.38-AES/lib/xgetpass.c
---- util-linux-2.38/lib/xgetpass.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/lib/xgetpass.c	2022-05-31 00:31:47.992067959 +0300
+diff -urN util-linux-2.38.1/lib/xgetpass.c util-linux-2.38.1-AES/lib/xgetpass.c
+--- util-linux-2.38.1/lib/xgetpass.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/lib/xgetpass.c	2022-10-06 14:49:48.707433689 +0300
 @@ -0,0 +1,64 @@
 +/*
 + * A function to read the passphrase either from the terminal or from
@@ -119,9 +119,9 @@ diff -urN util-linux-2.38/lib/xgetpass.c util-linux-2.38-AES/lib/xgetpass.c
 +	if(p) p[y] = 0;
 +	return p;
 +}
-diff -urN util-linux-2.38/libmount/src/Makemodule.am util-linux-2.38-AES/libmount/src/Makemodule.am
---- util-linux-2.38/libmount/src/Makemodule.am	2022-01-06 15:52:17.854125684 +0200
-+++ util-linux-2.38-AES/libmount/src/Makemodule.am	2022-05-31 00:31:47.992067959 +0300
+diff -urN util-linux-2.38.1/libmount/src/Makemodule.am util-linux-2.38.1-AES/libmount/src/Makemodule.am
+--- util-linux-2.38.1/libmount/src/Makemodule.am	2022-07-14 16:14:08.561882202 +0300
++++ util-linux-2.38.1-AES/libmount/src/Makemodule.am	2022-10-06 14:49:48.708433698 +0300
 @@ -27,7 +27,10 @@
  if LINUX
  libmount_la_SOURCES += \
@@ -134,9 +134,9 @@ diff -urN util-linux-2.38/libmount/src/Makemodule.am util-linux-2.38-AES/libmoun
  	libmount/src/context_veritydev.c \
  	libmount/src/context_mount.c \
  	libmount/src/context_umount.c \
-diff -urN util-linux-2.38/libmount/src/aes.c util-linux-2.38-AES/libmount/src/aes.c
---- util-linux-2.38/libmount/src/aes.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/libmount/src/aes.c	2022-05-31 00:31:47.993067968 +0300
+diff -urN util-linux-2.38.1/libmount/src/aes.c util-linux-2.38.1-AES/libmount/src/aes.c
+--- util-linux-2.38.1/libmount/src/aes.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/libmount/src/aes.c	2022-10-06 14:49:48.708433698 +0300
 @@ -0,0 +1,299 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -437,9 +437,9 @@ diff -urN util-linux-2.38/libmount/src/aes.c util-linux-2.38-AES/libmount/src/ae
 +
 +    state_out(out_blk, b0);
 +}
-diff -urN util-linux-2.38/libmount/src/aes.h util-linux-2.38-AES/libmount/src/aes.h
---- util-linux-2.38/libmount/src/aes.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/libmount/src/aes.h	2022-05-31 00:31:47.993067968 +0300
+diff -urN util-linux-2.38.1/libmount/src/aes.h util-linux-2.38.1-AES/libmount/src/aes.h
+--- util-linux-2.38.1/libmount/src/aes.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/libmount/src/aes.h	2022-10-06 14:49:48.708433698 +0300
 @@ -0,0 +1,97 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -538,9 +538,9 @@ diff -urN util-linux-2.38/libmount/src/aes.h util-linux-2.38-AES/libmount/src/ae
 +// if their parameters have not changed.
 +
 +#endif  // _AES_H
-diff -urN util-linux-2.38/libmount/src/context.c util-linux-2.38-AES/libmount/src/context.c
---- util-linux-2.38/libmount/src/context.c	2022-02-17 12:28:41.067689783 +0200
-+++ util-linux-2.38-AES/libmount/src/context.c	2022-05-31 00:31:47.994067977 +0300
+diff -urN util-linux-2.38.1/libmount/src/context.c util-linux-2.38.1-AES/libmount/src/context.c
+--- util-linux-2.38.1/libmount/src/context.c	2022-08-04 11:21:36.050638441 +0300
++++ util-linux-2.38.1-AES/libmount/src/context.c	2022-10-06 14:49:48.710433715 +0300
 @@ -102,7 +102,6 @@
  	mnt_unref_fs(cxt->fs);
  	mnt_unref_fs(cxt->fs_template);
@@ -558,9 +558,9 @@ diff -urN util-linux-2.38/libmount/src/context.c util-linux-2.38-AES/libmount/sr
  	fl = cxt->flags;
  
  	mnt_unref_fs(cxt->fs);
-diff -urN util-linux-2.38/libmount/src/context_loopdev1.c util-linux-2.38-AES/libmount/src/context_loopdev1.c
---- util-linux-2.38/libmount/src/context_loopdev1.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/libmount/src/context_loopdev1.c	2022-05-31 00:31:47.994067977 +0300
+diff -urN util-linux-2.38.1/libmount/src/context_loopdev1.c util-linux-2.38.1-AES/libmount/src/context_loopdev1.c
+--- util-linux-2.38.1/libmount/src/context_loopdev1.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/libmount/src/context_loopdev1.c	2022-10-06 14:49:48.710433715 +0300
 @@ -0,0 +1,1525 @@
 +/*
 + * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
@@ -2087,9 +2087,9 @@ diff -urN util-linux-2.38/libmount/src/context_loopdev1.c util-linux-2.38-AES/li
 +	cxt->loopdev_fd = -1;
 +	return 0;
 +}
-diff -urN util-linux-2.38/libmount/src/context_umount.c util-linux-2.38-AES/libmount/src/context_umount.c
---- util-linux-2.38/libmount/src/context_umount.c	2022-02-17 12:28:41.067689783 +0200
-+++ util-linux-2.38-AES/libmount/src/context_umount.c	2022-05-31 00:31:47.994067977 +0300
+diff -urN util-linux-2.38.1/libmount/src/context_umount.c util-linux-2.38.1-AES/libmount/src/context_umount.c
+--- util-linux-2.38.1/libmount/src/context_umount.c	2022-08-04 11:21:36.051638438 +0300
++++ util-linux-2.38.1-AES/libmount/src/context_umount.c	2022-10-06 14:49:48.710433715 +0300
 @@ -389,11 +389,12 @@
   */
  static int is_associated_fs(const char *devname, struct libmnt_fs *fs)
@@ -2141,9 +2141,9 @@ diff -urN util-linux-2.38/libmount/src/context_umount.c util-linux-2.38-AES/libm
  			mnt_context_enable_loopdel(cxt, FALSE);
  	}
  
-diff -urN util-linux-2.38/libmount/src/optmap.c util-linux-2.38-AES/libmount/src/optmap.c
---- util-linux-2.38/libmount/src/optmap.c	2022-02-17 12:28:41.068689778 +0200
-+++ util-linux-2.38-AES/libmount/src/optmap.c	2022-05-31 00:31:47.994067977 +0300
+diff -urN util-linux-2.38.1/libmount/src/optmap.c util-linux-2.38.1-AES/libmount/src/optmap.c
+--- util-linux-2.38.1/libmount/src/optmap.c	2022-06-22 17:33:10.974260647 +0300
++++ util-linux-2.38.1-AES/libmount/src/optmap.c	2022-10-06 14:49:48.710433715 +0300
 @@ -172,10 +172,19 @@
     { "x-",      MNT_MS_XCOMMENT,   MNT_NOHLPS | MNT_PREFIX },              /* persistent comments (utab) */
     { "X-",      MNT_MS_XFSTABCOMM, MNT_NOHLPS | MNT_NOMTAB | MNT_PREFIX }, /* fstab only comments */
@@ -2166,9 +2166,9 @@ diff -urN util-linux-2.38/libmount/src/optmap.c util-linux-2.38-AES/libmount/src
  
     { "nofail",  MNT_MS_NOFAIL, MNT_NOMTAB },               /* Do not fail if ENOENT on dev */
  
-diff -urN util-linux-2.38/libmount/src/rmd160.c util-linux-2.38-AES/libmount/src/rmd160.c
---- util-linux-2.38/libmount/src/rmd160.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/libmount/src/rmd160.c	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/libmount/src/rmd160.c util-linux-2.38.1-AES/libmount/src/rmd160.c
+--- util-linux-2.38.1/libmount/src/rmd160.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/libmount/src/rmd160.c	2022-10-06 14:49:48.710433715 +0300
 @@ -0,0 +1,532 @@
 +/* rmd160.c  -	RIPE-MD160
 + *	Copyright (C) 1998 Free Software Foundation, Inc.
@@ -2702,9 +2702,9 @@ diff -urN util-linux-2.38/libmount/src/rmd160.c util-linux-2.38-AES/libmount/src
 +    rmd160_final( &hd );
 +    memcpy( outbuf, hd.buf, 20 );
 +}
-diff -urN util-linux-2.38/libmount/src/rmd160.h util-linux-2.38-AES/libmount/src/rmd160.h
---- util-linux-2.38/libmount/src/rmd160.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/libmount/src/rmd160.h	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/libmount/src/rmd160.h util-linux-2.38.1-AES/libmount/src/rmd160.h
+--- util-linux-2.38.1/libmount/src/rmd160.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/libmount/src/rmd160.h	2022-10-06 14:49:48.711433724 +0300
 @@ -0,0 +1,9 @@
 +#ifndef RMD160_H
 +#define RMD160_H
@@ -2715,9 +2715,9 @@ diff -urN util-linux-2.38/libmount/src/rmd160.h util-linux-2.38-AES/libmount/src
 +#endif /*RMD160_H*/
 +
 +
-diff -urN util-linux-2.38/libmount/src/sha512.c util-linux-2.38-AES/libmount/src/sha512.c
---- util-linux-2.38/libmount/src/sha512.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/libmount/src/sha512.c	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/libmount/src/sha512.c util-linux-2.38.1-AES/libmount/src/sha512.c
+--- util-linux-2.38.1/libmount/src/sha512.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/libmount/src/sha512.c	2022-10-06 14:49:48.711433724 +0300
 @@ -0,0 +1,432 @@
 +/*
 + *  sha512.c
@@ -3151,9 +3151,9 @@ diff -urN util-linux-2.38/libmount/src/sha512.c util-linux-2.38-AES/libmount/src
 +    memset(&ctx, 0, sizeof(ctx));
 +}
 +#endif
-diff -urN util-linux-2.38/libmount/src/sha512.h util-linux-2.38-AES/libmount/src/sha512.h
---- util-linux-2.38/libmount/src/sha512.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/libmount/src/sha512.h	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/libmount/src/sha512.h util-linux-2.38.1-AES/libmount/src/sha512.h
+--- util-linux-2.38.1/libmount/src/sha512.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/libmount/src/sha512.h	2022-10-06 14:49:48.711433724 +0300
 @@ -0,0 +1,45 @@
 +/*
 + *  sha512.h
@@ -3200,9 +3200,9 @@ diff -urN util-linux-2.38/libmount/src/sha512.h util-linux-2.38-AES/libmount/src
 +/* no sha384_write(), use sha512_write() */
 +/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47]  */
 +extern void __loDev_sha384_hash_buffer(unsigned char *, int, unsigned char *, int);
-diff -urN util-linux-2.38/sys-utils/Makemodule.am util-linux-2.38-AES/sys-utils/Makemodule.am
---- util-linux-2.38/sys-utils/Makemodule.am	2022-01-25 10:50:55.647020553 +0200
-+++ util-linux-2.38-AES/sys-utils/Makemodule.am	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/sys-utils/Makemodule.am util-linux-2.38.1-AES/sys-utils/Makemodule.am
+--- util-linux-2.38.1/sys-utils/Makemodule.am	2022-08-04 11:21:36.057638413 +0300
++++ util-linux-2.38.1-AES/sys-utils/Makemodule.am	2022-10-06 14:49:48.711433724 +0300
 @@ -292,7 +292,7 @@
  sbin_PROGRAMS += losetup
  MANPAGES += sys-utils/losetup.8
@@ -3229,9 +3229,9 @@ diff -urN util-linux-2.38/sys-utils/Makemodule.am util-linux-2.38-AES/sys-utils/
  	sys-utils/swapon-common.c \
  	sys-utils/swapon-common.h \
  	lib/swapprober.c \
-diff -urN util-linux-2.38/sys-utils/loop.c util-linux-2.38-AES/sys-utils/loop.c
---- util-linux-2.38/sys-utils/loop.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/sys-utils/loop.c	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/sys-utils/loop.c util-linux-2.38.1-AES/sys-utils/loop.c
+--- util-linux-2.38.1/sys-utils/loop.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/sys-utils/loop.c	2022-10-06 14:49:48.711433724 +0300
 @@ -0,0 +1,221 @@
 +/*
 + *  loop.c
@@ -3454,9 +3454,9 @@ diff -urN util-linux-2.38/sys-utils/loop.c util-linux-2.38-AES/sys-utils/loop.c
 +	loopinfo->lo_encrypt_type = 18; /* LO_CRYPT_CRYPTOAPI */
 +	return(loop_set_status64_ioctl(fd, loopinfo));
 +}
-diff -urN util-linux-2.38/sys-utils/loop.h util-linux-2.38-AES/sys-utils/loop.h
---- util-linux-2.38/sys-utils/loop.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/sys-utils/loop.h	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/sys-utils/loop.h util-linux-2.38.1-AES/sys-utils/loop.h
+--- util-linux-2.38.1/sys-utils/loop.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/sys-utils/loop.h	2022-10-06 14:49:48.711433724 +0300
 @@ -0,0 +1,87 @@
 +/*
 + *  loop.h
@@ -3545,9 +3545,9 @@ diff -urN util-linux-2.38/sys-utils/loop.h util-linux-2.38-AES/sys-utils/loop.h
 +extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
 +
 +#endif
-diff -urN util-linux-2.38/sys-utils/losetup.8.adoc util-linux-2.38-AES/sys-utils/losetup.8.adoc
---- util-linux-2.38/sys-utils/losetup.8.adoc	2022-03-09 12:30:22.957702940 +0200
-+++ util-linux-2.38-AES/sys-utils/losetup.8.adoc	2022-05-31 00:31:47.995067986 +0300
+diff -urN util-linux-2.38.1/sys-utils/losetup.8.adoc util-linux-2.38.1-AES/sys-utils/losetup.8.adoc
+--- util-linux-2.38.1/sys-utils/losetup.8.adoc	2022-07-20 18:41:58.484354348 +0300
++++ util-linux-2.38.1-AES/sys-utils/losetup.8.adoc	2022-10-06 14:49:48.711433724 +0300
 @@ -12,153 +12,135 @@
  
  == SYNOPSIS
@@ -3629,7 +3629,7 @@ diff -urN util-linux-2.38/sys-utils/losetup.8.adoc util-linux-2.38-AES/sys-utils
 +Runs hashed passphrase through itercountk thousand iterations of AES-256 before using it for loop encryption. This consumes lots of CPU cycles at loop setup/mount time but not thereafter. In combination with passphrase seed this slows down dictionary attacks. Iteration is not done in multi-key mode.
  
 -*-b*, *--sector-size* _size_::
--Set the logical sector size of the loop device in bytes (since Linux 4.14). The option may be used when create a new loop device as well as stand-alone command to modify sector size of the already existing loop device.
+-Set the logical sector size of the loop device in bytes (since Linux 4.14). The option may be used when creating a new loop device as well as a stand-alone command to modify sector size of the already existing loop device.
 +*-d*::
 +Detach the file or device associated with the specified loop device.
  
@@ -3801,9 +3801,9 @@ diff -urN util-linux-2.38/sys-utils/losetup.8.adoc util-linux-2.38-AES/sys-utils
 -include::man-common/translation.adoc[]
 -endif::[]
 +AES support: Jari Ruusu
-diff -urN util-linux-2.38/sys-utils/losetup1.c util-linux-2.38-AES/sys-utils/losetup1.c
---- util-linux-2.38/sys-utils/losetup1.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.38-AES/sys-utils/losetup1.c	2022-05-31 00:31:47.996067994 +0300
+diff -urN util-linux-2.38.1/sys-utils/losetup1.c util-linux-2.38.1-AES/sys-utils/losetup1.c
+--- util-linux-2.38.1/sys-utils/losetup1.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.38.1-AES/sys-utils/losetup1.c	2022-10-06 14:49:48.711433724 +0300
 @@ -0,0 +1,1281 @@
 +/* Taken from Ted's losetup.c - Mitch <m.dsouza@mrc-apu.cam.ac.uk> */
 +/* Added vfs mount options - aeb - 960223 */
@@ -5086,9 +5086,9 @@ diff -urN util-linux-2.38/sys-utils/losetup1.c util-linux-2.38-AES/sys-utils/los
 +	}
 +	return res;
 +}
-diff -urN util-linux-2.38/sys-utils/mount.8.adoc util-linux-2.38-AES/sys-utils/mount.8.adoc
---- util-linux-2.38/sys-utils/mount.8.adoc	2022-02-17 12:28:41.196689052 +0200
-+++ util-linux-2.38-AES/sys-utils/mount.8.adoc	2022-05-31 00:31:47.996067994 +0300
+diff -urN util-linux-2.38.1/sys-utils/mount.8.adoc util-linux-2.38.1-AES/sys-utils/mount.8.adoc
+--- util-linux-2.38.1/sys-utils/mount.8.adoc	2022-08-04 11:21:36.058638409 +0300
++++ util-linux-2.38.1-AES/sys-utils/mount.8.adoc	2022-10-06 14:49:48.712433732 +0300
 @@ -381,6 +381,9 @@
  *--options-source-force*::
  Use options from _fstab_/_mtab_ even if both _device_ and _dir_ are specified.
@@ -5110,9 +5110,9 @@ diff -urN util-linux-2.38/sys-utils/mount.8.adoc util-linux-2.38-AES/sys-utils/m
  
  Since Linux 2.6.25 auto-destruction of loop devices is supported, meaning that any loop device allocated by *mount* will be freed by *umount* independently of _/etc/mtab_.
  
-diff -urN util-linux-2.38/sys-utils/mount.c util-linux-2.38-AES/sys-utils/mount.c
---- util-linux-2.38/sys-utils/mount.c	2022-02-17 12:28:41.196689052 +0200
-+++ util-linux-2.38-AES/sys-utils/mount.c	2022-05-31 00:31:47.996067994 +0300
+diff -urN util-linux-2.38.1/sys-utils/mount.c util-linux-2.38.1-AES/sys-utils/mount.c
+--- util-linux-2.38.1/sys-utils/mount.c	2022-08-04 11:21:36.059638405 +0300
++++ util-linux-2.38.1-AES/sys-utils/mount.c	2022-10-06 14:49:48.712433732 +0300
 @@ -36,6 +36,7 @@
  #include "c.h"
  #include "env.h"
@@ -5199,9 +5199,9 @@ diff -urN util-linux-2.38/sys-utils/mount.c util-linux-2.38-AES/sys-utils/mount.
  	if (all) {
  		/*
  		 * A) Mount all
-diff -urN util-linux-2.38/sys-utils/swapoff.c util-linux-2.38-AES/sys-utils/swapoff.c
---- util-linux-2.38/sys-utils/swapoff.c	2021-05-06 13:55:47.035422724 +0300
-+++ util-linux-2.38-AES/sys-utils/swapoff.c	2022-05-31 00:31:47.996067994 +0300
+diff -urN util-linux-2.38.1/sys-utils/swapoff.c util-linux-2.38.1-AES/sys-utils/swapoff.c
+--- util-linux-2.38.1/sys-utils/swapoff.c	2022-05-11 11:13:11.136530335 +0300
++++ util-linux-2.38.1-AES/sys-utils/swapoff.c	2022-10-06 14:49:48.712433732 +0300
 @@ -1,4 +1,9 @@
  #include <stdio.h>
 +#include <sys/types.h>
@@ -5299,9 +5299,9 @@ diff -urN util-linux-2.38/sys-utils/swapoff.c util-linux-2.38-AES/sys-utils/swap
  	}
  
  	mnt_free_iter(itr);
-diff -urN util-linux-2.38/sys-utils/swapon.8.adoc util-linux-2.38-AES/sys-utils/swapon.8.adoc
---- util-linux-2.38/sys-utils/swapon.8.adoc	2022-02-17 12:28:41.198689042 +0200
-+++ util-linux-2.38-AES/sys-utils/swapon.8.adoc	2022-05-31 00:31:47.996067994 +0300
+diff -urN util-linux-2.38.1/sys-utils/swapon.8.adoc util-linux-2.38.1-AES/sys-utils/swapon.8.adoc
+--- util-linux-2.38.1/sys-utils/swapon.8.adoc	2022-05-11 11:13:11.137530330 +0300
++++ util-linux-2.38.1-AES/sys-utils/swapon.8.adoc	2022-10-06 14:49:48.712433732 +0300
 @@ -26,6 +26,8 @@
  
  *swapoff* disables swapping on the specified devices and files. When the *-a* flag is given, swapping is disabled on all known swap devices and files (as found in _/proc/swaps_ or _/etc/fstab_).
@@ -5311,9 +5311,9 @@ diff -urN util-linux-2.38/sys-utils/swapon.8.adoc util-linux-2.38-AES/sys-utils/
  == OPTIONS
  
  *-a*, *--all*::
-diff -urN util-linux-2.38/sys-utils/swapon.c util-linux-2.38-AES/sys-utils/swapon.c
---- util-linux-2.38/sys-utils/swapon.c	2022-02-17 12:28:41.198689042 +0200
-+++ util-linux-2.38-AES/sys-utils/swapon.c	2022-05-31 00:31:47.996067994 +0300
+diff -urN util-linux-2.38.1/sys-utils/swapon.c util-linux-2.38.1-AES/sys-utils/swapon.c
+--- util-linux-2.38.1/sys-utils/swapon.c	2022-05-11 11:13:11.137530330 +0300
++++ util-linux-2.38.1-AES/sys-utils/swapon.c	2022-10-06 14:49:48.712433732 +0300
 @@ -8,6 +8,8 @@
  #include <unistd.h>
  #include <sys/types.h>