Rebased against release 5.3.3 (43e20564)

rwpenney · Sep 4, 2022 · 149ae96 · 149ae96
1 parent 335fe54
commit 149ae96
Show file tree

Hide file tree

Showing 40 changed files with 162 additions and 128 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -24,6 +24,7 @@ very helpful in testing and improving cryptmount:
     Rennie deGraaf      (tracing pathname canonicalization issues)
     Daniel Grund        (tracing cmstatus-corruption vulnerability)
     Jens Guenther       (improving compatibility with cryptsetup-2.x)
+    Helge Kreutzmann    (updating German translations)
     Holger M�ller       (RH spec-file, Makefile.in patches, LARGEFILE testing)
     Bj�rn Nilsson       (suggestions for /dev/disk/by-id in documentation)
     Dan O'Huiginn       (patch for Debian examples directory)

diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 ChangeLog for cryptmount (http://cryptmount.sourceforge.net)
 
+27Dec20	- Incorporated updated German translations from Helge Kreutzmann
+
+06Sep20	- Refreshed cipher-mode and loop-device selection in "mudslinger" testing script
+
 16Nov19	- Refined handling of passwords in "mudslinger" testing script
 
 06Oct19	- Improved documentation of default values in cmtab manual page

diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ to the protected filesystems:
 
  *  libcryptsetup (version 1.6 or later)
  *  libgcrypt (e.g. version 1.6.0 or later)
+ *  pkg-config
 
 You will also need to ensure that your system has support for the
 loopback and device-mapper devices, which may require loading

diff --git a/RELNOTES b/RELNOTES
@@ -1,6 +1,6 @@
-		    Release notes for cryptmount-5.3.2
+		    Release notes for cryptmount-5.3.3
 
-			RW Penney, November 2019
+			RW Penney, December 2020
 
 Introduction
 ============
@@ -38,21 +38,21 @@ This (stable) release offers the following enhancements:
 
 It has been tested on the following systems:
 
-  * Arch Linux (mid-Nov-2019) (x86_64)
+  * Arch Linux (late-Dec-2020) (x86_64)
 
-  * CentOS 8.0.1905 (x86_64)
+  * CentOS 8.3.2011 (x86_64)
 
-  * Debian GNU/Linux 11.x ("bullseye"/"testing", mid_Nov-2019) (x86)
+  * Debian GNU/Linux 11.x ("bullseye"/"testing", late-Dec-2020) (amd64)
 
-  * Debian GNU/Linux 10.2 ("buster") (amd64, x86)
+  * Debian GNU/Linux 10.7 ("buster") (amd64, x86)
 
-  * Debian GNU/Linux 9.11 ("stretch") (x86)
+  * Debian GNU/Linux 9.13 ("stretch") (x86)
 
-  * Debian GNU/Linux 8.11 ("jessie") (x86)
+  * Fedora 33 (x86_64)
 
-  * Gentoo (mid-Nov-2019) (x86)
+  * Gentoo (late-Dec-2020) (x86)
 
-  * Ubuntu 19.10 ("eoan") (x86_64)
+  * Ubuntu 20.10 ("groovy") (x86_64)
 
 
 Summary of new features in cryptmount-5.2

diff --git a/armour-builtin.c b/armour-builtin.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for encryption/security mechanisms for cryptmount
- *  (C)Copyright 2007-2019, RW Penney
+ *  (C)Copyright 2007-2021, RW Penney
  */
 
 /*
@@ -517,5 +517,5 @@ keymanager_t *kmblti_gethandle(void)
 /**  @} */
 
 /*
- *  (C)Copyright 2007-2019, RW Penney
+ *  (C)Copyright 2007-2021, RW Penney
  */
diff --git a/armour-gcry.c b/armour-gcry.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for encryption/security mechanisms for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -864,5 +864,5 @@ keymanager_t *kmgcry_gethandle()
 /**  @} */
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/armour-luks.c b/armour-luks.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for LUKS-related key-management for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -524,5 +524,5 @@ keymanager_t *kmluks_gethandle()
 /**  @} */
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/armour.c b/armour.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for encryption/security mechanisms for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -862,5 +862,5 @@ int cm_mutex_unlock(void)
 /** @} */
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/armour.h b/armour.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for encryption/security mechanisms for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -139,5 +139,5 @@ int cm_mutex_unlock(void);
 #endif  /* _ARMOUR_H */
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/cmtesting.c b/cmtesting.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for unit-testing utiltities for cryptmount
- *  (C)Copyright 2006-2019, RW Penney
+ *  (C)Copyright 2006-2021, RW Penney
  */
 
 /*
@@ -113,5 +113,5 @@ int _keep_ansi_pedantic_quiet = 0;
 #endif  /* TESTING */
 
 /*
- *  (C)Copyright 2006-2019, RW Penney
+ *  (C)Copyright 2006-2021, RW Penney
  */
diff --git a/cmtesting.h b/cmtesting.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for unit-test utilities for cryptmoumt
- *  (C)Copyright 2006-2019, RW Penney
+ *  (C)Copyright 2006-2021, RW Penney
  */
 
 /*
@@ -128,5 +128,5 @@ int cm_run_tests();
 #endif  /* _CMTEST_H */
 
 /*
- *  (C)Copyright 2006-2019, RW Penney
+ *  (C)Copyright 2006-2021, RW Penney
  */
diff --git a/configure.ac b/configure.ac
@@ -1,9 +1,9 @@
 dnl autoconf script for cryptmount
-dnl (C)Copyright 2005-2019, RW Penney
+dnl (C)Copyright 2005-2021, RW Penney
 
 dnl run 'aclocal; autoconf; automake -a -c -i; ./configure; make'
 
-AC_INIT(cryptmount, 5.3.2, [email protected])
+AC_INIT(cryptmount, 5.3.3, [email protected])
 AC_PREREQ(2.59)
 
 test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc

diff --git a/cryptmount.c b/cryptmount.c
@@ -1,6 +1,6 @@
 /*
  *  cryptmount - a utility for user-level mounting of encrypted filesystems
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -169,7 +169,7 @@ int fs_test_blkgetsz()
         "/dev/hdb", "/dev/hdb1", "/dev/hdb2", "/dev/hdb3",
         "/dev/sda", "/dev/sda1", "/dev/sda2", "/dev/sda3",
         "/dev/sdb", "/dev/sdb1", "/dev/sdb2", "/dev/sdb3",
-        "/dev/xvda", "/dev/xvda1",
+        "/dev/vda", "/dev/vda1", "/dev/xvda", "/dev/xvda1",
         "/dev/sr0", "/dev/sr1",
         NULL };
 #endif
@@ -1587,5 +1587,5 @@ int main(int argc, char *argv[])
 }
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/cryptmount.h b/cryptmount.h
@@ -1,6 +1,6 @@
 /*
  *  General declarations for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -35,7 +35,7 @@
 #  if HAVE_STDINT_H
 #    include <stdint.h>
 #  else
-     typedef unsigned short         uint8_t;
+     typedef unsigned char          uint8_t;
      typedef long                   int32_t;
      typedef unsigned long          uint32_t;
      typedef long long              int64_t;
@@ -173,5 +173,5 @@ typedef struct tgtdefn
 #endif  /* _CRYPTMOUNT_H */
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/cryptmount.spec b/cryptmount.spec
@@ -1,10 +1,10 @@
 #
 # rpm spec-file for cryptmount
-# Copyright 2006-2019, Holger Mueller, Eriks Zelenka & RW Penney
+# Copyright 2006-2021, Holger Mueller, Eriks Zelenka & RW Penney
 #
 Summary:	Let ordinary users mount an encrypted file system
 Name:		cryptmount
-Version: 	5.3.2
+Version: 	5.3.3
 Release:	1%{?dist}
 License:	GPL
 URL:		http://cryptmount.sourceforge.net

diff --git a/debian/changelog b/debian/changelog
@@ -1,9 +1,20 @@
+cryptmount (5.3.3-1) unstable; urgency=low
+
+  * New upstream release
+    - -Updated German translations (Closes: bug#978114)
+
+  * Updated to Debian Standards Version 4.5.1
+
+ -- RW Penney <[email protected]>  Sat, 02 Jan 2021 08:00:00 +0000
+
 cryptmount (5.3.2-1) unstable; urgency=low
 
   * New upstream release
     - various documentation cleanups
     - fixed (benign) memory leak
 
+  * Updated to Debian Standards Version 4.4.1
+
  -- RW Penney <[email protected]>  Sun, 17 Nov 2019 16:20:00 +0000
 
 cryptmount (5.3.1-1) unstable; urgency=low

diff --git a/debian/compat b/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/debian/control b/debian/control
@@ -3,10 +3,10 @@ Section: admin
 Priority: optional
 Maintainer: RW Penney <[email protected]>
 Homepage: http://cryptmount.sourceforge.net
-Build-Depends: automake, debhelper (>= 10), libcryptsetup-dev (>= 1.6),
+Build-Depends: automake, debhelper (>= 12), libcryptsetup-dev (>= 1.6),
             libdevmapper-dev, libgcrypt20-dev (>= 1.5), pkg-config
 Rules-Requires-Root: binary-targets
-Standards-Version: 4.4.1
+Standards-Version: 4.5.1
 
 Package: cryptmount
 Architecture: linux-any

diff --git a/debian/copyright b/debian/copyright
@@ -4,7 +4,7 @@ Source: https://www.sourceforge.net/projects/cryptmount
 License: GPL-2+
 
 Files: *
-Copyright: (C) 2005 - 2019 RW Penney <[email protected]>
+Copyright: (C) 2005 - 2021 RW Penney <[email protected]>
 License: GPL-2+
 
 Files: blowfish.c blowfish.h

diff --git a/debian/cryptmount.lintian-overrides b/debian/cryptmount.lintian-overrides
@@ -1,4 +1,4 @@
 # lintian-override for cryptmount
 
-# cryptmount needs to have setuid privileges to be usable by ordinary users:
+# cryptmount needs to have setuid privileges to be usable by ordinary users
 cryptmount: setuid-binary usr/bin/cryptmount 4755 root/root
diff --git a/debian/rules b/debian/rules
@@ -20,7 +20,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@  --with autoreconf,systemd
+	dh $@
 
 .PHONY:	override_dh_auto_configure override_dh_fixperms
 

diff --git a/debian/upstream/metadata b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+Reference:
+  Author: RW Penney
+  URL: http://www.rwpenney.uk/software/index.html#cryptmount
diff --git a/delegates.h.in b/delegates.h.in
@@ -1,6 +1,6 @@
 /*
  *  Delegation-related declations for cryptmount
- *  (C)Copyright 2006-2019, RW Penney
+ *  (C)Copyright 2006-2021, RW Penney
  */
 
 /*
@@ -70,5 +70,5 @@
 #endif  /* _DELEGATES_H */
 
 /*
- *  (C)Copyright 2006-2019, RW Penney
+ *  (C)Copyright 2006-2021, RW Penney
  */
diff --git a/dmutils.c b/dmutils.c
@@ -1,6 +1,6 @@
 /*
  *  Device-mapper utilities for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -275,7 +275,7 @@ int udev_settle()
 
 #if HAVE_LIBUDEV
     udev_ctx = udev_new();
-    udev_selinux_init(udev_ctx);
+    //udev_selinux_init(udev_ctx);
     udev_qu = udev_queue_new(udev_ctx);
 #endif
 
@@ -319,7 +319,7 @@ int udev_settle()
 
 #if HAVE_LIBUDEV
     udev_queue_unref(udev_qu);
-    udev_selinux_exit(udev_ctx);
+    //udev_selinux_exit(udev_ctx);
     udev_unref(udev_ctx);
 #endif
 
@@ -377,5 +377,5 @@ int udev_active_dir(const char *path, time_t starttime, double timeout)
 }
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/dmutils.h b/dmutils.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for device-mapper utilities for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -47,5 +47,5 @@ int udev_settle();
 #endif  /* _DMUTILS_H */
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
diff --git a/doxyfront.txt b/doxyfront.txt
@@ -1,6 +1,6 @@
 /*
  *  Doxygen introductory sections for cryptmount
- *  (C)Copyright 2012-2014, RW Penney
+ *  (C)Copyright 2012-2020, RW Penney
  */
 
 /*! \mainpage Cryptmount source documentation

diff --git a/fsutils.c b/fsutils.c
@@ -1,6 +1,6 @@
 /*
  *  Filesystem-related utilities for cryptmount
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
 
 /*
@@ -719,5 +719,5 @@ int fs_test_entropy()
 #endif  /* TESTING */
 
 /*
- *  (C)Copyright 2005-2019, RW Penney
+ *  (C)Copyright 2005-2021, RW Penney
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@
     # main packaging script based on dh7 syntax
     %:
-    	dh $@  --with autoreconf,systemd
+    	dh $@
     .PHONY:	override_dh_auto_configure override_dh_fixperms
@@ Expand Down @@