util-linux: use loop-aes patch from 3.7v release

3 files changed, 97 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 981a6f559bb9..1c712b4b5123 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.37.2
-	pkgrel = 1
+	pkgrel = 1.1
 	url = https://github.com/karelzak/util-linux
 	install = util-linux-aes.install
 	arch = x86_64
@@ -15,8 +15,7 @@ pkgbase = util-linux-aes
 	options = strip
 	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz
 	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.sign
-	source = http://loop-aes.sourceforge.net/updates/util-linux-2.37-20210620.diff.bz2
-	source = http://loop-aes.sourceforge.net/updates/util-linux-2.37-20210620.diff.bz2.sign
+	source = util-linux-2.37.2.diff
 	source = util-linux-aes.modules
 	source = pam-login
 	source = pam-common
@@ -30,8 +29,7 @@ pkgbase = util-linux-aes
 	validpgpkeys = 12D64C3ADCDA0AA427BDACDFF0733C808132F189
 	sha256sums = 6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
 	sha256sums = SKIP
-	sha256sums = 0a78ea9a05191b1ddaeedc8c8d8ae053f9ed4e7cd2f39ef4b3bc356e552c98a2
-	sha256sums = SKIP
+	sha256sums = 41ce470339c84c7c6ab32ba112437e96fd3ff71520fbd555d9fabed951670c2e
 	sha256sums = 560ca858961eb997a216ce6b419d900e84688591abf4584ef30c9323ba06fffd
 	sha256sums = 99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f
 	sha256sums = 57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af
diff --git a/PKGBUILD b/PKGBUILD
index 4adc966a1ddd..edace3e9e3d1 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=(util-linux-aes util-linux-libs-aes)
 _pkgmajor=2.37
 _realver=${_pkgmajor}.2
 pkgver=${_realver/-/}
-pkgrel=1
+pkgrel=1.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/"
@@ -23,8 +23,7 @@ install=${pkgname}.install
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284'  # Karel Zak
               '12D64C3ADCDA0AA427BDACDFF0733C808132F189') # Jari Ruusu
 source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${_basename}-${_realver}.tar."{xz,sign}
-        #"${_basename}-${pkgver}.diff"
-        http://loop-aes.sourceforge.net/updates/${_basename}-${_pkgmajor}-20210620.diff.bz2{,.sign}
+        "${_basename}-${pkgver}.diff"
         "${pkgname}.modules"
         pam-{login,common,runuser,su}
         'util-linux-aes.sysusers'
@@ -33,8 +32,7 @@ source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${_base
         'rfkill-block_.service')
 sha256sums=('6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9'
             'SKIP'
-            '0a78ea9a05191b1ddaeedc8c8d8ae053f9ed4e7cd2f39ef4b3bc356e552c98a2'
-            'SKIP'
+            '41ce470339c84c7c6ab32ba112437e96fd3ff71520fbd555d9fabed951670c2e'
             '560ca858961eb997a216ce6b419d900e84688591abf4584ef30c9323ba06fffd'
             '99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
             '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
@@ -48,8 +46,7 @@ sha256sums=('6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9'
 prepare() {
   cd "$_basename-$pkgver"
 
-  #patch -Np1 -i "../${_basename}-${pkgver}.diff"
-  patch -Np1 -i "../${_basename}-${_pkgmajor}-20210620.diff"
+  patch -Np1 -i "../${_basename}-${pkgver}.diff"
   autoreconf -i
 }
 
diff --git a/util-linux-2.37.diff b/util-linux-2.37.2.diff
index be61a9042c8e..132072248b36 100644
--- a/util-linux-2.37.diff
+++ b/util-linux-2.37.2.diff
@@ -19,9 +19,9 @@ to programs, like this:
     make
 
 
-diff -urN util-linux-2.37/include/Makemodule.am util-linux-2.37-AES/include/Makemodule.am
---- util-linux-2.37/include/Makemodule.am	2021-05-06 13:55:46.879423500 +0300
-+++ util-linux-2.37-AES/include/Makemodule.am	2021-06-20 14:51:07.588871129 +0300
+diff -urN util-linux-2.37.2/include/Makemodule.am util-linux-2.37.2-AES/include/Makemodule.am
+--- util-linux-2.37.2/include/Makemodule.am	2021-08-16 13:57:48.571807655 +0300
++++ util-linux-2.37.2-AES/include/Makemodule.am	2021-09-02 07:09:11.369551473 +0300
 @@ -50,6 +50,7 @@
  	include/procutils.h \
  	include/pt-bsd.h \
@@ -30,9 +30,9 @@ diff -urN util-linux-2.37/include/Makemodule.am util-linux-2.37-AES/include/Make
  	include/pt-mbr-partnames.h \
  	include/pt-gpt-partnames.h \
  	include/pt-sgi.h \
-diff -urN util-linux-2.37/include/xgetpass.h util-linux-2.37-AES/include/xgetpass.h
---- util-linux-2.37/include/xgetpass.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/include/xgetpass.h	2021-06-20 14:51:07.589871138 +0300
+diff -urN util-linux-2.37.2/include/xgetpass.h util-linux-2.37.2-AES/include/xgetpass.h
+--- util-linux-2.37.2/include/xgetpass.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/include/xgetpass.h	2021-09-02 07:09:11.370551480 +0300
 @@ -0,0 +1,6 @@
 +#ifndef UTIL_LINUX_XGETPASS_H
 +#define UTIL_LINUX_XGETPASS_H
@@ -40,9 +40,9 @@ diff -urN util-linux-2.37/include/xgetpass.h util-linux-2.37-AES/include/xgetpas
 +extern char *xgetpass(int pfd, const char *prompt);
 +
 +#endif /* UTIL_LINUX_XGETPASS_H */
-diff -urN util-linux-2.37/lib/Makemodule.am util-linux-2.37-AES/lib/Makemodule.am
---- util-linux-2.37/lib/Makemodule.am	2021-05-26 14:32:10.616108206 +0300
-+++ util-linux-2.37-AES/lib/Makemodule.am	2021-06-20 14:51:07.589871138 +0300
+diff -urN util-linux-2.37.2/lib/Makemodule.am util-linux-2.37.2-AES/lib/Makemodule.am
+--- util-linux-2.37.2/lib/Makemodule.am	2021-08-16 13:57:48.572807650 +0300
++++ util-linux-2.37.2-AES/lib/Makemodule.am	2021-09-02 07:09:11.370551480 +0300
 @@ -32,6 +32,7 @@
  	lib/pwdutils.c \
  	lib/randutils.c \
@@ -51,9 +51,9 @@ diff -urN util-linux-2.37/lib/Makemodule.am util-linux-2.37-AES/lib/Makemodule.a
  	lib/signames.c \
  	lib/strutils.c \
  	lib/strv.c \
-diff -urN util-linux-2.37/lib/xgetpass.c util-linux-2.37-AES/lib/xgetpass.c
---- util-linux-2.37/lib/xgetpass.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/lib/xgetpass.c	2021-06-20 14:51:07.590871146 +0300
+diff -urN util-linux-2.37.2/lib/xgetpass.c util-linux-2.37.2-AES/lib/xgetpass.c
+--- util-linux-2.37.2/lib/xgetpass.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/lib/xgetpass.c	2021-09-02 07:09:11.370551480 +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.37/lib/xgetpass.c util-linux-2.37-AES/lib/xgetpass.c
 +	if(p) p[y] = 0;
 +	return p;
 +}
-diff -urN util-linux-2.37/libmount/src/Makemodule.am util-linux-2.37-AES/libmount/src/Makemodule.am
---- util-linux-2.37/libmount/src/Makemodule.am	2021-05-31 18:31:47.951009645 +0300
-+++ util-linux-2.37-AES/libmount/src/Makemodule.am	2021-06-20 14:51:07.590871146 +0300
+diff -urN util-linux-2.37.2/libmount/src/Makemodule.am util-linux-2.37.2-AES/libmount/src/Makemodule.am
+--- util-linux-2.37.2/libmount/src/Makemodule.am	2021-05-31 18:31:47.951009645 +0300
++++ util-linux-2.37.2-AES/libmount/src/Makemodule.am	2021-09-02 07:09:11.371551488 +0300
 @@ -27,7 +27,10 @@
  if LINUX
  libmount_la_SOURCES += \
@@ -134,9 +134,9 @@ diff -urN util-linux-2.37/libmount/src/Makemodule.am util-linux-2.37-AES/libmoun
  	libmount/src/context_veritydev.c \
  	libmount/src/context_mount.c \
  	libmount/src/context_umount.c \
-diff -urN util-linux-2.37/libmount/src/aes.c util-linux-2.37-AES/libmount/src/aes.c
---- util-linux-2.37/libmount/src/aes.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/libmount/src/aes.c	2021-06-20 14:51:07.591871154 +0300
+diff -urN util-linux-2.37.2/libmount/src/aes.c util-linux-2.37.2-AES/libmount/src/aes.c
+--- util-linux-2.37.2/libmount/src/aes.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/libmount/src/aes.c	2021-09-02 07:09:11.371551488 +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.37/libmount/src/aes.c util-linux-2.37-AES/libmount/src/ae
 +
 +    state_out(out_blk, b0);
 +}
-diff -urN util-linux-2.37/libmount/src/aes.h util-linux-2.37-AES/libmount/src/aes.h
---- util-linux-2.37/libmount/src/aes.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/libmount/src/aes.h	2021-06-20 14:51:07.591871154 +0300
+diff -urN util-linux-2.37.2/libmount/src/aes.h util-linux-2.37.2-AES/libmount/src/aes.h
+--- util-linux-2.37.2/libmount/src/aes.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/libmount/src/aes.h	2021-09-02 07:09:11.372551495 +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.37/libmount/src/aes.h util-linux-2.37-AES/libmount/src/ae
 +// if their parameters have not changed.
 +
 +#endif  // _AES_H
-diff -urN util-linux-2.37/libmount/src/context.c util-linux-2.37-AES/libmount/src/context.c
---- util-linux-2.37/libmount/src/context.c	2021-05-06 13:55:46.900423396 +0300
-+++ util-linux-2.37-AES/libmount/src/context.c	2021-06-20 14:51:07.592871163 +0300
+diff -urN util-linux-2.37.2/libmount/src/context.c util-linux-2.37.2-AES/libmount/src/context.c
+--- util-linux-2.37.2/libmount/src/context.c	2021-08-16 13:57:48.580807607 +0300
++++ util-linux-2.37.2-AES/libmount/src/context.c	2021-09-02 07:09:11.373551503 +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.37/libmount/src/context.c util-linux-2.37-AES/libmount/sr
  	fl = cxt->flags;
  
  	mnt_unref_fs(cxt->fs);
-diff -urN util-linux-2.37/libmount/src/context_loopdev1.c util-linux-2.37-AES/libmount/src/context_loopdev1.c
---- util-linux-2.37/libmount/src/context_loopdev1.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/libmount/src/context_loopdev1.c	2021-06-20 14:51:07.593871171 +0300
+diff -urN util-linux-2.37.2/libmount/src/context_loopdev1.c util-linux-2.37.2-AES/libmount/src/context_loopdev1.c
+--- util-linux-2.37.2/libmount/src/context_loopdev1.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/libmount/src/context_loopdev1.c	2021-09-02 07:09:11.374551510 +0300
 @@ -0,0 +1,1525 @@
 +/*
 + * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
@@ -2087,9 +2087,9 @@ diff -urN util-linux-2.37/libmount/src/context_loopdev1.c util-linux-2.37-AES/li
 +	cxt->loopdev_fd = -1;
 +	return 0;
 +}
-diff -urN util-linux-2.37/libmount/src/context_umount.c util-linux-2.37-AES/libmount/src/context_umount.c
---- util-linux-2.37/libmount/src/context_umount.c	2021-05-06 13:55:46.901423390 +0300
-+++ util-linux-2.37-AES/libmount/src/context_umount.c	2021-06-20 14:51:07.593871171 +0300
+diff -urN util-linux-2.37.2/libmount/src/context_umount.c util-linux-2.37.2-AES/libmount/src/context_umount.c
+--- util-linux-2.37.2/libmount/src/context_umount.c	2021-07-20 12:31:43.451321659 +0300
++++ util-linux-2.37.2-AES/libmount/src/context_umount.c	2021-09-02 07:09:11.374551510 +0300
 @@ -390,11 +390,12 @@
   */
  static int is_associated_fs(const char *devname, struct libmnt_fs *fs)
@@ -2132,7 +2132,7 @@ diff -urN util-linux-2.37/libmount/src/context_umount.c util-linux-2.37-AES/libm
  }
  
  static int prepare_helper_from_options(struct libmnt_context *cxt,
-@@ -981,7 +982,7 @@
+@@ -978,7 +979,7 @@
  	if (!rc && mnt_context_is_loopdel(cxt) && cxt->fs) {
  		const char *src = mnt_fs_get_srcpath(cxt->fs);
  
@@ -2141,9 +2141,9 @@ diff -urN util-linux-2.37/libmount/src/context_umount.c util-linux-2.37-AES/libm
  			mnt_context_enable_loopdel(cxt, FALSE);
  	}
  
-diff -urN util-linux-2.37/libmount/src/optmap.c util-linux-2.37-AES/libmount/src/optmap.c
---- util-linux-2.37/libmount/src/optmap.c	2021-05-06 13:55:46.903423381 +0300
-+++ util-linux-2.37-AES/libmount/src/optmap.c	2021-06-20 14:51:07.593871171 +0300
+diff -urN util-linux-2.37.2/libmount/src/optmap.c util-linux-2.37.2-AES/libmount/src/optmap.c
+--- util-linux-2.37.2/libmount/src/optmap.c	2021-08-16 13:57:48.582807597 +0300
++++ util-linux-2.37.2-AES/libmount/src/optmap.c	2021-09-02 07:09:11.374551510 +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.37/libmount/src/optmap.c util-linux-2.37-AES/libmount/src
  
     { "nofail",  MNT_MS_NOFAIL, MNT_NOMTAB },               /* Do not fail if ENOENT on dev */
  
-diff -urN util-linux-2.37/libmount/src/rmd160.c util-linux-2.37-AES/libmount/src/rmd160.c
---- util-linux-2.37/libmount/src/rmd160.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/libmount/src/rmd160.c	2021-06-20 14:51:07.593871171 +0300
+diff -urN util-linux-2.37.2/libmount/src/rmd160.c util-linux-2.37.2-AES/libmount/src/rmd160.c
+--- util-linux-2.37.2/libmount/src/rmd160.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/libmount/src/rmd160.c	2021-09-02 07:09:11.374551510 +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.37/libmount/src/rmd160.c util-linux-2.37-AES/libmount/src
 +    rmd160_final( &hd );
 +    memcpy( outbuf, hd.buf, 20 );
 +}
-diff -urN util-linux-2.37/libmount/src/rmd160.h util-linux-2.37-AES/libmount/src/rmd160.h
---- util-linux-2.37/libmount/src/rmd160.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/libmount/src/rmd160.h	2021-06-20 14:51:07.593871171 +0300
+diff -urN util-linux-2.37.2/libmount/src/rmd160.h util-linux-2.37.2-AES/libmount/src/rmd160.h
+--- util-linux-2.37.2/libmount/src/rmd160.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/libmount/src/rmd160.h	2021-09-02 07:09:11.374551510 +0300
 @@ -0,0 +1,9 @@
 +#ifndef RMD160_H
 +#define RMD160_H
@@ -2715,9 +2715,9 @@ diff -urN util-linux-2.37/libmount/src/rmd160.h util-linux-2.37-AES/libmount/src
 +#endif /*RMD160_H*/
 +
 +
-diff -urN util-linux-2.37/libmount/src/sha512.c util-linux-2.37-AES/libmount/src/sha512.c
---- util-linux-2.37/libmount/src/sha512.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/libmount/src/sha512.c	2021-06-20 14:51:07.594871180 +0300
+diff -urN util-linux-2.37.2/libmount/src/sha512.c util-linux-2.37.2-AES/libmount/src/sha512.c
+--- util-linux-2.37.2/libmount/src/sha512.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/libmount/src/sha512.c	2021-09-02 07:09:11.374551510 +0300
 @@ -0,0 +1,432 @@
 +/*
 + *  sha512.c
@@ -3151,9 +3151,9 @@ diff -urN util-linux-2.37/libmount/src/sha512.c util-linux-2.37-AES/libmount/src
 +    memset(&ctx, 0, sizeof(ctx));
 +}
 +#endif
-diff -urN util-linux-2.37/libmount/src/sha512.h util-linux-2.37-AES/libmount/src/sha512.h
---- util-linux-2.37/libmount/src/sha512.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/libmount/src/sha512.h	2021-06-20 14:51:07.594871180 +0300
+diff -urN util-linux-2.37.2/libmount/src/sha512.h util-linux-2.37.2-AES/libmount/src/sha512.h
+--- util-linux-2.37.2/libmount/src/sha512.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/libmount/src/sha512.h	2021-09-02 07:09:11.374551510 +0300
 @@ -0,0 +1,45 @@
 +/*
 + *  sha512.h
@@ -3200,10 +3200,10 @@ diff -urN util-linux-2.37/libmount/src/sha512.h util-linux-2.37-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.37/sys-utils/Makemodule.am util-linux-2.37-AES/sys-utils/Makemodule.am
---- util-linux-2.37/sys-utils/Makemodule.am	2021-05-24 14:39:52.785045175 +0300
-+++ util-linux-2.37-AES/sys-utils/Makemodule.am	2021-06-20 14:51:07.594871180 +0300
-@@ -291,7 +291,7 @@
+diff -urN util-linux-2.37.2/sys-utils/Makemodule.am util-linux-2.37.2-AES/sys-utils/Makemodule.am
+--- util-linux-2.37.2/sys-utils/Makemodule.am	2021-07-20 12:34:53.356456837 +0300
++++ util-linux-2.37.2-AES/sys-utils/Makemodule.am	2021-09-02 07:09:11.375551518 +0300
+@@ -292,7 +292,7 @@
  sbin_PROGRAMS += losetup
  MANPAGES += sys-utils/losetup.8
  dist_noinst_DATA += sys-utils/losetup.8.adoc
@@ -3212,7 +3212,7 @@ diff -urN util-linux-2.37/sys-utils/Makemodule.am util-linux-2.37-AES/sys-utils/
  losetup_LDADD = $(LDADD) libcommon.la libsmartcols.la
  losetup_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
  
-@@ -398,6 +398,8 @@
+@@ -399,6 +399,8 @@
  
  swapon_SOURCES = \
  	sys-utils/swapon.c \
@@ -3221,7 +3221,7 @@ diff -urN util-linux-2.37/sys-utils/Makemodule.am util-linux-2.37-AES/sys-utils/
  	sys-utils/swapon-common.c \
  	sys-utils/swapon-common.h \
  	lib/swapprober.c \
-@@ -414,6 +416,7 @@
+@@ -415,6 +417,7 @@
  
  swapoff_SOURCES = \
  	sys-utils/swapoff.c \
@@ -3229,9 +3229,9 @@ diff -urN util-linux-2.37/sys-utils/Makemodule.am util-linux-2.37-AES/sys-utils/
  	sys-utils/swapon-common.c \
  	sys-utils/swapon-common.h \
  	lib/swapprober.c \
-diff -urN util-linux-2.37/sys-utils/loop.c util-linux-2.37-AES/sys-utils/loop.c
---- util-linux-2.37/sys-utils/loop.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/sys-utils/loop.c	2021-06-20 14:51:07.594871180 +0300
+diff -urN util-linux-2.37.2/sys-utils/loop.c util-linux-2.37.2-AES/sys-utils/loop.c
+--- util-linux-2.37.2/sys-utils/loop.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/sys-utils/loop.c	2021-09-02 07:09:11.375551518 +0300
 @@ -0,0 +1,221 @@
 +/*
 + *  loop.c
@@ -3454,9 +3454,9 @@ diff -urN util-linux-2.37/sys-utils/loop.c util-linux-2.37-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.37/sys-utils/loop.h util-linux-2.37-AES/sys-utils/loop.h
---- util-linux-2.37/sys-utils/loop.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/sys-utils/loop.h	2021-06-20 14:51:07.594871180 +0300
+diff -urN util-linux-2.37.2/sys-utils/loop.h util-linux-2.37.2-AES/sys-utils/loop.h
+--- util-linux-2.37.2/sys-utils/loop.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/sys-utils/loop.h	2021-09-02 07:09:11.375551518 +0300
 @@ -0,0 +1,87 @@
 +/*
 + *  loop.h
@@ -3545,9 +3545,9 @@ diff -urN util-linux-2.37/sys-utils/loop.h util-linux-2.37-AES/sys-utils/loop.h
 +extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
 +
 +#endif
-diff -urN util-linux-2.37/sys-utils/losetup.8.adoc util-linux-2.37-AES/sys-utils/losetup.8.adoc
---- util-linux-2.37/sys-utils/losetup.8.adoc	2021-05-06 13:55:47.027422763 +0300
-+++ util-linux-2.37-AES/sys-utils/losetup.8.adoc	2021-06-20 14:51:07.595871188 +0300
+diff -urN util-linux-2.37.2/sys-utils/losetup.8.adoc util-linux-2.37.2-AES/sys-utils/losetup.8.adoc
+--- util-linux-2.37.2/sys-utils/losetup.8.adoc	2021-06-02 12:46:28.258787794 +0300
++++ util-linux-2.37.2-AES/sys-utils/losetup.8.adoc	2021-09-02 09:17:45.814927884 +0300
 @@ -12,159 +12,135 @@
  
  == SYNOPSIS
@@ -3801,15 +3801,15 @@ diff -urN util-linux-2.37/sys-utils/losetup.8.adoc util-linux-2.37-AES/sys-utils
 +== AUTHORS
  
 -include::man-common/footer.adoc[]
-+Original version: Theodore Ts'o <tytso@athena.mit.edu>
++Original version: Theodore Ts'o
  
 -ifdef::translation[]
 -include::man-common/translation.adoc[]
 -endif::[]
 +AES support: Jari Ruusu
-diff -urN util-linux-2.37/sys-utils/losetup1.c util-linux-2.37-AES/sys-utils/losetup1.c
---- util-linux-2.37/sys-utils/losetup1.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.37-AES/sys-utils/losetup1.c	2021-06-20 14:51:07.595871188 +0300
+diff -urN util-linux-2.37.2/sys-utils/losetup1.c util-linux-2.37.2-AES/sys-utils/losetup1.c
+--- util-linux-2.37.2/sys-utils/losetup1.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.37.2-AES/sys-utils/losetup1.c	2021-09-02 07:09:11.376551526 +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 */
@@ -5092,9 +5092,9 @@ diff -urN util-linux-2.37/sys-utils/losetup1.c util-linux-2.37-AES/sys-utils/los
 +	}
 +	return res;
 +}
-diff -urN util-linux-2.37/sys-utils/mount.8.adoc util-linux-2.37-AES/sys-utils/mount.8.adoc
---- util-linux-2.37/sys-utils/mount.8.adoc	2021-05-24 14:39:52.787045165 +0300
-+++ util-linux-2.37-AES/sys-utils/mount.8.adoc	2021-06-20 14:51:07.595871188 +0300
+diff -urN util-linux-2.37.2/sys-utils/mount.8.adoc util-linux-2.37.2-AES/sys-utils/mount.8.adoc
+--- util-linux-2.37.2/sys-utils/mount.8.adoc	2021-08-16 14:00:18.083019067 +0300
++++ util-linux-2.37.2-AES/sys-utils/mount.8.adoc	2021-09-02 07:09:11.376551526 +0300
 @@ -374,6 +374,9 @@
  *--options-source-force*::
  Use options from _fstab_/_mtab_ even if both _device_ and _dir_ are specified.
@@ -5105,7 +5105,7 @@ diff -urN util-linux-2.37/sys-utils/mount.8.adoc util-linux-2.37-AES/sys-utils/m
  *-R*, *--rbind*::
  Remount a subtree and all possible submounts somewhere else (so that its contents are available in both places). See above, the subsection *Bind mounts*.
  
-@@ -1344,7 +1347,9 @@
+@@ -1445,7 +1448,9 @@
  *mount -t ext4 /tmp/disk.img /mnt*
  ____
  
@@ -5116,9 +5116,9 @@ diff -urN util-linux-2.37/sys-utils/mount.8.adoc util-linux-2.37-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.37/sys-utils/mount.c util-linux-2.37-AES/sys-utils/mount.c
---- util-linux-2.37/sys-utils/mount.c	2021-05-06 13:55:47.032422739 +0300
-+++ util-linux-2.37-AES/sys-utils/mount.c	2021-06-20 14:51:07.596871196 +0300
+diff -urN util-linux-2.37.2/sys-utils/mount.c util-linux-2.37.2-AES/sys-utils/mount.c
+--- util-linux-2.37.2/sys-utils/mount.c	2021-08-16 13:57:48.681807074 +0300
++++ util-linux-2.37.2-AES/sys-utils/mount.c	2021-09-02 07:09:11.376551526 +0300
 @@ -36,6 +36,7 @@
  #include "c.h"
  #include "env.h"
@@ -5135,7 +5135,7 @@ diff -urN util-linux-2.37/sys-utils/mount.c util-linux-2.37-AES/sys-utils/mount.
  static int mk_exit_code(struct libmnt_context *cxt, int rc);
  
  static void suid_drop(struct libmnt_context *cxt)
-@@ -105,6 +107,32 @@
+@@ -100,6 +102,32 @@
  	return 1;
  }
  
@@ -5168,7 +5168,7 @@ diff -urN util-linux-2.37/sys-utils/mount.c util-linux-2.37-AES/sys-utils/mount.
  /*
   * Replace control chars with '?' to be compatible with coreutils. For more
   * robust solution use findmnt(1) where we use \x?? hex encoding.
-@@ -477,6 +505,7 @@
+@@ -472,6 +500,7 @@
  	fprintf(out, _(
  	" -o, --options <list>    comma-separated list of mount options\n"
  	" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
@@ -5176,7 +5176,7 @@ diff -urN util-linux-2.37/sys-utils/mount.c util-linux-2.37-AES/sys-utils/mount.
  	" -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
  	" -t, --types <list>      limit the set of filesystem types\n"));
  	fprintf(out, _(
-@@ -676,7 +705,7 @@
+@@ -671,7 +700,7 @@
  
  	mnt_context_set_tables_errcb(cxt, table_parser_errcb);
  
@@ -5185,7 +5185,7 @@ diff -urN util-linux-2.37/sys-utils/mount.c util-linux-2.37-AES/sys-utils/mount.
  					longopts, NULL)) != -1) {
  
  		/* only few options are allowed for non-root users */
-@@ -736,6 +765,10 @@
+@@ -731,6 +760,10 @@
  			if (mnt_context_set_options_pattern(cxt, optarg))
  				err(MNT_EX_SYSERR, _("failed to set options pattern"));
  			break;
@@ -5196,7 +5196,7 @@ diff -urN util-linux-2.37/sys-utils/mount.c util-linux-2.37-AES/sys-utils/mount.
  		case 'L':
  			xasprintf(&srcbuf, "LABEL=\"%s\"", optarg);
  			mnt_context_disable_swapmatch(cxt, 1);
-@@ -908,6 +941,8 @@
+@@ -903,6 +936,8 @@
  	else if (types)
  		mnt_context_set_fstype(cxt, types);
  
@@ -5205,9 +5205,9 @@ diff -urN util-linux-2.37/sys-utils/mount.c util-linux-2.37-AES/sys-utils/mount.
  	if (all) {
  		/*
  		 * A) Mount all
-diff -urN util-linux-2.37/sys-utils/swapoff.c util-linux-2.37-AES/sys-utils/swapoff.c
---- util-linux-2.37/sys-utils/swapoff.c	2021-05-06 13:55:47.035422724 +0300
-+++ util-linux-2.37-AES/sys-utils/swapoff.c	2021-06-20 14:51:07.596871196 +0300
+diff -urN util-linux-2.37.2/sys-utils/swapoff.c util-linux-2.37.2-AES/sys-utils/swapoff.c
+--- util-linux-2.37.2/sys-utils/swapoff.c	2021-05-06 13:55:47.035422724 +0300
++++ util-linux-2.37.2-AES/sys-utils/swapoff.c	2021-09-02 07:09:11.376551526 +0300
 @@ -1,4 +1,9 @@
  #include <stdio.h>
 +#include <sys/types.h>
@@ -5305,9 +5305,9 @@ diff -urN util-linux-2.37/sys-utils/swapoff.c util-linux-2.37-AES/sys-utils/swap
  	}
  
  	mnt_free_iter(itr);
-diff -urN util-linux-2.37/sys-utils/swapon.8.adoc util-linux-2.37-AES/sys-utils/swapon.8.adoc
---- util-linux-2.37/sys-utils/swapon.8.adoc	2021-05-06 13:55:47.036422718 +0300
-+++ util-linux-2.37-AES/sys-utils/swapon.8.adoc	2021-06-20 14:51:07.596871196 +0300
+diff -urN util-linux-2.37.2/sys-utils/swapon.8.adoc util-linux-2.37.2-AES/sys-utils/swapon.8.adoc
+--- util-linux-2.37.2/sys-utils/swapon.8.adoc	2021-06-02 12:46:28.260787782 +0300
++++ util-linux-2.37.2-AES/sys-utils/swapon.8.adoc	2021-09-02 07:09:11.376551526 +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_).
@@ -5317,9 +5317,9 @@ diff -urN util-linux-2.37/sys-utils/swapon.8.adoc util-linux-2.37-AES/sys-utils/
  == OPTIONS
  
  *-a*, *--all*::
-diff -urN util-linux-2.37/sys-utils/swapon.c util-linux-2.37-AES/sys-utils/swapon.c
---- util-linux-2.37/sys-utils/swapon.c	2021-05-06 13:55:47.036422718 +0300
-+++ util-linux-2.37-AES/sys-utils/swapon.c	2021-06-20 14:51:07.596871196 +0300
+diff -urN util-linux-2.37.2/sys-utils/swapon.c util-linux-2.37.2-AES/sys-utils/swapon.c
+--- util-linux-2.37.2/sys-utils/swapon.c	2021-07-20 12:49:57.272329687 +0300
++++ util-linux-2.37.2-AES/sys-utils/swapon.c	2021-09-02 07:09:11.377551533 +0300
 @@ -8,6 +8,8 @@
  #include <unistd.h>
  #include <sys/types.h>
@@ -5338,7 +5338,7 @@ diff -urN util-linux-2.37/sys-utils/swapon.c util-linux-2.37-AES/sys-utils/swapo
  #include "bitops.h"
  #include "blkdev.h"
  #include "pathnames.h"
-@@ -734,6 +738,227 @@
+@@ -735,6 +739,227 @@
  }
  
  
@@ -5566,7 +5566,7 @@ diff -urN util-linux-2.37/sys-utils/swapon.c util-linux-2.37-AES/sys-utils/swapo
  static int swapon_all(struct swapon_ctl *ctl)
  {
  	struct libmnt_table *tb = get_fstab();
-@@ -751,6 +976,9 @@
+@@ -752,6 +977,9 @@
  	while (mnt_table_find_next_fs(tb, itr, match_swap, NULL, &fs) == 0) {
  		/* defaults */
  		const char *opts;
@@ -5576,7 +5576,7 @@ diff -urN util-linux-2.37/sys-utils/swapon.c util-linux-2.37-AES/sys-utils/swapo
  		const char *device;
  		struct swap_prop prop;		/* per device setting */
  
-@@ -759,6 +987,10 @@
+@@ -760,6 +988,10 @@
  				warnx(_("%s: noauto option -- ignored"), mnt_fs_get_source(fs));
  			continue;
  		}
@@ -5587,7 +5587,7 @@ diff -urN util-linux-2.37/sys-utils/swapon.c util-linux-2.37-AES/sys-utils/swapo
  
  		/* default setting */
  		prop = ctl->props;
-@@ -773,23 +1005,38 @@
+@@ -774,23 +1006,38 @@
  		if (!device) {
  			if (!prop.no_fail)
  				status |= cannot_find(mnt_fs_get_source(fs));