diff --git a/libxcrypt-4.4.3-test-alg-hmac-sha1_Fix_format-overflow.patch b/libxcrypt-4.4.3-test-alg-hmac-sha1_Fix_format-overflow.patch deleted file mode 100644 index f7db7a0..0000000 --- a/libxcrypt-4.4.3-test-alg-hmac-sha1_Fix_format-overflow.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2e4135284e7aaeac2218878041de31d8e724dc8f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 24 Jan 2019 22:22:36 +0100 -Subject: [PATCH] test-alg-hmac-sha1: Fix -Wformat-overflow. - ---- - test-alg-hmac-sha1.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/test-alg-hmac-sha1.c b/test-alg-hmac-sha1.c -index ffc6cb4..167f0b4 100644 ---- a/test-alg-hmac-sha1.c -+++ b/test-alg-hmac-sha1.c -@@ -162,8 +162,15 @@ main (void) - if (strcmp (dbuf, test->expect) != 0) - { - n = 1; -- printf ("\nkey=%s, data=%s,\nresult=%s: %s\n", -- test->key, test->data, dbuf, test->expect); -+ printf ("\nkey="); -+ puts (test->key); -+ puts (", data="); -+ puts (test->data); -+ printf (",\nresult="); -+ puts (dbuf); -+ puts (": "); -+ puts (test->expect); -+ printf ("\n"); - } - } - return n; diff --git a/libxcrypt-4.4.3-test-alg-hmac-sha1_Use_fputs.patch b/libxcrypt-4.4.3-test-alg-hmac-sha1_Use_fputs.patch deleted file mode 100644 index e41c19b..0000000 --- a/libxcrypt-4.4.3-test-alg-hmac-sha1_Use_fputs.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8d109010f022ac75e383ac74d1961c0c63a16c3a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Tue, 19 Feb 2019 10:59:43 +0100 -Subject: [PATCH] test-alg-hmac-sha1: Use fputs() instead of puts(). - -puts() appends a newline character at the -end of the output, while fputs() does not. ---- - test-alg-hmac-sha1.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/test-alg-hmac-sha1.c b/test-alg-hmac-sha1.c -index 167f0b4..5a87c7b 100644 ---- a/test-alg-hmac-sha1.c -+++ b/test-alg-hmac-sha1.c -@@ -162,15 +162,15 @@ main (void) - if (strcmp (dbuf, test->expect) != 0) - { - n = 1; -- printf ("\nkey="); -- puts (test->key); -- puts (", data="); -- puts (test->data); -- printf (",\nresult="); -- puts (dbuf); -- puts (": "); -- puts (test->expect); -- printf ("\n"); -+ fputs ("\nkey=", stdout); -+ fputs (test->key, stdout); -+ fputs (", data=", stdout); -+ fputs (test->data, stdout); -+ fputs (",\nresult=", stdout); -+ fputs (dbuf, stdout); -+ fputs (": ", stdout); -+ fputs (test->expect, stdout); -+ fputs ("\n", stdout); - } - } - return n; diff --git a/libxcrypt.spec b/libxcrypt.spec index f2390ef..7ab815c 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -158,8 +158,6 @@ 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/2e4135284e7aaeac2218878041de31d8e724dc8f.patch#/%{name}-4.4.3-test-alg-hmac-sha1_Fix_format-overflow.patch -Patch0001: %{url}/commit/8d109010f022ac75e383ac74d1961c0c63a16c3a.patch#/%{name}-4.4.3-test-alg-hmac-sha1_Use_fputs.patch # Patch 3000 - 5999: Backported patches from pull requests.