Enabled libudev support by default and updated copyright notices

rwpenney · Jan 2, 2023 · df16efa · df16efa
1 parent 0a48e53
commit df16efa
Show file tree

Hide file tree

Showing 28 changed files with 59 additions and 52 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,7 @@
 ChangeLog for cryptmount (http://cryptmount.sourceforge.net)
 
+02Jan23	- Enabled libudev by default
+
 20Dec22	- Updated various maintainer URLs to point to github.com
 	Reduced verbosity of manual-page variable substitution
 	Improved unit-test support for NVME devices

diff --git a/INSTALL.md b/INSTALL.md
@@ -54,6 +54,7 @@ range of much stronger cryptographic tools:
 
   * libcryptsetup (version 1.6 or later; this is essential for LUKS support)
   * libgcrypt (version 1.8 or later)
+  * libudev (version 232 or later)
   * pkgconf or pkg-config
 
 You will also need to ensure that your system has support for the

diff --git a/armour-builtin.c b/armour-builtin.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for encryption/security mechanisms for cryptmount
- *  (C)Copyright 2007-2022, RW Penney
+ *  (C)Copyright 2007-2023, RW Penney
  */
 
 /*
@@ -517,5 +517,5 @@ keymanager_t *kmblti_gethandle(void)
 /**  @} */
 
 /*
- *  (C)Copyright 2007-2022, RW Penney
+ *  (C)Copyright 2007-2023, 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-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -888,5 +888,5 @@ keymanager_t *kmgcry_gethandle()
 /**  @} */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, 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-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -524,5 +524,5 @@ keymanager_t *kmluks_gethandle()
 /**  @} */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/armour.c b/armour.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for encryption/security mechanisms for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -874,5 +874,5 @@ int cm_mutex_unlock(void)
 /** @} */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/armour.h b/armour.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for encryption/security mechanisms for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -139,5 +139,5 @@ int cm_mutex_unlock(void);
 #endif  /* _ARMOUR_H */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/cmtesting.c b/cmtesting.c
@@ -1,6 +1,6 @@
 /*
  *  Methods for unit-testing utiltities for cryptmount
- *  (C)Copyright 2006-2022, RW Penney
+ *  (C)Copyright 2006-2023, RW Penney
  */
 
 /*
@@ -113,5 +113,5 @@ int _keep_ansi_pedantic_quiet = 0;
 #endif  /* TESTING */
 
 /*
- *  (C)Copyright 2006-2022, RW Penney
+ *  (C)Copyright 2006-2023, RW Penney
  */
diff --git a/cmtesting.h b/cmtesting.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for unit-test utilities for cryptmoumt
- *  (C)Copyright 2006-2022, RW Penney
+ *  (C)Copyright 2006-2023, RW Penney
  */
 
 /*
@@ -128,5 +128,5 @@ int cm_run_tests();
 #endif  /* _CMTEST_H */
 
 /*
- *  (C)Copyright 2006-2022, RW Penney
+ *  (C)Copyright 2006-2023, RW Penney
  */
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ dnl (C)Copyright 2005-2022, RW Penney
 
 dnl run 'aclocal; autoconf; automake -a -c -i; ./configure; make'
 
-AC_INIT(cryptmount, 6.1.1, [email protected])
+AC_INIT(cryptmount, 6.2-beta, [email protected])
 AC_PREREQ(2.59)
 
 test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
@@ -115,8 +115,8 @@ dnl udev libraries
 dnl
 AC_ARG_ENABLE([libudev],
     AS_HELP_STRING([--enable-libudev],
-        [(EXPERIMENTAL) use libudev for /dev events (default=NO)]),
-    [use_libudev="${enableval}"], [use_libudev="no"])
+        [use libudev for /dev events (default is YES)]),
+    [use_libudev="${enableval}"], [use_libudev="yes"])
 if test "x${use_libudev}" = "xyes"; then
     AC_CHECK_HEADER([libudev.h],
         AC_SEARCH_LIBS(udev_queue_get_queue_is_empty, udev,
@@ -322,7 +322,7 @@ AC_MSG_NOTICE([
         Filesystem checking:            $msg_fsck
         Crypto-swap support:            $use_cswap
         libgcrypt support:              $msg_gcry
-        libudev support (EXPERIMENTAL): $udevlib
+        libudev support:                $udevlib
         LUKS support:                   $msg_luks
 
 ])

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-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -1586,5 +1586,5 @@ int main(int argc, char *argv[])
 }
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/cryptmount.h b/cryptmount.h
@@ -1,6 +1,6 @@
 /*
  *  General declarations for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -173,5 +173,5 @@ typedef struct tgtdefn
 #endif  /* _CRYPTMOUNT_H */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/debian/control b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: RW Penney <[email protected]>
 Homepage: https://github.com/rwpenney/cryptmount
 Build-Depends: automake, debhelper-compat (= 12), libcryptsetup-dev (>= 2.0),
-            libdevmapper-dev, libgcrypt20-dev (>= 1.8), pkgconf
+            libdevmapper-dev, libgcrypt20-dev (>= 1.8), libudev-dev, pkgconf
 Rules-Requires-Root: binary-targets
 Standards-Version: 4.6.2
 

diff --git a/delegates.h.in b/delegates.h.in
@@ -1,6 +1,6 @@
 /*
  *  Delegation-related declations for cryptmount
- *  (C)Copyright 2006-2022, RW Penney
+ *  (C)Copyright 2006-2023, RW Penney
  */
 
 /*
@@ -70,5 +70,5 @@
 #endif  /* _DELEGATES_H */
 
 /*
- *  (C)Copyright 2006-2021, RW Penney
+ *  (C)Copyright 2006-2023, RW Penney
  */
diff --git a/dmutils.c b/dmutils.c
@@ -1,6 +1,6 @@
 /*
  *  Device-mapper utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -322,6 +322,8 @@ int udev_settle()
 }
 
 
+#if !HAVE_LIBUDEV
+
 int udev_queue_size(const char *path)
     /*! Count number of unprocessed udev events in queue.bin file */
 {   FILE *fp;
@@ -373,6 +375,8 @@ int udev_active_dir(const char *path, time_t starttime, double timeout)
     return settling;
 }
 
+#endif  // !HAVE_LIBUDEV
+
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/dmutils.h b/dmutils.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for device-mapper utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -47,5 +47,5 @@ int udev_settle();
 #endif  /* _DMUTILS_H */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/fsutils.c b/fsutils.c
@@ -1,6 +1,6 @@
 /*
  *  Filesystem-related utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -719,5 +719,5 @@ int fs_test_entropy()
 #endif  /* TESTING */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/fsutils.h b/fsutils.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for filesytem-related utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -44,5 +44,5 @@ double fs_entropy(const char *dev, const size_t blklen);
 #endif  /* _FSUTILS_H */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/looputils.c b/looputils.c
@@ -1,6 +1,6 @@
 /*
  *  Loopback-device utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -302,5 +302,5 @@ int unblockify_file(const char **devname, int isloop)
 }
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/looputils.h b/looputils.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for loopback-device utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -45,5 +45,5 @@ int unblockify_file(const char **devname, int isloop);
 #endif  /* _LOOPUTILS_H */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/man/cmtab.5.in b/man/cmtab.5.in
@@ -1,5 +1,5 @@
 .\" cmtab (cryptmount) manual page
-.\" Copyright (c) 2005-2022 RW Penney
+.\" (C)Copyright 2005-2023 RW Penney
 .\"
 
 .\" ---- macro definitions ----
@@ -547,7 +547,7 @@ but various advanced LUKS features must be accessed through
 .\" --------------------------------
 .SH COPYRIGHT NOTICE
 .B cryptmount
-is Copyright 2005-2022 RW Penney
+is Copyright 2005-2023, RW Penney
 .br
 and is supplied with NO WARRANTY.
 Licencing terms are as described in the file "COPYING"

diff --git a/man/cryptmount-setup.8.in b/man/cryptmount-setup.8.in
@@ -1,5 +1,5 @@
 .\" cryptmount-setup manual page
-.\" Copyright (c) 2007-2022 RW Penney
+.\" (C)Copyright 2007-2023 RW Penney
 .\"
 .TH CRYPTMOUNT-SETUP 8 "2018-01-18" "@PACKAGE_VERSION@" "User commands"
 .SH NAME
@@ -39,7 +39,7 @@ For more advanced options, please see the manual page for
 .\" --------------------------------
 .SH COPYRIGHT NOTICE
 .B cryptmount
-is Copyright 2005-2022 RW Penney
+is Copyright 2005-2023, RW Penney
 .br
 and is supplied with NO WARRANTY.
 Licencing terms are as described in the file "COPYING"

diff --git a/man/cryptmount.8.in b/man/cryptmount.8.in
@@ -1,5 +1,5 @@
 .\" cryptmount manual page
-.\" Copyright (c) 2005-2022 RW Penney
+.\" (C)Copyright 2005-2023 RW Penney
 .\"
 .TH CRYPTMOUNT 8 "2022-09-03" "@PACKAGE_VERSION@" "User commands"
 .SH NAME
@@ -428,7 +428,7 @@ suggestions and bug-reports, via https://github.com/rwpenney/cryptmount/issues
 .\" --------------------------------
 .SH COPYRIGHT NOTICE
 .B cryptmount
-is Copyright 2005-2022 RW Penney
+is Copyright 2005-2023, RW Penney
 .br
 and is supplied with NO WARRANTY.
 Licencing terms are as described in the file "COPYING"

diff --git a/sysinit/setupscript.sh.in b/sysinit/setupscript.sh.in
@@ -310,7 +310,7 @@ eval_gettext "cryptmount setup script"; echo; echo
 
 eval_gettext "This program will allow you to setup a secure filing-system that will be managed by \"cryptmount\". You will be able to select basic features such as the location and size of the filesystem - if you want more advanced features, you should consult the cryptmount manual page." | FoldLines; echo; echo
 
-echo "cryptmount version @PKG_VERSION@, (C)Copyright 2007-2022 RW Penney"
+echo "cryptmount version @PKG_VERSION@, (C)Copyright 2007-2023, RW Penney"
 eval_gettext "cryptmount comes with ABSOLUTELY NO WARRANTY."; echo
 eval_gettext "This is free software, and you are welcome to redistribute it under certain conditions - see the file 'COPYING' in the source directory." | FoldLines; echo
 

diff --git a/tables.c b/tables.c
@@ -1,6 +1,6 @@
 /*
  *  Config-table and mount-table utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -1008,5 +1008,5 @@ int is_cmstatus_intact()
 }
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
diff --git a/tables.h b/tables.h
@@ -1,6 +1,6 @@
 /*
  *  Declarations for config-table & mount-table utilities for cryptmount
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */
 
 /*
@@ -71,5 +71,5 @@ int is_cmstatus_intact();
 #endif  /* _TABLES_H */
 
 /*
- *  (C)Copyright 2005-2022, RW Penney
+ *  (C)Copyright 2005-2023, RW Penney
  */