Hello community, here is the log from the commit of package argon2 for openSUSE:Factory checked in at 2018-01-10 23:35:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/argon2 (Old) and /work/SRC/openSUSE:Factory/.argon2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "argon2" Wed Jan 10 23:35:13 2018 rev:5 rq:562875 version:0.0+git20171227.670229c Changes: -------- --- /work/SRC/openSUSE:Factory/argon2/argon2.changes 2017-04-24 09:48:24.195186536 +0200 +++ /work/SRC/openSUSE:Factory/.argon2.new/argon2.changes 2018-01-10 23:35:22.419444412 +0100 @@ -1,0 +2,16 @@ +Tue Jan 9 10:56:17 UTC 2018 - [email protected] + +- Update description. + +------------------------------------------------------------------- +Tue Jan 09 08:10:20 UTC 2018 - [email protected] + +- Update to version 0.0+git20171227.670229c: + * Added ABI version number + * AVX2/AVX-512F optimizations of BLAMKA + * Set Argon2 version number from the command line + * New bindings + * Minor bug and warning fixes (no security issue) +- use _service file + +------------------------------------------------------------------- Old: ---- phc-winner-argon2-20161029.tar.gz New: ---- _service _servicedata argon2-0.0+git20171227.670229c.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ argon2.spec ++++++ --- /var/tmp/diff_new_pack.vW1sxb/_old 2018-01-10 23:35:23.971371593 +0100 +++ /var/tmp/diff_new_pack.vW1sxb/_new 2018-01-10 23:35:23.971371593 +0100 @@ -1,7 +1,7 @@ # # spec file for package argon2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,36 @@ # -%define lname libargon2-0 -%define _version 20161029 +%ifarch i686 x86_64 +%define no_optimize 0 +%else +%define no_optimize 1 +%endif +# for convenience +%define make %__make OPTFLAGS="%{optflags}" OPTTEST=%no_optimize LIB_ST= LIBRARY_REL=%_lib + +%define lname libargon2-1 Name: argon2 -Version: 0.0+%{_version} +Version: 0.0+git20171227.670229c Release: 0 Summary: The reference C implementation of Argon2 License: CC0-1.0 or Apache-2.0 Group: Productivity/Networking/Security Url: https://github.com/P-H-C/phc-winner-argon2 -Source: https://github.com/P-H-C/phc-winner-argon2/archive/%{_version}.tar.gz#/phc-winner-argon2-%{_version}.tar.gz +Source: %{name}-%{version}.tar.xz Patch1: optflags.patch BuildRequires: pkgconfig BuildRequires: sed -ExclusiveArch: i686 x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is the reference C implementation of Argon2, the password-hashing function -that won the Password Hashing Competition (PHC). +that won the Password Hashing Competition (PHC) in 2015. -Argon2 is a password-hashing function that summarizes the state of the art in -the design of memory-hard functions and can be used to hash passwords for -credential storage, key derivation, or other applications. +Argon2 is a password hashing function that is parametrized by a time cost, a +memory cost and a parallelism degree, used to guard against side-channel +attacks, attacks where lots of memory is available, or attacks where a lot of +processing is available. %package doc Summary: Documentation for Argon2 @@ -46,8 +53,8 @@ BuildArch: noarch %description doc -Documentation for Argon2, the password-hashing function that won the Password -Hashing Competition (PHC). +Documentation for Argon2, the password hashing function that won the Password +Hashing Competition (PHC) in 2015. %package -n %{lname} Summary: The reference C implementation of Argon2 @@ -55,7 +62,7 @@ %description -n %{lname} Reference C implementation of Argon2, the password-hashing function -that won the Password Hashing Competition (PHC). +that won the Password Hashing Competition (PHC) in 2015. %package devel Summary: Development files for argon2 @@ -64,37 +71,33 @@ %description devel Headers for argon2, the reference C implementation of Argon2, the -password-hashing function that won the Password Hashing Competition (PHC). +password hashing function that won the Password Hashing Competition +(PHC) in 2015. %prep -%setup -q -n phc-winner-argon2-%{_version} -%patch1 -p1 - -sed -i s,"LIBRARY_REL = lib","LIBRARY_REL = %{_lib}", Makefile +%autosetup %build -make %{?_smp_mflags} CFLAGS="-pthread %{optflags} -Iinclude -Isrc" +%make %{?_smp_mflags} +# fix pkgconfig file +sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i libargon2.pc %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install - -chmod -x %{buildroot}%{_includedir}/argon2.h - -mv %{buildroot}%{_libdir}/libargon2.so %{buildroot}%{_libdir}/libargon2.so.0 -ln -s %{_libdir}/libargon2.so.0 %{buildroot}%{_libdir}/libargon2.so +%make DESTDIR=%{buildroot} install install -D -m 644 man/argon2.1 %{buildroot}%{_mandir}/man1/argon2.1 install -D -m 644 libargon2.pc %{buildroot}/%{_libdir}/pkgconfig/libargon2.pc %check -make CFLAGS="-pthread %{optflags} -Iinclude -Isrc" test +%make test %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc LICENSE CHANGELOG.md README.md +%license LICENSE +%doc CHANGELOG.md README.md %{_bindir}/argon2 %{_mandir}/man1/argon2.1%{ext_man} @@ -104,7 +107,7 @@ %files -n %{lname} %defattr(-,root,root) -%{_libdir}/libargon2.so.0 +%{_libdir}/libargon2.so.1 %files devel %defattr(-,root,root) ++++++ _service ++++++ <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="url">https://github.com/P-H-C/phc-winner-argon2.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <!-- from https://github.com/P-H-C/phc-winner-argon2/releases/latest --> <param name="revision">20171227</param> </service> <service name="recompress" mode="disabled"> <param name="compression">xz</param> <param name="file">*.tar</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/P-H-C/phc-winner-argon2.git</param> <param name="changesrevision">670229c849b9fe882583688b74eb7dfdc846f9f6</param></service></servicedata>++++++ optflags.patch ++++++ --- /var/tmp/diff_new_pack.vW1sxb/_old 2018-01-10 23:35:24.039368403 +0100 +++ /var/tmp/diff_new_pack.vW1sxb/_new 2018-01-10 23:35:24.039368403 +0100 @@ -1,66 +1,31 @@ -Index: phc-winner-argon2-20161029/Makefile -=================================================================== ---- phc-winner-argon2-20161029.orig/Makefile -+++ phc-winner-argon2-20161029/Makefile -@@ -21,28 +21,14 @@ GENKAT = genkat - - DIST = phc-winner-argon2 - --SRC = src/argon2.c src/core.c src/blake2/blake2b.c src/thread.c src/encoding.c -+SRC = src/argon2.c src/core.c src/blake2/blake2b.c src/thread.c src/encoding.c src/opt.c - SRC_RUN = src/run.c - SRC_BENCH = src/bench.c +diff --git a/Makefile b/Makefile +index 1e1129f..33fe491 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,7 @@ SRC_BENCH = src/bench.c SRC_GENKAT = src/genkat.c OBJ = $(SRC:.c=.o) --CFLAGS += -std=c89 -pthread -O3 -Wall -g -Iinclude -Isrc --CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement -D_FORTIFY_SOURCE=2 \ -- -Wextra -Wno-type-limits -Werror -coverage -DTEST_LARGE_RAM -- +-CFLAGS += -std=c89 -O3 -Wall -g -Iinclude -Isrc ++CFLAGS += $(OPTFLAGS) -Iinclude -Isrc + + ifeq ($(NO_THREADS), 1) + CFLAGS += -DARGON2_NO_THREADS +@@ -41,16 +41,12 @@ endif + CI_CFLAGS := $(CFLAGS) -Werror=declaration-after-statement -D_FORTIFY_SOURCE=2 \ + -Wextra -Wno-type-limits -Werror -coverage -DTEST_LARGE_RAM + -OPTTARGET ?= native - OPTTEST := $(shell $(CC) -Iinclude -Isrc -march=$(OPTTARGET) src/opt.c -c \ - -o /dev/null 2>/dev/null; echo $$?) --# Detect compatible platform --ifneq ($(OPTTEST), 0) --$(info Building without optimizations) -- SRC += src/ref.c --else +-OPTTEST := $(shell $(CC) -Iinclude -Isrc -march=$(OPTTARGET) src/opt.c -c \ +- -o /dev/null 2>/dev/null; echo $$?) + # Detect compatible platform + ifneq ($(OPTTEST), 0) + $(info Building without optimizations) + SRC += src/ref.c + else -$(info Building with optimizations for $(OPTTARGET)) - CFLAGS += -march=$(OPTTARGET) -- SRC += src/opt.c --endif - - BUILD_PATH := $(shell pwd) - KERNEL_NAME := $(shell uname -s) -@@ -88,7 +74,7 @@ endif - - LIB_SH := lib$(LIB_NAME).$(LIB_EXT) - LIB_ST := lib$(LIB_NAME).a --LIBRARIES = $(LIB_SH) $(LIB_ST) -+LIBRARIES = $(LIB_SH) - HEADERS = include/argon2.h - - INSTALL = install -@@ -105,11 +91,11 @@ INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINA - - .PHONY: clean dist format $(GENKAT) all install - --all: clean $(RUN) libs -+all: $(RUN) libs - libs: $(LIBRARIES) - - $(RUN): $(SRC) $(SRC_RUN) -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -+ $(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS) - - $(BENCH): $(SRC) $(SRC_BENCH) - $(CC) $(CFLAGS) $^ -o $@ -@@ -118,7 +104,7 @@ $(GENKAT): $(SRC) $(SRC_GENKAT) - $(CC) $(CFLAGS) $^ -o $@ -DGENKAT - - $(LIB_SH): $(SRC) -- $(CC) $(CFLAGS) $(LIB_CFLAGS) $(LDFLAGS) $(SO_LDFLAGS) $^ -o $@ -+ $(CC) $(CFLAGS) $(LIB_CFLAGS) $(SO_LDFLAGS) $^ -o $@ $(LDFLAGS) ++$(info Building with optimizations) + SRC += src/opt.c + endif - $(LIB_ST): $(OBJ) - ar rcs $@ $^
