From 8875044f8e1576e162d6d3beec907e3baab18638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 18 Nov 2022 19:54:03 +0100 Subject: [PATCH] New upstream release --- ...-yescrypt-fix-Werror-sign-conversion.patch | 33 ------------------- libxcrypt-4.4.32.tar.xz.asc | 16 --------- libxcrypt-4.4.32.tar.xz.sha256sum | 2 -- libxcrypt-4.4.33.tar.xz.asc | 16 +++++++++ libxcrypt-4.4.33.tar.xz.sha256sum | 2 ++ libxcrypt.spec | 6 ++-- sources | 2 +- 7 files changed, 23 insertions(+), 54 deletions(-) delete mode 100644 libxcrypt-4.4.32-yescrypt-fix-Werror-sign-conversion.patch delete mode 100644 libxcrypt-4.4.32.tar.xz.asc delete mode 100644 libxcrypt-4.4.32.tar.xz.sha256sum create mode 100644 libxcrypt-4.4.33.tar.xz.asc create mode 100644 libxcrypt-4.4.33.tar.xz.sha256sum diff --git a/libxcrypt-4.4.32-yescrypt-fix-Werror-sign-conversion.patch b/libxcrypt-4.4.32-yescrypt-fix-Werror-sign-conversion.patch deleted file mode 100644 index b742576..0000000 --- a/libxcrypt-4.4.32-yescrypt-fix-Werror-sign-conversion.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index d483c3e..0000000 --- a/libxcrypt-4.4.32.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------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 deleted file mode 100644 index d057aed..0000000 --- a/libxcrypt-4.4.32.tar.xz.sha256sum +++ /dev/null @@ -1,2 +0,0 @@ -0613f9bd51d713f8bb79fa10705b68d2ab705c3be4c4fc119f0a96bdc72256c4 libxcrypt-4.4.32.tar.xz -77eb4294c1074ea5a8e83a7fc9cadca4342761f2467c94a12b498a5f4d5e88c4 libxcrypt-4.4.32.tar.xz.asc diff --git a/libxcrypt-4.4.33.tar.xz.asc b/libxcrypt-4.4.33.tar.xz.asc new file mode 100644 index 0000000..4eba9d5 --- /dev/null +++ b/libxcrypt-4.4.33.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEZ4zj/uQwMRWW24wW9S6YAHWUwh0FAmN3044ACgkQ9S6YAHWU +wh32zQ/+Kkw7VpFYVhgkfYfmyS/08LCp6EMYHhLP8OxMxFqRxA3boSGJll4GFTU9 +/+UiWpnFs/3prr+0w9WiF4iK8A230urzMVwql1y2KvUvoHOxtagBdtBjP0pxzSJc +MWR9cXNMTRLQFrADov+1lrrZr+fHPs5bVcLa8THD9TGBRXN8RUg1Yt6RGyJX+fsd +Gf72yfQh9lKZEzf42zd9wUE9zkEEeUoHh4gOvy6EYVvjSoQnM7l5Vs3nP9XVJpvi +RxFvioeo32JSebvFV+yLx62SSQaJfMIqP7xHtrCQS41VbGxqd/N411z+9q+bQEWi +cwytUDKSbM8ax1Bqj4EQeCulLMuLZF/hNY9abzzfYWlVYQktYaE+/ZVubOF8Ng/k +IZ2WBZCq2U2lOrxEJCSrZ7php6XXIq+dEEcsUXXCLQZjfOn/8tdsXblp3eFF6XIh +Xf+UDW8BEKXcE1EFqMwf2Vsd4sBd9qsqEaHiDhz6AW+3qz1QcGIBtYjAKv0bo2Vi +CGX/ggtEHruff0PVwRC+ALo6bHW+R/q54rWA3+cPBm7nGqQkJib42UJDyHvCziw6 +OWZgYY6Prac+jPu8TIZelIBmM+lS0kvCAvREUf1Ec9I1iYkG9kboA80gvOx2smfB +vWcTAr/NqYZF3CmkIz3t606n6FrXnKudAiWN6si+HEHsY6efw8o= +=zK1h +-----END PGP SIGNATURE----- diff --git a/libxcrypt-4.4.33.tar.xz.sha256sum b/libxcrypt-4.4.33.tar.xz.sha256sum new file mode 100644 index 0000000..cbbc371 --- /dev/null +++ b/libxcrypt-4.4.33.tar.xz.sha256sum @@ -0,0 +1,2 @@ +e87acf9c652c573a4713d5582159f98f305d56ed5f754ce64f57d4194d6b3a6f libxcrypt-4.4.33.tar.xz +23347dc4535e050ef0ca4f0f95b3d95625c868c876fdca0d341412eb1871e0b3 libxcrypt-4.4.33.tar.xz.asc diff --git a/libxcrypt.spec b/libxcrypt.spec index 9aae875..081d22e 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -161,7 +161,7 @@ fi \ Name: libxcrypt -Version: 4.4.32 +Version: 4.4.33 Release: 1%{?dist} Summary: Extended crypt library for descrypt, md5crypt, bcrypt, and others @@ -175,7 +175,6 @@ 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. @@ -574,6 +573,9 @@ done %changelog +* Fri Nov 18 2022 Björn Esser - 4.4.33-1 +- New upstream release + * Fri Nov 18 2022 Björn Esser - 4.4.32-1 - New upstream release diff --git a/sources b/sources index 12c2d25..3097370 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libxcrypt-4.4.32.tar.xz) = 09faa5f3aabe2bb85c55ee40269a313d3dc2de6b06755c8e985d4d720cd8e6125cf5738ce7428f29a2fea4edbca1203fc9807a6b620df71b730be406772b5ca3 +SHA512 (libxcrypt-4.4.33.tar.xz) = b46d226a83d35b578381aa340e34cd77aea25a304aec3d00ba3d3acb6462e96824ff82ea930aaf2b87039dfffef4dab4b1774736d6b8a107cfb61e6cdb307b99 SHA512 (libxcrypt-gpgkey.gpg) = 723ce5d76676e4366959e03850f8814d5b30f8b20a39629f0ccff61bb2b2bef64223fd78e719ad23d7dd272ca6c0177089749f9b508099d56750a8bb466d006c