[patch] very ugly patch to workaround crypto dependency

cr.patch (text/plain), 3.09 KB, created by kavol on 2018-12-02 11:00:15 UTC

--- configure~	2018-12-02 11:06:12.821399445 +0100
+++ configure	2018-12-02 11:16:39.386373795 +0100
@@ -15722,9 +15722,9 @@
 CFLAGS=$SAVE_CFLAGS
 LDFLAGS=$SAVE_LDFLAGS
 
-if test "x$have_crypto" = "xno"; then
-  as_fn_error $? "BLOCKDEV CRYPTO support requested but header or library not found" "$LINENO" 5
-fi
+#if test "x$have_crypto" = "xno"; then
+#  as_fn_error $? "BLOCKDEV CRYPTO support requested but header or library not found" "$LINENO" 5
+#fi
 
 
 # Internationalization
--- src/udiskslinuxblock.c~	2017-11-01 10:48:32.000000000 +0100
+++ src/udiskslinuxblock.c	2018-12-02 11:27:48.382346408 +0100
@@ -1516,11 +1516,11 @@
 static gchar *
 make_block_luksname (UDisksBlock *block, GError **error)
 {
-  gchar *uuid = bd_crypto_luks_uuid (udisks_block_get_device (block), error);
+/*  gchar *uuid = bd_crypto_luks_uuid (udisks_block_get_device (block), error);
 
   if (uuid)
     return g_strdup_printf ("luks-%s", uuid);
-  else
+  else */
     return NULL;
 }
 
--- src/udiskslinuxencryptedhelpers.c~	2017-11-01 10:48:32.000000000 +0100
+++ src/udiskslinuxencryptedhelpers.c	2018-12-02 11:33:08.146333318 +0100
@@ -21,7 +21,6 @@
  */
 
 #include <glib.h>
-#include <blockdev/crypto.h>
 
 #include "udisksthreadedjob.h"
 #include "udiskslinuxencryptedhelpers.h"
@@ -34,9 +33,7 @@
   LuksJobData *data = (LuksJobData*) user_data;
 
   /* device, cipher, key_size, passphrase, key_file, min_entropy, error */
-  return bd_crypto_luks_format_blob (data->device, NULL, 0,
-                                     (const guint8*) data->passphrase->str, data->passphrase->len, 0,
-                                     error);
+  return NULL;
 }
 
 gboolean luks_open_job_func (UDisksThreadedJob  *job,
@@ -47,9 +44,7 @@
   LuksJobData *data = (LuksJobData*) user_data;
 
   /* device, name, passphrase, key_file, read_only, error */
-  return bd_crypto_luks_open_blob (data->device, data->map_name,
-                                   (const guint8*) data->passphrase->str, data->passphrase->len, data->read_only,
-                                   error);
+  return NULL;
 }
 
 gboolean luks_close_job_func (UDisksThreadedJob  *job,
@@ -58,7 +53,7 @@
                     GError            **error)
 {
   LuksJobData *data = (LuksJobData*) user_data;
-  return bd_crypto_luks_close (data->map_name, error);
+  return NULL;
 }
 
 gboolean luks_change_key_job_func (UDisksThreadedJob  *job,
@@ -67,8 +62,5 @@
                           GError            **error)
 {
   LuksJobData *data = (LuksJobData*) user_data;
-  return bd_crypto_luks_change_key_blob (data->device,
-                                         (const guint8*) data->passphrase->str, data->passphrase->len,
-                                         (const guint8*) data->new_passphrase->str, data->new_passphrase->len,
-                                         error);
+  return NULL;
 }
--- src/udiskslinuxencryptedhelpers.h~	2017-11-01 10:48:32.000000000 +0100
+++ src/udiskslinuxencryptedhelpers.h	2018-12-02 11:26:20.414350009 +0100
@@ -24,7 +24,6 @@
 #define __UDISKS_LINUX_ENCRYPTED_HEPLERS_H__
 
 #include <glib.h>
-#include <blockdev/crypto.h>
 
 #include "udisksthreadedjob.h"