!20 [sync] PR-19: 【Mainline】Do not fail on existing symlink

From: @openeuler-sync-bot 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee

argon2.spec

@@ -1,10 +1,13 @@
 Name:          argon2
-Version:       20161029
+Version:       20190702
-Release:       10
+Release:       4
 Summary:       A password-hashing tool
 License:       Public Domain or ASL 2.0
 URL:           https://github.com/P-H-C/phc-winner-argon2
-Source0:       https://github.com/P-H-C/phc-winner-argon2/archive/1c4fc41f81f358283755eea88d4ecd05e43b7fd3/phc-winner-argon2-20161029-1c4fc41.tar.gz
+Source0:       https://github.com/P-H-C/phc-winner-argon2/archive/62358ba2123abd17fccf2a108a301d4b52c01a7c/phc-winner-argon2-20190702-62358ba.tar.gz
+
+Patch1:  backport-fix-3-spelling-mistakes.patch
+Patch2:  backport-Don-t-fail-on-existing-symlink.patch
 
 BuildRequires: gcc
 Requires:      libargon2%{?_isa} = %{version}-%{release}
@@ -51,15 +54,15 @@ This package contains dynamic library for argon2
 %package_help
 
 %prep
-%setup -qn phc-winner-argon2-1c4fc41f81f358283755eea88d4ecd05e43b7fd3
+%autosetup -n phc-winner-argon2-62358ba2123abd17fccf2a108a301d4b52c01a7c -p1
 
-if ! grep -q 'soname,libargon2.so.*' Makefile; then
+if ! grep -q 'ABI_VERSION = 1' Makefile; then
   : soname have changed
   grep soname Makefile
   exit 1
 fi
 
-sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i libargon2.pc
+sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i libargon2.pc.in
 
 sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
     -e 's:-O3 -Wall:%{optflags}:' \
@@ -68,6 +71,8 @@ sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
     -e 's:CFLAGS += -march=\$(OPTTARGET)::' \
     -i Makefile
 
+sed -e 's/\/x86_64-linux-gnu//g' -i Makefile
+
 %build
 make -j1
 
@@ -75,12 +80,10 @@ make -j1
 %make_install
 %delete_la_and_a
 
+install -Dpm 755 libargon2.so.* %{buildroot}%{_libdir}/
 install -Dpm 644 libargon2.pc %{buildroot}%{_libdir}/pkgconfig/libargon2.pc
 install -Dpm 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1
 
-mv %{buildroot}%{_libdir}/libargon2.so %{buildroot}%{_libdir}/libargon2.so.0
-ln -s libargon2.so.0 %{buildroot}%{_libdir}/libargon2.so
-
 %check
 make test
 
@@ -113,6 +116,21 @@ make test
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jul 31 2024 yixiangzhike <yixiangzhike007@163.com> - 20190702-4
+- backport upstream patch to fix failure on existing symlink
+
+* Tue Oct 18 2022 yixiangzhike <yixiangzhike007@163.com> - 20190702-3
+- fix spelling mistakes
+
+* Tue Apr 12 2022 yixiangzhike <yixiangzhike007@163.com> - 20190702-2
+- delete the old version .so file
+
+* Tue Sep 1 2020 zhangxingliang <zhangxingliang3@huawei.com> - 20190702-1
+- update to 20190702
+
+* Mon Jul 20 2020 Liquor <lirui130@huawei.com> - 20171227-1
+- update to 20171227
+
 * Mon Jul 6 2020 Liquor <lirui130@huawei.com> - 20161029-10
 - revert "update argon2 to 20190702" 
 

backport-Don-t-fail-on-existing-symlink.patch

@@ -0,0 +1,25 @@
+From b997b9e7d4744020409223afddc7299a771eb52d Mon Sep 17 00:00:00 2001
+From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
+Date: Thu, 7 Nov 2019 09:55:32 +0100
+Subject: [PATCH] Don't fail on existing symlink
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 837e7f7..7c116c9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -238,7 +238,7 @@ install: $(RUN) libs
+ 	$(INSTALL) -d $(INST_LIBRARY)
+ 	$(INSTALL) -m 0644 $(LIBRARIES) $(INST_LIBRARY)
+ ifdef LINKED_LIB_SH
+-	cd $(INST_LIBRARY) && ln -s $(notdir $(LIB_SH) $(LINKED_LIB_SH))
++	cd $(INST_LIBRARY) && ln -sf $(notdir $(LIB_SH) $(LINKED_LIB_SH))
+ endif
+ 	$(INSTALL) -d $(INST_BINARY)
+ 	$(INSTALL) $(RUN) $(INST_BINARY)
+-- 
+2.33.0
+

backport-fix-3-spelling-mistakes.patch

@@ -0,0 +1,48 @@
+From c985330b0120a2414c1480eac1f169ac6bf7d926 Mon Sep 17 00:00:00 2001
+From: Bastian Bittorf <bb@npl.de>
+Date: Fri, 25 Jun 2021 10:14:58 +0200
+Subject: [PATCH] fix 3 spelling mistakes
+
+---
+ README.md       | 4 ++--
+ libargon2.pc.in | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/README.md b/README.md
+index d936e33..91fc3fd 100644
+--- a/README.md
++++ b/README.md
+@@ -105,7 +105,7 @@ There are many additional parameters, but we will highlight three of them here.
+    https://en.wikipedia.org/wiki/Hash-based_message_authentication_code).
+    This allows a secret key to be input at hashing time (from some external
+    location) and be folded into the value of the hash. This means that even if
+-   your salts and hashes are compromized, an attacker cannot brute-force to find
++   your salts and hashes are compromised, an attacker cannot brute-force to find
+    the password without the key.
+ 
+ 2. The `ad` parameter, which is used to fold any additional data into the hash
+@@ -116,7 +116,7 @@ There are many additional parameters, but we will highlight three of them here.
+    key only usable at hashing time. The `ad` is for any other data.
+ 
+ 3. The `flags` parameter, which determines which memory should be securely
+-   erased. This is useful if you want to securly delete the `pwd` or `secret`
++   erased. This is useful if you want to securely delete the `pwd` or `secret`
+    fields right after they are used. To do this set `flags` to either
+    `ARGON2_FLAG_CLEAR_PASSWORD` or `ARGON2_FLAG_CLEAR_SECRET`. To change how
+    internal memory is cleared, change the global flag
+diff --git a/libargon2.pc.in b/libargon2.pc.in
+index 7185324..a0d2929 100644
+--- a/libargon2.pc.in
++++ b/libargon2.pc.in
+@@ -3,7 +3,7 @@
+ ## - replace @UPSTREAM_VER@ with current version, e.g. '20160406'
+ ## - replace @HOST_MULTIARCH@ with target arch lib, e.g. 'lib', 'lib/x86_64-linux-gnu' or 'lib64'
+ ## - replace @PREFIX@ with install path, e.g. '/usr', '/usr/local', '/usr/pkg'
+-## - replace @INCLUDE@ with incluse path, e.g. 'include' or 'include/argon2'
++## - replace @INCLUDE@ with include path, e.g. 'include' or 'include/argon2'
+ 
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-- 
+2.27.0
+