Accepting request 972474 from security

1. Fix version of package: 20171227 is the upstream version number
  of the package

2. Fix rpmlint error: shared-library-not-executable (forwarded request 972318 from susnux)

OBS-URL: https://build.opensuse.org/request/show/972474
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/argon2?expand=0&rev=8

_service

@@ -1,8 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
     <param name="filename">argon2</param>
-    <param name="version">0.0</param>
-    <param name="versionformat">0.0+git%cd.%h</param>
+    <param name="versionformat">@PARENT_TAG@</param>
     <param name="url">https://github.com/P-H-C/phc-winner-argon2.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>

adjust-makefile.patch

@@ -1,8 +1,7 @@
-diff --git a/Makefile b/Makefile
-index 1e1129f..33fe491 100644
---- a/Makefile
-+++ b/Makefile
-@@ -30,7 +30,7 @@ SRC_BENCH = src/bench.c
+diff -Nur argon2-20190702/Makefile new/Makefile
+--- argon2-20190702/Makefile	2019-05-20 11:18:00.000000000 +0200
++++ new/Makefile	2022-04-24 00:09:10.859729849 +0200
+@@ -37,7 +37,7 @@
  SRC_GENKAT = src/genkat.c
  OBJ = $(SRC:.c=.o)
  
@@ -11,7 +10,7 @@ index 1e1129f..33fe491 100644
  
  ifeq ($(NO_THREADS), 1)
  CFLAGS += -DARGON2_NO_THREADS
-@@ -41,16 +41,12 @@ endif
+@@ -48,16 +48,12 @@
  CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement -D_FORTIFY_SOURCE=2 \
  				-Wextra -Wno-type-limits -Werror -coverage -DTEST_LARGE_RAM
  
@@ -29,3 +28,20 @@ index 1e1129f..33fe491 100644
  	SRC += src/opt.c
  endif
  
+@@ -128,6 +124,7 @@
+ HEADERS = include/argon2.h
+ 
+ INSTALL = install
++LIB_INSTALL_PERM = 0755
+ 
+ # relative paths for different OS
+ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),DragonFly FreeBSD))
+@@ -236,7 +233,7 @@
+ 	$(INSTALL) -d $(INST_INCLUDE)
+ 	$(INSTALL) -m 0644 $(HEADERS) $(INST_INCLUDE)
+ 	$(INSTALL) -d $(INST_LIBRARY)
+-	$(INSTALL) -m 0644 $(LIBRARIES) $(INST_LIBRARY)
++	$(INSTALL) -m $(LIB_INSTALL_PERM) $(LIBRARIES) $(INST_LIBRARY)
+ ifdef LINKED_LIB_SH
+ 	cd $(INST_LIBRARY) && ln -s $(notdir $(LIB_SH) $(LINKED_LIB_SH))
+ endif

argon2-0.0+git20190520.62358ba.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8dd564d6411ae3eb096533d98e3bf06b98434f26ebef45515136d3e5fff1bebd
-size 1340828

argon2-20190702.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cfcab204cdc007f363bc863fe636fc9b9e0ddaab332fb0946b92171616f83c6
+size 1347812

argon2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Apr 23 21:44:18 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Fix version of package: 20171227 is the upstream version number
+  of the package
+- Replaced optflags.patch with adjust-makefile.patch, the
+  patch will now also allow to set the file permissions of installed
+  libraries. This fixes the rpmlint error: shared-library-not-executable
+
 -------------------------------------------------------------------
 Tue May 12 14:17:20 UTC 2020 - Wolfgang Frisch <wolfgang.frisch@suse.com>
 

argon2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package argon2
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,19 +22,20 @@
 %define no_optimize 1
 %endif
 # for convenience
-%define make %__make OPTFLAGS="%{optflags}" OPTTEST=%no_optimize LIB_ST= LIBRARY_REL=%_lib
+%define make %__make %{?_smp_mflags} OPTFLAGS="%{optflags}" OPTTEST=%no_optimize LIB_ST= LIBRARY_REL=%_lib
 
 %define lname libargon2-1
 Name:           argon2
-Version:        0.0+git20190520.62358ba
+Version:        20190702
 Release:        0
 Summary:        The reference C implementation of Argon2
-License:        CC0-1.0 OR Apache-2.0
+License:        Apache-2.0 OR CC0-1.0
 Group:          Productivity/Networking/Security
 URL:            https://github.com/P-H-C/phc-winner-argon2
 Source:         %{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-Patch1:         optflags.patch
+# PATCH-FIX-OPENSUSE adjust-makefile.patch -- Allow setting optflags and file permissions of installed libraries
+Patch1:         adjust-makefile.patch
 BuildRequires:  pkgconfig
 BuildRequires:  sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -79,10 +80,10 @@ password hashing function that won the Password Hashing Competition
 %autosetup
 
 %build
-%make %{?_smp_mflags}
+%make
 
 %install
-%make DESTDIR=%{buildroot} install
+%make install DESTDIR=%{buildroot}
 
 install -D -m 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1