New upstream release

This commit is contained in:
Björn Esser 2018-05-16 13:19:53 +02:00
parent 6bbf93a4e4
commit 544ae52099
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
5 changed files with 7 additions and 56 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/libxcrypt-4.0.0-20180120gitde99d27.tar.gz
/libxcrypt-4.0.0-20180120git3436e7b.tar.gz
/libxcrypt-4.0.0.tar.gz
/libxcrypt-4.0.1.tar.gz

View File

@ -1,28 +0,0 @@
From b84539c87d1522b73359772c0d6521a0f0fd5b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Thu, 1 Feb 2018 14:15:04 +0100
Subject: [PATCH] test-crypt-badsalt: Initialize cd before calling crypt_r
The value of 'cd.initialized' is left uninitialized before the
first invocation of 'crypt_r ()' in this test despite the fact
that it should be set to zero according to the API.
Ported from glibc commit: 650ba77ad547b24e0839c90ed56f7b9445d8165a
---
test-crypt-badsalt.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/test-crypt-badsalt.c b/test-crypt-badsalt.c
index 12892ba..1e1e840 100644
--- a/test-crypt-badsalt.c
+++ b/test-crypt-badsalt.c
@@ -68,6 +68,9 @@ main (void)
tests[n - 1][1] = &page[pagesize - 1];
}
+ /* Mark cd as initialized before first call to crypt_r. */
+ cd.initialized = 0;
+
for (size_t i = 0; i < n; i++)
{
retval = crypt (tests[i][0], tests[i][1]);

View File

@ -1,22 +0,0 @@
From db1a30dea83a74a0314fddffc35e165b1ebb3158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 31 Jan 2018 00:43:49 +0100
Subject: [PATCH] test-crypt-bcrypt: Fix test with GCC8
---
test-crypt-bcrypt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-crypt-bcrypt.c b/test-crypt-bcrypt.c
index fffee97..02a2f07 100644
--- a/test-crypt-bcrypt.c
+++ b/test-crypt-bcrypt.c
@@ -177,7 +177,7 @@ main (void)
const char *key = tests[i][1];
const char *setting = tests[i][2];
const char *p;
- int ok = !setting || strlen (hash) >= 30;
+ int ok = !setting || hash[0] != '*';
char s_buf[30];
char o_buf[sizeof (struct crypt_data)];
int errnm, match;

View File

@ -18,8 +18,8 @@
Name: libxcrypt
Version: 4.0.0
Release: 5%{?dist}
Version: 4.0.1
Release: 1%{?dist}
Summary: Extended crypt library for DES, MD5, Blowfish and others
# For explicit license breakdown, see the
@ -28,9 +28,6 @@ License: LGPLv2+ and BSD and CDDL and Public Domain
URL: https://github.com/besser82/%{name}
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: %{url}/commit/db1a30dea83a74a0314fddffc35e165b1ebb3158.patch#/%{name}-4.0.0_gcc8_fix_test.patch
Patch1: %{url}/commit/b84539c87d1522b73359772c0d6521a0f0fd5b68.patch#/%{name}-4.0.0_fix_test_crypt_badsalt.patch
BuildRequires: fipscheck
BuildRequires: libtool
@ -182,6 +179,9 @@ is highly discouraged.
%changelog
* Wed May 16 2018 Björn Esser <besser82@fedoraproject.org> - 4.0.1-1
- New upstream release
* Sat Feb 17 2018 Björn Esser <besser82@fedoraproject.org> - 4.0.0-5
- Switch to %%ldconfig_scriptlets

View File

@ -1 +1 @@
SHA512 (libxcrypt-4.0.0.tar.gz) = e8e27e266917bc83c77238cf662749b8e6c4b1a367db4274517f48f27dffe42444e0cd91162868e6714ef8e47e02eecf4f2ae8a02eb60c5f172a7da9b7d4f46d
SHA512 (libxcrypt-4.0.1.tar.gz) = d23503a61a89f23e78347314f400dcaac05d17ec35d9233c09dc5b6019d337c15655d288347eb44af168c16a32f72ec66147a24e067c2a025693cdfb30a908b1