R-maint-sig mass rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,2 @@
 /argon2_0.2-0.tar.gz
+/argon2_0.4-0.tar.gz

0001-Build-against-system-libraries-0.4.0.patch

@@ -0,0 +1,63 @@
+diff -up argon2/src/Makevars.in.system argon2/src/Makevars.in
+--- argon2/src/Makevars.in.system	2022-08-02 18:22:21.273766216 -0400
++++ argon2/src/Makevars.in	2022-08-02 18:23:16.861075821 -0400
+@@ -1,13 +1,5 @@
+-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) -I./argon2 @ADDL_CFLAGS@
+-PKG_LIBS = $(SHLIB_OPENMP_CFLAGS)
+-
+-ARGON2_OBJS = \
+-	argon2/blake2/blake2b.o \
+-	argon2/argon2.o \
+-	argon2/core.o \
+-	argon2/encoding.o \
+-	argon2/@FILL_IMPL@ \
+-	argon2/thread.o
++PKG_CFLAGS = $(shell pkg-config --cflags libargon2) $(SHLIB_OPENMP_CFLAGS)
++PKG_LIBS = $(shell pkg-config --libs libargon2) -lb2 $(SHLIB_OPENMP_CFLAGS)
+ 
+ R_OBJS = \
+ 	argon2_native.o \
+@@ -16,7 +8,7 @@ R_OBJS = \
+ 	pw_hash.o \
+ 	raw_as_char.o
+ 
+-OBJECTS = $(ARGON2_OBJS) $(R_OBJS)
++OBJECTS = $(R_OBJS)
+ all: $(SHLIB)
+ $(SHLIB): $(OBJECTS) 
+ 
+diff -up argon2/src/pw_hash.c.system argon2/src/pw_hash.c
+--- argon2/src/pw_hash.c.system	2022-08-02 18:24:09.600318328 -0400
++++ argon2/src/pw_hash.c	2022-08-02 18:24:55.957410456 -0400
+@@ -25,7 +25,7 @@
+ */
+ 
+ 
+-#include "argon2/argon2.h"
++#include "argon2.h"
+ 
+ #include "common.h"
+ #include "random_uchars.h"
+diff -up argon2/src/blake2.c.system argon2/src/blake2.c
+--- argon2/src/blake2.c.system	2022-08-02 18:27:04.697443485 -0400
++++ argon2/src/blake2.c	2022-08-02 18:27:17.318740831 -0400
+@@ -26,7 +26,7 @@
+ 
+ 
+ #include "common.h"
+-#include "argon2/blake2/blake2.h"
++#include "blake2.h"
+ 
+ #define HASHLEN 64
+ 
+diff -up argon2/src/raw_as_char.c.system argon2/src/raw_as_char.c
+--- argon2/src/raw_as_char.c.system	2022-08-02 18:28:15.361108271 -0400
++++ argon2/src/raw_as_char.c	2022-08-02 18:28:40.613703208 -0400
+@@ -30,7 +30,6 @@
+ #include <stdint.h>
+ 
+ #include "common.h"
+-#include "argon2/blake2/blake2.h"
+ 
+ 
+ SEXP R_raw_as_char(SEXP rawvec_, SEXP upper_, SEXP spaces_)

R-argon2.spec

@@ -1,16 +1,21 @@
 %global packname  argon2
 %global rlibdir  %{_libdir}/R/library
 
+# Even if I update libargon2 to 20190702 && hack it to export the symbol for secure_wipe_memory
+# this package fails its tests when built against system argon2 and b2.
+# Feel free to fix this so we can use the system copies.
+# 2022-08-02 spot@fedoraproject.org
+%bcond_without bundled
 
 Name:             R-%{packname}
-Version:          0.2.0
-Release:          10%{?dist}
+Version:          0.4.0
+Release:          3%{?dist}
 Summary:          Secure Password Hashing
 
 License:          BSD
 URL:              https://CRAN.R-project.org/package=%{packname}
-Source0:          https://cran.r-project.org/src/contrib/%{packname}_0.2-0.tar.gz
-Patch0001:        0001-Build-against-system-libraries.patch
+Source0:          https://cran.r-project.org/src/contrib/%{packname}_0.4-0.tar.gz
+Patch0001:        0001-Build-against-system-libraries-0.4.0.patch
 
 # Here's the R view of the dependencies world:
 # Depends:
@@ -20,8 +25,13 @@ Patch0001:        0001-Build-against-system-libraries.patch
 # Enhances:
 
 BuildRequires:    R-devel tex(latex)
-BuildRequires:    libargon2-devel >= 20161029
+%if %{with bundled}
+Provides:         bundled(libargon2) = 20190702
+Provides:         bundled(libb2)
+%else
+BuildRequires:    libargon2-devel >= 20190702
 BuildRequires:    libb2-devel
+%endif
 
 %description
 Utilities for secure password hashing via the argon2 algorithm. It is a
@@ -38,10 +48,12 @@ similar R packages, see sodium and 'bcrypt'.  See
 %setup -q -c -n %{packname}
 
 # Delete bundled libraries.
+%if !%{with bundled}
 pushd %{packname}
 rm -r src/argon2
 %patch0001 -p1
 popd
+%endif
 
 
 %build
@@ -75,6 +87,32 @@ rm -f %{buildroot}%{rlibdir}/R.css
 
 
 %changelog
+* Fri Apr 21 2023 Iñaki Úcar <iucar@fedoraproject.org> - 0.4.0-3
+- R-maint-sig mass rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Aug  2 2022 Tom Callaway <spot@fedoraproject.org> - 0.4.0-1
+- update to 0.4-0
+- rebuild for R 4.2.1
+- use bundled bits
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun  7 2021 Tom Callaway <spot@fedoraproject.org> - 0.2.0-12
+- rebuild for R 4.1.0
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (argon2_0.2-0.tar.gz) = 2889b2a60c7d067fce712618bc9355f759fd00003c6c9d4ce99deb9fe63607a383502ddf3905fe24754234cc978aed7274e6aa2b3ff2930e4b75a40931be601d
+SHA512 (argon2_0.4-0.tar.gz) = de0af94e3b49d13897bb91b07df6da95c3ad5a436b84e8a1b745f8cdea0dd42df2ac79f6bc7742d20bc0d962a5bbb6af2c1ec5cac00b0dcfe7081658f6f2cea0