revert "update argon2 to 20190702"
This commit is contained in:
parent
38dcf9cd89
commit
628de969ce
30
argon2.spec
30
argon2.spec
@ -1,12 +1,10 @@
|
||||
%define make %__make OPTFLAGS="%{optflags}" LIBRARY_REL=%{_lib}
|
||||
|
||||
Name: argon2
|
||||
Version: 20190702
|
||||
Release: 2
|
||||
Version: 20161029
|
||||
Release: 10
|
||||
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/62358ba2123abd17fccf2a108a301d4b52c01a7c/phc-winner-argon2-20190702-62358ba.tar.gz
|
||||
Source0: https://github.com/P-H-C/phc-winner-argon2/archive/1c4fc41f81f358283755eea88d4ecd05e43b7fd3/phc-winner-argon2-20161029-1c4fc41.tar.gz
|
||||
|
||||
BuildRequires: gcc
|
||||
Requires: libargon2%{?_isa} = %{version}-%{release}
|
||||
@ -53,20 +51,31 @@ This package contains dynamic library for argon2
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%setup -qn phc-winner-argon2-62358ba2123abd17fccf2a108a301d4b52c01a7c
|
||||
%setup -qn phc-winner-argon2-1c4fc41f81f358283755eea88d4ecd05e43b7fd3
|
||||
|
||||
if ! grep -q 'soname,libargon2.so.*' 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 '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
|
||||
-e 's:-O3 -Wall -g:%{optflags}:' \
|
||||
-e 's:-O3 -Wall:%{optflags}:' \
|
||||
-e '/^LIBRARY_REL/s:lib:%{_lib}:' \
|
||||
-e 's:-march=\$(OPTTARGET) :${CFLAGS} :' \
|
||||
-e 's:CFLAGS += -march=\$(OPTTARGET)::' \
|
||||
-i Makefile
|
||||
|
||||
%build
|
||||
%make %{?_smp_mflags}
|
||||
make -j1
|
||||
|
||||
%install
|
||||
%make DESTDIR=%{buildroot} install
|
||||
%make_install
|
||||
%delete_la_and_a
|
||||
|
||||
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
|
||||
@ -104,6 +113,9 @@ make test
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 6 2020 Liquor <lirui130@huawei.com> - 20161029-10
|
||||
- revert "update argon2 to 20190702"
|
||||
|
||||
* Sat Jul 4 2020 Liquor <lirui130@huawei.com> - 20190702-2
|
||||
- add libargon2.so.0
|
||||
|
||||
|
||||
BIN
phc-winner-argon2-20161029-1c4fc41.tar.gz
Normal file
BIN
phc-winner-argon2-20161029-1c4fc41.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user