diff --git a/libxcrypt-4.4.22-fix_Werror_conversion__test_des_obsolete_c.patch b/libxcrypt-4.4.22-fix_Werror_conversion__test_des_obsolete_c.patch deleted file mode 100644 index b364dfc..0000000 --- a/libxcrypt-4.4.22-fix_Werror_conversion__test_des_obsolete_c.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ab819b18673ddce6d9ded84e412cff6b26e394fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sun, 13 Jun 2021 12:24:23 +0200 -Subject: [PATCH] test/des-obsolete.c: Fix Werror=conversion. - ---- - test/des-obsolete.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/des-obsolete.c b/test/des-obsolete.c -index 2955c873..2259e815 100644 ---- a/test/des-obsolete.c -+++ b/test/des-obsolete.c -@@ -29,7 +29,7 @@ expand (unsigned char ex[64], const unsigned char pk[8]) - { - t = pk[i]; - for (j = 0; j < 8; j++) -- ex[i*8 + j] = (t & (0x01u << (7 - j))) != 0; -+ ex[i*8 + j] = (unsigned char)((t & (0x01u << (7 - j))) != 0); - } - } - diff --git a/libxcrypt-4.4.22-fix_Werror_conversion__test_des_obsolete_r_c.patch b/libxcrypt-4.4.22-fix_Werror_conversion__test_des_obsolete_r_c.patch deleted file mode 100644 index 1d76441..0000000 --- a/libxcrypt-4.4.22-fix_Werror_conversion__test_des_obsolete_r_c.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 087ff50c441b8c819f1ede0f7b322daa227b2137 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sun, 13 Jun 2021 12:36:42 +0200 -Subject: [PATCH] test/des-obsolete_r.c: Fix Werror=conversion. - ---- - test/des-obsolete_r.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/des-obsolete_r.c b/test/des-obsolete_r.c -index 6113d3f..cbdfb43 100644 ---- a/test/des-obsolete_r.c -+++ b/test/des-obsolete_r.c -@@ -29,7 +29,7 @@ expand (unsigned char ex[64], const unsigned char pk[8]) - { - t = pk[i]; - for (j = 0; j < 8; j++) -- ex[i*8 + j] = (t & (0x01u << (7 - j))) != 0; -+ ex[i*8 + j] = (unsigned char)((t & (0x01u << (7 - j))) != 0); - } - } - diff --git a/libxcrypt-4.4.22-fix_Werror_conversion_des_obsolete_c.patch b/libxcrypt-4.4.22-fix_Werror_conversion_des_obsolete_c.patch deleted file mode 100644 index 0a064da..0000000 --- a/libxcrypt-4.4.22-fix_Werror_conversion_des_obsolete_c.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9f39b280c705de2806650c23f0b2bbb5f1319e54 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sun, 13 Jun 2021 12:05:47 +0200 -Subject: [PATCH] lib/crypt-des-obsolete.c: Fix Werror=conversion. - ---- - lib/crypt-des-obsolete.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/crypt-des-obsolete.c b/lib/crypt-des-obsolete.c -index 36434d0..a10bb5a 100644 ---- a/lib/crypt-des-obsolete.c -+++ b/lib/crypt-des-obsolete.c -@@ -85,7 +85,7 @@ unpack_bits (char bytev[64], const unsigned char bitv[8]) - { - c = bitv[i]; - for (int j = 0; j < 8; j++) -- bytev[i*8 + j] = (c & (0x01 << (7 - j))) != 0; -+ bytev[i*8 + j] = (char)((c & (0x01 << (7 - j))) != 0); - } - } - diff --git a/libxcrypt-4.4.22-fix_gensalt_yescrypt_o_size_calculation.patch b/libxcrypt-4.4.22-fix_gensalt_yescrypt_o_size_calculation.patch deleted file mode 100644 index 0597a44..0000000 --- a/libxcrypt-4.4.22-fix_gensalt_yescrypt_o_size_calculation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dc75db8c5f17733d4212201f2554e5d5e093c1b3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sat, 5 Jun 2021 19:40:39 +0200 -Subject: [PATCH] lib/crypt-yescrypt.c: Fix output calculation for - gensalt_yescrypt_rn(). - ---- - lib/crypt-yescrypt.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/crypt-yescrypt.c b/lib/crypt-yescrypt.c -index b2daf16..84b7f19 100644 ---- a/lib/crypt-yescrypt.c -+++ b/lib/crypt-yescrypt.c -@@ -106,8 +106,8 @@ gensalt_yescrypt_rn (unsigned long count, - const uint8_t *rbytes, size_t nrbytes, - uint8_t *output, size_t o_size) - { -- if (o_size < 3 + 8 * 6 + BASE64_LEN (nrbytes) + 1 || -- CRYPT_GENSALT_OUTPUT_SIZE < 3 + 8 * 6 + BASE64_LEN (nrbytes) + 1) -+ if (o_size < 3 + 8 * 6 + 1 + BASE64_LEN (nrbytes) + 1 || -+ CRYPT_GENSALT_OUTPUT_SIZE < 3 + 8 * 6 + 1 + BASE64_LEN (nrbytes) + 1) - { - errno = ERANGE; - return; diff --git a/libxcrypt.spec b/libxcrypt.spec index cd05944..91cb997 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -163,10 +163,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/dc75db8c5f17733d4212201f2554e5d5e093c1b3.patch#/%{name}-4.4.22-fix_gensalt_yescrypt_o_size_calculation.patch -Patch0001: %{url}/commit/9f39b280c705de2806650c23f0b2bbb5f1319e54.patch#/%{name}-4.4.22-fix_Werror_conversion_des_obsolete_c.patch -Patch0002: %{url}/commit/ab819b18673ddce6d9ded84e412cff6b26e394fa.patch#/%{name}-4.4.22-fix_Werror_conversion__test_des_obsolete_c.patch -Patch0003: %{url}/commit/087ff50c441b8c819f1ede0f7b322daa227b2137.patch#/%{name}-4.4.22-fix_Werror_conversion__test_des_obsolete_r_c.patch # Patch 3000 - 5999: Backported patches from pull requests.