diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch b/meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch deleted file mode 100644 index 1ae3d66c78..0000000000 --- a/meta/recipes-core/systemd/systemd/0023-build-sys-fix-build-with-libgrcypt-disabled.patch +++ /dev/null @@ -1,122 +0,0 @@ -From b68f10bf1f7519e012da5e35fab3a57da7dc46d4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Sun, 27 Mar 2016 17:33:54 -0400 -Subject: [PATCH] build-sys: fix build with libgrcypt disabled - -- Move gcrypt.h include inside grcrypt-util.h. -- Allow gcrypt-util.[ch] to be compiled even without gcrypt. -This allows the logic in files using gcrypt to be simplified. - -- Fix compilation of systemd-resolve without gcrypt. -systemd-resolved already supported that. - -Upstream-Status: Backport [ https://github.com/systemd/systemd/pull/2905 ] - -Fixes [YOCTO #9219] - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - Makefile.am | 8 ++++---- - src/resolve/resolve-tool.c | 3 +-- - src/shared/gcrypt-util.c | 4 +++- - src/shared/gcrypt-util.h | 14 ++++++++++++++ - 4 files changed, 22 insertions(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 2b72a53..95eaa9a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4262,7 +4262,9 @@ libsystemd_journal_internal_la_SOURCES = \ - src/journal/mmap-cache.h \ - src/journal/compress.c \ - src/journal/audit-type.h \ -- src/journal/audit-type.c -+ src/journal/audit-type.c \ -+ src/shared/gcrypt-util.h \ -+ src/shared/gcrypt-util.c - - nodist_libsystemd_journal_internal_la_SOURCES = \ - src/journal/audit_type-to-name.h -@@ -4294,9 +4296,7 @@ libsystemd_journal_internal_la_SOURCES += \ - src/journal/journal-authenticate.c \ - src/journal/journal-authenticate.h \ - src/journal/fsprg.c \ -- src/journal/fsprg.h \ -- src/shared/gcrypt-util.c \ -- src/shared/gcrypt-util.h -+ src/journal/fsprg.h - - libsystemd_journal_internal_la_LIBADD += \ - $(GCRYPT_LIBS) -diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolve-tool.c -index 009cc73..14ee01c 100644 ---- a/src/resolve/resolve-tool.c -+++ b/src/resolve/resolve-tool.c -@@ -17,7 +17,6 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - --#include <gcrypt.h> - #include <getopt.h> - #include <net/if.h> - -@@ -863,7 +862,7 @@ static int resolve_openpgp(sd_bus *bus, const char *address) { - } - domain++; - -- r = string_hashsum(address, domain - 1 - address, GCRY_MD_SHA224, &hashed); -+ r = string_hashsum_sha224(address, domain - 1 - address, &hashed); - if (r < 0) - return log_error_errno(r, "Hashing failed: %m"); - -diff --git a/src/shared/gcrypt-util.c b/src/shared/gcrypt-util.c -index 4ff9452..39b544b 100644 ---- a/src/shared/gcrypt-util.c -+++ b/src/shared/gcrypt-util.c -@@ -19,10 +19,11 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#ifdef HAVE_GCRYPT - #include <gcrypt.h> - --#include "hexdecoct.h" - #include "gcrypt-util.h" -+#include "hexdecoct.h" - - void initialize_libgcrypt(bool secmem) { - const char *p; -@@ -67,3 +68,4 @@ int string_hashsum(const char *s, size_t len, int md_algorithm, char **out) { - *out = enc; - return 0; - } -+#endif -diff --git a/src/shared/gcrypt-util.h b/src/shared/gcrypt-util.h -index c7652c2..cf33b3c 100644 ---- a/src/shared/gcrypt-util.h -+++ b/src/shared/gcrypt-util.h -@@ -19,7 +19,21 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#include <errno.h> - #include <stdbool.h> -+#include <stddef.h> -+ -+#ifdef HAVE_GCRYPT -+#include <gcrypt.h> - - void initialize_libgcrypt(bool secmem); - int string_hashsum(const char *s, size_t len, int md_algorithm, char **out); -+#endif -+ -+static inline int string_hashsum_sha224(const char *s, size_t len, char **out) { -+#ifdef HAVE_GCRYPT -+ return string_hashsum(s, len, GCRY_MD_SHA224, out); -+#else -+ return -EOPNOTSUPP; -+#endif -+} --- -2.4.0 - |