From 288e4948d7cfcf9f8abd7d0444ad9987dc6c2629495fa3a7afabdb4538c1e436 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 12 May 2020 15:02:47 +0000
Subject: [PATCH 1/2] Accepting request 803034 from
 home:wfrisch:branches:security

version update to 20190520

OBS-URL: https://build.opensuse.org/request/show/803034
OBS-URL: https://build.opensuse.org/package/show/security/argon2?expand=0&rev=16
---
 _service                              |  2 +-
 _servicedata                          |  8 +++++---
 argon2-0.0+git20171227.670229c.tar.xz |  3 ---
 argon2-0.0+git20190520.62358ba.tar.xz |  3 +++
 argon2.changes                        |  9 +++++++++
 argon2.spec                           | 10 +++++-----
 6 files changed, 23 insertions(+), 12 deletions(-)
 delete mode 100644 argon2-0.0+git20171227.670229c.tar.xz
 create mode 100644 argon2-0.0+git20190520.62358ba.tar.xz

diff --git a/_service b/_service
index ef3f528..e64144d 100644
--- a/_service
+++ b/_service
@@ -7,7 +7,7 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <!-- from https://github.com/P-H-C/phc-winner-argon2/releases/latest -->
-    <param name="revision">20171227</param>
+    <param name="revision">20190702</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="compression">xz</param>
diff --git a/_servicedata b/_servicedata
index 5e36dd1..f729e34 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,6 @@
 <servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/P-H-C/phc-winner-argon2.git</param>
-              <param name="changesrevision">670229c849b9fe882583688b74eb7dfdc846f9f6</param></service></servicedata>
\ No newline at end of file
+  <service name="tar_scm">
+    <param name="url">https://github.com/P-H-C/phc-winner-argon2.git</param>
+    <param name="changesrevision">d3639142fa71f8095ee36e64068f71b3c97baf6d</param>
+  </service>
+</servicedata>
\ No newline at end of file
diff --git a/argon2-0.0+git20171227.670229c.tar.xz b/argon2-0.0+git20171227.670229c.tar.xz
deleted file mode 100644
index 1861b2a..0000000
--- a/argon2-0.0+git20171227.670229c.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:412899b064fa8c444eb4cf7516f90812dc194414516145c72aede6a73989342e
-size 1339200
diff --git a/argon2-0.0+git20190520.62358ba.tar.xz b/argon2-0.0+git20190520.62358ba.tar.xz
new file mode 100644
index 0000000..68f0ea2
--- /dev/null
+++ b/argon2-0.0+git20190520.62358ba.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8dd564d6411ae3eb096533d98e3bf06b98434f26ebef45515136d3e5fff1bebd
+size 1340828
diff --git a/argon2.changes b/argon2.changes
index df39771..ed983f3 100644
--- a/argon2.changes
+++ b/argon2.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue May 12 14:17:20 UTC 2020 - Wolfgang Frisch <wolfgang.frisch@suse.com>
+
+- Update to version 0.0+git20190520.62358ba (boo#1170512):
+  * Fix the Makefile to install libargon2.pc.
+  * Wait for already running threads if a thread creation failed.
+  * Added Argon2 Erlang binding.
+  * Additional JVM bindings (Jargon2).
+
 -------------------------------------------------------------------
 Tue Jan 30 13:31:06 UTC 2018 - lnussel@suse.de
 
diff --git a/argon2.spec b/argon2.spec
index 6ec17f9..cdcc45c 100644
--- a/argon2.spec
+++ b/argon2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package argon2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -26,12 +26,12 @@
 
 %define lname libargon2-1
 Name:           argon2
-Version:        0.0+git20171227.670229c
+Version:        0.0+git20190520.62358ba
 Release:        0
 Summary:        The reference C implementation of Argon2
-License:        CC0-1.0 or Apache-2.0
+License:        CC0-1.0 OR Apache-2.0
 Group:          Productivity/Networking/Security
-Url:            https://github.com/P-H-C/phc-winner-argon2
+URL:            https://github.com/P-H-C/phc-winner-argon2
 Source:         %{name}-%{version}.tar.xz
 Source1:        baselibs.conf
 Patch1:         optflags.patch

From 1e9f424e01e5fc0f7fc4f2472bef33257aea510301575c62a5969a53ada5c213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Tue, 12 May 2020 16:58:31 +0000
Subject: [PATCH 2/2] Remove now-unneeded pkgconfig hacks

OBS-URL: https://build.opensuse.org/package/show/security/argon2?expand=0&rev=17
---
 argon2.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/argon2.spec b/argon2.spec
index cdcc45c..41adeab 100644
--- a/argon2.spec
+++ b/argon2.spec
@@ -80,14 +80,11 @@ password hashing function that won the Password Hashing Competition
 
 %build
 %make %{?_smp_mflags}
-# fix pkgconfig file
-sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i libargon2.pc
 
 %install
 %make DESTDIR=%{buildroot} install
 
 install -D -m 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1
-install -D -m 644 libargon2.pc %{buildroot}/%{_libdir}/pkgconfig/libargon2.pc
 
 %check
 %make test