Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/409

.gitignore

@@ -1,2 +1,3 @@
 /phc-winner-argon2-20161029-1c4fc41.tar.gz
 /phc-winner-argon2-20171227-670229c.tar.gz
+/phc-winner-argon2-20190702-62358ba.tar.gz

argon2.spec

@@ -7,25 +7,23 @@
 # Please, preserve the changelog entries
 #
 %global libname      libargon2
-%global gh_commit    670229c849b9fe882583688b74eb7dfdc846f9f6
+%global gh_commit    62358ba2123abd17fccf2a108a301d4b52c01a7c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     P-H-C
 %global gh_project   phc-winner-argon2
 %global soname       1
 
-%global upstream_version 20171227
+%global upstream_version 20190702
 #global upstream_prever  RC1
 
 Name:    argon2
 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 7%{?dist}
+Release: 6%{?dist}
 Summary: The password-hashing tools
 
-License: Public Domain or ASL 2.0
+License: CC0-1.0 OR Apache-2.0
 URL:     https://github.com/%{gh_owner}/%{gh_project}
 Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz
-Patch0:  argon2-Use-explicit_bzero-on-recent-glibc-versions.patch
-Patch1:  argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch
 
 BuildRequires: gcc
 BuildRequires: make
@@ -76,8 +74,6 @@ developing applications that use %{libname}.
 
 %prep
 %setup -qn %{gh_project}-%{gh_commit}
-%patch0 -p1
-%patch1 -p1
 
 if ! grep -q 'ABI_VERSION = %{soname}' Makefile; then
   : soname have changed
@@ -86,8 +82,9 @@ if ! grep -q 'ABI_VERSION = %{soname}' Makefile; then
 fi
 
 # Fix pkgconfig file
-sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc
+sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc.in
 
+%build
 # Honours default RPM build options and library path, do not use -march=native
 sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
     -e 's:-O3 -Wall:%{optflags}:' \
@@ -96,13 +93,12 @@ sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \
     -e 's:CFLAGS += -march=\$(OPTTARGET)::' \
     -i Makefile
 
-%build
 # parallel build is not supported
-make -j1
+make -j1 PREFIX=%{_prefix}
 
 
 %install
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBRARY_REL=%{_lib}
 
 # Drop static library
 rm %{buildroot}%{_libdir}/%{libname}.a
@@ -112,7 +108,7 @@ install -Dpm 644 %{libname}.pc %{buildroot}%{_libdir}/pkgconfig/%{libname}.pc
 
 # Fix perms
 chmod -x %{buildroot}%{_includedir}/%{name}.h
-
+chmod +x %{buildroot}%{_libdir}/%{libname}.so.%{soname}
 
 %check
 make test
@@ -135,6 +131,33 @@ make test
 
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20190702-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20190702-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 20190702-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20190702-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 20190702-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Aug  2 2022 Tom Callaway <spot@fedoraproject.org> - 20190702-1
+- update to 20190702
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20171227-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Mar 28 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 20171227-9
+- Fix build with package notes (rhbz#2066558)
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 20171227-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20171227-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (phc-winner-argon2-20171227-670229c.tar.gz) = 005c6bba5a3fa0470389a667c4d9ee1cd6401a981330cc72c84d87d9563159ce3f600f65204baf999aa6350dfbecc7c036946347306e089154ef09b9fb65494e
+SHA512 (phc-winner-argon2-20190702-62358ba.tar.gz) = b8d2917ec91cc2c624d3f71b87a503b51b17b4901868576106985bd778f77f58ec4a37f1ed9fb0da7333195534fc5df0850ce196a74c710a1701ee306b32a076