util-linux-aes: Follow loop-AES release 3.7r

3 files changed, 155 insertions, 138 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7bab17b6666..2eb7ecd97258 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.35.2
-	pkgrel = 1
+	pkgver = 2.36
+	pkgrel = 4
 	url = https://github.com/karelzak/util-linux
 	install = util-linux-aes.install
 	arch = x86_64
@@ -9,10 +9,11 @@ pkgbase = util-linux-aes
 	makedepends = systemd
 	makedepends = python
 	makedepends = libcap-ng
+	makedepends = libxcrypt
 	options = strip
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.35/util-linux-2.35.2.tar.sign
-	source = util-linux-2.35.2.diff
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.tar.sign
+	source = util-linux-2.36.diff
 	source = util-linux-aes.modules
 	source = pam-login
 	source = pam-common
@@ -23,9 +24,9 @@ pkgbase = util-linux-aes
 	source = rfkill-unblock_.service
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
-	sha256sums = 21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a
+	sha256sums = 9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1
 	sha256sums = SKIP
-	sha256sums = b500e906f0675318647a1af5696866822794d1fd535a6adf1b3f0f17e4ce56f7
+	sha256sums = dab79ac6d863a1b93a6885f0c33badb4030522592848e5b4df37d3d9e0cbe73a
 	sha256sums = 560ca858961eb997a216ce6b419d900e84688591abf4584ef30c9323ba06fffd
 	sha256sums = 993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92
 	sha256sums = fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20
@@ -41,8 +42,15 @@ pkgname = util-linux-aes
 	depends = shadow
 	depends = coreutils
 	depends = systemd-libs
+	depends = libsystemd.so
+	depends = libudev.so
 	depends = libcap-ng
-	depends = libutil-linux-aes
+	depends = libxcrypt
+	depends = libcrypt.so
+	depends = util-linux-libs-aes
+	depends = libmagic.so
+	depends = libncursesw.so
+	depends = libreadline.so
 	optdepends = python: python bindings to libmount
 	optdepends = words: default dictionary for look
 	provides = rfkill
@@ -58,8 +66,14 @@ pkgname = util-linux-aes
 	backup = etc/pam.d/su
 	backup = etc/pam.d/su-l
 
-pkgname = libutil-linux-aes
+pkgname = util-linux-libs-aes
 	pkgdesc = util-linux runtime libraries
 	provides = libutil-linux
+	provides = libblkid.so
+	provides = libfdisk.so
+	provides = libmount.so
+	provides = libsmartcols.so
+	provides = libuuid.so
 	conflicts = libutil-linux
+	replaces = libutil-linux
 
diff --git a/PKGBUILD b/PKGBUILD
index cf15987183a0..09221488c001 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,15 @@
 
 _basename=util-linux
 pkgbase=util-linux-aes
-pkgname=(util-linux-aes libutil-linux-aes)
-_pkgmajor=2.35
-pkgver=${_pkgmajor}.2
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux, with loop-AES support"
+pkgname=(util-linux-aes util-linux-libs-aes)
+_pkgmajor=2.36
+pkgver=${_pkgmajor}
+pkgrel=4
+pkgdesc='Miscellaneous system utilities for Linux, with loop-AES support'
 url='https://github.com/karelzak/util-linux'
 #url="http://sourceforge.net/projects/loop-aes/"
 arch=('x86_64')
-makedepends=('systemd' 'python' 'libcap-ng')
+makedepends=('systemd' 'python' 'libcap-ng' 'libxcrypt')
 license=('GPL2')
 options=('strip')
 install=${pkgname}.install
@@ -28,9 +28,9 @@ source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${_basena
         '60-rfkill.rules'
         'rfkill-unblock_.service'
         'rfkill-block_.service')
-sha256sums=('21b7431e82f6bcd9441a01beeec3d57ed33ee948f8a5b41da577073c372eb58a'
+sha256sums=('9e4b1c67eb13b9b67feb32ae1dc0d50e08ce9e5d82e1cccd0ee771ad2fa9e0b1'
             'SKIP'
-            'b500e906f0675318647a1af5696866822794d1fd535a6adf1b3f0f17e4ce56f7'
+            'dab79ac6d863a1b93a6885f0c33badb4030522592848e5b4df37d3d9e0cbe73a'
             '560ca858961eb997a216ce6b419d900e84688591abf4584ef30c9323ba06fffd'
             '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92'
             'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20'
@@ -80,7 +80,9 @@ package_util-linux-aes() {
   conflicts=('rfkill' "${_basename}")
   provides=('rfkill' "${_basename}")
   replaces=('rfkill')
-  depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libcap-ng' 'libutil-linux-aes')
+  depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
+           'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs-aes'
+           'libmagic.so' 'libncursesw.so' 'libreadline.so')
   optdepends=('python: python bindings to libmount'
               'words: default dictionary for look')
   backup=(etc/pam.d/chfn
@@ -99,13 +101,13 @@ package_util-linux-aes() {
   chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
 
   # install PAM files for login-utils
-  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
-  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
-  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
-  install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser"
-  install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
+  install -Dm0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
+  install -m0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
+  install -m0644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
+  install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser"
+  install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l"
+  install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
+  install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
 
   # TODO(dreisner): offer this upstream?
   sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket"
@@ -116,30 +118,30 @@ package_util-linux-aes() {
   mv usr/sbin/* usr/bin
   rmdir usr/sbin
 
-  ### runtime libs are shipped as part of libutil-linux
+  ### runtime libs are shipped as part of util-linux-libs
   rm "$pkgdir"/usr/lib/lib*.{a,so}*
 
   ### install systemd-sysusers
-  install -Dm644 "$srcdir/util-linux-aes.sysusers" \
+  install -Dm0644 "$srcdir/util-linux-aes.sysusers" \
     "$pkgdir/usr/lib/sysusers.d/util-linux-aes.conf"
 
-  install -Dm644 "$srcdir/60-rfkill.rules" \
+  install -Dm0644 "$srcdir/60-rfkill.rules" \
     "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
 
-  install -Dm644 "$srcdir/rfkill-unblock_.service" \
+  install -Dm0644 "$srcdir/rfkill-unblock_.service" \
     "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service"
-  install -Dm644 "$srcdir/rfkill-block_.service" \
+  install -Dm0644 "$srcdir/rfkill-block_.service" \
     "$pkgdir/usr/lib/systemd/system/rfkill-block@.service"
 
   # install modules
   install -Dm644 "${srcdir}/${pkgname}.modules" "${pkgdir}/etc/modules-load.d/${pkgname}.conf"
 }
 
-package_libutil-linux-aes() {
+package_util-linux-libs-aes() {
   pkgdesc="util-linux runtime libraries"
-  provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
-  conflicts=("libutil-linux")
-  provides=("libutil-linux")
+  provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+  conflicts=('libutil-linux')
+  replaces=('libutil-linux')
 
   make -C "$_basename-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
 }
diff --git a/util-linux-2.35.2.diff b/util-linux-2.36.diff
index 19a8db71e00c..918559d56c55 100644
--- a/util-linux-2.35.2.diff
+++ b/util-linux-2.36.diff
@@ -19,10 +19,10 @@ to programs, like this:
     make
 
 
-diff -urN util-linux-2.35.2/include/Makemodule.am util-linux-2.35.2-AES/include/Makemodule.am
---- util-linux-2.35.2/include/Makemodule.am	2020-05-20 15:27:43.450013565 +0300
-+++ util-linux-2.35.2-AES/include/Makemodule.am	2020-06-02 12:09:34.980739096 +0300
-@@ -46,6 +46,7 @@
+diff -urN util-linux-2.36/include/Makemodule.am util-linux-2.36-AES/include/Makemodule.am
+--- util-linux-2.36/include/Makemodule.am	2020-07-01 14:42:48.218685213 +0300
++++ util-linux-2.36-AES/include/Makemodule.am	2020-08-09 21:59:17.982217314 +0300
+@@ -47,6 +47,7 @@
  	include/procutils.h \
  	include/pt-bsd.h \
  	include/pt-mbr.h \
@@ -30,9 +30,9 @@ diff -urN util-linux-2.35.2/include/Makemodule.am util-linux-2.35.2-AES/include/
  	include/pt-mbr-partnames.h \
  	include/pt-gpt-partnames.h \
  	include/pt-sgi.h \
-diff -urN util-linux-2.35.2/include/xgetpass.h util-linux-2.35.2-AES/include/xgetpass.h
---- util-linux-2.35.2/include/xgetpass.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/include/xgetpass.h	2020-06-02 12:09:34.981739099 +0300
+diff -urN util-linux-2.36/include/xgetpass.h util-linux-2.36-AES/include/xgetpass.h
+--- util-linux-2.36/include/xgetpass.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/include/xgetpass.h	2020-08-09 21:59:17.983217323 +0300
 @@ -0,0 +1,6 @@
 +#ifndef UTIL_LINUX_XGETPASS_H
 +#define UTIL_LINUX_XGETPASS_H
@@ -40,10 +40,10 @@ diff -urN util-linux-2.35.2/include/xgetpass.h util-linux-2.35.2-AES/include/xge
 +extern char *xgetpass(int pfd, const char *prompt);
 +
 +#endif /* UTIL_LINUX_XGETPASS_H */
-diff -urN util-linux-2.35.2/lib/Makemodule.am util-linux-2.35.2-AES/lib/Makemodule.am
---- util-linux-2.35.2/lib/Makemodule.am	2020-05-20 15:27:43.451013558 +0300
-+++ util-linux-2.35.2-AES/lib/Makemodule.am	2020-06-02 12:09:34.981739099 +0300
-@@ -23,6 +23,7 @@
+diff -urN util-linux-2.36/lib/Makemodule.am util-linux-2.36-AES/lib/Makemodule.am
+--- util-linux-2.36/lib/Makemodule.am	2020-07-22 11:06:46.904692361 +0300
++++ util-linux-2.36-AES/lib/Makemodule.am	2020-08-09 21:59:17.983217323 +0300
+@@ -24,6 +24,7 @@
  	lib/strutils.c \
  	lib/timeutils.c \
  	lib/ttyutils.c \
@@ -51,9 +51,9 @@ diff -urN util-linux-2.35.2/lib/Makemodule.am util-linux-2.35.2-AES/lib/Makemodu
  	lib/exec_shell.c \
  	lib/strv.c \
  	lib/sha1.c \
-diff -urN util-linux-2.35.2/lib/xgetpass.c util-linux-2.35.2-AES/lib/xgetpass.c
---- util-linux-2.35.2/lib/xgetpass.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/lib/xgetpass.c	2020-06-02 12:09:34.981739099 +0300
+diff -urN util-linux-2.36/lib/xgetpass.c util-linux-2.36-AES/lib/xgetpass.c
+--- util-linux-2.36/lib/xgetpass.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/lib/xgetpass.c	2020-08-09 21:59:17.983217323 +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.35.2/lib/xgetpass.c util-linux-2.35.2-AES/lib/xgetpass.c
 +	if(p) p[y] = 0;
 +	return p;
 +}
-diff -urN util-linux-2.35.2/libmount/src/Makemodule.am util-linux-2.35.2-AES/libmount/src/Makemodule.am
---- util-linux-2.35.2/libmount/src/Makemodule.am	2020-04-27 11:19:10.825721526 +0300
-+++ util-linux-2.35.2-AES/libmount/src/Makemodule.am	2020-06-02 12:09:34.982739101 +0300
+diff -urN util-linux-2.36/libmount/src/Makemodule.am util-linux-2.36-AES/libmount/src/Makemodule.am
+--- util-linux-2.36/libmount/src/Makemodule.am	2020-07-22 11:06:46.915692298 +0300
++++ util-linux-2.36-AES/libmount/src/Makemodule.am	2020-08-09 21:59:17.984217331 +0300
 @@ -27,7 +27,10 @@
  if LINUX
  libmount_la_SOURCES += \
@@ -134,9 +134,9 @@ diff -urN util-linux-2.35.2/libmount/src/Makemodule.am util-linux-2.35.2-AES/lib
  	libmount/src/context_veritydev.c \
  	libmount/src/context_mount.c \
  	libmount/src/context_umount.c \
-diff -urN util-linux-2.35.2/libmount/src/aes.c util-linux-2.35.2-AES/libmount/src/aes.c
---- util-linux-2.35.2/libmount/src/aes.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/libmount/src/aes.c	2020-06-02 12:09:34.983739103 +0300
+diff -urN util-linux-2.36/libmount/src/aes.c util-linux-2.36-AES/libmount/src/aes.c
+--- util-linux-2.36/libmount/src/aes.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/libmount/src/aes.c	2020-08-09 21:59:17.984217331 +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.35.2/libmount/src/aes.c util-linux-2.35.2-AES/libmount/sr
 +
 +    state_out(out_blk, b0);
 +}
-diff -urN util-linux-2.35.2/libmount/src/aes.h util-linux-2.35.2-AES/libmount/src/aes.h
---- util-linux-2.35.2/libmount/src/aes.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/libmount/src/aes.h	2020-06-02 12:09:34.983739103 +0300
+diff -urN util-linux-2.36/libmount/src/aes.h util-linux-2.36-AES/libmount/src/aes.h
+--- util-linux-2.36/libmount/src/aes.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/libmount/src/aes.h	2020-08-09 21:59:17.985217339 +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.35.2/libmount/src/aes.h util-linux-2.35.2-AES/libmount/sr
 +// if their parameters have not changed.
 +
 +#endif  // _AES_H
-diff -urN util-linux-2.35.2/libmount/src/context.c util-linux-2.35.2-AES/libmount/src/context.c
---- util-linux-2.35.2/libmount/src/context.c	2020-05-20 15:27:43.461013497 +0300
-+++ util-linux-2.35.2-AES/libmount/src/context.c	2020-06-02 12:09:34.984739106 +0300
+diff -urN util-linux-2.36/libmount/src/context.c util-linux-2.36-AES/libmount/src/context.c
+--- util-linux-2.36/libmount/src/context.c	2020-07-22 11:06:46.916692291 +0300
++++ util-linux-2.36-AES/libmount/src/context.c	2020-08-09 21:59:17.986217348 +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.35.2/libmount/src/context.c util-linux-2.35.2-AES/libmoun
  	fl = cxt->flags;
  
  	mnt_unref_fs(cxt->fs);
-diff -urN util-linux-2.35.2/libmount/src/context_loopdev1.c util-linux-2.35.2-AES/libmount/src/context_loopdev1.c
---- util-linux-2.35.2/libmount/src/context_loopdev1.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/libmount/src/context_loopdev1.c	2020-06-02 12:09:34.985739108 +0300
+diff -urN util-linux-2.36/libmount/src/context_loopdev1.c util-linux-2.36-AES/libmount/src/context_loopdev1.c
+--- util-linux-2.36/libmount/src/context_loopdev1.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/libmount/src/context_loopdev1.c	2020-08-09 21:59:17.987217356 +0300
 @@ -0,0 +1,1525 @@
 +/*
 + * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
@@ -2087,10 +2087,10 @@ diff -urN util-linux-2.35.2/libmount/src/context_loopdev1.c util-linux-2.35.2-AE
 +	cxt->loopdev_fd = -1;
 +	return 0;
 +}
-diff -urN util-linux-2.35.2/libmount/src/context_umount.c util-linux-2.35.2-AES/libmount/src/context_umount.c
---- util-linux-2.35.2/libmount/src/context_umount.c	2020-05-20 15:27:43.462013491 +0300
-+++ util-linux-2.35.2-AES/libmount/src/context_umount.c	2020-06-02 12:09:34.985739108 +0300
-@@ -330,11 +330,12 @@
+diff -urN util-linux-2.36/libmount/src/context_umount.c util-linux-2.36-AES/libmount/src/context_umount.c
+--- util-linux-2.36/libmount/src/context_umount.c	2020-07-22 11:06:46.916692291 +0300
++++ util-linux-2.36-AES/libmount/src/context_umount.c	2020-08-09 21:59:17.987217356 +0300
+@@ -384,11 +384,12 @@
   */
  static int is_associated_fs(const char *devname, struct libmnt_fs *fs)
  {
@@ -2104,8 +2104,8 @@ diff -urN util-linux-2.35.2/libmount/src/context_umount.c util-linux-2.35.2-AES/
 +	extern int __loDev_is_loop_active_same_back(char *, char *, char *, char *);
  
  	/* check if it begins with /dev/loop */
- 	if (strncmp(devname, _PATH_DEV_LOOP, sizeof(_PATH_DEV_LOOP) - 1))
-@@ -346,16 +347,16 @@
+ 	if (strncmp(devname, _PATH_DEV_LOOP, sizeof(_PATH_DEV_LOOP) - 1) != 0)
+@@ -400,16 +401,16 @@
  
  	/* check for the offset option in @fs */
  	optstr = mnt_fs_get_user_options(fs);
@@ -2132,7 +2132,7 @@ diff -urN util-linux-2.35.2/libmount/src/context_umount.c util-linux-2.35.2-AES/
  }
  
  static int prepare_helper_from_options(struct libmnt_context *cxt,
-@@ -920,7 +921,7 @@
+@@ -974,7 +975,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.35.2/libmount/src/context_umount.c util-linux-2.35.2-AES/
  			mnt_context_enable_loopdel(cxt, FALSE);
  	}
  
-diff -urN util-linux-2.35.2/libmount/src/optmap.c util-linux-2.35.2-AES/libmount/src/optmap.c
---- util-linux-2.35.2/libmount/src/optmap.c	2020-05-20 15:27:43.463013485 +0300
-+++ util-linux-2.35.2-AES/libmount/src/optmap.c	2020-06-02 12:09:34.985739108 +0300
+diff -urN util-linux-2.36/libmount/src/optmap.c util-linux-2.36-AES/libmount/src/optmap.c
+--- util-linux-2.36/libmount/src/optmap.c	2020-07-22 11:06:46.918692280 +0300
++++ util-linux-2.36-AES/libmount/src/optmap.c	2020-08-09 21:59:17.988217365 +0300
 @@ -168,10 +168,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.35.2/libmount/src/optmap.c util-linux-2.35.2-AES/libmount
  
     { "nofail",  MNT_MS_NOFAIL, MNT_NOMTAB },               /* Do not fail if ENOENT on dev */
  
-diff -urN util-linux-2.35.2/libmount/src/rmd160.c util-linux-2.35.2-AES/libmount/src/rmd160.c
---- util-linux-2.35.2/libmount/src/rmd160.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/libmount/src/rmd160.c	2020-06-02 12:09:34.986739110 +0300
+diff -urN util-linux-2.36/libmount/src/rmd160.c util-linux-2.36-AES/libmount/src/rmd160.c
+--- util-linux-2.36/libmount/src/rmd160.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/libmount/src/rmd160.c	2020-08-09 21:59:17.988217365 +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.35.2/libmount/src/rmd160.c util-linux-2.35.2-AES/libmount
 +    rmd160_final( &hd );
 +    memcpy( outbuf, hd.buf, 20 );
 +}
-diff -urN util-linux-2.35.2/libmount/src/rmd160.h util-linux-2.35.2-AES/libmount/src/rmd160.h
---- util-linux-2.35.2/libmount/src/rmd160.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/libmount/src/rmd160.h	2020-06-02 12:09:34.986739110 +0300
+diff -urN util-linux-2.36/libmount/src/rmd160.h util-linux-2.36-AES/libmount/src/rmd160.h
+--- util-linux-2.36/libmount/src/rmd160.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/libmount/src/rmd160.h	2020-08-09 21:59:17.988217365 +0300
 @@ -0,0 +1,9 @@
 +#ifndef RMD160_H
 +#define RMD160_H
@@ -2715,9 +2715,9 @@ diff -urN util-linux-2.35.2/libmount/src/rmd160.h util-linux-2.35.2-AES/libmount
 +#endif /*RMD160_H*/
 +
 +
-diff -urN util-linux-2.35.2/libmount/src/sha512.c util-linux-2.35.2-AES/libmount/src/sha512.c
---- util-linux-2.35.2/libmount/src/sha512.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/libmount/src/sha512.c	2020-06-02 12:09:34.986739110 +0300
+diff -urN util-linux-2.36/libmount/src/sha512.c util-linux-2.36-AES/libmount/src/sha512.c
+--- util-linux-2.36/libmount/src/sha512.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/libmount/src/sha512.c	2020-08-09 21:59:17.988217365 +0300
 @@ -0,0 +1,432 @@
 +/*
 + *  sha512.c
@@ -3151,9 +3151,9 @@ diff -urN util-linux-2.35.2/libmount/src/sha512.c util-linux-2.35.2-AES/libmount
 +    memset(&ctx, 0, sizeof(ctx));
 +}
 +#endif
-diff -urN util-linux-2.35.2/libmount/src/sha512.h util-linux-2.35.2-AES/libmount/src/sha512.h
---- util-linux-2.35.2/libmount/src/sha512.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/libmount/src/sha512.h	2020-06-02 12:09:34.986739110 +0300
+diff -urN util-linux-2.36/libmount/src/sha512.h util-linux-2.36-AES/libmount/src/sha512.h
+--- util-linux-2.36/libmount/src/sha512.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/libmount/src/sha512.h	2020-08-09 21:59:17.988217365 +0300
 @@ -0,0 +1,45 @@
 +/*
 + *  sha512.h
@@ -3200,10 +3200,10 @@ diff -urN util-linux-2.35.2/libmount/src/sha512.h util-linux-2.35.2-AES/libmount
 +/* 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.35.2/sys-utils/Makemodule.am util-linux-2.35.2-AES/sys-utils/Makemodule.am
---- util-linux-2.35.2/sys-utils/Makemodule.am	2020-05-20 15:27:43.547012965 +0300
-+++ util-linux-2.35.2-AES/sys-utils/Makemodule.am	2020-06-02 12:09:34.986739110 +0300
-@@ -231,7 +231,7 @@
+diff -urN util-linux-2.36/sys-utils/Makemodule.am util-linux-2.36-AES/sys-utils/Makemodule.am
+--- util-linux-2.36/sys-utils/Makemodule.am	2020-07-22 11:06:47.010691743 +0300
++++ util-linux-2.36-AES/sys-utils/Makemodule.am	2020-08-09 21:59:17.988217365 +0300
+@@ -259,7 +259,7 @@
  if BUILD_LOSETUP
  sbin_PROGRAMS += losetup
  dist_man_MANS += sys-utils/losetup.8
@@ -3212,7 +3212,7 @@ diff -urN util-linux-2.35.2/sys-utils/Makemodule.am util-linux-2.35.2-AES/sys-ut
  losetup_LDADD = $(LDADD) libcommon.la libsmartcols.la
  losetup_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir)
  
-@@ -330,6 +330,8 @@
+@@ -358,6 +358,8 @@
  
  swapon_SOURCES = \
  	sys-utils/swapon.c \
@@ -3221,7 +3221,7 @@ diff -urN util-linux-2.35.2/sys-utils/Makemodule.am util-linux-2.35.2-AES/sys-ut
  	sys-utils/swapon-common.c \
  	sys-utils/swapon-common.h \
  	lib/swapprober.c \
-@@ -346,6 +348,7 @@
+@@ -374,6 +376,7 @@
  
  swapoff_SOURCES = \
  	sys-utils/swapoff.c \
@@ -3229,9 +3229,9 @@ diff -urN util-linux-2.35.2/sys-utils/Makemodule.am util-linux-2.35.2-AES/sys-ut
  	sys-utils/swapon-common.c \
  	sys-utils/swapon-common.h \
  	lib/swapprober.c \
-diff -urN util-linux-2.35.2/sys-utils/loop.c util-linux-2.35.2-AES/sys-utils/loop.c
---- util-linux-2.35.2/sys-utils/loop.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/sys-utils/loop.c	2020-06-02 12:09:34.986739110 +0300
+diff -urN util-linux-2.36/sys-utils/loop.c util-linux-2.36-AES/sys-utils/loop.c
+--- util-linux-2.36/sys-utils/loop.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/sys-utils/loop.c	2020-08-09 21:59:17.988217365 +0300
 @@ -0,0 +1,221 @@
 +/*
 + *  loop.c
@@ -3454,9 +3454,9 @@ diff -urN util-linux-2.35.2/sys-utils/loop.c util-linux-2.35.2-AES/sys-utils/loo
 +	loopinfo->lo_encrypt_type = 18; /* LO_CRYPT_CRYPTOAPI */
 +	return(loop_set_status64_ioctl(fd, loopinfo));
 +}
-diff -urN util-linux-2.35.2/sys-utils/loop.h util-linux-2.35.2-AES/sys-utils/loop.h
---- util-linux-2.35.2/sys-utils/loop.h	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/sys-utils/loop.h	2020-06-02 12:09:34.986739110 +0300
+diff -urN util-linux-2.36/sys-utils/loop.h util-linux-2.36-AES/sys-utils/loop.h
+--- util-linux-2.36/sys-utils/loop.h	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/sys-utils/loop.h	2020-08-09 21:59:17.989217373 +0300
 @@ -0,0 +1,87 @@
 +/*
 + *  loop.h
@@ -3545,9 +3545,9 @@ diff -urN util-linux-2.35.2/sys-utils/loop.h util-linux-2.35.2-AES/sys-utils/loo
 +extern int try_cryptoapi_loop_interface(int, struct loop_info64 *, char *);
 +
 +#endif
-diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/losetup.8
---- util-linux-2.35.2/sys-utils/losetup.8	2020-05-20 15:27:43.551012941 +0300
-+++ util-linux-2.35.2-AES/sys-utils/losetup.8	2020-06-02 12:09:34.987739112 +0300
+diff -urN util-linux-2.36/sys-utils/losetup.8 util-linux-2.36-AES/sys-utils/losetup.8
+--- util-linux-2.36/sys-utils/losetup.8	2020-07-22 11:06:47.016691708 +0300
++++ util-linux-2.36-AES/sys-utils/losetup.8	2020-08-09 21:59:17.989217373 +0300
 @@ -1,210 +1,200 @@
 -.TH LOSETUP 8 "November 2015" "util-linux" "System Administration"
 +.TH LOSETUP 8 "2012-09-24" "Linux" "MAINTENANCE COMMANDS"
@@ -3712,7 +3712,7 @@ diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/
 -.BR \-\-direct\-io [ =on | off ]
 -Enable or disable direct I/O for the backing file.  The optional argument
 -can be either \fBon\fR or \fBoff\fR.  If the argument is omitted, it defaults
--to \fBon\fR.
+-to \fBoff\fR.
 -.TP
 -.BR \-v , " \-\-verbose"
 +.IP \fB\-a\fP
@@ -3877,7 +3877,8 @@ diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/
 -.B Cryptoloop is no longer supported in favor of dm-crypt.
 -.B For more details see cryptsetup(8).
 -
- .SH RETURN VALUE
+-.SH EXIT STATUS
++.SH RETURN VALUE
  .B losetup
 -returns 0 on success, nonzero on failure.  When
 +returns 0 on success, nonzero on failure. When
@@ -3885,6 +3886,10 @@ diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/
  displays the status of a loop device, it returns 1 if the device
  is not configured and 2 if an error occurred which prevented
 -determining the status of the device.
+-
+-.SH ENVIRONMENT
+-.IP LOOPDEV_DEBUG=all
+-enables debug output.
 +.B losetup
 +from determining the status of the device.
  
@@ -3895,7 +3900,6 @@ diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/
 -.TP
 -.I /dev/loop-control
 -loop control device
--
 +.nf
 +/dev/loop0,/dev/loop1,...   loop devices (major=7)
 +.fi
@@ -3921,9 +3925,6 @@ diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/
 +umount /dev/loop0
 +losetup -d /dev/loop0
  .fi
--.SH ENVIRONMENT
--.IP LOOPDEV_DEBUG=all
--enables debug output.
 +.SH RESTRICTION
 +XOR encryption is terribly weak.
  .SH AUTHORS
@@ -3936,9 +3937,9 @@ diff -urN util-linux-2.35.2/sys-utils/losetup.8 util-linux-2.35.2-AES/sys-utils/
 +Original version: Theodore Ts'o <tytso@athena.mit.edu>
 +AES support: Jari Ruusu
 +.fi
-diff -urN util-linux-2.35.2/sys-utils/losetup1.c util-linux-2.35.2-AES/sys-utils/losetup1.c
---- util-linux-2.35.2/sys-utils/losetup1.c	1970-01-01 02:00:00.000000000 +0200
-+++ util-linux-2.35.2-AES/sys-utils/losetup1.c	2020-06-02 12:09:34.987739112 +0300
+diff -urN util-linux-2.36/sys-utils/losetup1.c util-linux-2.36-AES/sys-utils/losetup1.c
+--- util-linux-2.36/sys-utils/losetup1.c	1970-01-01 02:00:00.000000000 +0200
++++ util-linux-2.36-AES/sys-utils/losetup1.c	2020-08-09 21:59:17.989217373 +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 */
@@ -5221,10 +5222,10 @@ diff -urN util-linux-2.35.2/sys-utils/losetup1.c util-linux-2.35.2-AES/sys-utils
 +	}
 +	return res;
 +}
-diff -urN util-linux-2.35.2/sys-utils/mount.8 util-linux-2.35.2-AES/sys-utils/mount.8
---- util-linux-2.35.2/sys-utils/mount.8	2020-05-20 15:27:43.553012928 +0300
-+++ util-linux-2.35.2-AES/sys-utils/mount.8	2020-06-02 12:09:34.988739115 +0300
-@@ -737,6 +737,11 @@
+diff -urN util-linux-2.36/sys-utils/mount.8 util-linux-2.36-AES/sys-utils/mount.8
+--- util-linux-2.36/sys-utils/mount.8	2020-07-22 11:06:47.019691690 +0300
++++ util-linux-2.36-AES/sys-utils/mount.8	2020-08-09 21:59:17.990217381 +0300
+@@ -823,6 +823,11 @@
  sections.
  .RE
  
@@ -5235,8 +5236,8 @@ diff -urN util-linux-2.35.2/sys-utils/mount.8 util-linux-2.35.2-AES/sys-utils/mo
 +instead of from the terminal.
  .TP
  .BR "\-\-options\-mode " \fImode
- Controls how to combine options from fstab/mtab with options from command line.
-@@ -2466,13 +2471,19 @@
+ Controls how to combine options from
+@@ -2653,13 +2658,19 @@
  .B "mount \-t ext4 /tmp/disk.img /mnt"
  .sp
  .RE
@@ -5258,9 +5259,9 @@ diff -urN util-linux-2.35.2/sys-utils/mount.8 util-linux-2.35.2-AES/sys-utils/mo
  Since Linux 2.6.25 auto-destruction of loop devices is supported,
  meaning that any loop device allocated by
  .B mount
-diff -urN util-linux-2.35.2/sys-utils/mount.c util-linux-2.35.2-AES/sys-utils/mount.c
---- util-linux-2.35.2/sys-utils/mount.c	2020-05-20 15:27:43.553012928 +0300
-+++ util-linux-2.35.2-AES/sys-utils/mount.c	2020-06-02 12:09:34.988739115 +0300
+diff -urN util-linux-2.36/sys-utils/mount.c util-linux-2.36-AES/sys-utils/mount.c
+--- util-linux-2.36/sys-utils/mount.c	2020-07-22 11:06:47.019691690 +0300
++++ util-linux-2.36-AES/sys-utils/mount.c	2020-08-09 21:59:17.990217381 +0300
 @@ -36,6 +36,7 @@
  #include "c.h"
  #include "env.h"
@@ -5318,7 +5319,7 @@ diff -urN util-linux-2.35.2/sys-utils/mount.c util-linux-2.35.2-AES/sys-utils/mo
  	" -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, _(
-@@ -666,7 +695,7 @@
+@@ -667,7 +696,7 @@
  
  	mnt_context_set_tables_errcb(cxt, table_parser_errcb);
  
@@ -5327,7 +5328,7 @@ diff -urN util-linux-2.35.2/sys-utils/mount.c util-linux-2.35.2-AES/sys-utils/mo
  					longopts, NULL)) != -1) {
  
  		/* only few options are allowed for non-root users */
-@@ -715,6 +744,10 @@
+@@ -727,6 +756,10 @@
  			if (mnt_context_set_options_pattern(cxt, optarg))
  				err(MNT_EX_SYSERR, _("failed to set options pattern"));
  			break;
@@ -5338,7 +5339,7 @@ diff -urN util-linux-2.35.2/sys-utils/mount.c util-linux-2.35.2-AES/sys-utils/mo
  		case 'L':
  			xasprintf(&srcbuf, "LABEL=\"%s\"", optarg);
  			mnt_context_disable_swapmatch(cxt, 1);
-@@ -887,6 +920,8 @@
+@@ -899,6 +932,8 @@
  	else if (types)
  		mnt_context_set_fstype(cxt, types);
  
@@ -5347,9 +5348,9 @@ diff -urN util-linux-2.35.2/sys-utils/mount.c util-linux-2.35.2-AES/sys-utils/mo
  	if (all) {
  		/*
  		 * A) Mount all
-diff -urN util-linux-2.35.2/sys-utils/swapoff.c util-linux-2.35.2-AES/sys-utils/swapoff.c
---- util-linux-2.35.2/sys-utils/swapoff.c	2020-02-27 11:26:34.709140285 +0200
-+++ util-linux-2.35.2-AES/sys-utils/swapoff.c	2020-06-02 12:09:34.988739115 +0300
+diff -urN util-linux-2.36/sys-utils/swapoff.c util-linux-2.36-AES/sys-utils/swapoff.c
+--- util-linux-2.36/sys-utils/swapoff.c	2020-07-22 11:06:47.021691678 +0300
++++ util-linux-2.36-AES/sys-utils/swapoff.c	2020-08-09 21:59:17.990217381 +0300
 @@ -1,4 +1,9 @@
  #include <stdio.h>
 +#include <sys/types.h>
@@ -5368,8 +5369,8 @@ diff -urN util-linux-2.35.2/sys-utils/swapoff.c util-linux-2.35.2-AES/sys-utils/
  #include "c.h"
  #include "xalloc.h"
  #include "closestream.h"
-@@ -143,6 +149,45 @@
- 	exit(EXIT_SUCCESS);
+@@ -162,6 +168,45 @@
+ 	exit(SWAPOFF_EX_OK);
  }
  
 +static void
@@ -5413,8 +5414,8 @@ diff -urN util-linux-2.35.2/sys-utils/swapoff.c util-linux-2.35.2-AES/sys-utils/
 +
  static int swapoff_all(void)
  {
- 	int status = 0;
-@@ -173,8 +218,30 @@
+ 	int nerrs = 0, nsucc = 0;
+@@ -196,8 +241,30 @@
  	mnt_reset_iter(itr, MNT_ITER_FORWARD);
  
  	while (tb && mnt_table_find_next_fs(tb, itr, match_swap, NULL, &fs) == 0) {
@@ -5447,9 +5448,9 @@ diff -urN util-linux-2.35.2/sys-utils/swapoff.c util-linux-2.35.2-AES/sys-utils/
  	}
  
  	mnt_free_iter(itr);
-diff -urN util-linux-2.35.2/sys-utils/swapon.8 util-linux-2.35.2-AES/sys-utils/swapon.8
---- util-linux-2.35.2/sys-utils/swapon.8	2020-02-27 11:26:34.710140278 +0200
-+++ util-linux-2.35.2-AES/sys-utils/swapon.8	2020-06-02 12:09:34.988739115 +0300
+diff -urN util-linux-2.36/sys-utils/swapon.8 util-linux-2.36-AES/sys-utils/swapon.8
+--- util-linux-2.36/sys-utils/swapon.8	2020-07-22 11:06:47.021691678 +0300
++++ util-linux-2.36-AES/sys-utils/swapon.8	2020-08-09 21:59:17.990217381 +0300
 @@ -69,6 +69,22 @@
  .I /proc/swaps
  or
@@ -5473,9 +5474,9 @@ diff -urN util-linux-2.35.2/sys-utils/swapon.8 util-linux-2.35.2-AES/sys-utils/s
  
  .SH OPTIONS
  .TP
-diff -urN util-linux-2.35.2/sys-utils/swapon.c util-linux-2.35.2-AES/sys-utils/swapon.c
---- util-linux-2.35.2/sys-utils/swapon.c	2020-05-20 15:27:43.555012916 +0300
-+++ util-linux-2.35.2-AES/sys-utils/swapon.c	2020-06-02 12:09:34.989739117 +0300
+diff -urN util-linux-2.36/sys-utils/swapon.c util-linux-2.36-AES/sys-utils/swapon.c
+--- util-linux-2.36/sys-utils/swapon.c	2020-07-22 11:06:47.022691673 +0300
++++ util-linux-2.36-AES/sys-utils/swapon.c	2020-08-09 21:59:17.991217390 +0300
 @@ -8,6 +8,8 @@
  #include <unistd.h>
  #include <sys/types.h>
@@ -5494,7 +5495,7 @@ diff -urN util-linux-2.35.2/sys-utils/swapon.c util-linux-2.35.2-AES/sys-utils/s
  #include "bitops.h"
  #include "blkdev.h"
  #include "pathnames.h"
-@@ -722,6 +726,227 @@
+@@ -721,6 +725,227 @@
  }
  
  
@@ -5722,7 +5723,7 @@ diff -urN util-linux-2.35.2/sys-utils/swapon.c util-linux-2.35.2-AES/sys-utils/s
  static int swapon_all(struct swapon_ctl *ctl)
  {
  	struct libmnt_table *tb = get_fstab();
-@@ -739,6 +964,9 @@
+@@ -738,6 +963,9 @@
  	while (mnt_table_find_next_fs(tb, itr, match_swap, NULL, &fs) == 0) {
  		/* defaults */
  		const char *opts;
@@ -5732,7 +5733,7 @@ diff -urN util-linux-2.35.2/sys-utils/swapon.c util-linux-2.35.2-AES/sys-utils/s
  		const char *device;
  		struct swap_prop prop;		/* per device setting */
  
-@@ -747,6 +975,10 @@
+@@ -746,6 +974,10 @@
  				warnx(_("%s: noauto option -- ignored"), mnt_fs_get_source(fs));
  			continue;
  		}
@@ -5743,7 +5744,7 @@ diff -urN util-linux-2.35.2/sys-utils/swapon.c util-linux-2.35.2-AES/sys-utils/s
  
  		/* default setting */
  		prop = ctl->props;
-@@ -761,23 +993,38 @@
+@@ -760,23 +992,38 @@
  		if (!device) {
  			if (!prop.no_fail)
  				status |= cannot_find(mnt_fs_get_source(fs));