diff --git a/libxcrypt-4.4.31.tar.xz.asc b/libxcrypt-4.4.31.tar.xz.asc deleted file mode 100644 index 7f3a290..0000000 --- a/libxcrypt-4.4.31.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEZ4zj/uQwMRWW24wW9S6YAHWUwh0FAmNxPicACgkQ9S6YAHWU -wh0tnA/9FCJwZGy00gdyJgIAJE/kSAhRpIIFX1/Sjjjt2jgeUCYLViOnbfrBOJ19 -XPECbaq0tFmnBt9KxOF+HDQy7ck/nlbBS0CCnhcKk1oPidmdjQCkKNT/5oNMTDGC -P4mqBfurQtG+iGB0K6HolMu/eerRgoFqhcmvEXNJ/fwgST/VudmZDFfLs+463aze -4c8BEcY7dtf8i2JapddQXcugCbr/tH5jy7OxJdPCT+gX6zxX9geStAMQXlgXdbXx -ZOrQajKkCe95DMcfFi2guZ+h04A62C/Wfy/BrDCG/96lzEXyhfauxvoFTXkOzRlq -7DXwVlV44WicQR7OfpsVthDBbzsHgYBlxqm1FeyLC1LiT8yTWImhpZpfCPQUaZdF -V7jo7tOt41VczC1D2H9shp8k9kJrDFTDpWJG5kHwdQH2b3NJcOnqPHdDlQ8w6+tV -haa+g55ZQVG8d/7nUmf4Ubn2UGMLtzhkP1HMfvR9dDqhSuDQqS0jpc7bwz2jpcW0 -eaD8F6x8gI94OmFJXZ4cZVjtlP/KYuKqdZEH5mzh4UVVpEDkOOQk4C7RJN3JBthe -gLJ6f2OfmrJnpwNpiIyyTcordTn9S/UvVNjfDbV2NZv6OWC8qtnoqohQ1Ynrh0WO -g/WT5W0bPjQb4llQYFGq/oG7cMk0E3SNd6wKGiKsi+l9VVIgYSQ= -=ep7V ------END PGP SIGNATURE----- diff --git a/libxcrypt-4.4.31.tar.xz.sha256sum b/libxcrypt-4.4.31.tar.xz.sha256sum deleted file mode 100644 index 41b87ad..0000000 --- a/libxcrypt-4.4.31.tar.xz.sha256sum +++ /dev/null @@ -1,2 +0,0 @@ -c0181b6a8eea83850cfe7783119bf71fddbde69adddda1d15747ba433d5c57ba libxcrypt-4.4.31.tar.xz -296af0a04613bf80ab440ddc65129ca29c37ceaa6476da565c99297191f7e5b8 libxcrypt-4.4.31.tar.xz.asc diff --git a/libxcrypt-4.4.32-yescrypt-fix-Werror-sign-conversion.patch b/libxcrypt-4.4.32-yescrypt-fix-Werror-sign-conversion.patch new file mode 100644 index 0000000..b742576 --- /dev/null +++ b/libxcrypt-4.4.32-yescrypt-fix-Werror-sign-conversion.patch @@ -0,0 +1,33 @@ +From 05e5705d66fb18c75bfe32bdcd1774248abab2ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Fri, 18 Nov 2022 07:32:36 +0100 +Subject: [PATCH] lib/alg-yescrypt-platform.c: Fix -Werror=sign-conversion. + +In 894aee75433b4dc8d9724b126da6e79fa5f6814b we introduced some +changes, which show is this error when building with GCC v12.2.1. +--- + lib/alg-yescrypt-platform.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/alg-yescrypt-platform.c b/lib/alg-yescrypt-platform.c +index d9e5190..615a0c6 100644 +--- a/lib/alg-yescrypt-platform.c ++++ b/lib/alg-yescrypt-platform.c +@@ -47,7 +47,7 @@ static void *alloc_region(yescrypt_region_t *region, size_t size) + size_t new_size = size; + const size_t hugepage_mask = (size_t)HUGEPAGE_SIZE - 1; + if (size >= HUGEPAGE_THRESHOLD && size + hugepage_mask >= size) { +- flags |= MAP_HUGETLB | MAP_HUGE_2MB; ++ flags |= (int)(MAP_HUGETLB | MAP_HUGE_2MB); + /* + * Linux's munmap() fails on MAP_HUGETLB mappings if size is not a multiple of + * huge page size, so let's round up to huge page size here. +@@ -59,7 +59,7 @@ static void *alloc_region(yescrypt_region_t *region, size_t size) + if (base != MAP_FAILED) { + base_size = new_size; + } else if (flags & MAP_HUGETLB) { +- flags &= ~(MAP_HUGETLB | MAP_HUGE_2MB); ++ flags &= ~(int)(MAP_HUGETLB | MAP_HUGE_2MB); + base = mmap(NULL, size, PROT_READ | PROT_WRITE, flags, -1, 0); + } + diff --git a/libxcrypt-4.4.32.tar.xz.asc b/libxcrypt-4.4.32.tar.xz.asc new file mode 100644 index 0000000..d483c3e --- /dev/null +++ b/libxcrypt-4.4.32.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEZ4zj/uQwMRWW24wW9S6YAHWUwh0FAmN3IzwACgkQ9S6YAHWU +wh1Ivg//Y+No9nqTaB4ivSlu4JapnKFVTbClY+0wjNT7kmP2hHZPDNsX8QrUoqAD +Rd/0tqfOLZ5o+T6vow6fVeS6Ktb9yF5lmM1Id6SDwZfATEmcFAYJfUkGwe7msc0Y +lVOIyaqR5KdtnGtZwWLBBqSv6EgfQ0pz/9KZ37l/1LtFLLl+FByZuWFpOBw9wzrV +mokzldb2EnTz0vTGNMbG7t32Wt4hw4BZsoGoYts6j8fVXUtA9AEFefI9W+6Uh6Um +U54n+Eu1AfJBSTOdb28X7SO0ZTJQJjRK8rVIY6HlzQ7tTsrr6I9IEN2OyQsIfCSu +O7n2T4M192LRKW+6ZKKhDfcE5WbmrOoa4OlHN3QvhBRXI8CCKt87co56zCLo+3iR +35oWM60jxPvI78qu0XI7sEi1PNu1/0rD6yRyfbemX275ynFjpSiJmxsJLfolzIsB +Hy+8oqttISJb/s1TYYhkc3eqaS2gZDhPRvaQgpoakpyP/EIwVzNEHUkbTan/nhws +ajLk/BfOfT+fU2IA73zCzAIrVEevDPMAFotwK87+fqovQLeYgBxxhsTToZy3Lhdx +gKEvNaOGcH2Katqo9knAKdEORxClN752ycnb2wSrZ29W+ZExZ/mDUSNmhlJYdNn3 +4FiuWNvQuo72nd6JZU0UDTNqWKgN2P3ILwma9HftTjYeIcOR5wA= +=5JjT +-----END PGP SIGNATURE----- diff --git a/libxcrypt-4.4.32.tar.xz.sha256sum b/libxcrypt-4.4.32.tar.xz.sha256sum new file mode 100644 index 0000000..d057aed --- /dev/null +++ b/libxcrypt-4.4.32.tar.xz.sha256sum @@ -0,0 +1,2 @@ +0613f9bd51d713f8bb79fa10705b68d2ab705c3be4c4fc119f0a96bdc72256c4 libxcrypt-4.4.32.tar.xz +77eb4294c1074ea5a8e83a7fc9cadca4342761f2467c94a12b498a5f4d5e88c4 libxcrypt-4.4.32.tar.xz.asc diff --git a/libxcrypt.spec b/libxcrypt.spec index 4666d0a..9aae875 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -161,8 +161,8 @@ fi \ Name: libxcrypt -Version: 4.4.31 -Release: 5%{?dist} +Version: 4.4.32 +Release: 1%{?dist} Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others # For explicit license breakdown, see the @@ -175,6 +175,7 @@ Source2: %{url}/releases/download/v%{version}/%{name}-gpgkey.gpg Source3: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz.sha256sum # Patch 0000 - 2999: Backported patches from upstream. +Patch0000: %{url}/commit/05e5705d66fb18c75bfe32bdcd1774248abab2ce.patch#/%{name}-4.4.32-yescrypt-fix-Werror-sign-conversion.patch # Patch 3000 - 5999: Backported patches from pull requests. @@ -573,6 +574,9 @@ done %changelog +* Fri Nov 18 2022 Björn Esser - 4.4.32-1 +- New upstream release + * Wed Nov 16 2022 Björn Esser - 4.4.31-5 - Add %%{perl_minver} macro and re-add BR on perl(:VERSION) diff --git a/sources b/sources index c049384..12c2d25 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libxcrypt-4.4.31.tar.xz) = 4c87cc5299a871d30d492ddfe758295aa306e62cadde188fce7ce00db32da623cfc65394075b9a45e06291237885005591b7987411315740a0e7d29ff105d8ac +SHA512 (libxcrypt-4.4.32.tar.xz) = 09faa5f3aabe2bb85c55ee40269a313d3dc2de6b06755c8e985d4d720cd8e6125cf5738ce7428f29a2fea4edbca1203fc9807a6b620df71b730be406772b5ca3 SHA512 (libxcrypt-gpgkey.gpg) = 723ce5d76676e4366959e03850f8814d5b30f8b20a39629f0ccff61bb2b2bef64223fd78e719ad23d7dd272ca6c0177089749f9b508099d56750a8bb466d006c