[packages/volume_key] - updated to 0.3.10

baggins baggins at pld-linux.org
Tue May 22 15:08:11 CEST 2018


commit 278a2abe0ebb0bf270a71f7efe2c4309b65bb439
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 22 22:07:39 2018 +0900

    - updated to 0.3.10

 volume_key-config.h.patch   | 25 -------------------------
 volume_key-fips-crash.patch | 33 ---------------------------------
 volume_key.spec             | 10 +++-------
 3 files changed, 3 insertions(+), 65 deletions(-)
---
diff --git a/volume_key.spec b/volume_key.spec
index f02774b..0e563ed 100644
--- a/volume_key.spec
+++ b/volume_key.spec
@@ -1,13 +1,11 @@
 Summary:	An utility for manipulating storage encryption keys and passphrases
 Name:		volume_key
-Version:	0.3.9
-Release:	2
+Version:	0.3.10
+Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://releases.pagure.org/volume_key/%{name}-%{version}.tar.xz
-# Source0-md5:	a2d14931177c660e1f3ebbcf5f47d8e2
-Patch0:		%{name}-config.h.patch
-Patch1:		%{name}-fips-crash.patch
+# Source0-md5:	605fd99a6e42916728020562a6edee78
 URL:		https://pagure.io/volume_key/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
@@ -67,8 +65,6 @@ separately from volumes.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/volume_key-config.h.patch b/volume_key-config.h.patch
deleted file mode 100644
index 98a70f9..0000000
--- a/volume_key-config.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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>
----
- lib/libvolume_key.h | 2 --
- 1 file changed, 2 deletions(-)
-
-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>
- 
--- 
-2.1.0
-
diff --git a/volume_key-fips-crash.patch b/volume_key-fips-crash.patch
deleted file mode 100644
index 0f79d4e..0000000
--- a/volume_key-fips-crash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-This case can be triggered by encrypting in FIPS mode, where the default
-algorithm is unsupported and gpg crashes in response.
-
-diff --git a/lib/crypto.c b/lib/crypto.c
-index 06eb482..905d583 100644
---- a/lib/crypto.c
-+++ b/lib/crypto.c
-@@ -709,6 +709,12 @@ encrypt_with_passphrase (size_t *res_size, const void *data, size_t size,
-     }
-   gpgme_data_release (src_data);
-   gpgme_res = gpgme_data_release_and_get_mem (dest_data, res_size);
-+  if (gpgme_res == NULL)
-+    {
-+      g_set_error (error, LIBVK_ERROR, LIBVK_ERROR_CRYPTO,
-+		   _("Unknown error getting encryption result"));
-+      goto err_ctx;
-+    }
-   res = g_memdup (gpgme_res, *res_size);
-   gpgme_free (gpgme_res);
- 
-@@ -759,6 +765,12 @@ decrypt_with_passphrase (size_t *res_size, const void *data, size_t size,
-     }
-   gpgme_data_release (src_data);
-   gpgme_res = gpgme_data_release_and_get_mem (dest_data, res_size);
-+  if (gpgme_res == NULL)
-+    {
-+      g_set_error (error, LIBVK_ERROR, LIBVK_ERROR_CRYPTO,
-+		   _("Unknown error getting decryption result"));
-+      goto err_ctx;
-+    }
-   res = g_memdup (gpgme_res, *res_size);
-   gpgme_free (gpgme_res);
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/volume_key.git/commitdiff/278a2abe0ebb0bf270a71f7efe2c4309b65bb439



More information about the pld-cvs-commit mailing list