From 8d4af9f9e534fe51027d88fa892edd7e9eed4aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 4 May 2019 19:51:38 +0200 Subject: [PATCH] Add patch to remove an unneeded union keyword --- ...-4.4.5-remove_unneeded_union_keyword.patch | 22 +++++++++++++++++++ libxcrypt.spec | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 libxcrypt-4.4.5-remove_unneeded_union_keyword.patch diff --git a/libxcrypt-4.4.5-remove_unneeded_union_keyword.patch b/libxcrypt-4.4.5-remove_unneeded_union_keyword.patch new file mode 100644 index 0000000..42f7187 --- /dev/null +++ b/libxcrypt-4.4.5-remove_unneeded_union_keyword.patch @@ -0,0 +1,22 @@ +From 5cce1ebe4e8e303bab593af694c9d30c51cf5eb4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Sat, 4 May 2019 19:46:16 +0200 +Subject: [PATCH] alg-gost3411-2012-core: Remove unneeded union keyword. + +--- + lib/alg-gost3411-2012-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/alg-gost3411-2012-core.c b/lib/alg-gost3411-2012-core.c +index f508ba8..13bb493 100644 +--- a/lib/alg-gost3411-2012-core.c ++++ b/lib/alg-gost3411-2012-core.c +@@ -149,7 +149,7 @@ g(uint512_u *h, const uint512_u *N, const unsigned char *m) + static inline void + stage2(GOST34112012Context *CTX, const unsigned char *data) + { +- union uint512_u m; ++ uint512_u m; + + memcpy(&m, data, sizeof(m)); + g(&(CTX->h), &(CTX->N), (const unsigned char *)&m); diff --git a/libxcrypt.spec b/libxcrypt.spec index f17dabf..53d8d4e 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -152,6 +152,7 @@ URL: https://github.com/besser82/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # Patch 0000 - 2999: Backported patches from upstream. +Patch0000: %{url}/commit/5cce1ebe4e8e303bab593af694c9d30c51cf5eb4.patch#/%{name}-4.4.5-remove_unneeded_union_keyword.patch # Patch 3000 - 5999: Backported patches from pull requests. @@ -461,6 +462,7 @@ done %changelog * Sat May 04 2019 Björn Esser - 4.4.5-1 - New upstream release (#1706419) +- Add patch to remove an unneeded union keyword * Fri Mar 15 2019 Björn Esser - 4.4.4-2 - Change Recommends: whois-mkpasswd to Fedora 30 and later (#1687870)