Accepting request 768748 from Base:System

- Update to version 4.4.12
  * Another fix for GCC v10.x, which occurs on s390 architectures only. (forwarded request 768745 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/768748
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxcrypt?expand=0&rev=6

gcc10.patch

@@ -1,65 +0,0 @@
-From 45ff87405a6f2ee64ec282e6efc6cca229eae893 Mon Sep 17 00:00:00 2001
-From: Zack Weinberg <zackw@panix.com>
-Date: Wed, 11 Dec 2019 13:27:54 -0500
-Subject: [PATCH 1/2] Remove -Winline from the list of warnings to use (#95)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 may decline to inline some functions in `alg-yescrypt-opt.c`
-and, with `-Winline -Werror`, this breaks the build.  This warning
-isn’t ever going to expose actual bugs, so let’s just turn it off.
-
-Fixes #95.
----
- m4/zw_simple_warnings.m4 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/m4/zw_simple_warnings.m4 b/m4/zw_simple_warnings.m4
-index cfdf9e9..e45453e 100644
---- a/m4/zw_simple_warnings.m4
-+++ b/m4/zw_simple_warnings.m4
-@@ -72,7 +72,6 @@ AC_ARG_ENABLE(
-         -Wformat-overflow=2 dnl
-         -Wformat-signedness dnl
-         -Wformat-truncation=1 dnl
--        -Winline dnl
-         -Wlogical-op dnl
-         -Wmissing-declarations dnl
-         -Wmissing-prototypes dnl
--- 
-2.24.1
-
-
-From 941362e2868a71a32a2a497903e651fb647b4fd2 Mon Sep 17 00:00:00 2001
-From: Zack Weinberg <zackw@panix.com>
-Date: Wed, 11 Dec 2019 13:33:07 -0500
-Subject: [PATCH 2/2] crypt-common.h: Declare `ascii64` with explicit `extern`.
-
-GCC 10 changes its default compilation mode from `-fcommon` to
-`-fno-common`, which means that tentative definitions of data objects
-will no longer be merged across translation units; instead they will
-produce multiple definition errors.  The `ascii64` constant was
-supposed to be _declared_ in crypt-common.h, but it was accidentally a
-tentative definition instead.  Fix this by adding the `extern`
-annotation that should have always been there.
----
- lib/crypt-common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/crypt-common.h b/lib/crypt-common.h
-index c97fa5d..1134bc4 100644
---- a/lib/crypt-common.h
-+++ b/lib/crypt-common.h
-@@ -24,7 +24,7 @@
- /* The base-64 encoding table used by most hashing methods.
-    (bcrypt uses a slightly different encoding.)  Size 65
-    because it's used as a C string in a few places.  */
--const unsigned char ascii64[65];
-+extern const unsigned char ascii64[65];
- 
- /* Same table gets used with other names in various places.  */
- #define b64t   ((const char *) ascii64)
--- 
-2.24.1
-

libxcrypt-4.4.10.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7da15438d93883be434b0b44a8c22f726b5f605c6d88a315e17d4f4e929c20a8
-size 499736

libxcrypt-4.4.12.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e9c03ed4d4b5b3db427b579e10fc32d186ac9823f2a219ff1f14bd653f004e2
+size 493620

libxcrypt.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Jan 30 13:34:00 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- Update to version 4.4.12
+  * Another fix for GCC v10.x, which occurs on s390 architectures only.
+
+-------------------------------------------------------------------
+Wed Jan 22 11:35:17 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- Update to version 4.4.11
+  * Fixes for GCC v10.x
+  * Change how the known-answer tests are parallelized
+- gcc10.patch: remove
+
 -------------------------------------------------------------------
 Thu Dec 12 08:23:08 UTC 2019 - Andreas Schwab <schwab@suse.de>
 

libxcrypt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libxcrypt
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           libxcrypt
-Version:        4.4.10
+Version:        4.4.12
 Release:        0
 Summary:        Extended crypt library for DES, MD5, Blowfish and others
 License:        GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND SUSE-Public-Domain
@@ -25,7 +25,6 @@ Group:          Development/Libraries/C and C++
 URL:            https://github.com/besser82/%{name}
 Source0:        %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
-Patch0:         gcc10.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -86,8 +85,8 @@ is highly discouraged.
 %build
 # Disable LTO due to symbol versioning (boo#1138833):
 # (https://en.opensuse.org/openSUSE:LTO#Symbol_versioning).
-
 %define _lto_cflags %{nil}
+
 autoreconf -fi
 %configure			\
   --disable-silent-rules	\