app-admin/calamares : version bump

7 files changed, 113 insertions, 375 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index a60cebdc..684761a4 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1 +1 @@
-DIST calamares-3.1.12.tar.gz 2272996 BLAKE2B f9fd2edd6922262b2a0e5a28818c79e477c9cc2105a4d4d3cb8367cb6a399af1011f6333f43790699aea04d31668e7fa2b9b79225098af6b1f31093de8988e87 SHA512 10ab898c06d4d936c5bf25e5d461e40d98914636b2fddca22b80b949b6a1225170887ffc6ceebb3848276b6d4812db863751b608b6671bb829a98a0dc6e7bf72
+DIST calamares-3.2.24.tar.gz 3557006 BLAKE2B 80dda7556bc2a21ac15b527472f1867ecd825a46ced3281243329704e7260923bd39ecb4ebabfd6d39e10a3c5ca805002fb51387db5f6c59ddea594aa1399c13 SHA512 96e62f97b3257208eec3cdc4b048b9089f64babab745a1f52362b6a367dc550aed0f03b79de5a7456c0576fc681c37ce569a16b591b9f5b84dd01e12cefdb880
diff --git a/app-admin/calamares/calamares-3.1.12-r6.ebuild b/app-admin/calamares/calamares-3.1.12-r6.ebuild
deleted file mode 100644
index c21cd9de..00000000
--- a/app-admin/calamares/calamares-3.1.12-r6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6,7,8} )
-
-inherit eutils cmake-utils python-r1
-
-SRC_URI="https://github.com/calamares/calamares/releases/download/v${PV}/${P}.tar.gz"
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+python"
-
-S="${WORKDIR}/${P}"
-
-DEPEND="
-	python? (
-		>=dev-libs/boost-1.55.0-r2[${PYTHON_USEDEP}]
-	)
-	>=dev-qt/designer-5.9.0:5
-	>=dev-qt/linguist-tools-5.9.0:5
-	>=dev-qt/qtconcurrent-5.9.0:5
-	>=dev-qt/qtcore-5.9.0:5
-	>=dev-qt/qtdbus-5.9.0:5
-	>=dev-qt/qtdeclarative-5.9.0:5
-	>=dev-qt/qtgui-5.9.0:5
-	>=dev-qt/qtnetwork-5.9.0:5
-	>=dev-qt/qtopengl-5.9.0:5
-	>=dev-qt/qtprintsupport-5.9.0:5
-	>=dev-qt/qtscript-5.9.0:5
-	>=dev-qt/qtsvg-5.9.0:5
-	>=dev-qt/qttest-5.9.0:5
-	>=dev-qt/qtwebengine-5.9.0:5
-	>=dev-qt/qtwebchannel-5.9.0:5
-	>=dev-qt/qtwidgets-5.9.0:5
-	>=dev-qt/qtxml-5.9.0:5
-	>=dev-qt/qtxmlpatterns-5.9.0:5
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=kde-frameworks/extra-cmake-modules-5.18.0
-	>=sys-libs/kpmcore-3.2.0"
-
-RDEPEND="app-misc/calamares-runtime[branding]"
-
-src_prepare() {
-	# build against kpmcore-3.2
-	epatch "${FILESDIR}"/${PN}-kpmcore-3.2.patch
-	# don't run locale-gen during system installation, we run it ourselves during stage4 bootstrap...this patch should speed up installation significantly
-	epatch "${FILESDIR}"/${PN}-dont-run-locale-gen.patch
-	# support auto-unlocking encrypted partitions via OpenRC's dmcrypt service
-	epatch -p1 "${FILESDIR}"/${PN}-openrc-dmcrypt-cfg-r1.patch
-	# fix grubcfg breakage introduced by Manjaro, we don't rely on plymouthcfg to have splash
-	epatch -p1 "${FILESDIR}"/${PN}-dont-rely-on-plymouthcfg.patch
-	# replace calamares installer desktop icon
-	sed -i "s/Icon=calamares/Icon=redcore-weblink/g" "${S}/calamares.desktop"
-	# fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY)
-	sed -i "s/pkexec //g" "${S}/calamares.desktop"
-	sed -i "s/calamares/calamares-pkexec/g" "${S}/calamares.desktop"
-	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
-	# Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild)
-	export QT_SELECT=qt5
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_PARTITIONMANAGER=1
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/bin
-	insopts -m 755
-	doins ${FILESDIR}/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.2.24.ebuild b/app-admin/calamares/calamares-3.2.24.ebuild
new file mode 100644
index 00000000..6d9e7726
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.24.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_7 )
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT=0
+LICENSE="GPL-3"
+IUSE="+branding +config"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/yaml-cpp:=
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kpackage:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt
+	>=sys-libs/kpmcore-4.0.0:5=
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/libatasmart
+	net-misc/rsync
+	sys-boot/grub:2
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	sys-libs/timezone-data
+	sys-power/upower
+	virtual/udev
+	branding? ( x11-themes/redcore-artwork-calamares )
+	config? ( app-misc/calamares-config-redcore )
+"
+
+PATCHES="
+	${FILESDIR}/calamares-dont-run-locale-gen.patch
+"
+
+src_prepare() {
+	ecm_src_prepare
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+			PYTHON_LIBS="$(python_get_LIBS)"
+
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+		calamares.desktop || die
+	sed -i -e 's:Icon=calamares:Icon=redcore-weblink:' \
+		calamares.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_CONFIG=OFF
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch b/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch
deleted file mode 100644
index 04f41a30..00000000
--- a/app-admin/calamares/files/calamares-dont-rely-on-plymouthcfg.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
---- a/src/modules/grubcfg/main.py	2018-01-02 14:37:36.000000000 +0000
-+++ b/src/modules/grubcfg/main.py	2019-01-26 22:47:25.005850844 +0000
-@@ -44,16 +44,20 @@
-     dracut_bin = libcalamares.utils.target_env_call(
-         ["sh", "-c", "which dracut"]
-         )
--    have_dracut = dracut_bin == 0  # Shell exit value 0 means success
-+    plymouth_bin = libcalamares.utils.target_env_call(
-+        ["sh", "-c", "which plymouth"]
-+        )
-+    # Shell exit value 0 means success
-+    have_dracut = dracut_bin == 0
-+    have_plymouth = plymouth_bin == 0
- 
-     use_splash = ""
-     swap_uuid = ""
-     swap_outer_uuid = ""
-     swap_outer_mappername = None
- 
--    if libcalamares.globalstorage.contains("hasPlymouth"):
--        if libcalamares.globalstorage.value("hasPlymouth"):
--            use_splash = "splash"
-+    if have_plymouth: 
-+        use_splash = "splash"
- 
-     cryptdevice_params = []
- 
diff --git a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch
index 29ca6a61..03314b12 100644
--- a/app-admin/calamares/files/calamares-dont-run-locale-gen.patch
+++ b/app-admin/calamares/files/calamares-dont-run-locale-gen.patch
@@ -1,42 +1,24 @@
 diff -Nur a/src/modules/localecfg/main.py b/src/modules/localecfg/main.py
---- a/src/modules/localecfg/main.py	2017-11-14 15:18:58.000000000 +0000
-+++ b/src/modules/localecfg/main.py	2017-11-20 18:56:23.801595116 +0000
-@@ -47,38 +47,6 @@
- 
-     install_path = libcalamares.globalstorage.value("rootMountPoint")
+--- a/src/modules/localecfg/main.py	2020-05-11 19:53:23.000000000 +0100
++++ b/src/modules/localecfg/main.py	2020-05-21 16:11:50.013845904 +0100
+@@ -149,20 +149,6 @@
+     target_locale_conf_path = "{!s}/etc/locale.conf".format(install_path)
+     target_etc_default_path = "{!s}/etc/default".format(install_path)
  
 -    # restore backup if available
--    if os.path.exists('/etc/locale.gen.bak'):
--        shutil.copy2("{!s}/etc/locale.gen.bak".format(install_path),
--                     "{!s}/etc/locale.gen".format(install_path))
--
--    # run locale-gen if detected
+-    if os.path.exists(target_locale_gen_bak):
+-        shutil.copy2(target_locale_gen_bak, target_locale_gen)
+-        libcalamares.utils.debug("Restored backup {!s} -> {!s}"
+-            .format(target_locale_gen_bak, target_locale_gen))
+-
+-    # run locale-gen if detected; this *will* cause an exception
+-    # if the live system has locale.gen, but the target does not:
+-    # in that case, fix your installation filesystem.
 -    if os.path.exists('/etc/locale.gen'):
--        text = []
--
--        with open("{!s}/etc/locale.gen".format(install_path), "r") as gen:
--            text = gen.readlines()
--
--        # we want unique values, so locale_values should have 1 or 2 items
--        locale_values = set(locale_conf.values())
--
--        with open("{!s}/etc/locale.gen".format(install_path), "w") as gen:
--            for line in text:
--                # always enable en_US
--                if en_us_locale in line and line[0] == "#":
--                    # uncomment line
--                    line = line[1:].lstrip()
--
--                for locale_value in locale_values:
--                    if locale_value in line and line[0] == "#":
--                        # uncomment line
--                        line = line[1:].lstrip()
--
--                gen.write(line)
--
+-        rewrite_locale_gen(target_locale_gen, target_locale_gen, locale_conf)
 -        libcalamares.utils.target_env_call(['locale-gen'])
--        print('locale.gen done')
+-        libcalamares.utils.debug('{!s} done'.format(target_locale_gen))
 -
      # write /etc/locale.conf
-     locale_conf_path = os.path.join(install_path, "etc/locale.conf")
-     with open(locale_conf_path, "w") as lcf:
+     with open(target_locale_conf_path, "w") as lcf:
+         for k, v in locale_conf.items():
diff --git a/app-admin/calamares/files/calamares-kpmcore-3.2.patch b/app-admin/calamares/files/calamares-kpmcore-3.2.patch
deleted file mode 100644
index 07e506ec..00000000
--- a/app-admin/calamares/files/calamares-kpmcore-3.2.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Naur calamares-3.1.8/src/modules/partition/CMakeLists.txt calamares-3.1.8-p/src/modules/partition/CMakeLists.txt
---- calamares-3.1.8/src/modules/partition/CMakeLists.txt	2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-p/src/modules/partition/CMakeLists.txt	2017-11-18 13:16:38.335840619 +0100
-@@ -5,14 +5,10 @@
- include(GenerateExportHeader)
- find_package( KF5 REQUIRED CoreAddons )
- 
--# These are needed because KPMcore links publicly against ConfigCore, I18n, IconThemes, KIOCore and Service
--find_package( KF5 REQUIRED Config I18n IconThemes KIO Service )
-+find_package( Qt5 REQUIRED DBus )
-+find_package( KF5 REQUIRED Config I18n WidgetsAddons Service )
- 
--find_package( KPMcore 3.1.50 QUIET )
--if ( KPMcore_FOUND )
--    add_definitions(-DWITH_KPMCORE22)
--endif()
--find_package( KPMcore 3.0.3 QUIET )
-+find_package( KPMcore 3.2 QUIET )
- # 3.0.3 and newer has fixes for NVMe support; allow 3.0.2, but warn
- # about it .. needs to use a different feature name because it otherwise
- # gets reported as KPMcore (the package).
-@@ -25,15 +21,6 @@
-     add_feature_info( KPMcoreNVMe KPMcore_FOUND "Older KPMcore with no NVMe support" )
- endif()
- 
--find_library( atasmart_LIB atasmart )
--find_library( blkid_LIB blkid )
--if( NOT atasmart_LIB )
--  message( WARNING "atasmart library not found." )
--endif()
--if( NOT blkid_LIB )
--  message( WARNING "blkid library not found." )
--endif()
--
- 
- include_directories( ${KPMCORE_INCLUDE_DIR} )
- include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-diff -Naur calamares-3.1.8/src/modules/partition/core/KPMHelpers.cpp calamares-3.1.8-p/src/modules/partition/core/KPMHelpers.cpp
---- calamares-3.1.8/src/modules/partition/core/KPMHelpers.cpp	2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-p/src/modules/partition/core/KPMHelpers.cpp	2017-11-18 13:11:35.255540490 +0100
-@@ -116,9 +116,7 @@
-                     PartitionTable::Flags flags )
- {
-     FileSystem* fs = FileSystemFactory::create( fsType, firstSector, lastSector
--#ifdef WITH_KPMCORE22
-                                                 ,device.logicalSize()
--#endif
-     );
-     return new Partition(
-                parent,
-@@ -153,9 +151,7 @@
-                            FileSystemFactory::create( FileSystem::Luks,
-                                                       firstSector,
-                                                       lastSector
--#ifdef WITH_KPMCORE22
-                                                      ,device.logicalSize()
--#endif
-                                                       ) );
-     if ( !fs )
-     {
-@@ -186,9 +182,7 @@
-                          partition->fileSystem().type(),
-                          partition->firstSector(),
-                          partition->lastSector()
--#ifdef WITH_KPMCORE22
-                         ,device->logicalSize()
--#endif
-                      );
-     return new Partition( partition->parent(),
-                           *device,
-diff -Naur calamares-3.1.8/src/modules/partition/jobs/FillGlobalStorageJob.cpp calamares-3.1.8-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp
---- calamares-3.1.8/src/modules/partition/jobs/FillGlobalStorageJob.cpp	2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-p/src/modules/partition/jobs/FillGlobalStorageJob.cpp	2017-11-18 13:11:35.256540518 +0100
-@@ -77,50 +77,6 @@
-     return uuid;
- }
- 
--// TODO: this will be available from KPMCore soon
--static const char* filesystem_labels[] = {
--    "unknown",
--    "extended",
--
--    "ext2",
--    "ext3",
--    "ext4",
--    "linuxswap",
--    "fat16",
--    "fat32",
--    "ntfs",
--    "reiser",
--    "reiser4",
--    "xfs",
--    "jfs",
--    "hfs",
--    "hfsplus",
--    "ufs",
--    "unformatted",
--    "btrfs",
--    "hpfs",
--    "luks",
--    "ocfs2",
--    "zfs",
--    "exfat",
--    "nilfs2",
--    "lvm2 pv",
--    "f2fs",
--    "udf",
--    "iso9660",
--};
--
--Q_STATIC_ASSERT_X((sizeof(filesystem_labels) / sizeof(char *)) >= FileSystem::__lastType, "Mismatch in filesystem labels");
--
--static QString
--untranslatedTypeName(FileSystem::Type t)
--{
--
--    Q_ASSERT( t >= 0 );
--    Q_ASSERT( t <= FileSystem::__lastType );
--
--    return QLatin1String(filesystem_labels[t]);
--}
- 
- static QVariant
- mapForPartition( Partition* partition, const QString& uuid )
-@@ -129,7 +85,7 @@
-     map[ "device" ] = partition->partitionPath();
-     map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
-     map[ "fsName" ] = partition->fileSystem().name();
--    map[ "fs" ] = untranslatedTypeName( partition->fileSystem().type() );
-+    map[ "fs" ] = partition->fileSystem().name( { QStringLiteral("C") } );  // Untranslated
-     if ( partition->fileSystem().type() == FileSystem::Luks &&
-          dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
-         map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name();
-diff -Naur calamares-3.1.8/src/modules/partition/tests/PartitionJobTests.cpp calamares-3.1.8-p/src/modules/partition/tests/PartitionJobTests.cpp
---- calamares-3.1.8/src/modules/partition/tests/PartitionJobTests.cpp	2017-11-14 16:18:58.000000000 +0100
-+++ calamares-3.1.8-p/src/modules/partition/tests/PartitionJobTests.cpp	2017-11-18 13:11:35.255540490 +0100
-@@ -219,9 +219,7 @@
-     else
-         lastSector = freeSpacePartition->lastSector();
-     FileSystem* fs = FileSystemFactory::create( type, firstSector, lastSector
--#ifdef WITH_KPMCORE22
-         ,m_device->logicalSize()
--#endif
-     );
- 
-     Partition* partition = new Partition(
diff --git a/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch b/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch
deleted file mode 100644
index 67279b7c..00000000
--- a/app-admin/calamares/files/calamares-openrc-dmcrypt-cfg-r1.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Nur a/src/modules/openrcdmcryptcfg/main.py b/src/modules/openrcdmcryptcfg/main.py
---- a/src/modules/openrcdmcryptcfg/main.py	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/modules/openrcdmcryptcfg/main.py	2017-12-02 19:40:18.212303089 +0000
-@@ -0,0 +1,65 @@
-+#!/usr/bin/env python3
-+# -*- coding: utf-8 -*-
-+#
-+# === This file is part of Calamares - <http://github.com/calamares> ===
-+#
-+#   Copyright 2017, Ghiunhan Mamut <venerix@redcorelinux.org>
-+#
-+#   Calamares is free software: you can redistribute it and/or modify
-+#   it under the terms of the GNU General Public License as published by
-+#   the Free Software Foundation, either version 3 of the License, or
-+#   (at your option) any later version.
-+#
-+#   Calamares is distributed in the hope that it will be useful,
-+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+#   GNU General Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License
-+#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
-+
-+import libcalamares
-+import os.path
-+
-+def write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path):
-+    crypto_target = ""
-+    crypto_source = ""
-+
-+    for partition in partitions:
-+        has_luks = "luksMapperName" in partition
-+        skip_partitions = partition["mountPoint"] == "/" or partition["fs"] == "linuxswap"
-+
-+        if not has_luks and not skip_partitions:
-+            libcalamares.utils.debug(
-+                "Skip writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"]))
-+
-+        if has_luks and not skip_partitions:
-+            crypto_target = partition["luksMapperName"]
-+            crypto_source = "/dev/disk/by-uuid/{!s}".format(partition["uuid"])
-+            libcalamares.utils.debug(
-+                "Writing OpenRC LUKS configuration for partition {!s}".format(partition["mountPoint"]))
-+
-+            with open(os.path.join(root_mount_point, dmcrypt_conf_path), 'a+') as dmcrypt_file:
-+                dmcrypt_file.write("\ntarget=" + crypto_target)
-+                dmcrypt_file.write("\nsource=" + crypto_source)
-+                dmcrypt_file.write("\nkey=/crypto_keyfile.bin")
-+                dmcrypt_file.write("\n")
-+
-+        if has_luks and skip_partitions:
-+            pass  # root and swap partitions should be handled by initramfs generators
-+
-+    return None
-+
-+def run():
-+    """
-+    This module configures OpenRC dmcrypt service for LUKS encrypted partitions.
-+    :return:
-+    """
-+
-+    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
-+    dmcrypt_conf_path = libcalamares.job.configuration["configFilePath"]
-+    partitions = libcalamares.globalstorage.value("partitions")
-+
-+    dmcrypt_conf_path = dmcrypt_conf_path.lstrip('/')
-+
-+    return write_dmcrypt_conf(partitions, root_mount_point, dmcrypt_conf_path)
-diff -Nur a/src/modules/openrcdmcryptcfg/module.desc b/src/modules/openrcdmcryptcfg/module.desc
---- a/src/modules/openrcdmcryptcfg/module.desc	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/modules/openrcdmcryptcfg/module.desc	2017-12-02 16:48:49.663145918 +0000
-@@ -0,0 +1,5 @@
-+---
-+type:       "job"
-+name:       "openrcdmcryptcfg"
-+interface:  "python"
-+script:     "main.py"
-diff -Nur a/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf b/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf
---- a/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf	1970-01-01 01:00:00.000000000 +0100
-+++ b/src/modules/openrcdmcryptcfg/openrcdmcryptcfg.conf	2017-12-02 16:48:49.663145918 +0000
-@@ -0,0 +1,2 @@
-+---
-+configFilePath: /etc/conf.d/dmcrypt