From 22827f3e32fa13df4e34042d75e6c25567aa144d Mon Sep 17 00:00:00 2001 From: Richard Penney Date: Sat, 8 Oct 2022 17:07:20 +0100 Subject: [PATCH] Rebased against release 6.1 (fd0b4a89) --- .gitignore | 5 +++++ ChangeLog | 2 ++ INSTALL.md | 6 +++--- Makefile.am | 2 +- README.md | 2 +- RELNOTES | 24 +++++++++++++++++++----- armour-builtin.c | 2 +- cmtab.example | 2 +- configure.ac | 2 +- cryptmount.spec | 4 +++- debian/changelog | 9 +++++++++ debian/docs | 1 - debian/mkDebPkg | 13 ++++++++++++- debian/rules | 6 +++++- man/cmtab.5.in | 33 ++++++++++++++++++++++----------- man/fr/cmtab.5.in | 41 ++++++++++++++++++++++++++--------------- testing/mudslinger.in | 4 +++- 17 files changed, 114 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 670d56f..757b39d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,8 @@ man/cmtab.5 man/cryptmount.8 man/cryptmount-setup.8 man/Makefile +man/*/cryptmount.8 +man/*/cmtab.5 man/*/Makefile po/Makefile @@ -41,7 +43,10 @@ po/POTFILES po/stamp-po po/*.gmo +sysinit/cryptmount.service +sysinit/initscript sysinit/Makefile.in +sysinit/setupscript testing/keys/3.1.2_luks_md5_blowfish_0 testing/keys/4.1_luks_ripemd160_twofish_0 diff --git a/ChangeLog b/ChangeLog index f65da4b..3903846 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ ChangeLog for cryptmount (http://cryptmount.sourceforge.net) +08Oct22 - *** cryptmount-6.1 released + 01Oct22 - Improved udev settling schedule and filesystem syncs Added partial support for compiling against libgcrypt-1.7 diff --git a/INSTALL.md b/INSTALL.md index fa3846b..84ae5b1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ -Installing "cryptmount" -======================= +Installing cryptmount +===================== There are three main routes by which cryptmount can be installed on a Linux-based system: @@ -12,7 +12,7 @@ All of these options will, at some stage, require root-level permissions, such as "sudo". -Vendor-provided packages +Distro-provided packages ------------------------ A variety of flavours of Linux provide official pre-built cryptmount packages, diff --git a/Makefile.am b/Makefile.am index c8143a5..9ed7d58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ SUBDIRS = man po sysinit testing install-exec-hook: install-etcdir - chown root.root $(DESTDIR)$(bindir)/cryptmount$(EXEEXT) + chown root:root $(DESTDIR)$(bindir)/cryptmount$(EXEEXT) chmod u+srwx,go-w,go+r $(DESTDIR)$(bindir)/cryptmount$(EXEEXT) @if test -z "$(DESTDIR)" -o "$(DESTDIR)" = "/"; then \ modprobe -a loop dm-crypt || true; \ diff --git a/README.md b/README.md index a0d6b18..4171704 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ For example, an entry of the form: keyformat=luks } ``` -Describes a LUKS-encrypted filesystem to be contained in an ordinary file, +describes a LUKS-encrypted filesystem to be contained in an ordinary file, and which will be mounted beneath `/mnt/crypt`. Such a filesystem could be initialized as follows: diff --git a/RELNOTES b/RELNOTES index b05a30b..f29efcb 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,4 @@ - Release notes for cryptmount-6.0 + Release notes for cryptmount-6.1 RW Penney, October 2022 @@ -29,14 +29,28 @@ especially within system start-up scripts. Summary of new features in cryptmount-6.1 ========================================= -This (beta) release is still under development +This (stable) release offers the following improvements: + + * Improved deconfliction when operating simultaneously with other device-mapper tools + + * Revised installation instructions, now in markdown format It has been tested on the following systems: - * Debian GNU/Linux 11.4 ("bullseye") (amd64) + * Alma Linux 9.0 (x86_64, lacking libcryptsetup headers) + + * Arch Linux (early-Oct-2022) (x86_64) + + * Debian GNU/Linux 12.x ("bookworm"/"testing", early-Oct-2022) (amd64) + + * Debian GNU/Linux 11.5 ("bullseye") (amd64) + + * Debian GNU/Linux 10.13 ("buster") (x86) * Fedora 36 (x86_64) + * Ubuntu 22.04 ("jammy") (x86_64) + Summary of new features in cryptmount-6.0 ========================================= @@ -51,11 +65,11 @@ It has been tested on the following systems: * Arch Linux (mid-Aug-2022) (x86_64) - * Debian GNU/Linux 12.x ("bookworm"/"testing", early-Sep-2020) (amd64) + * Debian GNU/Linux 12.x ("bookworm"/"testing", early-Sep-2022) (amd64) * Debian GNU/Linux 11.4 ("bullseye") (amd64) - * Debian GNU/Linux 10.12 ("buster") (amd64) + * Debian GNU/Linux 10.12 ("buster") (x86) * Fedora 36 (x86_64) diff --git a/armour-builtin.c b/armour-builtin.c index 067a9be..972f267 100644 --- a/armour-builtin.c +++ b/armour-builtin.c @@ -42,7 +42,7 @@ typedef struct { - unsigned fversion; + unsigned fversion; /*!< File-format version, default==1 since version 4.0 */ } blti_overrides_t; diff --git a/cmtab.example b/cmtab.example index fb008b2..d0e2bdf 100644 --- a/cmtab.example +++ b/cmtab.example @@ -31,7 +31,7 @@ crypt_sdb63 { cipher=serpent # filesystem encryption # information about file used to store decryption key: - keyfile=/usr/local/etc/cryptmount/crypt_sdb63.key + keyfile=/etc/cryptmount/crypt_sdb63.key keyformat=openssl-compat keyhash=md5 keycipher=bf-cbc } diff --git a/configure.ac b/configure.ac index 29b794c..912ba89 100644 --- 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-beta, cryptmount@rwpenney.uk) +AC_INIT(cryptmount, 6.1.0, cryptmount@rwpenney.uk) AC_PREREQ(2.59) test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc diff --git a/cryptmount.spec b/cryptmount.spec index 9c31e70..0140094 100644 --- a/cryptmount.spec +++ b/cryptmount.spec @@ -4,7 +4,7 @@ # Summary: Let ordinary users mount an encrypted file system Name: cryptmount -Version: 6.1-beta +Version: 6.1.0 Release: 1%{?dist} License: GPL URL: http://cryptmount.sourceforge.net @@ -100,6 +100,8 @@ fi %changelog +* Sat Oct 08 2022 RW Penney - 6.1 + -- Refreshed installation documentation and inter-process locking * Sat Sep 03 2022 RW Penney - 6.0 -- Refreshed default ciphers and keymanager * Wed Feb 07 2018 RW Penney - 5.3 diff --git a/debian/changelog b/debian/changelog index 1e3aef6..dc5214b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +cryptmount (6.1.0-1) unstable; urgency=low + + * New upstream release + - updated German translations (Closes: bug#1019550) + - resolved missing French translations + - improved inter-process deconfliction + + -- RW Penney Sat, 08 Oct 2022 16:45:00 +0000 + cryptmount (6.0-1) unstable; urgency=low * New upstream release diff --git a/debian/docs b/debian/docs index 0aaaac6..9102d86 100644 --- a/debian/docs +++ b/debian/docs @@ -1,4 +1,3 @@ -INSTALL.md README.md README.sshfs RELNOTES diff --git a/debian/mkDebPkg b/debian/mkDebPkg index d9736f6..334c728 100755 --- a/debian/mkDebPkg +++ b/debian/mkDebPkg @@ -10,6 +10,14 @@ UPSDIR=.. # $VERSION refers to the true version number associated with a *.tar.gz file # $PSEUDO_VERSION is the stable release number for which a .deb should be generated +printHelp() { + cat <&3 - sync; wait_udev + sync; wait_udev; sleep 1 idx=`mkrandshort` cat < ${TMPDIR}/cmtab @@ -1488,6 +1488,8 @@ Cryptmount mudslinger logfile EOF ls -l ${CM} >&3 2>&1 lsb_release -a >&3 2>&1 || echo "(No lsb_release info)" >&3 +test -r /etc/debian_version && echo "Debian version: `cat /etc/debian_version`" >&3 +test -r /etc/redhat-release && echo "Redhat release: `cat /etc/redhat-release`" >&3 if [ -r /usr/include/linux/version.h ]; then cat /usr/include/linux/version.h >&3 fi