sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9893f138486dbe7cddd919ab1b1fa400ffb6ac34)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9893f138486dbe7cddd919ab1b1fa400ffb6ac34)
- Date: Wed, 25 Jan 2023 13:21:57 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
crypto/cryptsetup-luks/DEPENDS |
8
crypto/cryptsetup-luks/DETAILS |
6
crypto/cryptsetup-luks/HISTORY |
4
disk/libblockdev/DETAILS |
4
disk/libblockdev/HISTORY |
3
disk/libbytesize/DETAILS |
4
disk/libbytesize/HISTORY |
3
disk/lvm/DEPENDS |
3
disk/lvm/DETAILS |
2
disk/lvm/HISTORY |
7
disk/lvm/PRE_BUILD |
11
disk/volume_key/DEPENDS |
4
disk/volume_key/HISTORY |
4
disk/volume_key/PRE_BUILD |
3
disk/volume_key/patches/8f8698aba19b501f01285e9eec5c18231fc6bcea.patch |
28
disk/volume_key/patches/ecef526a51c5a276681472fd6df239570c9ce518.patch |
331 ----------
libs/libaio/DETAILS |
10
libs/libaio/HISTORY |
3
18 files changed, 50 insertions(+), 388 deletions(-)
New commits:
commit 9893f138486dbe7cddd919ab1b1fa400ffb6ac34
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
volume_key - fix build
commit 529284dc2f81e793576b68513eabaac061b7802b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cryptsetup-luks: => 2.6.0
commit 26be16a8ccd131365081b1ad1ddbc06be5076745
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
lvm - fixes
commit 3ef2f89f529d517061f32694e1c2bbce378a0b54
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libaio: => 0.3.113
commit a82f8834a6d3b41616d1110d268d21a1e65e876b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
lvm: => 2.03.18
commit e91786afab0bb4a64a8b957caf3c349abc32b9f4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libbytesize: => 2.7
commit 6f12ab11a5ec71c07a8e31feaeca7b0a95ac2b3c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
libblockdev: => 2.28
diff --git a/crypto/cryptsetup-luks/DEPENDS b/crypto/cryptsetup-luks/DEPENDS
index 8901d71..bb61ca8 100755
--- a/crypto/cryptsetup-luks/DEPENDS
+++ b/crypto/cryptsetup-luks/DEPENDS
@@ -1,7 +1,9 @@
depends lvm &&
-depends libgcrypt &&
-depends popt &&
depends json-c &&
+depends SSL &&
+depends libssh &&
+depends util-linux &&
optional_depends DEVICE-MANAGER '--enable-udev' '--disable-udev' 'UDev
support' &&
optional_depends GETTEXT '--enable-nls' '--disable-nls' 'NLS support' &&
-optional_depends PYTHON '--enable-python' '--disable-python' 'Python
bindings'
+optional_depends asciidoctor --{en,dis}able-asciidoc 'build man pages' &&
+optional_depends libargon2 --{en,dis}able-libargon2 'better Argon2'
diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index e0c12f9..83b0332 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,9 +1,9 @@
- SPELL=cryptsetup-luks
- VERSION=2.3.4
+ SPELL=cryptsetup-luks
+ VERSION=2.6.0
+
SOURCE_HASH=sha512:64d7b318b58fe96143ac7a12476852a38cc30126ef431b4687d0f3f399d56f6569c716e0311cfc2802e4f025520ee41edc17c82c2421da7cc56788478e646983
BRANCH=v$(echo $VERSION | cut -f 1 -d .).$(echo $VERSION | cut -f
2 -d .)
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cryptsetup-$VERSION
SOURCE=cryptsetup-$VERSION.tar.xz
-
SOURCE_HASH=sha512:db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
SOURCE_URL[0]=https://www.kernel.org/pub/linux/utils/cryptsetup/$BRANCH/$SOURCE
WEB_SITE=https://gitlab.com/cryptsetup/cryptsetup
ENTERED=20060117
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index 1fc31e7..93f907e 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,7 @@
+2023-01-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.6.0
+ * DEPENDS: multiple changes
+
2020-09-26 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.3.4, builds again with json-c
diff --git a/disk/libblockdev/DETAILS b/disk/libblockdev/DETAILS
index 7476b1b..a46f666 100755
--- a/disk/libblockdev/DETAILS
+++ b/disk/libblockdev/DETAILS
@@ -1,6 +1,6 @@
SPELL=libblockdev
- VERSION=2.27
-
SOURCE_HASH=sha512:fa9faf3efefc1c76165c9456936175b2addb336a5257c43c1e41403db200386fd660203ef17559529f57b2f57b9ef768686ecd31493c58527434297c31712c10
+ VERSION=2.28
+
SOURCE_HASH=sha512:9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://github.com/storaged-project/libblockdev
diff --git a/disk/libblockdev/HISTORY b/disk/libblockdev/HISTORY
index 0386147..e32aa29 100644
--- a/disk/libblockdev/HISTORY
+++ b/disk/libblockdev/HISTORY
@@ -1,3 +1,6 @@
+2023-01-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.28
+
2022-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.27
diff --git a/disk/libbytesize/DETAILS b/disk/libbytesize/DETAILS
index 98263a7..2e7fc84 100755
--- a/disk/libbytesize/DETAILS
+++ b/disk/libbytesize/DETAILS
@@ -1,6 +1,6 @@
SPELL=libbytesize
- VERSION=2.5
-
SOURCE_HASH=sha512:730d9c84bfc7199424fa34de5037dd9187d60c1f32d82cedc3e395167bf39a98a3b7f20b15f154206e797144c11de05ae0f606e0af6a2157ed946f138a346ad6
+ VERSION=2.7
+
SOURCE_HASH=sha512:3f2bdebad1e145227d7c81b25b8832ab9f984513c35d81254f68c0cb50b1883f3b96fbb258d7c8223fb284d79dc4ec8b01beae3f7687cded629b269ef5b7210e
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://github.com/storaged-project/$SPELL
diff --git a/disk/libbytesize/HISTORY b/disk/libbytesize/HISTORY
index 8657c88..48484ab 100644
--- a/disk/libbytesize/HISTORY
+++ b/disk/libbytesize/HISTORY
@@ -1,3 +1,6 @@
+2023-01-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7
+
2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)
diff --git a/disk/lvm/DEPENDS b/disk/lvm/DEPENDS
index e798439..da2a89b 100755
--- a/disk/lvm/DEPENDS
+++ b/disk/lvm/DEPENDS
@@ -1,9 +1,8 @@
depends libaio &&
depends util-linux &&
-depends libaio &&
optional_depends PKG-CONFIG \
- "--enable-PKG-CONFIG" \
+ "--enable-pkgconfig" \
"" \
"to install PKG-CONFIG support" &&
diff --git a/disk/lvm/DETAILS b/disk/lvm/DETAILS
index 3b91d9f..f0706d7 100755
--- a/disk/lvm/DETAILS
+++ b/disk/lvm/DETAILS
@@ -1,5 +1,5 @@
SPELL=lvm
- VERSION=2.03.17
+ VERSION=2.03.18
SOURCE=LVM2.$VERSION.tgz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/LVM2.$VERSION
diff --git a/disk/lvm/HISTORY b/disk/lvm/HISTORY
index 1436e5a..0428a59 100644
--- a/disk/lvm/HISTORY
+++ b/disk/lvm/HISTORY
@@ -1,3 +1,10 @@
+2023-01-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: fix pkgconfig flag
+ * PRE_BUILD: fix build
+
+2023-01-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.03.18
+
2022-11-27 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.03.17
* patches/fix-stdio-usage.patch, patches/portability.patch: removed
diff --git a/disk/lvm/PRE_BUILD b/disk/lvm/PRE_BUILD
index 044770e..822a553 100755
--- a/disk/lvm/PRE_BUILD
+++ b/disk/lvm/PRE_BUILD
@@ -1,7 +1,4 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-
-# Don't try to install non-existent po/de.mo which isn't even bothered to be
-# created from the dummy file po/de.po
-sedit 's:^LANGS=de:#&:;/^#TARGETS=/s/#//' po/Makefile.in
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# fix compile
+sed -i '/GNU_SYMVER/,/#endif/D' libdm/datastruct/bitset.c
diff --git a/disk/volume_key/DEPENDS b/disk/volume_key/DEPENDS
index b128f6b..ddc5c16 100755
--- a/disk/volume_key/DEPENDS
+++ b/disk/volume_key/DEPENDS
@@ -4,6 +4,8 @@ depends glib2 &&
depends gpgme &&
depends json-c &&
depends nss &&
-depends PYTHON &&
depends util-linux &&
optional_depends GETTEXT '--enable-nls' '--disable-nls' 'NLS support'
+optional_depends python3 --with{,out}-python3 'Python bindings'
+optional_depends python --with{,out}-python 'Python bindings'
+
diff --git a/disk/volume_key/HISTORY b/disk/volume_key/HISTORY
index 341ca32..a860ade 100644
--- a/disk/volume_key/HISTORY
+++ b/disk/volume_key/HISTORY
@@ -1,3 +1,7 @@
+2023-01-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/* PRE_BUILD: deleted
+ * DEPENDS: python optional
+
2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)
diff --git a/disk/volume_key/PRE_BUILD b/disk/volume_key/PRE_BUILD
deleted file mode 100755
index 922c0ab..0000000
--- a/disk/volume_key/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-apply_patch_dir patches
diff --git
a/disk/volume_key/patches/8f8698aba19b501f01285e9eec5c18231fc6bcea.patch
b/disk/volume_key/patches/8f8698aba19b501f01285e9eec5c18231fc6bcea.patch
deleted file mode 100644
index 6ff600e..0000000
--- a/disk/volume_key/patches/8f8698aba19b501f01285e9eec5c18231fc6bcea.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8f8698aba19b501f01285e9eec5c18231fc6bcea Mon Sep 17 00:00:00 2001
-From: Vratislav Podzimek <vpodzime AT redhat.com>
-Date: Jan 12 2015 23:18:49 +0000
-Subject: Do not include config.h in libvolume_key.h
-
-
-The library's header file distributed in the devel package cannot include
-the config.h file that is only available during build otherwise it's not
-possible to use the library outside of the volume_key build process.
-
-Signed-off-by: Vratislav Podzimek <vpodzime AT redhat.com>
-
----
-
-diff --git a/lib/libvolume_key.h b/lib/libvolume_key.h
-index 657b626..513f923 100644
---- a/lib/libvolume_key.h
-+++ b/lib/libvolume_key.h
-@@ -18,8 +18,6 @@ Author: Miloslav Trmač <mitr AT redhat.com> */
- #ifndef LIBVOLUME_KEY_H__
- #define LIBVOLUME_KEY_H__
-
--#include <config.h>
--
- #include <cert.h>
- #include <glib.h>
-
-
diff --git
a/disk/volume_key/patches/ecef526a51c5a276681472fd6df239570c9ce518.patch
b/disk/volume_key/patches/ecef526a51c5a276681472fd6df239570c9ce518.patch
deleted file mode 100644
index 2798e88..0000000
--- a/disk/volume_key/patches/ecef526a51c5a276681472fd6df239570c9ce518.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-From ecef526a51c5a276681472fd6df239570c9ce518 Mon Sep 17 00:00:00 2001
-From: Miloslav Trmač <mitr AT redhat.com>
-Date: Nov 07 2017 15:55:55 +0000
-Subject: Stop using crypt_get_error
-
-
-Instead of crypt_get_error, which has been removed in cryptsetup 2.0,
-set up a log callback, which is available in both older and newer
-versions.
-
-Fixes #13.
-
----
-
-diff --git a/lib/volume_luks.c b/lib/volume_luks.c
-index 14794d7..f4bf2c8 100644
---- a/lib/volume_luks.c
-+++ b/lib/volume_luks.c
-@@ -61,17 +61,13 @@ my_strerror (int err_no)
- }
-
- /* Set ERROR based on libcryptsetup error state after returning RES.
-- Use CODE. */
-+ Use CODE and LAST_LOG_ENTRY. */
- static void
--error_from_cryptsetup (GError **error, LIBVKError code, int res)
-+error_from_cryptsetup (GError **error, LIBVKError code, int res,
-+ char *last_log_entry)
- {
-- /* It's not possible to get the error message length from libcryptsetup,
just
-- guess. */
-- char crypt_msg[4096];
--
-- crypt_get_error (crypt_msg, sizeof (crypt_msg));
-- if (crypt_msg[0] != '\0')
-- g_set_error (error, LIBVK_ERROR, code, "%s", crypt_msg);
-+ if (last_log_entry != NULL && last_log_entry[0] != '\0')
-+ g_set_error (error, LIBVK_ERROR, code, "%s", last_log_entry);
- else
- {
- char *s;
-@@ -82,17 +78,33 @@ error_from_cryptsetup (GError **error, LIBVKError code,
int res)
- }
- }
-
-+static void
-+record_cryptsetup_log_entry (int level, const char *msg, void *usrptr)
-+{
-+ char **last_log_entry = usrptr;
-+
-+ if (level == CRYPT_LOG_ERROR)
-+ {
-+ g_free (*last_log_entry);
-+ *last_log_entry = g_strdup (msg);
-+ }
-+}
-+
- /* Open volume PATH and load its header.
-+ Set up *LAST_LOG_ENTRY to be updated to the last logged message for the
-+ device. The caller must g_free(*LAST_LOG_ENTRY) after closing the
device.
- Return the volume, or NULL on error. */
- static struct crypt_device *
--open_crypt_device (const char *path, GError **error)
-+open_crypt_device (const char *path, char **last_log_entry, GError **error)
- {
- struct crypt_device *cd;
- int r;
-
-+ *last_log_entry = NULL;
- r = crypt_init (&cd, path);
- if (r < 0)
- goto err;
-+ crypt_set_log_callback(cd, record_cryptsetup_log_entry, last_log_entry);
- r = crypt_load (cd, CRYPT_LUKS1, NULL);
- if (r < 0)
- goto err_cd;
-@@ -101,9 +113,12 @@ open_crypt_device (const char *path, GError **error)
- err_cd:
- crypt_free (cd);
- err:
-- error_from_cryptsetup (error, LIBVK_ERROR_VOLUME_UNKNOWN_FORMAT, r);
-+ error_from_cryptsetup (error, LIBVK_ERROR_VOLUME_UNKNOWN_FORMAT, r,
-+ *last_log_entry);
- g_prefix_error (error, _("Error getting information about volume `%s': "),
- path);
-+ g_free (*last_log_entry);
-+ *last_log_entry = NULL;
- return NULL;
- }
-
-@@ -173,10 +188,11 @@ luks_volume_open (struct libvk_volume *vol, const char
*path, GError **error)
- {
- struct luks_volume *luks;
- struct crypt_device *cd;
-+ char *last_log_entry;
- const char *uuid;
-
- (void)vol;
-- cd = open_crypt_device (path, error);
-+ cd = open_crypt_device (path, &last_log_entry, error);
- if (cd == NULL)
- return NULL;
- /* A bit of paranoia */
-@@ -187,6 +203,7 @@ luks_volume_open (struct libvk_volume *vol, const char
*path, GError **error)
- _("UUID mismatch between libblkid and libcryptsetup: `%s' "
- "vs. `%s'"), vol->uuid, uuid);
- crypt_free (cd);
-+ g_free (last_log_entry);
- return NULL;
- }
-
-@@ -195,6 +212,7 @@ luks_volume_open (struct libvk_volume *vol, const char
*path, GError **error)
- luks->cipher_mode = g_strdup (crypt_get_cipher_mode (cd));
- luks->key_bytes = crypt_get_volume_key_size (cd);
- crypt_free (cd);
-+ g_free (last_log_entry);
-
- luks->key = NULL;
- luks->passphrase = NULL;
-@@ -256,7 +274,7 @@ luks_get_secret (struct libvk_volume *vol, enum
libvk_secret secret_type,
- const struct libvk_ui *ui, GError **error)
- {
- struct crypt_device *cd;
-- char *passphrase;
-+ char *last_log_entry, *passphrase;
- void *key;
- size_t key_length;
- int slot;
-@@ -276,7 +294,7 @@ luks_get_secret (struct libvk_volume *vol, enum
libvk_secret secret_type,
- _("Encryption information type unsupported in LUKS"));
- goto err;
- }
-- cd = open_crypt_device (vol->path, error);
-+ cd = open_crypt_device (vol->path, &last_log_entry, error);
- if (cd == NULL)
- goto err;
- key_length = crypt_get_volume_key_size (cd);
-@@ -303,7 +321,7 @@ luks_get_secret (struct libvk_volume *vol, enum
libvk_secret secret_type,
- g_free_passphrase (passphrase);
- if (r != -EPERM)
- {
-- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r);
-+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r,
last_log_entry);
- g_prefix_error (error, _("Error getting LUKS data encryption key:
"));
- goto err_prompt;
- }
-@@ -322,12 +340,14 @@ luks_get_secret (struct libvk_volume *vol, enum
libvk_secret secret_type,
- vol->v.luks->passphrase_slot = slot;
- g_free (prompt);
- crypt_free (cd);
-+ g_free (last_log_entry);
- return 0;
-
- err_prompt:
- g_free (prompt);
- g_free_key (key, key_length);
- crypt_free (cd);
-+ g_free (last_log_entry);
- err:
- return -1;
- }
-@@ -383,11 +403,12 @@ luks_load_packet (struct libvk_volume *vol, const
struct libvk_volume *packet,
- if (packet->v.luks->key != NULL)
- {
- struct crypt_device *cd;
-+ char *last_log_entry;
- int r;
-
- g_return_val_if_fail (vol->v.luks->key_bytes ==
packet->v.luks->key_bytes,
- -1);
-- cd = open_crypt_device (vol->path, error);
-+ cd = open_crypt_device (vol->path, &last_log_entry, error);
- if (cd == NULL)
- return -1;
- r = crypt_volume_key_verify (cd, packet->v.luks->key,
-@@ -395,21 +416,25 @@ luks_load_packet (struct libvk_volume *vol, const
struct libvk_volume *packet,
- crypt_free (cd);
- if (r < 0)
- {
-- error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH,
r);
-+ error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r,
-+ last_log_entry);
- g_prefix_error (error, _("LUKS data encryption key in packet is "
- "invalid: "));
-+ g_free (last_log_entry);
- return -1;
- }
-+ g_free (last_log_entry);
- luks_replace_key (vol, packet->v.luks->key);
- }
- if (packet->v.luks->passphrase != NULL)
- {
- struct crypt_device *cd;
-+ char *last_log_entry;
- void *key;
- size_t key_size;
- int r;
-
-- cd = open_crypt_device (vol->path, error);
-+ cd = open_crypt_device (vol->path, &last_log_entry, error);
- if (cd == NULL)
- return -1;
- key_size = crypt_get_volume_key_size (cd);
-@@ -420,10 +445,13 @@ luks_load_packet (struct libvk_volume *vol, const
struct libvk_volume *packet,
- crypt_free (cd);
- if (r < 0)
- {
-- error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH,
r);
-+ error_from_cryptsetup (error, LIBVK_ERROR_PACKET_VOLUME_MISMATCH, r,
-+ last_log_entry);
- g_prefix_error (error, _("LUKS passphrase in packet is invalid: "));
-+ g_free (last_log_entry);
- return -1;
- }
-+ g_free (last_log_entry);
- luks_replace_passphrase (vol, packet->v.luks->passphrase);
- vol->v.luks->passphrase_slot = r;
- if (packet->v.luks->key == NULL)
-@@ -446,7 +474,7 @@ luks_apply_secret (struct libvk_volume *vol, const
struct libvk_volume *packet,
- GError **error)
- {
- struct crypt_device *cd;
-- char *prompt, *prompt2, *error_prompt, *passphrase;
-+ char *last_log_entry, *prompt, *prompt2, *error_prompt, *passphrase;
- unsigned failed;
- int res;
-
-@@ -498,7 +526,7 @@ luks_apply_secret (struct libvk_volume *vol, const
struct libvk_volume *packet,
- goto err_prompts;
-
- got_passphrase:
-- cd = open_crypt_device (vol->path, error);
-+ cd = open_crypt_device (vol->path, &last_log_entry, error);
- if (cd == NULL)
- goto err_passphrase;
- res = crypt_keyslot_add_by_volume_key (cd, CRYPT_ANY_SLOT,
-@@ -508,10 +536,12 @@ luks_apply_secret (struct libvk_volume *vol, const
struct libvk_volume *packet,
- crypt_free (cd);
- if (res < 0)
- {
-- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res);
-+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res,
last_log_entry);
- g_prefix_error (error, _("Error adding a LUKS passphrase"));
-+ g_free (last_log_entry);
- goto err_passphrase;
- }
-+ g_free (last_log_entry);
-
- g_return_val_if_fail (vol->v.luks->key_bytes == packet->v.luks->key_bytes,
- -1);
-@@ -542,6 +572,7 @@ luks_add_secret (struct libvk_volume *vol, enum
libvk_secret secret_type,
- const void *secret, size_t size, GError **error)
- {
- struct crypt_device *cd;
-+ char *last_log_entry;
- int res;
-
- if (secret_type != LIBVK_SECRET_PASSPHRASE)
-@@ -562,7 +593,7 @@ luks_add_secret (struct libvk_volume *vol, enum
libvk_secret secret_type,
- _("The passphrase must be a string"));
- return -1;
- }
-- cd = open_crypt_device (vol->path, error);
-+ cd = open_crypt_device (vol->path, &last_log_entry, error);
- if (cd == NULL)
- return -1;
- res = crypt_keyslot_add_by_volume_key (cd, CRYPT_ANY_SLOT,
vol->v.luks->key,
-@@ -570,10 +601,12 @@ luks_add_secret (struct libvk_volume *vol, enum
libvk_secret secret_type,
- crypt_free (cd);
- if (res < 0)
- {
-- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res);
-+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, res,
last_log_entry);
- g_prefix_error (error, _("Error adding a LUKS passphrase"));
-+ g_free (last_log_entry);
- return -1;
- }
-+ g_free (last_log_entry);
-
- luks_replace_passphrase (vol, secret);
- vol->v.luks->passphrase_slot = res;
-@@ -823,12 +856,13 @@ luks_open_with_packet (struct libvk_volume *vol,
- GError **error)
- {
- struct crypt_device *cd;
-+ char *last_log_entry;
- void *to_free;
- const void *key;
- int r;
- size_t key_size;
-
-- cd = open_crypt_device (vol->path, error);
-+ cd = open_crypt_device (vol->path, &last_log_entry, error);
- if (cd == NULL)
- goto err;
- if (packet->v.luks->key != NULL)
-@@ -846,7 +880,7 @@ luks_open_with_packet (struct libvk_volume *vol,
- strlen (packet->v.luks->passphrase));
- if (r < 0)
- {
-- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r);
-+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r,
last_log_entry);
- g_prefix_error (error, _("Error getting LUKS data encryption key:
"));
- goto err_to_free;
- }
-@@ -862,7 +896,7 @@ luks_open_with_packet (struct libvk_volume *vol,
- r = crypt_activate_by_volume_key (cd, name, key, key_size, 0);
- if (r < 0)
- {
-- error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r);
-+ error_from_cryptsetup (error, LIBVK_ERROR_FAILED, r, last_log_entry);
- g_prefix_error (error, _("Error opening LUKS volume: "));
- goto err_to_free;
- }
-@@ -870,6 +904,7 @@ luks_open_with_packet (struct libvk_volume *vol,
- if (to_free != NULL)
- g_free_key (to_free, key_size);
- crypt_free (cd);
-+ g_free (last_log_entry);
- return 0;
-
- err_to_free:
-@@ -877,6 +912,7 @@ luks_open_with_packet (struct libvk_volume *vol,
- g_free_key (to_free, key_size);
- err_cd:
- crypt_free (cd);
-+ g_free (last_log_entry);
- err:
- return -1;
- }
-
diff --git a/libs/libaio/DETAILS b/libs/libaio/DETAILS
index 64785e6..b1903dc 100755
--- a/libs/libaio/DETAILS
+++ b/libs/libaio/DETAILS
@@ -1,10 +1,10 @@
SPELL=libaio
- VERSION=0.3.112
-
SOURCE_HASH=sha512:612f0adeea4926ced914b43ec550bf821bef348e6c787f9e3c1a545e5667121692a9af7ebaab14744aca7132a071083a1120bd01e31726932f3ceb9be51891a7
- SOURCE="${SPELL}_${VERSION}.orig.tar.xz"
-
SOURCE_URL[0]=http://ftp.debian.org/debian/pool/main/liba/${SPELL}/${SOURCE}
+ VERSION=0.3.113
+
SOURCE_HASH=sha512:65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
+ SOURCE="${SPELL}_${VERSION}.orig.tar.gz"
+
SOURCE_URL[0]=https://ftp.debian.org/debian/pool/main/liba/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://lse.sourceforge.net/io/aio.html";
+ WEB_SITE="https://lse.sourceforge.net/io/aio.html";
LICENSE[0]=LGPL
ENTERED=20090303
SHORT="Linux-native asynchronous I/O access library"
diff --git a/libs/libaio/HISTORY b/libs/libaio/HISTORY
index a1fb64c..642aed9 100644
--- a/libs/libaio/HISTORY
+++ b/libs/libaio/HISTORY
@@ -1,3 +1,6 @@
+2023-01-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.3.113
+
2019-03-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.3.112
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9893f138486dbe7cddd919ab1b1fa400ffb6ac34), Treeve Jelbert, 01/25/2023
Archive powered by MHonArc 2.6.24.