Do not fail on existing symlink
(cherry picked from commit 86665862f09850cbdccbce3f8a82bc51f4be14c0)
This commit is contained in:
parent
b65df92f7b
commit
fc409f6e60
@ -1,12 +1,13 @@
|
|||||||
Name: argon2
|
Name: argon2
|
||||||
Version: 20190702
|
Version: 20190702
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: A password-hashing tool
|
Summary: A password-hashing tool
|
||||||
License: Public Domain or ASL 2.0
|
License: Public Domain or ASL 2.0
|
||||||
URL: https://github.com/P-H-C/phc-winner-argon2
|
URL: https://github.com/P-H-C/phc-winner-argon2
|
||||||
Source0: https://github.com/P-H-C/phc-winner-argon2/archive/62358ba2123abd17fccf2a108a301d4b52c01a7c/phc-winner-argon2-20190702-62358ba.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
|
Patch1: backport-fix-3-spelling-mistakes.patch
|
||||||
|
Patch2: backport-Don-t-fail-on-existing-symlink.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
Requires: libargon2%{?_isa} = %{version}-%{release}
|
Requires: libargon2%{?_isa} = %{version}-%{release}
|
||||||
@ -115,6 +116,9 @@ make test
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Oct 18 2022 yixiangzhike <yixiangzhike007@163.com> - 20190702-3
|
||||||
- fix spelling mistakes
|
- fix spelling mistakes
|
||||||
|
|
||||||
|
|||||||
25
backport-Don-t-fail-on-existing-symlink.patch
Normal file
25
backport-Don-t-fail-on-existing-symlink.patch
Normal file
@ -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
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user