From 43ec80ab8d2685ec04aea3613a4e4eb1ea8dbcab26b29d6365e11996f66c90b5 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 1 Sep 2020 16:11:54 +0000
Subject: [PATCH] Accepting request 831254 from home:Andreas_Schwab:Factory

- Add compatibility provides for SLE15
- Update to version 4.4.17
  * Salt string compatibility with generic implementations

OBS-URL: https://build.opensuse.org/request/show/831254
OBS-URL: https://build.opensuse.org/package/show/Base:System/libxcrypt?expand=0&rev=25
---
 baselibs.conf           |  2 ++
 libxcrypt-4.4.15.tar.gz |  3 ---
 libxcrypt-4.4.17.tar.gz |  3 +++
 libxcrypt.changes       |  7 +++++++
 libxcrypt.spec          | 12 +++++++++++-
 5 files changed, 23 insertions(+), 4 deletions(-)
 delete mode 100644 libxcrypt-4.4.15.tar.gz
 create mode 100644 libxcrypt-4.4.17.tar.gz

diff --git a/baselibs.conf b/baselibs.conf
index dae5526..2c16257 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,6 @@
 libcrypt1
+  arch i586 provides "libowcrypt.so.1"
+  arch i586 provides "libowcrypt.so.1(OW_CRYPT_1.0)"
 libxcrypt-devel
   requires -libxcrypt-<targettype>
   requires "libcrypt1-<targettype> = <version>"
diff --git a/libxcrypt-4.4.15.tar.gz b/libxcrypt-4.4.15.tar.gz
deleted file mode 100644
index 087f93e..0000000
--- a/libxcrypt-4.4.15.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8bcdef03bc65f9dbda742e56820435b6f13eea59fb903765141c6467f4655e5a
-size 480586
diff --git a/libxcrypt-4.4.17.tar.gz b/libxcrypt-4.4.17.tar.gz
new file mode 100644
index 0000000..a19abe4
--- /dev/null
+++ b/libxcrypt-4.4.17.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7665168d0409574a03f7b484682e68334764c29c21ca5df438955a381384ca07
+size 519096
diff --git a/libxcrypt.changes b/libxcrypt.changes
index 32e6e9d..34202d4 100644
--- a/libxcrypt.changes
+++ b/libxcrypt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep  1 14:47:37 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- Add compatibility provides for SLE15
+- Update to version 4.4.17
+  * Salt string compatibility with generic implementations
+
 -------------------------------------------------------------------
 Mon Mar  2 09:50:17 UTC 2020 - Andreas Schwab <schwab@suse.de>
 
diff --git a/libxcrypt.spec b/libxcrypt.spec
index 690bbd9..f946dac 100644
--- a/libxcrypt.spec
+++ b/libxcrypt.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libxcrypt
-Version:        4.4.15
+Version:        4.4.17
 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
@@ -42,6 +42,16 @@ Openwall Linux, 'crypt_rn', 'crypt_ra', 'crypt_gensalt',
 Summary:        Extended crypt library for DES, MD5, Blowfish and others
 License:        LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND SUSE-Public-Domain
 Group:          System/Libraries
+# Compatibility provides to help the transition from libowcrypt.so.1
+# to libcrypt.so.1, which provides all symbols of the former
+%ifarch x86_64 s390x ppc64le aarch64
+Provides:       libowcrypt.so.1()(64bit)
+Provides:       libowcrypt.so.1(OW_CRYPT_1.0)(64bit)
+%endif
+%ifarch i586
+Provides:       libowcrypt.so.1
+Provides:       libowcrypt.so.1(OW_CRYPT_1.0)
+%endif
 
 %description -n libcrypt1
 libxcrypt is a modern library for one-way hashing of passwords.  It