rpms/volume_key
7
0
Fork 0
Code Issues Pull Requests Releases Activity

do not require gpgme-devel for autoreconf

Browse Source 
Resolves: RHEL-56368
This commit is contained in:
Michal Hlavinka 2025-07-23 14:13:57 +02:00
parent 4101f7fda7
commit b7c68ab93c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
volume_key-0.3.12-sq_crypto.patch
View File

@ -1,6 +1,6 @@
diff -up volume_key-0.3.12/configure.ac.sq_crypto volume_key-0.3.12/configure.ac
--- volume_key-0.3.12/configure.ac.sq_crypto 2018-10-08 13:24:58.000000000 +0200
+++ volume_key-0.3.12/configure.ac 2025-07-23 12:25:37.576918138 +0200
+++ volume_key-0.3.12/configure.ac 2025-07-23 14:10:46.558515947 +0200
@@ -195,7 +195,13 @@ AC_DEFINE(G_DISABLE_DEPRECATED, 1,
PKG_CHECK_MODULES(libcryptsetup, [libcryptsetup])
PKG_CHECK_MODULES(nss, [nss])
@ -11,14 +11,14 @@ diff -up volume_key-0.3.12/configure.ac.sq_crypto volume_key-0.3.12/configure.ac
+
+# Check for GPGME only if --with-sq was not specified
+AS_IF([test "x$SQ_PATH" = "x"],
+ [AM_PATH_GPGME],
+ [m4_ifdef([AM_PATH_GPGME],[AM_PATH_GPGME],[AC_MSG_ERROR([Not using sq yet GPGME is missing as well])])],
+ [AC_MSG_NOTICE([Skipping GPGME check, using sq instead])])
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.18.2])
diff -up volume_key-0.3.12/lib/crypto.c.sq_crypto volume_key-0.3.12/lib/crypto.c
--- volume_key-0.3.12/lib/crypto.c.sq_crypto 2025-07-23 12:25:37.575395964 +0200
+++ volume_key-0.3.12/lib/crypto.c 2025-07-23 12:36:59.911092759 +0200
--- volume_key-0.3.12/lib/crypto.c.sq_crypto 2025-07-23 13:35:56.130945870 +0200
+++ volume_key-0.3.12/lib/crypto.c 2025-07-23 13:35:56.132432928 +0200
@@ -26,7 +26,6 @@ Author: Miloslav Trmač <mitr@redhat.com
#include <cms.h>
#include <glib.h>
@ -260,8 +260,8 @@ diff -up volume_key-0.3.12/lib/crypto.c.sq_crypto volume_key-0.3.12/lib/crypto.c
- return NULL;
-}
diff -up volume_key-0.3.12/lib/crypto-gpgme.c.sq_crypto volume_key-0.3.12/lib/crypto-gpgme.c
--- volume_key-0.3.12/lib/crypto-gpgme.c.sq_crypto 2025-07-23 12:25:37.577261352 +0200
+++ volume_key-0.3.12/lib/crypto-gpgme.c 2025-07-23 12:25:37.577214824 +0200
--- volume_key-0.3.12/lib/crypto-gpgme.c.sq_crypto 2025-07-23 13:35:56.132605020 +0200
+++ volume_key-0.3.12/lib/crypto-gpgme.c 2025-07-23 13:35:56.132605020 +0200
@@ -0,0 +1,432 @@
+/* libgpgme utils */
+static void
@ -696,8 +696,8 @@ diff -up volume_key-0.3.12/lib/crypto-gpgme.c.sq_crypto volume_key-0.3.12/lib/cr
+ return NULL;
+}
diff -up volume_key-0.3.12/lib/crypto-gpgme.h.sq_crypto volume_key-0.3.12/lib/crypto-gpgme.h
--- volume_key-0.3.12/lib/crypto-gpgme.h.sq_crypto 2025-07-23 12:25:37.577399531 +0200
+++ volume_key-0.3.12/lib/crypto-gpgme.h 2025-07-23 12:25:37.577384603 +0200
--- volume_key-0.3.12/lib/crypto-gpgme.h.sq_crypto 2025-07-23 13:35:56.132749491 +0200
+++ volume_key-0.3.12/lib/crypto-gpgme.h 2025-07-23 13:35:56.132749491 +0200
@@ -0,0 +1,16 @@
+#ifndef CRYPTO_GPGME_H
+#define CRYPTO_GPGME_H
@ -716,8 +716,8 @@ diff -up volume_key-0.3.12/lib/crypto-gpgme.h.sq_crypto volume_key-0.3.12/lib/cr
+ const char *passphrase, GError **error);
+#endif
diff -up volume_key-0.3.12/lib/crypto-sq.c.sq_crypto volume_key-0.3.12/lib/crypto-sq.c
--- volume_key-0.3.12/lib/crypto-sq.c.sq_crypto 2025-07-23 12:25:37.577609294 +0200
+++ volume_key-0.3.12/lib/crypto-sq.c 2025-07-23 12:25:37.577573236 +0200
--- volume_key-0.3.12/lib/crypto-sq.c.sq_crypto 2025-07-23 13:35:56.132872512 +0200
+++ volume_key-0.3.12/lib/crypto-sq.c 2025-07-23 13:35:56.132872512 +0200
@@ -0,0 +1,382 @@
+#include <config.h>
+#include <stdio.h>
@ -1102,8 +1102,8 @@ diff -up volume_key-0.3.12/lib/crypto-sq.c.sq_crypto volume_key-0.3.12/lib/crypt
+ return NULL;
+}
diff -up volume_key-0.3.12/lib/crypto-sq.h.sq_crypto volume_key-0.3.12/lib/crypto-sq.h
--- volume_key-0.3.12/lib/crypto-sq.h.sq_crypto 2025-07-23 12:25:37.577709322 +0200
+++ volume_key-0.3.12/lib/crypto-sq.h 2025-07-23 12:25:37.577697039 +0200
--- volume_key-0.3.12/lib/crypto-sq.h.sq_crypto 2025-07-23 13:35:56.132993038 +0200
+++ volume_key-0.3.12/lib/crypto-sq.h 2025-07-23 13:35:56.132993038 +0200
@@ -0,0 +1,45 @@
+#ifndef SQME_H
+#define SQME_H
@ -1152,7 +1152,7 @@ diff -up volume_key-0.3.12/lib/crypto-sq.h.sq_crypto volume_key-0.3.12/lib/crypt
+
diff -up volume_key-0.3.12/lib/Makefile.am.sq_crypto volume_key-0.3.12/lib/Makefile.am
--- volume_key-0.3.12/lib/Makefile.am.sq_crypto 2018-09-18 16:08:04.000000000 +0200
+++ volume_key-0.3.12/lib/Makefile.am 2025-07-23 12:25:37.577056037 +0200
+++ volume_key-0.3.12/lib/Makefile.am 2025-07-23 13:35:56.133161093 +0200
@@ -33,6 +33,12 @@ libvolume_key_la_SOURCES = SECerrs.h SSL
ui.c ui.h \
volume.c volume.h \
@ -1167,8 +1167,8 @@ diff -up volume_key-0.3.12/lib/Makefile.am.sq_crypto volume_key-0.3.12/lib/Makef
libvolume_key_la_LDFLAGS = -version-info $(VERSION_INFO)
libvolume_key_la_LIBADD = $(blkid_LIBS) $(glib_LIBS) $(GPGME_LIBS) \
diff -up volume_key-0.3.12/m4/sq.m4.sq_crypto volume_key-0.3.12/m4/sq.m4
--- volume_key-0.3.12/m4/sq.m4.sq_crypto 2025-07-23 12:25:37.578094644 +0200
+++ volume_key-0.3.12/m4/sq.m4 2025-07-23 12:25:37.578078183 +0200
--- volume_key-0.3.12/m4/sq.m4.sq_crypto 2025-07-23 13:35:56.133352712 +0200
+++ volume_key-0.3.12/m4/sq.m4 2025-07-23 14:08:01.349773347 +0200
@@ -0,0 +1,34 @@
+AC_DEFUN([AM_CHECK_SQ],
+[
@ -1180,19 +1180,19 @@ diff -up volume_key-0.3.12/m4/sq.m4.sq_crypto volume_key-0.3.12/m4/sq.m4
+
+
+ SQ_PATH=""
+ if test "x$sq_path" != "x" -a "x$sq_path" != "xyes" ; then
+ if test "x$sq_path" != "x" -a "x$sq_path" != "xyes"; then
+ AC_MSG_CHECKING([for Sequoia sq])
+ if test -x "$sq_path"; then
+ SQ_PATH="$sq_path"
+ AC_MSG_RESULT([found at $sq_path])
+ else
+ elif test "x$sq_path" != "xno"; then
+ AC_MSG_ERROR([specified sq binary at $sq_path is not executable])
+ fi
+ else
+ # Search for sq in PATH
+ AC_PATH_PROG([SQ_PATH], [sq])
+
+ if test "x$SQ_PATH" = "x"; then
+ if test "x$SQ_PATH" = "x" -a "x$sq_path" != "x" -a "x$sq_path" != "xno"; then
+ AC_MSG_ERROR([Sequoia sq binary not found in PATH])
+ fi
+ fi