Accepting request 677323 from Base:System

- format-overflow.patch: Fix -Werror=format-overflow (forwarded request 677322 from Andreas_Schwab)

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

format-overflow.patch

@@ -0,0 +1,77 @@
+From 2e4135284e7aaeac2218878041de31d8e724dc8f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Thu, 24 Jan 2019 22:22:36 +0100
+Subject: [PATCH] test-alg-hmac-sha1: Fix -Wformat-overflow.
+
+---
+ test-alg-hmac-sha1.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/test-alg-hmac-sha1.c b/test-alg-hmac-sha1.c
+index ffc6cb4..167f0b4 100644
+--- a/test-alg-hmac-sha1.c
++++ b/test-alg-hmac-sha1.c
+@@ -162,8 +162,15 @@ main (void)
+       if (strcmp (dbuf, test->expect) != 0)
+         {
+           n = 1;
+-          printf ("\nkey=%s, data=%s,\nresult=%s: %s\n",
+-                  test->key, test->data, dbuf, test->expect);
++          printf ("\nkey=");
++          puts (test->key);
++          puts (", data=");
++          puts (test->data);
++          printf (",\nresult=");
++          puts (dbuf);
++          puts (": ");
++          puts (test->expect);
++          printf ("\n");
+         }
+     }
+   return n;
+-- 
+2.20.1
+
+From 8d109010f022ac75e383ac74d1961c0c63a16c3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Tue, 19 Feb 2019 10:59:43 +0100
+Subject: [PATCH] test-alg-hmac-sha1: Use fputs() instead of puts().
+
+puts() appends a newline character at the
+end of the output, while fputs() does not.
+---
+ test-alg-hmac-sha1.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/test-alg-hmac-sha1.c b/test-alg-hmac-sha1.c
+index 167f0b4..5a87c7b 100644
+--- a/test-alg-hmac-sha1.c
++++ b/test-alg-hmac-sha1.c
+@@ -162,15 +162,15 @@ main (void)
+       if (strcmp (dbuf, test->expect) != 0)
+         {
+           n = 1;
+-          printf ("\nkey=");
+-          puts (test->key);
+-          puts (", data=");
+-          puts (test->data);
+-          printf (",\nresult=");
+-          puts (dbuf);
+-          puts (": ");
+-          puts (test->expect);
+-          printf ("\n");
++          fputs ("\nkey=", stdout);
++          fputs (test->key, stdout);
++          fputs (", data=", stdout);
++          fputs (test->data, stdout);
++          fputs (",\nresult=", stdout);
++          fputs (dbuf, stdout);
++          fputs (": ", stdout);
++          fputs (test->expect, stdout);
++          fputs ("\n", stdout);
+         }
+     }
+   return n;
+-- 
+2.20.1
+

libxcrypt-4.1.0.tar.gz

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

libxcrypt-4.4.3.tar.gz

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

libxcrypt.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Feb 19 10:49:30 UTC 2019 - schwab@suse.de
+
+- format-overflow.patch: Fix -Werror=format-overflow
+
+-------------------------------------------------------------------
+Thu Feb 14 13:54:55 UTC 2019 - Martin Liška <mliska@suse.cz>
+
+- Update to version 4.4.3:
+  * Add libxcrypt.so, libxcrypt.a and xcrypt.h.
+  * Add new man3 manual pages.
+
 -------------------------------------------------------------------
 Tue Oct  9 11:43:13 UTC 2018 - schwab@suse.de
 

libxcrypt.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libxcrypt
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # 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.1.0
+Version:        4.4.3
 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,6 +25,7 @@ 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:         format-overflow.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -119,16 +120,26 @@ find %{buildroot}%{_libdir} -name '*.la' -print -delete
 %files devel
 %doc TODO
 %{_libdir}/libcrypt.so
+%{_libdir}/libxcrypt.so
 %{_libdir}/libowcrypt.so
 %{_includedir}/crypt.h
+%{_includedir}/xcrypt.h
 %{_libdir}/pkgconfig/libcrypt.pc
 %{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/crypt_rn.3.*
 %{_mandir}/man3/crypt_gensalt.3.*
+%{_mandir}/man3/crypt.3.*
+%{_mandir}/man3/crypt_checksalt.3.*
+%{_mandir}/man3/crypt_gensalt_ra.3.*
+%{_mandir}/man3/crypt_gensalt_rn.3.*
+%{_mandir}/man3/crypt_preferred_method.3.*
+%{_mandir}/man3/crypt_r.3.*
+%{_mandir}/man3/crypt_ra.3.*
 %{_mandir}/man5/crypt.5.*
 
 %files devel-static
 %{_libdir}/libcrypt.a
+%{_libdir}/libxcrypt.a
 %{_libdir}/libowcrypt.a
 
 %changelog